From 3337fa7b875f97c3e1b870df4b91597a99510f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 15 Mar 2012 16:38:24 +0000
Subject: [PATCH 001/208] Adding the cups lib path to ld_libraray_path for
 libreoffice to be able to print with cups.

That would have been also the fix for go-oo for this problem, I think.


svn path=/nixpkgs/trunk/; revision=33112
---
 pkgs/applications/office/openoffice/libreoffice.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix
index 6c61f04026d..74824e2c30c 100644
--- a/pkgs/applications/office/openoffice/libreoffice.nix
+++ b/pkgs/applications/office/openoffice/libreoffice.nix
@@ -5,7 +5,7 @@
 , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
-, autoconf, automake, openldap, bash
+, autoconf, automake, openldap, bash, makeWrapper
 , fontsConf
 , langs ? [ "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
 }:
@@ -89,6 +89,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
       ln -s $out/lib/libreoffice/program/$a $out/bin/$a
+      wrapProgram $out/bin/$a --prefix LD_LIBRARY_PATH : ${cups}/lib
     done
   '';
 
@@ -146,7 +147,7 @@ stdenv.mkDerivation rec {
     libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack 
     getopt file jdk cairo which icu boost libXext libX11 libXtst libXi mesa
     cups libXinerama openssl gperf GConf ORBit2 gnome_vfs gstreamer gst_plugins_base
-    ant autoconf openldap cppunit poppler librsvg automake
+    ant autoconf openldap cppunit poppler librsvg automake makeWrapper
   ];
 
   meta = {

From 6fe531299e8b2b8873501b0b2fffc15da9d8b60a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 15 Mar 2012 16:45:04 +0000
Subject: [PATCH 002/208] Avoiding the wrapper in libreoffice, and trying to
 use '-lcups'.

svn path=/nixpkgs/trunk/; revision=33113
---
 pkgs/applications/office/openoffice/libreoffice.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix
index 74824e2c30c..aa9c1712d55 100644
--- a/pkgs/applications/office/openoffice/libreoffice.nix
+++ b/pkgs/applications/office/openoffice/libreoffice.nix
@@ -5,7 +5,7 @@
 , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
-, autoconf, automake, openldap, bash, makeWrapper
+, autoconf, automake, openldap, bash
 , fontsConf
 , langs ? [ "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
 }:
@@ -33,6 +33,12 @@ stdenv.mkDerivation rec {
     sha256 = "04hvlj6wzbj3zjpfjq975mgdmf902ywyf94nxcv067asg83qfcvr";
   };
 
+  # Openoffice will open libcups dynamically, so we link it directly
+  # to make its dlopen work.
+  NIX_LDFLAGS = "-lcups";
+
+  # If we call 'configure', 'make' will then call configure again without parameters.
+  # It's their system.
   configureScript = "./autogen.sh";
 
   preConfigure = ''
@@ -89,7 +95,6 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
       ln -s $out/lib/libreoffice/program/$a $out/bin/$a
-      wrapProgram $out/bin/$a --prefix LD_LIBRARY_PATH : ${cups}/lib
     done
   '';
 
@@ -147,7 +152,7 @@ stdenv.mkDerivation rec {
     libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack 
     getopt file jdk cairo which icu boost libXext libX11 libXtst libXi mesa
     cups libXinerama openssl gperf GConf ORBit2 gnome_vfs gstreamer gst_plugins_base
-    ant autoconf openldap cppunit poppler librsvg automake makeWrapper
+    ant autoconf openldap cppunit poppler librsvg automake
   ];
 
   meta = {

From b0d0278e82febd897bbc086a2243e75c5f40b858 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Mar 2012 17:08:26 +0000
Subject: [PATCH 003/208] libssh-0.5.2, switch to libgcrypt

svn path=/nixpkgs/trunk/; revision=33114
---
 pkgs/development/libraries/libssh/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 889f98d8a76..1ac93db0f4d 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,12 +1,14 @@
-{stdenv, fetchurl, cmake, zlib, openssl}:
+{stdenv, fetchurl, cmake, zlib, libgcrypt}:
 
 stdenv.mkDerivation rec {
-  name = "libssh-0.4.8";
+  name = "libssh-0.5.2";
   src = fetchurl {
-    url = "http://www.libssh.org/files/0.4/${name}.tar.gz";
-    sha256 = "05d8i8hwya2gry3lky9pmjpvr9f4wvggszqjjzgxvyy74sj3khhm";
+    url = "http://www.libssh.org/files/0.5/${name}.tar.gz";
+    sha256 = "09xjb8ja8k3j3a0y3zjphhxwrnh1y618afcbbri48x87mz0vks21";
   };
-  buildInputs = [ cmake zlib openssl ];
+  buildInputs = [ zlib libgcrypt ];
+  buildNativeInputs = [ cmake ];
+  cmakeFlags = "-DWITH_GCRYPT=ON";
   meta = {
     description = "SSH client library";
     license = "LGPL";

From ee402fac15493ef679c414a538f6c0c26cae57d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2012 18:07:45 +0000
Subject: [PATCH 004/208] haskell-bloomfilter: added version 1.2.6.8

svn path=/nixpkgs/trunk/; revision=33115
---
 .../libraries/haskell/bloomfilter/default.nix  | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/bloomfilter/default.nix

diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix
new file mode 100644
index 00000000000..ff7d8421a5e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bloomfilter/default.nix
@@ -0,0 +1,18 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "bloomfilter";
+  version = "1.2.6.8";
+  sha256 = "0qv25dfyqbkswcbw1cxs4zcm8zl0xi5880zx6fab8ka6vnx2a5nf";
+  buildDepends = [ deepseq ];
+  meta = {
+    homepage = "http://www.serpentine.com/software/bloomfilter";
+    description = "Pure and impure Bloom Filter implementations";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d309ec583e6..7785b51a108 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -489,6 +489,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {};
 
+  bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
+
   bmp = callPackage ../development/libraries/haskell/bmp {};
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};

From 6ff954a5e8ff7e7cc1c80602cd692c9550e40b4c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2012 18:07:49 +0000
Subject: [PATCH 005/208] git-annex: updated to version 3.20120315

svn path=/nixpkgs/trunk/; revision=33116
---
 .../version-management/git-and-tools/default.nix     |  3 ++-
 .../git-and-tools/git-annex/default.nix              | 12 +++++++-----
 2 files 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 f2e7b6b98e9..5b53cfce1ce 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -48,7 +48,8 @@ rec {
   gitAnnex = lib.makeOverridable (import ./git-annex) {
     inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils;
     inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc
-      HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse QuickCheck2;
+      HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse
+      QuickCheck2 bloomfilter;
   };
 
   qgit = import ./qgit {
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 80307135e9a..ecdb0811996 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,23 +1,25 @@
 { stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
 , ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
-, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils, IfElse
+, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
+, IfElse, bloomfilter
 }:
 
 let
-  version = "3.20120309";
+  version = "3.20120315";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
-    sha256 = "54b2d6a9660a700cbe914e8613c1a4bc265f912cf157be774e2b5ea5775a4502";
+    url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
+    sha256 = "eeefca150f7f86a9373ac60cef9be22fe6fcb03fd13fda54793a4f8d46b747a1";
+    name = "git-annex-${version}.tar.gz";
   };
 
   buildInputs = [
     curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
     libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
-    rsync SHA testpack utf8String which liftedBase IfElse
+    rsync SHA testpack utf8String which liftedBase IfElse bloomfilter
   ];
 
   checkTarget = "test";

From 8849219c81eb2027275449f32e8dc3afc2906047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 15 Mar 2012 19:50:23 +0000
Subject: [PATCH 006/208] Trying to update libreoffice to the version today
 released. Cross fingers; we can revert this, if it does not work.

svn path=/nixpkgs/trunk/; revision=33117
---
 .../office/openoffice/libreoffice.nix          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix
index aa9c1712d55..3b69ac8ebb1 100644
--- a/pkgs/applications/office/openoffice/libreoffice.nix
+++ b/pkgs/applications/office/openoffice/libreoffice.nix
@@ -14,23 +14,23 @@ let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
 in
 stdenv.mkDerivation rec {
-  name = "libreoffice-3.5.0.3";
+  name = "libreoffice-3.5.1.2";
 
   srcs_download = import ./libreoffice-srcs.nix { inherit fetchurl; };
 
   src_translation = fetchurl {
-    url = "http://download.documentfoundation.org/libreoffice/src/3.5.0/libreoffice-translations-3.5.0.3.tar.xz";
-    sha256 = "0kk1jb4axjvkmg22yhxx4p9522zix6rr5cs0c5rxzlkm63qw6h8w";
+    url = "http://download.documentfoundation.org/libreoffice/src/3.5.1/libreoffice-translations-3.5.1.2.tar.xz";
+    sha256 = "cf8ed662f7d0a679bd3a242a7f88cf445b769afdcd8a3d3df655d774f296972a";
   };
 
   src_help = fetchurl {
-    url = "http://download.documentfoundation.org/libreoffice/src/3.5.0/libreoffice-help-3.5.0.3.tar.xz";
-    sha256 = "0wvlh2r4cy14rs0svr4yb4fidp2g9wbj8vxx2a5swnjf2fdf8qda";
+    url = "http://download.documentfoundation.org/libreoffice/src/3.5.1/libreoffice-help-3.5.1.2.tar.xz";
+    sha256 = "43b07225854b1c8b3195b252453b8e97d2d58d83909bf4b5f920cb08b7f33e30";
   };
 
   src = fetchurl {
-    url = "http://download.documentfoundation.org/libreoffice/src/3.5.0/libreoffice-core-3.5.0.3.tar.xz";
-    sha256 = "04hvlj6wzbj3zjpfjq975mgdmf902ywyf94nxcv067asg83qfcvr";
+    url = "http://download.documentfoundation.org/libreoffice/src/3.5.1/libreoffice-core-3.5.1.2.tar.xz";
+    sha256 = "61cd12e20fb9460178fc6f08100a9a189c2390c21e2e47eb66e07a5b0ce5cd94";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
@@ -44,10 +44,10 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     tar xf $src_translation
     # Libreoffice expects by default the translations in ./translations
-    mv libreoffice-translations-3.5.0.3/translations .
+    mv libreoffice-translations-3.5.1.2/translations .
     tar xf $src_help
     # Libreoffice expects by default the help in ./helpcontent2
-    mv libreoffice-help-3.5.0.3/helpcontent2 .
+    mv libreoffice-help-3.5.1.2/helpcontent2 .
 
     sed -i 's,/bin/bash,${bash}/bin/bash,' sysui/desktop/share/makefile.mk solenv/bin/localize
     sed -i 's,/usr/bin/env bash,${bash}/bin/bash,' bin/unpack-sources \

From 5d066bdbce849d81c9a16392df9c7bee7132ed6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 15 Mar 2012 20:27:35 +0000
Subject: [PATCH 007/208] GNU: SMBFS: Update.

svn path=/nixpkgs/trunk/; revision=33118
---
 pkgs/os-specific/gnu/smbfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/gnu/smbfs/default.nix b/pkgs/os-specific/gnu/smbfs/default.nix
index 99b9b77adaa..4897c0c0af8 100644
--- a/pkgs/os-specific/gnu/smbfs/default.nix
+++ b/pkgs/os-specific/gnu/smbfs/default.nix
@@ -1,7 +1,7 @@
 { fetchcvs, stdenv, hurd, machHeaders, samba }:
 
 let
-  date = "2012-03-08";
+  date = "2012-03-15";
   samba_patched = stdenv.lib.overrideDerivation samba (attrs: {
     patches = attrs.patches ++ [ ./samba-without-byte-range-locks.patch ];
   });
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchcvs {
     cvsRoot = ":pserver:anonymous@cvs.savannah.nongnu.org:/sources/hurdextras";
     module = "smbfs";
-    sha256 = "526475771e145a43752a9a6b9ff60cbed24cb6c098cafc490ab42684936fd685";
+    sha256 = "5941d1a5da4488cbf0efe9aa0b41fe4ff5ba57b84ed24f7ff7c0feda4501d3e3";
     inherit date;
   };
 

From eaab66d11a4be47c3c2d22d5865db685e074dd14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 15 Mar 2012 20:27:41 +0000
Subject: [PATCH 008/208] forceSystem: Inherit `crossSystem' and `platform'.

svn path=/nixpkgs/trunk/; revision=33119
---
 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 91f3ebf4f0c..24e3787c502 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -142,7 +142,8 @@ let
   # Override system. This is useful to build i686 packages on x86_64-linux.
   forceSystem = system: (import ./all-packages.nix) {
     inherit system;
-    inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
+    inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config
+      crossSystem platform;
   };
 
 

From e4f5ebb3486e072640077f153ee1aa34130a022e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 15 Mar 2012 20:27:49 +0000
Subject: [PATCH 009/208] GNU MIG: Make it clear that the inputs are native.

svn path=/nixpkgs/trunk/; revision=33120
---
 pkgs/os-specific/gnu/mig/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix
index 480b349297a..77bb53f7a06 100644
--- a/pkgs/os-specific/gnu/mig/default.nix
+++ b/pkgs/os-specific/gnu/mig/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   patches = [ ./noyywrap.patch ];
 
-  buildInputs = [ autoconf automake flex bison machHeaders ];
+  buildNativeInputs = [ autoconf automake flex bison machHeaders ];
 
   preConfigure = "autoreconf -vfi";
 

From 97bd4b7b004347dca31e141ebe9c5ba89859586a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 15 Mar 2012 20:27:53 +0000
Subject: [PATCH 010/208] GNU MIG: Use `forceSystem' instead of the custom
 hack.

svn path=/nixpkgs/trunk/; revision=33121
---
 pkgs/os-specific/gnu/default.nix | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index a16aeb1c06c..5b8309f1c52 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -3,7 +3,7 @@
 args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
 , texinfo, glibcCross, hurdPartedCross, libuuid, samba_light
 , gccCrossStageStatic, gccCrossStageFinal
-, forceBuildDrv, callPackage, platform, config, crossSystem }:
+, forceBuildDrv, forceSystem, callPackage, platform, config, crossSystem }:
 
 with args;
 
@@ -72,20 +72,11 @@ rec {
     mig = null;
   };
 
-  mig = callPackage ./mig
-    (if stdenv.isLinux
-     then {
-       # Build natively, but force use of a 32-bit environment because we're
-       # targeting `i586-pc-gnu'.
-       stdenv = (import ../../stdenv {
-         system = "i686-linux";
-         stdenvType = "i686-linux";
-         allPackages = args:
-           import ../../top-level/all-packages.nix ({ inherit config; } // args);
-         inherit platform;
-       }).stdenv;
-     }
-     else { });
+  mig = callPackage ./mig {
+    # Build natively, but force use of a 32-bit environment because we're
+    # targeting `i586-pc-gnu'.
+    stdenv = (forceSystem "i686-linux").stdenv;
+  };
 
   smbfs = callPackage ./smbfs {
     samba = samba_light;

From 9e2e08ba4768d0386da544ff4ee096a9c4d18174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 15 Mar 2012 20:27:58 +0000
Subject: [PATCH 011/208] unionfs: Mark MIG as a native build input.

svn path=/nixpkgs/trunk/; revision=33122
---
 pkgs/os-specific/gnu/unionfs/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/gnu/unionfs/default.nix b/pkgs/os-specific/gnu/unionfs/default.nix
index 5b42e7fdf2b..f35fed282b6 100644
--- a/pkgs/os-specific/gnu/unionfs/default.nix
+++ b/pkgs/os-specific/gnu/unionfs/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
     '';
 
   makeFlags = [ "CC=i586-pc-gnu-gcc" ];
-  buildInputs = [ hurd machHeaders mig ];
+  buildInputs = [ hurd machHeaders ];
+  buildNativeInputs = [ mig ];
 
   installPhase =
     '' mkdir -p "$out/hurd"

From 2e0ae13f680ab56f303eb15397d08f0889bd93ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 15 Mar 2012 20:28:03 +0000
Subject: [PATCH 012/208] GNU MIG: When cross-compiling, patch shebang
 correctly.

svn path=/nixpkgs/trunk/; revision=33123
---
 pkgs/os-specific/gnu/mig/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix
index 77bb53f7a06..f7b798a7624 100644
--- a/pkgs/os-specific/gnu/mig/default.nix
+++ b/pkgs/os-specific/gnu/mig/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, stdenv, autoconf, automake, flex, bison, machHeaders }:
+{ fetchgit, stdenv, autoconf, automake, flex, bison, machHeaders, bash }:
 
 let
   date = "20100512";
@@ -21,6 +21,14 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
+  crossAttrs = {
+    postInstall =
+      # Fix the shebang to point to the cross-built shell.
+      '' sed -i "$out/bin/mig" \
+             -e 's|^#!/.*|#!${bash.hostDrv}/bin/sh|g'
+      '';
+  };
+
   meta = {
     description = "GNU MIG, the Mach interface generator";
 

From 90b8995e04b40cfd5e771afaa92dfe50f90bfea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 15 Mar 2012 20:28:07 +0000
Subject: [PATCH 013/208] GNU MIG: Add a `raw' version, without `forceSystem'.

svn path=/nixpkgs/trunk/; revision=33124
---
 pkgs/os-specific/gnu/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index 5b8309f1c52..1c4af3bdbfb 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -78,6 +78,11 @@ rec {
     stdenv = (forceSystem "i686-linux").stdenv;
   };
 
+  # XXX: Use this one for its `.hostDrv'.  Using the one above from
+  # `x86_64-linux' leads to building a different cross-toolchain because of
+  # the `forceSystem'.
+  mig_raw = callPackage ./mig {};
+
   smbfs = callPackage ./smbfs {
     samba = samba_light;
     hurd = hurdCross;

From 049e67640347eb42f91da022f51815df92a461f0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Mar 2012 20:46:36 +0000
Subject: [PATCH 014/208] Remove qc-usb

This directory was added in 2006, and was never called by nix-expressions
outside of qc-usb/.

svn path=/nixpkgs/trunk/; revision=33125
---
 pkgs/os-specific/linux/qc-usb/builder.sh      | 26 ------
 pkgs/os-specific/linux/qc-usb/default.nix     | 13 ---
 .../linux/qc-usb/quickcam-install.patch       | 91 -------------------
 3 files changed, 130 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/qc-usb/builder.sh
 delete mode 100644 pkgs/os-specific/linux/qc-usb/default.nix
 delete mode 100644 pkgs/os-specific/linux/qc-usb/quickcam-install.patch

diff --git a/pkgs/os-specific/linux/qc-usb/builder.sh b/pkgs/os-specific/linux/qc-usb/builder.sh
deleted file mode 100644
index 041be115328..00000000000
--- a/pkgs/os-specific/linux/qc-usb/builder.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-source $stdenv/setup
-
-hashname=$(basename $kernel)
-echo $hashname
-if echo "$hashname" | grep -q '^[a-z0-9]\{32\}-'; then
-  hashname=$(echo "$hashname" | cut -c -32)
-fi
-
-stripHash $kernel
-version=$(echo $strippedName | cut -c 7-)-$hashname
-
-echo "version $version"
-
-export version
-
-mkdir -p $out/lib/modules/$version/misc
-
-LINUX_DIR=$kernel/lib/modules/$version/build
-PREFIX=$out
-MODULE_DIR=$out/lib/modules/$version
-
-export LINUX_DIR
-export PREFIX
-export MODULE_DIR
-
-genericBuild
diff --git a/pkgs/os-specific/linux/qc-usb/default.nix b/pkgs/os-specific/linux/qc-usb/default.nix
deleted file mode 100644
index 508a891dd9e..00000000000
--- a/pkgs/os-specific/linux/qc-usb/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, kernel, gawk}:
-
-stdenv.mkDerivation {
-  name = "qc-usb-0.6.4";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = mirror://sourceforge/qce-ga/qc-usb-0.6.4.tar.gz;
-    md5 = "7e91c3a633382c99100e3ef4f1d9f50a";
-  };
-  inherit kernel;
-  buildInputs = [gawk];
-  patches = [./quickcam-install.patch];
-}
diff --git a/pkgs/os-specific/linux/qc-usb/quickcam-install.patch b/pkgs/os-specific/linux/qc-usb/quickcam-install.patch
deleted file mode 100644
index 136aab5a1d0..00000000000
--- a/pkgs/os-specific/linux/qc-usb/quickcam-install.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -ruN qc-usb-0.6.3/Makefile qc-usb-0.6.3.new/Makefile
---- qc-usb-0.6.3/Makefile	2004-10-21 18:13:11.000000000 +0200
-+++ qc-usb-0.6.3.new/Makefile	2006-01-17 18:03:02.000000000 +0100
-@@ -56,8 +56,9 @@
- endif
- 
- ARCH    := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
--INSTALL := $(shell which install)
--DEPMOD  := $(shell which depmod || which /sbin/depmod || echo "true You should now run depmod")
-+#INSTALL := $(shell which install)
-+INSTALL := install
-+#DEPMOD  := $(shell which depmod || which /sbin/depmod || echo "true You should now run depmod")
- 
- # Get VERSION_CODE (from version.h in kernel source directory)
- VERSION_CODE := $(shell awk '/[ 	]*\#[ 	]*define[ 	]*LINUX_VERSION_CODE[ 	]*/ { print $$3 }' $(LINUX_DIR)/include/linux/version.h|tail -n 1)
-@@ -68,36 +69,36 @@
- MODULE_NAME := quickcam.o	# for 2.4.x and older
- endif
- 
--.PHONY: help
--help:
--	@echo '-=- Logitech QuickCam USB camera driver -=-'
--	@echo
--	@echo "Makefile target examples:"
--	@echo "make all - Compile driver and utilities against current running kernel"
--	@echo "make all USER_OPT=-DDEBUG - Compile with debugging code and messages"
--	@echo "make all LINUX_DIR=/usr/src/linux - Compile against specified kernel source"
--	@echo "make install - Copy driver and utilities into standard locations (needs root)"
--	@echo "make install PREFIX=/usr - Copy utilities to /usr/bin instead of /usr/local/bin"
--	@echo "make install MODULE_DIR=/lib/modules/2.4.0 - Copy module to /lib/modules/2.4.0/misc"
--ifeq ($(VERSION_CODE),132116)
--	@echo "make patch - Modify kernel source to include the driver for kernel 2.4.20"
--endif
--ifeq ($(VERSION_CODE),132615)
--	@echo "make patch - Modify kernel source to include the driver for kernel 2.6.7"
--endif
--ifeq ($(VERSION_CODE),132616)
--	@echo "make patch - Modify kernel source to include the driver for kernel 2.6.8/2.6.8.1"
--endif
--	@echo "make clean - Remove object files from the source directory"
--	@echo
--	@echo "Current configuration:"
--	@echo "Driver source directory (PWD):         $(PWD)"
--	@echo "Kernel source directory (LINUX_DIR):   $(LINUX_DIR)"
--	@echo "Module install directory (MODULE_DIR): $(MODULE_DIR)"
--	@echo "Utility install directory (PREFIX):    $(PREFIX)"
--	@echo "User options (USER_OPT):               $(USER_OPT)"
--	@echo "Driver file name (use with insmod):    $(MODULE_NAME)"
--	@echo "Kernel version code:                   $(VERSION_CODE)"
-+#.PHONY: help
-+#help:
-+	#@echo '-=- Logitech QuickCam USB camera driver -=-'
-+	#@echo
-+	#@echo "Makefile target examples:"
-+	#@echo "make all - Compile driver and utilities against current running kernel"
-+	#@echo "make all USER_OPT=-DDEBUG - Compile with debugging code and messages"
-+	#@echo "make all LINUX_DIR=/usr/src/linux - Compile against specified kernel source"
-+	#@echo "make install - Copy driver and utilities into standard locations (needs root)"
-+	#@echo "make install PREFIX=/usr - Copy utilities to /usr/bin instead of /usr/local/bin"
-+	#@echo "make install MODULE_DIR=/lib/modules/2.4.0 - Copy module to /lib/modules/2.4.0/misc"
-+#ifeq ($(VERSION_CODE),132116)
-+	#@echo "make patch - Modify kernel source to include the driver for kernel 2.4.20"
-+#endif
-+#ifeq ($(VERSION_CODE),132615)
-+	#@echo "make patch - Modify kernel source to include the driver for kernel 2.6.7"
-+#endif
-+#ifeq ($(VERSION_CODE),132616)
-+	#@echo "make patch - Modify kernel source to include the driver for kernel 2.6.8/2.6.8.1"
-+#endif
-+	#@echo "make clean - Remove object files from the source directory"
-+	#@echo
-+	#@echo "Current configuration:"
-+	#@echo "Driver source directory (PWD):         $(PWD)"
-+	#@echo "Kernel source directory (LINUX_DIR):   $(LINUX_DIR)"
-+	#@echo "Module install directory (MODULE_DIR): $(MODULE_DIR)"
-+	#@echo "Utility install directory (PREFIX):    $(PREFIX)"
-+	#@echo "User options (USER_OPT):               $(USER_OPT)"
-+	#@echo "Driver file name (use with insmod):    $(MODULE_NAME)"
-+	#@echo "Kernel version code:                   $(VERSION_CODE)"
- 
- all: $(MODULE_NAME) qcset
- 
-@@ -165,7 +166,7 @@
- install: $(MODULE_NAME)
- 	$(INSTALL) -c -D -m 644 $(MODULE_NAME) $(MODULE_DIR)/misc/$(MODULE_NAME)
- 	$(INSTALL) -c -D -m 755 qcset $(PREFIX)/bin/qcset
--	-$(DEPMOD) -a
-+	#-$(DEPMOD) -a
- 
- qcset: qcset.c quickcam.h
- 	gcc -Wall -O2 -s qcset.c -o qcset -lm

From 1677493301fa915908e8b2b5dd7e287a4104203a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 15 Mar 2012 21:41:40 +0000
Subject: [PATCH 015/208] Libreoffice wants a newer libvisio.

svn path=/nixpkgs/trunk/; revision=33126
---
 pkgs/applications/office/openoffice/libreoffice-srcs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/openoffice/libreoffice-srcs.nix b/pkgs/applications/office/openoffice/libreoffice-srcs.nix
index 7e84bfdbd71..6b98e32e46f 100644
--- a/pkgs/applications/office/openoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/openoffice/libreoffice-srcs.nix
@@ -356,8 +356,8 @@
   md5 = "3bf481ca95109b14435125c0dd1f2217";
 })
 (fetchurl {
-  url = "http://dev-www.libreoffice.org/src/776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2";
-  md5 = "776ad69a63ac1e99abed176e54ce25d9";
+  url = "http://dev-www.libreoffice.org/src/d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2";
+  md5 = "d28864eb2b59bb57b034c0d4662a3cee";
 })
 (fetchurl {
   url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";

From 0239640deff9607ffaf0263cd484add8fa202cb8 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Mar 2012 21:49:54 +0000
Subject: [PATCH 016/208] Add farstream

svn path=/nixpkgs/trunk/; revision=33127
---
 .../libraries/farstream/default.nix           | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/farstream/default.nix

diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
new file mode 100644
index 00000000000..7d5e7148620
--- /dev/null
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
+, pygobject, gst_python, gupnp_igd }:
+
+stdenv.mkDerivation rec {
+  name = "farstream-0.1.1";
+  src = fetchurl {
+    url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
+    sha256 = "0lmdz7ijpgrc0zbr11jp3msvz44p809scx2m56bk5l5x1xrs123v";
+  };
+
+  buildInputs = [ libnice python pygobject gst_python gupnp_igd ];
+
+  buildNativeInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ gstreamer gst_plugins_base ];
+
+  meta = {
+    homepage = http://www.freedesktop.org/wiki/Software/Farstream;
+    description = "Audio/Video Communications Framework formely known as farsight";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24e3787c502..4d9c2510d88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3407,6 +3407,8 @@ let
 
   farsight2 = callPackage ../development/libraries/farsight2 { };
 
+  farstream = callPackage ../development/libraries/farstream { };
+
   fcgi = callPackage ../development/libraries/fcgi { };
 
   ffmpeg = callPackage ../development/libraries/ffmpeg {

From d477e709c83c44c3e050823b310e3429798680a8 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Mar 2012 21:50:02 +0000
Subject: [PATCH 017/208] Add telepathy-farstream

svn path=/nixpkgs/trunk/; revision=33128
---
 .../libraries/telepathy/farstream/default.nix   | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/telepathy/farstream/default.nix

diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix
new file mode 100644
index 00000000000..a9b072d2152
--- /dev/null
+++ b/pkgs/development/libraries/telepathy/farstream/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, telepathy_glib, farstream, gst_plugins_base, dbus_glib
+, pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-0.2.2";
+  pname = "telepathy-farstream";
+
+  src = fetchurl {
+    url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    sha256 = "0gdcf50dz1hf22az5jqal2jlzbb1nl2cim579kv3q87b8lq9aplv";
+  };
+
+  buildInputs = [ gst_plugins_base gst_python pygobject ];
+
+  propagatedBuildInputs = [ dbus_glib farstream telepathy_glib gstreamer ];
+  buildNativeInputs = [ pkgconfig python libxslt];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d9c2510d88..09678a5e01a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4676,6 +4676,8 @@ let
 
   telepathy_farsight = callPackage ../development/libraries/telepathy/farsight { };
 
+  telepathy_farstream = callPackage ../development/libraries/telepathy/farstream {};
+
   telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
 
   tk = callPackage ../development/libraries/tk { };

From 8a5e005bee4cc5934a98c88095db8561574df0ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 01:46:39 +0000
Subject: [PATCH 018/208] * dmidecode updated to 2.11.

svn path=/nixpkgs/trunk/; revision=33132
---
 pkgs/os-specific/linux/dmidecode/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix
index 7a291cba26c..f0649ccc390 100644
--- a/pkgs/os-specific/linux/dmidecode/default.nix
+++ b/pkgs/os-specific/linux/dmidecode/default.nix
@@ -1,19 +1,13 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dmidecode-2.10";
+  name = "dmidecode-2.11";
 
   src = fetchurl {
-    url = "http://www.very-clever.com/download/nongnu/dmidecode/${name}.tar.bz2";
-    sha256 = "1h72r5scrpvgw60hif5msjg6vw2x0jd6z094lhbh6cjk6gls6x2d";
+    url = "http://download.savannah.gnu.org/releases/dmidecode/${name}.tar.bz2";
+    sha256 = "0l9v8985piykc98hmbg1cq5r4xwvp0jjl4li3avr3ddkg4s699bd";
   };
 
-  # Taken from gentoo, to build with gnumake 3.82
-  # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/dmidecode/dmidecode-2.10.ebuild?r1=1.5&r2=1.6
-  patchPhase = ''
-    sed -i -e '/^PROGRAMS !=/d' Makefile
-  '';
-
   makeFlags = "prefix=$(out)";
 
   meta = {

From d7533209a109126073af99444b4c600ed31d9fa9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 02:05:38 +0000
Subject: [PATCH 019/208] Add NixosBootPkg

You almost certainly don't want to use this. It's a very stupid,
overspecialized application that's only needed by the efiBootStub NixOS
module in corner cases.

svn path=/nixpkgs/trunk/; revision=33134
---
 pkgs/tools/misc/NixosBootPkg/default.nix | 28 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/misc/NixosBootPkg/default.nix

diff --git a/pkgs/tools/misc/NixosBootPkg/default.nix b/pkgs/tools/misc/NixosBootPkg/default.nix
new file mode 100644
index 00000000000..88192465aba
--- /dev/null
+++ b/pkgs/tools/misc/NixosBootPkg/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, edk2, fetchhg }:
+
+let
+
+  src = fetchhg {
+    url = https://bitbucket.org/shlevy/nixosbootpkg;
+    tag = "1ff4c2891c8c1eb03677a6f8b04b8d05807ec198";
+    sha256 = "06zwy0g9a7g2sny7phvn2z76pb3wnw4vm9vsrjjaj7f7nzcsn13k";
+  };
+
+in
+
+stdenv.mkDerivation (edk2.setup "NixosBootPkg/NixosBootPkg.dsc" {
+  name = "NixosBootPkg-2012-03-15";
+
+  unpackPhase = ''
+    ln -sv ${src} NixosBootPkg
+    ln -sv ${edk2.src}/MdePkg .
+  '';
+
+  meta = {
+    description = "Sample UEFI firmware for QEMU and KVM";
+    homepage = http://www.shealevy.com;
+    license = "MIT";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = ["x86_64-linux" "i686-linux"];
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09678a5e01a..5fe2853e038 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -927,6 +927,8 @@ let
 
   ninka = callPackage ../development/tools/misc/ninka { };
 
+  NixosBootPkg = callPackage ../tools/misc/NixosBootPkg { };
+
   nodejs = callPackage ../development/web/nodejs {};
 
   ldns = callPackage ../development/libraries/ldns { };

From b3e248d0f7aa2113106db0e6fc75a8c18e71a86a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 02:41:12 +0000
Subject: [PATCH 020/208] Whoops, sloppy copy

svn path=/nixpkgs/trunk/; revision=33136
---
 pkgs/tools/misc/NixosBootPkg/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/NixosBootPkg/default.nix b/pkgs/tools/misc/NixosBootPkg/default.nix
index 88192465aba..5bce1789a02 100644
--- a/pkgs/tools/misc/NixosBootPkg/default.nix
+++ b/pkgs/tools/misc/NixosBootPkg/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation (edk2.setup "NixosBootPkg/NixosBootPkg.dsc" {
   '';
 
   meta = {
-    description = "Sample UEFI firmware for QEMU and KVM";
+    description =
+      "Simple EFI app to load the kernel with NixOS-specific arguments";
     homepage = http://www.shealevy.com;
     license = "MIT";
     maintainers = [ stdenv.lib.maintainers.shlevy ];

From 0845f6618cecce9db9516ff8642024eb19006b9a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 02:45:47 +0000
Subject: [PATCH 021/208] Add an 'efiBootStub' kernel feature to be used by
 NixOS

svn path=/nixpkgs/trunk/; revision=33137
---
 pkgs/os-specific/linux/kernel/linux-3.3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix
index 82ca7b0b6bb..748648d7332 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix
@@ -243,6 +243,7 @@ import ./generic.nix (
     configCross = configWithPlatform stdenv.cross.platform;
 
     features.iwlwifi = true;
+    features.efiBootStub = true;
   }
 
   // removeAttrs args ["extraConfig"]

From 01b850670899799f1395cd1a68f30f76d9fb96b5 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 16 Mar 2012 06:57:58 +0000
Subject: [PATCH 022/208] Add libsoup to top-level

svn path=/nixpkgs/trunk/; revision=33142
---
 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 5fe2853e038..f8cdb3c4a31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4176,6 +4176,8 @@ let
 
   libsndfile = callPackage ../development/libraries/libsndfile { };
 
+  libsoup = pkgs.gnome.libsoup;
+
   libssh = callPackage ../development/libraries/libssh { };
 
   libssh2 = callPackage ../development/libraries/libssh2 { };

From 2aed4ebe882b32960a98ce5012f71f812646a615 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 16 Mar 2012 06:58:03 +0000
Subject: [PATCH 023/208] Add telepathy-salut

svn path=/nixpkgs/trunk/; revision=33143
---
 .../telepathy/salut/default.nix               | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
new file mode 100644
index 00000000000..21095261b9c
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup
+, libuuid, gnutls, sqlite, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  pname = "telepathy-salut";
+  name = "${pname}-0.7.1";
+
+  src = fetchurl {
+    url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    sha256 = "0677c4j11n0symmhy52g2qzrflvxjppysscq3rh7zc3ys6h10kpi";
+  };
+
+  buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls
+    sqlite ];
+
+  buildNativeInputs = [ libxslt pkgconfig ];
+
+  configureFlags = "--disable-avahi-tests";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8cdb3c4a31..b89919cbfa9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7358,6 +7358,8 @@ let
 
   telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };
 
+  telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};
+
   tesseract = callPackage ../applications/graphics/tesseract { };
 
   thinkingRock = callPackage ../applications/misc/thinking-rock { };

From 6e56feca1da3723f13aa7c0ad822e3b653d07663 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2012 09:47:31 +0000
Subject: [PATCH 024/208] Updated Haskell packages.

 - RepLib: updated to version 0.5.2
 - http-enumerator: updated to version 0.7.3.1
 - http-types: updated to version 0.6.10
 - leksah-server: updated to version 0.12.0.5
 - test-framework-quickcheck2: updated to version 0.2.12.1
 - unbound: updated to version 0.4
 - yesod: updated to version 0.10.2

svn path=/nixpkgs/trunk/; revision=33144
---
 pkgs/development/libraries/haskell/RepLib/default.nix       | 4 ++--
 .../libraries/haskell/http-enumerator/default.nix           | 4 ++--
 pkgs/development/libraries/haskell/http-types/default.nix   | 6 ++----
 pkgs/development/libraries/haskell/leksah/leksah-server.nix | 4 ++--
 .../haskell/test-framework-quickcheck2/default.nix          | 4 ++--
 pkgs/development/libraries/haskell/unbound/default.nix      | 4 ++--
 pkgs/development/libraries/haskell/yesod/default.nix        | 4 ++--
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
index 908ff5b62a9..2b405cf07bf 100644
--- a/pkgs/development/libraries/haskell/RepLib/default.nix
+++ b/pkgs/development/libraries/haskell/RepLib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "RepLib";
-  version = "0.5.1";
-  sha256 = "1c6zqi87lmmmiz8amsvhw6wkhg90rhh6yl5vh0a9ism3apwh1i7r";
+  version = "0.5.2";
+  sha256 = "1wcxvl40wlnva2x7z13pm95485lwxbpy5di1mb1din3id8dprxfr";
   buildDepends = [ mtl typeEquality ];
   noHaddock = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix
index 25346362b88..543b54e599a 100644
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-enumerator";
-  version = "0.7.3";
-  sha256 = "0l7azfvibqnninbxvbvgvia53jjf2fa1mhbip8gafy53asig6d06";
+  version = "0.7.3.1";
+  sha256 = "0a4p9340g6bx3s7mj3lbkrgw3db2kxpjncbbnnpdcwqyswi2vm75";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
index 0c7f78c65c2..dff38078295 100644
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ b/pkgs/development/libraries/haskell/http-types/default.nix
@@ -2,10 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-types";
-  version = "0.6.9";
-  sha256 = "1dkp2iqqalrm381vagw65bhjnm80hv02h28447lmjl2j60b4mby0";
-  isLibrary = true;
-  isExecutable = true;
+  version = "0.6.10";
+  sha256 = "0py6l6hk14vrpqwrrajvsiasfksqsklk75sij4zx4xws01jwh9xd";
   buildDepends = [ blazeBuilder caseInsensitive text ];
   meta = {
     homepage = "https://github.com/aristidb/http-types";
diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
index 44c82a282e1..5ad27e008c8 100644
--- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix
+++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "leksah-server";
-  version = "0.12.0.4";
-  sha256 = "0lv6z2b79cxvcz5mldyicx87lp3a0xfmv0wjd0cjf954cdizccg2";
+  version = "0.12.0.5";
+  sha256 = "0kr5xsnjl0brbdysw1rhd7a1gy3i0kn8rq2c5grc2m734ankil6z";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
index 8e3698ab000..f011cc76ce5 100644
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework-quickcheck2";
-  version = "0.2.12";
-  sha256 = "08qr2lh1akjy5daxxk1sy59sg94hvv5s5njs9x6lrx648hy7y8iy";
+  version = "0.2.12.1";
+  sha256 = "03m6kf6lhi9nzymfyfqqimfgs6139bpa0pzbxzvz2nvizdnbmmcw";
   buildDepends = [
     extensibleExceptions QuickCheck random testFramework
   ];
diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
index e58da04d039..228e2c43f1f 100644
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unbound";
-  version = "0.3.1";
-  sha256 = "13k53dcap8knvl2qzcykx838laas34xfc0480705vzl1z9z1xppz";
+  version = "0.4";
+  sha256 = "0s4aybbxz5qvkf09wn65qavw10hk0rsyyc2d0ydr02rzz10vd270";
   buildDepends = [ mtl RepLib transformers ];
   noHaddock = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 8547f9fdf07..2222699c9dd 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 = "0.10.1.4";
-  sha256 = "0glyl1q5szwk1r2l2amq7w42kjl5wda33bvz64rvav1hngkpvii0";
+  version = "0.10.2";
+  sha256 = "15dswvhn9vz3bpdvbypg8x8gwhjkwj170b8mqznp10drccxyizs2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 46f9f71439963f0bddcf1a3a6ab40cecede9a1b8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2012 09:47:34 +0000
Subject: [PATCH 025/208] git: updated to version 1.7.9.4

svn path=/nixpkgs/trunk/; revision=33145
---
 .../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 62f7d6d3574..f859dcf96b0 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "1.7.9.2";
+  version = "1.7.9.4";
   svn = subversionClient.override { perlBindings = true; };
 in
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75";
+    sha256 = "c59f4c1e37a99f00022b491a6674f633a00164513efdc269e74ed20537f71c39";
   };
 
   patches = [ ./docbook2texi.patch ];

From d30947aef323bf86a60e177b9b83672b5864d967 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 11:53:50 +0000
Subject: [PATCH 026/208] Move NixosBootPkg into NixOS

svn path=/nixpkgs/trunk/; revision=33149
---
 pkgs/tools/misc/NixosBootPkg/default.nix | 29 ------------------------
 pkgs/top-level/all-packages.nix          |  2 --
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/tools/misc/NixosBootPkg/default.nix

diff --git a/pkgs/tools/misc/NixosBootPkg/default.nix b/pkgs/tools/misc/NixosBootPkg/default.nix
deleted file mode 100644
index 5bce1789a02..00000000000
--- a/pkgs/tools/misc/NixosBootPkg/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, edk2, fetchhg }:
-
-let
-
-  src = fetchhg {
-    url = https://bitbucket.org/shlevy/nixosbootpkg;
-    tag = "1ff4c2891c8c1eb03677a6f8b04b8d05807ec198";
-    sha256 = "06zwy0g9a7g2sny7phvn2z76pb3wnw4vm9vsrjjaj7f7nzcsn13k";
-  };
-
-in
-
-stdenv.mkDerivation (edk2.setup "NixosBootPkg/NixosBootPkg.dsc" {
-  name = "NixosBootPkg-2012-03-15";
-
-  unpackPhase = ''
-    ln -sv ${src} NixosBootPkg
-    ln -sv ${edk2.src}/MdePkg .
-  '';
-
-  meta = {
-    description =
-      "Simple EFI app to load the kernel with NixOS-specific arguments";
-    homepage = http://www.shealevy.com;
-    license = "MIT";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-    platforms = ["x86_64-linux" "i686-linux"];
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b89919cbfa9..8efdbcbc930 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -927,8 +927,6 @@ let
 
   ninka = callPackage ../development/tools/misc/ninka { };
 
-  NixosBootPkg = callPackage ../tools/misc/NixosBootPkg { };
-
   nodejs = callPackage ../development/web/nodejs {};
 
   ldns = callPackage ../development/libraries/ldns { };

From a3b099d27901f61e3e1c8e530b709cd213ffd4fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 12:08:41 +0000
Subject: [PATCH 027/208] * Latest 3.0.x, 3.1.x and 3.2.x kernels.

svn path=/nixpkgs/trunk/; revision=33151
---
 pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.1.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index 95b3ef16699..6624718501c 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -227,7 +227,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.0.9";
+    version = "3.0.24";
   
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -235,7 +235,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
-      sha256 = "1dcn371za577fxw64vk9ry69bihf16l1hk6rs380qnhr6msxr478";
+      sha256 = "0j783ivlgg66jvasxaapimyzaqyn61jlz4abhkynckr4h5hrpvw4";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix
index 2e48eb3e460..9321bbdd479 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix
@@ -227,7 +227,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.1.7";
+    version = "3.1.10";
 
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -235,7 +235,7 @@ import ./generic.nix (
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
-      sha256 = "1l4imli1mykcda2vvdvfr6c3h9ys9km4s0wsy778d58vcs68pc89";
+      sha256 = "1vcpbh7wnc9smw2l5ci27a5p0rgmc1a5dc6a1aljm6f6wcfic8lz";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 66643a3117e..c5d7dedb111 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -226,7 +226,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.2.7";
+    version = "3.2.11";
     testing = false;
 
     modDirVersion = version;
@@ -237,7 +237,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2";
-      sha256 = "e80009e097e137b9a1f1efacabc482c1d4b3651b238bf733a41595d0b387ae12";
+      sha256 = "1hacfmf08ydzf4xlg6wkkckl5icj7w9h3nh17myz1s67bp7q61qs";
     };
 
     config = configWithPlatform stdenv.platform;

From cc6f814a8f0e9b70ede5b24192558664fa1f98a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 16 Mar 2012 13:11:41 +0000
Subject: [PATCH 028/208] GFortran 4.6: Add patch to fix the output of `-v'.

svn path=/nixpkgs/trunk/; revision=33154
---
 .../development/compilers/gcc/4.6/default.nix |  1 +
 .../compilers/gcc/4.6/gfortran-driving.patch  | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/compilers/gcc/4.6/gfortran-driving.patch

diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index 7fd65b5fecb..bceaf2b4426 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -54,6 +54,7 @@ let version = "4.6.3";
       # target libraries and tools.
       ++ optional langAda ./gnat-cflags.patch
       ++ optional langVhdl ./ghdl-ortho-cflags.patch
+      ++ optional langFortran ./gfortran-driving.patch
       ++ optional (stdenv.isGNU || crossGNU) ./hurd-sigrtmin.patch;
 
     javaEcj = fetchurl {
diff --git a/pkgs/development/compilers/gcc/4.6/gfortran-driving.patch b/pkgs/development/compilers/gcc/4.6/gfortran-driving.patch
new file mode 100644
index 00000000000..70708886b40
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.6/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");
+     }

From a09a78165cc87732d3df4726889ac6e44cc4ea5d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 13:28:35 +0000
Subject: [PATCH 029/208] Update rubygems

svn path=/nixpkgs/trunk/; revision=33155
---
 .../interpreters/ruby/generated.nix           | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 4a1f1f36b89..57367785f9f 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -3,7 +3,7 @@
 g: # Get dependencies from patched gems
 {
   aliases = {
-    ZenTest = g.ZenTest_4_6_2;
+    ZenTest = g.ZenTest_4_7_0;
     actionmailer = g.actionmailer_3_2_2;
     actionpack = g.actionpack_3_2_2;
     activemodel = g.activemodel_3_2_2;
@@ -15,7 +15,7 @@ g: # Get dependencies from patched gems
     autotest_rails = g.autotest_rails_4_1_2;
     builder = g.builder_3_0_0;
     buildr = g.buildr_1_4_6;
-    bundler = g.bundler_1_1_0;
+    bundler = g.bundler_1_1_1;
     childprocess = g.childprocess_0_3_1;
     diff_lcs = g.diff_lcs_1_1_3;
     erubis = g.erubis_2_7_0;
@@ -27,7 +27,7 @@ g: # Get dependencies from patched gems
     journey = g.journey_1_0_3;
     json = g.json_1_6_5;
     json_pure = g.json_pure_1_6_5;
-    mail = g.mail_2_4_3;
+    mail = g.mail_2_4_4;
     mime_types = g.mime_types_1_17_2;
     minitar = g.minitar_0_5_3;
     multi_json = g.multi_json_1_1_0;
@@ -62,7 +62,7 @@ g: # Get dependencies from patched gems
   };
   gem_nix_args = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ];
   gems = {
-    ZenTest_4_6_2 = {
+    ZenTest_4_7_0 = {
       basename = ''ZenTest'';
       meta = {
         description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby'';
@@ -88,9 +88,9 @@ multiruby runs anything you want on multiple versions of ruby. Great
 for compatibility checking! Use multiruby_setup to manage your
 installed versions.'';
       };
-      name = ''ZenTest-4.6.2'';
+      name = ''ZenTest-4.7.0'';
       requiredGems = [  ];
-      sha256 = ''0knbim1lvp7q7k529if3h78584x845h9xyz08vykrdqa97x4lkh0'';
+      sha256 = ''1gvhmar81y9rqyf0vh06kxagqswkxkyys4w0s0z6hq84rb4z0v1w'';
     };
     actionmailer_3_2_2 = {
       basename = ''actionmailer'';
@@ -100,7 +100,7 @@ installed versions.'';
         longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
       };
       name = ''actionmailer-3.2.2'';
-      requiredGems = [ g.mail_2_4_3 ];
+      requiredGems = [ g.mail_2_4_4 ];
       sha256 = ''0x4308y786100146m2fx7bygp77cwzsds3cgwjjlkw9hgyapcxz0'';
     };
     actionpack_3_2_2 = {
@@ -207,7 +207,7 @@ database compatibility and query generation.'';
 rails support and extra plugins for migrations and fixtures.'';
       };
       name = ''autotest-rails-4.1.2'';
-      requiredGems = [ g.ZenTest_4_6_2 ];
+      requiredGems = [ g.ZenTest_4_7_0 ];
       sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
     };
     builder_2_1_2 = {
@@ -253,16 +253,16 @@ for those one-off tasks, with a language that's a joy to use.
       requiredGems = [ g.rake_0_8_7 g.builder_2_1_2 g.net_ssh_2_0_23 g.net_sftp_2_0_4 g.rubyzip_0_9_4 g.highline_1_5_1 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_3_3 g.atoulme_Antwrap_0_7_1 g.diff_lcs_1_1_2 g.rspec_expectations_2_1_0 g.rspec_mocks_2_1_0 g.rspec_core_2_1_0 g.rspec_2_1_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ];
       sha256 = ''11qwqrdnmzzi4zhgajfq1f1ckvd4kpfm9gyqrfjfalphs4gi0vxz'';
     };
-    bundler_1_1_0 = {
+    bundler_1_1_1 = {
       basename = ''bundler'';
       meta = {
         description = ''The best way to manage your application's dependencies'';
         homepage = ''http://gembundler.com'';
         longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
       };
-      name = ''bundler-1.1.0'';
+      name = ''bundler-1.1.1'';
       requiredGems = [  ];
-      sha256 = ''0b9s1pi7xg0sdwhvjgdwhr98h23fd3dj257gh06ldrnilvi5w1z1'';
+      sha256 = ''05cr17gzx731403fhbzv3szdfa80hghpn77ab6vi73k4177pjnzx'';
     };
     childprocess_0_3_1 = {
       basename = ''childprocess'';
@@ -456,16 +456,16 @@ See class rdoc for help. Hint: ri Hoe'';
       requiredGems = [  ];
       sha256 = ''09s5qymc4y9q0376zjiwf5bjm69fcivr75ar8ji0kmhjkk2rwc55'';
     };
-    mail_2_4_3 = {
+    mail_2_4_4 = {
       basename = ''mail'';
       meta = {
         description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.'';
         homepage = ''http://github.com/mikel/mail'';
         longDescription = ''A really Ruby Mail handler.'';
       };
-      name = ''mail-2.4.3'';
+      name = ''mail-2.4.4'';
       requiredGems = [ g.mime_types_1_17_2 g.treetop_1_4_10 ];
-      sha256 = ''1awghn40l7h6njfp6jd4qgsvd8yxvsi7s2ppz689jjj6gbjzbhn6'';
+      sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3'';
     };
     mime_types_1_17_2 = {
       basename = ''mime_types'';
@@ -635,7 +635,7 @@ request helpers feature.'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
       name = ''rails-3.2.2'';
-      requiredGems = [ g.activesupport_3_2_2 g.actionpack_3_2_2 g.activerecord_3_2_2 g.activeresource_3_2_2 g.actionmailer_3_2_2 g.railties_3_2_2 g.bundler_1_1_0 ];
+      requiredGems = [ g.activesupport_3_2_2 g.actionpack_3_2_2 g.activerecord_3_2_2 g.activeresource_3_2_2 g.actionmailer_3_2_2 g.railties_3_2_2 g.bundler_1_1_1 ];
       sha256 = ''0kwh8142zxyvrva09m5g85cmwhby714q87j1mb8s6wikv4gvfmy9'';
     };
     railties_3_2_2 = {

From b2f0319bc27714896b4a3d8ee98fad170d8c4d8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 13:55:10 +0000
Subject: [PATCH 030/208] * nfs-utils updated to 1.2.5.

svn path=/nixpkgs/trunk/; revision=33158
---
 pkgs/os-specific/linux/nfs-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index cdadcb05849..2d89d70e64a 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, tcpWrapper, utillinux, libcap }:
 
 stdenv.mkDerivation rec {
-  name = "nfs-utils-1.2.3";
+  name = "nfs-utils-1.2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/nfs/${name}.tar.bz2";
-    sha256 = "06gzb4idg6rkr4wpj7lrdmg3zdqiz86j43dygykbyz0987lyqxam";
+    sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m";
   };
 
   # Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'.

From 5f6bb1fce6783711705459b693b1d7f8f429fe8e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 14:27:58 +0000
Subject: [PATCH 031/208] Ghostscript: Fix darwin build

svn path=/nixpkgs/trunk/; revision=33160
---
 pkgs/misc/ghostscript/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index cc278d6abe5..0a028660f7f 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -79,7 +79,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional cupsSupport cups;
 
   CFLAGS = "-fPIC";
-  NIX_LDFLAGS = "-lz -rpath=${freetype}/lib";
+  NIX_LDFLAGS =
+    "-lz -rpath${ if stdenv.isDarwin then " " else "="}${freetype}/lib";
 
   patches = variant.patches ++ [ ./urw-font-files.patch ];
 

From 105ad5e50303984ef123e6b3b4b38a6f90e3ba88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 16 Mar 2012 15:32:03 +0000
Subject: [PATCH 032/208] GCC 4.7: Update.

svn path=/nixpkgs/trunk/; revision=33161
---
 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 8efdbcbc930..de0856ce81b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1923,10 +1923,10 @@ let
   }));
 
   gcc47 = lowPrio (wrapGCC (lib.overrideDerivation gcc46_debug.gcc (a: {
-    name = "gcc-debug-4.7.0rc20120302";
+    name = "gcc-debug-4.7.0rc20120314";
     src = fetchurl {
-      url = "ftp://gcc.gnu.org/pub/gcc/snapshots/4.7.0-RC-20120302/gcc-4.7.0-RC-20120302.tar.bz2";
-      sha256 = "13clix3cqf93rmkgmb9izqz0ld0h0xrgpirsjr0fs0f7c86c935l";
+      url = "ftp://gcc.gnu.org/pub/gcc/snapshots/4.7.0-RC-20120314/gcc-4.7.0-RC-20120314.tar.bz2";
+      sha256 = "0dhzmrhrzlgvsxfbjc1x98pf2y89zkw2lgijyghmxiczc5gniszp";
     };
 
     configureFlags = a.configureFlags

From eefb2b65318540804e8748bb45102432a6386757 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 16 Mar 2012 17:15:47 +0000
Subject: [PATCH 033/208] ilbc: style

svn path=/nixpkgs/trunk/; revision=33163
---
 pkgs/development/libraries/ilbc/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix
index dfa7e751099..4450c6e6ef7 100644
--- a/pkgs/development/libraries/ilbc/default.nix
+++ b/pkgs/development/libraries/ilbc/default.nix
@@ -13,14 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "0zf4mvi3jzx6zjrfl2rbhl2m68pzbzpf1vbdmn7dqbfpcb67jpdy";
   };
 
-  cmakeLists = ./CMakeLists.txt;
   buildNativeInputs = [ cmake ];
 
   unpackPhase = ''
     mkdir -v ${name}
     cd ${name}
     ${gawk}/bin/gawk -f ${script} ${rfc3951}
-    cp -v ${cmakeLists} CMakeLists.txt
+    cp -v ${./CMakeLists.txt} CMakeLists.txt
     '';
 
 }

From 75207a6a90ece8b2eac6f0a071bf2b8354151bbf Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 16 Mar 2012 17:15:52 +0000
Subject: [PATCH 034/208] Try to update slr

Still fails to build because atlas doesn't provide full blas.

svn path=/nixpkgs/trunk/; revision=33164
---
 .../science/biology/slr/default.nix            | 18 ++++++------------
 pkgs/top-level/all-packages.nix                |  4 +---
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/science/biology/slr/default.nix b/pkgs/applications/science/biology/slr/default.nix
index 629c10aecdf..7111d1a854e 100644
--- a/pkgs/applications/science/biology/slr/default.nix
+++ b/pkgs/applications/science/biology/slr/default.nix
@@ -1,22 +1,16 @@
 {stdenv, fetchurl, liblapack}:
 
 stdenv.mkDerivation {
-  name = "slr";
+  name = "slr-1.4.2";
+
   src = fetchurl {
-    url = http://www.ebi.ac.uk/goldman-srv/SLR/download/current/slr_source.tgz;
-    sha256 = "0i81fv201p187mim4zakipxnhzqdvd3p5a9qa59xznc6458r2zsn";
+    url = http://www.ebi.ac.uk/goldman-srv/SLR/download/v1.4.2/slr_source.tgz;
+    sha256 = "03ak7jsz89zism6gx8fr1dwlwjgcmnrr9m6xgqpr0xzikxid02jp";
   };
 
   buildInputs = [ liblapack ];
-  buildPhase = ''
-    cd src
-    ls
-    make -fMakefile.linux
-  '';
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -v ../Slr $out/bin 
-  '';
+  preConfigure = "mkdir bin; cd src";
+  makeFlags = "-f Makefile.linux";
 
   meta = {
     description     = "Phylogenetic Analysis by Maximum Likelihood (PAML)";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de0856ce81b..33579045b7d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8104,9 +8104,7 @@ let
 
   paml = callPackage ../applications/science/biology/paml { };
 
-  /* slr = import ../applications/science/biology/slr {
-    inherit fetchurl stdenv liblapack;
-  }; */
+  /* slr = callPackage ../applications/science/biology/slr { }; */
 
   pal2nal = callPackage ../applications/science/biology/pal2nal { };
 

From 1148fc2f76f1f3a02ee64e96a833e980b461aca3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 17:20:04 +0000
Subject: [PATCH 035/208] * Minor cleanup.

svn path=/nixpkgs/trunk/; revision=33165
---
 pkgs/servers/portmap/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix
index aaa9bb684f4..52635b5818f 100644
--- a/pkgs/servers/portmap/default.nix
+++ b/pkgs/servers/portmap/default.nix
@@ -17,15 +17,14 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags =
-   lib.concatStringsSep " "
-     (lib.optional (daemonUser != false) "RPCUSER=\"${daemonUser}\""
-      ++ lib.optional (daemonUID != false) "DAEMON_UID=${toString daemonUID}"
-      ++ lib.optional (daemonGID != false) "DAEMON_GID=${toString daemonGID}");
+    lib.optional (daemonUser != false) "RPCUSER=\"${daemonUser}\""
+    ++ lib.optional (daemonUID != false) "DAEMON_UID=${toString daemonUID}"
+    ++ lib.optional (daemonGID != false) "DAEMON_GID=${toString daemonGID}";
 
   buildInputs = [ tcpWrapper ];
 
   installPhase = ''
-    mkdir -p "$out/sbin" && ensureDir "$out/man/man8" && \
+    mkdir -p "$out/sbin" "$out/man/man8"
     make install BASEDIR=$out
   '';
 

From 0ac7828c6b36816b41f41513f8126b9f100c6eb1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 17:42:14 +0000
Subject: [PATCH 036/208] * portmap: Set SO_REUSEADDR to ensure that portmap
 can restart   properly.

svn path=/nixpkgs/trunk/; revision=33166
---
 pkgs/servers/portmap/default.nix        |  4 ++-
 pkgs/servers/portmap/reuse-socket.patch | 38 +++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/portmap/reuse-socket.patch

diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix
index 52635b5818f..d7a05261ff2 100644
--- a/pkgs/servers/portmap/default.nix
+++ b/pkgs/servers/portmap/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1pj13ll4mbfwjwpn3fbg03qq9im6v2i8fcpa3ffp4viykz9j1j02";
   };
 
-  patchPhase = ''
+  patches = [ ./reuse-socket.patch ];
+
+  postPatch = ''
     substituteInPlace "Makefile" --replace "/usr/share" "" \
       --replace "install -o root -g root" "install"
   '';
diff --git a/pkgs/servers/portmap/reuse-socket.patch b/pkgs/servers/portmap/reuse-socket.patch
new file mode 100644
index 00000000000..7d1a0ca0952
--- /dev/null
+++ b/pkgs/servers/portmap/reuse-socket.patch
@@ -0,0 +1,38 @@
+Set SO_REUSEADDR to ensure that portmap can restart properly.
+
+https://bugs.launchpad.net/ubuntu/+source/portmap/+bug/688550
+
+===================================================================
+--- portmap-6.0.0.orig/portmap.c	2011-03-16 20:43:26.000000000 +0100
++++ portmap-6.0.0/portmap.c	2011-03-17 07:30:17.000000000 +0100
+@@ -142,9 +142,9 @@
+   * loopback interface address.
+   */
+ 
++static int on = 1;
+ #ifdef LOOPBACK_SETUNSET
+ static SVCXPRT *ludpxprt, *ltcpxprt;
+-static int on = 1;
+ #ifndef INADDR_LOOPBACK
+ #define INADDR_LOOPBACK ntohl(inet_addr("127.0.0.1"))
+ #endif
+@@ -399,9 +399,7 @@
+ 		syslog(LOG_ERR, "cannot create udp socket: %m");
+ 		exit(1);
+ 	}
+-#ifdef LOOPBACK_SETUNSET
+ 	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on);
+-#endif
+ 
+ 	memset((char *) &addr, 0, sizeof(addr));
+ 	addr.sin_addr.s_addr = 0;
+@@ -434,9 +432,7 @@
+ 		syslog(LOG_ERR, "cannot create tcp socket: %m");
+ 		exit(1);
+ 	}
+-#ifdef LOOPBACK_SETUNSET
+ 	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on);
+-#endif
+ 	if (bind(sock, (struct sockaddr *)&addr, len) != 0) {
+ 		syslog(LOG_ERR, "cannot bind tcp: %m");
+ 		exit(1);

From 6b6b758745df0079eb38bc390a3b812aea345afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 16 Mar 2012 18:40:10 +0000
Subject: [PATCH 037/208] Updating mlt to 0.7.8.

kdenlive 0.8.2.1 wants mlt 0.7.8. With 0.7.6, it crashed clicking the timeline
(only with qt48).


svn path=/nixpkgs/trunk/; revision=33168
---
 pkgs/development/libraries/mlt/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 50100e3f1f3..1740de118a4 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -2,14 +2,14 @@
 libvorbis, sox}:
 
 stdenv.mkDerivation {
-  name = "mlt-0.7.6";
+  name = "mlt-0.7.8";
 
   src = fetchurl {
-    url = mirror://sourceforge/mlt/mlt-0.7.6.tar.gz;
-    sha256 = "f8ea8590417ea2b5543a495f2edc30636d3931932deee7a4e0d8516e9c2b58ae";
+    url = mirror://sourceforge/mlt/mlt-0.7.8.tar.gz;
+    sha256 = "0hvfjk0hspamym0ahi635ivx9iv3v2jy2qv15za1vmz28qkkp0wm";
   };
 
-  buildInputs = [ qt4 SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ];
+  buildInputs = [ qt4 SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox pkgconfig ];
 
   # Mostly taken from:
   # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine

From 0546a7e79ae3f5ecd8a86b4ae89aa3e80e8dc41e Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Fri, 16 Mar 2012 19:19:00 +0000
Subject: [PATCH 038/208] Updating mumble to 1.2.3 and adding pkgconfig as an
 input as it fails to build without it.

svn path=/nixpkgs/trunk/; revision=33169
---
 pkgs/applications/networking/mumble/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index e736d561cb4..de78e897575 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile,
- avahi, dbus, libcap,
+ avahi, dbus, libcap, pkgconfig,
 jackSupport ? false, 
 jackaudio ? null }:
 
 
 stdenv.mkDerivation rec {
   name = "mumble-" + version;
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/mumble/${name}.tar.gz";
-    sha256 = "1s4vlkdfmyzx7h3i4060q0sf2xywl9sm6dpjhaa150blbcylwmic";
+    sha256 = "0p4as6bcmbzkiff1gvc0f277dzbz2sfys97gcbxw7gjamqi53285";
   };
 
   patchPhase = ''
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
 
   buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi dbus
-    libcap ]
+    libcap pkgconfig ]
     ++ (stdenv.lib.optional jackSupport jackaudio);
 
   installPhase = ''

From 6b4810d310cf1fdb3fa65398d804b60b3d986622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 16 Mar 2012 19:40:36 +0000
Subject: [PATCH 039/208] Updating php 5.3 to 5.3.10

svn path=/nixpkgs/trunk/; revision=33170
---
 pkgs/development/interpreters/php/5.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index 6e4e67069b9..af550c6bc6c 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -8,7 +8,7 @@ in
 
 composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.3.6";
+  version = "5.3.10";
 
   name = "php-${version}";
 
@@ -157,7 +157,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
   src = args.fetchurl {
     url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    sha256 = "161iimjsnbvzqbf6chxv778n8qqdig2y704vrkn97vp3487qibih";
+    sha256 = "0jilzwscbcjzabzb7s2jnkcq2pjlya9a4z98gmck8r9q5fpmg49k";
     name = "php-${version}.tar.bz2";
   };
 

From ef1437585d77680a879212cb9329e3aa47a1356d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 16 Mar 2012 21:17:13 +0000
Subject: [PATCH 040/208] Adding kexectools.

svn path=/nixpkgs/trunk/; revision=33175
---
 pkgs/os-specific/linux/kexectools/default.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kexectools/default.nix

diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
new file mode 100644
index 00000000000..0feba1b1c31
--- /dev/null
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, zlib, xz}:
+
+stdenv.mkDerivation {
+  name = "kexectools-2.0.3";
+  
+  src = fetchurl {
+    url = http://horms.net/projects/kexec/kexec-tools/kexec-tools-2.0.3.tar.xz;
+    sha256 = "1ac6szvm6pdhn5b8ba5l06rx09rylsqhgv1l6wmy4b5b1hrbip52";
+  };
+
+  buildInputs = [ xz zlib ];
+  
+  meta = {
+    homepage = http://horms.net/projects/kexec/kexec-tools/;
+    description = "Tools related to the kexec linux feature";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33579045b7d..ec3ba83e592 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -915,6 +915,8 @@ let
 
   jwhois = callPackage ../tools/networking/jwhois { };
 
+  kexectools = callPackage ../os-specific/linux/kexectools { };
+
   keychain = callPackage ../tools/misc/keychain { };
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };

From 0ebb25866899963183587b28877229dd0fa14820 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 16 Mar 2012 22:22:50 +0000
Subject: [PATCH 041/208] telepathy: don't include unstable in full

svn path=/nixpkgs/trunk/; revision=33179
---
 .../networking/instant-messengers/telepathy/kde/default.nix     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
index 8b7c9ba98de..b638944d891 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
@@ -49,5 +49,5 @@ in
 pkgs // {
   inherit version;
   recurseForDerivations = true;
-  full = stdenv.lib.attrValues pkgs;
+  full = stdenv.lib.attrValues stable;
 }

From 707bf75144d6c3478f41ae071d80b5ccd1fd098c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 16 Mar 2012 22:26:26 +0000
Subject: [PATCH 042/208] mythth-0.24.2

New dependencies:
* Qt4
* Pulseaudio (optional but I've hardcoded it)
* fftw (single precision)

svn path=/nixpkgs/trunk/; revision=33180
---
 pkgs/applications/video/mythtv/builder.sh     | 25 -------
 pkgs/applications/video/mythtv/default.nix    | 40 ++++------
 pkgs/applications/video/mythtv/purity.patch   | 75 -------------------
 pkgs/applications/video/mythtv/settings.patch | 21 +++---
 4 files changed, 25 insertions(+), 136 deletions(-)
 delete mode 100644 pkgs/applications/video/mythtv/builder.sh
 delete mode 100644 pkgs/applications/video/mythtv/purity.patch

diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh
deleted file mode 100644
index 31edf87641b..00000000000
--- a/pkgs/applications/video/mythtv/builder.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-source $stdenv/setup
-
-
-# Hack - MythTV's configure searches LD_LIBRARY_PATH for its
-# dependencies.
-for i in $pkgs; do
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$i/lib
-done
-echo $LD_LIBRARY_PATH
-
-
-buildPhase() {
-    qmake mythtv.pro
-    make
-}
-
-
-postInstall() {
-    sqlDir="$out/share/mythtv/sql"
-    mkdir -p $sqlDir
-    cp -p ./database/mc.sql $sqlDir/
-}
-
-
-genericBuild
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 821c37d9c51..59a2519edb4 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -1,36 +1,22 @@
-a@{ stdenv, fetchurl, which, qt3, x11, xlibs
-, lame, zlib, mesa, alsaLib
-, freetype, perl
+{ stdenv, fetchurl, which, qt4, x11, pulseaudio, fftwSinglePrec
+, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig
+, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu
 }:
 
-let
-  qt3 = a.qt3.override { mysqlSupport = true; };
-in
+stdenv.mkDerivation rec {
+  name = "mythtv-0.24.2";
 
-stdenv.mkDerivation {
-  name = "mythtv-0.21";
-
-  builder = ./builder.sh;
-  
   src = fetchurl {
-    url = http://ftp.osuosl.org/pub/mythtv/mythtv-0.21.tar.bz2;
-    sha256 = "1r654fvklpsf6h9iqckb8fhd7abgs71lx6xh352xgz9yzjl7ia1k";
+    url = "http://ftp.osuosl.org/pub/mythtv/${name}.tar.bz2";
+    sha256 = "14mkyf2b26pc9spx6lg15mml0nqyg1r3qnq8m9dz3110h771y2db";
   };
 
-  #configureFlags = "--x11-path=/no-such-path --dvb-path=/no-such-path";
-
-  configureFlags = ''
-    --disable-joystick-menu --disable-dvb
-  '';
-
   buildInputs = [
-    freetype qt3 lame zlib x11 mesa perl alsaLib
-    xlibs.libX11 xlibs.libXv xlibs.libXrandr xlibs.libXvMC xlibs.libXmu
-    xlibs.libXinerama xlibs.libXxf86vm xlibs.libXmu
-  ];
-  
-  patches = [
-    ./settings.patch
-    ./purity.patch # don't search in /usr/include etc.
+    freetype qt4 lame zlib x11 mesa perl alsaLib pulseaudio fftwSinglePrec
+    libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu
   ];
+
+  buildNativeInputs = [ pkgconfig which ];
+
+  patches = [ ./settings.patch ];
 }
diff --git a/pkgs/applications/video/mythtv/purity.patch b/pkgs/applications/video/mythtv/purity.patch
deleted file mode 100644
index abbd1daac32..00000000000
--- a/pkgs/applications/video/mythtv/purity.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -rc mythtv-0.21-orig/configure mythtv-0.21/configure
-*** mythtv-0.21-orig/configure	2008-03-04 22:23:23.000000000 +0100
---- mythtv-0.21/configure	2008-06-23 11:00:09.000000000 +0200
-***************
-*** 1687,1693 ****
-  
-  has_library()
-  {
-!     if test -f /etc/ld.so.conf ; then
-          LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
-      else
-          LIBPATHS=''
---- 1687,1693 ----
-  
-  has_library()
-  {
-!     if false ; then
-          LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
-      else
-          LIBPATHS=''
-***************
-*** 1698,1704 ****
-      LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
-  
-      # recurse down just one level, should be enough in most cases
-!     if test -f /etc/ld.so.conf ; then
-          INCL=`cat /etc/ld.so.conf | grep -v "#" | grep  "^include"`
-          SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
-          for x in $SRCH ; do
---- 1698,1704 ----
-      LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
-  
-      # recurse down just one level, should be enough in most cases
-!     if false ; then
-          INCL=`cat /etc/ld.so.conf | grep -v "#" | grep  "^include"`
-          SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
-          for x in $SRCH ; do
-***************
-*** 1707,1713 ****
-          done
-      fi
-  
-!     LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
-  
-      HAS_IT="no"
-      for LIBPATH in $LIBPATHS ; do
---- 1707,1713 ----
-          done
-      fi
-  
-!     LIBPATHS="`echo $LIBPATHS | sed s/'\/ '/' '/g` "
-  
-      HAS_IT="no"
-      for LIBPATH in $LIBPATHS ; do
-***************
-*** 1720,1728 ****
-  
-  has_header()
-  {
-!     HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
-      INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
-!     HPATHS="$HPATHS "$(echo $INCL | sed "s/$libdir_name/include/g")
-  
-      HAS_IT="no"
-      for HPATH in $HPATHS ; do
---- 1720,1728 ----
-  
-  has_header()
-  {
-!     HPATHS=""
-      INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
-!     HPATHS="$HPATHS "$(echo $INCL | sed "s/$libdir_name\($\|[\/ ]\)/include\1/g")
-  
-      HAS_IT="no"
-      for HPATH in $HPATHS ; do
diff --git a/pkgs/applications/video/mythtv/settings.patch b/pkgs/applications/video/mythtv/settings.patch
index bd3824eba90..ec1e7009792 100644
--- a/pkgs/applications/video/mythtv/settings.patch
+++ b/pkgs/applications/video/mythtv/settings.patch
@@ -1,10 +1,13 @@
-diff -urN mythtv-0.18.1-orig/settings.pro mythtv-0.18.1/settings.pro
---- mythtv-0.18.1-orig/settings.pro	2005-10-22 15:32:48.000000000 +0200
-+++ mythtv-0.18.1/settings.pro	2005-10-22 15:35:01.000000000 +0200
-@@ -1,5 +1,6 @@
- CONFIG += $$CCONFIG
+diff --git a/Makefile b/Makefile
+index 05db819..383036d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,7 @@ i18n/Makefile: i18n/i18n.pro
+ locales/Makefile: locales/locales.pro
  
-+PREFIX = $$(out)
- isEmpty( PREFIX ) {
-     PREFIX = /usr/local
- }
+ $(addsuffix /Makefile,$(QT_SUBDIRS)): %/Makefile :
+-	cd $*; $(QMAKE) QMAKE=$(QMAKE) -o $(@F) $(<F)
++	cd $*; $(QMAKE) QMAKE=$(QMAKE) PREFIX=${PREFIX} -o $(@F) $(<F)
+ 
+ $(SUBDIRS): $(addsuffix /Makefile,$(SUBDIRS)) version.cpp
+ 	$(MAKE) -C $@

From c8900990a703c72e98cb2ec2b02b367f3135204f Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Fri, 16 Mar 2012 22:28:21 +0000
Subject: [PATCH 043/208] Updating ardour to the 2.8.12 svn tag (2.8.2 doesn't
 compile), hopefully this works although the comment from Marc Weber suggests
 that the hash will change over time. This builds for me but fails to start
 giving the following error:

raptor_new_uri_for_rdf_concept called with Raptor V1 world object
raptor_general.c:240:raptor_init: fatal error: raptor_init() failedAborted

https://qa.mandriva.com/show_bug.cgi?id=65072 looks similar, but adding liblrdf (0.4.0) as an input, doesn't help.

svn path=/nixpkgs/trunk/; revision=33181
---
 pkgs/applications/audio/ardour/default.nix | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 2a0caf93001..f60a0002b7b 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,25 +1,34 @@
-{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor
+{ stdenv, fetchsvn, scons, boost, pkgconfig, fftw, librdf_raptor
 , librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
 , libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
 , gtk, glibmm, gtkmm, libgnomecanvas, librdf, liblo, aubio
-, fftwSinglePrec, libmad }:
+, fftwSinglePrec, libmad, automake, autoconf, liblrdf, libtool }:
 
-stdenv.mkDerivation {
-  name = "ardour-2.8.2";
+stdenv.mkDerivation rec {
+  name = "ardour-${version}";
+  version = "2.8.12";
 
   # svn is the source to get official releases from their site?
   # alternative: wget  --data-urlencode 'key=7c4b2e1df903aae5ff5cc4077cda801e' http://ardour.org/downloader
   # but hash is changing ?
-  src = fetchurl {
-    url = http://mawercer.de/~nix/ardour-2.8.2.tar.bz2;
-    sha256 = "1igwv1r6rlybdac24qady5asaf34f9k7kawkkgyvsifhl984m735";
+
+  # TODO: see if this is also true when using a tag (~goibhniu)
+  src = fetchsvn {
+    url = "http://subversion.ardour.org/svn/ardour2/tags/${version}";
+    sha256 = "0d4y8bv12kb0yd2srvxn5388sa4cl5d5rk381saj9f3jgpiciyky";
   };
 
+  patchPhase = ''
+    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 = [
     scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio
     flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
     libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas librdf
-    liblo aubio fftwSinglePrec libmad
+    liblo aubio fftwSinglePrec libmad autoconf automake liblrdf libtool
   ];
 
   buildPhase = ''

From 9fd94809e532888e70c22449f9b2e8dd76ea4930 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 17 Mar 2012 09:18:06 +0000
Subject: [PATCH 044/208] notmuch-0.11.1

svn path=/nixpkgs/trunk/; revision=33184
---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 2815266f2a1..dc4fee41fa0 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-0.11";
+  name = "notmuch-0.11.1";
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "ce062b31db6868babaf3088adee95bfd1030b2691493e815da1730dd262226c0";
+    sha256 = "d9896ae295fd8e5471c49b0ba39872ccfdfc3488a8e7ba6fd68ba1686bc52706";
   };
 
   buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];

From 88e5f7e2c797308e384e1608572458f5129f87dc Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 17 Mar 2012 09:18:11 +0000
Subject: [PATCH 045/208] conkeror-1.0pre-20120316

svn path=/nixpkgs/trunk/; revision=33185
---
 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 6bca02820b4..0a370701109 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "conkeror-1.0pre-20120105";
+  name = "conkeror-1.0pre-20120316";
   
   src = fetchurl {
-    url = http://repo.or.cz/w/conkeror.git/snapshot/da0f9962eeedca9133e8b1928108594173f1769c.zip;
-    sha256 = "75176e5bb077a5ad05b82df01939edeb240e2caba9657a6e175fb3aabf23b393";
+    url = http://repo.or.cz/w/conkeror.git/snapshot/1264c0dbbefb6d671504a072d4ddb48d62ccead2.zip;
+    sha256 = "1vdxnhqjjvg9cry70byv6d3wib2p4rxhkmv7hs10pq39km1kpj7f";
   };
   
   buildInputs = [ unzip makeWrapper ];

From 1bbaec552e3e95b82bddb519c023d1fd1ca4f5e5 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 13:21:31 +0000
Subject: [PATCH 046/208] taglib-1.7.1

Release notes says that this release fixes a few security issues.

svn path=/nixpkgs/trunk/; revision=33186
---
 pkgs/development/libraries/taglib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index d0ba30fff50..8157ca269aa 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, zlib, cmake}:
 
 stdenv.mkDerivation rec {
-  name = "taglib-1.7";
+  name = "taglib-1.7.1";
   
   src = fetchurl {
-    url = "http://developer.kde.org/~wheeler/files/src/${name}.tar.gz";
-    sha256 = "0gvpmfrrh4wgdpyc14zq9mk3hivp8kbmfdxjk8bi2nf3py6zpph9";
+    url = "https://github.com/downloads/taglib/taglib/${name}.tar.gz";
+    sha256 = "1nc7zd9jxx5gw4n6zqgvjh0wxlm89ihcyyrzk2rbf15njw4lgpjj";
   };
   
   cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";

From 70139b0bbd892cecdb6ef16c8370264ca9a81d19 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2012 13:45:56 +0000
Subject: [PATCH 047/208] pkgs/development/libraries/libtirpc: removed obsolete
 copy of this library

svn path=/nixpkgs/trunk/; revision=33191
---
 .../libraries/libtirpc/default.nix            | 22 -------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/libtirpc/default.nix

diff --git a/pkgs/development/libraries/libtirpc/default.nix b/pkgs/development/libraries/libtirpc/default.nix
deleted file mode 100644
index d9678f646b8..00000000000
--- a/pkgs/development/libraries/libtirpc/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  version = "0.2.2";
-in
-stdenv.mkDerivation {
-  name = "libtirpc-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/libtirpc/libtirpc-${version}.tar.bz2";
-    sha256 = "f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705";
-  };
-
-  meta = {
-    homepage = "http://sourceforge.net/projects/libtirpc/";
-    description = "a port of Suns Transport-Independent RPC library to Linux";
-    license = stdenv.lib.licenses.bsd3;
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-  };
-}

From 0d06448ac23fcdff75d1955cc9e4e194795ff458 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Sat, 17 Mar 2012 15:03:12 +0000
Subject: [PATCH 048/208] Remove lowPrio to ocaml-3.12.1

svn path=/nixpkgs/trunk/; revision=33192
---
 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 ec3ba83e592..c233c655230 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2384,7 +2384,7 @@ let
 
   ocaml_3_10_0 = callPackage ../development/compilers/ocaml/3.10.0.nix { };
 
-  ocaml_3_12_1 = lowPrio (callPackage ../development/compilers/ocaml/3.12.1.nix { });
+  ocaml_3_12_1 = callPackage ../development/compilers/ocaml/3.12.1.nix { };
 
   metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
 

From 0e397758ee6474a63c533863d165e946388a94ad Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 15:25:00 +0000
Subject: [PATCH 049/208] dragonegg-3.0

The old version fails to build, thus I commit it instead of review request.

svn path=/nixpkgs/trunk/; revision=33193
---
 pkgs/development/compilers/llvm/dragonegg.nix | 11 +++++------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/llvm/dragonegg.nix b/pkgs/development/compilers/llvm/dragonegg.nix
index fbaa80c115d..9fd308a7e21 100644
--- a/pkgs/development/compilers/llvm/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/dragonegg.nix
@@ -1,12 +1,11 @@
-{stdenv, fetchsvn, llvm, gmp, mpfr, mpc}:
+{stdenv, fetchurl, llvm, gmp, mpfr, mpc}:
 
 stdenv.mkDerivation rec {
-  name = "dragonegg-2.7";
+  name = "dragonegg-3.0";
 
-  src = fetchsvn {
-    url = http://llvm.org/svn/llvm-project/dragonegg/branches/release_27;
-    rev = 105882;
-    sha256 = "0j0mj3zm1nd8kaj3b28b3w2dlzc1xbywq4mcdxk5nq4yds6rx5np";
+  src = fetchurl {
+    url = "http://llvm.org/releases/3.0/${name}.tar.gz";
+    sha256 = "09v8bxx676iz93qk39dc2fk52iqhqy9pnphvinmm9ch1x791zpvj";
   };
 
   # The gcc the plugin will be built for (the same used building dragonegg)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c233c655230..eb511174d83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3374,9 +3374,7 @@ let
 
   dssi = callPackage ../development/libraries/dssi {};
 
-  dragonegg = callPackage ../development/compilers/llvm/dragonegg.nix {
-    stdenv = overrideGCC stdenv gcc45;
-  };
+  dragonegg = callPackage ../development/compilers/llvm/dragonegg.nix { };
 
   eigen = callPackage ../development/libraries/eigen {};
 

From af37461b114f959102928b3510571029ccab2290 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Sat, 17 Mar 2012 16:26:20 +0000
Subject: [PATCH 050/208] Fix building of Coq and update to version 8.3pl3.

svn path=/nixpkgs/trunk/; revision=33194
---
 pkgs/applications/science/logic/coq/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 35395bd25d1..ce285418ad8 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -4,7 +4,7 @@
 {stdenv, fetchurl, ocaml, findlib, camlp5, lablgtk, ncurses}:
 
 let
-  version = "8.3pl1";
+  version = "8.3pl3";
 in
 
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";
-    sha256 = "0a791gsbf17y2wi0a376n78pxkhpl0lkzifhy5d3mx3lpn376j9s";
+    sha256 = "0ivrafwr4p8pklb9wfq3zyai19xdk05xr3q16xqk4q9pfad9w9dg";
   };
 
   buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
@@ -29,7 +29,8 @@ stdenv.mkDerivation {
 
   buildFlags = "world"; # Debug with "world VERBOSE=1";
 
-  patches = [ ./configure.patch ./coq-8.3-make-3.82-compat.patch ];
+  #patches = [ ./configure.patch ./coq-8.3-make-3.82-compat.patch ];
+  patches = [ /root/configure.patch ];
 
   postPatch = ''
     UNAME=$(type -tp uname)

From 699de0f3f9ec9e03ca2792c1667308dbf86d9f3e Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Sat, 17 Mar 2012 16:30:23 +0000
Subject: [PATCH 051/208] Fix building of Coq and update to version 8.3pl3. 
 (Forgot to save files)

svn path=/nixpkgs/trunk/; revision=33195
---
 .../science/logic/coq/configure.patch         | 1104 ++++++++++++++++-
 .../logic/coq/coq-8.3-make-3.82-compat.patch  |   84 --
 .../science/logic/coq/default.nix             |    3 +-
 3 files changed, 1099 insertions(+), 92 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/coq/coq-8.3-make-3.82-compat.patch

diff --git a/pkgs/applications/science/logic/coq/configure.patch b/pkgs/applications/science/logic/coq/configure.patch
index 3989ea5c601..431cccac4b0 100644
--- a/pkgs/applications/science/logic/coq/configure.patch
+++ b/pkgs/applications/science/logic/coq/configure.patch
@@ -1,7 +1,7 @@
-diff -Nuar coq-8.3/configure coq-8.3.nixos/configure
---- coq-8.3/configure	2010-10-14 16:02:46.000000000 +0200
-+++ coq-8.3.nixos/configure	2010-11-04 09:57:16.000000000 +0100
-@@ -394,7 +394,6 @@
+diff -Nuar coq-8.3pl3-orig/configure coq-8.3pl3/configure
+--- coq-8.3pl3-orig/configure	2011-12-19 22:57:30.000000000 +0100
++++ coq-8.3pl3/configure	2012-03-17 16:38:16.000000000 +0100
+@@ -395,7 +395,6 @@
  	 ocamlyaccexec=$CAMLBIN/ocamlyacc
  	 ocamlmktopexec=$CAMLBIN/ocamlmktop
  	 ocamlmklibexec=$CAMLBIN/ocamlmklib
@@ -9,12 +9,1104 @@ diff -Nuar coq-8.3/configure coq-8.3.nixos/configure
  esac
  
  if test ! -f "$CAMLC" ; then
-@@ -637,7 +636,7 @@
+@@ -628,7 +627,7 @@
              no)  LABLGTKLIB=+lablgtk2                   # Pour le message
                   LABLGTKINCLUDES="-I $LABLGTKLIB";;     # Pour le makefile
              yes) LABLGTKLIB="$lablgtkdir"               # Pour le message
 -                 LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile
-+                 LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile
++                 LABLGTKINCLUDES="-I $LABLGTKLIB";;     # Pour le makefile
          esac;;
      no) LABLGTKINCLUDES="";;
  esac
+diff -Nuar coq-8.3pl3-orig/configure~ coq-8.3pl3/configure~
+--- coq-8.3pl3-orig/configure~	1970-01-01 01:00:00.000000000 +0100
++++ coq-8.3pl3/configure~	2011-12-19 22:57:30.000000000 +0100
+@@ -0,0 +1,1088 @@
++#!/bin/sh
++
++##################################
++#
++#  Configuration script for Coq
++# 
++##################################
++
++VERSION=8.3pl3
++VOMAGIC=08300
++STATEMAGIC=58300
++DATE=`LANG=C date +"%B %Y"`
++
++# Create the bin/ directory if non-existent
++test -d bin || mkdir bin
++
++# a local which command for sh
++which () {
++IFS=":" # set words separator in PATH to be ':' (it allows spaces in dirnames)
++for i in $PATH; do
++  if test -z "$i"; then i=.; fi 
++  if [ -f "$i/$1" ] ; then
++	IFS=" "
++        echo "$i/$1"
++	break
++  fi
++done
++}
++
++usage () {
++    printf "Available options for configure are:\n"
++    echo "-help"
++    printf "\tDisplays this help page\n"
++    echo "-prefix <dir>"
++    printf "\tSet installation directory to <dir>\n"
++    echo "-local"
++    printf "\tSet installation directory to the current source tree\n"
++    echo "-coqrunbyteflags"
++    printf "\tSet link flags for VM-dependent bytecode (coqtop)\n"
++    echo "-coqtoolsbyteflags"
++    printf "\tSet link flags for VM-independant bytecode (coqdep, coqdoc, ...)\n"
++    echo "-custom"
++    printf "\tGenerate all bytecode executables with -custom (not recommended)\n"
++    echo "-src"
++    printf "\tSpecifies the source directory\n"
++    echo "-bindir"
++    echo "-libdir"
++    echo "-mandir"
++    echo "-docdir"
++    printf "\tSpecifies where to install bin/lib/man/doc files resp.\n"
++    echo "-emacslib"
++    echo "-emacs"
++    printf "\tSpecifies where emacs files are to be installed\n"
++    echo "-coqdocdir"
++    printf "\tSpecifies where Coqdoc style files are to be installed\n"
++    echo "-camldir"
++    printf "\tSpecifies the path to the OCaml library\n"
++    echo "-lablgtkdir"
++    printf "\tSpecifies the path to the Lablgtk library\n"
++    echo "-camlp5dir"
++    printf "\tSpecifies where to look for the Camlp5 library and tells to use it\n"
++    echo "-arch"
++    printf "\tSpecifies the architecture\n"
++    echo "-opt"
++    printf "\tSpecifies whether or not to use OCaml *.opt optimized compilers\n"
++    echo "-natdynlink (yes|no)"
++    printf "\tSpecifies whether or not to use dynamic loading of native code\n"
++    echo "-coqide (opt|byte|no)"
++    printf "\tSpecifies whether or not to compile Coqide\n"
++    echo "-browser <command>"
++    printf "\tUse <command> to open URL %%s\n"
++    echo "-with-doc (yes|no)"
++    printf "\tSpecifies whether or not to compile the documentation\n"
++    echo "-with-geoproof (yes|no)"
++    printf "\tSpecifies whether or not to use Geoproof binding\n"
++    echo "-with-cc <file>"
++    echo "-with-ar <file>"
++    echo "-with-ranlib <file>"
++    printf "\tTells configure where to find gcc/ar/ranlib executables\n"
++    echo "-byte-only"
++    printf "\tCompiles only bytecode version of Coq\n"
++    echo "-debug"
++    printf "\tAdd debugging information in the Coq executables\n"
++    echo "-profile"
++    printf "\tAdd profiling information in the Coq executables\n"
++    echo "-annotate"
++    printf "\tCompiles Coq with -dtypes option\n"
++}
++
++
++# Default OCaml binaries
++bytecamlc=ocamlc
++nativecamlc=ocamlopt
++ocamlmklibexec=ocamlmklib
++ocamlexec=ocaml
++ocamldepexec=ocamldep
++ocamldocexec=ocamldoc
++ocamllexexec=ocamllex
++ocamlyaccexec=ocamlyacc
++ocamlmktopexec=ocamlmktop
++camlp4oexec=camlp4o
++
++
++coq_debug_flag=
++coq_debug_flag_opt=
++coq_profile_flag=
++coq_annotate_flag=
++best_compiler=opt
++cflags="-fno-defer-pop -Wall -Wno-unused"
++natdynlink=yes
++
++gcc_exec=gcc
++ar_exec=ar
++ranlib_exec=ranlib
++
++local=false
++coqrunbyteflags_spec=no
++coqtoolsbyteflags_spec=no
++custom_spec=no
++src_spec=no
++prefix_spec=no
++bindir_spec=no
++libdir_spec=no
++mandir_spec=no
++docdir_spec=no
++emacslib_spec=no
++emacs_spec=no
++camldir_spec=no
++lablgtkdir_spec=no
++coqdocdir_spec=no
++arch_spec=no
++coqide_spec=no
++browser_spec=no
++wwwcoq_spec=no
++with_geoproof=false
++with_doc=all
++with_doc_spec=no
++force_caml_version=no
++force_caml_version_spec=no
++
++COQSRC=`pwd`
++
++# Parse command-line arguments
++
++while : ; do
++  case "$1" in
++    "") break;;
++    -help|--help) usage
++	          exit;;
++    -prefix|--prefix) prefix_spec=yes
++                      prefix="$2"
++		      shift;;
++    -local|--local) local=true;;
++    -coqrunbyteflags|--coqrunbyteflags) coqrunbyteflags_spec=yes
++                                        coqrunbyteflags="$2"
++                                        shift;;
++    -coqtoolsbyteflags|--coqtoolsbyteflags) coqtoolsbyteflags_spec=yes
++                                            coqtoolsbyteflags="$2"
++                                            shift;;
++    -custom|--custom) custom_spec=yes
++                      shift;;
++    -src|--src) src_spec=yes
++                COQSRC="$2"
++	        shift;;
++    -bindir|--bindir) bindir_spec=yes
++                      bindir="$2"
++		      shift;;
++    -libdir|--libdir) libdir_spec=yes
++                      libdir="$2"
++		      shift;;
++    -mandir|--mandir) mandir_spec=yes
++                      mandir="$2"
++		      shift;;
++    -docdir|--docdir) docdir_spec=yes
++                      docdir="$2"
++		      shift;;
++    -emacslib|--emacslib) emacslib_spec=yes
++                          emacslib="$2"
++			  shift;;
++    -emacs |--emacs) emacs_spec=yes
++		     emacs="$2"
++		     shift;;
++    -coqdocdir|--coqdocdir) coqdocdir_spec=yes
++	              coqdocdir="$2"
++		      shift;;
++    -camldir|--camldir) camldir_spec=yes
++	                camldir="$2"
++			shift;;
++    -lablgtkdir|--lablgtkdir) lablgtkdir_spec=yes
++	                lablgtkdir="$2"
++			shift;;
++    -camlp5dir|--camlp5dir)
++	                camlp5dir="$2"
++			shift;;
++    -arch|--arch) arch_spec=yes
++                  arch=$2
++		  shift;;
++    -opt|--opt) bytecamlc=ocamlc.opt
++                camlp4oexec=camlp4o  # can't add .opt since dyn load'll be required
++                nativecamlc=ocamlopt.opt;;
++    -natdynlink|--natdynlink) case "$2" in
++	                  yes) natdynlink=yes;;
++                          *) natdynlink=no
++                        esac
++                        shift;;
++    -coqide|--coqide) coqide_spec=yes
++		      case "$2" in
++			  byte|opt) COQIDE=$2;;
++			  *) COQIDE=no
++		      esac
++		      shift;;
++    -browser|--browser) browser_spec=yes
++		      BROWSER=$2
++		      shift;;
++    -coqwebsite|--coqwebsite) wwwcoq_spec=yes
++                      WWWCOQ=$2
++                      shift;;
++    -with-doc|--with-doc) with_doc_spec=yes
++		      case "$2" in
++			  yes|all) with_doc=all;;
++			  *) with_doc=no
++		      esac
++		      shift;;
++    -with-geoproof|--with-geoproof) 
++	  case "$2" in
++	      yes) with_geoproof=true;;
++	      no) with_geoproof=false;;
++	  esac
++	  shift;;
++    -with-cc|-with-gcc|--with-cc|--with-gcc) 
++	  gcc_spec=yes
++	  gcc_exec=$2
++	  shift;;
++    -with-ar|--with-ar) 
++	  ar_spec=yes
++	  ar_exec=$2
++	  shift;;
++    -with-ranlib|--with-ranlib) 
++	  ranlib_spec=yes
++	  ranlib_exec=$2
++	  shift;;
++    -byte-only|-byteonly|--byteonly|--byte-only) best_compiler=byte;;
++    -debug|--debug) coq_debug_flag=-g;;
++    -profile|--profile) coq_profile_flag=-p;;
++    -annotate|--annotate) coq_annotate_flag=-dtypes;;
++    -force-caml-version|--force-caml-version|-force-ocaml-version|--force-ocaml-version) 
++          force_caml_version_spec=yes
++	  force_caml_version=yes;;
++    *) echo "Unknown option \"$1\"." 1>&2; usage; exit 2;;
++  esac
++  shift
++done
++
++if [ $prefix_spec = yes -a $local = true ] ; then
++  echo "Options -prefix and -local are incompatible."
++  echo "Configure script failed!"
++  exit 1
++fi
++
++# compile date
++DATEPGM=`which date`
++case $DATEPGM in
++    "") echo "I can't find the program \"date\" in your path."
++        echo "Please give me the current date"
++	read COMPILEDATE;;
++    *)  COMPILEDATE=`date +"%h %d %Y %H:%M:%S"`;;
++esac
++
++# Architecture
++
++case $arch_spec in
++    no) 
++    # First we test if we are running a Cygwin system
++    if [ `uname -s | cut -c -6` = "CYGWIN" ] ; then
++	ARCH="win32"
++    else
++	# If not, we determine the architecture
++	if test -x /bin/arch ; then
++ 	    ARCH=`/bin/arch`
++ 	elif test -x /usr/bin/arch ; then
++ 	    ARCH=`/usr/bin/arch`
++ 	elif test -x /usr/ucb/arch ; then
++ 	    ARCH=`/usr/ucb/arch`
++ 	elif test -x /bin/uname ; then
++ 	    ARCH=`/bin/uname -s`
++ 	elif test -x /usr/bin/uname ; then
++ 	    ARCH=`/usr/bin/uname -s`
++	else
++	    echo "I can not automatically find the name of your architecture."
++	    printf "%s"\
++		"Give me a name, please [win32 for Win95, Win98 or WinNT]: "
++	    read ARCH
++	fi
++    fi;;
++    yes) ARCH=$arch
++esac
++
++# executable extension
++
++case $ARCH in
++    win32) 
++      EXE=".exe"
++      DLLEXT=".dll";;
++    *) EXE=""
++       DLLEXT=".so"
++esac
++
++# Is the source tree checked out from a recognised
++# version control system ?
++if test -e .svn/entries ; then 
++    checkedout=svn
++elif [ -d '{arch}' ]; then
++    checkedout=gnuarch
++elif [ -z "${GIT_DIR}" ] && [ -d .git ] || [ -d "${GIT_DIR}" ]; then
++    checkedout=git
++else
++    checkedout=0
++fi
++
++# make command
++
++MAKE=`which make`
++if [ "$MAKE" != "" ]; then
++  MAKEVERSION=`$MAKE -v | head -1 | cut -d" " -f3`
++  MAKEVERSIONMAJOR=`echo $MAKEVERSION | cut -d. -f1`
++  MAKEVERSIONMINOR=`echo $MAKEVERSION | cut -d. -f2`
++  if [ "$MAKEVERSIONMAJOR" -eq 3 -a "$MAKEVERSIONMINOR" -ge 81 ]; then
++      echo "You have GNU Make $MAKEVERSION. Good!"
++  else
++      OK="no"
++      if [ -x ./make ]; then
++	  MAKEVERSION=`./make -v | head -1`
++	  if [ "$MAKEVERSION" = "GNU Make 3.81" ]; then OK="yes"; fi
++      fi
++      if [ $OK = "no" ]; then
++	  echo "GNU Make >= 3.81 is needed."
++	  echo "Make 3.81 can be downloaded from ftp://ftp.gnu.org/gnu/make/make-3.81.tar.gz"
++	  echo "then locally installed on a Unix-style system by issuing:"
++	  echo "  tar xzvf make-3.81.tar.gz"
++	  echo "  cd make-3.81"
++          echo "  ./configure"
++          echo "  make"
++          echo "  mv make .."
++	  echo "  cd .."
++	  echo "Restart then the configure script and later use ./make instead of make."
++	  exit 1
++      else
++	  echo "You have locally installed GNU Make 3.81. Good!"
++      fi
++  fi
++else
++  echo "Cannot find GNU Make >= 3.81."
++fi
++
++# Browser command
++
++if [ "$browser_spec" = "no" ]; then
++    case $ARCH in
++        win32) BROWSER='C:\PROGRA~1\INTERN~1\IEXPLORE %s' ;;
++        *) BROWSER='firefox -remote "OpenURL(%s,new-tab)" || firefox %s &' ;;
++    esac
++fi
++
++if [ "$wwwcoq_spec" = "no" ]; then
++    WWWCOQ="http://coq.inria.fr/"
++fi
++
++#########################################
++# Objective Caml programs
++
++case $camldir_spec in
++    no) CAMLC=`which $bytecamlc`
++	case "$CAMLC" in
++	    "") echo "$bytecamlc is not present in your path!"
++		echo "Give me manually the path to the $bytecamlc executable [/usr/local/bin by default]: "
++		read CAMLC
++		
++		case "$CAMLC" in
++		    "") CAMLC=/usr/local/bin/$bytecamlc;;
++		    */ocamlc|*/ocamlc.opt) true;;
++		    */) CAMLC="${CAMLC}"$bytecamlc;;
++		    *) CAMLC="${CAMLC}"/$bytecamlc;;
++		esac
++	esac
++	CAMLBIN=`dirname "$CAMLC"`;;
++    yes) CAMLC=$camldir/$bytecamlc
++        
++         CAMLBIN=`dirname "$CAMLC"`
++	 bytecamlc="$CAMLC"
++	 nativecamlc=$CAMLBIN/$nativecamlc
++	 ocamlexec=$CAMLBIN/ocaml
++	 ocamldepexec=$CAMLBIN/ocamldep
++	 ocamldocexec=$CAMLBIN/ocamldoc
++	 ocamllexexec=$CAMLBIN/ocamllex
++	 ocamlyaccexec=$CAMLBIN/ocamlyacc
++	 ocamlmktopexec=$CAMLBIN/ocamlmktop
++	 ocamlmklibexec=$CAMLBIN/ocamlmklib
++	 camlp4oexec=$CAMLBIN/camlp4o
++esac
++
++if test ! -f "$CAMLC" ; then
++    echo "I can not find the executable '$CAMLC'. Have you installed it?"
++    echo "Configuration script failed!"
++    exit 1
++fi
++
++# Under Windows, OCaml only understands Windows filenames (C:\...)
++case $ARCH in
++    win32) CAMLBIN=`cygpath -m ${CAMLBIN}`;;
++esac
++
++CAMLVERSION=`"$bytecamlc" -version`
++
++case $CAMLVERSION in
++    1.*|2.*|3.00|3.01|3.02|3.03|3.03alpha|3.04|3.05beta|3.05|3.06|3.07*|3.08*|3.09*)
++	echo "Your version of Objective-Caml is $CAMLVERSION."
++	if [ "$force_caml_version" = "yes" ]; then
++	    echo "*Warning* You are compiling Coq with an outdated version of Objective-Caml."
++	else
++	    echo "          You need Objective-Caml 3.10.2 or later."
++	    echo "          Configuration script failed!"
++	    exit 1
++	fi;;
++    ?*)
++	CAMLP4COMPAT="-loc loc" 
++	echo "You have Objective-Caml $CAMLVERSION. Good!";;
++    *)
++	echo "I found the Objective-Caml compiler but cannot find its version number!"
++	echo "Is it installed properly?"
++	echo "Configuration script failed!"
++	exit 1;;
++esac
++
++CAMLTAG=OCAML`echo $CAMLVERSION | sed -e "s/\([1-9]\)\.\([0-9]*\).*/\1\2/g"`
++
++# For coqmktop & bytecode compiler
++
++case $ARCH in
++    win32) # Awfull trick to get around a ^M problem at the end of CAMLLIB
++      CAMLLIB=`"$CAMLC" -where | sed -e 's/^\(.*\)$/\1/'` ;;
++    *)
++      CAMLLIB=`"$CAMLC" -where`
++esac
++
++if [ "$coq_debug_flag" = "-g" ]; then
++    case $CAMLTAG in
++        OCAML31*)
++            # Compilation debug flag
++            coq_debug_flag_opt="-g"
++            ;;
++    esac
++fi
++
++# Native dynlink
++if [ "$natdynlink" = "yes" -a -f `"$CAMLC" -where`/dynlink.cmxa ]; then
++    HASNATDYNLINK=true
++else
++    HASNATDYNLINK=false
++fi
++
++case $HASNATDYNLINK,`uname -s`,`uname -r`,$CAMLVERSION in
++    true,Darwin,9.*,3.11.*)  # ocaml 3.11.0 dynlink on MacOS 10.5 is buggy
++        NATDYNLINKFLAG=os5fixme;;
++    #Possibly a problem on 10.6.0/10.6.1/10.6.2
++    #May just be a 32 vs 64 problem for all 10.6.*
++    true,Darwin,10.0.*,3.11.*) # Possibly a problem on 10.6.0
++        NATDYNLINKFLAG=os5fixme;;
++    true,Darwin,10.1.*,3.11.*) # Possibly a problem on 10.6.1
++        NATDYNLINKFLAG=os5fixme;;
++    true,Darwin,10.2.*,3.11.*) # Possibly a problem on 10.6.2
++        NATDYNLINKFLAG=os5fixme;;
++    true,Darwin,10.*,3.11.*)
++        if [ `getconf LONG_BIT` = "32" ]; then
++	    # Still a problem for x86_32
++            NATDYNLINKFLAG=os5fixme
++        else
++	    # Not a problem for x86_64
++            NATDYNLINKFLAG=$HASNATDYNLINK
++        fi;;
++    *)
++        NATDYNLINKFLAG=$HASNATDYNLINK;;
++esac
++
++# Camlp4 / Camlp5 configuration
++
++if [ "$camlp5dir" != "" ]; then
++    CAMLP4=camlp5
++    CAMLP4LIB=$camlp5dir
++    if [ ! -f $camlp5dir/camlp5.cma ]; then
++	echo "Cannot find camlp5 libraries in $camlp5dir (camlp5.cma not found)."
++	echo "Configuration script failed!"
++	exit 1
++    fi
++    camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'`
++else
++    case $CAMLTAG in
++        OCAML31*)
++            if [ -x "${CAMLLIB}/camlp5" ]; then
++                CAMLP4LIB=+camlp5
++            elif [ -x "${CAMLLIB}/site-lib/camlp5" ]; then
++                CAMLP4LIB=+site-lib/camlp5
++            else
++	        echo "Objective Caml $CAMLVERSION found but no Camlp5 installed."
++	        echo "Configuration script failed!"
++	        exit 1
++            fi
++            CAMLP4=camlp5
++            camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'`
++            ;;
++        *)
++            CAMLP4=camlp4
++            CAMLP4LIB=+camlp4
++            ;;
++    esac
++fi
++
++if [ "$CAMLP4" = "camlp5" ] && `$camlp4oexec -v 2>&1 | grep -q 5.00`; then
++    echo "Camlp5 version 5.00 not supported: versions 4.0x or >= 5.01 are OK"
++    echo "(depending also on your ocaml version)."
++    echo "Configuration script failed!"
++    exit 1
++fi
++
++
++case $CAMLP4LIB in
++    +*) FULLCAMLP4LIB=$CAMLLIB/`echo $CAMLP4LIB | cut -b 2-`;;
++    *)  FULLCAMLP4LIB=$CAMLP4LIB;;
++esac
++
++# Assume that camlp(4|5) binaries are at the same place as ocaml ones
++# (this should become configurable some day) 
++CAMLP4BIN=${CAMLBIN}
++
++# do we have a native compiler: test of ocamlopt and its version
++
++if [ "$best_compiler" = "opt" ] ; then
++  if test -e "$nativecamlc" || test -e "`which $nativecamlc`"; then
++      CAMLOPTVERSION=`"$nativecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
++      if [ "`uname -s`" = "Darwin" -a "$ARCH" = "i386" ]; then
++	  case $CAMLOPTVERSION in
++	      3.09.3|3.1?*) ;;
++	      *) echo "Native compilation on MacOS X Pentium requires Objective-Caml >= 3.09.3,"
++		 best_compiler=byte
++		 echo "only the bytecode version of Coq will be available."
++	  esac
++      elif [ ! -f $FULLCAMLP4LIB/gramlib.cmxa ]; then
++	  best_compiler=byte
++	  echo "Cannot find native-code $CAMLP4,"
++	  echo "only the bytecode version of Coq will be available."
++      else
++        if [ "$CAMLOPTVERSION" != "$CAMLVERSION" ] ; then
++	  echo "Native and bytecode compilers do not have the same version!"
++        fi
++        echo "You have native-code compilation. Good!"
++      fi
++  else
++      best_compiler=byte
++      echo "You have only bytecode compilation."
++  fi
++fi
++
++# OS dependent libraries
++
++case $ARCH in
++  sun4*) OS=`uname -r`
++	case $OS in
++	   5*) OS="Sun Solaris $OS"
++	       OSDEPLIBS="-cclib -lunix -cclib -lnsl -cclib -lsocket";;
++	   *) OS="Sun OS $OS"
++	      OSDEPLIBS="-cclib -lunix"
++        esac;;
++  alpha) OSDEPLIBS="-cclib -lunix";;
++  win32) OS="Win32" 
++	 OSDEPLIBS="-cclib -lunix"
++	 cflags="-mno-cygwin $cflags";;
++  *) OSDEPLIBS="-cclib -lunix"
++esac
++
++# lablgtk2 and CoqIDE
++
++# -byte-only should imply -coqide byte, unless the user decides otherwise
++
++if [ "$best_compiler" = "byte" -a "$coqide_spec" = "no" ]; then 
++    coqide_spec=yes
++    COQIDE=byte
++fi
++
++# Which coqide is asked ? which one is possible ?
++
++if [ "$coqide_spec" = "yes" -a "$COQIDE" = "no" ]; then 
++    echo "CoqIde disabled as requested."
++else
++    case $lablgtkdir_spec in
++	no) 
++	    if [ -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then
++		lablgtkdir=${CAMLLIB}/lablgtk2
++	    elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.mli" ]; then
++		lablgtkdir=${CAMLLIB}/site-lib/lablgtk2
++	    fi;;
++	yes)
++	    if [ ! -f "$lablgtkdir/glib.mli" ]; then
++		echo "Incorrect LablGtk2 library (glib.mli not found)."
++		echo "Configuration script failed!"
++		exit 1
++	    fi;;
++    esac
++    if [ "$lablgtkdir" = "" ]; then
++	echo "LablGtk2 not found: CoqIde will not be available."
++	COQIDE=no
++    elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then
++	echo "LablGtk2 found but too old: CoqIde will not be available."
++	COQIDE=no;
++    elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then 
++	echo "LablGtk2 found, bytecode CoqIde will be used as requested."
++	COQIDE=byte
++    elif [ ! -f "${CAMLLIB}/threads/threads.cmxa" ]; then 
++	echo "LablGtk2 found, no native threads: bytecode CoqIde will be available."
++	COQIDE=byte
++    else 
++	echo "LablGtk2 found, native threads: native CoqIde will be available."
++	COQIDE=opt
++    fi
++fi
++
++case $COQIDE in
++    byte|opt)
++        case $lablgtkdir_spec in
++            no)  LABLGTKLIB=+lablgtk2                   # Pour le message
++                 LABLGTKINCLUDES="-I $LABLGTKLIB";;     # Pour le makefile
++            yes) LABLGTKLIB="$lablgtkdir"               # Pour le message
++                 LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile
++        esac;;
++    no) LABLGTKINCLUDES="";;
++esac
++
++# strip command
++
++case $ARCH in
++    win32)
++	# true -> strip : it exists under cygwin !
++	STRIPCOMMAND="strip";; 
++    *)
++    if [ "$coq_profile_flag" = "-p" ] || [ "$coq_debug_flag" = "-g" ] ||
++       [ "`uname -s`" = "Darwin" -a "$HASNATDYNLINK" = "true" ]
++    then
++	STRIPCOMMAND="true"
++    else
++	STRIPCOMMAND="strip"
++    fi
++esac
++
++# mktexlsr
++#MKTEXLSR=`which mktexlsr`
++#case $MKTEXLSR in
++#    "") MKTEXLSR=true;;
++#esac
++
++# "
++### Test if documentation can be compiled (latex, hevea)
++
++if test "$with_doc" = "all" 
++then
++    for cmd in "latex" "hevea" ; do
++	if test ! -x "`which $cmd`"
++	then 
++	    echo "$cmd was not found; documentation will not be available"
++	    with_doc=no
++	    break
++	fi
++    done
++fi
++
++###########################################
++# bindir, libdir, mandir, docdir, etc.
++
++case $src_spec in
++  no) COQTOP=${COQSRC}
++esac
++
++# OCaml only understand Windows filenames (C:\...)
++case $ARCH in
++    win32) COQTOP=`cygpath -m ${COQTOP}`
++esac
++
++case $ARCH in
++  win32)
++	 bindir_def='C:\coq\bin'
++	 libdir_def='C:\coq\lib'
++	 mandir_def='C:\coq\man'
++	 docdir_def='C:\coq\doc'
++	 emacslib_def='C:\coq\emacs'
++         coqdocdir_def='C:\coq\latex';;
++  *)
++	 bindir_def=/usr/local/bin
++	 libdir_def=/usr/local/lib/coq
++	 mandir_def=/usr/local/man
++	 docdir_def=/usr/local/share/doc/coq
++	 emacslib_def=/usr/local/share/emacs/site-lisp
++         coqdocdir_def=/usr/local/share/texmf/tex/latex/misc;;
++esac
++
++emacs_def=emacs
++
++case $bindir_spec/$prefix_spec/$local in
++    yes/*/*) BINDIR=$bindir ;;
++    */yes/*) BINDIR=$prefix/bin ;;
++    */*/true) BINDIR=$COQTOP/bin ;;
++    *) printf "Where should I install the Coq binaries [$bindir_def]? "
++        read BINDIR
++	case $BINDIR in
++	    "") BINDIR=$bindir_def;;
++	    *) true;;
++	esac;;
++esac
++
++case $libdir_spec/$prefix_spec/$local in
++    yes/*/*) LIBDIR=$libdir;;
++    */yes/*)
++        case $ARCH in
++          win32) LIBDIR=$prefix ;;
++          *)  LIBDIR=$prefix/lib/coq ;;
++        esac ;;
++    */*/true) LIBDIR=$COQTOP ;;
++    *)  printf "Where should I install the Coq library [$libdir_def]? "
++        read LIBDIR
++	case $LIBDIR in
++	    "") LIBDIR=$libdir_def;;
++	    *) true;;
++	esac;;
++esac
++
++case $mandir_spec/$prefix_spec/$local in
++    yes/*/*) MANDIR=$mandir;;
++    */yes/*) MANDIR=$prefix/man ;;
++    */*/true) MANDIR=$COQTOP/man ;;
++    *)  printf "Where should I install the Coq man pages [$mandir_def]? "
++        read MANDIR
++	case $MANDIR in
++	    "") MANDIR=$mandir_def;;
++	    *) true;;
++	esac;;
++esac
++
++case $docdir_spec/$prefix_spec/$local in
++    yes/*/*) DOCDIR=$docdir; HTMLREFMANDIR=$DOCDIR/html/refman;;
++    */yes/*) DOCDIR=$prefix/share/doc/coq; HTMLREFMANDIR=$DOCDIR/html/refman;;
++    */*/true) DOCDIR=$COQTOP/doc; HTMLREFMANDIR=$DOCDIR/refman/html;;
++    *)  printf "Where should I install the Coq documentation [$docdir_def]? "
++        read DOCDIR
++	case $DOCDIR in
++	    "") DOCDIR=$docdir_def; HTMLREFMANDIR=$DOCDIR/html/refman;;
++	    *) true;;
++	esac;;
++esac
++
++case $emacslib_spec/$prefix_spec/$local in
++    yes/*/*) EMACSLIB=$emacslib;;
++    */yes/*)
++        case $ARCH in
++          win32) EMACSLIB=$prefix/emacs ;;
++          *)  EMACSLIB=$prefix/share/emacs/site-lisp ;;
++        esac ;;
++    */*/true) EMACSLIB=$COQTOP/tools/emacs ;;
++    *) printf "Where should I install the Coq Emacs mode [$emacslib_def]? "
++        read EMACSLIB
++	case $EMACSLIB in
++	    "") EMACSLIB=$emacslib_def;;
++	    *) true;;
++	esac;;
++esac
++
++case $coqdocdir_spec/$prefix_spec/$local in
++    yes/*/*) COQDOCDIR=$coqdocdir;;
++    */yes/*)
++        case $ARCH in
++          win32) COQDOCDIR=$prefix/latex ;;
++          *)  COQDOCDIR=$prefix/share/emacs/site-lisp ;;
++        esac ;;
++    */*/true) COQDOCDIR=$COQTOP/tools/coqdoc ;;
++    *) printf "Where should I install Coqdoc TeX/LaTeX files [$coqdocdir_def]? "
++        read COQDOCDIR
++	case $COQDOCDIR in
++	    "") COQDOCDIR=$coqdocdir_def;;
++	    *) true;;
++	esac;;
++esac
++
++# Determine if we enable -custom by default (Windows and MacOS)
++CUSTOM_OS=no
++if [ "$ARCH" = "win32" ] || [ "`uname -s`" = "Darwin" ]; then
++    CUSTOM_OS=yes
++fi
++
++BUILDLDPATH="# you might want to set CAML_LD_LIBRARY_PATH by hand!"
++case $coqrunbyteflags_spec/$local/$custom_spec/$CUSTOM_OS in
++    yes/*/*/*) COQRUNBYTEFLAGS="$coqrunbyteflags";;
++    */*/yes/*|*/*/*/yes) COQRUNBYTEFLAGS="-custom";;
++    */true/*/*) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$COQTOP'/kernel/byterun";;
++    *)
++        COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$LIBDIR'"
++        BUILDLDPATH="export CAML_LD_LIBRARY_PATH='$COQTOP'/kernel/byterun";;
++esac
++case $coqtoolsbyteflags_spec/$custom_spec/$CUSTOM_OS in
++    yes/*/*) COQTOOLSBYTEFLAGS="$coqtoolsbyteflags";;
++    */yes/*|*/*/yes) COQTOOLSBYTEFLAGS="-custom";;
++    *) COQTOOLSBYTEFLAGS="";;
++esac
++
++# case $emacs_spec in
++#     no) printf "Which Emacs command should I use to compile coq.el [$emacs_def]? "
++#         read EMACS
++	
++# 	case $EMACS in
++# 	    "") EMACS=$emacs_def;;
++# 	    *) true;;
++# 	esac;;
++#     yes) EMACS=$emacs;;
++# esac
++
++
++
++###########################################
++# Summary of the configuration
++
++echo ""
++echo "  Coq top directory                 : $COQTOP"
++echo "  Architecture                      : $ARCH"
++if test ! -z "$OS" ; then
++  echo "  Operating system                  : $OS"
++fi
++echo "  Coq VM bytecode link flags        : $COQRUNBYTEFLAGS"
++echo "  Coq tools bytecode link flags     : $COQTOOLSBYTEFLAGS"
++echo "  OS dependent libraries            : $OSDEPLIBS"
++echo "  Objective-Caml/Camlp4 version     : $CAMLVERSION"
++echo "  Objective-Caml/Camlp4 binaries in : $CAMLBIN"
++echo "  Objective-Caml library in         : $CAMLLIB"
++echo "  Camlp4 library in                 : $CAMLP4LIB"
++if test "$best_compiler" = opt ; then
++echo "  Native dynamic link support       : $HASNATDYNLINK"
++fi
++if test "$COQIDE" != "no"; then
++echo "  Lablgtk2 library in               : $LABLGTKLIB"
++fi
++if test "$with_doc" = "all"; then
++echo "  Documentation                     : All"
++else
++echo "  Documentation                     : None"
++fi
++echo "  CoqIde                            : $COQIDE"
++echo "  Web browser                       : $BROWSER"
++echo "  Coq web site                      : $WWWCOQ"
++echo ""
++
++echo "  Paths for true installation:"
++echo "    binaries      will be copied in $BINDIR"
++echo "    library       will be copied in $LIBDIR"
++echo "    man pages     will be copied in $MANDIR"
++echo "    documentation will be copied in $DOCDIR"
++echo "    emacs mode    will be copied in $EMACSLIB"
++echo ""
++
++##################################################
++# Building the $COQTOP/dev/ocamldebug-coq file
++##################################################
++
++OCAMLDEBUGCOQ=$COQSRC/dev/ocamldebug-coq
++
++if test "$coq_debug_flag" = "-g" ; then
++  rm -f $OCAMLDEBUGCOQ
++  sed -e "s|COQTOPDIRECTORY|$COQTOP|" \
++      -e "s|COQLIBDIRECTORY|$LIBDIR|" \
++      -e "s|CAMLBINDIRECTORY|$CAMLBIN|" \
++      -e "s|CAMLP4LIBDIRECTORY|$FULLCAMLP4LIB|"\
++      $OCAMLDEBUGCOQ.template > $OCAMLDEBUGCOQ
++  chmod a-w,a+x $OCAMLDEBUGCOQ
++fi
++
++####################################################
++# Fixing lablgtk types (before/after 2.6.0) 
++####################################################
++
++if [ ! "$COQIDE" = "no" ]; then 
++    if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then
++       if grep -q "?accepts_tab:bool" "$lablgtkdir/gText.mli" ; then
++        cp -f ide/undo_lablgtk_ge212.mli ide/undo.mli
++       else
++	cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli
++       fi
++    else
++	cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli
++    fi
++fi  
++
++##############################################
++# Creation of configuration files
++##############################################
++
++mlconfig_file="$COQSRC/config/coq_config.ml"
++config_file="$COQSRC/config/Makefile"
++config_template="$COQSRC/config/Makefile.template"
++
++
++### Warning !!
++### After this line, be careful when using variables,
++### since some of them (e.g. $COQSRC) will be escaped
++
++
++# An escaped version of a variable
++escape_var () {
++"$ocamlexec" 2>&1 1>/dev/null <<EOF
++  prerr_endline(String.escaped(Sys.getenv"$VAR"));;
++EOF
++}
++
++# Escaped version of browser command
++export BROWSER
++BROWSER=`VAR=BROWSER escape_var`
++
++# damned backslashes under M$Windows
++case $ARCH in
++    win32)
++	COQTOP=`echo $COQTOP |sed -e 's|\\\|\\\\\\\|g'`
++	BINDIR=`echo $BINDIR |sed -e 's|\\\|\\\\\\\|g'`
++	COQSRC=`cygpath -m $COQSRC |sed -e 's|\\\|\\\\\\\|g'`
++	LIBDIR=`echo $LIBDIR |sed -e 's|\\\|\\\\\\\|g'`
++	CAMLBIN=`echo $CAMLBIN |sed -e 's|\\\|\\\\\\\|g'`
++	CAMLLIB=`echo $CAMLLIB |sed -e 's|\\\|\\\\\\\|g'`
++	MANDIR=`echo $MANDIR |sed -e 's|\\\|\\\\\\\|g'`
++	DOCDIR=`echo $DOCDIR |sed -e 's|\\\|\\\\\\\|g'`
++	EMACSLIB=`echo $EMACSLIB |sed -e 's|\\\|\\\\\\\|g'`
++	COQDOCDIR=`echo $COQDOCDIR |sed -e 's|\\\|\\\\\\\|g'`
++	CAMLP4BIN=`echo $CAMLP4BIN |sed -e 's|\\\|\\\\\\\|g'`
++	CAMLP4LIB=`echo $CAMLP4LIB |sed -e 's|\\\|\\\\\\\|g'`
++	LABLGTKINCLUDES=`echo $LABLGTKINCLUDES |sed -e 's|\\\|\\\\\\\|g'`
++	COQRUNBYTEFLAGS=`echo $COQRUNBYTEFLAGS |sed -e 's|\\\|\\\\\\\|g'`
++	COQTOOLSBYTEFLAGS=`echo $COQTOOLSBYTEFLAGS |sed -e 's|\\\|\\\\\\\|g'`
++	BUILDLDPATH=`echo $BUILDLDPATH |sed -e 's|\\\|\\\\\\\|g'`
++	ocamlexec=`echo $ocamlexec |sed -e 's|\\\|\\\\\\\|g'`
++	bytecamlc=`echo $bytecamlc |sed -e 's|\\\|\\\\\\\|g'`
++	nativecamlc=`echo $nativecamlc |sed -e 's|\\\|\\\\\\\|g'`
++	ocamlmklibexec=`echo $ocamlmklibexec |sed -e 's|\\\|\\\\\\\|g'`
++	ocamldepexec=`echo $ocamldepexec |sed -e 's|\\\|\\\\\\\|g'`
++	ocamldocexec=`echo $ocamldocexec |sed -e 's|\\\|\\\\\\\|g'`
++	ocamllexexec=`echo $ocamllexexec |sed -e 's|\\\|\\\\\\\|g'`
++	ocamlyaccexec=`echo $ocamlyaccexec |sed -e 's|\\\|\\\\\\\|g'`
++	camlp4oexec=`echo $camlp4oexec |sed -e 's|\\\|\\\\\\\|g'`
++    ;;
++esac
++
++#####################################################
++# Building the $COQTOP/config/coq_config.ml file
++#####################################################
++
++rm -f "$mlconfig_file"
++cat << END_OF_COQ_CONFIG > $mlconfig_file
++(* DO NOT EDIT THIS FILE: automatically generated by ../configure *)
++
++let local = $local
++let coqrunbyteflags = "$COQRUNBYTEFLAGS"
++let coqlib = "$LIBDIR"
++let coqsrc = "$COQSRC"
++let ocaml = "$ocamlexec"
++let ocamlc = "$bytecamlc"
++let ocamlopt = "$nativecamlc"
++let ocamlmklib = "$ocamlmklibexec"
++let ocamldep = "$ocamldepexec"
++let ocamldoc = "$ocamldocexec"
++let ocamlyacc = "$ocamlyaccexec"
++let ocamllex = "$ocamllexexec"
++let camlbin = "$CAMLBIN"
++let camllib = "$CAMLLIB"
++let camlp4 = "$CAMLP4"
++let camlp4o = "$camlp4oexec"
++let camlp4bin = "$CAMLP4BIN"
++let camlp4lib = "$CAMLP4LIB"
++let camlp4compat = "$CAMLP4COMPAT"
++let coqideincl = "$LABLGTKINCLUDES"
++let cflags = "$cflags"
++let best = "$best_compiler"
++let arch = "$ARCH"
++let has_coqide = "$COQIDE"
++let has_natdynlink = $HASNATDYNLINK
++let natdynlinkflag = "$NATDYNLINKFLAG"
++let osdeplibs = "$OSDEPLIBS"
++let version = "$VERSION"
++let caml_version = "$CAMLVERSION"
++let date = "$DATE"
++let compile_date = "$COMPILEDATE"
++let vo_magic_number = $VOMAGIC
++let state_magic_number = $STATEMAGIC
++let exec_extension = "$EXE"
++let with_geoproof = ref $with_geoproof
++let browser = "$BROWSER"
++let wwwcoq = "$WWWCOQ"
++let wwwrefman = wwwcoq ^ "distrib/" ^ version ^ "/refman/"
++let wwwstdlib = wwwcoq ^ "distrib/" ^ version ^ "/stdlib/"
++let localwwwrefman = "file://$HTMLREFMANDIR/"
++
++END_OF_COQ_CONFIG
++
++# to be sure printf is found on windows when spaces occur in PATH variable
++PRINTF=`which printf`
++
++# Subdirectories of theories/ added in coq_config.ml
++subdirs () {
++    (cd $1; find * \( -name .svn -prune \) -o \( -type d -exec $PRINTF "\"%s\";\n" {} \; \) >> "$mlconfig_file")
++}
++
++echo "let theories_dirs = [" >> "$mlconfig_file"
++subdirs theories
++echo "]" >> "$mlconfig_file"
++
++echo "let plugins_dirs = [" >> "$mlconfig_file"
++subdirs plugins
++echo "]" >> "$mlconfig_file"
++
++chmod a-w "$mlconfig_file"
++
++
++###############################################
++# Building the $COQTOP/config/Makefile file
++###############################################
++
++rm -f "$config_file"
++
++sed -e "s|LOCALINSTALLATION|$local|" \
++    -e "s|XCOQRUNBYTEFLAGS|$COQRUNBYTEFLAGS|" \
++    -e "s|XCOQTOOLSBYTEFLAGS|$COQTOOLSBYTEFLAGS|" \
++    -e "s|COQSRCDIRECTORY|$COQSRC|" \
++    -e "s|COQVERSION|$VERSION|" \
++    -e "s|BINDIRDIRECTORY|$BINDIR|" \
++    -e "s|COQLIBDIRECTORY|$LIBDIR|" \
++    -e "s|BUILDLDPATH=|$BUILDLDPATH|" \
++    -e "s|MANDIRDIRECTORY|$MANDIR|" \
++    -e "s|DOCDIRDIRECTORY|$DOCDIR|" \
++    -e "s|EMACSLIBDIRECTORY|$EMACSLIB|" \
++    -e "s|EMACSCOMMAND|$EMACS|" \
++    -e "s|COQDOCDIRECTORY|$COQDOCDIR|" \
++    -e "s|MKTEXLSRCOMMAND|$MKTEXLSR|" \
++    -e "s|ARCHITECTURE|$ARCH|" \
++    -e "s|OSDEPENDENTLIBS|$OSDEPLIBS|" \
++    -e "s|OSDEPENDENTP4OPTFLAGS|$OSDEPP4OPTFLAGS|" \
++    -e "s|CAMLLIBDIRECTORY|$CAMLLIB|" \
++    -e "s|CAMLTAG|$CAMLTAG|" \
++    -e "s|CAMLP4BINDIRECTORY|$CAMLP4BIN|" \
++    -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \
++    -e "s|CAMLP4TOOL|$camlp4oexec|" \
++    -e "s|CAMLP4COMPATFLAGS|$CAMLP4COMPAT|" \
++    -e "s|LABLGTKINCLUDES|$LABLGTKINCLUDES|" \
++    -e "s|COQDEBUGFLAGOPT|$coq_debug_flag_opt|" \
++    -e "s|COQDEBUGFLAG|$coq_debug_flag|" \
++    -e "s|COQPROFILEFLAG|$coq_profile_flag|" \
++    -e "s|CAMLANNOTATEFLAG|$coq_annotate_flag|" \
++    -e "s|CCOMPILEFLAGS|$cflags|" \
++    -e "s|BESTCOMPILER|$best_compiler|" \
++    -e "s|DLLEXTENSION|$DLLEXT|" \
++    -e "s|EXECUTEEXTENSION|$EXE|" \
++    -e "s|BYTECAMLC|$bytecamlc|" \
++    -e "s|OCAMLMKLIBEXEC|$ocamlmklibexec|" \
++    -e "s|NATIVECAMLC|$nativecamlc|" \
++    -e "s|OCAMLEXEC|$ocamlexec|" \
++    -e "s|OCAMLDEPEXEC|$ocamldepexec|" \
++    -e "s|OCAMLDOCEXEC|$ocamldocexec|" \
++    -e "s|OCAMLLEXEXEC|$ocamllexexec|" \
++    -e "s|OCAMLYACCEXEC|$ocamlyaccexec|" \
++    -e "s|CAMLMKTOPEXEC|$ocamlmktopexec|" \
++    -e "s|CCEXEC|$gcc_exec|" \
++    -e "s|AREXEC|$ar_exec|" \
++    -e "s|RANLIBEXEC|$ranlib_exec|" \
++    -e "s|STRIPCOMMAND|$STRIPCOMMAND|" \
++    -e "s|COQIDEOPT|$COQIDE|" \
++    -e "s|CHECKEDOUTSOURCETREE|$checkedout|" \
++    -e "s|WITHDOCOPT|$with_doc|" \
++    -e "s|HASNATIVEDYNLINK|$NATDYNLINKFLAG|" \
++      "$config_template" > "$config_file"
++
++chmod a-w "$config_file"
++
++##################################################
++# The end
++####################################################
++
++echo "If anything in the above is wrong, please restart './configure'."
++echo
++echo "*Warning* To compile the system for a new architecture"
++echo "          don't forget to do a 'make archclean' before './configure'."
++
++# $Id: configure 14833 2011-12-19 21:57:30Z notin $
diff --git a/pkgs/applications/science/logic/coq/coq-8.3-make-3.82-compat.patch b/pkgs/applications/science/logic/coq/coq-8.3-make-3.82-compat.patch
deleted file mode 100644
index 5176aa33ec8..00000000000
--- a/pkgs/applications/science/logic/coq/coq-8.3-make-3.82-compat.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Date: Tue, 19 Oct 2010 13:22:08 +0000 (+0000)
-Subject: Fix mixed implicit and normal rules
-X-Git-Url: https://gforge.inria.fr/plugins/scmgit/cgi-bin/gitweb.cgi?p=coq%2Fcoq-svn.git;a=commitdiff_plain;h=86eb08bad450dd3fa77b11e4a34d2f493ab80d85
-
-Fix mixed implicit and normal rules
-
-This fixes build with GNU Make 3.82. See threads:
-
-  https://sympa-roc.inria.fr/wws/arc/coqdev/2010-10/msg00025.html
-  http://thread.gmane.org/gmane.comp.gnu.make.bugs/4912
-
-git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/branches/v8.3@13566 85f007b7-540e-0410-9357-904b9bb8a0f7
----
-
-diff --git a/Makefile b/Makefile
-index b1edc01..ea73c51 100644
---- a/Makefile
-+++ b/Makefile
-@@ -160,9 +160,19 @@ else
- stage1 $(STAGE1_TARGETS) : always
- 	$(call stage-template,1)
- 
-+ifneq (,$(STAGE1_IMPLICITS))
-+$(STAGE1_IMPLICITS) : always
-+	$(call stage-template,1)
-+endif
-+
- stage2 $(STAGE2_TARGETS) : stage1
- 	$(call stage-template,2)
- 
-+ifneq (,$(STAGE2_IMPLICITS))
-+$(STAGE2_IMPLICITS) : stage1
-+	$(call stage-template,2)
-+endif
-+
- # Nota:
- # - world is one of the targets in $(STAGE2_TARGETS), hence launching
- # "make" or "make world" leads to recursion into stage1 then stage2
-diff --git a/Makefile.common b/Makefile.common
-index cc38980..46bf217 100644
---- a/Makefile.common
-+++ b/Makefile.common
-@@ -365,7 +365,7 @@ DATE=$(shell LANG=C date +"%B %Y")
- 
- SOURCEDOCDIR=dev/source-doc
- 
--CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.cmi %.cma %.cmxa %.cmxs %.dep.ps %.dot
-+CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.o %.cmi %.cma %.cmxa %.a %.cmxs %.dep.ps %.dot
- 
- ### Targets forwarded by Makefile to a specific stage:
- 
-@@ -374,10 +374,12 @@ CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.cmi %.cma %.cmxa %.cmxs %.dep.ps %.dot
- STAGE1_TARGETS:= $(STAGE1) $(COQDEPBOOT) \
-   $(GENFILES) \
-   source-doc revision toplevel/mltop.byteml toplevel/mltop.optml \
--  $(STAGE1_ML4:.ml4=.ml4-preprocessed) %.o
-+  $(STAGE1_ML4:.ml4=.ml4-preprocessed)
-+
-+STAGE1_IMPLICITS:=
- 
- ifdef CM_STAGE1
-- STAGE1_TARGETS+=$(CAML_OBJECT_PATTERNS)
-+ STAGE1_IMPLICITS+=$(CAML_OBJECT_PATTERNS)
- endif
- 
- ## Enumeration of targets that require being done at stage2
-@@ -402,12 +404,13 @@ STAGE2_TARGETS:=$(COQBINARIES) lib kernel byterun library proofs tactics \
-   printers debug initplugins plugins \
-   world install coqide coqide-files coq coqlib \
-   coqlight states check init theories theories-light \
--  $(DOC_TARGETS) $(VO_TARGETS) validate \
--  %.vo %.glob states/% install-% %.ml4-preprocessed \
-+  $(DOC_TARGETS) $(VO_TARGETS) validate
-+
-+STAGE2_IMPLICITS:= %.vo %.glob states/% install-% %.ml4-preprocessed \
-   $(DOC_TARGET_PATTERNS)
- 
- ifndef CM_STAGE1
-- STAGE2_TARGETS+=$(CAML_OBJECT_PATTERNS)
-+ STAGE2_IMPLICITS+=$(CAML_OBJECT_PATTERNS)
- endif
- 
- 
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index ce285418ad8..3fef10b44fb 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -29,8 +29,7 @@ stdenv.mkDerivation {
 
   buildFlags = "world"; # Debug with "world VERBOSE=1";
 
-  #patches = [ ./configure.patch ./coq-8.3-make-3.82-compat.patch ];
-  patches = [ /root/configure.patch ];
+  patches = [ ./configure.patch ];
 
   postPatch = ''
     UNAME=$(type -tp uname)

From dba8b32385346fe696eb99e114c75a37c4ca55d3 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Sat, 17 Mar 2012 16:36:36 +0000
Subject: [PATCH 052/208] Update HOL Light to rev 128

svn path=/nixpkgs/trunk/; revision=33196
---
 pkgs/applications/science/logic/hol_light/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 88f3f788376..ac048c2dc9b 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -9,11 +9,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "hol_light-20120129";
+  name = "hol_light-20120312";
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "122";
-    sha256 = "d837ba5fe941af9595540691ba4be34e58174ba9a9c7e1ce57620e5cd4385769";
+    rev = "128";
+    sha256 = "35dc164c05b07663bf596ea9553209087c1538dea87a04c23f01d5423b23dbfe";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];

From f0925eeded71deb7ce48fcafdcba3ba5a7a014a5 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 17:12:48 +0000
Subject: [PATCH 053/208] pidgin-2.10.2

Use rec to prevent "name != src.basename" in the future.
REVIEW:6

svn path=/nixpkgs/trunk/; revision=33204
---
 .../networking/instant-messengers/pidgin/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index aad1996f023..5e85c4c26b4 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -20,11 +20,11 @@
   , libgcrypt ? null
 } :
 
-stdenv.mkDerivation {
-  name = "pidgin-2.9.0";
+stdenv.mkDerivation rec {
+  name = "pidgin-2.10.2";
   src = fetchurl {
-    url = mirror://sourceforge/pidgin/pidgin-2.10.1.tar.bz2;
-    sha256 = "2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8";
+    url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
+    sha256 = "1f1j9pr7zwpxwbv94510brh69pmwn4v3np12h75pfrnkas8d5kg5";
   };
 
   inherit nss ncurses;

From 776bedbb5fca600a20a89b1d6e02e54f11b30c63 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 17:20:30 +0000
Subject: [PATCH 054/208] Remove some files not reachable from all-packages.nix

List of removed files:
* pkgs/applications/misc/kiwixbuilder/default.nix
* pkgs/applications/misc/simgrid/default.nix
* pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
* pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
* pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch
* pkgs/development/libraries/bluez-libs/default.nix
* pkgs/development/libraries/libjingle/0.4.0.nix
* pkgs/development/perl-modules/Font-TTF/default.nix
* pkgs/tools/X11/xauth/default.nix
* pkgs/tools/security/p0f/default.nix
* pkgs/tools/security/p0f/p0f.patch

svn path=/nixpkgs/trunk/; revision=33205
---
 .../misc/kiwixbuilder/default.nix             | 28 ------
 pkgs/applications/misc/simgrid/default.nix    | 59 ------------
 .../instant-messengers/carrier/2.4.2.nix      | 54 -----------
 .../mailreaders/thunderbird/7.x.nix           | 96 -------------------
 .../thunderbird/thunderbird-build-deps.patch  | 21 ----
 .../libraries/bluez-libs/default.nix          |  9 --
 .../development/libraries/libjingle/0.4.0.nix | 10 --
 .../perl-modules/Font-TTF/default.nix         | 10 --
 pkgs/tools/X11/xauth/default.nix              | 10 --
 pkgs/tools/security/p0f/default.nix           | 13 ---
 pkgs/tools/security/p0f/p0f.patch             | 46 ---------
 11 files changed, 356 deletions(-)
 delete mode 100644 pkgs/applications/misc/kiwixbuilder/default.nix
 delete mode 100644 pkgs/applications/misc/simgrid/default.nix
 delete mode 100644 pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
 delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
 delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch
 delete mode 100644 pkgs/development/libraries/bluez-libs/default.nix
 delete mode 100644 pkgs/development/libraries/libjingle/0.4.0.nix
 delete mode 100644 pkgs/development/perl-modules/Font-TTF/default.nix
 delete mode 100644 pkgs/tools/X11/xauth/default.nix
 delete mode 100644 pkgs/tools/security/p0f/default.nix
 delete mode 100644 pkgs/tools/security/p0f/p0f.patch

diff --git a/pkgs/applications/misc/kiwixbuilder/default.nix b/pkgs/applications/misc/kiwixbuilder/default.nix
deleted file mode 100644
index cec8513e4c7..00000000000
--- a/pkgs/applications/misc/kiwixbuilder/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-args : with args; with builderDefs {src="";} null;
-	let localDefs = builderDefs (rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://downloads.sourceforge.net/kiwix/kiwixbuilder.tgz;
-			sha256 = "0qb97smw4675i3hh328a7f65payw1w71bn4d32ycdkmqk56zl4ds";
-		};
-		buildInputs = [glib zlib];
-		configureFlags = [" --prefix=$out "];
-		preConfigure = fullDepEntry (''
-			export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE' -I${glib}/include/glib-2.0/ -I${glib}/lib/glib-2.0/include/ '
-			export NIX_LDFLAGS=$NIX_LDFLAGS' -lglib-2.0 '
-			sed -e 's@/usr/local/lib/libz\.a@${zlib}/lib/libz.a@' -i configure
-		'') ["minInit" "doUnpack"];
-	}) args null; /* null is a terminator for sumArgs */
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "kiwix";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "
-		Offline Wikipedia viewer builder.
-";
-		inherit src;
-	};
-}
diff --git a/pkgs/applications/misc/simgrid/default.nix b/pkgs/applications/misc/simgrid/default.nix
deleted file mode 100644
index 45b93dab830..00000000000
--- a/pkgs/applications/misc/simgrid/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ fetchurl, stdenv, cmake, ruby }:
-
-stdenv.mkDerivation rec {
-  name = "simgrid-3.4.1";
-
-  src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/26944/${name}.tar.bz2";
-    sha256 = "acd2bb2c1abf59e9b190279b1c38582b7c1edd4b6ef4c6a9b01100740f1a6b28";
-  };
-
-  /* FIXME: Ruby currently disabled because of this:
-
-     Linking C shared library ../src/.libs/libsimgrid.so
-     ld: cannot find -lruby-1.8.7-p72
-
-   */
-  buildInputs = [ cmake /* ruby */ ];
-
-  preConfigure =
-    # Make it so that libsimgrid.so will be found when running programs from
-    # the build dir.
-    '' export LD_LIBRARY_PATH="$PWD/src/.libs"
-       export cmakeFlags="-Dprefix=$out"
-    '';
-
-  makeFlags = "VERBOSE=1";
-
-  patchPhase =
-    '' for i in "src/smpi/"*
-       do
-         sed -i "$i" -e's|/bin/bash|/bin/sh|g'
-       done
-    '';
-
-  installPhase = "make install-simgrid";
-
-  # Fixing the few tests that fail is left as an exercise to the reader.
-  doCheck = false;
-
-  meta = {
-    description = "SimGrid, a simulator for distributed applications in heterogeneous environments";
-
-    longDescription =
-      '' SimGrid is a toolkit that provides core functionalities for the
-         simulation of distributed applications in heterogeneous distributed
-         environments.  The specific goal of the project is to facilitate
-         research in the area of distributed and parallel application
-         scheduling on distributed computing platforms ranging from simple
-         network of workstations to Computational Grids.
-      '';
-
-    homepage = http://simgrid.gforge.inria.fr/;
-
-    license = "LGPLv2+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
deleted file mode 100644
index 877e71d0d00..00000000000
--- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-args : with args; 
-/*
-  arguments: all buildInputs
-  optional: purple2Source: purple-2 source - place to copy libpurple from 
-    (to use a fresher pidgin build)
-*/
-let 
-  externalPurple2 = lib.attrByPath ["purple2Source"] null args) != null; 
-in
-rec {
-  src = fetchurl {
-    url = http://downloads.sourceforge.net/funpidgin/carrier-2.4.2.tar.bz2;
-    sha256 = "176mi7gxkvvrmxsd58bi8qgkc209gpnlp21hh3j0dmb9zszyh7kp";
-  };
-
-  buildInputs = [gtkspell aspell
-    gstreamer startupnotification
-    libxml2 openssl nss
-    libXScrnSaver ncurses scrnsaverproto 
-    libX11 xproto kbproto GConf avahi
-    dbus dbus_glib glib python 
-    autoconf libtool automake];
-
-  propagatedBuildInputs = [
-    pkgconfig gtk perl perlXMLParser gettext
-  ];
-
-  configureFlags="--with-nspr-includes=${nss}/include/nspr"
-    + " --with-nspr-libs=${nss}/lib --with-nss-includes=${nss}/include/nss"
-    + " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include"
-    + " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
-
-  preBuild = fullDepEntry (''
-    export echo=echo
-  '') [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]
-    ++ (lib.optional externalPurple2 "postInstall")
-  ;
-      
-  name = "carrier-" + version;
-  meta = {
-    description = "Carrier - PidginIM GUI fork with user-friendly development model";
-    homepage = http://funpidgin.sf.net; 
-  };
-} // (if externalPurple2 then {
-  postInstall = fullDepEntry (''
-      mkdir -p $out/lib/purple-2
-      cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
-    '') ["minInit" "defEnsureDir"]; }
-  else {})
-
-
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
deleted file mode 100644
index fb84271787c..00000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL
-, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
-, libnotify, cairo, pixman, fontconfig
-
-, # If you want the resulting program to call itself "Thunderbird"
-  # instead of "Shredder", enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-
-}:
-
-let version = "7.0.1"; in
-
-stdenv.mkDerivation {
-  name = "thunderbird-${version}";
-
-  src = fetchurl {
-    url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5";
-  };
-
-  enableParallelBuilding = true;
-
-  buildInputs =
-    [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify
-      libnotify cairo pixman fontconfig yasm mesa /* nss */
-    ];
-
-  patches = [
-    # Fix weird dependencies such as a so file which depends on "-lpthread".
-    ./thunderbird-build-deps.patch
-  ];
-
-  NIX_LDFLAGS = "-lpixman-1";
-
-  configureFlags =
-    [ "--enable-application=mail"
-      "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      # "--with-system-bz2"
-      "--with-system-nspr"
-      "--enable-system-cairo"
-      "--disable-crashreporter"
-      "--disable-necko-wifi"
-      "--disable-tests"
-      "--enable-calendar"
-    ]
-    ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-  # The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
-  # prefix, and PREFIX in some places where they are not set.  In
-  # particular, there are some linker flags like
-  # `-rpath-link=$(LIBXUL_DIST)/bin'.  Since this expands to
-  # `-rpath-link=/bin', the build fails due to the purity checks in
-  # the ld wrapper.  So disable the purity check for now.
-  preBuild = "NIX_ENFORCE_PURITY=0";
-
-  # This doesn't work:
-  #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
-
-  postInstall =
-    ''
-      # Fix some references to /bin paths in the Xulrunner shell script.
-      substituteInPlace $out/lib/thunderbird-*/thunderbird \
-          --replace /bin/pwd "$(type -tP pwd)" \
-          --replace /bin/ls "$(type -tP ls)"
-
-      # 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-${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 =
-      # Official branding implies thunderbird name and logo cannot be reuse,
-      # see http://www.mozilla.org/foundation/licensing.html
-      if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
-    maintainers = with maintainers; [ pierron ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch b/pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch
deleted file mode 100644
index ac074e8c881..00000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -x _inst -x _build -x .svn -ur comm-miramar/config/rules.mk comm-miramar.after/config/rules.mk
---- comm-miramar/config/rules.mk	2011-06-24 22:13:31.000000000 +0200
-+++ comm-miramar/config/rules.mk	2011-08-15 12:27:07.305556040 +0200
-@@ -851,9 +851,13 @@
- 
- ifndef _LIBNAME_RELATIVE_PATHS
- 
--LIBS_DEPS += $(filter -l%, $(LIBS))
--HOST_LIBS_DEPS += $(filter -l%, $(HOST_LIBS))
--DSO_LDOPTS_DEPS += $(filter -l%, $(EXTRA_DSO_LDOPTS))
-+LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(LIBS))))
-+HOST_LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(HOST_LIBS))))
-+DSO_LDOPTS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(EXTRA_DSO_LDOPTS))))
-+
-+LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(LIBS)))
-+HOST_LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(HOST_LIBS)))
-+DSO_LDOPTS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(EXTRA_DSO_LDOPTS)))
- 
- _LIBDIRS = $(patsubst -L%,%,$(filter -L%, $(LIBS) $(HOST_LIBS) $(EXTRA_DSO_LDOPTS)))
- ifneq (,$(_LIBDIRS))
-Seulement dans comm-miramar.after/config: rules.mk~
diff --git a/pkgs/development/libraries/bluez-libs/default.nix b/pkgs/development/libraries/bluez-libs/default.nix
deleted file mode 100644
index 20cfa41f365..00000000000
--- a/pkgs/development/libraries/bluez-libs/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "bluez-libs-2.25";
-  src = fetchurl {
-    url = http://bluez.sf.net/download/bluez-libs-2.25.tar.gz;
-    md5 = "ebc8408c9a74c785786a2ef7185fe628";
-  };
-}
diff --git a/pkgs/development/libraries/libjingle/0.4.0.nix b/pkgs/development/libraries/libjingle/0.4.0.nix
deleted file mode 100644
index 93bacd00929..00000000000
--- a/pkgs/development/libraries/libjingle/0.4.0.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "libjingle-" + version;
-
-  src = fetchurl {
-    url = "mirror://sf/libjingle/${name}.tar.gz";
-    sha256 = "0izg1i4nmhysvkqmsl2xqp0x6lwz2jjyavvhv196hsdsr2w0iwvi";
-  };
-}
diff --git a/pkgs/development/perl-modules/Font-TTF/default.nix b/pkgs/development/perl-modules/Font-TTF/default.nix
deleted file mode 100644
index 4072079a67f..00000000000
--- a/pkgs/development/perl-modules/Font-TTF/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{fetchurl, perl}:
-
-import ../generic perl {
-  name = "perl-Font-TTF-0.43";
-  src = fetchurl {
-    url = mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.43.tar.gz;
-    sha256 = "0782mj5n5a2qbghvvr20x51llizly6q5smak98kzhgq9a7q3fg89";
-  };
-  perlPreHook = "makeMakerFlags=\"EXPATLIBPATH=$expat/lib EXPATINCPATH=$expat/include\"";
-}
diff --git a/pkgs/tools/X11/xauth/default.nix b/pkgs/tools/X11/xauth/default.nix
deleted file mode 100644
index 42e01c0aeda..00000000000
--- a/pkgs/tools/X11/xauth/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl, pkgconfig, libX11, libXau, libXext, libXmu}:
-
-stdenv.mkDerivation {
-  name = "xauth-7.0";
-  src = fetchurl {
-    url = http://nixos.org/tarballs/xauth-7.0.tar.bz2;
-    md5 = "d597005016baa8af81a5b0e38951d563";
-  };
-  buildInputs = [pkgconfig libX11 libXau libXext libXmu];
-}
diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix
deleted file mode 100644
index 22c58cdfecf..00000000000
--- a/pkgs/tools/security/p0f/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, libpcap}:
-  
-stdenv.mkDerivation {
-  name = "p0f-2.0.8";
-  
-  src = fetchurl {
-    url = http://lcamtuf.coredump.cx/p0f/p0f-2.0.8.tgz;
-    md5 = "1ccbcd8d4c95ef6dae841120d23c56a5";
-  };
-  
-  buildInputs = [libpcap];
-  patches = [./p0f.patch];
-}
diff --git a/pkgs/tools/security/p0f/p0f.patch b/pkgs/tools/security/p0f/p0f.patch
deleted file mode 100644
index e1b73fa37a0..00000000000
--- a/pkgs/tools/security/p0f/p0f.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ruN p0f/Build p0f.new/Build
---- p0f/Build	2006-03-16 08:44:34.000000000 +0100
-+++ p0f.new/Build	2007-01-13 03:26:40.000000000 +0100
-@@ -36,9 +36,9 @@
- 
- USE_BPF="pcap-bpf.h"
- 
--if [ ! -f "/usr/include/$USE_BPF" -a ! -f "/usr/local/include/$USE_BPF" ]; then
--  USE_BPF="net/bpf.h"
--fi
-+#if [ ! -f "/usr/include/$USE_BPF" -a ! -f "/usr/local/include/$USE_BPF" ]; then
-+#  USE_BPF="net/bpf.h"
-+#fi
- 
- export USE_BPF
- 
-diff -ruN p0f/mk/Linux p0f.new/mk/Linux
---- p0f/mk/Linux	2006-08-21 14:37:00.000000000 +0200
-+++ p0f.new/mk/Linux	2007-01-13 03:34:18.000000000 +0100
-@@ -11,8 +11,7 @@
- LIBS	= -lpcap
- STRIP   = strip
- CFLAGS  = -O3 -Wall -fomit-frame-pointer -funroll-loops \
--          -DUSE_BPF=\"${USE_BPF}\" \
--	  -I/usr/include/pcap -I/usr/local/include/pcap -I/usr/local/include
-+          -DUSE_BPF=\"${USE_BPF}\"
- FILE	= p0f
- TOOLS   = test/sendack test/sendack2 test/sendsyn
- 
-@@ -47,9 +46,11 @@
- 	rm -f /tmp/p0f.tgz
- 	
- install: $(FILE)
--	cp -f $(FILE) /usr/sbin/
--	cp -f p0frep /usr/sbin/
--	mkdir /etc/p0f || true
--	cp -f p0f.fp p0fa.fp p0fr.fp p0fo.fp /etc/p0f/
--	cp -f p0f.1 /usr/man/man1/ || cp -f p0f.1 /usr/local/man/man1/
-+	mkdir -p ${out}/sbin
-+	cp -f $(FILE) ${out}/sbin/
-+	cp -f p0frep ${out}/sbin/
-+	mkdir -p ${out}/etc/p0f || true
-+	cp -f p0f.fp p0fa.fp p0fr.fp p0fo.fp ${out}/etc/p0f/
-+	mkdir -p ${out}/man/man1
-+	cp -f p0f.1 ${out}/man/man1/
- 	@echo "You might want to manually install test/ tools now."

From f94501bfa29cb5ec3824687bbf8f66626d329c85 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 17:20:34 +0000
Subject: [PATCH 055/208] Remove tuxracer

"tuxracer = ..." string was commented for 3 years.

svn path=/nixpkgs/trunk/; revision=33206
---
 pkgs/games/tuxracer/default.nix | 31 -------------------------------
 pkgs/top-level/all-packages.nix |  5 -----
 2 files changed, 36 deletions(-)
 delete mode 100644 pkgs/games/tuxracer/default.nix

diff --git a/pkgs/games/tuxracer/default.nix b/pkgs/games/tuxracer/default.nix
deleted file mode 100644
index 98074c42d9b..00000000000
--- a/pkgs/games/tuxracer/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
-
-  version = a.lib.attrByPath ["version"] "0.61" a; 
-  buildInputs = with a; [
-    mesa libX11 xproto tcl freeglut
-  ];
-in
-rec {
-  src = fetchurl {
-    url = "http://downloads.sourceforge.net/tuxracer/tuxracer-${version}.tar.gz";
-    sha256 = "1zqyz4ig0kax5q30vcgbavcjw36wsyp9yjsd2dbfb3srh28d04d3";
-  };
-
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-
-  preConfigure = a.fullDepEntry (''
-    sed -e '/TCL_LIB_LIST=/atcl8.4' -i configure
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DGLX_GLXEXT_LEGACY=1"
-  '') ["minInit" "doUnpack"];
-      
-  name = "tuxracer-" + version;
-  meta = {
-    description = "TuxRacer - Tux lies on his belly and accelerates down ice slopes..";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb511174d83..608902deb1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5953,11 +5953,6 @@ let
 
   tunctl = callPackage ../os-specific/linux/tunctl { };
 
-  /*tuxracer = builderDefsPackage (import ../games/tuxracer) {
-    inherit mesa tcl freeglut;
-    inherit (xlibs) libX11 xproto;
-  };*/
-
   ubootChooser = name : if (name == "upstream") then ubootUpstream
     else if (name == "sheevaplug") then ubootSheevaplug
     else if (name == "guruplug") then ubootGuruplug

From d68c80932a71cd5e344e472a58d4ee0563ea03c7 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 17:20:39 +0000
Subject: [PATCH 056/208] Remove libjingle

It seems that every japper/jingle implementation ships a modified version of
libjingle.

svn path=/nixpkgs/trunk/; revision=33207
---
 pkgs/development/libraries/libjingle/0.3.11.nix | 12 ------------
 pkgs/top-level/all-packages.nix                 |  2 --
 2 files changed, 14 deletions(-)
 delete mode 100644 pkgs/development/libraries/libjingle/0.3.11.nix

diff --git a/pkgs/development/libraries/libjingle/0.3.11.nix b/pkgs/development/libraries/libjingle/0.3.11.nix
deleted file mode 100644
index 3fa8c99c430..00000000000
--- a/pkgs/development/libraries/libjingle/0.3.11.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, fetchurl, mediastreamer }:
-
-stdenv.mkDerivation rec {
-  name = "libjingle-0.3.11";
-  
-  src = fetchurl {
-    url = "mirror://sourceforge/tapioca-voip/${name}.tar.gz";
-    sha256 = "1x5l2jwxpkyxvnq0cagq40p6x61v23vxngnnsxr15lyh1zwzk1yj";
-  };
-
-  propagatedBuildInputs = [ mediastreamer ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 608902deb1a..9124c4ad2c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4067,8 +4067,6 @@ let
 
   libiptcdata = callPackage ../development/libraries/libiptcdata { };
 
-  libjingle = callPackage ../development/libraries/libjingle/0.3.11.nix { };
-
   libjpeg = callPackage ../development/libraries/libjpeg { };
 
   libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };

From 11410436e5bfb4d50ba1ecfa9d596c26d92721aa Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 17:35:29 +0000
Subject: [PATCH 057/208] Let hydra build kde-telepathy

svn path=/nixpkgs/trunk/; revision=33210
---
 .../networking/instant-messengers/telepathy/kde/default.nix  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
index b638944d891..3a7f2d32463 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
@@ -24,6 +24,11 @@ let
         buildNativeInputs = [ gettext pkgconfig ];
         buildInputs = [ kdelibs telepathy_qt ]
           ++ stdenv.lib.optional (name != "ktp-common-internals") common_internals;
+
+        meta = {
+          inherit (kdelibs.meta) platforms;
+          maintainers = [ stdenv.lib.maintainers.urkud ];
+        };
       }
     );
   };

From 457e59d99da6b6220616e5126898f1ccb841ab8b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2012 17:44:20 +0000
Subject: [PATCH 058/208] libtirpc: updated to version 0.2.2

svn path=/nixpkgs/trunk/; revision=33211
---
 pkgs/development/libraries/ti-rpc/default.nix | 50 +++++++++----------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index e669f8a254f..96a54a66eb2 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,44 +1,40 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-0.1.8-1";
+  name = "libtirpc-0.2.2";
 
   src = fetchurl {
-    url = "http://nfsv4.bullopensource.org/tarballs/tirpc/${name}.tar.bz2";
-    sha256 = "0jf0sj2cv1rm1dm1i226ww9h93srljf8zf0yfy9mvwxg8gqnn5fy";
+    url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
+    sha256 = "f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705";
   };
 
-  preConfigure =
-    '' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "Makefile.in"
-    '';
+  preConfigure = ''
+    sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "doc/Makefile.in"
+  '';
+
   preInstall = "mkdir -p $out/etc";
 
   doCheck = true;
 
   meta = {
+    homepage = "http://sourceforge.net/projects/libtirpc/";
     description = "The transport-independent Sun RPC implementation (TI-RPC)";
-
-    longDescription =
-      '' Currently, NFS commands use the SunRPC routines provided by the
-         glibc.  These routines do not support IPv6 addresses.  Ulrich
-         Drepper, who is the maintainer of the glibc, refuses any change in
-         the glibc concerning the RPC.  He wants the RPC to become a separate
-         library.  Other OS (NetBSD, FreeBSD, Solarix, HP-UX, AIX) have
-         migrated their SunRPC library to a TI-RPC (Transport Independent
-         RPC) implementation.  This implementation allows the support of
-         other transports than UDP and TCP over IPv4.  FreeBSD provides a
-         TI-RPC library ported from NetBSD with improvments.  This library
-         already supports IPv6.  So, the FreeBSD release 5.2.1 TI-RPC has
-         been ported to replace the SunRPC of the glibc.
-      '';
-
-    homepage = http://nfsv4.bullopensource.org/doc/tirpc_rpcbind.php;
-
-    # Free software license, see
-    # <http://www.gnu.org/licenses/license-list.html#SISSL>.
-    license = "Sun Industry Standards Source License 1.0";
+    license = stdenv.lib.license.bsd3;
+    longDescription = ''
+       Currently, NFS commands use the SunRPC routines provided by the
+       glibc.  These routines do not support IPv6 addresses.  Ulrich
+       Drepper, who is the maintainer of the glibc, refuses any change in
+       the glibc concerning the RPC.  He wants the RPC to become a separate
+       library.  Other OS (NetBSD, FreeBSD, Solarix, HP-UX, AIX) have
+       migrated their SunRPC library to a TI-RPC (Transport Independent
+       RPC) implementation.  This implementation allows the support of
+       other transports than UDP and TCP over IPv4.  FreeBSD provides a
+       TI-RPC library ported from NetBSD with improvments.  This library
+       already supports IPv6.  So, the FreeBSD release 5.2.1 TI-RPC has
+       been ported to replace the SunRPC of the glibc.
+    '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
   };
 }

From 062d0404138e6fec66e786d9111aea9a31498e4a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 20:57:24 +0000
Subject: [PATCH 059/208] Let hydra build telepathy-salut

svn path=/nixpkgs/trunk/; revision=33216
---
 .../instant-messengers/telepathy/salut/default.nix           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index 21095261b9c..a5ca302d03d 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -16,4 +16,9 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [ libxslt pkgconfig ];
 
   configureFlags = "--disable-avahi-tests";
+
+  meta = {
+    description = "Link-local XMPP connection manager for Telepathy";
+    platforms = stdenv.lib.platforms.gnu; # Random choice
+  };
 }

From 168a3d7101834d89925faee89b70ad73c67b47cf Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 20:57:28 +0000
Subject: [PATCH 060/208] Add qt4_for_skype

This build disables some optional features. I'm going to pass this to
skype_linux to reduce the size occupied by i686 packages on x86_64 system.

svn path=/nixpkgs/trunk/; revision=33217
---
 .../development/libraries/qt-4.x/4.8/default.nix | 16 +++++++++-------
 pkgs/top-level/all-packages.nix                  | 11 +++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 2c5a7814bc1..5313c8afefa 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, substituteAll
-, alsaLib, gstreamer, gst_plugins_base
 , libXrender, libXinerama, libXcursor, libXmu , libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig
 , zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig
 , libtiff, glib, icu
 , mysql, postgresql, sqlite
 , perl, coreutils, libXi
+, buildMultimedia ? true, alsaLib, gstreamer, gst_plugins_base
+, buildWebkit ? true
 , flashplayerFix ? true, gdk_pixbuf
 , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
 }:
@@ -64,24 +65,25 @@ stdenv.mkDerivation rec {
       -v -no-separate-debug-info -release -no-fast -confirm-license -opensource
 
       -opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
-      -qdbus -cups -glib -dbus-linked -openssl-linked
+      -qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked -openssl-linked
 
-      -plugin-sql-mysql -system-sqlite
+      ${if mysql != null then "-plugin" else "-no"}-sql-mysql -system-sqlite
 
       -exceptions -xmlpatterns
 
       -make libs -make tools -make translations
       -nomake demos -nomake examples -nomake docs
 
-      -no-phonon -webkit -multimedia -audio-backend
+      -no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if buildMultimedia then "" else "-no"}-multimedia -audio-backend
     '';
 
   propagatedBuildInputs =
     [ libXrender libXrandr libXinerama libXcursor libXext libXfixes
       libXv libXi libSM mesa
-      alsaLib zlib libpng openssl dbus.libs freetype fontconfig glib
-      gstreamer gst_plugins_base
-    ];
+    ] ++ (stdenv.lib.optional (buildWebkit || buildMultimedia) alsaLib)
+    ++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ]
+    ++ (stdenv.lib.optionals (buildWebkit || buildMultimedia)
+        [ gstreamer gst_plugins_base ]);
 
   # The following libraries are only used in plugins
   buildInputs = [ cups # Qt dlopen's libcups instead of linking to it
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9124c4ad2c7..b00f442e783 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4540,6 +4540,17 @@ let
     inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
   };
 
+  qt4_for_skype = qt48.override {
+    mysql = null;
+    postgresql = null;
+    libtiff = null;
+    libmng = null;
+    cups = null;
+    flashplayerFix = false;
+    gstreamer = null;
+    gst_plugins_base = null;
+  };
+
   qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
 
   quesoglc = callPackage ../development/libraries/quesoglc { };

From ec78373642c50678606d67e02a8008edebdd66a3 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 17 Mar 2012 22:03:15 +0000
Subject: [PATCH 061/208] Update jackdbus to 1.9.8

svn path=/nixpkgs/trunk/; revision=33218
---
 pkgs/misc/jackaudio/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 522da20f73c..2470915ea8e 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "jackdbus-${version}";
-  version = "1.9.7";
+  version = "1.9.8";
 
   src = fetchurl {
-    url = "http://www.grame.fr/~letz/jack-1.9.7.tar.bz2";
-    sha256 = "01gcn82bb7xnbcsd2ispbav6lwm0il4g8rs2mbaqpcrf9nnmfvq9";
+    url = "http://www.grame.fr/~letz/jack-1.9.8.tgz";
+    sha256 = "0788092zxrivcfnfg15brpjkf14x8ma8cwjz4k0b9xdxajn2wwac";
   };
 
   buildInputs = [ pkgconfig alsaLib python dbus pythonDBus expat makeWrapper ];
 
-  configurePhase = "python waf configure --prefix=$out --dbus --alsa";
+  configurePhase = "cd jack-1.9.8 && python waf configure --prefix=$out --dbus --alsa";
 
-  buildPhase = "python waf";
+  buildPhase = "python waf build";
 
   installPhase = ''
     python waf install

From 23b865d1b49347a99fc017fa54a85c48db1ea499 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 22:25:30 +0000
Subject: [PATCH 062/208] Fix evaluation

svn path=/nixpkgs/trunk/; revision=33220
---
 pkgs/development/libraries/ti-rpc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 96a54a66eb2..ae52ca3959d 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://sourceforge.net/projects/libtirpc/";
     description = "The transport-independent Sun RPC implementation (TI-RPC)";
-    license = stdenv.lib.license.bsd3;
+    license = stdenv.lib.licenses.bsd3;
     longDescription = ''
        Currently, NFS commands use the SunRPC routines provided by the
        glibc.  These routines do not support IPv6 addresses.  Ulrich

From 9365291276dd935e2228285fee4ea1609db23b76 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 18 Mar 2012 08:11:14 +0000
Subject: [PATCH 063/208] dejavu-fonts broke during the merge of
 stdenv-upgrade.

problem/fix described here:
http://comments.gmane.org/gmane.comp.fonts.dejavu/3608

svn path=/nixpkgs/trunk/; revision=33227
---
 pkgs/data/fonts/dejavu-fonts/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index 505746b3edf..75a66fc6f5f 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation {
     url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2";
     sha256 = "1h8x0bnbh9awwsxiwjpp73iczk1y4d5y0as1f4zb4pbk6l2m7v60";
   };
+  buildFlags = "full-ttf";
   preBuild = ''
     sed -e s@/usr/bin/env@$(type -tP env)@ -i scripts/*
     sed -e s@/usr/bin/perl@$(type -tP perl)@ -i scripts/*

From 54a5f7f328e9c1ba59f54f55321aa5f1d4c21b64 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 18 Mar 2012 08:11:17 +0000
Subject: [PATCH 064/208] gtypist, typing tutor

Now all I need is time to practise :)

svn path=/nixpkgs/trunk/; revision=33228
---
 pkgs/games/gtypist/default.nix  | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/games/gtypist/default.nix

diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix
new file mode 100644
index 00000000000..8fd2e28e77b
--- /dev/null
+++ b/pkgs/games/gtypist/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, ncurses}:
+
+stdenv.mkDerivation {
+  name = "gtypist-2.9.1";
+
+  src = fetchurl {
+    url = "ftp://ftp.gnu.org/gnu/gtypist/gtypist-2.9.1.tar.xz";
+    sha256 = "1yv209aih1ixbs477vzzk1xj013g6w32vi33g0hldfzvfxbl9y5s";
+  };
+
+  buildInputs = [ncurses];
+
+  patches = [ (fetchurl {
+    url = "http://projects.archlinux.org/svntogit/community.git/plain/trunk/ncurses.patch?h=packages/gtypist";
+    sha256 = "1chdr4xkm140cjwv1n3ydk04qdwgycd12d9adz2sjc58lybqp7sy";
+  })];
+
+  meta = {
+    homepage = http://www.gnu.org/software/gtypist;
+    description = "GNU Typist (also called gtypist) is a universal typing tutor.";
+    license = stdenv.lib.licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b00f442e783..dd13ca0a81b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7703,6 +7703,8 @@ let
     inherit (gnome) gnomedocutils;
   };
 
+  gtypist = callPackage ../games/gtypist { };
+
   hexen = callPackage ../games/hexen { };
 
   icbm3d = callPackage ../games/icbm3d { };

From 5475f367a56913973fce0335593bc403d7791803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 18 Mar 2012 09:24:42 +0000
Subject: [PATCH 065/208] Adding patch for grip (sent by Ilja Honkonen).

I reworked the spacing.


svn path=/nixpkgs/trunk/; revision=33229
---
 pkgs/applications/misc/grip/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index 02fac4d4214..1eb9ee1186f 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
-, curl, cdparanoia, libid3tag, ncurses }:
+, curl, cdparanoia, libid3tag, ncurses, libtool }:
 
 stdenv.mkDerivation {
   name = "grip-3.2.0";
@@ -9,7 +9,8 @@ stdenv.mkDerivation {
     sha256 = "1jh5x35rq15n8ivlp9wbdx8x9mj6agf5rfdv8sd6gai851zsclas";
   };
 
-  buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ncurses ];
+  buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia
+    libid3tag ncurses libtool ];
 
   meta = {
     description = "GTK+-based audio CD player/ripper";

From 969b9478a2e08323494c0fdfa7c6b33f33cfe45b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 18 Mar 2012 10:29:14 +0000
Subject: [PATCH 066/208] Updating samba to 3.6.3. I take out the overcome
 readlink.patch.

svn path=/nixpkgs/trunk/; revision=33231
---
 pkgs/servers/samba/default.nix    |   8 +-
 pkgs/servers/samba/readlink.patch | 217 ------------------------------
 2 files changed, 3 insertions(+), 222 deletions(-)
 delete mode 100644 pkgs/servers/samba/readlink.patch

diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 037fa14491c..6d34d1f64f5 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -18,17 +18,15 @@
 assert useKerberos -> kerberos != null;
 
 stdenv.mkDerivation rec {
-  name = "samba-3.6.1";
+  name = "samba-3.6.3";
 
   src = fetchurl {
     url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";
-    sha256 = "0r6mbghja357xhpada5djg0gpczi50f18ap53hdn8b7y0amz5c65";
+    sha256 = "0x30qv5y5m5cip077k44gf2khl0hk0s5hpy98ywmqkay5ngl1qk7";
   };
 
   patches =
-    [ # Fix for https://bugzilla.samba.org/show_bug.cgi?id=8541.
-      ./readlink.patch
-
+    [
       # Allow cross-builds for GNU/Hurd.
       ./libnss-wins-pthread.patch
     ];
diff --git a/pkgs/servers/samba/readlink.patch b/pkgs/servers/samba/readlink.patch
deleted file mode 100644
index 84c0e021b1c..00000000000
--- a/pkgs/servers/samba/readlink.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff --git a/source3/include/smb.h b/source3/include/smb.h
-index 3a64af7..549ebb2 100644
---- a/source3/include/smb.h
-+++ b/source3/include/smb.h
-@@ -1714,6 +1714,7 @@ struct smb_file_time {
- #define UCF_ALWAYS_ALLOW_WCARD_LCOMP	0x00000002
- #define UCF_COND_ALLOW_WCARD_LCOMP	0x00000004
- #define UCF_POSIX_PATHNAMES		0x00000008
-+#define UCF_UNIX_NAME_LOOKUP		0x00000010
- 
- /*
-  * smb_filename
-diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
-index 25301e6..b2ed239 100644
---- a/source3/smbd/filename.c
-+++ b/source3/smbd/filename.c
-@@ -383,7 +383,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
- 
- 	if((!conn->case_sensitive || !(conn->fs_capabilities &
- 				       FILE_CASE_SENSITIVE_SEARCH)) &&
--	    stat_cache_lookup(conn, &smb_fname->base_name, &dirpath, &start,
-+	    stat_cache_lookup(conn, posix_pathnames, &smb_fname->base_name, &dirpath, &start,
- 			      &smb_fname->st)) {
- 		goto done;
- 	}
-@@ -977,26 +977,39 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
- }
- 
- /****************************************************************************
-- Check a filename - possibly calling check_reduced_name.
-- This is called by every routine before it allows an operation on a filename.
-- It does any final confirmation necessary to ensure that the filename is
-- a valid one for the user to access.
-+ Ensure a path is not vetod.
- ****************************************************************************/
- 
--NTSTATUS check_name(connection_struct *conn, const char *name)
-+NTSTATUS check_veto_path(connection_struct *conn, const char *name)
- {
- 	if (IS_VETO_PATH(conn, name))  {
- 		/* Is it not dot or dot dot. */
--		if (!((name[0] == '.') && (!name[1] ||
--					(name[1] == '.' && !name[2])))) {
--			DEBUG(5,("check_name: file path name %s vetoed\n",
-+		if (!(ISDOT(name) || ISDOTDOT(name))) {
-+			DEBUG(5,("check_veto_path: file path name %s vetoed\n",
- 						name));
- 			return map_nt_error_from_unix(ENOENT);
- 		}
- 	}
-+	return NT_STATUS_OK;
-+}
-+
-+/****************************************************************************
-+ Check a filename - possibly calling check_reduced_name.
-+ This is called by every routine before it allows an operation on a filename.
-+ It does any final confirmation necessary to ensure that the filename is
-+ a valid one for the user to access.
-+****************************************************************************/
-+
-+NTSTATUS check_name(connection_struct *conn, const char *name)
-+{
-+	NTSTATUS status = check_veto_path(conn, name);
-+
-+	if (!NT_STATUS_IS_OK(status)) {
-+		return status;
-+	}
- 
- 	if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
--		NTSTATUS status = check_reduced_name(conn,name);
-+		status = check_reduced_name(conn,name);
- 		if (!NT_STATUS_IS_OK(status)) {
- 			DEBUG(5,("check_name: name %s failed with %s\n",name,
- 						nt_errstr(status)));
-@@ -1314,6 +1327,12 @@ NTSTATUS filename_convert(TALLOC_CTX *ctx,
- 		return status;
- 	}
- 
-+	if ((ucf_flags & UCF_UNIX_NAME_LOOKUP) &&
-+			VALID_STAT((*pp_smb_fname)->st) &&
-+			S_ISLNK((*pp_smb_fname)->st.st_ex_mode)) {
-+		return check_veto_path(conn, (*pp_smb_fname)->base_name);
-+	}
-+
- 	status = check_name(conn, (*pp_smb_fname)->base_name);
- 	if (!NT_STATUS_IS_OK(status)) {
- 		DEBUG(3,("filename_convert: check_name failed "
-diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
-index c455ffe..02b5e40 100644
---- a/source3/smbd/proto.h
-+++ b/source3/smbd/proto.h
-@@ -336,6 +336,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
- 		      const char *orig_path,
- 		      struct smb_filename **smb_fname,
- 		      uint32_t ucf_flags);
-+NTSTATUS check_veto_path(connection_struct *conn, const char *name);
- NTSTATUS check_name(connection_struct *conn, const char *name);
- int get_real_filename(connection_struct *conn, const char *path,
- 		      const char *name, TALLOC_CTX *mem_ctx,
-@@ -1037,6 +1038,7 @@ void stat_cache_add( const char *full_orig_name,
- 		char *translated_path,
- 		bool case_sensitive);
- bool stat_cache_lookup(connection_struct *conn,
-+			bool posix_paths,
- 			char **pp_name,
- 			char **pp_dirpath,
- 			char **pp_start,
-diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
-index e2ccc74..e910982 100644
---- a/source3/smbd/statcache.c
-+++ b/source3/smbd/statcache.c
-@@ -150,6 +150,7 @@ void stat_cache_add( const char *full_orig_name,
-  * Look through the stat cache for an entry
-  *
-  * @param conn    A connection struct to do the stat() with.
-+ * @param posix_paths Whether to lookup using stat() or lstat()
-  * @param name    The path we are attempting to cache, modified by this routine
-  *                to be correct as far as the cache can tell us. We assume that
-  *		  it is a talloc'ed string from top of stack, we free it if
-@@ -166,6 +167,7 @@ void stat_cache_add( const char *full_orig_name,
-  */
- 
- bool stat_cache_lookup(connection_struct *conn,
-+			bool posix_paths,
- 			char **pp_name,
- 			char **pp_dirpath,
- 			char **pp_start,
-@@ -181,6 +183,7 @@ bool stat_cache_lookup(connection_struct *conn,
- 	char *name;
- 	TALLOC_CTX *ctx = talloc_tos();
- 	struct smb_filename smb_fname;
-+	int ret;
- 
- 	*pp_dirpath = NULL;
- 	*pp_start = *pp_name;
-@@ -283,7 +286,13 @@ bool stat_cache_lookup(connection_struct *conn,
- 	ZERO_STRUCT(smb_fname);
- 	smb_fname.base_name = translated_path;
- 
--	if (SMB_VFS_STAT(conn, &smb_fname) != 0) {
-+	if (posix_paths) {
-+		ret = SMB_VFS_LSTAT(conn, &smb_fname);
-+	} else {
-+		ret = SMB_VFS_STAT(conn, &smb_fname);
-+	}
-+
-+	if (ret != 0) {
- 		/* Discard this entry - it doesn't exist in the filesystem. */
- 		memcache_delete(smbd_memcache(), STAT_CACHE,
- 				data_blob_const(chk_name, strlen(chk_name)));
-diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
-index 0931fff..129ab01 100644
---- a/source3/smbd/trans2.c
-+++ b/source3/smbd/trans2.c
-@@ -2271,6 +2271,7 @@ static void call_trans2findfirst(connection_struct *conn,
- 	TALLOC_CTX *ctx = talloc_tos();
- 	struct dptr_struct *dirptr = NULL;
- 	struct smbd_server_connection *sconn = req->sconn;
-+	uint32_t ucf_flags = (UCF_SAVE_LCOMP | UCF_ALWAYS_ALLOW_WCARD_LCOMP);
- 
- 	if (total_params < 13) {
- 		reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-@@ -2314,6 +2315,7 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
- 				reply_nterror(req, NT_STATUS_INVALID_LEVEL);
- 				goto out;
- 			}
-+			ucf_flags |= UCF_UNIX_NAME_LOOKUP;
- 			break;
- 		default:
- 			reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-@@ -2331,8 +2333,7 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
- 	ntstatus = filename_convert(ctx, conn,
- 				    req->flags2 & FLAGS2_DFS_PATHNAMES,
- 				    directory,
--				    (UCF_SAVE_LCOMP |
--					UCF_ALWAYS_ALLOW_WCARD_LCOMP),
-+				    ucf_flags,
- 				    &mask_contains_wcard,
- 				    &smb_dname);
- 	if (!NT_STATUS_IS_OK(ntstatus)) {
-@@ -5103,6 +5104,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
- 	} else {
- 		uint32_t name_hash;
- 		char *fname = NULL;
-+		uint32_t ucf_flags = 0;
- 
- 		/* qpathinfo */
- 		if (total_params < 7) {
-@@ -5114,9 +5116,16 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
- 
- 		DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
- 
--		if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
--			reply_nterror(req, NT_STATUS_INVALID_LEVEL);
--			return;
-+		if (INFO_LEVEL_IS_UNIX(info_level)) {
-+			if (!lp_unix_extensions()) {
-+				reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-+				return;
-+			}
-+			if (info_level == SMB_QUERY_FILE_UNIX_BASIC ||
-+					info_level == SMB_QUERY_FILE_UNIX_INFO2 ||
-+					info_level == SMB_QUERY_FILE_UNIX_LINK) {
-+				ucf_flags |= UCF_UNIX_NAME_LOOKUP;
-+			}
- 		}
- 
- 		srvstr_get_path(req, params, req->flags2, &fname, &params[6],
-@@ -5131,7 +5140,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
- 					conn,
- 					req->flags2 & FLAGS2_DFS_PATHNAMES,
- 					fname,
--					0,
-+					ucf_flags,
- 					NULL,
- 					&smb_fname);
- 		if (!NT_STATUS_IS_OK(status)) {

From b4955eea6529233083d6dbbed4417f2b40dd0365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 18 Mar 2012 10:31:15 +0000
Subject: [PATCH 067/208] Adding qemu 1.0.1.

svn path=/nixpkgs/trunk/; revision=33232
---
 pkgs/applications/virtualization/qemu/1.0.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/virtualization/qemu/1.0.nix

diff --git a/pkgs/applications/virtualization/qemu/1.0.nix b/pkgs/applications/virtualization/qemu/1.0.nix
new file mode 100644
index 00000000000..daa0b74ee32
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/1.0.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "qemu-1.0.1";
+
+  src = fetchurl {
+    url = "http://wiki.qemu.org/download/${name}.tar.gz";
+    sha256 = "0y43v5ls3j7iqczfswxkksiqww77nllydncygih7ylc20zhh528r";
+  };
+
+  buildInputs = [ python zlib pkgconfig glib SDL ncurses ];
+
+  meta = {
+    description = "QEmu processor emulator";
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd13ca0a81b..e834006bbcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7182,6 +7182,8 @@ let
 
   qemu = callPackage ../applications/virtualization/qemu/0.15.nix { };
 
+  qemu_1_0 = callPackage ../applications/virtualization/qemu/1.0.nix { };
+
   qemu_0_13 = callPackage ../applications/virtualization/qemu/0.13.nix { };
 
   qemuSVN = callPackage ../applications/virtualization/qemu/svn-6642.nix { };

From a544da22fcccecfe1ba888004a15ce3454eee464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 18 Mar 2012 11:45:53 +0000
Subject: [PATCH 068/208] Adding latencytop.

svn path=/nixpkgs/trunk/; revision=33233
---
 pkgs/os-specific/linux/latencytop/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/os-specific/linux/latencytop/default.nix

diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix
new file mode 100644
index 00000000000..d5c857cf4c9
--- /dev/null
+++ b/pkgs/os-specific/linux/latencytop/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, ncurses, glib, pkgconfig, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "latencytop-0.5";
+
+  patchPhase = "sed -i s,/usr,$out, Makefile";
+  preInstall = "mkdir -p $out/sbin";
+
+  src = fetchurl {
+    urls = [ "http://latencytop.org/download/${name}.tar.gz"
+     "http://dbg.download.sourcemage.org/mirror/latencytop-0.5.tar.gz" ];
+    sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy";
+  };
+
+  buildInputs = [ ncurses glib pkgconfig gtk ];
+
+  meta = {
+    homepage = http://latencytop.org;
+    description = "Tool to show kernel reports on latencies (LATENCYTOP option)";
+    licence = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e834006bbcb..b663ad01ca9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5428,6 +5428,8 @@ let
 
   kbd = callPackage ../os-specific/linux/kbd { };
 
+  latencytop = callPackage ../os-specific/linux/latencytop { };
+
   libaio = callPackage ../os-specific/linux/libaio { };
 
   libatasmart = callPackage ../os-specific/linux/libatasmart { };

From dfcd4dd5596b476faf94f457b92cb585490bf8d5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 18 Mar 2012 17:14:52 +0000
Subject: [PATCH 069/208] Add a kernel patch for the efi boot stub to read a
 config file when booted without arguments, and base removable media booting
 off of that patch

The patch is currently being discussed on LKML and hopefully will be included
in mainline in some form in the future. Note that booting from the livecd has
to do a lot of work before anything is output to the console, so if the drive
is still busy don't assume the boot has hanged

svn path=/nixpkgs/trunk/; revision=33235
---
 .../kernel/efi-bootstub-config-3.3.patch      | 226 ++++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix     |   5 +
 pkgs/top-level/all-packages.nix               |   1 +
 3 files changed, 232 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/efi-bootstub-config-3.3.patch

diff --git a/pkgs/os-specific/linux/kernel/efi-bootstub-config-3.3.patch b/pkgs/os-specific/linux/kernel/efi-bootstub-config-3.3.patch
new file mode 100644
index 00000000000..7481bd0cb73
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/efi-bootstub-config-3.3.patch
@@ -0,0 +1,226 @@
+From 2c12b0f49831d2d96b6bdcef931794178312c288 Mon Sep 17 00:00:00 2001
+From: Shea Levy <shea@shealevy.com>
+Date: Sun, 18 Mar 2012 16:17:04 +0100
+Subject: [PATCH 1/1] x86, efi: EFI boot stub config file support
+
+When booting via the EFI boot stub, search for a file named 'linux.conf' in
+the same directory as the bzImage and read the kernel command line from it
+when no load options are passed.
+
+The file search should only be triggered when the bzImage is loaded from the
+firmware's boot process. When loaded via an EFI shell, the load options always
+contain at least one character, even if no parameters were passed at the
+prompt.
+
+Signed-off-by: Shea Levy <shea@shealevy.com>
+---
+ arch/x86/boot/compressed/eboot.c |  146 ++++++++++++++++++++++++++++++++++++--
+ arch/x86/boot/compressed/eboot.h |    2 +
+ 2 files changed, 143 insertions(+), 5 deletions(-)
+
+diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
+index fec216f..672ecfe 100644
+--- a/arch/x86/boot/compressed/eboot.c
++++ b/arch/x86/boot/compressed/eboot.c
+@@ -486,14 +486,14 @@ struct initrd {
+  * kernel image.
+  */
+ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
+-				    struct setup_header *hdr)
++				    struct setup_header *hdr,
++				    efi_file_handle_t *fh)
+ {
+ 	struct initrd *initrds;
+ 	unsigned long initrd_addr;
+ 	efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID;
+ 	u64 initrd_total;
+ 	efi_file_io_interface_t *io;
+-	efi_file_handle_t *fh;
+ 	efi_status_t status;
+ 	int nr_initrds;
+ 	char *str;
+@@ -568,7 +568,7 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
+ 		*p = '\0';
+ 
+ 		/* Only open the volume once. */
+-		if (!i) {
++		if (!fh) {
+ 			efi_boot_services_t *boottime;
+ 
+ 			boottime = sys_table->boottime;
+@@ -712,6 +712,7 @@ static efi_status_t make_boot_params(struct boot_params *boot_params,
+ 	u16 *s2;
+ 	u8 *s1;
+ 	int i;
++	efi_file_handle_t *fh = NULL;
+ 
+ 	hdr->type_of_loader = 0x21;
+ 
+@@ -743,14 +744,149 @@ static efi_status_t make_boot_params(struct boot_params *boot_params,
+ 
+ 			*s1 = '\0';
+ 		}
+-	}
++	} else {
++		efi_char16_t config_file_name[
++			sizeof CONFIG_FILE_NAME * sizeof(efi_char16_t)];
++		u16 *file_path = (u16 *)image->file_path;
++		efi_char16_t config_path[256], *config_path_position;
++		efi_boot_services_t *boottime;
++		efi_file_info_t *info;
++		unsigned long info_sz = 0;
++		u64 file_sz;
++		efi_guid_t info_guid = EFI_FILE_INFO_ID;
++		efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID;
++		efi_file_io_interface_t *io;
++		efi_file_handle_t *h;
++
++		boottime = sys_table->boottime;
++
++		config_path_position = config_path;
++
++		for (i = 0; i < sizeof CONFIG_FILE_NAME; i++)
++			config_file_name[i] = CONFIG_FILE_NAME[i];
++
++		while (*file_path == 0x404) {
++			u16 node_size = *(file_path + 1)/sizeof *file_path;
++
++			if (config_path_position - config_path) {
++				if (*(file_path + 2) == '\\' &&
++						*(file_path - 2) == '\\') {
++					config_path_position--;
++				} else if (*(file_path + 2) != '\\' &&
++						*(file_path - 2) != '\\') {
++					*config_path_position++ = '\\';
++				}
++			}
++
++			if ((config_path_position - config_path) + node_size - 3
++					+ sizeof config_file_name
++					/ sizeof *config_file_name
++					> sizeof config_path
++					/ sizeof *config_path)
++				goto end;
++
++			memcpy((void *)config_path_position, file_path + 2,
++					(node_size - 3) * sizeof *config_path);
+ 
++			config_path_position += node_size - 3;
++			file_path += node_size;
++		}
++
++		while (*config_path_position != '\\' && config_path_position !=
++				config_path)
++			config_path_position--;
++
++		*config_path_position = '\\';
++
++		memcpy((void *)(config_path_position + 1),
++				config_file_name,
++				sizeof config_file_name);
++
++		status = efi_call_phys3(boottime->handle_protocol,
++				image->device_handle, &fs_proto, &io);
++
++		if (status != EFI_SUCCESS)
++			goto end;
++
++		status = efi_call_phys2(io->open_volume, io, &fh);
++
++		if (status != EFI_SUCCESS) {
++			fh = NULL;
++			goto end;
++		}
++
++		status = efi_call_phys5(fh->open,
++				fh,
++				&h,
++				config_path,
++				EFI_FILE_MODE_READ, (u64)0);
++
++		if (status != EFI_SUCCESS)
++			goto end;
++
++		status = efi_call_phys4(h->get_info, h, &info_guid,
++					&info_sz, NULL);
++
++		if (status != EFI_BUFFER_TOO_SMALL)
++			goto close_config_file;
++
++		while (status == EFI_BUFFER_TOO_SMALL) {
++			status = efi_call_phys3(boottime->allocate_pool,
++					EFI_LOADER_DATA, info_sz, &info);
++
++			if (status != EFI_SUCCESS)
++				goto close_config_file;
++
++			status = efi_call_phys4(h->get_info, h, &info_guid,
++						&info_sz, info);
++
++			if (status == EFI_BUFFER_TOO_SMALL)
++				efi_call_phys1(boottime->free_pool, info);
++		}
++
++		if (status != EFI_SUCCESS)
++			goto free_config_file_info;
++
++		file_sz = info->file_size;
++
++		if (file_sz > hdr->cmdline_size)
++			file_sz = hdr->cmdline_size;
++
++		options_size = file_sz + 1;
++
++		status = low_alloc(options_size, 1, &cmdline);
++
++		if (status != EFI_SUCCESS)
++			goto free_config_file_info;
++
++		status = efi_call_phys3(h->read, h, &file_sz, cmdline);
++
++		if (status != EFI_SUCCESS)
++			goto free_config_file_cmdline;
++
++		*((u8 *)cmdline + file_sz) = 0;
++
++		goto free_config_file_info;
++free_config_file_cmdline:
++		low_free(options_size, cmdline);
++		cmdline = 0;
++		options_size = 0;
++free_config_file_info:
++		efi_call_phys1(boottime->free_pool, info);
++close_config_file:
++		efi_call_phys1(h->close, h);
++	}
++end:
+ 	hdr->cmd_line_ptr = cmdline;
+ 
+ 	hdr->ramdisk_image = 0;
+ 	hdr->ramdisk_size = 0;
+ 
+-	status = handle_ramdisks(image, hdr);
++	status = handle_ramdisks(image, hdr, fh);
++
++	if (fh)
++		efi_call_phys1(fh->close, fh);
++
+ 	if (status != EFI_SUCCESS)
+ 		goto free_cmdline;
+ 
+diff --git a/arch/x86/boot/compressed/eboot.h b/arch/x86/boot/compressed/eboot.h
+index 3925166..186b4c6 100644
+--- a/arch/x86/boot/compressed/eboot.h
++++ b/arch/x86/boot/compressed/eboot.h
+@@ -20,6 +20,8 @@
+ #define PIXEL_BLT_ONLY					3
+ #define PIXEL_FORMAT_MAX				4
+ 
++#define CONFIG_FILE_NAME "linux.conf"
++
+ struct efi_pixel_bitmask {
+ 	u32 red_mask;
+ 	u32 green_mask;
+-- 
+1.7.9.4
+
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index df153d01548..75f6473b57b 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -334,6 +334,11 @@ rec {
       patch = ./sheevaplug_modules-2.6.35.patch;
     };
 
+  efi_bootstub_config_3_3 =
+    { name = "efi-config-3.3";
+      patch = ./efi-bootstub-config-3.3.patch;
+    };
+
   mips_restart_2_6_36 =
     { name = "mips_restart_2_6_36";
       patch = ./mips_restart.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b663ad01ca9..363f85834fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5638,6 +5638,7 @@ let
       [ #kernelPatches.fbcondecor_2_6_38
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs3_3
+        kernelPatches.efi_bootstub_config_3_3
         #kernelPatches.mips_restart_2_6_36
       ];
   };

From 5521faad6520f65ac77cff59e9b499b207d40e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 18 Mar 2012 18:33:10 +0000
Subject: [PATCH 070/208] Updating socat. I thought it could have improvements
 in performance for nixos build-vm in my computer, but does not.

svn path=/nixpkgs/trunk/; revision=33239
---
 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 754aabe3a87..7028c3bf605 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.1.2";
+  name = "socat-1.7.2.0";
   
   src = fetchurl {
     url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
-    sha256 = "0rz12l36id4sfzbr2mpral1ddcqgm71al0snh14smg8l94amnfgp";
+    sha256 = "00hq0ia1fs4sy0qpavzlpf4qmnhh2ybq5is2kqzvqky14zlvvcsr";
   };
 
   buildInputs = [ openssl ];

From 1824f424b298bddb9b5982070370423edd6051eb Mon Sep 17 00:00:00 2001
From: Piotr Pietraszkiewicz <ppietrasa@googlemail.com>
Date: Sun, 18 Mar 2012 22:51:17 +0000
Subject: [PATCH 071/208] Made sword build again by tuning the configureFlags:
 - to ignore warnings about unused variables - not to build the tests (the
 warnings in tests looked serious at first   glance) Additionally disabled
 debug because I hit no problems at runtime so far

svn path=/nixpkgs/trunk/; revision=33243
---
 pkgs/development/libraries/sword/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index a3684194c0f..3486981463f 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     patchShebangs .;
   '';
 
-  configureFlags = "--without-conf --enable-debug";
+  configureFlags = "--without-conf --enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable";
 
   meta = {
     description = "A software framework that allows research manipulation of Biblical texts";

From d329b66b7336cac791837f4baeb510c6848c6b57 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 18 Mar 2012 23:13:41 +0000
Subject: [PATCH 072/208] bbswitch: use the modDirVersion instead of version

svn path=/nixpkgs/trunk/; revision=33244
---
 pkgs/os-specific/linux/bbswitch/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index 7c5752b4e34..8b4350fdb13 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -15,15 +15,14 @@ stdenv.mkDerivation {
   };
 
   preBuild = ''
-    kernelVersion=$(cd ${kernel}/lib/modules && ls)
     substituteInPlace Makefile \
-      --replace "\$(shell uname -r)" "${kernel.version}" \
+      --replace "\$(shell uname -r)" "${kernel.modDirVersion}" \
       --replace "/lib/modules" "${kernel}/lib/modules"
   '';
  
   installPhase = ''
-    ensureDir $out/lib/modules/${kernel.version}/misc
-    cp bbswitch.ko $out/lib/modules/${kernel.version}/misc
+    ensureDir $out/lib/modules/${kernel.modDirVersion}/misc
+    cp bbswitch.ko $out/lib/modules/${kernel.modDirVersion}/misc
 
     ensureDir $out/bin
     tee $out/bin/discrete_vga_poweroff << EOF

From fbfa56c165420e2b6bd619ad777e0d4da0247869 Mon Sep 17 00:00:00 2001
From: Piotr Pietraszkiewicz <ppietrasa@googlemail.com>
Date: Sun, 18 Mar 2012 23:52:58 +0000
Subject: [PATCH 073/208] bumped bibletime to v2.9.1 which has the side effect
 that it builds again

svn path=/nixpkgs/trunk/; revision=33245
---
 pkgs/applications/misc/bibletime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix
index 787761a9d2f..36366d6ee72 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
 
-  version = "2.8.1";
+  version = "2.9.1";
 
   name = "bibletime-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/bibletime/${name}.tar.bz2";
-    sha256 = "00xrgv4cx50ddbcfjiz3vl0cvsixwd0vj7avjvhrh617qqg8w325";
+    sha256 = "1d8kh213rpx4d63sxl5mk1s94xv363l5prrq2kh06cpnl7a8d2ih";
   };
 
   prePatch = ''

From 06d28ca8f1e9ef040f9398e4d1a035d40006bd47 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 02:45:52 +0000
Subject: [PATCH 074/208] * Support setting postPhases.

svn path=/nixpkgs/trunk/; revision=33247
---
 pkgs/build-support/release/nix-build.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index 7e2a0d4f03b..a8973b9d779 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -13,6 +13,7 @@
 , src, stdenv
 , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build"
 , failureHook ? null
+, postPhases ? []
 , ... } @ args:
 
 stdenv.mkDerivation (
@@ -26,9 +27,6 @@ stdenv.mkDerivation (
 
     showBuildStats = true;
 
-    postPhases =
-      (stdenv.lib.optional doCoverageAnalysis "coverageReportPhase") ++ ["finalPhase"];
-
     finalPhase =
       ''
         # Propagate the release name of the source tarball.  This is
@@ -105,6 +103,9 @@ stdenv.mkDerivation (
 
     inherit lcovExtraTraceFiles;
 
+    postPhases = postPhases ++
+      (stdenv.lib.optional doCoverageAnalysis "coverageReportPhase") ++ ["finalPhase"];
+
     meta = (if args ? meta then args.meta else {}) // {
       description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}";
     };

From ebd19ec70548eaece8f5b4c22a966f0fa92ec28f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 03:45:36 +0000
Subject: [PATCH 075/208] * For "nix-build --run-env" it's desirable that
 $stdenv/setup (and by   extension postHook) does nothing else than set up the
 environment.   It shouldn't touch $out because there may not be a $out.  So
 move   the "imperative" bits of postHook into a separate phase.

svn path=/nixpkgs/trunk/; revision=33249
---
 pkgs/build-support/release/nix-build.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index a8973b9d779..92f0579e884 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -13,6 +13,7 @@
 , src, stdenv
 , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build"
 , failureHook ? null
+, prePhases ? []
 , postPhases ? []
 , ... } @ args:
 
@@ -56,13 +57,6 @@ stdenv.mkDerivation (
     name = name + (if src ? version then "-" + src.version else "");
   
     postHook = ''
-      mkdir -p $out/nix-support
-      echo "$system" > $out/nix-support/system
-
-      if test -z "${toString doCoverageAnalysis}"; then
-          echo "nix-build none $out" >> $out/nix-support/hydra-build-products
-      fi
-
       # If `src' is the result of a call to `makeSourceTarball', then it
       # has a subdirectory containing the actual tarball(s).  If there are
       # multiple tarballs, just pick the first one.
@@ -77,9 +71,18 @@ stdenv.mkDerivation (
           export CFLAGS="-O0"
           export CXXFLAGS="-O0"
       fi
-
     ''; # */
 
+    initPhase = ''
+      mkdir -p $out/nix-support
+      echo "$system" > $out/nix-support/system
+
+      if test -z "${toString doCoverageAnalysis}"; then
+          echo "nix-build none $out" >> $out/nix-support/hydra-build-products
+      fi
+    '';
+
+    prePhases = ["initPhase"] ++ prePhases;
 
     # In the report phase, create a coverage analysis report.
     coverageReportPhase = if doCoverageAnalysis then ''

From b4d308f6727d163f356a368c18d5245ed58a1b66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 03:55:37 +0000
Subject: [PATCH 076/208] * Update some Perl packages that had gone missing.

svn path=/nixpkgs/trunk/; revision=33250
---
 pkgs/top-level/perl-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f8d5022d933..fbef4c36976 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -768,10 +768,10 @@ rec {
   };
 
   ClassXSAccessor = buildPerlPackage rec {
-    name = "Class-XSAccessor-1.11";
+    name = "Class-XSAccessor-1.13";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz";
-      sha256 = "0mf7rp73r1pzy47m4bp49jw8iwpi6l1drdpk4qqxik6n7nx15mh2";
+      sha256 = "1nj21xq8bqvfz2mafrfskzw2p2j48b5k3rqxgxk99lw5ysmkz834";
     };
   };
 
@@ -1404,10 +1404,10 @@ rec {
   };
 
   ExtUtilsParseXS = buildPerlPackage rec {
-    name = "ExtUtils-ParseXS-3.03";
+    name = "ExtUtils-ParseXS-3.15";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
-      sha256 = "0ziq4iwn3bc1zyrm7aigc7nk5lxb69shzix9irxw17i5lfc923xg";
+      sha256 = "06baf0nsmdkfk50p4x9kss4ncm8h49gkzy8hl5cxbxdsab65gmrb";
     };
   };
 
@@ -3775,10 +3775,10 @@ rec {
   };
 
   VariableMagic = buildPerlPackage rec {
-    name = "Variable-Magic-0.46";
+    name = "Variable-Magic-0.48";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Variable/${name}.tar.gz";
-      sha256 = "0z8fbna6nhn0hlvj1qbjw7yjn3dzl7pz1psmc8amv8kg6avgj33q";
+      sha256 = "124isksyw52br0y304dq4fcm26jk1v44s6ni1xd10nnl26fwmzbw";
     };
   };
 

From 69adc0d433b850862d2a8dc6fd7a9252fc1401db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 19 Mar 2012 11:15:39 +0000
Subject: [PATCH 077/208] Update Haskell packages.

 - gd: updated to version 3000.7.3
 - hakyll: updated to version 3.2.6.2
 - HaskellForMaths: updated to version 0.4.4
 - haskell-src-meta: updated to version 0.5.1.1
 - mwc-random: dropped obsolete version 0.10.0.1.
 - persistent-template: updated to version 0.8.2
 - snap-core: updated to version 0.8.0.1
 - snap-server: updated to version 0.8.0.1
 - unordered-containers: dropped obsolete version 0.1.4.6.

svn path=/nixpkgs/trunk/; revision=33255
---
 .../haskell/HaskellForMaths/default.nix        |  4 ++--
 .../libraries/haskell/gd/default.nix           |  4 ++--
 .../libraries/haskell/hakyll/default.nix       |  4 ++--
 .../haskell/haskell-src-meta/default.nix       |  4 ++--
 .../libraries/haskell/mwc-random/0.10.0.1.nix  | 18 ------------------
 .../mwc-random/{0.12.0.0.nix => default.nix}   |  0
 .../haskell/persistent-template/default.nix    |  4 ++--
 .../libraries/haskell/snap/core.nix            |  6 +++---
 .../libraries/haskell/snap/server.nix          |  4 ++--
 .../haskell/unordered-containers/0.1.4.6.nix   | 17 -----------------
 .../{0.2.1.0.nix => default.nix}               |  0
 pkgs/top-level/haskell-packages.nix            | 13 +++----------
 12 files changed, 18 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix
 rename pkgs/development/libraries/haskell/mwc-random/{0.12.0.0.nix => default.nix} (100%)
 delete mode 100644 pkgs/development/libraries/haskell/unordered-containers/0.1.4.6.nix
 rename pkgs/development/libraries/haskell/unordered-containers/{0.2.1.0.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
index 25143e647bb..a70474698aa 100644
--- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
+++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HaskellForMaths";
-  version = "0.4.3";
-  sha256 = "00s502h3pw9i464qn6cn74ihghcnn5gsar891q276ld682m5vdns";
+  version = "0.4.4";
+  sha256 = "1qijaich0jwlii5wdmv0rnr6skbyacxg09nzh0i7dhk86vimz6q8";
   buildDepends = [ random ];
   meta = {
     homepage = "http://haskellformaths.blogspot.com/";
diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix
index 42de2748380..44c15b23d4b 100644
--- a/pkgs/development/libraries/haskell/gd/default.nix
+++ b/pkgs/development/libraries/haskell/gd/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gd";
-  version = "3000.7.1";
-  sha256 = "07rb02jfmz6bw853b6snw1inby9qgaygdmlsid35snc2xn2ylb50";
+  version = "3000.7.3";
+  sha256 = "1dkzv6zs00qi0jmblkw05ywizc8y3baz7pnz0lcqn1cs1mhcpbhl";
   extraLibraries = [
     expat fontconfig freetype gd libjpeg libpng zlib
   ];
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index f6a3d26b24e..73fe6f0ba68 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "3.2.6.1";
-  sha256 = "0chpg04rsp8lxzdj43wqs3wyc7i70hfi3raxdar6bhwxhfxgj4wn";
+  version = "3.2.6.2";
+  sha256 = "07l2igpmr4kd47zk88hz2salzzc92dh7wpny6xr5pw5xf95lpx7p";
   buildDepends = [
     binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc
     parsec regexBase regexTdfa snapCore snapServer tagsoup time
diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index 180c84f6519..972e93a6901 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-meta";
-  version = "0.5.1";
-  sha256 = "1wpddllq651vnsibhi0m7agc6ygj95646k29v0xl75nmfb034lz3";
+  version = "0.5.1.1";
+  sha256 = "1v192j47vxjisa5i2zd9lj7l9xa12jsg858yhx5qz624fcq73ggi";
   buildDepends = [ haskellSrcExts syb thLift uniplate ];
   meta = {
     description = "Parse source to template-haskell abstract syntax";
diff --git a/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix b/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix
deleted file mode 100644
index ab762c2db63..00000000000
--- a/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, primitive, time, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "mwc-random";
-  version = "0.10.0.1";
-  sha256 = "0mmkl90rf57f2rxg3y2nibd37l9mwr2j4c71bwyvxqzfk7cylw9b";
-  buildDepends = [ primitive time vector ];
-  meta = {
-    homepage = "https://github.com/bos/mwc-random";
-    description = "Fast, high quality pseudo random number generation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mwc-random/0.12.0.0.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/mwc-random/0.12.0.0.nix
rename to pkgs/development/libraries/haskell/mwc-random/default.nix
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 47c364d964d..e6affc56d2a 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "0.8.1.2";
-  sha256 = "1zrd7v953avmkq40nb7jlsmy45r7dphym3fa6jfqy7d1big1mkzf";
+  version = "0.8.2";
+  sha256 = "0lmdp2gmrbgnp2ls4b76hnjcrllgmzrsiszkmbywkb2dmlxm5wdq";
   buildDepends = [ aeson monadControl persistent text transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index b9014288f80..3ae933f5087 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-core";
-  version = "0.7.0.1";
-  sha256 = "010w3ycwalz48288342rmwg87pdml7ixg9drw38k206q9s9a9cp9";
+  version = "0.8.0.1";
+  sha256 = "0lw1c5gczb75878vr5acjck656aq5zg1hva9bfny321v0442azds";
   buildDepends = [
     attoparsec attoparsecEnumerator base16Bytestring blazeBuilder
     blazeBuilderEnumerator bytestringMmap bytestringNums
@@ -19,7 +19,7 @@ cabal.mkDerivation (self: {
   ];
   meta = {
     homepage = "http://snapframework.com/";
-    description = "Snap: A Haskell Web Framework (Core)";
+    description = "Snap: A Haskell Web Framework (core interfaces and types)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index 73ddf11b81d..040889ed1d7 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-server";
-  version = "0.7.0.1";
-  sha256 = "149jgd9mcndw9sc051020y7yiai1fipjnqk4s3sbw4lmaysap673";
+  version = "0.8.0.1";
+  sha256 = "1648p0m4n4ha4976gw891z112rzxd9q4s7n4x3v0z3qb10aynxjb";
   buildDepends = [
     attoparsec attoparsecEnumerator binary blazeBuilder
     blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree
diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.1.4.6.nix b/pkgs/development/libraries/haskell/unordered-containers/0.1.4.6.nix
deleted file mode 100644
index da4616a1367..00000000000
--- a/pkgs/development/libraries/haskell/unordered-containers/0.1.4.6.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, deepseq, hashable }:
-
-cabal.mkDerivation (self: {
-  pname = "unordered-containers";
-  version = "0.1.4.6";
-  sha256 = "1azwxbrzlzaw54idp3z2xx1xlywzsf1r893blbz51nnwcj9v550d";
-  buildDepends = [ deepseq hashable ];
-  meta = {
-    description = "Efficient hashing-based container types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.1.0.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/unordered-containers/0.2.1.0.nix
rename to pkgs/development/libraries/haskell/unordered-containers/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7785b51a108..195730a1c40 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1025,9 +1025,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   murmurHash = callPackage ../development/libraries/haskell/murmur-hash {};
 
-  mwcRandom_0_10_0_1 = callPackage ../development/libraries/haskell/mwc-random/0.10.0.1.nix {};
-  mwcRandom_0_12_0_0 = callPackage ../development/libraries/haskell/mwc-random/0.12.0.0.nix {};
-  mwcRandom = self.mwcRandom_0_12_0_0;
+  mwcRandom = callPackage ../development/libraries/haskell/mwc-random {};
 
   NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
 
@@ -1227,10 +1225,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
 
-  snapCore = callPackage ../development/libraries/haskell/snap/core.nix {
-    mwcRandom = self.mwcRandom_0_10_0_1;
-    unorderedContainers = self.unorderedContainers_0_1_4_6;
-  };
+  snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
 
   snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
 
@@ -1389,9 +1384,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
 
-  unorderedContainers_0_1_4_6 = callPackage ../development/libraries/haskell/unordered-containers/0.1.4.6.nix {};
-  unorderedContainers_0_2_1_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.1.0.nix {};
-  unorderedContainers = self.unorderedContainers_0_2_1_0;
+  unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {};
 
   url = callPackage ../development/libraries/haskell/url {};
 

From a7725088469637b7e060f14f73c6af5bcc6e35ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 13:16:35 +0000
Subject: [PATCH 078/208] * NASM updated to 2.10.

svn path=/nixpkgs/trunk/; revision=33256
---
 pkgs/development/compilers/nasm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index 688a81f4b3e..61015a66d16 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "nasm-2.09";
+  name = "nasm-2.10";
   
   src = fetchurl {
-    url = http://www.nasm.us/pub/nasm/releasebuilds/2.09/nasm-2.09.tar.bz2;
-    sha256 = "06kv1ii8d3jwq5mczbyx6zc7k1acdwjdfjblv78mglf161i82j4m";
+    url = "http://www.nasm.us/pub/nasm/releasebuilds/2.10/${name}.tar.bz2";
+    sha256 = "1wcxm0il06b17wjarw8pbf9bagjhfcf7yayahmyip03qkfka2yk8";
   };
 
   meta = {

From 9f683a5aac066c09e0f3cbfd799084c68741a842 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 13:40:57 +0000
Subject: [PATCH 079/208] * After building an RPM, install and uninstall it.

svn path=/nixpkgs/trunk/; revision=33257
---
 pkgs/build-support/release/rpm-build.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix
index 26b120e5b1d..66a9c42ec04 100644
--- a/pkgs/build-support/release/rpm-build.nix
+++ b/pkgs/build-support/release/rpm-build.nix
@@ -29,11 +29,21 @@ vmTools.buildRPM (
       for i in $out/rpms/*/*.rpm; do
         if echo $i | grep -vq "\.src\.rpm$"; then
           echo "file rpm $i" >> $out/nix-support/hydra-build-products
+          
+          echo "installing $i..."
+          rpm -ip "$i" --excludepath /nix/store
+
+          rpmName="$(rpm -qp "$i")"
+          
+          echo "uninstalling $rpmName..."
+          rpm -e "$rpmName"
         fi
       done
+      
       for i in $out/rpms/*/*.src.rpm; do
         echo "file srpm $i" >> $out/nix-support/hydra-build-products
       done
+      
       for rpmdir in $extraRPMs ; do
         echo "file rpm-extra $(ls $rpmdir/rpms/*/*.rpm | grep -v 'src\.rpm' | sort | head -1)" >> $out/nix-support/hydra-build-products
       done

From 626d364e374a9765da0bede9c634d76d1c1cb8ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 13:49:39 +0000
Subject: [PATCH 080/208] * Build Bison 2.5.

svn path=/nixpkgs/trunk/; revision=33258
---
 pkgs/top-level/release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 57cc538c70c..b73d2e19ac7 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -36,6 +36,7 @@ with (import ./release-lib.nix);
   bind = linux;
   bison23 = all;
   bison24 = all;
+  bison25 = all;
   bitlbee = linux;
   bittorrent = linux;
   blender = linux;

From 1e8dfa4e2c4771e38017aaaca1227c2d3c692c01 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 19 Mar 2012 15:36:40 +0000
Subject: [PATCH 081/208] Linux 3.3 release

svn path=/nixpkgs/trunk/; revision=33260
---
 pkgs/os-specific/linux/kernel/linux-3.3.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix
index 748648d7332..ecdcfc86a88 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix
@@ -225,10 +225,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.3-rc7";
-    testing = true;
+    version = "3.3";
 
-    modDirVersion = "3.3.0-rc7";
+    testing = false;
+
+    modDirVersion = "3.3.0";
 
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -236,7 +237,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2";
-      sha256 = "1wfdkryfi9mxjd2n0bysg737579ydqjarczln5wsjzp5w80c3g64";
+      sha256 = "0czk8bj46r3r95iz6gi7xkavhjx847s5p9248vabi0c1wjs6kmlg";
     };
 
     config = configWithPlatform stdenv.platform;

From c3072a8df8844ba7240e9c26e83744b85df8942e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 16:05:29 +0000
Subject: [PATCH 082/208] * When doing coverage builds, set useTempPrefix (in
 case we're doing   an "installcheck").

svn path=/nixpkgs/trunk/; revision=33261
---
 pkgs/build-support/release/nix-build.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index 92f0579e884..8abbca97875 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation (
 
     # When doing coverage analysis, we don't care about the result.
     dontInstall = doCoverageAnalysis;
+    useTempPrefix = doCoverageAnalysis;
 
     showBuildStats = true;
 
@@ -77,7 +78,7 @@ stdenv.mkDerivation (
       mkdir -p $out/nix-support
       echo "$system" > $out/nix-support/system
 
-      if test -z "${toString doCoverageAnalysis}"; then
+      if [ -z "${toString doCoverageAnalysis}" ]; then
           echo "nix-build none $out" >> $out/nix-support/hydra-build-products
       fi
     '';

From 47574d25f64b19cad291c3f2fa579a2b3887724c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 19 Mar 2012 17:40:23 +0000
Subject: [PATCH 083/208] Fix some broken firmware URLS. Hope the Fedora
 project wouldn't host non-free firmware...

svn path=/nixpkgs/trunk/; revision=33265
---
 pkgs/os-specific/linux/firmware/ipw2100/default.nix            | 2 +-
 pkgs/os-specific/linux/firmware/ipw2200/default.nix            | 2 +-
 pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/ipw2100/default.nix b/pkgs/os-specific/linux/firmware/ipw2100/default.nix
index 3548a841aab..617a6cc38dd 100644
--- a/pkgs/os-specific/linux/firmware/ipw2100/default.nix
+++ b/pkgs/os-specific/linux/firmware/ipw2100/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ipw2100-fw-1.3";
   src = fetchurl {
-    url = http://bughost.org/firmware/ipw2100-fw-1.3.tgz;
+    url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2100-firmware/ipw2100-fw-1.3.tgz/46aa75bcda1a00efa841f9707bbbd113/ipw2100-fw-1.3.tgz;
     sha256 = "18m7wgd062qwfdr6y0kjrvf1715wjcjn4yml2sk29ls8br2pq471";
   };
 
diff --git a/pkgs/os-specific/linux/firmware/ipw2200/default.nix b/pkgs/os-specific/linux/firmware/ipw2200/default.nix
index 402636862ec..ec1607ff2f7 100644
--- a/pkgs/os-specific/linux/firmware/ipw2200/default.nix
+++ b/pkgs/os-specific/linux/firmware/ipw2200/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ipw2200-fw-3.1";
   src = fetchurl {
-    url = http://bughost.org/firmware/ipw2200-fw-3.1.tgz;
+    url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-3.1.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-3.1.tgz;
     sha256 = "1gaqc8d827d6ji7zhhkpbr4fzznqpar68gzqbzak1h4cq48qr0f6";
   };
   
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix
index afe2357995c..77756e771ae 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "iwlwifi-3945-ucode-15.32.2.9";
   
   src = fetchurl {
-    url = "http://www.intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
+    url = http://pkgs.fedoraproject.org/repo/pkgs/iwl3945-firmware/iwlwifi-3945-ucode-15.32.2.9.tgz/d99a75ab1305d1532a09471b2f9a547a/iwlwifi-3945-ucode-15.32.2.9.tgz;
     sha256 = "0baf07lblwsq841zdcj9hicf11jiq06sz041qcybc6l8yyhhcqjk";
   };
   

From af2da39a04a0577671cd3bc0cae01e73c2c889ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 18:01:49 +0000
Subject: [PATCH 084/208] * Remove unused function "checker".

svn path=/nixpkgs/trunk/; revision=33266
---
 pkgs/lib/misc.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix
index df3956f1147..d3b236f73e5 100644
--- a/pkgs/lib/misc.nix
+++ b/pkgs/lib/misc.nix
@@ -397,15 +397,4 @@ rec {
           && (eqListStrict (lib.attrValues a) (lib.attrValues b))
         else a == b; # FIXME !
 
-
-  # Check absence of non-used options
-  # Obsolete?
-  checker = x: flag: opts: config:
-    (if flag then let result=(
-      (import ../build-support/checker)
-      opts config); in
-      (if (result=="") then x else
-      abort ("Unknown option specified: " + result))
-    else x);
-
 }

From 6b4cd6673ad1c7b7203002040ccdbacec818135a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 18:04:47 +0000
Subject: [PATCH 085/208] * Add a utility function "versionOlder" to compare
 two version   strings.

svn path=/nixpkgs/trunk/; revision=33267
---
 pkgs/lib/strings.nix                       | 13 +++++++++++++
 pkgs/os-specific/linux/microcode/intel.nix |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix
index 73520a949c1..8f918acf7b2 100644
--- a/pkgs/lib/strings.nix
+++ b/pkgs/lib/strings.nix
@@ -82,15 +82,18 @@ rec {
       map f (stringToCharacters s)
     );
 
+    
   # same as vim escape function.
   # Each character contained in list is prefixed by "\"
   escape = list : string :
     stringAsChars (c: if lib.elem c list then "\\${c}" else c) string;
 
+    
   # still ugly slow. But more correct now
   # [] for zsh
   escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]");
 
+  
   # replace characters by their substitutes.  This function is equivalent to
   # the `tr' command except that one character can be replace by multiple
   # ones.  e.g.,
@@ -105,10 +108,12 @@ rec {
     in
       stringAsChars subst s;
 
+      
   # Compares strings not requiring context equality
   # Obviously, a workaround but works on all Nix versions
   eqStrings = a: b: (a+(substring 0 0 b)) == ((substring 0 0 a)+b);
 
+  
   # Cut a string with a separator and produces a list of strings which were
   # separated by this separator. e.g.,
   # `splitString "." "foo.bar.baz"' returns ["foo" "bar" "baz"].
@@ -133,6 +138,7 @@ rec {
     in
       recurse 0 0;
 
+      
   # return the suffix of the second argument if the first argument match its
   # prefix. e.g.,
   # `removePrefix "foo." "foo.bar.baz"' returns "bar.baz".
@@ -146,6 +152,13 @@ rec {
       else
         s;
 
+        
+  # Why do we need this if we have baseNameOf?
   basename = s: lib.last (splitString "/" s);
 
+
+  # Return true iff string v1 denotes a version older than v2.
+  versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
+
+
 }
diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 9a57fef67a1..d17663b7a65 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://www.intel.com;
+    homepage = http://www.intel.com/;
     description = "Microcode for Intel processors";
   };
 }
\ No newline at end of file

From 2938819d7e425ddc922ff63b9332dddc20cba106 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 18:13:47 +0000
Subject: [PATCH 086/208] * Remove an unnecessary function.

svn path=/nixpkgs/trunk/; revision=33271
---
 pkgs/build-support/trivial-builders.nix | 2 +-
 pkgs/lib/strings.nix                    | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 1815c99a9f4..c8f0272daf8 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -112,7 +112,7 @@ _EOF_
   # the default binary.
   useSetUID = drv: path:
     let
-      name = stdenv.lib.basename path;
+      name = baseNameOf path;
       bin = "${drv}${path}";
     in assert name != "";
       writeScript "setUID-${name}" ''
diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix
index 8f918acf7b2..5f2670913e2 100644
--- a/pkgs/lib/strings.nix
+++ b/pkgs/lib/strings.nix
@@ -153,10 +153,6 @@ rec {
         s;
 
         
-  # Why do we need this if we have baseNameOf?
-  basename = s: lib.last (splitString "/" s);
-
-
   # Return true iff string v1 denotes a version older than v2.
   versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
 

From 512357f875cfa2a6ed9356290ab0b8acb91e0e65 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 18:24:53 +0000
Subject: [PATCH 087/208] * Remove a wildly outdated Git version that shouldn't
 have been in   Nixpkgs in the first place.

svn path=/nixpkgs/trunk/; revision=33272
---
 .../git-and-tools/default.nix                 |  11 --
 .../git-and-tools/git/git-git.nix             | 103 ------------------
 2 files changed, 114 deletions(-)
 delete mode 100644 pkgs/applications/version-management/git-and-tools/git/git-git.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 5b53cfce1ce..376e5286b05 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -35,16 +35,6 @@ rec {
     sendEmailSupport = stdenv.isDarwin == false;
   });
 
-  gitGit = import ./git/git-git.nix {
-    inherit fetchurl sourceFromHead stdenv curl openssl zlib expat perl gettext
-      asciidoc texinfo xmlto docbook2x
-      docbook_xsl docbook_xml_dtd_45 libxslt
-      cpio tcl tk makeWrapper subversion autoconf;
-    svnSupport = false;
-    guiSupport = false;
-    perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
-  };
-
   gitAnnex = lib.makeOverridable (import ./git-annex) {
     inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils;
     inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc
@@ -64,7 +54,6 @@ rec {
     qt = qt4;
   };
 
-
   stgit = import ./stgit {
     inherit fetchurl stdenv python git;
   };
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-git.nix b/pkgs/applications/version-management/git-and-tools/git/git-git.nix
deleted file mode 100644
index 6371e504bfb..00000000000
--- a/pkgs/applications/version-management/git-and-tools/git/git-git.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, cpio
-, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
-, libxslt, tcl, tk, makeWrapper
-, svnSupport, subversion, perlLibs
-, guiSupport
-, sourceFromHead
-, autoconf
-}:
-
-# `git-svn' support requires Subversion and various Perl libraries.
-# FIXME: We should make sure Subversion comes with its Perl bindings.
-assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBindings);
-
-assert svnSupport -> subversion.perlBindings;
-
-stdenv.mkDerivation rec {
-  # the glob patch adds the filter [touching paths (glob)] to gitk
-  # contact marco-oweber@gmx.de if you want to know more details
-  name = "git-git-with-glob-patch";
-
-  # REGION AUTO UPDATE:     { name="git"; type="git"; url="git://git.kernel.org/pub/scm/git/git.git"; }
-  src = sourceFromHead "git-8b43d378dff4d490165dbac05a0bf5da2011bfa5.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/git-8b43d378dff4d490165dbac05a0bf5da2011bfa5.tar.gz"; sha256 = "a910bbac05c6e349a0bcfd9a27f7045916e5d07dc4acb4baf6d92475c30e28dc"; });
-  # END
-
-  patchePhase = ''
-    patch -p1 < ${./docbook2texi-2.patch}
-    sed -i 's/docbook2x-texi/docbook2texi/gc' Documentation/Makefile
-  '';
-  # maybe this introduces unneccessary dependencies ?
-  patchPhase = "
-    unset patchPhase; patchPhase;
-    sed -i 's=/usr/bin/perl=$perl/bin/perl=g' `find -type f`
-    sed -i 's=/bin/pwd=pwd=g' `find -type f`
-  ";
-
-  inherit perl;
-  buildInputs = [curl openssl zlib expat gettext cpio makeWrapper autoconf]
-    ++ # documentation tools
-       [ asciidoc texinfo xmlto docbook2x
-         docbook_xsl docbook_xml_dtd_45 libxslt ]
-    ++ stdenv.lib.optionals guiSupport [tcl tk];
-
-  preConfigure = "autoconf";
-  makeFlags = "install install-doc prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}";
-
-  postInstall =
-    ''
-      # Install Emacs mode.
-      echo "installing Emacs mode..."
-      mkdir -p $out/share/emacs/site-lisp
-      cp -p contrib/emacs/*.el $out/share/emacs/site-lisp
-
-      wrapArgs=
-    '' # */
-
-   + (if svnSupport then
-
-      ''# wrap git-svn
-        gitperllib=$out/lib/perl5/site_perl
-        for i in ${builtins.toString perlLibs}; do
-          gitperllib=$gitperllib:$i/lib/perl5/site_perl
-        done
-#cp git-svn "$out/bin"
-        wrapArgs="$wrapArgs --set GITPERLLIB $gitperllib"
-        wrapArgs="$wrapArgs --prefix PATH : ${subversion}/bin"
-       '' else "")
-
-   + ''# Install man pages and Info manual
-       make PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
-         -C Documentation ''
-
-   + (if guiSupport then ''
-       # Wrap Tcl/Tk programs
-         wrapArgs="$wrapArgs --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}"
-         wrapArgs="$wrapArgs --prefix PATH : ${tk}/bin"
-     '' else "")
-
-   + ''# Wrap `git-clone'
-       wrapArgs="$wrapArgs --prefix PATH : ${cpio}/bin"
-
-       for b in $out/bin/{git,gitk}; do
-         [ -f "$b" ] && eval "wrapProgram $b $wrapArgs"
-       done
-     ''
-
-   + ''# install bash completion script
-      d="$out/etc/bash_completion.d"
-      mkdir -p $d; cp contrib/completion/git-completion.bash "$d"
-     '';
-
-  meta = {
-    license = "GPLv2";
-    homepage = http://git.or.cz;
-    description = "Git, a popular distributed version control system";
-
-    longDescription = ''
-      Git, a popular distributed version control system designed to
-      handle very large projects with speed and efficiency.
-    '';
-
-  };
-}

From 0d90c06ba1bf1b7ca8f700ffc908a9718164acaf Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 19 Mar 2012 18:31:02 +0000
Subject: [PATCH 088/208] Remove some packages with Qt3 dependency

kde3.k3b: use kde4.k3b instead
kde3.kphone: there are many other SIP phones
valknut: last version from 2009, doesn't support new ADC protocol
qdu: latest release in 2004, use kde4.filelight

REVIEWBOARD:5

svn path=/nixpkgs/trunk/; revision=33273
---
 pkgs/applications/misc/k3b/1.0.nix            | 20 --------------
 .../instant-messengers/kphone/default.nix     | 27 -------------------
 .../networking/p2p/valknut/builder.sh         | 12 ---------
 .../networking/p2p/valknut/default.nix        | 14 ----------
 pkgs/tools/misc/qdu/default.nix               | 27 -------------------
 pkgs/top-level/all-packages.nix               | 12 ---------
 6 files changed, 112 deletions(-)
 delete mode 100644 pkgs/applications/misc/k3b/1.0.nix
 delete mode 100644 pkgs/applications/networking/instant-messengers/kphone/default.nix
 delete mode 100644 pkgs/applications/networking/p2p/valknut/builder.sh
 delete mode 100644 pkgs/applications/networking/p2p/valknut/default.nix
 delete mode 100644 pkgs/tools/misc/qdu/default.nix

diff --git a/pkgs/applications/misc/k3b/1.0.nix b/pkgs/applications/misc/k3b/1.0.nix
deleted file mode 100644
index bd01174ae59..00000000000
--- a/pkgs/applications/misc/k3b/1.0.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, kdelibs, x11, zlib, libpng, libjpeg, perl, qt3}:
-
-stdenv.mkDerivation {
-  name = "k3b-1.0.5";
-
-  src = fetchurl {
-    url = mirror://sourceforge/k3b/k3b-1.0.5.tar.bz2;
-    sha256 = "1pshv8na1sr9xcmkr0byjgyl8jmxwcylkl8pwjvripja4fgpkyfl";
-  };
-
-  buildInputs = [kdelibs x11 zlib libpng libjpeg perl qt3];
-
-  configureFlags = "--without-arts";
-
-  meta = {
-    description = "A CD and DVD authoring application for KDE";
-    homepage = http://www.k3b.org/;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/kphone/default.nix b/pkgs/applications/networking/instant-messengers/kphone/default.nix
deleted file mode 100644
index dceb24a48b8..00000000000
--- a/pkgs/applications/networking/instant-messengers/kphone/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, qt3, pkgconfig
-, openssl, libpng, alsaLib, libX11, libXext, libXt, libICE
-, libSM }:
-
-stdenv.mkDerivation {
-  name = "kphone-1.2";
-
-  src = fetchurl {
-    url = mirror://sourceforge/kphone/kphoneSI_1.2.tar.gz;
-    sha256 = "1q309n2gsdsa8d7ff2zwnyc69ngpnnj143dys90dnlmzr9ckhhg3";
-  };
-
-  buildInputs =
-    [ autoconf automake libtool qt3 pkgconfig openssl libpng alsaLib
-      libX11 libXext libXt libICE libSM
-    ];
-    
-  preConfigure = "autoconf";
-
-  meta = {
-    description = "KPhone is a SIP UA for Linux";
-    homepage = http://sourceforge.net/projects/kphone/;
-    license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/p2p/valknut/builder.sh b/pkgs/applications/networking/p2p/valknut/builder.sh
deleted file mode 100644
index 56f5dd87005..00000000000
--- a/pkgs/applications/networking/p2p/valknut/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-addInputsHook=addBzip2
-addBzip2() {
-    bzip2=$(type -tP bzip2)
-    test -n $bzip2
-    buildInputs="$(dirname $(dirname $bzip2)) $buildInputs"
-}
-
-source $stdenv/setup
-
-export configureFlags="--with-ssl-dir=$openssl --x-libraries=/no-such-dir"
-
-genericBuild
diff --git a/pkgs/applications/networking/p2p/valknut/default.nix b/pkgs/applications/networking/p2p/valknut/default.nix
deleted file mode 100644
index 2290cf52314..00000000000
--- a/pkgs/applications/networking/p2p/valknut/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, perl, x11, libxml2, libjpeg, libpng, openssl, qt3, dclib}:
-
-stdenv.mkDerivation {
-  name = "valknut-0.3.7";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://download.berlios.de/dcgui/valknut-0.3.7.tar.bz2;
-    md5 = "848f9b3f25af15c3f1837133ac4b9415";
-  };
-
-  buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt3 dclib];
-  inherit openssl;
-}
diff --git a/pkgs/tools/misc/qdu/default.nix b/pkgs/tools/misc/qdu/default.nix
deleted file mode 100644
index cd9c296a758..00000000000
--- a/pkgs/tools/misc/qdu/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchurl, qt3, libXext, libX11}:
-
-stdenv.mkDerivation {
-  name = "qdu-2.2";
-  src = fetchurl {
-    url = http://artis.imag.fr/~Gilles.Debunne/Code/QDU/qdu-2.2.tar.gz;
-    sha256 = "0nn13lcw7bpasdn5xd0ydkyzirz9zamgl8lizi3ncqdzv8bjm7xl";
-  };
-
-  buildInputs = [ qt3 libXext libX11 ];
-
-  patchPhase = ''
-    sed -i "s@/usr/bin@$out/bin@" qdu.pro
-    sed -i "s@hint>directoryview@hint>directoryView@g" qduInterface.ui
-  '';
-  buildPhase = ''
-    qmake
-    make
-    make install
-  '';
-
-  meta = {
-    homepage = "http://artis.imag.fr/~Gilles.Debunne/Code/QDU";
-    description = "A graphical disk usage tool based on Qt";
-    license="GPL";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 363f85834fe..83cb9c7eea3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1262,8 +1262,6 @@ let
 
   openmpi = callPackage ../development/libraries/openmpi { };
 
-  qdu = callPackage ../tools/misc/qdu { };
-
   qhull = callPackage ../development/libraries/qhull { };
 
   qjoypad = callPackage ../tools/misc/qjoypad { };
@@ -7415,8 +7413,6 @@ let
     inherit (gnome) libsoup;
   };
 
-  valknut = callPackage ../applications/networking/p2p/valknut { };
-
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 
   veracity = callPackage ../applications/version-management/veracity {};
@@ -7918,14 +7914,6 @@ let
       inherit (pkgs.kde3) kdelibs;
     };
 
-    k3b = callPackage ../applications/misc/k3b/1.0.nix {
-      inherit (kde3) kdelibs;
-    };
-
-    kphone = callPackage ../applications/networking/instant-messengers/kphone {
-      stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files
-    };
-
   };
 
   kde4 = recurseIntoAttrs pkgs.kde47;

From 2199d375a2efab74ba2af07a2c322f3633b24606 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 19:34:34 +0000
Subject: [PATCH 089/208] * Updated lvm2 to 2.02.95.

svn path=/nixpkgs/trunk/; revision=33277
---
 pkgs/os-specific/linux/lvm2/default.nix  |  4 +-
 pkgs/os-specific/linux/lvm2/purity.patch | 49 +++++++++---------------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 037a3d227c4..3411bc83d8a 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 }:
 
 let
-  v = "2.02.87";
+  v = "2.02.95";
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz";
-    sha256 = "04d605dac9r0yz9khx9pq6a8jdsf9arda2rz1a2d1qr3jhlw4kvg";
+    sha256 = "09cixpdrbzjybf8k8f0rsgkriyvbaj2acmfsg1bzxnjil4vayd83";
   };
 
   configureFlags =
diff --git a/pkgs/os-specific/linux/lvm2/purity.patch b/pkgs/os-specific/linux/lvm2/purity.patch
index 8446e8e9ee9..d6990dd9caa 100644
--- a/pkgs/os-specific/linux/lvm2/purity.patch
+++ b/pkgs/os-specific/linux/lvm2/purity.patch
@@ -1,13 +1,7 @@
-TODO: fix path to blkid as well.
-
-Currently we set it to /sbin/blkid because in nixos we fix a lot of references
-to /sbin/blkid anyway.
-
-diff --git a/udev/10-dm.rules.in b/udev/10-dm.rules.in
-index 605e088..8865d54 100644
---- a/udev/10-dm.rules.in
-+++ b/udev/10-dm.rules.in
-@@ -19,9 +19,8 @@ KERNEL=="device-mapper", NAME="(DM_DIR)/control"
+diff -ru LVM2.2.02.95-orig/udev/10-dm.rules.in LVM2.2.02.95/udev/10-dm.rules.in
+--- LVM2.2.02.95-orig/udev/10-dm.rules.in	2011-08-11 19:55:29.000000000 +0200
++++ LVM2.2.02.95/udev/10-dm.rules.in	2012-03-19 20:12:35.000000000 +0100
+@@ -19,9 +19,8 @@
  SUBSYSTEM!="block", GOTO="dm_end"
  KERNEL!="dm-[0-9]*", GOTO="dm_end"
  
@@ -19,23 +13,9 @@ index 605e088..8865d54 100644
  TEST!="$env{DM_SBIN_PATH}/dmsetup", GOTO="dm_end"
  
  # Device created, major and minor number assigned - "add" event generated.
-diff --git a/udev/13-dm-disk.rules b/udev/13-dm-disk.rules
-index 271ca22..cdc583f 100644
---- a/udev/13-dm-disk.rules
-+++ b/udev/13-dm-disk.rules
-@@ -19,7 +19,7 @@ ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}"
- 
- ENV{DM_SUSPENDED}=="1", GOTO="dm_end"
- 
--IMPORT{program}="$env{DM_SBIN_PATH}/blkid -o udev -p $tempnode"
-+IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
- ENV{DM_UDEV_LOW_PRIORITY_FLAG}=="1", OPTIONS="link_priority=-100"
- ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
- ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
-diff --git a/udev/Makefile.in b/udev/Makefile.in
-index 11635bb..49cf732 100644
---- a/udev/Makefile.in
-+++ b/udev/Makefile.in
+diff -ru LVM2.2.02.95-orig/udev/Makefile.in LVM2.2.02.95/udev/Makefile.in
+--- LVM2.2.02.95-orig/udev/Makefile.in	2012-02-24 10:53:12.000000000 +0100
++++ LVM2.2.02.95/udev/Makefile.in	2012-03-19 20:16:09.000000000 +0100
 @@ -12,6 +12,7 @@
  # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
@@ -44,12 +24,21 @@ index 11635bb..49cf732 100644
  top_srcdir = @top_srcdir@
  top_builddir = @top_builddir@
  
-@@ -26,7 +27,7 @@ include $(top_builddir)/make.tmpl
+@@ -26,7 +27,7 @@
+ ifeq ("@UDEV_HAS_BUILTIN_BLKID@", "yes")
+ 	BLKID_RULE=IMPORT{builtin}=\"blkid\"
+ else
+-	BLKID_RULE=IMPORT{program}=\"\$$env{DM_SBIN_PATH}\/blkid -o udev -p \$$tempnode\"
++	BLKID_RULE=IMPORT{program}=\"\/sbin\/blkid -o udev -p \$$tempnode\"
+ endif
+ 
+ CLEAN_TARGETS = 10-dm.rules 13-dm-disk.rules
+@@ -36,7 +37,7 @@
  vpath %.rules $(srcdir)
  
  %.rules: %.rules.in
--	$(SED) -e "s/(DM_DIR)/$(DM_DIR)/" $< >$@
-+	$(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s|(sbindir)|$(sbindir)|" $< >$@
+-	$(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s/(BLKID_RULE)/$(BLKID_RULE)/" $< >$@
++	$(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s/(BLKID_RULE)/$(BLKID_RULE)/" -e "s|(sbindir)|$(sbindir)|" $< >$@
  
  %_install: %.rules
  	$(INSTALL_DATA) -D $< $(udevdir)/$(<F)

From a39a9b3d8e9b2342193a89c845e22cda163ecab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 19 Mar 2012 21:50:58 +0000
Subject: [PATCH 090/208] Adding a glibc patch to get proper first days of the
 week in the Catalan locale.

Since 2008 somehow it cannot get fixed in glibc:
https://bugzilla.redhat.com/show_bug.cgi?id=454629


svn path=/nixpkgs/trunk/; revision=33279
---
 .../libraries/glibc/2.13/catalan-firstdays.patch    | 13 +++++++++++++
 pkgs/development/libraries/glibc/2.13/common.nix    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/glibc/2.13/catalan-firstdays.patch

diff --git a/pkgs/development/libraries/glibc/2.13/catalan-firstdays.patch b/pkgs/development/libraries/glibc/2.13/catalan-firstdays.patch
new file mode 100644
index 00000000000..674e0aee884
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.13/catalan-firstdays.patch
@@ -0,0 +1,13 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=454629
+
+--- glibc-20090510T1842/localedata/locales/ca_ES.orig	2009-06-26 14:05:18.422043552 +0200
++++ glibc-20090510T1842/localedata/locales/ca_ES	2009-06-26 14:05:38.292042700 +0200
+@@ -138,6 +138,8 @@
+ date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+ <U0025><U005A><U0020><U0025><U0059>"
++first_weekday   2
++first_workday   2
+ END LC_TIME
+ 
+ LC_PAPER
diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix
index 99efeaf9453..6cb663d7f12 100644
--- a/pkgs/development/libraries/glibc/2.13/common.nix
+++ b/pkgs/development/libraries/glibc/2.13/common.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation ({
 
     /* Without this patch many KDE binaries crash. */
     ./glibc-elf-localscope.patch
-  ];
+  ] ++ stdenv.lib.optional installLocales ./catalan-firstdays.patch;
 
   postPatch = ''
     # Needed for glibc to build with the gnumake 3.82

From 5f32e704bf7dd0489fc353c72a75eeb0e6f5180d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 19 Mar 2012 23:41:06 +0000
Subject: [PATCH 091/208] haskell-url: updated to version 2.1.3

svn path=/nixpkgs/trunk/; revision=33280
---
 pkgs/development/libraries/haskell/url/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix
index 466d5309019..e4726ef011d 100644
--- a/pkgs/development/libraries/haskell/url/default.nix
+++ b/pkgs/development/libraries/haskell/url/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "url";
-  version = "2.1.2";
-  sha256 = "2cf5c4296418afe3940ae4de66d867897b1382cc4d37a0b9a5ccffa16743ef91";
+  version = "2.1.3";
+  sha256 = "0qag18wbrq9jjk1444mjigz1xl7xl03fz66b1lnya9qaihzpxwjs";
   buildDepends = [ utf8String ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Url";

From a74565238a0cac702a17bfb560753e89209b5e91 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 00:02:24 +0000
Subject: [PATCH 092/208] Linux 3.3 puts some of its headers in
 include/generated

svn path=/nixpkgs/trunk/; revision=33282
---
 pkgs/os-specific/linux/broadcom-sta/default.nix | 2 ++
 pkgs/os-specific/linux/nvidia-x11/builder.sh    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 1c557301729..ff21b5d5254 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation {
     #(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0)
       #[ ./mutex-sema.patch ];
 
+  NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated";
+
   makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build";
 
   unpackPhase =
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index b0d2bf35c52..ace9d50cdee 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -17,7 +17,7 @@ buildPhase() {
         sysSrc=$(echo $kernel/lib/modules/$kernelVersion/build/)
         unset src # used by the nv makefile
         # Hack necessary to compile on 2.6.28.
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$sysSrc/include/asm/mach-default"
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$sysSrc/include/asm/mach-default -I$sysSrc/include/generated"
         make SYSSRC=$sysSrc module
         cd ..
     fi

From 6fe5413cb7a4f9aef80ae76b3f2a299a75fafabb Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 01:48:09 +0000
Subject: [PATCH 093/208] xf86-input-multitouch seems to be abandoned, update
 it with the mtrack fork

svn path=/nixpkgs/trunk/; revision=33283
---
 pkgs/development/libraries/mtdev/default.nix  |  8 ++--
 .../linux/xf86-input-mtrack/default.nix       | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/os-specific/linux/xf86-input-mtrack/default.nix

diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix
index b8ecdb239c1..854becf6bb5 100644
--- a/pkgs/development/libraries/mtdev/default.nix
+++ b/pkgs/development/libraries/mtdev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "mtdev-1.1.0";
+stdenv.mkDerivation rec {
+  name = "mtdev-1.1.2";
 
   src = fetchurl {
-    url = "http://bitmath.org/code/mtdev/mtdev-1.1.0.tar.bz2";
-    sha256 = "0l5a6vr5r5yx3g86nvj699xlpd5bg5rfzpgjvn46flq4x9r9zpac";
+    url = "http://bitmath.org/code/mtdev/${name}.tar.bz2";
+    sha256 = "0c2sfxxymf20ylvblgmdmybqs0cydmphg9fq6fnp6flbl0fd33b9";
   };
 
   meta = {
diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
new file mode 100644
index 00000000000..f04d2d7f320
--- /dev/null
+++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
@@ -0,0 +1,37 @@
+{
+  stdenv
+, fetchurl
+, autoconf
+, automake
+, utilmacros
+, pkgconfig
+, libtool
+, mtdev
+, xorgserver
+, xproto
+, inputproto
+}:
+
+stdenv.mkDerivation {
+  name = "xf86-input-mtrack-0.2.0";
+
+  preConfigure = "autoreconf -vfi";
+
+  buildInputs = [
+    autoconf
+    automake
+    utilmacros
+    pkgconfig
+    libtool
+    mtdev
+    xorgserver
+    xproto
+    inputproto
+  ];
+
+  src = fetchurl {
+    name = "xf86-input-mtrack.tar.gz";
+    url = "https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.2.0";
+    sha256 = "1zvd68dxpjn44ys7ysi3yc95xdjw1rz0s3xwlh3fzpw1ib3wrr3x";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 83cb9c7eea3..9f8abfdb484 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6071,6 +6071,10 @@ let
 
   wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
 
+  xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack {
+    inherit (xorg) utilmacros xproto inputproto xorgserver;
+  };
+
   xf86_input_multitouch =
     callPackage ../os-specific/linux/xf86-input-multitouch { };
 

From 836532a54b527771ffc4472b3c32f55fb7110a51 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 01:51:03 +0000
Subject: [PATCH 094/208] Whoops, forgot meta

svn path=/nixpkgs/trunk/; revision=33284
---
 pkgs/os-specific/linux/xf86-input-mtrack/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
index f04d2d7f320..405f722f70f 100644
--- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
@@ -34,4 +34,14 @@ stdenv.mkDerivation {
     url = "https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.2.0";
     sha256 = "1zvd68dxpjn44ys7ysi3yc95xdjw1rz0s3xwlh3fzpw1ib3wrr3x";
   };
+
+  meta = {
+    homepage = https://github.com/BlueDragonX/xf86-input-mtrack;
+
+    description = "An Xorg driver for multitouch trackpads";
+
+    license = "gplv2";
+
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
 }

From f272acd50138150b868a2c0c877cd4b8bd608f72 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 04:41:13 +0000
Subject: [PATCH 095/208] Add a module for the pommed tool for Apple laptop
 keyboards.

svn path=/nixpkgs/trunk/; revision=33286
---
 .../libraries/audiofile/default.nix           | 19 +++++
 pkgs/os-specific/linux/pommed/default.nix     | 82 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++
 3 files changed, 107 insertions(+)
 create mode 100644 pkgs/development/libraries/audiofile/default.nix
 create mode 100644 pkgs/os-specific/linux/pommed/default.nix

diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
new file mode 100644
index 00000000000..8ea6470cde8
--- /dev/null
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, alsaLib }:
+
+stdenv.mkDerivation rec {
+  name = "audiofile-0.3.3";
+
+  buildInputs = [ alsaLib ];
+
+  src = fetchurl {
+    url = "http://audiofile.68k.org/${name}.tar.gz";
+    sha256 = "1qm7z0g1d9rcxi1m87slgdi0rhl94g13dx3d2b05dilghwpgjjgq";
+  };
+
+  meta = {
+    description = "A library for reading and writing audio files in various formats";
+    homepage = http://www.68k.org/~michael/audiofile/; 
+    license = "lgpl";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
+}
diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix
new file mode 100644
index 00000000000..d8ccaebea8c
--- /dev/null
+++ b/pkgs/os-specific/linux/pommed/default.nix
@@ -0,0 +1,82 @@
+{ 
+  stdenv
+, fetchurl
+, pciutils
+, confuse
+, dbus, dbus_glib
+, alsaLib
+, audiofile
+, eject
+, pkgconfig
+, gtk
+, gettext
+, libXpm
+}:
+
+let
+
+  build_flags_patch = fetchurl {
+    url = http://patch-tracker.debian.org/patch/series/dl/pommed/1.39~dfsg-2/build_flags.patch;
+    sha256 = "109n5v0m91fqf8vqnpqg1zw8mk8fi9pkzqsfrmlavalg4xz49x9j";
+  }; 
+
+in
+
+stdenv.mkDerivation rec {
+  name = "pommed-1.39";
+
+  src = fetchurl {
+    url = "http://alioth.debian.org/frs/download.php/3583/${name}.tar.gz";
+    sha256 = "18lxywmikanjr5pk1jdqda88dxd2579fpyd332xn4njjhlgwy5fp";
+  };
+
+  patches = [ build_flags_patch ];
+
+  buildInputs = [
+    pciutils
+    confuse
+    dbus
+    alsaLib
+    audiofile
+    eject
+    dbus_glib
+    pkgconfig
+    gtk
+    gettext
+    libXpm
+  ];
+
+  installPhase = ''
+    mkdir -pv $out/bin $out/etc/init.d $out/etc/dbus-1/system.d \
+      $out/share/pommed $out/share/gpomme $out/share/applications \
+      $out/share/icons/hicolor/scalable/apps $out/share/pixmaps
+
+    install -v -m755 pommed/pommed wmpomme/wmpomme gpomme/gpomme $out/bin
+    install -v -m644 pommed/data/* $out/share/pommed
+    install -v -m644 pommed.conf.mactel $out/etc/pommed.conf
+    install -v -m644 pommed.init $out/etc/init.d
+    install -v -m644 dbus-policy.conf $out/etc/dbus-1/system.d/pommed.conf
+
+    cp -av gpomme/themes $out/share/gpomme
+    for lang in de es fr it ja; do
+      mkdir -pv $out/share/locale/"$lang"/LC_MESSAGES
+      install -v -m644 gpomme/po/"$lang".mo $out/share/locale/"$lang"/LC_MESSAGES/gpomme.mo
+    done
+    install -v -m644 gpomme/gpomme*.desktop $out/share/applications
+    for size in 128 16 192 22 24 32 36 48 64 72 96; do
+      mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps
+      install -v -m644 icons/gpomme_"$size"x"$size".png \
+        $out/share/icons/hicolor/"$size"x"$size"/apps
+    done
+    install -v -m644 icons/gpomme.svg  $out/share/icons/hicolor/scalable/apps
+
+    install -v -m644 icons/gpomme_192x192.xpm $out/share/pixmaps/wmpomme.xpm
+  '';
+
+  meta = {
+    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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f8abfdb484..2687126ccd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3223,6 +3223,8 @@ let
 
   aubio = callPackage ../development/libraries/aubio { };
 
+  audiofile = callPackage ../development/libraries/audiofile { };
+
   axis = callPackage ../development/libraries/axis { };
 
   babl = callPackage ../development/libraries/babl { };
@@ -7173,6 +7175,10 @@ let
     gtksharp = gtksharp2;
   };
 
+  pommed = callPackage ../os-specific/linux/pommed {
+    inherit (xorg) libXpm;
+  };
+
   pqiv = callPackage ../applications/graphics/pqiv { };
 
   # perhaps there are better apps for this task? It's how I had configured my preivous system.

From 42b97b78b0aa21344b1596c559f194e13b067f6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 10:00:04 +0000
Subject: [PATCH 096/208] * Mountall updated to 2.35.

svn path=/nixpkgs/trunk/; revision=33287
---
 pkgs/os-specific/linux/mountall/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/mountall/default.nix b/pkgs/os-specific/linux/mountall/default.nix
index d3b0311b449..aed55dc37e3 100644
--- a/pkgs/os-specific/linux/mountall/default.nix
+++ b/pkgs/os-specific/linux/mountall/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libnih, dbus, udev, autoconf, automake, libtool, gettext }:
    
 stdenv.mkDerivation {
-  name = "mountall-2.31";
+  name = "mountall-2.35";
    
   src = fetchurl {
-    url = https://launchpad.net/ubuntu/+archive/primary/+files/mountall_2.31.tar.gz;
-    sha256 = "09885v82kd8x7yf18vw7h6z4816jvn7gmjx5vicxlg4pqlzwqvhv";
+    url = https://launchpad.net/ubuntu/+archive/primary/+files/mountall_2.35.tar.gz;
+    sha256 = "1k52d4x75balnwcsqgznvzrdqgbp2dqnrzw0n25kajdcwr192wwy";
   };
 
   patches = [ ./no-plymouth.patch ];

From 995a44a897884dd7c896d6fbd059ce44eb6a365f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 10:25:11 +0000
Subject: [PATCH 097/208] * Fix a race condition in mountall: the USR1 signal
 handler must be   installed before we daemonise, otherwise another job might
 send   USR1 to mountall before the handler is installed, killing it.

svn path=/nixpkgs/trunk/; revision=33289
---
 pkgs/os-specific/linux/mountall/default.nix   |  2 +-
 .../linux/mountall/fix-usr1-race.patch        | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/mountall/fix-usr1-race.patch

diff --git a/pkgs/os-specific/linux/mountall/default.nix b/pkgs/os-specific/linux/mountall/default.nix
index aed55dc37e3..b563b80f9a9 100644
--- a/pkgs/os-specific/linux/mountall/default.nix
+++ b/pkgs/os-specific/linux/mountall/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1k52d4x75balnwcsqgznvzrdqgbp2dqnrzw0n25kajdcwr192wwy";
   };
 
-  patches = [ ./no-plymouth.patch ];
+  patches = [ ./no-plymouth.patch ./fix-usr1-race.patch ];
 
   preConfigure = "rm -R aclocal.m4; gettextize -f; autoreconf -vfi";
 
diff --git a/pkgs/os-specific/linux/mountall/fix-usr1-race.patch b/pkgs/os-specific/linux/mountall/fix-usr1-race.patch
new file mode 100644
index 00000000000..e970b77733c
--- /dev/null
+++ b/pkgs/os-specific/linux/mountall/fix-usr1-race.patch
@@ -0,0 +1,27 @@
+diff -ru mountall-2.35-orig/src/mountall.c mountall-2.35/src/mountall.c
+--- mountall-2.35-orig/src/mountall.c	2012-03-20 11:01:14.035898815 +0100
++++ mountall-2.35/src/mountall.c	2012-03-20 11:20:39.194786311 +0100
+@@ -3746,6 +3746,12 @@
+ 		exit (EXIT_ERROR);
+ 	}
+ 
++	/* SIGUSR1 tells us that a network device came up.  Install
++           the handler before daemonising so that the mountall-net job
++           won't kill us by sending USR1. */
++	nih_signal_set_handler (SIGUSR1, nih_signal_handler);
++	NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL));
++
+ 	/* Become daemon */
+ 	if (daemonise) {
+ 		pid_t pid;
+@@ -3799,10 +3805,6 @@
+ 	nih_signal_set_handler (SIGTERM, nih_signal_handler);
+ 	NIH_MUST (nih_signal_add_handler (NULL, SIGTERM, nih_main_term_signal, NULL));
+ 
+-	/* SIGUSR1 tells us that a network device came up */
+-	nih_signal_set_handler (SIGUSR1, nih_signal_handler);
+-	NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL));
+-
+ 	/* Check for force-fsck on the kernel command line */
+ 	cmdline = fopen ("/proc/cmdline", "r");
+ 	if (cmdline) {

From bd8d003d695eb2cfa92f057e2a0ccfbe45702852 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 13:54:01 +0000
Subject: [PATCH 098/208] * VirtualBox updated to 4.1.10.  Drop the wrapper
 script since it no   longer seems needed.  Optionally build the Python
 bindings.  Disable   the Java bindings by default to prevent a gratuitous
 dependency on   the JDK.

svn path=/nixpkgs/trunk/; revision=33295
---
 .../virtualization/virtualbox/VBox.sh         | 66 -------------------
 .../virtualization/virtualbox/default.nix     | 49 +++++++-------
 2 files changed, 26 insertions(+), 89 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/virtualbox/VBox.sh

diff --git a/pkgs/applications/virtualization/virtualbox/VBox.sh b/pkgs/applications/virtualization/virtualbox/VBox.sh
deleted file mode 100644
index 407f376cc70..00000000000
--- a/pkgs/applications/virtualization/virtualbox/VBox.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-INSTALL_PATH="@INSTALL_PATH@"
-export LD_LIBRARY_PATH="@INSTALL_PATH@:@QT4_PATH@"
-
-export USER=$(whoami)
-
-if [ ! -c /dev/vboxdrv ]; then
-  echo "/dev/vboxdrv does not exist. Load the kernel module then try again."
-  exit 1
-fi
-if [ ! -r /dev/vboxdrv -o ! -w /dev/vboxdrv ]; then
-  echo "User $USER can not read and/or write to /dev/vboxdrv."
-  exit 1
-fi
-
-echo "/dev/vboxdrv exists and $USER can access it."
-
-SERVER_PID=$(ps -U $USER | grep VBoxSVC | awk '{ print $1 }')
-if [ "$1" = "shutdown" ]; then
-  if [ -n "$SERVER_PID" ]; then
-    echo "Terminating VBoxSVC with PID $SERVER_PID."
-    kill -TERM $SERVER_PID
-  else
-    echo "VBoxSVC Not Currently Running."
-  fi
-  exit 0
-fi
-
-if [ ! -x "$INSTALL_PATH/VBoxSVC" ]; then
-  echo "$INSTALL_PATH/VBoxSVC does not exist! Can not continue."
-  exit 1
-fi
-
-APP=$(which $0)
-APP=${APP##/*/}
-
-if [ ! -x "$INSTALL_PATH/$APP" ]; then
-  echo "$INSTALL_PATH/$APP does not exist!"
-  exit 1
-fi
-case "$APP" in
-  VirtualBox|VBoxManage|VBoxSDL|VBoxVRDP)
-    EXEC_APP="$INSTALL_PATH/$APP"
-  ;;
-  *)
-    echo "Unknown application - $APP."
-  ;;
-esac
-
-if [ -z "$SERVER_PID" ]; then
-  rm -rf /tmp/.vbox-$USER-ipc
-  echo "Starting VBoxSVC for $USER."
-  "$INSTALL_PATH/VBoxSVC" --daemonize
-fi
-
-SERVER_PID=$(ps -U $USER | grep VBoxSVC | awk '{ print $1 }')
-if [ -z "$SERVER_PID" ]; then
-  echo "VBoxSVC failed to start! Can not continue"
-  exit 1
-fi
-
-echo "VBoxSVC is running for user $USER with PID $SERVER_PID."
-
-echo "Starting $EXEC_APP."
-exec "$EXEC_APP" "$@"
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 76cc945baef..9fa26eba4ab 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,30 +1,36 @@
 { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
 , libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel
-, python, which, alsaLib, curl, gawk
-, xorriso, makeself, perl, jdk, pkgconfig
+, which, alsaLib, curl, gawk
+, xorriso, makeself, perl, pkgconfig
+, javaBindings ? false, jdk ? null
+, pythonBindings ? false, python ? null
 }:
 
-let version = "4.1.8"; in
+with stdenv.lib;
+
+let version = "4.1.10"; in
 
 stdenv.mkDerivation {
   name = "virtualbox-${version}-${kernel.version}";
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "1q04825ayynzgh8zl6y038lzxp3jk1a3dxpg6f52kk4vkirdc5pg";
+    sha256 = "1gsp3arp79x6gmh403sayh4lzr3l8fc3anp664fyl1dl0ykgmqs7";
   };
 
   buildInputs =
     [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
       libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk
-      pkgconfig which libXmu
-    ];
+      pkgconfig which libXmu ]
+    ++ optional javaBindings jdk
+    ++ optional pythonBindings python;
 
   patchPhase = ''
     set -x
     MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
     sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
         -e 's@MKISOFS --version@MKISOFS -version@' \
+        -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
         -i configure
     ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 
     ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 
@@ -34,7 +40,11 @@ stdenv.mkDerivation {
   '';
 
   configurePhase = ''
-    ./configure --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening --with-mkisofs=${xorriso}/bin/xorrisofs
+    ./configure --with-qt4-dir=${qt4} \
+      ${optionalString (!javaBindings) "--disable-java"} \
+      ${optionalString (!pythonBindings) "--disable-python"} \
+      --disable-pulse --disable-hardening \
+      --with-mkisofs=${xorriso}/bin/xorrisofs
     sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
         -i AutoConfig.kmk
     sed -e 's@arch/x86/@@' \
@@ -63,10 +73,12 @@ stdenv.mkDerivation {
   '';
     
   installPhase = ''
+    libexec=$out/libexec/virtualbox
+  
     # Install VirtualBox files
     cd out/linux.*/release/bin
-    mkdir -p $out/virtualbox
-    cp -av * $out/virtualbox
+    mkdir -p $libexec
+    cp -av * $libexec
     
     # Install kernel module
     cd src
@@ -74,8 +86,7 @@ stdenv.mkDerivation {
     export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
     
     # Remove root ownership stuff, since this does not work in a chroot environment
-    for i in `find . -name Makefile`
-    do
+    for i in `find . -name Makefile`; do
 	sed -i -e "s|-o root||g" \
                -e "s|-g root||g" $i
     done
@@ -85,22 +96,14 @@ stdenv.mkDerivation {
     
     # Create wrapper script
     mkdir -p $out/bin
-    cp -v ${./VBox.sh} $out/bin/VBox.sh
-    sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \
-           -e "s|@QT4_PATH@|${qt4}/lib|" \
-	   -e "s|which|${which}/bin/which|" \
-	   -e "s|awk|${gawk}/bin/awk|" \
-	   $out/bin/VBox.sh
-    chmod 755 $out/bin/VBox.sh
-    for file in VirtualBox VBoxManage VBoxSDL
-    do
-        [ -f "$out/virtualbox/$file" ] && ln -sfv $out/bin/VBox.sh $out/bin/$file
+    for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do
+        ln -s "$libexec/$file" $out/bin/$file
     done
     
     # Create and fix desktop item
     mkdir -p $out/share/applications
-    sed -i -e "s|Icon=VBox|Icon=$out/virtualbox/VBox.png|" $out/virtualbox/virtualbox.desktop
-    ln -sfv $out/virtualbox/virtualbox.desktop $out/share/applications
+    sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop
+    ln -sfv $libexec/virtualbox.desktop $out/share/applications
   '';
   
   meta = {

From 34fcba81bec9c660b37ee348acc7ff6af7678525 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Mar 2012 14:12:53 +0000
Subject: [PATCH 099/208] Add new release of kdevelop

I'll remove the old release when Hydra will build the new one, and I'll test the
result.

svn path=/nixpkgs/trunk/; revision=33296
---
 pkgs/applications/editors/kdevelop/4.3.0.nix  | 34 +++++++++++++++++++
 .../libraries/kdevplatform/1.3.0.nix          | 27 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 3 files changed, 65 insertions(+)
 create mode 100644 pkgs/applications/editors/kdevelop/4.3.0.nix
 create mode 100644 pkgs/development/libraries/kdevplatform/1.3.0.nix

diff --git a/pkgs/applications/editors/kdevelop/4.3.0.nix b/pkgs/applications/editors/kdevelop/4.3.0.nix
new file mode 100644
index 00000000000..082246cb0a6
--- /dev/null
+++ b/pkgs/applications/editors/kdevelop/4.3.0.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
+  kdebase_workspace, gettext, perl, okteta }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "4.3.0";
+  pname = "kdevelop";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
+    sha256 = "0ay3d2s5442pvdsx9lyfzb986kh6848qhbls9ff982f0glzqdcya";
+  };
+
+  buildInputs = [ kdevplatform kdebase_workspace okteta ];
+
+  buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
+
+  NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
+
+  meta = with stdenv.lib; {
+    maintainers = [ maintainers.urkud ];
+    platforms = platforms.linux;
+    description = "KDE official IDE";
+    longDescription =
+      ''
+        A free, opensource IDE (Integrated Development Environment)
+        for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a
+        feature-full, plugin extendable IDE for C/C++ and other
+        programing languages. It is based on KDevPlatform, KDE and Qt
+        libraries and is under development since 1998.
+      '';
+    homepage = http://www.kdevelop.org;
+  };
+}
diff --git a/pkgs/development/libraries/kdevplatform/1.3.0.nix b/pkgs/development/libraries/kdevplatform/1.3.0.nix
new file mode 100644
index 00000000000..10aa4c02028
--- /dev/null
+++ b/pkgs/development/libraries/kdevplatform/1.3.0.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, perl, phonon,
+  gettext, pkgconfig, apr, aprutil, boost, qjson }:
+
+stdenv.mkDerivation rec {
+  name = "kdevplatform-1.3.0";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/kdevelop/4.3.0/src/${name}.tar.bz2";
+    sha256 = "0afka8999csyj8hbgmcsbn8h2by04v7n8k4mrwkl0b79crdvwbcd";
+  };
+
+  propagatedBuildInputs = [ kdelibs qt4 phonon ];
+  buildInputs = [ apr aprutil subversion boost qjson ];
+
+  buildNativeInputs = [ cmake automoc4 gettext pkgconfig ];
+
+  meta = {
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.linux;
+    description = "KDE libraries for IDE-like programs";
+    longDescription = ''
+      A free, opensource set of libraries that can be used as a foundation for
+      IDE-like programs. It is programing-language independent, and is planned
+      to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc."
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2687126ccd5..e67e654dfa8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7973,8 +7973,12 @@ let
       kdesvn = callPackage ../applications/version-management/kdesvn { };
 
       kdevelop = callPackage ../applications/editors/kdevelop { };
+      kdevelop_4_3 = callPackage ../applications/editors/kdevelop/4.3.0.nix {
+        kdevplatform = self.kdevplatform_1_3;
+      };
 
       kdevplatform = callPackage ../development/libraries/kdevplatform { };
+      kdevplatform_1_3 = callPackage ../development/libraries/kdevplatform/1.3.0.nix { };
 
       kdiff3 = callPackage ../tools/text/kdiff3 { };
 

From 73ce1dd4bb15b8a3f7f71c798efcc0b676cf7dcd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 14:41:24 +0000
Subject: [PATCH 100/208] * Adobe Reader: install .desktop file in the right
 place.

svn path=/nixpkgs/trunk/; revision=33297
---
 pkgs/applications/misc/adobe-reader/builder.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh
index 1f4844a22c4..174dd70ab04 100644
--- a/pkgs/applications/misc/adobe-reader/builder.sh
+++ b/pkgs/applications/misc/adobe-reader/builder.sh
@@ -26,3 +26,12 @@ substituteInPlace $out/Adobe/Reader*/bin/acroread \
 
 mkdir -p $out/bin
 ln -s $out/Adobe/Reader*/bin/acroread $out/bin/acroread
+
+mkdir -p $out/share/applications
+mv $out/Adobe/Reader9/Resource/Support/AdobeReader.desktop $out/share/applications/
+sed -i $out/share/applications/AdobeReader.desktop \
+    -e "s|Icon=.*|Icon=$out/Adobe/Reader9/Resource/Icons/128x128/AdobeReader9.png|"
+
+# Not sure if this works.
+mkdir -p $out/share/mimelnk/application
+mv $out/Adobe/Reader9/Resource/Support/vnd*.desktop $out/share/mimelnk/application

From fc152de1c2c42bd02776908b07abc040080fe0cc Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Tue, 20 Mar 2012 14:51:18 +0000
Subject: [PATCH 101/208] rewrote the text to make virics and my edits seem
 like from one author

svn path=/nixpkgs/trunk/; revision=33298
---
 pkgs/misc/my-env/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 200485eea63..ab1eff9bf33 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -11,8 +11,10 @@
     };
   }
 
-  # Then you can install it by:   nix-env -i sdl-env
-  # And you can load it simply calling:  load-sdl-env
+  # Then you can install it by:  
+  #  $ nix-env -i sdl-env
+  # And you can load it simply calling:  
+  #  $ load-sdl-env
   # and this will update your env vars to have 'make' and 'gcc' finding the SDL
   # headers and libs.
 
@@ -44,13 +46,13 @@
     };
   }
 
-  Now we should build our newly defined custom environment using this command on a shell, so type:
-    $ nix-env -i env-nix
+  # Now we should build our newly defined custom environment using this command on a shell, so type:
+  #  $ nix-env -i env-nix
 
-  You can load the environment simply typing a "load-${name}-env" command.
-    $ load-nix-env
-  The result using that command should be:
-    env-nix loaded
+  # You can load the environment simply typing a "load-${name}-env" command.
+  #  $ load-nix-env
+  # The result using that command should be:
+  #  env-nix loaded
 */
 
 { mkDerivation, substituteAll, pkgs } : { stdenv ? pkgs.stdenv, name, buildInputs ? [], cTags ? [], extraCmds ? ""} :

From 102a1d82e73ebc41db99605c5fe0da23a093cd48 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Mar 2012 16:17:46 +0000
Subject: [PATCH 102/208] Oops, fix kdevelop-4.3.0 hash

svn path=/nixpkgs/trunk/; revision=33299
---
 pkgs/applications/editors/kdevelop/4.3.0.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/kdevelop/4.3.0.nix b/pkgs/applications/editors/kdevelop/4.3.0.nix
index 082246cb0a6..92b4da5280a 100644
--- a/pkgs/applications/editors/kdevelop/4.3.0.nix
+++ b/pkgs/applications/editors/kdevelop/4.3.0.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0ay3d2s5442pvdsx9lyfzb986kh6848qhbls9ff982f0glzqdcya";
+    sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr";
   };
 
   buildInputs = [ kdevplatform kdebase_workspace okteta ];

From 8d1d247e027a85cdca28d8c54fa35c1473d7bb63 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 16:29:22 +0000
Subject: [PATCH 103/208] Add nouveau xorg video driver

svn path=/nixpkgs/trunk/; revision=33300
---
 .../linux/xf86-video-nouveau/default.nix      | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +++
 2 files changed, 46 insertions(+)
 create 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
new file mode 100644
index 00000000000..e92b7f8003d
--- /dev/null
+++ b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchgit
+, autoconf
+, automake
+, libtool
+, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto
+, utilmacros
+, libdrm
+, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "xf86-video-nouveau-2012-03-05";
+
+  src = fetchgit {
+    url = git://anongit.freedesktop.org/nouveau/xf86-video-nouveau;
+    rev = "f5d1cd2cb6808838ae1a188cef888eaa9582c76d";
+    sha256 = "8c20e9ce7897fbd4c5097e4738e80ecca30e6326b758a13fc97f96ccc12fd7d9"; 
+  };
+
+  buildInputs = [
+    autoconf
+    automake
+    libtool
+    xorgserver xproto fontsproto xf86driproto renderproto videoproto
+    utilmacros
+    libdrm
+    pkgconfig
+  ];
+
+  preConfigure = "autoreconf -vfi";
+
+  meta = {
+    homepage = http://nouveau.freedesktop.org/wiki/;
+
+    description = "The xorg driver for nouveau-driven video cards";
+
+    license = "gplv2";
+
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e67e654dfa8..fb88ba19bbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6082,6 +6082,11 @@ let
 
   xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
 
+  xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau { 
+    inherit (xorg) xorgserver xproto fontsproto xf86driproto renderproto
+      videoproto utilmacros;
+  };
+
   xmoto = builderDefsPackage (import ../games/xmoto) {
     inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng
       freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf

From bdc3de6a4dbf4f0520033b19bcdb2d37eb590348 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 18:28:32 +0000
Subject: [PATCH 104/208] Pommed: find the 'eject' command in
 /var/setuid-wrappers:/home/shlevy/.nix-profile/bin:/home/shlevy/.nix-profile/sbin:/home/shlevy/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec

svn path=/nixpkgs/trunk/; revision=33302
---
 pkgs/os-specific/linux/pommed/default.nix            |  4 +---
 .../linux/pommed/find-eject-in-path.patch            | 12 ++++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/os-specific/linux/pommed/find-eject-in-path.patch

diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix
index d8ccaebea8c..d6c06eca12f 100644
--- a/pkgs/os-specific/linux/pommed/default.nix
+++ b/pkgs/os-specific/linux/pommed/default.nix
@@ -6,7 +6,6 @@
 , dbus, dbus_glib
 , alsaLib
 , audiofile
-, eject
 , pkgconfig
 , gtk
 , gettext
@@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
     sha256 = "18lxywmikanjr5pk1jdqda88dxd2579fpyd332xn4njjhlgwy5fp";
   };
 
-  patches = [ build_flags_patch ];
+  patches = [ build_flags_patch ./find-eject-in-path.patch ];
 
   buildInputs = [
     pciutils
@@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
     dbus
     alsaLib
     audiofile
-    eject
     dbus_glib
     pkgconfig
     gtk
diff --git a/pkgs/os-specific/linux/pommed/find-eject-in-path.patch b/pkgs/os-specific/linux/pommed/find-eject-in-path.patch
new file mode 100644
index 00000000000..d021a0290ee
--- /dev/null
+++ b/pkgs/os-specific/linux/pommed/find-eject-in-path.patch
@@ -0,0 +1,12 @@
+diff -Naur pommed-1.39-orig/pommed/cd_eject.c pommed-1.39/pommed/cd_eject.c
+--- pommed-1.39-orig/pommed/cd_eject.c	2011-06-02 05:24:05.000000000 -0400
++++ pommed-1.39/pommed/cd_eject.c	2012-03-20 14:25:33.397712520 -0400
+@@ -100,7 +100,7 @@
+       for (fd = 3; fd < max_fd; fd++)
+ 	close(fd);
+ 
+-      execve("/usr/bin/eject", eject_argv, eject_envp);
++      execvpe("eject", eject_argv, eject_envp);
+ 
+       logmsg(LOG_ERR, "Could not execute eject: %s", strerror(errno));
+       exit(1);

From 49fabfacab9b5e5905eb2317c66827e0388c6675 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Tue, 20 Mar 2012 18:41:03 +0000
Subject: [PATCH 105/208] Upgrading ardour3-svn to beta3, currently ardour2
 does not run.

svn path=/nixpkgs/trunk/; revision=33303
---
 pkgs/applications/audio/ardour/ardour3.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
index dea27cb6a55..c719e4d650e 100644
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -5,16 +5,16 @@ librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile,
 libusb, libuuid, libxml2, libxslt, pango, perl, pkgconfig, python }:
 
 let
-  rev = "9942";
+  rev = "11483";
 in
 
 stdenv.mkDerivation {
   name = "ardour3-svn-${rev}";
 
   src = fetchsvn {
-    url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
+    url = http://subversion.ardour.org/svn/ardour2/tags/3.0-beta3;
     inherit rev;
-    sha256 = "5f463e5a67bcb1ee6b4d24c25307419ea14ce52130819054b775e377c31a0664";
+    sha256 = "02az11lvfbln475np9jyfkdlrkpp1pszjmk6gl75wq6ws08dd7rd";
   };
 
   buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec

From fc3ac31540f57d933fcaca8b65c2a38491d8f369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 20 Mar 2012 18:49:44 +0000
Subject: [PATCH 106/208] Updating the script of loading myEnv environments,
 for something close to what I was using. It sets a fixed PS1, maybe breaking
 someone's taste, though. But I find it easier to use.

svn path=/nixpkgs/trunk/; revision=33304
---
 pkgs/misc/my-env/default.nix | 13 ++++++-------
 pkgs/misc/my-env/loadenv.sh  | 13 +++++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/misc/my-env/loadenv.sh

diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index ab1eff9bf33..660b757f327 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -53,9 +53,10 @@
   #  $ load-nix-env
   # The result using that command should be:
   #  env-nix loaded
+  and show you a shell with a prefixed prompt.
 */
 
-{ mkDerivation, substituteAll, pkgs } : { stdenv ? pkgs.stdenv, name, buildInputs ? [], cTags ? [], extraCmds ? ""} :
+{ mkDerivation, substituteAll, pkgs } : { stdenv ? pkgs.stdenv, name, buildInputs ? [], cTags ? [], extraCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash"} :
 mkDerivation {
   # The setup.sh script from stdenv will expect the native build inputs in
   # the buildNativeInputs environment variable.
@@ -126,11 +127,9 @@ mkDerivation {
       echo $name loaded
     EOF
 
-    cat >> "$out/bin/load-''${name/env-/}-env" << EOF
-    #!/bin/sh
-
-    source "$out/dev-envs/''${name/env-/}"
-    EOF
-    chmod +x "$out/bin/load-''${name/env-/}-env" 
+    mkdir -p $out/bin
+    sed -e s,@shell@,${shell}, -e s,@myenvpath@,$out/dev-envs/${name}, \
+      -e s,@name@,${name}, ${./loadenv.sh} > $out/bin/load-${name}-env
+    chmod +x $out/bin/load-${name}-env
   '';
 }
diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh
new file mode 100644
index 00000000000..c116c14d8fe
--- /dev/null
+++ b/pkgs/misc/my-env/loadenv.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+OLDPATH="$PATH"
+OLDTZ="$TZ"
+source @myenvpath@
+
+PATH="$PATH:$OLDPATH"
+export PS1="\n@name@:[\u@\h:\w]\$ "
+export buildInputs
+export NIX_STRIP_DEBUG=0
+export TZ="$OLDTZ"
+
+exec @shell@ --norc

From efcc0c9b1effdb1d2d1730635f0555bec9a74b26 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Tue, 20 Mar 2012 18:53:01 +0000
Subject: [PATCH 107/208] Adding some notes on why ardour2 is not working,
 perhaps someone else can take this up, or else we just remove ardour2 when
 ardour3 is released.

svn path=/nixpkgs/trunk/; revision=33305
---
 pkgs/applications/audio/ardour/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index f60a0002b7b..58ed4c61f4b 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchsvn, scons, boost, pkgconfig, fftw, librdf_raptor
 , librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
 , libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
-, gtk, glibmm, gtkmm, libgnomecanvas, librdf, liblo, aubio
-, fftwSinglePrec, libmad, automake, autoconf, liblrdf, libtool }:
+, gtk, glibmm, gtkmm, libgnomecanvas,  liblo, aubio
+, fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf }:
 
 stdenv.mkDerivation rec {
   name = "ardour-${version}";
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
   # but hash is changing ?
 
   # TODO: see if this is also true when using a tag (~goibhniu)
+
+  # This version does not run it exits with the following error:
+  # raptor_new_uri_for_rdf_concept called with Raptor V1 world object
+  # raptor_general.c:240:raptor_init: fatal error: raptor_init() failedAborted
   src = fetchsvn {
     url = "http://subversion.ardour.org/svn/ardour2/tags/${version}";
     sha256 = "0d4y8bv12kb0yd2srvxn5388sa4cl5d5rk381saj9f3jgpiciyky";
@@ -27,8 +31,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio
     flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
-    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas librdf
-    liblo aubio fftwSinglePrec libmad autoconf automake liblrdf libtool
+    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas liblrdf
+    liblo aubio fftwSinglePrec libmad autoconf automake libtool
   ];
 
   buildPhase = ''
@@ -42,6 +46,7 @@ stdenv.mkDerivation rec {
   meta = { 
     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/;

From f9a5fa373e26ae83e8ab63de6edb4da5b9f39d84 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Tue, 20 Mar 2012 19:11:22 +0000
Subject: [PATCH 108/208] Upgrading HOL4 to version k.7.

svn path=/nixpkgs/trunk/; revision=33306
---
 .../science/logic/hol/default.nix             | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix
index 5552fadc555..18a16114c50 100644
--- a/pkgs/applications/science/logic/hol/default.nix
+++ b/pkgs/applications/science/logic/hol/default.nix
@@ -1,12 +1,17 @@
-{stdenv, fetchurl, polyml}:
+{stdenv, fetchurl, polyml, experimentalKernel ? false}:
+
+let
+  pname = "hol4";
+  version = "k.7";
+  kernelFlag = if experimentalKernel then "-expk" else "-stdknl";
+in
 
 stdenv.mkDerivation {
-  name = "hol";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    #url = "http://downloads.sourceforge.net/project/hol/hol/kananaskis-5/kananaskis-5.tar.gz";
-    url = mirror://sourceforge/hol/hol/kananaskis-5/kananaskis-5.tar.gz;
-    sha256 = "1qjfx5ii80v17yr04hz70n8aa46892fjc4qcxs9gs7nh3hw7rvmx";
+    url = mirror://sourceforge/hol/hol/kananaskis-7/kananaskis-7.tar.gz;
+    sha256 = "0gs1nmjvsjhnndama9v7gids2g86iip53v7d7dm3sfq6jxmqkwkl";
   };
 
   buildInputs = [polyml];
@@ -16,21 +21,21 @@ stdenv.mkDerivation {
     cd  "$out/src"
 
     tar -xzf "$src"
-    cd hol
+    cd hol4.${version}
 
-    substituteInPlace tools-poly/Holmake/Holmake.sml --replace \
-      "\"/bin/mv\"" \
-      "\"mv\""
+    substituteInPlace tools/Holmake/Holmake_types.sml \
+      --replace "\"/bin/mv\"" "\"mv\"" \
+      --replace "\"/bin/cp\"" "\"cp\""
 
     #sed -ie "/compute/,999 d" tools/build-sequence # for testing
 
     poly < tools/smart-configure.sml
     
-    bin/build -expk -symlink
+    bin/build ${kernelFlag} -symlink
 
     mkdir -p "$out/bin"
-    ln -st $out/bin  $out/src/hol/bin/*
-    # ln -s $out/src/hol/bin $out/bin
+    ln -st $out/bin  $out/src/hol4.${version}/bin/*
+    # ln -s $out/src/hol4.${version}/bin $out/bin
   '';
 
   meta = {

From 9dcf8dffa2fc588d683d514c0d0fbb4063e8357b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Mar 2012 21:45:15 +0000
Subject: [PATCH 109/208] Enable perlqt and smokekde from kdebindings

I had to patch their buildsystem. I'm going to submit the patches upstream next
week.

svn path=/nixpkgs/trunk/; revision=33309
---
 pkgs/desktops/kde-4.8/default.nix             |   4 +-
 .../kdebindings/perlqt-include-smokeqt.patch  |  19 +
 .../perlqt-rewrite-FindPerlMore.patch         | 118 +++++
 .../perlqt-use-site-arch-install-dir.patch    | 454 ++++++++++++++++++
 pkgs/desktops/kde-4.8/kdebindings/perlqt.nix  |   6 +
 .../kde-4.8/kdebindings/smokegen-nix.patch    |  46 ++
 .../desktops/kde-4.8/kdebindings/smokegen.nix |   2 +-
 .../desktops/kde-4.8/kdebindings/smokekde.nix |  11 +
 8 files changed, 657 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch
 create mode 100644 pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch
 create mode 100644 pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch
 create mode 100644 pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch
 create mode 100644 pkgs/desktops/kde-4.8/kdebindings/smokekde.nix

diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix
index 24485d30e0c..f086b06ab9d 100644
--- a/pkgs/desktops/kde-4.8/default.nix
+++ b/pkgs/desktops/kde-4.8/default.nix
@@ -15,8 +15,8 @@ let
     # kdesdk/kioslave is splitted into kioslave-svn and kioslave-git
     kdesdk = [ "kioslave" ];
     # Most of kdebindings do not compile due to a bug in the buildsystem
-    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "perlqt"
-      "qtruby" "qyoto" "smokekde" ];
+    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde"
+      "qtruby" "qyoto" ];
   };
 
   # Extra subpackages in the manifest format
diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch b/pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch
new file mode 100644
index 00000000000..fd67860283b
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch
@@ -0,0 +1,19 @@
+commit 48b92b74bc6fd270c33a726257e2879203cf5064
+Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
+Date:   Wed Mar 21 00:47:43 2012 +0400
+
+    Include SMOKE_QTCORE_INCLUDE_DIR
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 48020a1..2263a73 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@ find_package(Smoke COMPONENTS QtCore QtGui QtNetwork Qt3Support QtDeclarative Qt
+                               QtOpenGl QtScript QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns
+                               Phonon Qwt QSci QImageBlitz)
+                               
+-include_directories(${SMOKE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src)
++include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${SMOKE_CMAKE_MODULE_DIR})
+ include(MacroOptionalFindPackage)
+ include(MacroOptionalAddBindings)
diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch b/pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch
new file mode 100644
index 00000000000..c7f73815f54
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch
@@ -0,0 +1,118 @@
+commit e702abfd16f610e773fb0310d8c6512991794c63
+Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
+Date:   Wed Mar 21 00:50:02 2012 +0400
+
+    Rewrite FindPerlMore.cmake
+    
+    * Ask perl for expanded paths
+    * Move execute_process to a macro
+    * Add PERL_*_INSTALL_DIR variables that point to CMAKE_INSTALL_PREFIX
+    
+    The last change makes it easy to install a file into CMAKE_INSTALL_PREFIX
+    instead of perl install prefix.Add debug message
+
+diff --git a/cmake/FindPerlMore.cmake b/cmake/FindPerlMore.cmake
+index 6412a47..cc8faf8 100644
+--- a/cmake/FindPerlMore.cmake
++++ b/cmake/FindPerlMore.cmake
+@@ -5,54 +5,52 @@
+ #
+ #  PERL_INCLUDE_PATH = path to where perl.h can be found
+ 
+-if(PERL_INCLUDE_PATH)
+-   # Already in cache, be silent
+-   SET(PERL_HEADERS_FOUND TRUE)
+-endif (PERL_INCLUDE_PATH)		
+-
+-IF(PERL_EXECUTABLE)
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{archlib}"
+-   		OUTPUT_VARIABLE PERL_ARCH_LIB_DIR)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitearch}"
+-   		OUTPUT_VARIABLE PERL_SITE_ARCH_DIR)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorarch}"
+-   		OUTPUT_VARIABLE PERL_VENDOR_ARCH_DIR)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitelib}"
+-   		OUTPUT_VARIABLE PERL_SITE_LIB_DIR)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorlib}"
+-   		OUTPUT_VARIABLE PERL_VENDOR_LIB_DIR)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{version}"
+-   		OUTPUT_VARIABLE PERL_VERSION)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccflags}"
+-   		OUTPUT_VARIABLE PERL_CXX_FLAGS)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccdlflags}"
+-   		OUTPUT_VARIABLE PERL_CCDL_FLAGS)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
+-   		OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{perllibs}"
+-   		OUTPUT_VARIABLE PERL_LIBS)
+-
+-	FIND_PATH(PERL_INCLUDE_PATH 
+-  		NAMES perl.h
+-  		PATHS ${PERL_ARCH_LIB_DIR}/CORE
+-  	)
+-
+-	if(PERL_INCLUDE_PATH)
+-		SET(PERL_HEADERS_FOUND TRUE)
+-	endif (PERL_INCLUDE_PATH)
+-
+-	MARK_AS_ADVANCED(
+-	  PERL_INCLUDE_PATH
+-	  )
++if(FIND_PERLMORE_REQUIRED)
++  find_package(Perl REQUIRED)
++else()
++ find_package(Perl)
++endif()
++
++macro(_perl_get_config_var name output)
++  execute_process(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{${name}}"
++                  OUTPUT_VARIABLE PERL_${output})
++endmacro()
++
++macro(_perl_get_config_dir name)
++  string(TOLOWER ${name} _tmp)
++  string(REPLACE "_" "" _tmp ${_tmp})
++  _perl_get_config_var(${_tmp}exp ${name}_DIR)
++  string(REPLACE "${PERL_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" PERL_${name}_INSTALL_DIR "${PERL_${name}_DIR}")
++endmacro()
++
++if(PERL_EXECUTABLE)
++  _perl_get_config_var(prefixexp ROOT_DIR)
++
++  _perl_get_config_dir(ARCH_LIB)
++  _perl_get_config_dir(SITE_ARCH)
++  _perl_get_config_dir(VENDOR_ARCH)
++  _perl_get_config_dir(SITE_LIB)
++  _perl_get_config_dir(VENDOR_LIB)
++
++  _perl_get_config_var(version VERSION)
++  _perl_get_config_var(ccflags CXX_FLAGS)
++  _perl_get_config_var(ccdlflags CCDL_FLAGS)
++
++  EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
++                  OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
++
++  _perl_get_config_var(perllibs LIBS)
++
++  FIND_PATH(PERL_INCLUDE_PATH
++            NAMES perl.h
++            HINTS ${PERL_ARCH_LIB_DIR}/CORE
++  )
++
++  if(PERL_INCLUDE_PATH)
++    SET(PERL_HEADERS_FOUND TRUE)
++  endif (PERL_INCLUDE_PATH)
++
++  MARK_AS_ADVANCED(PERL_INCLUDE_PATH)
+ ENDIF(PERL_EXECUTABLE)
+ 
+ IF(PERL_HEADERS_FOUND)
diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch b/pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch
new file mode 100644
index 00000000000..04f0c558677
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch
@@ -0,0 +1,454 @@
+commit c78779fcaff587818ee37bec3ded5e0617625b95
+Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
+Date:   Wed Mar 21 01:01:27 2012 +0400
+
+    Install to PERL_SITE_ARCH_INSTALL_DIR
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 48020a1..16188df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,7 +36,6 @@ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 libraries for Qt4" "http:/
+ add_definitions(-DDEBUG)
+ 
+ include (FindPerlMore)
+-set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITE_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension")
+ 
+ # the RPATH to be used when installing, but only if it's not a system directory
+ GET_FILENAME_COMPONENT(SMOKE_LIB_DIR ${SMOKE_BASE_LIBRARY} PATH)
+diff --git a/INSTALL b/INSTALL
+index d19f97e..97cc9f1 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -36,7 +36,6 @@ ccmake step.
+ The standard options are:
+     CMAKE_BUILD_TYPE = The type of build ('Debug', 'Release', etc)
+     CMAKE_INSTALL_PREFIX = The location for any executables ( e.g. puic4 )
+-    CUSTOM_PERL_SITE_ARCH_DIR = The location for the perl modules themselves.
+     QT_QMAKE_EXECUTABLE = The path to your system's qmake.
+ 
+ cmake looks in your path for a qmake executable.  If it can't find it, it will
+diff --git a/Makefile.PL b/Makefile.PL
+index df9a13c..31dd912 100755
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -3,7 +3,7 @@
+ use strict;
+ use Config;
+ 
+-my ($prefix, $sitearch, $qmake) = ($Config{prefix}, $Config{sitearch});
++my ($prefix, $qmake) = ($Config{prefix});
+ my @cmakeArgs;
+ foreach my $arg (@ARGV) {
+     my $key = $arg;
+@@ -12,7 +12,6 @@ foreach my $arg (@ARGV) {
+     $value =~ s/^[^=]*=//g;
+     if ($key eq 'PREFIX' or $key eq 'INSTALL_BASE') {
+         $prefix = $value;
+-        $sitearch = "$prefix";
+     }
+     elsif ($key eq 'QMAKE') {
+         $qmake = $value;
+@@ -34,7 +33,6 @@ if($^O =~ /win/i){
+ }
+ push @args, "-DCMAKE_INSTALL_PREFIX=$prefix" if $prefix;
+ push @args, "-DQT_QMAKE_EXECUTABLE=$qmake" if $qmake;
+-push @args, "-DCUSTOM_PERL_SITE_ARCH_DIR=$sitearch" if $sitearch;
+ push @args, @cmakeArgs;
+ 
+ if ( eval "require Alien::SmokeQt" ) {
+diff --git a/phonon/lib/CMakeLists.txt b/phonon/lib/CMakeLists.txt
+index f2857c3..78674ea 100644
+--- a/phonon/lib/CMakeLists.txt
++++ b/phonon/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(phononpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Phonon.pm ${CMAKE_BINARY_DIR}/blib/lib/Phonon.pm)
+-install(FILES Phonon.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES Phonon.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/phonon/src/CMakeLists.txt b/phonon/src/CMakeLists.txt
+index a04db11..9933dfd 100644
+--- a/phonon/src/CMakeLists.txt
++++ b/phonon/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_phonon
+ set_target_properties(perl_phonon PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_phonon PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_phonon DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_phonon DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qimageblitz/lib/CMakeLists.txt b/qimageblitz/lib/CMakeLists.txt
+index 0809ba8..22fc1c0 100644
+--- a/qimageblitz/lib/CMakeLists.txt
++++ b/qimageblitz/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qimageblitzpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QImageBlitz.pm ${CMAKE_BINARY_DIR}/blib/lib/QImageBlitz.pm)
+-install(FILES QImageBlitz.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QImageBlitz.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qimageblitz/src/CMakeLists.txt b/qimageblitz/src/CMakeLists.txt
+index 02ef494..4f02c1b 100644
+--- a/qimageblitz/src/CMakeLists.txt
++++ b/qimageblitz/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qimageblitz
+ set_target_properties(perl_qimageblitz PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qimageblitz PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qimageblitz DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qimageblitz DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qsci/lib/CMakeLists.txt b/qsci/lib/CMakeLists.txt
+index 63b451f..d22869f 100644
+--- a/qsci/lib/CMakeLists.txt
++++ b/qsci/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qscipm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qsci.pm ${CMAKE_BINARY_DIR}/blib/lib/Qsci.pm)
+-install(FILES Qsci.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES Qsci.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qsci/src/CMakeLists.txt b/qsci/src/CMakeLists.txt
+index 8c1659b..bdcb5a8 100644
+--- a/qsci/src/CMakeLists.txt
++++ b/qsci/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qsci
+ set_target_properties(perl_qsci PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qsci PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qsci DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qsci DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qt3support/lib/CMakeLists.txt b/qt3support/lib/CMakeLists.txt
+index 2f04cfa..dda5afa 100644
+--- a/qt3support/lib/CMakeLists.txt
++++ b/qt3support/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qt3support4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qt3Support4.pm ${CMAKE_BINARY_DIR}/blib/lib/Qt3Support4.pm)
+-install(FILES Qt3Support4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES Qt3Support4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qt3support/src/CMakeLists.txt b/qt3support/src/CMakeLists.txt
+index b24532e..bed99aa 100644
+--- a/qt3support/src/CMakeLists.txt
++++ b/qt3support/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qt3support4
+ set_target_properties(perl_qt3support4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qt3support4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qt3support4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qt3support4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtcore/lib/CMakeLists.txt b/qtcore/lib/CMakeLists.txt
+index ef07d10..1d78196 100644
+--- a/qtcore/lib/CMakeLists.txt
++++ b/qtcore/lib/CMakeLists.txt
+@@ -1,3 +1,3 @@
+ add_subdirectory( QtCore4 )
+ add_custom_target(perlqtcore4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtCore4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtCore4.pm)
+-install( FILES QtCore4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR} )
++install( FILES QtCore4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR} )
+diff --git a/qtcore/lib/QtCore4/CMakeLists.txt b/qtcore/lib/QtCore4/CMakeLists.txt
+index 44c7893..06aef20 100644
+--- a/qtcore/lib/QtCore4/CMakeLists.txt
++++ b/qtcore/lib/QtCore4/CMakeLists.txt
+@@ -1,3 +1,3 @@
+-install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/QtCore4 )
++install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/QtCore4 )
+ add_custom_target(perlqt4pmlibmkdir ALL ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/blib/lib/QtCore4)
+ add_custom_target(perlqt4pmlibsubdir ALL ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/blib/lib/QtCore4)
+diff --git a/qtcore/src/CMakeLists.txt b/qtcore/src/CMakeLists.txt
+index 3910636..b5e645c 100644
+--- a/qtcore/src/CMakeLists.txt
++++ b/qtcore/src/CMakeLists.txt
+@@ -53,10 +53,10 @@ target_link_libraries(perlqtcore4
+ set_target_properties(perlqtcore4 PROPERTIES
+     OUTPUT_NAME ${libraryName}
+     PREFIX ""
+-    INSTALL_NAME_DIR ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/
++    INSTALL_NAME_DIR ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/
+ )
+ 
+-install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+ install(FILES binding.h handlers.h listclass_macros.h marshall_basetypes.h marshall_complex.h
+               marshall.h marshall_macros.h marshall_primitives.h marshall_types.h perlqt.h ppport.h
+               QtCore4.h smokehelp.h smokeperl.h util.h
+diff --git a/qtdbus/lib/CMakeLists.txt b/qtdbus/lib/CMakeLists.txt
+index d03a672..a60d603 100644
+--- a/qtdbus/lib/CMakeLists.txt
++++ b/qtdbus/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtdbus4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDBus4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDBus4.pm)
+-install(FILES QtDBus4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtDBus4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtdbus/src/CMakeLists.txt b/qtdbus/src/CMakeLists.txt
+index 9aa05a0..5786ea2 100644
+--- a/qtdbus/src/CMakeLists.txt
++++ b/qtdbus/src/CMakeLists.txt
+@@ -31,4 +31,4 @@ target_link_libraries(perl_qtdbus4
+ set_target_properties(perl_qtdbus4 PROPERTIES OUTPUT_NAME "QtDBus4")
+ set_target_properties(perl_qtdbus4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtdbus4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/QtDBus4/)
++install(TARGETS perl_qtdbus4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/QtDBus4/)
+diff --git a/qtdeclarative/lib/CMakeLists.txt b/qtdeclarative/lib/CMakeLists.txt
+index e8d2847..b458858 100644
+--- a/qtdeclarative/lib/CMakeLists.txt
++++ b/qtdeclarative/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtdeclarative4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDeclarative4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDeclarative4.pm)
+-install(FILES QtDeclarative4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtDeclarative4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtdeclarative/src/CMakeLists.txt b/qtdeclarative/src/CMakeLists.txt
+index 1662167..ec2a8fc 100644
+--- a/qtdeclarative/src/CMakeLists.txt
++++ b/qtdeclarative/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtdeclarative4
+ set_target_properties(perl_qtdeclarative4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtdeclarative4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtdeclarative4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qtdeclarative4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtgui/lib/CMakeLists.txt b/qtgui/lib/CMakeLists.txt
+index 82626c8..e62a4ac 100644
+--- a/qtgui/lib/CMakeLists.txt
++++ b/qtgui/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtgui4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtGui4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtGui4.pm)
+-install(FILES QtGui4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtGui4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtgui/src/CMakeLists.txt b/qtgui/src/CMakeLists.txt
+index 4cc8b36..44041b6 100644
+--- a/qtgui/src/CMakeLists.txt
++++ b/qtgui/src/CMakeLists.txt
+@@ -38,4 +38,4 @@ target_link_libraries(perl_qtgui4
+ set_target_properties(perl_qtgui4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtgui4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtgui4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qtgui4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qthelp/lib/CMakeLists.txt b/qthelp/lib/CMakeLists.txt
+index dcf5ebe..da817d4 100644
+--- a/qthelp/lib/CMakeLists.txt
++++ b/qthelp/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qthelp4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtHelp4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtHelp4.pm)
+-install(FILES QtHelp4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtHelp4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qthelp/src/CMakeLists.txt b/qthelp/src/CMakeLists.txt
+index c00359d..689cb29 100644
+--- a/qthelp/src/CMakeLists.txt
++++ b/qthelp/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qthelp4
+ set_target_properties(perl_qthelp4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qthelp4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qthelp4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qthelp4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtmultimedia/lib/CMakeLists.txt b/qtmultimedia/lib/CMakeLists.txt
+index e55f697..5384539 100644
+--- a/qtmultimedia/lib/CMakeLists.txt
++++ b/qtmultimedia/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtmultimedia4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtMultimedia4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtMultimedia4.pm)
+-install(FILES QtMultimedia4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtMultimedia4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtmultimedia/src/CMakeLists.txt b/qtmultimedia/src/CMakeLists.txt
+index 0728aba..df8e552 100644
+--- a/qtmultimedia/src/CMakeLists.txt
++++ b/qtmultimedia/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtmultimedia4
+ set_target_properties(perl_qtmultimedia4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtmultimedia4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtmultimedia4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qtmultimedia4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtnetwork/lib/CMakeLists.txt b/qtnetwork/lib/CMakeLists.txt
+index 12cd5dd..d1fb0e6 100644
+--- a/qtnetwork/lib/CMakeLists.txt
++++ b/qtnetwork/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtnetwork4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtNetwork4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtNetwork4.pm)
+-install(FILES QtNetwork4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtNetwork4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtnetwork/src/CMakeLists.txt b/qtnetwork/src/CMakeLists.txt
+index caf8327..0994d57 100644
+--- a/qtnetwork/src/CMakeLists.txt
++++ b/qtnetwork/src/CMakeLists.txt
+@@ -39,4 +39,4 @@ target_link_libraries(perl_qtnetwork4
+ set_target_properties(perl_qtnetwork4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtnetwork4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtnetwork4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qtnetwork4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtopengl/lib/CMakeLists.txt b/qtopengl/lib/CMakeLists.txt
+index f3b5640..d8dc9e4 100644
+--- a/qtopengl/lib/CMakeLists.txt
++++ b/qtopengl/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtopengl4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtOpenGL4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtOpenGL4.pm)
+-install(FILES QtOpenGL4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtOpenGL4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtopengl/src/CMakeLists.txt b/qtopengl/src/CMakeLists.txt
+index 20493a9..777af89 100644
+--- a/qtopengl/src/CMakeLists.txt
++++ b/qtopengl/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtopengl4
+ set_target_properties(perl_qtopengl4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtopengl4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtopengl4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qtopengl4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtscript/lib/CMakeLists.txt b/qtscript/lib/CMakeLists.txt
+index d21dbe5..320ff93 100644
+--- a/qtscript/lib/CMakeLists.txt
++++ b/qtscript/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtscript4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtScript4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtScript4.pm)
+-install(FILES QtScript4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtScript4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtscript/src/CMakeLists.txt b/qtscript/src/CMakeLists.txt
+index dd395be..6ff47d8 100644
+--- a/qtscript/src/CMakeLists.txt
++++ b/qtscript/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtscript4
+ set_target_properties(perl_qtscript4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtscript4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtscript4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qtscript4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtsql/lib/CMakeLists.txt b/qtsql/lib/CMakeLists.txt
+index 59336d3..d9dd4d5 100644
+--- a/qtsql/lib/CMakeLists.txt
++++ b/qtsql/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtsql4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSql4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSql4.pm)
+-install(FILES QtSql4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtSql4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtsql/src/CMakeLists.txt b/qtsql/src/CMakeLists.txt
+index 3ec2028..59096ba 100644
+--- a/qtsql/src/CMakeLists.txt
++++ b/qtsql/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsql4
+ set_target_properties(perl_qtsql4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtsql4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtsql4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qtsql4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtsvg/lib/CMakeLists.txt b/qtsvg/lib/CMakeLists.txt
+index 33f6deb..bf1dc1f 100644
+--- a/qtsvg/lib/CMakeLists.txt
++++ b/qtsvg/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtsvg4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSvg4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSvg4.pm)
+-install(FILES QtSvg4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtSvg4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtsvg/src/CMakeLists.txt b/qtsvg/src/CMakeLists.txt
+index 11eccd2..449bf0f 100644
+--- a/qtsvg/src/CMakeLists.txt
++++ b/qtsvg/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsvg4
+ set_target_properties(perl_qtsvg4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtsvg4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtsvg4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qtsvg4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qttest/lib/CMakeLists.txt b/qttest/lib/CMakeLists.txt
+index 3bfa78c..5a8d8da 100644
+--- a/qttest/lib/CMakeLists.txt
++++ b/qttest/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qttest4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtTest4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtTest4.pm)
+-install(FILES QtTest4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtTest4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qttest/src/CMakeLists.txt b/qttest/src/CMakeLists.txt
+index 5492e55..d4662b1 100644
+--- a/qttest/src/CMakeLists.txt
++++ b/qttest/src/CMakeLists.txt
+@@ -38,4 +38,4 @@ target_link_libraries(perl_qttest4
+ set_target_properties(perl_qttest4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qttest4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qttest4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qttest4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtuitools/lib/CMakeLists.txt b/qtuitools/lib/CMakeLists.txt
+index 119e40e..3a5f472 100644
+--- a/qtuitools/lib/CMakeLists.txt
++++ b/qtuitools/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtuitools4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtUiTools4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtUiTools4.pm)
+-install(FILES QtUiTools4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtUiTools4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtuitools/src/CMakeLists.txt b/qtuitools/src/CMakeLists.txt
+index a8ae4a2..ecc079f 100644
+--- a/qtuitools/src/CMakeLists.txt
++++ b/qtuitools/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtuitools4
+ set_target_properties(perl_qtuitools4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtuitools4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtuitools4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qtuitools4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtwebkit/lib/CMakeLists.txt b/qtwebkit/lib/CMakeLists.txt
+index a02f7ee..3846227 100644
+--- a/qtwebkit/lib/CMakeLists.txt
++++ b/qtwebkit/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtwebkit4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtWebKit4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtWebKit4.pm)
+-install(FILES QtWebKit4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtWebKit4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtwebkit/src/CMakeLists.txt b/qtwebkit/src/CMakeLists.txt
+index a6e00f8..dbebc44 100644
+--- a/qtwebkit/src/CMakeLists.txt
++++ b/qtwebkit/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtwebkit4
+ set_target_properties(perl_qtwebkit4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtwebkit4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtwebkit4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qtwebkit4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtxml/lib/CMakeLists.txt b/qtxml/lib/CMakeLists.txt
+index 5505bc4..7db743c 100644
+--- a/qtxml/lib/CMakeLists.txt
++++ b/qtxml/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtxml4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXml4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXml4.pm)
+-install(FILES QtXml4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtXml4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtxml/src/CMakeLists.txt b/qtxml/src/CMakeLists.txt
+index 018508c..a351609 100644
+--- a/qtxml/src/CMakeLists.txt
++++ b/qtxml/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxml4
+ set_target_properties(perl_qtxml4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtxml4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtxml4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qtxml4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtxmlpatterns/lib/CMakeLists.txt b/qtxmlpatterns/lib/CMakeLists.txt
+index a35f3df..3d86103 100644
+--- a/qtxmlpatterns/lib/CMakeLists.txt
++++ b/qtxmlpatterns/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtxmlpatterns4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXmlPatterns4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXmlPatterns4.pm)
+-install(FILES QtXmlPatterns4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES QtXmlPatterns4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtxmlpatterns/src/CMakeLists.txt b/qtxmlpatterns/src/CMakeLists.txt
+index 9970a98..563e922 100644
+--- a/qtxmlpatterns/src/CMakeLists.txt
++++ b/qtxmlpatterns/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxmlpatterns4
+ set_target_properties(perl_qtxmlpatterns4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtxmlpatterns4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtxmlpatterns4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qtxmlpatterns4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qwt/lib/CMakeLists.txt b/qwt/lib/CMakeLists.txt
+index 0013c4d..d67ffbf 100644
+--- a/qwt/lib/CMakeLists.txt
++++ b/qwt/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qwtpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qwt.pm ${CMAKE_BINARY_DIR}/blib/lib/Qwt.pm)
+-install(FILES Qwt.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
++install(FILES Qwt.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qwt/src/CMakeLists.txt b/qwt/src/CMakeLists.txt
+index 869d818..b644e80 100644
+--- a/qwt/src/CMakeLists.txt
++++ b/qwt/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qwt
+ set_target_properties(perl_qwt PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qwt PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qwt DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
++install(TARGETS perl_qwt DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix
index 13c145f3275..2c1378f1049 100644
--- a/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix
+++ b/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix
@@ -4,6 +4,12 @@ kde {
   buildInputs = [ smokeqt perl ];
   buildNativeInputs = [ cmake ];
 
+  patches =
+    # The order is important
+    [ ./perlqt-include-smokeqt.patch ./perlqt-rewrite-FindPerlMore.patch
+      ./perlqt-use-site-arch-install-dir.patch
+    ];
+
   meta = {
     description = "Perl bindings for Qt library";
   };
diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch
new file mode 100644
index 00000000000..03df484b63e
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch
@@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 79945c4..a244d0f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,10 +32,6 @@ set(generator_SRC
+     type.cpp
+ )
+ 
+-# force RPATH so that the binary is usable from within the build tree
+-set (CMAKE_SKIP_BUILD_RPATH FALSE)
+-set (CMAKE_SKIP_RPATH FALSE)
+-
+ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
+ 
+ add_executable(smokegen ${generator_SRC})
+diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in
+index 947315c..de8d66c 100644
+--- a/cmake/SmokeConfig.cmake.in
++++ b/cmake/SmokeConfig.cmake.in
+@@ -44,21 +44,19 @@ macro (find_smoke_component name)
+         set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "")
+ 
+         find_path(SMOKE_${uppercase}_INCLUDE_DIR 
+-            ${lowercase}_smoke.h 
+-            PATH ${SMOKE_INCLUDE_DIR}
+-            NO_DEFAULT_PATH
++            ${lowercase}_smoke.h
++            HINTS ${SMOKE_INCLUDE_DIR}
++            PATH_SUFFIXES smoke
+             )
+         if(WIN32)
+ 		    # DLLs are in the bin directory.
+             find_library(SMOKE_${uppercase}_LIBRARY
+                 smoke${lowercase}
+-                PATHS "@CMAKE_INSTALL_PREFIX@/bin"
+-                NO_DEFAULT_PATH)
++                PATHS "@CMAKE_INSTALL_PREFIX@/bin")
+         else(WIN32)
+             find_library(SMOKE_${uppercase}_LIBRARY
+                 smoke${lowercase}
+-                PATHS "@SMOKE_LIBRARY_PREFIX@"
+-                NO_DEFAULT_PATH)
++                PATHS "@SMOKE_LIBRARY_PREFIX@")
+         endif(WIN32)
+ 
+         if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY)
diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix
index df26eb2717e..e32ed57c907 100644
--- a/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix
+++ b/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix
@@ -4,7 +4,7 @@ kde {
   buildInputs = [ qt4 ];
   buildNativeInputs = [ cmake ];
 
-  patchPhase = "sed -e /RPATH/d -i CMakeLists.txt";
+  patches = [ ./smokegen-nix.patch ];
 
   meta = {
     description = "C++ parser used to generate language bindings for Qt/KDE";
diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
new file mode 100644
index 00000000000..58a7623e012
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
@@ -0,0 +1,11 @@
+{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, shared_desktop_ontologies, attica }:
+
+kde {
+  buildInputs = [ smokeqt kdelibs akonadi kdepimlibs shared_desktop_ontologies attica ];
+  buildNativeInputs = [ cmake ];
+
+  cmakeFlags = "-DQTDEFINES_FILE=${smokeqt}/share/smokegen/qtdefines";
+  meta = {
+    description = "SMOKE bindings for kdelibs";
+  };
+}

From 9bb16846229428fb6f88a5f002149b23bf1dfd62 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Mar 2012 22:10:53 +0000
Subject: [PATCH 110/208] Add kde48.qtruby

svn path=/nixpkgs/trunk/; revision=33313
---
 pkgs/desktops/kde-4.8/default.nix                |  3 +--
 .../kdebindings/qtruby-include-smokeqt.patch     | 13 +++++++++++++
 .../kdebindings/qtruby-install-prefix.patch      | 15 +++++++++++++++
 pkgs/desktops/kde-4.8/kdebindings/qtruby.nix     | 16 ++++++++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch
 create mode 100644 pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch
 create mode 100644 pkgs/desktops/kde-4.8/kdebindings/qtruby.nix

diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix
index f086b06ab9d..6404173bb12 100644
--- a/pkgs/desktops/kde-4.8/default.nix
+++ b/pkgs/desktops/kde-4.8/default.nix
@@ -15,8 +15,7 @@ let
     # kdesdk/kioslave is splitted into kioslave-svn and kioslave-git
     kdesdk = [ "kioslave" ];
     # Most of kdebindings do not compile due to a bug in the buildsystem
-    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde"
-      "qtruby" "qyoto" ];
+    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
   };
 
   # Extra subpackages in the manifest format
diff --git a/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch b/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch
new file mode 100644
index 00000000000..7d20a3c1c0b
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33078b4..1a6ad2e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,7 +5,7 @@ set(COMPILE_RUBY FALSE CACHE INTERNAL "")
+ find_package(Ruby REQUIRED)
+ find_package(Qt4 REQUIRED)
+ find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg Phonon QSci QtDeclarative QtScript QtWebkit QtUiTools QtTest Qwt)
+-include_directories(${SMOKE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
++include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR})
+ include(MacroOptionalFindPackage)
diff --git a/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch
new file mode 100644
index 00000000000..bd95a0d8bd3
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/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.8/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix
new file mode 100644
index 00000000000..5dd25899e74
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, smokeqt, ruby }:
+
+kde {
+  buildInputs = [ smokeqt ruby ];
+  buildNativeInputs = [ cmake ];
+
+  # The second patch is not ready for upstream submmission. I should add an
+  # option() instead.
+  patches = [ ./qtruby-include-smokeqt.patch ./qtruby-install-prefix.patch ];
+
+  cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
+
+  meta = {
+    description = "Ruby bindings for Qt library";
+  };
+}

From 2ce433c26cda21581e94443a71430cd402327dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 20 Mar 2012 22:19:48 +0000
Subject: [PATCH 111/208] Removing go-oo. It neither builds neither upstream
 continues it.

svn path=/nixpkgs/trunk/; revision=33314
---
 .../office/openoffice/gcc46.patch             |  11 --
 .../office/openoffice/get-go-src.nix          |  54 -------
 pkgs/applications/office/openoffice/go-oo.nix | 151 ------------------
 .../office/openoffice/go-srcs.nix             |  66 --------
 pkgs/top-level/all-packages.nix               |  10 --
 5 files changed, 292 deletions(-)
 delete mode 100644 pkgs/applications/office/openoffice/gcc46.patch
 delete mode 100644 pkgs/applications/office/openoffice/get-go-src.nix
 delete mode 100644 pkgs/applications/office/openoffice/go-oo.nix
 delete mode 100644 pkgs/applications/office/openoffice/go-srcs.nix

diff --git a/pkgs/applications/office/openoffice/gcc46.patch b/pkgs/applications/office/openoffice/gcc46.patch
deleted file mode 100644
index a301e078d53..00000000000
--- a/pkgs/applications/office/openoffice/gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/OOO320_m19/cppu/inc/uno/lbnames.h
-+++ b/build/OOO320_m19/cppu/inc/uno/lbnames.h
-@@ -59,7 +59,7 @@ provoking error here, because PP ignores #error
- #error "Tested gcc 2 versions are 2.91 and 2.95.  Patch uno/lbnames.h to try your gcc 2 version."
- #elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
- #define __CPPU_ENV gcc3
--#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 5)
-+#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 6)
- #define __CPPU_ENV gcc3
- #elif (__GNUC__ == 3)
- #error "Tested gcc 3 version is <= 3.4.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/pkgs/applications/office/openoffice/get-go-src.nix b/pkgs/applications/office/openoffice/get-go-src.nix
deleted file mode 100644
index 439da366381..00000000000
--- a/pkgs/applications/office/openoffice/get-go-src.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-# nix derivation that will create a bash script that will create the go-srcs.nix file.
-# 
-# it can be slightly improved so it downloads properly also the OpenOffice.org upstream package,
-# instead of only those 'additional' to the upstream code. By now the upstream oo.org code I wrote
-# manually in the go-oo.nix.
-#
-# I think this looks quite ugly, but the only way I've found to know what files the program will need,
-# and from what URLs, is running their './configure' with proper parameters and executing their
-# './download' script.
-
-let
-  pkgsFun = import /etc/nixos/nixpkgs;
-  pkgs = pkgsFun {};
-  downloadRoot = "http://download.services.openoffice.org/files/stable/";
-in
-with pkgs;
-
-lib.overrideDerivation go_oo (attrs: {
-  name = attrs.name + "-make-src";
-  src = attrs.src;
-
-  buildInputs = attrs.buildInputs ++ [ gawk ];
-
-  # Avoid downloading what is defined in go_oo
-  srcs_download = null;
-
-  phases = [ "unpackPhase" "configurePhase" "makesh" ];
-
-  makesh = ''
-    sed -i -e '/-x $WG/d' -e "s/WGET='''/WGET='echo XXX'/" download
-    mkdir -p $out
-
-    set +e
-    ./download --all | grep XXX | 
-      sed '/bouncer/s,\(.*\)http.*version=\([0-9.]\+\).*lang=\([a-z0-9]\+\).*\( .*\),\1${downloadRoot}\2/OOo_\2_src_\3.tar.bz2\4,' |
-      awk '
-      BEGIN {
-        print "#!/bin/sh"
-        print "echo \"{fetchurl} : [\" > go-srcs.nix"
-      }
-      {
-         print "echo \"(fetchurl {\" >> go-srcs.nix"
-         print "echo \"  url = \\\"" $2 "\\\";\" >> go-srcs.nix"
-         print "echo \"  sha256 = \\\"`nix-prefetch-url " $2 "`\\\";\" >> go-srcs.nix"
-         if (NF > 3)
-           print "echo \"  name = \\\"" $4 "\\\";\" >> go-srcs.nix"
-        print "echo \"})\" >> go-srcs.nix"
-      }
-      END {
-        print "echo ] >> go-srcs.nix"
-      }' > $out/make-go-srcs-nix.sh
-    exit 0
-  '';
-})
diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix
deleted file mode 100644
index c0eaf0deb9b..00000000000
--- a/pkgs/applications/office/openoffice/go-oo.nix
+++ /dev/null
@@ -1,151 +0,0 @@
-{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip
-, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
-, libxml2, db4, 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
-, autoconf, openldap, postgresql, bash
-, langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
-}:
-
-let
-  langsSpaces = stdenv.lib.concatStringsSep " " langs;
-  tag = "OOO320_m19";
-  version = "3.2.1.6";
-in
-stdenv.mkDerivation rec {
-  name = "go-oo-${version}";
-  # builder = ./builder.sh;
-
-  src = fetchurl {
-      url = "http://download.go-oo.org/OOO320/ooo-build-${version}.tar.gz";
-      sha256 = "1l9kpg61wyqjsig5n6a7c7zyygbg09zsmn4q267c12zzpl5qpmxy";
-    };
-
-  srcs_download = import ./go-srcs.nix { inherit fetchurl; };
-
-  # Multi-CPU: --with-num-cpus=4 
-  # The '--with-tag=XXXX' string I took from their 'configure' script. I write it so it matches the
-  # logic in the script for "upstream version for X.X.X". Look for that string in the script.
-  # We need '--without-split' when downloading directly usptream openoffice src tarballs.
-  configurePhase = ''
-    sed -i -e '1s,/bin/bash,${bash}/bin/bash,' $(find bin -type f)
-    sed -i -e '1s,/usr/bin/perl,${perl}/bin/perl,' download.in $(find bin -type f)
-    sed -i -e '1s,/usr/bin/python,${python}/bin/python,' bin/*.py
-    echo "$distroFlags" > distro-configs/SUSE-11.1.conf.in
-
-    ./configure --with-distro=SUSE-11.1 --with-system-libwpd --without-git --with-system-cairo \
-      --with-lang="${langsSpaces}" --with-tag=${tag} --without-split
-  '';
-
-  buildPhase = ''
-    for a in $srcs_download; do
-      FILE=$(basename $a)
-      # take out the hash
-      cp -v $a src/$(echo $FILE | sed 's/[^-]*-//')
-    done
-    sed '/-x $WGET/d' -i download
-    ./download
-
-    # Needed to find genccode
-    PATH=$PATH:${icu}/sbin
-
-    make build.prepare
-
-    set -x
-    pushd build/${tag}
-
-    patch -p1 < ${./xlib.patch}
-    patch -p3 < ${./gcc46.patch}
-
-    # Fix svtools: hardcoded jpeg path
-    sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,' solenv/inc/libs.mk
-    # Fix sysui: wants to create a tar for root
-    sed -i -e 's,--own.*root,,' sysui/desktop/slackware/makefile.mk
-    # Fix libtextcat: wants to set rpath to /usr/local/lib
-    sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, libtextcat/makefile.mk
-    # Fix hunspell: the checks fail due to /bin/bash missing, and I find this fix easier
-    sed -i -e 's,make && make check,make,' hunspell/makefile.mk
-    # Fix redland: wants to set rpath to /usr/local/lib
-    sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, redland/redland/makefile.mk \
-      redland/raptor/makefile.mk redland/rasqal/makefile.mk
-
-    popd
-
-    set +x
-    make
-  '';
-
-  installPhase = ''
-    bin/ooinstall $out
-    mkdir -p $out/bin
-    for a in $out/program/{sbase,scalc,sdraw,simpress,smath,soffice,swriter,soffice.bin}; do
-      ln -s $a $out/bin
-    done
-  '';
-
-  distroFlags = ''
-    --with-vendor=NixPkgs
-    --with-package-format=native
-    --disable-epm
-    --disable-fontooo
-    --disable-gnome-vfs
-    --disable-gnome-vfs
-    --disable-mathmldtd
-    --disable-mozilla
-    --disable-odk
-    --disable-pasf
-    --disable-dbus
-    --disable-kde
-    --disable-kde4
-    --disable-mono
-    --disable-gstreamer
-    --with-cairo
-    --with-system-libs
-    --with-system-python
-    --with-system-boost
-    --with-system-db
-    --with-jdk-home=${jdk}
-    --with-ant-home=${ant}
-    --without-afms
-    --without-dict
-    --without-fonts
-    --without-myspell-dicts
-    --without-nas
-    --without-ppds
-    --without-system-agg
-    --without-system-beanshell
-    --without-system-hsqldb
-    --without-system-xalan
-    --without-system-xerces
-    --without-system-xml-apis
-    --without-system-xt
-    --without-system-jars
-    --without-system-hunspell
-    --without-system-altlinuxhyph
-    --without-system-lpsolve
-    --without-system-graphite
-    --without-system-mozilla
-    --without-system-libwps
-    --without-system-libwpg
-    --without-system-redland
-  '';
-
-  buildInputs = [
-    pam python tcsh libxslt perl ArchiveZip CompressZlib zlib 
-    libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl 
-    libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack 
-    getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
-    cups libXinerama openssl gperf GConf ORBit2
-
-    ant autoconf openldap postgresql
-  ];
-
-  meta = {
-    description = "Go-oo - Novell variant of OpenOffice.org";
-    homepage = http://go-oo.org/;
-    license = "LGPL";
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/office/openoffice/go-srcs.nix b/pkgs/applications/office/openoffice/go-srcs.nix
deleted file mode 100644
index 9ac2cff58f8..00000000000
--- a/pkgs/applications/office/openoffice/go-srcs.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{fetchurl} : [
-(fetchurl {
-  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_system.tar.bz2";
-  sha256 = "0giy3sza64ij19w7b06rxcrkrb5kq2fvkz486vh3mv08s8xa8zfc";
-})
-(fetchurl {
-  url = "http://download.go-oo.org/src//seamonkey-1.1.14.source.tar.gz";
-  sha256 = "0fb0pv2w8583q65ja5x8wh6ah6i3kwwq99s4v8cn99g91v8xn9hr";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//DEV300/ooo-cli-prebuilt-3.2.1.tar.bz2";
-  sha256 = "0wfq6xsiqdzmkq3zxhd0q4k7db9bhl027wy5z28pcnmv4li5h40b";
-})
-(fetchurl {
-  url = "http://archive.apache.org/dist/ant/binaries/apache-ant-1.7.0-bin.tar.gz";
-  sha256 = "1dnwzk1k8d5iinxsal3qskjagljx5ywwmwb4i6bymfmyr64qppn1";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//SRC680/mdbtools-0.6pre1.tar.gz";
-  sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi";
-})
-(fetchurl {
-  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_core.tar.bz2";
-  sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i";
-})
-(fetchurl {
-  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_extensions.tar.bz2";
-  sha256 = "0d5byyg0ac0xsi22cw4d857rpd1r3mm2j13ajfydgsn2d2ka7nrj";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//SRC680/extras-3.tar.bz2";
-  sha256 = "1s6cz92b2amfn135l6a2hras4qrd04kw5yyqli7xmb8xqa0m3y3c";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//SRC680/biblio.tar.bz2";
-  sha256 = "02v2xbq771zi09qw3k4zih95m1rjns4pwwpl51n0m34c0a00lhf0";
-})
-(fetchurl {
-  url = "http://multidimalgorithm.googlecode.com/files//mdds_0.3.0.tar.bz2";
-  sha256 = "1zqxs2a1ah0vq2a5dypqclig2c85z0a8rz7b63vfsqxvd2258a2d";
-})
-(fetchurl {
-  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_binfilter.tar.bz2";
-  sha256 = "0nxh1rdw566i7nr5vjfxbankwy5lsd2maggcqz3m0chp7jgvsb6p";
-})
-(fetchurl {
-  url = "http://tools.openoffice.org/unowinreg_prebuild/680//unowinreg.dll";
-  sha256 = "0g3529nr0nfhn3cygn8x931pqxnqq88nfc5h829xncr1j8ifaqzm";
-})
-(fetchurl {
-  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_l10n.tar.bz2";
-  sha256 = "0m3i3czwqcyc2mibldp1zx34wxw7ls7akb3jak75nc6i3h7ykmsm";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//SRC680/libwps-0.1.2.tar.gz";
-  sha256 = "1cdjmgpy0igrwlb5i1sm4s2yxvzbmqz6j7xnmmv3kpbx7z43zw78";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz";
-  sha256 = "1qv5qqycaqrm8arprwf3vyk76fm6v7qabpx5qq58knp1xm72z98r";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//DEV300/ooo_oxygen_images-2009-06-17.tar.gz";
-  sha256 = "0jhgjhm63cmjr59nhvdln1szgm36v6kkazy2388l7z6xjjrhxk1z";
-})
-]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb88ba19bbc..a487df71ef4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7121,16 +7121,6 @@ let
     zip = zip.override { enableNLS = false; };
   };
 
-  go_oo = callPackage ../applications/office/openoffice/go-oo.nix {
-    inherit (perl510Packages) ArchiveZip CompressZlib;
-    inherit (gnome) GConf ORBit2;
-    neon = neon029;
-    libwpd = libwpd_08;
-    /* It uses Switch.pm, deprecated in perl 5.14 */
-    perl = perl510;
-    zip = zip.override { enableNLS = false; };
-  };
-
   openscad = callPackage ../applications/graphics/openscad {};
 
   opera = callPackage ../applications/networking/browsers/opera {

From b2d61a850d98b040ded3d28d0405398e46c81811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 20 Mar 2012 23:17:45 +0000
Subject: [PATCH 112/208] Enabling nfsv4 and nfsv41 in nfsUtils (or at least I
 think so).

svn path=/nixpkgs/trunk/; revision=33315
---
 .../libraries/libnfsidmap/default.nix            | 16 ++++++++++++++++
 pkgs/development/libraries/ti-rpc/default.nix    |  3 +++
 pkgs/os-specific/linux/nfs-utils/default.nix     | 10 ++++++----
 pkgs/top-level/all-packages.nix                  |  2 ++
 4 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/libnfsidmap/default.nix

diff --git a/pkgs/development/libraries/libnfsidmap/default.nix b/pkgs/development/libraries/libnfsidmap/default.nix
new file mode 100644
index 00000000000..1b623c4d490
--- /dev/null
+++ b/pkgs/development/libraries/libnfsidmap/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libnfsidmap-0.25";
+  
+  src = fetchurl {
+    url = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${name}.tar.gz";
+    sha256 = "1kzgwxzh83qi97rblcm9qj80cdvnv8kml2plz0q103j0hifj8vb5";
+  };
+
+  meta = {
+    homepage = http://www.citi.umich.edu/projects/nfsv4/linux/;
+    description = "Library for holding mulitiple methods of mapping names to id's and visa versa, mainly for NFSv4";
+    license = "BSD";
+  };
+}
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index ae52ca3959d..e26d714367f 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -8,7 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705";
   };
 
+  # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf
   preConfigure = ''
+    echo "" > src/des_crypt.c
+
     sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "doc/Makefile.in"
   '';
 
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 2d89d70e64a..dfbc1b56209 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,4 +1,5 @@
-{ fetchurl, stdenv, tcpWrapper, utillinux, libcap }:
+{ fetchurl, stdenv, tcpWrapper, utillinux, libcap, libtirpc, libevent, libnfsidmap, lvm2,
+  e2fsprogs }:
 
 stdenv.mkDerivation rec {
   name = "nfs-utils-1.2.5";
@@ -8,13 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m";
   };
 
-  # Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'.
-  buildInputs = [ tcpWrapper utillinux libcap ];
+  buildInputs = [ tcpWrapper utillinux libcap libtirpc libevent libnfsidmap lvm2
+    e2fsprogs ];
 
   # FIXME: Add the dependencies needed for NFSv4 and TI-RPC.
   configureFlags =
-    [ "--disable-gss" "--disable-nfsv4" "--disable-nfsv41" "--disable-tirpc"
+    [ "--disable-gss"
       "--with-statedir=/var/lib/nfs"
+      "--with-tirpcinclude=${libtirpc}/include/tirpc"
     ]
     ++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc}/bin/rpcgen";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a487df71ef4..4bd4adb8381 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4035,6 +4035,8 @@ let
 
   libnatspec = callPackage ../development/libraries/libnatspec { };
 
+  libnfsidmap = callPackage ../development/libraries/libnfsidmap { };
+
   libnice = callPackage ../development/libraries/libnice { };
 
   libplist = callPackage ../development/libraries/libplist { };

From f682391220abffa9b844fe6aba46f64cec98d866 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 23:23:00 +0000
Subject: [PATCH 113/208] * Fix Firefox desktop item.  Contributed by Kirill
 Elagin.

svn path=/nixpkgs/trunk/; revision=33316
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 1b8fb796bad..a89db87809b 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -7,12 +7,12 @@ stdenv.mkDerivation {
 
   desktopItem = makeDesktopItem {
     name = browserName;
-    exec = browserName;
+    exec = browserName + " %U";
     icon = icon;
     comment = "";
     desktopName = desktopName;
     genericName = "Web Browser";
-    categories = "Application;Network;";
+    categories = "Application;Network;WebBrowser;";
   };
 
   buildInputs = [makeWrapper];

From 3b48b8ffc498a4bca32b42f76b231c68aac3763e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 23:27:12 +0000
Subject: [PATCH 114/208] graphviz: Hard-code lefty's path in dotty

svn path=/nixpkgs/trunk/; revision=33317
---
 pkgs/tools/graphics/graphviz/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 678744ad5bb..c070a73d1f1 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
     sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile
   '';
 
+  postInstall = ''
+    sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty
+  '';
+
   meta = {
     description = "A program for visualising graphs";
     homepage = http://www.graphviz.org/;

From 7bc7db74fb1f16352025719afc875aa3de131179 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 23:55:22 +0000
Subject: [PATCH 115/208] * NSPR updated to 4.9.

svn path=/nixpkgs/trunk/; revision=33318
---
 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 0497278f14a..f8423eb47f4 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.8.9"; in
+let version = "4.9"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "1khw7l80f0k5jbk37hw6xqqmv6pmsp2m4xlfj2xh6bz7374cfhzz";
+    sha1 = "57a6bb09ccb90d14303c3d9a6ec2592d8a5c0752";
   };
 
   preConfigure = "cd mozilla/nsprpub";

From b4497055879c02459925512c9a04d93ec8ecdfa3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 23:59:09 +0000
Subject: [PATCH 116/208] * Firefox 11 (contributed by Kirill Elagin). 
 Unfortunately it's not   called "Firefox" anymore when built without official
 branding.   Apparently that was a SNAFU in Firefox 10.

svn path=/nixpkgs/trunk/; revision=33319
---
 .../networking/browsers/firefox/10.0.nix            |  1 +
 .../networking/browsers/firefox/11.0.nix            | 11 ++++++-----
 pkgs/top-level/all-packages.nix                     | 13 +++++++------
 pkgs/top-level/release.nix                          |  4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/10.0.nix b/pkgs/applications/networking/browsers/firefox/10.0.nix
index 0836fc159c1..ff16cad0ee1 100644
--- a/pkgs/applications/networking/browsers/firefox/10.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/10.0.nix
@@ -170,6 +170,7 @@ rec {
     meta = {
       description = "Mozilla Firefox - the browser, reloaded";
       homepage = http://www.mozilla.com/en-US/firefox/;
+      maintainers = [ stdenv.lib.maintainers.eelco ];
     };
 
     passthru = {
diff --git a/pkgs/applications/networking/browsers/firefox/11.0.nix b/pkgs/applications/networking/browsers/firefox/11.0.nix
index fd72b51f5b5..28f0f476833 100644
--- a/pkgs/applications/networking/browsers/firefox/11.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/11.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "11.0b1";
+  firefoxVersion = "11.0";
   
   xulVersion = "11.0"; # this attribute is used by other packages
 
   
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha256 = "1f9p2jmjvhmb23wmvj84jj22wd9g803k6pdjm8glwmkzwnva8x1b";
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    md5 = "4b07acf47857aff72776d805409cdd1b";
   };
   
   commonConfigureFlags =
@@ -32,7 +32,7 @@ rec {
       "--with-system-jpeg"
       "--with-system-zlib"
       "--with-system-bz2"
-      #"--with-system-nspr" # <-- There are links to nspr 4.9.0, but no file...
+      "--with-system-nspr"
       # "--with-system-nss"
       # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
       "--enable-system-cairo"
@@ -139,7 +139,7 @@ rec {
       [ "--enable-application=browser"
         "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
         "--enable-chrome-format=jar"
-	"--disable-elf-hack"
+        "--disable-elf-hack"
       ]
       ++ commonConfigureFlags
       ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
@@ -170,6 +170,7 @@ rec {
     meta = {
       description = "Mozilla Firefox - the browser, reloaded";
       homepage = http://www.mozilla.com/en-US/firefox/;
+      maintainers = [ stdenv.lib.maintainers.eelco ];
     };
 
     passthru = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4bd4adb8381..4b038ad6f5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6625,7 +6625,7 @@ let
 
   firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
 
-  firefoxPkgs = pkgs.firefox100Pkgs;
+  firefoxPkgs = pkgs.firefox11Pkgs;
 
   firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
     inherit (gnome) libIDL;
@@ -6633,23 +6633,23 @@ let
 
   firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
 
-  firefox90Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix {
+  firefox9Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix {
     inherit (gnome) libIDL;
   };
 
-  firefox90Wrapper = wrapFirefox { browser = firefox90Pkgs.firefox; };
+  firefox9Wrapper = wrapFirefox { browser = firefox9Pkgs.firefox; };
 
-  firefox100Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix {
+  firefox10Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix {
     inherit (gnome) libIDL;
   };
 
-  firefox100Wrapper = wrapFirefox { browser = firefox100Pkgs.firefox; };
+  firefox10Wrapper = wrapFirefox { browser = firefox10Pkgs.firefox; };
 
   firefox11Pkgs = callPackage ../applications/networking/browsers/firefox/11.0.nix {
     inherit (gnome) libIDL;
   };
 
-  firefox11Wrapper = lowPrio (wrapFirefox { browser = firefox11Pkgs.firefox; });
+  firefox11Wrapper = wrapFirefox { browser = firefox11Pkgs.firefox; };
 
   flac = callPackage ../applications/audio/flac { };
 
@@ -6663,6 +6663,7 @@ let
 
   flashplayer11 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
     debug = getConfig ["flashplayer" "debug"] false;
+    # !!! Fix the dependency on two different builds of nss.
   };
 
   freecad = callPackage ../applications/graphics/freecad {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b73d2e19ac7..f88ac212d6c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -362,8 +362,8 @@ with (import ./release-lib.nix);
   };
 
   firefox36Pkgs.firefox = linux;
-  firefox90Pkgs.firefox = linux;
-  firefox100Pkgs.firefox = linux;
+  firefox10Pkgs.firefox = linux;
+  firefox11Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;

From f67b9d8f2dfe61319a0f5279394837116667990a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 21 Mar 2012 01:26:21 +0000
Subject: [PATCH 117/208] Thunderbird: Blind update

svn path=/nixpkgs/trunk/; revision=33320
---
 .../mailreaders/thunderbird/11.x.nix          | 115 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +
 2 files changed, 119 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/11.x.nix

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix
new file mode 100644
index 00000000000..c0de194ba99
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix
@@ -0,0 +1,115 @@
+{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, unzip
+, libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
+, libnotify, cairo, pixman, fontconfig
+, libjpeg
+
+, # If you want the resulting program to call itself "Thunderbird"
+  # instead of "Shredder", enable this option.  However, those
+  # binaries may not be distributed without permission from the
+  # Mozilla Foundation, see
+  # http://www.mozilla.org/foundation/trademarks/.
+  enableOfficialBranding ? false
+
+}:
+
+let version = "11.0";
+
+    # This patch may become necessary when we use a more recent version of libpng
+    # for now, it's actually not needed
+    # pngPatch = fetchurl {
+    #   url = http://www.linuxfromscratch.org/patches/blfs/svn/thunderbird-9.0.1-libpng-1.5-1.patch;
+    #   sha256 = "8454bdde3be8dc37c9f5e6f597914f0a585ff4b357d3fc86c6c9f80208b6068d";
+    # };
+in
+
+stdenv.mkDerivation {
+  name = "thunderbird-${version}";
+
+  src = fetchurl {
+    url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
+    sha256 = "0lrp7ngi3ni70m9v11f0l8xvp3s8sc50isxbgy8vj677fzb1qn2s";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs =
+    [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
+      libnotify cairo pixman fontconfig yasm mesa /* nss */
+      libjpeg
+    ];
+
+  # fix some paths in pngPatch
+  # prePatch = ''
+  #   substitute ${pngPatch} png.patch --replace "mozilla-release/modules/" "comm-release/mozilla/modules/"
+  #   '';
+
+  patches = [
+    # "png.patch" # produced by postUnpack
+
+    # Fix weird dependencies such as a so file which depends on "-lpthread".
+    # ./thunderbird-build-deps.patch
+  ];
+
+  configureFlags =
+    [ "--enable-application=mail"
+      "--enable-optimize"
+      "--with-pthreads"
+      "--disable-debug"
+      "--enable-strip"
+      "--with-pthreads"
+      "--with-system-jpeg"
+      # "--with-system-png"  # png 1.5.x not merged in nixpkgs yet
+      "--with-system-zlib"
+      "--with-system-bz2"
+      "--with-system-nspr"
+      "--enable-system-cairo"
+      "--disable-crashreporter"
+      "--disable-necko-wifi"
+      "--disable-webm"
+      "--disable-tests"
+      "--enable-calendar"
+    ]
+    ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
+
+  # The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
+  # prefix, and PREFIX in some places where they are not set.  In
+  # particular, there are some linker flags like
+  # `-rpath-link=$(LIBXUL_DIST)/bin'.  Since this expands to
+  # `-rpath-link=/bin', the build fails due to the purity checks in
+  # the ld wrapper.  So disable the purity check for now.
+  preBuild = "NIX_ENFORCE_PURITY=0";
+
+  # This doesn't work:
+  #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
+
+  postInstall =
+    ''
+      # Fix some references to /bin paths in the Xulrunner shell script.
+      substituteInPlace $out/lib/thunderbird-*/thunderbird \
+          --replace /bin/pwd "$(type -tP pwd)" \
+          --replace /bin/ls "$(type -tP ls)"
+
+      # 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-${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 =
+      # Official branding implies thunderbird name and logo cannot be reuse,
+      # see http://www.mozilla.org/foundation/licensing.html
+      if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
+    maintainers = with maintainers; [ pierron ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b038ad6f5a..a6fe5be428f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7381,6 +7381,10 @@ let
     inherit (gnome) libIDL;
   };
 
+  thunderbird11 = callPackage ../applications/networking/mailreaders/thunderbird/11.x.nix {
+    inherit (gnome) libIDL;
+  };
+
   timidity = callPackage ../tools/misc/timidity { };
 
   tkcvs = callPackage ../applications/version-management/tkcvs { };

From 28027d477126190be8f7e855c816e735feac8f2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 21 Mar 2012 09:18:40 +0000
Subject: [PATCH 118/208] Aestethic changes suggested by Eelco, and trying to
 fix the problem on rpc.statd, that looks at /etc/netconfig.

Problem: http://hydra.nixos.org/build/2310686/log/raw


svn path=/nixpkgs/trunk/; revision=33322
---
 pkgs/development/libraries/ti-rpc/default.nix |  2 +-
 pkgs/os-specific/linux/nfs-utils/default.nix  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index e26d714367f..e3fd2bc34ff 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     echo "" > src/des_crypt.c
 
-    sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "doc/Makefile.in"
+    sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h
   '';
 
   preInstall = "mkdir -p $out/etc";
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index dfbc1b56209..0a0a3c99748 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv, tcpWrapper, utillinux, libcap, libtirpc, libevent, libnfsidmap, lvm2,
-  e2fsprogs }:
+{ fetchurl, stdenv, tcpWrapper, utillinux, libcap, libtirpc, libevent, libnfsidmap
+, lvm2, e2fsprogs }:
 
 stdenv.mkDerivation rec {
   name = "nfs-utils-1.2.5";
@@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m";
   };
 
-  buildInputs = [ tcpWrapper utillinux libcap libtirpc libevent libnfsidmap lvm2
-    e2fsprogs ];
+  buildInputs =
+    [ tcpWrapper utillinux libcap libtirpc libevent libnfsidmap
+      lvm2 e2fsprogs
+    ];
 
   # FIXME: Add the dependencies needed for NFSv4 and TI-RPC.
   configureFlags =

From d8e65ee71ddcf8cfece8156489fde1343cd1c047 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Mar 2012 11:46:12 +0000
Subject: [PATCH 119/208] pkgs/development/compilers/ghc/with-packages.nix:
 trivial changes to fix syntax highlighting in Emacs

svn path=/nixpkgs/trunk/; revision=33324
---
 pkgs/development/compilers/ghc/with-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix
index 63427ea8278..a64047a2906 100644
--- a/pkgs/development/compilers/ghc/with-packages.nix
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     echo "Linking GHC core libraries:"
 
     echo -n "Linking $originalTopDir "
-    for f in $originalTopDir/*; do
+    for f in "$originalTopDir/"*; do
       if test -f $f; then
         ln -s $f $linkedTopDir
         echo -n .
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     echo
 
     echo -n "Linking $originalPkgDir "
-    for f in $originalPkgDir/*.conf; do
+    for f in "$originalPkgDir/"*.conf; do
       ln -s $f $linkedPkgDir
       echo -n .
     done
@@ -44,11 +44,11 @@ stdenv.mkDerivation rec {
       # 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
+        for f in "$currentPath/bin/"*; do
           ln -s $f $out/bin
           echo -n .
         done
-        for f in $currentPkgDir/*.conf; do
+        for f in "$currentPkgDir/"*.conf; do
           ln -s $f $linkedPkgDir
           echo -n .
         done

From 115b3d943afb3f6640e4365b2f9ea59a9cda9561 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Mar 2012 11:46:15 +0000
Subject: [PATCH 120/208] pkgs/development/compilers/ghc/with-packages.nix:
 renamed this expression from "ghc-${ghc.version}-linkdir" to
 "haskell-env-${ghc.name}"

This change allows use of the with-packages wrapper in user profiles that are
being updated with "nix-env -u \*". The previous name this expression generated
was considered by Nix to be an older version of "ghc-7.0.4-wrapper", because
that name has a higher priority.

svn path=/nixpkgs/trunk/; revision=33325
---
 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 a64047a2906..5f36db177ec 100644
--- a/pkgs/development/compilers/ghc/with-packages.nix
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@@ -1,7 +1,7 @@
 {stdenv, ghc, packages ? [], makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "ghc-${ghc.version}-linkdir";
+  name = "haskell-env-${ghc.name}";
 
   allPackages = stdenv.lib.closePropagation packages;
   buildInputs = allPackages ++ [makeWrapper];

From 4f576ac4b5d4c15703af4fb20015ed7dba0c4064 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Mar 2012 11:46:18 +0000
Subject: [PATCH 121/208] pkgs/applications/editors/emacs-modes/haskell:
 updated haskell-mode to the latest version from Github

svn path=/nixpkgs/trunk/; revision=33326
---
 .../editors/emacs-modes/haskell/default.nix     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index b73d91b611c..8e613572943 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl, emacs}:
+{ stdenv, fetchgit, emacs }:
 
-stdenv.mkDerivation rec {
-  name = "haskell-mode-2.8.0";
+stdenv.mkDerivation {
+  name = "haskell-mode-2.8.0.29-gc906ee1";
 
-  src = fetchurl {
-    url = "http://projects.haskell.org/haskellmode-emacs/${name}.tar.gz";
-    sha256 = "1065g4xy3ca72xhqh6hfxs5j3mls82bli8w5rhz1npzyfwlwhkb1";
+  src = fetchgit {
+    url = "http://github.com/haskell/haskell-mode.git";
+    rev = "c906ee1fcc03a7c1c670bcaf9a8c8dc99117fca1";
+    sha256 = "a0857a690d85e09ea3ce94a9467335a91fee6a41b9fbc1165f42d1e91723877a";
   };
 
   buildInputs = [emacs];
@@ -16,8 +17,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://projects.haskell.org/haskellmode-emacs/";
-    description = "Haskell mode package for Emacs";
+    homepage = "http://github.com/haskell/haskell-mode";
+    description = "Haskell mode for Emacs";
 
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.simons ];

From c6dc67483ecb1fdc11c6e66180c525defe10c10d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 21 Mar 2012 11:55:26 +0000
Subject: [PATCH 122/208] Updating the libevent version and url, patch by
 Rickard Nilsson.

svn path=/nixpkgs/trunk/; revision=33327
---
 pkgs/development/libraries/libevent/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index ccce0bd5b3d..3be67d18040 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl}:
 
-let version = "2.0.12"; in
+let version = "2.0.17"; in
 stdenv.mkDerivation {
   name = "libevent-${version}";
 
   src = fetchurl {
-    url = "http://monkey.org/~provos/libevent-${version}-stable.tar.gz";
-    sha256 = "1az554fal8g822nhc9f1qrsx12y741x4ks9smj9ix20g5vvq60mc";
+    url = "https://github.com/downloads/libevent/libevent/libevent-${version}-stable.tar.gz";
+    sha256 = "51735d1241f9f6d2d6465d8abc76f7511764f6de7d81026120c629612296faa6";
   };
 
   meta = {

From 6c4fb4a7b77b87ad19c217cfdf39164a6d5f018d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 21 Mar 2012 11:56:04 +0000
Subject: [PATCH 123/208] libnfsidmap plugin path fix.

Patch by Rickard Nilsson.


svn path=/nixpkgs/trunk/; revision=33328
---
 pkgs/development/libraries/libnfsidmap/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/libnfsidmap/default.nix b/pkgs/development/libraries/libnfsidmap/default.nix
index 1b623c4d490..7ffca47fa00 100644
--- a/pkgs/development/libraries/libnfsidmap/default.nix
+++ b/pkgs/development/libraries/libnfsidmap/default.nix
@@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "1kzgwxzh83qi97rblcm9qj80cdvnv8kml2plz0q103j0hifj8vb5";
   };
 
+  preConfigure =
+    ''
+      configureFlags="--with-pluginpath=$out/lib/libnfsidmap"
+    '';
+
   meta = {
     homepage = http://www.citi.umich.edu/projects/nfsv4/linux/;
     description = "Library for holding mulitiple methods of mapping names to id's and visa versa, mainly for NFSv4";

From 61d475d2e0c5634d5c85a94bebd74a9f64f7bc09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 21 Mar 2012 11:56:33 +0000
Subject: [PATCH 124/208] nfs-utils PAGE_SIZE patch.

Otherwise it fails on ARM.

Patch by Rickard Nilsson.


svn path=/nixpkgs/trunk/; revision=33329
---
 pkgs/os-specific/linux/nfs-utils/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 0a0a3c99748..6429d8092cf 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
         chmod +x "$i"
       done
       sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c
+
+      # https://bugzilla.redhat.com/show_bug.cgi?id=749195
+      sed -i s,PAGE_SIZE,getpagesize\(\), utils/blkmapd/device-process.c
     '';
 
   preBuild =

From 26789f2e897aef6728170d79e178e0e14de360ab Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 21 Mar 2012 14:07:29 +0000
Subject: [PATCH 125/208] Update rubygems

svn path=/nixpkgs/trunk/; revision=33333
---
 .../interpreters/ruby/generated.nix           | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 57367785f9f..5786fac0758 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -15,7 +15,7 @@ g: # Get dependencies from patched gems
     autotest_rails = g.autotest_rails_4_1_2;
     builder = g.builder_3_0_0;
     buildr = g.buildr_1_4_6;
-    bundler = g.bundler_1_1_1;
+    bundler = g.bundler_1_1_2;
     childprocess = g.childprocess_0_3_1;
     diff_lcs = g.diff_lcs_1_1_3;
     erubis = g.erubis_2_7_0;
@@ -28,7 +28,7 @@ g: # Get dependencies from patched gems
     json = g.json_1_6_5;
     json_pure = g.json_pure_1_6_5;
     mail = g.mail_2_4_4;
-    mime_types = g.mime_types_1_17_2;
+    mime_types = g.mime_types_1_18;
     minitar = g.minitar_0_5_3;
     multi_json = g.multi_json_1_1_0;
     net_sftp = g.net_sftp_2_0_4;
@@ -253,16 +253,16 @@ for those one-off tasks, with a language that's a joy to use.
       requiredGems = [ g.rake_0_8_7 g.builder_2_1_2 g.net_ssh_2_0_23 g.net_sftp_2_0_4 g.rubyzip_0_9_4 g.highline_1_5_1 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_3_3 g.atoulme_Antwrap_0_7_1 g.diff_lcs_1_1_2 g.rspec_expectations_2_1_0 g.rspec_mocks_2_1_0 g.rspec_core_2_1_0 g.rspec_2_1_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ];
       sha256 = ''11qwqrdnmzzi4zhgajfq1f1ckvd4kpfm9gyqrfjfalphs4gi0vxz'';
     };
-    bundler_1_1_1 = {
+    bundler_1_1_2 = {
       basename = ''bundler'';
       meta = {
         description = ''The best way to manage your application's dependencies'';
         homepage = ''http://gembundler.com'';
         longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
       };
-      name = ''bundler-1.1.1'';
+      name = ''bundler-1.1.2'';
       requiredGems = [  ];
-      sha256 = ''05cr17gzx731403fhbzv3szdfa80hghpn77ab6vi73k4177pjnzx'';
+      sha256 = ''130b2z724bv5k1xzvpzsnv7wxkl4yyigm5vra9lp0km6l1nfbnab'';
     };
     childprocess_0_3_1 = {
       basename = ''childprocess'';
@@ -464,10 +464,10 @@ See class rdoc for help. Hint: ri Hoe'';
         longDescription = ''A really Ruby Mail handler.'';
       };
       name = ''mail-2.4.4'';
-      requiredGems = [ g.mime_types_1_17_2 g.treetop_1_4_10 ];
+      requiredGems = [ g.mime_types_1_18 g.treetop_1_4_10 ];
       sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3'';
     };
-    mime_types_1_17_2 = {
+    mime_types_1_18 = {
       basename = ''mime_types'';
       meta = {
         description = ''This library allows for the identification of a file's likely MIME content type'';
@@ -481,16 +481,11 @@ Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data
 format for the MIME::Type list has changed and the synchronization will no
 longer happen.
 
-Homepage::  http://mime-types.rubyforge.org/
-GitHub::    http://github.com/halostatue/mime-types/
-Copyright:: 2002 - 2011, Austin Ziegler
-            Based in part on prior work copyright Mark Overmeer
-
-:include: License.rdoc'';
+:include: Licence.rdoc'';
       };
-      name = ''mime-types-1.17.2'';
+      name = ''mime-types-1.18'';
       requiredGems = [  ];
-      sha256 = ''0i4pmx86xbnlrhbbm9znnyfglmb21vwjvh262c6qw3m19w6ifs6p'';
+      sha256 = ''00j7vragd5kdj235mskicn3nbg7hrdc6xjvc9bw9vqmal8x4707q'';
     };
     minitar_0_5_3 = {
       basename = ''minitar'';
@@ -635,7 +630,7 @@ request helpers feature.'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
       name = ''rails-3.2.2'';
-      requiredGems = [ g.activesupport_3_2_2 g.actionpack_3_2_2 g.activerecord_3_2_2 g.activeresource_3_2_2 g.actionmailer_3_2_2 g.railties_3_2_2 g.bundler_1_1_1 ];
+      requiredGems = [ g.activesupport_3_2_2 g.actionpack_3_2_2 g.activerecord_3_2_2 g.activeresource_3_2_2 g.actionmailer_3_2_2 g.railties_3_2_2 g.bundler_1_1_2 ];
       sha256 = ''0kwh8142zxyvrva09m5g85cmwhby714q87j1mb8s6wikv4gvfmy9'';
     };
     railties_3_2_2 = {

From c977a573945934eb4c6ead50e5546f5ddbc2610a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Mar 2012 16:48:36 +0000
Subject: [PATCH 126/208] * Add dhcpcd to the channel.

svn path=/nixpkgs/trunk/; revision=33334
---
 pkgs/tools/networking/dhcpcd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index f23d0f41e11..9a862a461b6 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -19,5 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
     homepage = http://roy.marples.name/projects/dhcpcd;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }

From 0728828fac93c83e42b67308ee017e62b24aacad Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 21 Mar 2012 17:15:39 +0000
Subject: [PATCH 127/208] Remove old Thunderbird with Eelco's blessing

svn path=/nixpkgs/trunk/; revision=33335
---
 .../mailreaders/thunderbird/9.x.nix           | 115 ------------------
 pkgs/top-level/all-packages.nix               |   6 +-
 2 files changed, 1 insertion(+), 120 deletions(-)
 delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/9.x.nix

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix
deleted file mode 100644
index 717d4012645..00000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix
+++ /dev/null
@@ -1,115 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, unzip
-, libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
-, libnotify, cairo, pixman, fontconfig
-, libjpeg
-
-, # If you want the resulting program to call itself "Thunderbird"
-  # instead of "Shredder", enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-
-}:
-
-let version = "9.0.1";
-
-    # This patch may become necessary when we use a more recent version of libpng
-    # for now, it's actually not needed
-    # pngPatch = fetchurl {
-    #   url = http://www.linuxfromscratch.org/patches/blfs/svn/thunderbird-9.0.1-libpng-1.5-1.patch;
-    #   sha256 = "8454bdde3be8dc37c9f5e6f597914f0a585ff4b357d3fc86c6c9f80208b6068d";
-    # };
-in
-
-stdenv.mkDerivation {
-  name = "thunderbird-${version}";
-
-  src = fetchurl {
-    url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha256 = "4fc392915e22b81ef0bd08e6e2d8d0348e66f0930f35bf8ac47eb49f64453e2d";
-  };
-
-  enableParallelBuilding = true;
-
-  buildInputs =
-    [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
-      libnotify cairo pixman fontconfig yasm mesa /* nss */
-      libjpeg
-    ];
-
-  # fix some paths in pngPatch
-  # prePatch = ''
-  #   substitute ${pngPatch} png.patch --replace "mozilla-release/modules/" "comm-release/mozilla/modules/"
-  #   '';
-
-  patches = [
-    # "png.patch" # produced by postUnpack
-
-    # Fix weird dependencies such as a so file which depends on "-lpthread".
-    # ./thunderbird-build-deps.patch
-  ];
-
-  configureFlags =
-    [ "--enable-application=mail"
-      "--enable-optimize"
-      "--with-pthreads"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-pthreads"
-      "--with-system-jpeg"
-      # "--with-system-png"  # png 1.5.x not merged in nixpkgs yet
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      "--enable-system-cairo"
-      "--disable-crashreporter"
-      "--disable-necko-wifi"
-      "--disable-webm"
-      "--disable-tests"
-      "--enable-calendar"
-    ]
-    ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-  # The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
-  # prefix, and PREFIX in some places where they are not set.  In
-  # particular, there are some linker flags like
-  # `-rpath-link=$(LIBXUL_DIST)/bin'.  Since this expands to
-  # `-rpath-link=/bin', the build fails due to the purity checks in
-  # the ld wrapper.  So disable the purity check for now.
-  preBuild = "NIX_ENFORCE_PURITY=0";
-
-  # This doesn't work:
-  #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
-
-  postInstall =
-    ''
-      # Fix some references to /bin paths in the Xulrunner shell script.
-      substituteInPlace $out/lib/thunderbird-*/thunderbird \
-          --replace /bin/pwd "$(type -tP pwd)" \
-          --replace /bin/ls "$(type -tP ls)"
-
-      # 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-${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 =
-      # Official branding implies thunderbird name and logo cannot be reuse,
-      # see http://www.mozilla.org/foundation/licensing.html
-      if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
-    maintainers = with maintainers; [ pierron ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6fe5be428f..8e0bb1e0bc0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7377,11 +7377,7 @@ let
 
   thinkingRock = callPackage ../applications/misc/thinking-rock { };
 
-  thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/9.x.nix {
-    inherit (gnome) libIDL;
-  };
-
-  thunderbird11 = callPackage ../applications/networking/mailreaders/thunderbird/11.x.nix {
+  thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/11.x.nix {
     inherit (gnome) libIDL;
   };
 

From ec9ed33730cc99fbce7a41586b2a4bd52a3113a1 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Wed, 21 Mar 2012 17:16:37 +0000
Subject: [PATCH 128/208] Fixing hydrogen so that it builds with scons 2.1,
 using the patch from
 http://www.assembla.com/spaces/hydrogen/tickets/204-hydrogen-0-9-5-doesn-t-install-with-scons-2-1-0

svn path=/nixpkgs/trunk/; revision=33336
---
 pkgs/applications/audio/hydrogen/scons-env.patch | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/audio/hydrogen/scons-env.patch b/pkgs/applications/audio/hydrogen/scons-env.patch
index 4ffa1f91e91..ebc17f67872 100644
--- a/pkgs/applications/audio/hydrogen/scons-env.patch
+++ b/pkgs/applications/audio/hydrogen/scons-env.patch
@@ -9,6 +9,14 @@
  
  
  	#location of qt4.py
+@@ -298,7 +298,6 @@
+ 
+         for N in glob.glob('./data/i18n/hydrogen.*'):
+             env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
+-	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
+ 
+ 	#add every img in ./data/img to the install list. 
+ 	os.path.walk("./data/img/",install_images,env) 
 @@ -379,7 +379,7 @@
  
  includes, a , b = get_platform_flags( opts )

From 214482c79a3029c435c2b6193bb9fba2db3e2b3c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 21 Mar 2012 17:42:19 +0000
Subject: [PATCH 129/208] Update ctemplate

I don't know what this is, but it wasn't building before and now it is.

svn path=/nixpkgs/trunk/; revision=33338
---
 pkgs/development/libraries/libctemplate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix
index 6e53fcb4fe3..3af7e7e4387 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 = "0.97";
+  version = "2.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://google-ctemplate.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0p588zjf7gyi06rcggh9ljx2bj5250zi7s8y3vxmg3j9vddhkdyx";
+    url = "http://ctemplate.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0scdqqbp8fy9jiak60dj1051gbyb8xmlm4rdz4h1myxifjagwbfa";
   };
 }

From 07c583c3d4025e72eb45799aa5c1b34f7bf905cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 21 Mar 2012 20:35:15 +0000
Subject: [PATCH 130/208] Adding rpcbind.

Patch by Rickard Nilsson.


svn path=/nixpkgs/trunk/; revision=33341
---
 pkgs/servers/rpcbind/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/servers/rpcbind/default.nix

diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
new file mode 100644
index 00000000000..db543cd2c01
--- /dev/null
+++ b/pkgs/servers/rpcbind/default.nix
@@ -0,0 +1,24 @@
+{ fetchurl, stdenv, libtirpc }:
+
+stdenv.mkDerivation rec {
+  name = "rpcbind-0.2.0";
+  
+  src = fetchurl {
+    url = "http://freefr.dl.sourceforge.net/project/rpcbind/rpcbind/0.2.0/rpcbind-0.2.0.tar.bz2";
+    sha256 = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3";
+  };
+
+  preConfigure = ''
+    export CPPFLAGS=-I${libtirpc}/include/tirpc
+  '';
+
+  buildInputs = [ libtirpc ];
+
+  meta = {
+    description = "ONC RPC portmapper";
+    license = "BSD";
+    longDescription = ''
+      Universal addresses to RPC program number mapper.
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e0bb1e0bc0..ccd1fe806d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5126,6 +5126,8 @@ let
 
   portmap = callPackage ../servers/portmap { };
 
+  rpcbind = callPackage ../servers/rpcbind { };
+
   monetdb = callPackage ../servers/sql/monetdb { };
 
   mongodb = callPackage ../servers/nosql/mongodb { useV8 = (getConfig ["mongodb" "useV8"] false); };

From a827b5f70928e0f1d85305c09e6c80046d79ddbf Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 22 Mar 2012 08:43:14 +0000
Subject: [PATCH 131/208] smokekde: disable akonadi&kdepimlibs

svn path=/nixpkgs/trunk/; revision=33345
---
 pkgs/desktops/kde-4.8/kdebindings/smokekde.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
index 58a7623e012..8a621a1a2bc 100644
--- a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
+++ b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
@@ -1,7 +1,8 @@
 { kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, shared_desktop_ontologies, attica }:
 
 kde {
-  buildInputs = [ smokeqt kdelibs akonadi kdepimlibs shared_desktop_ontologies attica ];
+  # akonadi & kdepimlibs are disabled due to smokegen crash
+  buildInputs = [ smokeqt kdelibs shared_desktop_ontologies attica ];
   buildNativeInputs = [ cmake ];
 
   cmakeFlags = "-DQTDEFINES_FILE=${smokeqt}/share/smokegen/qtdefines";

From c2e7aa68e43f6bac835366654eb52f8807ab9152 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Thu, 22 Mar 2012 10:29:43 +0000
Subject: [PATCH 132/208] Bumb of Chromium version. I've been using this one
 for a while now.

svn path=/nixpkgs/trunk/; revision=33348
---
 .../networking/browsers/chromium/default.nix     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index a73f87b4a53..2ea5bac0600 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,30 +1,30 @@
 { GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat
 , fetchurl, ffmpeg, fontconfig, freetype, libX11, libXfixes
 , glib, gtk, gdk_pixbuf, pango
-, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
+, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst, libXcomposite
 , libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
-, stdenv, unzip, zlib, pam, pcre }:
+, stdenv, unzip, zlib, pam, pcre, udev }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
 
 stdenv.mkDerivation rec {
-  name = "chromium-18.0.975.0-pre${version}";
+  name = "chromium-19.0.1061.0-pre${version}";
 
   # To determine the latest revision, get
   # ‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’.
   # For the version number, see ‘about:version’.
-  version = "114925";
+  version = "124950";
   
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip";
-        sha256 = "19ayrcz1vw7nqr3bbas5f414n3kibf7knd285azrk29f7a7dnpd6";
+        sha256 = "4472bf584a96e477e2c17f96d4452dd41f4f34ac3d6a9bb4c845cf15d8db0c73";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip";
-        sha256 = "1bhcd3plw3r62bfysc9nszn07xv3gamf5lkwd6ardwyxanclc7x6";
+        sha256 = "6e8a49d9917ee26b67d14cd10b85711c3b9382864197ba02b3cfe8e636d3d69c";
       }
     else throw "Chromium is not supported on this platform.";
 
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
   libPath =
     stdenv.lib.makeLibraryPath
        [ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat
-         ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes
+         ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes libXcomposite
          libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
          libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc
          glib gtk gdk_pixbuf pango
-         pam
+         pam udev
        ];
 
   installPhase = ''

From 31ffda057ebaf41064259793a0dee4ec7bd2b7e5 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Thu, 22 Mar 2012 10:31:10 +0000
Subject: [PATCH 133/208] Fix of the ocaml pcre nix expr. Added 'pcre' as
 propagated build input.

svn path=/nixpkgs/trunk/; revision=33349
---
 pkgs/development/ocaml-modules/pcre/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index 112242e24d6..d7c302a17ec 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation {
     sha256 = "f1774028a4525d22d1f4cf4ce0121c99d85a75aed7a498c3e8ab0f5e39888e47";
   };
 
-  buildInputs = [pcre ocaml findlib];
+  buildInputs = [ocaml findlib];
+  propagatedBuildInputs = [pcre];
 
   createFindlibDestdir = true;
 

From 3a7b035380fb99e532c613cf275deb3b736e6233 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Thu, 22 Mar 2012 10:32:32 +0000
Subject: [PATCH 134/208] Fix of the ocaml extlib expression. The native object
 files were not installed. Turns out that also the 'opt' make target must be
 run besides 'all'.

svn path=/nixpkgs/trunk/; revision=33350
---
 pkgs/development/ocaml-modules/extlib/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index 40808222622..55e1c841830 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  configurePhase = "true";
+  buildPhase = ''
+    make all
+    make opt
+  '';
 
   meta = {
     homepage = "http://code.google.com/p/ocaml-extlib/";

From 3a86557b7c3f500d2310d7d07ca8131573d8ca92 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Thu, 22 Mar 2012 10:36:48 +0000
Subject: [PATCH 135/208] Tidy up: style

svn path=/nixpkgs/trunk/; revision=33351
---
 pkgs/applications/audio/qtractor/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index 7634ecc01da..113b9c4b0d3 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -1,6 +1,6 @@
-{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio,
-ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile,
-libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
+{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio
+, ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
+, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
 
 stdenv.mkDerivation rec {
   version = "0.5.0";
@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "de5991d2d29b2713d73a90ab29efc24db0be68d8e9ca328062d53d229e902e89";
   };
 
-  buildInputs = [ alsaLib autoconf automake dssi gtk jackaudio ladspaH
-    ladspaPlugins liblo libmad libsamplerate libsndfile libtool
-    libvorbis pkgconfig qt4 rubberband ];
+  buildInputs =
+    [ alsaLib autoconf automake dssi gtk jackaudio ladspaH
+      ladspaPlugins liblo libmad libsamplerate libsndfile libtool
+      libvorbis pkgconfig qt4 rubberband
+    ];
 
   meta = with stdenv.lib; {
     description = "Audio/MIDI multi-track sequencer";

From acf3b221a752d4d4e3c208e8aa9a5c2d477f504f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Mar 2012 10:44:57 +0000
Subject: [PATCH 136/208] * Make English the default language for LibreOffice.

svn path=/nixpkgs/trunk/; revision=33352
---
 pkgs/applications/office/openoffice/libreoffice.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix
index 3b69ac8ebb1..0febf2dcbad 100644
--- a/pkgs/applications/office/openoffice/libreoffice.nix
+++ b/pkgs/applications/office/openoffice/libreoffice.nix
@@ -7,7 +7,7 @@
 , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
 , autoconf, automake, openldap, bash
 , fontsConf
-, langs ? [ "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
+, langs ? [ "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ]
 }:
 
 let

From d905637b44a6901ef6e27cdac2cbba0d9edb66e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Mar 2012 11:16:28 +0000
Subject: [PATCH 137/208] * Fix rpcbind.  It wasn't listening on port 111,
 causing nfsd to fail   (http://hydra.nixos.org/build/2315333).

svn path=/nixpkgs/trunk/; revision=33353
---
 pkgs/servers/rpcbind/default.nix  |  2 ++
 pkgs/servers/rpcbind/sunrpc.patch | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/servers/rpcbind/sunrpc.patch

diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index db543cd2c01..33965299a9b 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3";
   };
 
+  patches = [ ./sunrpc.patch ];
+
   preConfigure = ''
     export CPPFLAGS=-I${libtirpc}/include/tirpc
   '';
diff --git a/pkgs/servers/rpcbind/sunrpc.patch b/pkgs/servers/rpcbind/sunrpc.patch
new file mode 100644
index 00000000000..af9b3b71679
--- /dev/null
+++ b/pkgs/servers/rpcbind/sunrpc.patch
@@ -0,0 +1,27 @@
+http://projects.archlinux.org/svntogit/packages.git/tree/trunk/rpcbind-sunrpc.patch?h=packages/rpcbind
+
+Lookup "sunrpc" instead of "rpcbind" in /etc/services, since the former is the
+official IANA name.
+
+--- rpcbind-0.1.7/src/rpcbind.c.orig	2008-11-19 14:17:34.000000000 +0100
++++ rpcbind-0.1.7/src/rpcbind.c	2010-01-07 13:03:37.416632894 +0100
+@@ -114,7 +114,7 @@
+ char *udp_uaddr;	/* Universal UDP address */
+ char *tcp_uaddr;	/* Universal TCP address */
+ #endif
+-static char servname[] = "rpcbind";
++static char servname[] = "sunrpc";
+ static char superuser[] = "superuser";
+ 
+ int main __P((int, char *[]));
+--- rpcbind-0.1.7/src/rpcinfo.c~	2010-01-08 16:14:24.592156602 +0000
++++ rpcbind-0.1.7/src/rpcinfo.c	2010-01-08 16:14:31.578838609 +0000
+@@ -633,7 +633,7 @@
+ 	{
+ 	  memset (&hints, 0, sizeof hints);
+ 	  hints.ai_family = AF_INET;
+-	  if ((error = getaddrinfo (host, "rpcbind", &hints, &res)) != 0 &&
++	  if ((error = getaddrinfo (host, "sunrpc", &hints, &res)) != 0 &&
+               (error = getaddrinfo (host, "portmapper", &hints, &res)) != 0)
+ 	    {
+ 	      fprintf (stderr, "rpcinfo: %s: %s\n",

From 0c842e76202bf4972d81fcc9a69da03191902bc7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Mar 2012 11:17:49 +0000
Subject: [PATCH 138/208] Updated Haskell packages.

 - cautious-file: updated to version 1.0.1
 - hmatrix: updated to version 0.14.0.1
 - random-fu: updated to version 0.2.2.0
 - resourcet: added version 0.3.0
 - sendfile: updated to version 0.7.6
 - test-framework: added version 0.6

svn path=/nixpkgs/trunk/; revision=33354
---
 .../haskell/cautious-file/default.nix         |  4 +--
 .../libraries/haskell/hmatrix/default.nix     | 12 +++++----
 .../libraries/haskell/random-fu/default.nix   |  4 +--
 .../libraries/haskell/resourcet/default.nix   | 17 +++++++++++++
 .../libraries/haskell/sendfile/default.nix    |  4 +--
 .../test-framework/{default.nix => 0.5.nix}   |  0
 .../libraries/haskell/test-framework/0.6.nix  | 25 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           | 13 ++++++++--
 8 files changed, 66 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/resourcet/default.nix
 rename pkgs/development/libraries/haskell/test-framework/{default.nix => 0.5.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/test-framework/0.6.nix

diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix
index 1e967675b00..816ed6fadae 100644
--- a/pkgs/development/libraries/haskell/cautious-file/default.nix
+++ b/pkgs/development/libraries/haskell/cautious-file/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cautious-file";
-  version = "1.0";
-  sha256 = "1s2la91vk9c99bj0ipzc4r6w81rcs4jfmn0xr1cgjab00bzj880q";
+  version = "1.0.1";
+  sha256 = "0mlgchvdhw9lhml4pqmxxvx1zcqmkcyl3yx6w3zp0df200njzsws";
   buildDepends = [ filepath ];
   meta = {
     description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 0248f3289b8..acda91808ad 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -1,13 +1,15 @@
-{ cabal, binary, blas, gsl, liblapack, storableComplex, vector }:
+{ cabal, binary, blas, gsl, liblapack, random, storableComplex
+, vector
+}:
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.13.1.0";
-  sha256 = "0pl5z6zsxyvbdfdng77r2c4isq6d4wbyzx2qs9r8rbn6glaxwrmp";
-  buildDepends = [ binary storableComplex vector ];
+  version = "0.14.0.1";
+  sha256 = "057ii711qsh5307bp3jqpvlhwp2iacr83whhjm5053b5psinj4z5";
+  buildDepends = [ binary random storableComplex vector ];
   extraLibraries = [ blas gsl liblapack ];
   meta = {
-    homepage = "http://perception.inf.um.es/hmatrix";
+    homepage = "https://github.com/albertoruiz/hmatrix";
     description = "Linear algebra and numerical computation";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index 653a4c8534d..2f4893dba08 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "random-fu";
-  version = "0.2.1.1";
-  sha256 = "034pnmagly3akmmcli018258fnyqlyz79av21dqqklfixvw3yja7";
+  version = "0.2.2.0";
+  sha256 = "1wv2c6ba3ad80zyj75xfds98q7psgjkmaqk2zm0srmipq06mx92r";
   buildDepends = [
     erf gamma monadLoops mtl randomShuffle randomSource rvar syb
     transformers vector
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
new file mode 100644
index 00000000000..16cf070eb13
--- /dev/null
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -0,0 +1,17 @@
+{ cabal, liftedBase, monadControl, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "resourcet";
+  version = "0.3.0";
+  sha256 = "1r7yyw8jzh1wxy03mv22hg1c9ff9s4iv86kfgnmva8nwmcgnv0a1";
+  buildDepends = [
+    liftedBase monadControl transformers transformersBase
+  ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Deterministic allocation and freeing of scarce resources";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix
index 74f49b56a91..875bbf45eb3 100644
--- a/pkgs/development/libraries/haskell/sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/sendfile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "sendfile";
-  version = "0.7.5";
-  sha256 = "0gkkxlbl3ci1b973jyksk03400pm8npmsqv81iqs0lwbzc7nxs28";
+  version = "0.7.6";
+  sha256 = "0wqbnr07s3g7f6p4x27ips9nzjjz1ii5hw1q54i31g40jzv8rs7z";
   buildDepends = [ network ];
   meta = {
     homepage = "http://patch-tag.com/r/mae/sendfile";
diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/0.5.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/test-framework/default.nix
rename to pkgs/development/libraries/haskell/test-framework/0.5.nix
diff --git a/pkgs/development/libraries/haskell/test-framework/0.6.nix b/pkgs/development/libraries/haskell/test-framework/0.6.nix
new file mode 100644
index 00000000000..12238fc199e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/test-framework/0.6.nix
@@ -0,0 +1,25 @@
+{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname
+, random, regexPosix, time, xml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "test-framework";
+  version = "0.6";
+  sha256 = "1ah5q3fwd5dmh2zb4rphdpz7hs39m4g1khvxjjwfzwyd9pxiz723";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    ansiTerminal ansiWlPprint extensibleExceptions hostname random
+    regexPosix time xml
+  ];
+  meta = {
+    homepage = "http://batterseapower.github.com/test-framework/";
+    description = "Framework for running and organising tests, with HUnit and QuickCheck support";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 195730a1c40..75cf015e31a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1211,6 +1211,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   resourcePool = callPackage ../development/libraries/haskell/resource-pool {};
 
+  resourcet = callPackage ../development/libraries/haskell/resourcet {};
+
   RSA = callPackage ../development/libraries/haskell/RSA {};
 
   safe = callPackage ../development/libraries/haskell/safe {};
@@ -1324,7 +1326,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   terminfo = callPackage ../development/libraries/haskell/terminfo {};
 
-  testFramework = callPackage ../development/libraries/haskell/test-framework {};
+  testFramework_0_6 = callPackage ../development/libraries/haskell/test-framework/0.6.nix {};
+  testFramework_0_5 = callPackage ../development/libraries/haskell/test-framework/0.5.nix {};
+  testFramework = self.testFramework_0_6;
 
   testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {};
 
@@ -1608,7 +1612,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     QuickCheck = self.QuickCheck2;
   };
 
-  mathblog = callPackage ../applications/misc/mathblog {};
+  mathblog = callPackage ../applications/misc/mathblog {
+    testFramework = self.testFramework_0_5;
+    testFrameworkHunit = self.testFrameworkHunit.override {
+      testFramework = self.testFramework_0_5;
+    };
+  };
 
   xmobar = callPackage ../applications/misc/xmobar {
     parsec = self.parsec3;

From e53c036470d8353c7af15f29a6e0d30cfbd2a16b Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Thu, 22 Mar 2012 18:49:15 +0000
Subject: [PATCH 139/208] Upgrading dssi to 1.1.1

svn path=/nixpkgs/trunk/; revision=33360
---
 pkgs/development/libraries/dssi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix
index 9074120d7de..951278b4433 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/pkgs/development/libraries/dssi/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , ladspaH, jackaudio, liblo, alsaLib, qt4, libX11, libsndfile, libSM
-  , libsamplerate, libtool, autoconf, automake, xproto, libICE
+  , libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig
   , ...}:
 builderDefsPackage
 (a :  
@@ -12,11 +12,11 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="dssi";
-    version="1.1.0";
+    version="1.1.1";
     project="${baseName}";
     name="${baseName}-${version}";
     url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
-    hash="0lwvyrsr9dm032rrhxad30k712q3arrbn7g898n3flg26hmw58yf";
+    hash="0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j";
   };
 in
 rec {

From 464a05818e873c243ef20e33eb2add1f0f08ba74 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Thu, 22 Mar 2012 18:49:57 +0000
Subject: [PATCH 140/208] Upgrading Qtractor to 0.5.4

svn path=/nixpkgs/trunk/; revision=33361
---
 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 113b9c4b0d3..3c31aff4232 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.0";
+  version = "0.5.4";
   name = "qtractor-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qtractor/${name}.tar.gz";
-    sha256 = "de5991d2d29b2713d73a90ab29efc24db0be68d8e9ca328062d53d229e902e89";
+    sha256 = "08vnvjl4w6z49s5shnip0qlwib0gwixw9wrqbazkh62i328fa05l";
   };
 
   buildInputs =

From 438f877d8282f0a65fdc1b9b05be1e5e2e04ec19 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Thu, 22 Mar 2012 19:56:48 +0000
Subject: [PATCH 141/208] Removing specimen, the release doesn't work and the
 svn repo is no longer available :(

svn path=/nixpkgs/trunk/; revision=33362
---
 pkgs/applications/audio/specimen/default.nix | 28 --------------------
 pkgs/top-level/all-packages.nix              |  4 ---
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/applications/audio/specimen/default.nix

diff --git a/pkgs/applications/audio/specimen/default.nix b/pkgs/applications/audio/specimen/default.nix
deleted file mode 100644
index 31b17b70ff3..00000000000
--- a/pkgs/applications/audio/specimen/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchsvn, alsaLib, autoconf, automake, gtk, jackaudio,
-libgnomecanvas, libsamplerate, libsndfile, libtool, libxml2, phat,
-pkgconfig }:
-
-stdenv.mkDerivation  rec {
-  name = "specimen-svn-89";
-
-  # The released version won't compile with newer versions of jack
-  src = fetchsvn {
-    url = http://zhevny.com/svn/specimen/trunk;
-    rev = 89;
-    sha256 = "1i24nchw14cbjv7kmzs7cvmis2xv4r7bxghi8d6gq5lprwk8xydf";
-  };
-
-  preConfigure = "sh autogen.sh";
-
-  buildInputs = [ alsaLib autoconf automake gtk jackaudio
-    libgnomecanvas libsamplerate libsndfile libtool libxml2 phat
-    pkgconfig ];
-
-  meta = with stdenv.lib; {
-    description = "MIDI controllable audio sampler";
-    homepage = http://zhevny.com/specimen/;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccd1fe806d8..1f4ee6ad1f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7293,10 +7293,6 @@ let
 
   sox = callPackage ../applications/misc/audio/sox { };
 
-  specimen = callPackage ../applications/audio/specimen {
-    inherit (gnome) libgnomecanvas;
-  };
-
   spotify = callPackage ../applications/audio/spotify { };
 
   stalonetray = callPackage ../applications/window-managers/stalonetray {};

From 01e0c31baeddf2e5005b1804c20a60547c5e2389 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 22 Mar 2012 22:37:08 +0000
Subject: [PATCH 142/208] haskell-lazysmallcheck

svn path=/nixpkgs/trunk/; revision=33363
---
 pkgs/development/compilers/uhc/default.nix      |  5 +++--
 .../haskell/lazysmallcheck/default.nix          | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  2 ++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/lazysmallcheck/default.nix

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index 8cd0a2e7944..d2fe6150374 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  revision = "2426";
+  revision = "2495";
 in
 stdenv.mkDerivation {
   name = "uhc-svn-${revision}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchsvn {
      url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC";
      rev = revision;
-     sha256 = "06963edb673697f3eac357eccdc6d4bf7fbe7b9b92a96e3e329a4caf53f85c4c";
+     sha256 = "0402cb05629454e29bdca02051406bc9e515d2525a785c85079469b674378fca";
   };
 
   propagatedBuildInputs = [mtl network binary fgl syb];
@@ -30,6 +30,7 @@ stdenv.mkDerivation {
     sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in
     sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in
     sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/dist.mk
+    sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/config.mk.in
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
new file mode 100644
index 00000000000..5881baf7430
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "lazysmallcheck";
+  version = "0.6";
+  sha256 = "0lqggm75m1qd34lzqj3ibvnjwhjqvq16cab8zxm4yzn7j2sxzm4x";
+  meta = {
+    homepage = "http://www.cs.york.ac.uk/~mfn/lazysmallcheck/";
+    description = "A library for demand-driven testing of Haskell programs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 75cf015e31a..66c074ac17e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -950,6 +950,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   largeword = callPackage ../development/libraries/haskell/largeword {};
 
+  lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {};
+
   leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
 
   libmpd = callPackage ../development/libraries/haskell/libmpd {};

From 25fe36ff1516320794131e04748a01f5c28d173b Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 22 Mar 2012 22:37:13 +0000
Subject: [PATCH 143/208] haskell-Stream

svn path=/nixpkgs/trunk/; revision=33364
---
 .../libraries/haskell/Stream/default.nix        | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/Stream/default.nix

diff --git a/pkgs/development/libraries/haskell/Stream/default.nix b/pkgs/development/libraries/haskell/Stream/default.nix
new file mode 100644
index 00000000000..4dc274850df
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Stream/default.nix
@@ -0,0 +1,17 @@
+{ cabal, lazysmallcheck, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "Stream";
+  version = "0.4.6";
+  sha256 = "0ppjcddm8dxxd260dsnzrdijifg4pa66lm401qj4fiddw0b50wzb";
+  buildDepends = [ lazysmallcheck QuickCheck ];
+  meta = {
+    description = "A library for manipulating infinite lists";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 66c074ac17e..16a8cfcb21c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1302,6 +1302,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   storableRecord = callPackage ../development/libraries/haskell/storable-record {};
 
+  Stream = callPackage ../development/libraries/haskell/Stream {};
+
   strictConcurrency = callPackage ../development/libraries/haskell/strictConcurrency {};
 
   svgcairo = callPackage ../development/libraries/haskell/svgcairo {

From c690fb832be49039a0746049ffb8256bcdd35907 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 22 Mar 2012 22:37:17 +0000
Subject: [PATCH 144/208] haskell-arrows

svn path=/nixpkgs/trunk/; revision=33365
---
 .../libraries/haskell/arrows/default.nix       | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/arrows/default.nix

diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix
new file mode 100644
index 00000000000..9584a4a3e09
--- /dev/null
+++ b/pkgs/development/libraries/haskell/arrows/default.nix
@@ -0,0 +1,18 @@
+{ cabal, Stream }:
+
+cabal.mkDerivation (self: {
+  pname = "arrows";
+  version = "0.4.4.0";
+  sha256 = "1dcvv1vscyggwqmlm6j2sc29zy0wmhn6w4g617gbxxb1j28bm6a9";
+  buildDepends = [ Stream ];
+  meta = {
+    homepage = "http://www.haskell.org/arrows/";
+    description = "Arrow classes and transformers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 16a8cfcb21c..b31c1152132 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -434,6 +434,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {};
 
+  arrows = callPackage ../development/libraries/haskell/arrows {};
+
   asn1Data = callPackage ../development/libraries/haskell/asn1-data {};
 
   AspectAG = callPackage ../development/libraries/haskell/AspectAG {};

From 6aa06a6699ce4bf6bf61605bdb44b2c4908a046f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 23 Mar 2012 03:01:58 +0000
Subject: [PATCH 145/208] ghc-packages: Darwin's native readlink doesn't
 support -f

svn path=/nixpkgs/trunk/; revision=33366
---
 pkgs/development/compilers/ghc/wrapper.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix
index b04cd18fb46..be27f98925e 100644
--- a/pkgs/development/compilers/ghc/wrapper.nix
+++ b/pkgs/development/compilers/ghc/wrapper.nix
@@ -1,4 +1,4 @@
-{stdenv, ghc, makeWrapper}:
+{stdenv, ghc, makeWrapper, coreutils}:
 
 stdenv.mkDerivation {
   name = "ghc-${ghc.version}-wrapper";
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
       case "\$arg" in
         -package-conf) ;;
         *)
-          CANONICALIZED="\$(readlink -f "\$arg")"
+          CANONICALIZED="\$(${stdenv.lib.optionalString stdenv.isDarwin "${coreutils}/bin/"}}readlink -f "\$arg")"
           GHC_PACKAGES_HASH["\$CANONICALIZED"]= ;;
       esac
     done

From 3fbeca3ebc07b38ebcac41ab8785759c56b5d5c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2012 11:26:28 +0000
Subject: [PATCH 146/208] pkgs/development/compilers/ghc/wrapper.nix: removed
 extraneous closing bracket that broke the script

svn path=/nixpkgs/trunk/; revision=33371
---
 pkgs/development/compilers/ghc/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix
index be27f98925e..4407f16c9e0 100644
--- a/pkgs/development/compilers/ghc/wrapper.nix
+++ b/pkgs/development/compilers/ghc/wrapper.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
       case "\$arg" in
         -package-conf) ;;
         *)
-          CANONICALIZED="\$(${stdenv.lib.optionalString stdenv.isDarwin "${coreutils}/bin/"}}readlink -f "\$arg")"
+          CANONICALIZED="\$(${stdenv.lib.optionalString stdenv.isDarwin "${coreutils}/bin/"}readlink -f "\$arg")"
           GHC_PACKAGES_HASH["\$CANONICALIZED"]= ;;
       esac
     done

From 3837c965ad49b35b0dda49aab6274b7f4b00cd2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2012 12:03:04 +0000
Subject: [PATCH 147/208] haskell-zlib-bindings: added version 0.1.0

svn path=/nixpkgs/trunk/; revision=33373
---
 .../zlib-bindings/{default.nix => 0.0.3.2.nix} |  0
 .../libraries/haskell/zlib-bindings/0.1.0.nix  | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  8 ++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/haskell/zlib-bindings/{default.nix => 0.0.3.2.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix

diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/zlib-bindings/default.nix
rename to pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix b/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix
new file mode 100644
index 00000000000..783de42cf8c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix
@@ -0,0 +1,18 @@
+{ cabal, zlib }:
+
+cabal.mkDerivation (self: {
+  pname = "zlib-bindings";
+  version = "0.1.0";
+  sha256 = "0jjkrn72hkakdq4n300fk5422sy1q46p019554lvplqmyqr8bkac";
+  buildDepends = [ zlib ];
+  meta = {
+    homepage = "http://github.com/snoyberg/zlib-bindings";
+    description = "Low-level bindings to the zlib package";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b31c1152132..9fd1b15f96f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1528,11 +1528,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   };
   zlib = self.zlib_0_5_3_3;
 
-  zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
+  zlibBindings_0_0_3_2 = callPackage ../development/libraries/haskell/zlib-bindings/0.0.3.2.nix {};
+  zlibBindings_0_1_0 = callPackage ../development/libraries/haskell/zlib-bindings/0.1.0.nix {};
+  zlibBindings = self.zlibBindings_0_0_3_2;
 
   zlibConduit = callPackage ../development/libraries/haskell/zlib-conduit {};
 
-  zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {};
+  zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {
+    zlibBindings = self.zlibBindings_0_0_3_2;
+  };
 
   Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {};
 

From 24c1200a021188db36587f7763fd43fd45e7fdbd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2012 12:03:07 +0000
Subject: [PATCH 148/208] haskell-fclabels: updated to version 1.1.1.1

svn path=/nixpkgs/trunk/; revision=33374
---
 pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index c310637cacd..1f9a1152831 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.1.1.0";
-  sha256 = "1xkgqib7ya3l6m9bz5ly6x9k0n71jiydk8ss38rvn9j5gryv3las";
+  version = "1.1.1.1";
+  sha256 = "170lsalbak7l52fzdppdvq88ky8y06zzlxy6h18zpd1g18caa0q7";
   buildDepends = [ mtl transformers ];
   meta = {
     description = "First class accessor labels";

From 39e8ab71571b23fde78a9b05c7d2cbaeb11f8411 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2012 12:03:10 +0000
Subject: [PATCH 149/208] haskell-monad-loops: updated to version 0.3.2.0

svn path=/nixpkgs/trunk/; revision=33375
---
 pkgs/development/libraries/haskell/monad-loops/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix
index 669df22a951..9e9d8ed5a1a 100644
--- a/pkgs/development/libraries/haskell/monad-loops/default.nix
+++ b/pkgs/development/libraries/haskell/monad-loops/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-loops";
-  version = "0.3.1.1";
-  sha256 = "086aqd1x1xc6irp24z1lwhzrknw9r2wbs8fnxz6vyi75m3rqvdcv";
+  version = "0.3.2.0";
+  sha256 = "0si8vz1r13lwliya161kwgrb5dpj01j74b6gbjyv78d5fd4hn7n2";
   buildDepends = [ stm ];
   meta = {
-    homepage = "http://code.haskell.org/~mokus/monad-loops";
+    homepage = "https://github.com/mokus0/monad-loops";
     description = "Monadic loops";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From f503c5f7282a671f929ec2495489974bdd6b1f94 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2012 12:03:12 +0000
Subject: [PATCH 150/208] haskell-resourcet: updated to version 0.3.1

svn path=/nixpkgs/trunk/; revision=33376
---
 pkgs/development/libraries/haskell/resourcet/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index 16cf070eb13..490908b6fa2 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.3.0";
-  sha256 = "1r7yyw8jzh1wxy03mv22hg1c9ff9s4iv86kfgnmva8nwmcgnv0a1";
+  version = "0.3.1";
+  sha256 = "0nz1rz0nrs693hfav687rci3rhrhsmnjb93949mxgyd0ka5pw90l";
   buildDepends = [
     liftedBase monadControl transformers transformersBase
   ];
@@ -13,5 +13,9 @@ cabal.mkDerivation (self: {
     description = "Deterministic allocation and freeing of scarce resources";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

From f4462f5cad53c084c26c2582d52c2c2b6c04f8cd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2012 12:03:15 +0000
Subject: [PATCH 151/208] haskell-yesod-core: updated to version 0.10.3

svn path=/nixpkgs/trunk/; revision=33377
---
 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 84c578786c6..b137ad744bc 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "0.10.2.2";
-  sha256 = "1aghra5pmmykl9fvsb18mbpawvwqwv3iwls33m166b0czzdwlrlv";
+  version = "0.10.3";
+  sha256 = "1mw78h6h7b4g67kyg4y01rcgi5bpb97hhzx0yqk4bmq23mzisg9m";
   buildDepends = [
     aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
     conduit cookie failure fastLogger hamlet httpTypes liftedBase

From 952626fc9431bee481739d673c99ed4e1fb358cf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2012 12:03:18 +0000
Subject: [PATCH 152/208] haskell-transformers: added version 0.3.0.0

svn path=/nixpkgs/trunk/; revision=33378
---
 .../libraries/haskell/transformers/0.3.0.0.nix   | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/transformers/0.3.0.0.nix

diff --git a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
new file mode 100644
index 00000000000..50675d901ec
--- /dev/null
+++ b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
@@ -0,0 +1,16 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "transformers";
+  version = "0.3.0.0";
+  sha256 = "14cmfdi4cmirbrc3x2h6ly08j0mb4p59mxbqkqw8rnbsr4g0rap5";
+  meta = {
+    description = "Concrete functor and monad transformers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9fd1b15f96f..09935353d90 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1378,7 +1378,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   tlsExtra = callPackage ../development/libraries/haskell/tls-extra {};
 
   transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};
-  transformers = self.transformers_0_2_2_0;
+  transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {};
+  transformers = self.transformers_0_3_0_0;
 
   transformersBase = callPackage ../development/libraries/haskell/transformers-base {};
 

From 062c35144d975e3622324c9e8e22467227976e21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2012 12:03:21 +0000
Subject: [PATCH 153/208] haskell-monad-control: added version 0.3.1.1

svn path=/nixpkgs/trunk/; revision=33379
---
 .../haskell/monad-control/0.3.1.1.nix         | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix

diff --git a/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix b/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix
new file mode 100644
index 00000000000..8c651936d3e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix
@@ -0,0 +1,20 @@
+{ cabal, baseUnicodeSymbols, transformers, transformersBase }:
+
+cabal.mkDerivation (self: {
+  pname = "monad-control";
+  version = "0.3.1.1";
+  sha256 = "09sr9zw6xzci4r86sjpslwnd64ickcsv6qs1fr6ig4w7mwacyx4x";
+  buildDepends = [
+    baseUnicodeSymbols transformers transformersBase
+  ];
+  meta = {
+    homepage = "https://github.com/basvandijk/monad-control";
+    description = "Lift control operations, like exception catching, through monad transformers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 09935353d90..6df1eafe4af 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -989,8 +989,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {};
 
   monadControl_0_2_0_3 = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {};
-  monadControl_0_3_1 = callPackage ../development/libraries/haskell/monad-control/0.3.1.nix {};
-  monadControl = self.monadControl_0_3_1;
+  monadControl_0_3_1_1 = callPackage ../development/libraries/haskell/monad-control/0.3.1.1.nix {};
+  monadControl = self.monadControl_0_3_1_1;
 
   monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
 

From e58d3914bb601320667216f9badc5d44a230d191 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2012 12:03:23 +0000
Subject: [PATCH 154/208] haskell-mode: updated to version 2.8.0.29-g7682f99

svn path=/nixpkgs/trunk/; revision=33380
---
 pkgs/applications/editors/emacs-modes/haskell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 8e613572943..f58b66a506e 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, emacs }:
 
 stdenv.mkDerivation {
-  name = "haskell-mode-2.8.0.29-gc906ee1";
+  name = "haskell-mode-2.8.0.29-g7682f99";
 
   src = fetchgit {
     url = "http://github.com/haskell/haskell-mode.git";
-    rev = "c906ee1fcc03a7c1c670bcaf9a8c8dc99117fca1";
-    sha256 = "a0857a690d85e09ea3ce94a9467335a91fee6a41b9fbc1165f42d1e91723877a";
+    rev = "7682f991acd63d9400597d5f4980f62d7b1c4c0b";
+    sha256 = "f4508a11fa65ece237c9ee9f623bc4e9ad3d3d58ab2fcacc8ddb080c29aac717";
   };
 
   buildInputs = [emacs];

From e1873ada7f69fa4957f5b59a4a50e1607cfbeb59 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 23 Mar 2012 15:33:35 +0000
Subject: [PATCH 155/208] disable notification to Peter Simons for now

svn path=/nixpkgs/trunk/; revision=33384
---
 pkgs/lib/maintainers.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index d4c08515545..9df7da673c9 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -26,7 +26,8 @@
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   shlevy = "Shea Levy <shea@shealevy.com>";
-  simons = "Peter Simons <simons@cryp.to>";
+  simons = "";
+  # simons = "Peter Simons <simons@cryp.to>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
   viric = "Lluís Batlle i Rossell <viric@viric.name>";

From eeb95637ac3bd9b787b6e56e46f1e95bd0fd9c67 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 23 Mar 2012 18:56:35 +0000
Subject: [PATCH 156/208] Add ksshaskpass

Patch supplied by Kirill Elagin, edited by Yury Kudryashov.

svn path=/nixpkgs/trunk/; revision=33386
---
 pkgs/tools/security/ksshaskpass/default.nix | 23 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/security/ksshaskpass/default.nix

diff --git a/pkgs/tools/security/ksshaskpass/default.nix b/pkgs/tools/security/ksshaskpass/default.nix
new file mode 100644
index 00000000000..1c777294c9b
--- /dev/null
+++ b/pkgs/tools/security/ksshaskpass/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, kdelibs}:
+
+stdenv.mkDerivation {
+  name = "ksshaskpass-0.5.3";
+
+  src = fetchurl {
+    url = http://kde-apps.org/CONTENT/content-files/50971-ksshaskpass-0.5.3.tar.gz;
+    sha256 = "0911i8jr0nzqah8xidb8wba55a2skaidj3klv3cw6bm5fjx7x953";
+  };
+
+  buildInputs = [ kdelibs ];
+
+  patchPhase = ''
+    sed -i 's@/usr/bin/@@' src/ksshaskpass.desktop
+  '';
+
+  meta = {
+    homepage = http://kde-apps.org/content/show.php?content=50971;
+    description = "A KDE 4 version of ssh-askpass with KWallet support";
+    license = stdenv.lib.licenses.gpl2Plus;
+    inherit (kdelibs.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f4ee6ad1f8..d6891b36567 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7998,6 +7998,8 @@ let
 
       krusader = callPackage ../applications/misc/krusader { };
 
+      ksshaskpass = callPackage ../tools/security/ksshaskpass {};
+
       ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
 
       kuickshow = callPackage ../applications/graphics/kuickshow { };

From 295971e153393ee32152d1f847c9f8fd0d3b6238 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 23 Mar 2012 18:56:41 +0000
Subject: [PATCH 157/208] Disable smokekde.attica

svn path=/nixpkgs/trunk/; revision=33387
---
 pkgs/desktops/kde-4.8/kdebindings/smokekde.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
index 8a621a1a2bc..6f1b7a0b708 100644
--- a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
+++ b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
@@ -1,8 +1,8 @@
 { kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, shared_desktop_ontologies, attica }:
 
 kde {
-  # akonadi & kdepimlibs are disabled due to smokegen crash
-  buildInputs = [ smokeqt kdelibs shared_desktop_ontologies attica ];
+  # attica, akonadi and kdepimlibs are disabled due to smokegen crash
+  buildInputs = [ smokeqt kdelibs shared_desktop_ontologies ];
   buildNativeInputs = [ cmake ];
 
   cmakeFlags = "-DQTDEFINES_FILE=${smokeqt}/share/smokegen/qtdefines";

From e7403a7f634dcbca4231c32adaa0bc25ecef890b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2012 21:03:04 +0000
Subject: [PATCH 158/208] haskell-permutation: added version 0.4.1

svn path=/nixpkgs/trunk/; revision=33389
---
 .../libraries/haskell/permutation/default.nix   | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/permutation/default.nix

diff --git a/pkgs/development/libraries/haskell/permutation/default.nix b/pkgs/development/libraries/haskell/permutation/default.nix
new file mode 100644
index 00000000000..e21a8993a97
--- /dev/null
+++ b/pkgs/development/libraries/haskell/permutation/default.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "permutation";
+  version = "0.4.1";
+  sha256 = "0fgw4ivs8sa18fyphwr3mzp2v7ha2nz2yf3a7jmz9ymqdf2xws97";
+  meta = {
+    homepage = "http://stat.stanford.edu/~patperry/code/permutation";
+    description = "A library for permutations and combinations";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6df1eafe4af..0d3d43ab64c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1099,6 +1099,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   pcreLight = callPackage ../development/libraries/haskell/pcre-light {};
 
+  permutation = callPackage ../development/libraries/haskell/permutation {};
+
   persistent = callPackage ../development/libraries/haskell/persistent {};
 
   persistentSqlite = callPackage ../development/libraries/haskell/persistent-sqlite {};

From ea335bb574ebc4383c285942dcbe068866d868de Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 24 Mar 2012 06:35:16 +0000
Subject: [PATCH 159/208] Calligra-2.4 RC2

Blind commit. Let Hydra build it.

svn path=/nixpkgs/trunk/; revision=33391
---
 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 89eed7310c2..a447323332a 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -4,11 +4,11 @@
 , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies }:
 
 stdenv.mkDerivation rec {
-  name = "calligra-2.3.87";
+  name = "calligra-2.3.92";
 
   src = fetchurl {
     url = "mirror://kde/unstable/${name}/${name}.tar.bz2";
-    sha256 = "1arrk2ww3bykv4y8fsn1dn25gq9bf7a4ygggkrczfrxlbv1s9p9v";
+    sha256 = "1ad7vzdhfkv48xhs9p84mwpq8zsdiajz3qjng3h2rswd88sgrblg";
   };
 
   buildNativeInputs = [ cmake perl pkgconfig ];

From 880dcc2c648873f6f0c1126864d17894317f736f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 Mar 2012 10:21:28 +0000
Subject: [PATCH 160/208] Removed myself as a maintainer from Haskell packages
 that I don't personally use.

By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
---
 pkgs/applications/editors/leksah/default.nix                 | 5 +----
 pkgs/applications/misc/mathblog/default.nix                  | 5 +----
 pkgs/applications/misc/xmobar/default.nix                    | 5 +----
 pkgs/applications/version-management/darcs/default.nix       | 5 +----
 pkgs/applications/window-managers/xmonad/xmonad-contrib.nix  | 5 +----
 pkgs/applications/window-managers/xmonad/xmonad-extras.nix   | 5 +----
 pkgs/development/compilers/Agda-executable/default.nix       | 5 +----
 pkgs/development/compilers/epic/default.nix                  | 5 +----
 pkgs/development/compilers/idris/default.nix                 | 5 +----
 pkgs/development/libraries/haskell/AC-Vector/default.nix     | 5 +----
 pkgs/development/libraries/haskell/Agda/default.nix          | 5 +----
 pkgs/development/libraries/haskell/AspectAG/default.nix      | 5 +----
 pkgs/development/libraries/haskell/Boolean/default.nix       | 5 +----
 pkgs/development/libraries/haskell/Cabal/1.14.0.nix          | 5 +----
 pkgs/development/libraries/haskell/Chart/default.nix         | 5 +----
 pkgs/development/libraries/haskell/ConfigFile/default.nix    | 5 +----
 pkgs/development/libraries/haskell/CouchDB/default.nix       | 5 +----
 pkgs/development/libraries/haskell/DSH/default.nix           | 5 +----
 pkgs/development/libraries/haskell/Diff/default.nix          | 5 +----
 pkgs/development/libraries/haskell/FerryCore/default.nix     | 5 +----
 pkgs/development/libraries/haskell/GLFW/default.nix          | 5 +----
 pkgs/development/libraries/haskell/GLURaw/default.nix        | 5 +----
 pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix          | 5 +----
 pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix          | 5 +----
 pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix          | 5 +----
 pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix          | 5 +----
 pkgs/development/libraries/haskell/GlomeVec/default.nix      | 5 +----
 pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix        | 5 +----
 pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix  | 5 +----
 pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix     | 5 +----
 pkgs/development/libraries/haskell/HDBC/HDBC.nix             | 5 +----
 pkgs/development/libraries/haskell/HGL/default.nix           | 5 +----
 pkgs/development/libraries/haskell/HList/default.nix         | 5 +----
 pkgs/development/libraries/haskell/HSH/default.nix           | 5 +----
 .../libraries/haskell/HStringTemplate/default.nix            | 5 +----
 pkgs/development/libraries/haskell/HTTP/4000.0.6.nix         | 5 +----
 pkgs/development/libraries/haskell/HTTP/4000.0.9.nix         | 5 +----
 pkgs/development/libraries/haskell/HTTP/4000.1.1.nix         | 5 +----
 pkgs/development/libraries/haskell/HTTP/4000.1.2.nix         | 5 +----
 pkgs/development/libraries/haskell/HTTP/4000.2.1.nix         | 5 +----
 pkgs/development/libraries/haskell/HTTP/4000.2.2.nix         | 5 +----
 pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix         | 5 +----
 pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix         | 5 +----
 pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix         | 5 +----
 pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix         | 5 +----
 pkgs/development/libraries/haskell/HaXml/default.nix         | 5 +----
 .../libraries/haskell/HaskellForMaths/default.nix            | 5 +----
 pkgs/development/libraries/haskell/Hipmunk/default.nix       | 5 +----
 pkgs/development/libraries/haskell/HsOpenSSL/default.nix     | 5 +----
 pkgs/development/libraries/haskell/HsSyck/default.nix        | 5 +----
 pkgs/development/libraries/haskell/IfElse/default.nix        | 5 +----
 pkgs/development/libraries/haskell/JsContracts/default.nix   | 5 +----
 pkgs/development/libraries/haskell/ListLike/default.nix      | 5 +----
 pkgs/development/libraries/haskell/MaybeT/default.nix        | 5 +----
 pkgs/development/libraries/haskell/MemoTrie/default.nix      | 5 +----
 pkgs/development/libraries/haskell/MissingH/default.nix      | 5 +----
 .../libraries/haskell/MonadCatchIO-mtl/default.nix           | 5 +----
 .../libraries/haskell/MonadCatchIO-transformers/default.nix  | 5 +----
 pkgs/development/libraries/haskell/MonadPrompt/default.nix   | 5 +----
 pkgs/development/libraries/haskell/MonadRandom/default.nix   | 5 +----
 pkgs/development/libraries/haskell/NanoProlog/default.nix    | 5 +----
 pkgs/development/libraries/haskell/NumInstances/default.nix  | 5 +----
 pkgs/development/libraries/haskell/ObjectName/default.nix    | 5 +----
 pkgs/development/libraries/haskell/OneTuple/default.nix      | 5 +----
 pkgs/development/libraries/haskell/OpenAL/default.nix        | 5 +----
 pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix        | 5 +----
 pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix        | 5 +----
 pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix        | 5 +----
 pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix        | 5 +----
 pkgs/development/libraries/haskell/OpenGLRaw/default.nix     | 5 +----
 pkgs/development/libraries/haskell/PSQueue/default.nix       | 5 +----
 pkgs/development/libraries/haskell/Pathfinder/default.nix    | 5 +----
 pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix    | 5 +----
 pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix    | 5 +----
 pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix    | 5 +----
 pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix    | 5 +----
 pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix    | 5 +----
 pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix      | 5 +----
 pkgs/development/libraries/haskell/RSA/default.nix           | 5 +----
 pkgs/development/libraries/haskell/Ranged-sets/default.nix   | 5 +----
 pkgs/development/libraries/haskell/RepLib/default.nix        | 5 +----
 pkgs/development/libraries/haskell/SDL-image/default.nix     | 5 +----
 pkgs/development/libraries/haskell/SDL-mixer/default.nix     | 5 +----
 pkgs/development/libraries/haskell/SDL-ttf/default.nix       | 5 +----
 pkgs/development/libraries/haskell/SDL/default.nix           | 5 +----
 pkgs/development/libraries/haskell/SHA/default.nix           | 5 +----
 pkgs/development/libraries/haskell/SMTPClient/default.nix    | 5 +----
 .../libraries/haskell/Shellac/Shellac-haskeline.nix          | 5 +----
 .../libraries/haskell/Shellac/Shellac-readline.nix           | 5 +----
 pkgs/development/libraries/haskell/Shellac/Shellac.nix       | 5 +----
 pkgs/development/libraries/haskell/StateVar/default.nix      | 5 +----
 pkgs/development/libraries/haskell/Stream/default.nix        | 5 +----
 pkgs/development/libraries/haskell/TableAlgebra/default.nix  | 5 +----
 pkgs/development/libraries/haskell/Tensor/default.nix        | 5 +----
 pkgs/development/libraries/haskell/Vec/default.nix           | 5 +----
 pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix    | 5 +----
 pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix    | 5 +----
 pkgs/development/libraries/haskell/WebBits/1.0.nix           | 5 +----
 pkgs/development/libraries/haskell/WebBits/2.0.nix           | 5 +----
 pkgs/development/libraries/haskell/WebBits/2.1.nix           | 5 +----
 pkgs/development/libraries/haskell/X11-xft/default.nix       | 5 +----
 pkgs/development/libraries/haskell/X11/default.nix           | 5 +----
 pkgs/development/libraries/haskell/Zwaluw/default.nix        | 5 +----
 pkgs/development/libraries/haskell/aeson/default.nix         | 5 +----
 .../development/libraries/haskell/alternative-io/default.nix | 5 +----
 pkgs/development/libraries/haskell/ansi-terminal/default.nix | 5 +----
 .../development/libraries/haskell/ansi-wl-pprint/default.nix | 5 +----
 pkgs/development/libraries/haskell/arrows/default.nix        | 5 +----
 pkgs/development/libraries/haskell/asn1-data/default.nix     | 5 +----
 pkgs/development/libraries/haskell/async/default.nix         | 5 +----
 pkgs/development/libraries/haskell/attempt/0.3.1.1.nix       | 5 +----
 pkgs/development/libraries/haskell/attempt/0.4.0.nix         | 5 +----
 .../libraries/haskell/attoparsec-conduit/default.nix         | 5 +----
 pkgs/development/libraries/haskell/attoparsec/default.nix    | 5 +----
 pkgs/development/libraries/haskell/attoparsec/enumerator.nix | 5 +----
 pkgs/development/libraries/haskell/authenticate/default.nix  | 5 +----
 .../libraries/haskell/base-unicode-symbols/default.nix       | 5 +----
 .../libraries/haskell/base16-bytestring/default.nix          | 5 +----
 .../libraries/haskell/base64-bytestring/default.nix          | 5 +----
 pkgs/development/libraries/haskell/base64-string/default.nix | 5 +----
 pkgs/development/libraries/haskell/benchpress/default.nix    | 5 +----
 pkgs/development/libraries/haskell/bimap/default.nix         | 5 +----
 pkgs/development/libraries/haskell/binary-shared/default.nix | 5 +----
 pkgs/development/libraries/haskell/binary/default.nix        | 5 +----
 pkgs/development/libraries/haskell/bitarray/default.nix      | 5 +----
 pkgs/development/libraries/haskell/bitmap/default.nix        | 5 +----
 pkgs/development/libraries/haskell/bktrees/default.nix       | 5 +----
 .../libraries/haskell/blaze-builder-conduit/default.nix      | 5 +----
 .../libraries/haskell/blaze-builder-enumerator/default.nix   | 5 +----
 pkgs/development/libraries/haskell/blaze-builder/default.nix | 5 +----
 pkgs/development/libraries/haskell/blaze-html/default.nix    | 5 +----
 pkgs/development/libraries/haskell/blaze-textual/default.nix | 5 +----
 pkgs/development/libraries/haskell/bloomfilter/default.nix   | 5 +----
 pkgs/development/libraries/haskell/bmp/default.nix           | 5 +----
 pkgs/development/libraries/haskell/bson/default.nix          | 5 +----
 pkgs/development/libraries/haskell/byteorder/default.nix     | 5 +----
 .../libraries/haskell/bytestring-lexing/default.nix          | 5 +----
 .../libraries/haskell/bytestring-mmap/default.nix            | 5 +----
 .../libraries/haskell/bytestring-nums/default.nix            | 5 +----
 .../libraries/haskell/bytestring-trie/default.nix            | 5 +----
 pkgs/development/libraries/haskell/cabal-file-th/default.nix | 5 +----
 pkgs/development/libraries/haskell/cairo/default.nix         | 5 +----
 .../libraries/haskell/case-insensitive/default.nix           | 5 +----
 pkgs/development/libraries/haskell/cautious-file/default.nix | 5 +----
 pkgs/development/libraries/haskell/cereal/default.nix        | 5 +----
 pkgs/development/libraries/haskell/certificate/default.nix   | 5 +----
 pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix        | 5 +----
 pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix        | 5 +----
 pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix        | 5 +----
 pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix        | 5 +----
 pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix        | 5 +----
 pkgs/development/libraries/haskell/citeproc-hs/default.nix   | 5 +----
 pkgs/development/libraries/haskell/clientsession/default.nix | 5 +----
 pkgs/development/libraries/haskell/cmdargs/default.nix       | 5 +----
 pkgs/development/libraries/haskell/cmdlib/default.nix        | 5 +----
 .../libraries/haskell/colorize-haskell/default.nix           | 5 +----
 pkgs/development/libraries/haskell/colour/default.nix        | 5 +----
 .../libraries/haskell/compact-string-fix/default.nix         | 5 +----
 pkgs/development/libraries/haskell/conduit/default.nix       | 5 +----
 .../libraries/haskell/continued-fractions/default.nix        | 5 +----
 pkgs/development/libraries/haskell/converge/default.nix      | 5 +----
 .../libraries/haskell/convertible-text/default.nix           | 5 +----
 pkgs/development/libraries/haskell/convertible/default.nix   | 5 +----
 pkgs/development/libraries/haskell/cookie/default.nix        | 5 +----
 pkgs/development/libraries/haskell/cprng-aes/default.nix     | 5 +----
 pkgs/development/libraries/haskell/criterion/default.nix     | 5 +----
 pkgs/development/libraries/haskell/crypto-api/default.nix    | 5 +----
 .../development/libraries/haskell/crypto-conduit/default.nix | 5 +----
 .../libraries/haskell/crypto-pubkey-types/default.nix        | 5 +----
 pkgs/development/libraries/haskell/cryptocipher/default.nix  | 5 +----
 pkgs/development/libraries/haskell/cryptohash/default.nix    | 5 +----
 pkgs/development/libraries/haskell/css-text/default.nix      | 5 +----
 pkgs/development/libraries/haskell/csv/default.nix           | 5 +----
 pkgs/development/libraries/haskell/curl/default.nix          | 5 +----
 .../haskell/data-accessor/data-accessor-template.nix         | 5 +----
 .../libraries/haskell/data-accessor/data-accessor.nix        | 5 +----
 .../libraries/haskell/data-binary-ieee754/default.nix        | 5 +----
 pkgs/development/libraries/haskell/data-default/default.nix  | 5 +----
 pkgs/development/libraries/haskell/data-reify/default.nix    | 5 +----
 pkgs/development/libraries/haskell/dataenc/default.nix       | 5 +----
 pkgs/development/libraries/haskell/datetime/default.nix      | 5 +----
 pkgs/development/libraries/haskell/deepseq-th/default.nix    | 5 +----
 pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix       | 5 +----
 pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix       | 5 +----
 pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix       | 5 +----
 pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix       | 5 +----
 pkgs/development/libraries/haskell/derive/default.nix        | 5 +----
 pkgs/development/libraries/haskell/derp/default.nix          | 5 +----
 pkgs/development/libraries/haskell/digest/default.nix        | 5 +----
 pkgs/development/libraries/haskell/dimensional/default.nix   | 5 +----
 .../development/libraries/haskell/directory-tree/default.nix | 5 +----
 pkgs/development/libraries/haskell/dlist/default.nix         | 5 +----
 pkgs/development/libraries/haskell/dotgen/default.nix        | 5 +----
 .../libraries/haskell/double-conversion/default.nix          | 5 +----
 pkgs/development/libraries/haskell/download-curl/default.nix | 5 +----
 pkgs/development/libraries/haskell/download/default.nix      | 5 +----
 pkgs/development/libraries/haskell/dstring/default.nix       | 5 +----
 pkgs/development/libraries/haskell/editline/default.nix      | 5 +----
 .../development/libraries/haskell/email-validate/default.nix | 5 +----
 pkgs/development/libraries/haskell/entropy/default.nix       | 5 +----
 pkgs/development/libraries/haskell/enumerator/default.nix    | 5 +----
 pkgs/development/libraries/haskell/erf/default.nix           | 5 +----
 .../libraries/haskell/explicit-exception/default.nix         | 5 +----
 .../libraries/haskell/extensible-exceptions/0.1.1.0.nix      | 5 +----
 .../libraries/haskell/extensible-exceptions/0.1.1.2.nix      | 5 +----
 .../libraries/haskell/extensible-exceptions/0.1.1.3.nix      | 5 +----
 .../libraries/haskell/extensible-exceptions/0.1.1.4.nix      | 5 +----
 pkgs/development/libraries/haskell/failure/0.1.2.nix         | 5 +----
 pkgs/development/libraries/haskell/failure/0.2.0.nix         | 5 +----
 pkgs/development/libraries/haskell/fast-logger/default.nix   | 5 +----
 pkgs/development/libraries/haskell/fclabels/default.nix      | 5 +----
 pkgs/development/libraries/haskell/feed/default.nix          | 5 +----
 pkgs/development/libraries/haskell/fgl/5.4.2.2.nix           | 5 +----
 pkgs/development/libraries/haskell/fgl/5.4.2.3.nix           | 5 +----
 pkgs/development/libraries/haskell/fgl/5.4.2.4.nix           | 5 +----
 pkgs/development/libraries/haskell/file-embed/default.nix    | 5 +----
 pkgs/development/libraries/haskell/filepath/default.nix      | 5 +----
 pkgs/development/libraries/haskell/filestore/default.nix     | 5 +----
 pkgs/development/libraries/haskell/fingertree/default.nix    | 5 +----
 .../libraries/haskell/flexible-defaults/default.nix          | 5 +----
 pkgs/development/libraries/haskell/funcmp/default.nix        | 5 +----
 pkgs/development/libraries/haskell/gamma/default.nix         | 5 +----
 pkgs/development/libraries/haskell/gd/default.nix            | 5 +----
 pkgs/development/libraries/haskell/gdiff/default.nix         | 5 +----
 .../libraries/haskell/generic-deriving/default.nix           | 5 +----
 pkgs/development/libraries/haskell/ghc-core/default.nix      | 5 +----
 pkgs/development/libraries/haskell/ghc-events/default.nix    | 5 +----
 pkgs/development/libraries/haskell/ghc-mtl/default.nix       | 5 +----
 pkgs/development/libraries/haskell/ghc-paths/default.nix     | 5 +----
 pkgs/development/libraries/haskell/ghc-syb-utils/default.nix | 5 +----
 pkgs/development/libraries/haskell/ghc-syb/default.nix       | 5 +----
 pkgs/development/libraries/haskell/gio/default.nix           | 5 +----
 pkgs/development/libraries/haskell/gitit/default.nix         | 5 +----
 pkgs/development/libraries/haskell/glade/default.nix         | 5 +----
 pkgs/development/libraries/haskell/glib/default.nix          | 5 +----
 pkgs/development/libraries/haskell/gloss/default.nix         | 5 +----
 pkgs/development/libraries/haskell/graphviz/default.nix      | 5 +----
 pkgs/development/libraries/haskell/gtk/default.nix           | 5 +----
 .../libraries/haskell/gtk2hs-buildtools/default.nix          | 5 +----
 .../development/libraries/haskell/gtksourceview2/default.nix | 5 +----
 pkgs/development/libraries/haskell/hS3/default.nix           | 5 +----
 pkgs/development/libraries/haskell/hackage-db/default.nix    | 5 +----
 pkgs/development/libraries/haskell/hakyll/default.nix        | 5 +----
 pkgs/development/libraries/haskell/hamlet/default.nix        | 5 +----
 .../libraries/haskell/happstack/happstack-data.nix           | 5 +----
 .../libraries/haskell/happstack/happstack-hamlet.nix         | 5 +----
 .../libraries/haskell/happstack/happstack-server.nix         | 5 +----
 .../libraries/haskell/happstack/happstack-util.nix           | 5 +----
 pkgs/development/libraries/haskell/hashable/default.nix      | 5 +----
 .../development/libraries/haskell/hashed-storage/default.nix | 5 +----
 pkgs/development/libraries/haskell/hashtables/default.nix    | 5 +----
 .../libraries/haskell/haskeline-class/default.nix            | 5 +----
 pkgs/development/libraries/haskell/haskeline/default.nix     | 5 +----
 pkgs/development/libraries/haskell/haskell-lexer/default.nix | 5 +----
 .../libraries/haskell/haskell-src-exts/default.nix           | 5 +----
 .../libraries/haskell/haskell-src-meta/default.nix           | 5 +----
 pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix   | 5 +----
 pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix   | 5 +----
 pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix   | 5 +----
 pkgs/development/libraries/haskell/hastache/default.nix      | 5 +----
 pkgs/development/libraries/haskell/haxr-th/default.nix       | 5 +----
 pkgs/development/libraries/haskell/haxr/default.nix          | 5 +----
 .../libraries/haskell/highlighting-kate/default.nix          | 5 +----
 pkgs/development/libraries/haskell/hint/default.nix          | 5 +----
 pkgs/development/libraries/haskell/hjsmin/default.nix        | 5 +----
 pkgs/development/libraries/haskell/hledger-lib/default.nix   | 5 +----
 pkgs/development/libraries/haskell/hledger-vty/default.nix   | 5 +----
 pkgs/development/libraries/haskell/hledger-web/default.nix   | 5 +----
 pkgs/development/libraries/haskell/hledger/default.nix       | 5 +----
 pkgs/development/libraries/haskell/hmatrix/default.nix       | 1 -
 pkgs/development/libraries/haskell/hopenssl/default.nix      | 5 +----
 pkgs/development/libraries/haskell/hostname/default.nix      | 5 +----
 pkgs/development/libraries/haskell/hp2any-core/default.nix   | 5 +----
 pkgs/development/libraries/haskell/hp2any-graph/default.nix  | 5 +----
 pkgs/development/libraries/haskell/hs-bibutils/default.nix   | 5 +----
 pkgs/development/libraries/haskell/hscolour/default.nix      | 5 +----
 pkgs/development/libraries/haskell/hsdns/default.nix         | 5 +----
 pkgs/development/libraries/haskell/hsemail/default.nix       | 5 +----
 .../libraries/haskell/hslogger-template/default.nix          | 5 +----
 pkgs/development/libraries/haskell/hspread/default.nix       | 5 +----
 pkgs/development/libraries/haskell/hsyslog/default.nix       | 5 +----
 pkgs/development/libraries/haskell/html/1.0.1.2.nix          | 5 +----
 pkgs/development/libraries/haskell/http-conduit/default.nix  | 5 +----
 pkgs/development/libraries/haskell/http-date/default.nix     | 5 +----
 .../libraries/haskell/http-enumerator/default.nix            | 5 +----
 pkgs/development/libraries/haskell/http-types/default.nix    | 5 +----
 pkgs/development/libraries/haskell/httpd-shed/default.nix    | 5 +----
 .../libraries/haskell/hxt-charproperties/default.nix         | 5 +----
 .../libraries/haskell/hxt-regex-xmlschema/default.nix        | 5 +----
 pkgs/development/libraries/haskell/hxt-unicode/default.nix   | 5 +----
 pkgs/development/libraries/haskell/hxt/default.nix           | 5 +----
 pkgs/development/libraries/haskell/ieee754/default.nix       | 5 +----
 .../libraries/haskell/instant-generics/default.nix           | 5 +----
 pkgs/development/libraries/haskell/io-storage/default.nix    | 5 +----
 pkgs/development/libraries/haskell/irc/default.nix           | 5 +----
 pkgs/development/libraries/haskell/iteratee/default.nix      | 5 +----
 pkgs/development/libraries/haskell/ivor/default.nix          | 5 +----
 pkgs/development/libraries/haskell/jpeg/default.nix          | 5 +----
 pkgs/development/libraries/haskell/jsonTypes/default.nix     | 5 +----
 .../libraries/haskell/language-haskell-extract/default.nix   | 5 +----
 .../libraries/haskell/language-javascript/default.nix        | 5 +----
 pkgs/development/libraries/haskell/largeword/default.nix     | 5 +----
 .../development/libraries/haskell/lazysmallcheck/default.nix | 5 +----
 pkgs/development/libraries/haskell/leksah/leksah-server.nix  | 5 +----
 pkgs/development/libraries/haskell/leksah/process-leksah.nix | 5 +----
 pkgs/development/libraries/haskell/libmpd/default.nix        | 5 +----
 pkgs/development/libraries/haskell/lifted-base/default.nix   | 5 +----
 pkgs/development/libraries/haskell/logfloat/default.nix      | 5 +----
 pkgs/development/libraries/haskell/ltk/default.nix           | 5 +----
 .../development/libraries/haskell/math-functions/default.nix | 5 +----
 pkgs/development/libraries/haskell/maude/default.nix         | 5 +----
 .../libraries/haskell/mersenne-random-pure64/default.nix     | 5 +----
 pkgs/development/libraries/haskell/mime-mail/default.nix     | 5 +----
 pkgs/development/libraries/haskell/mmap/default.nix          | 5 +----
 pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix | 5 +----
 pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix | 5 +----
 pkgs/development/libraries/haskell/monad-control/0.3.1.nix   | 5 +----
 pkgs/development/libraries/haskell/monad-loops/default.nix   | 5 +----
 pkgs/development/libraries/haskell/monad-par/default.nix     | 5 +----
 pkgs/development/libraries/haskell/monad-peel/default.nix    | 5 +----
 pkgs/development/libraries/haskell/monads-tf/default.nix     | 5 +----
 pkgs/development/libraries/haskell/mongoDB/default.nix       | 5 +----
 pkgs/development/libraries/haskell/mpppc/default.nix         | 5 +----
 pkgs/development/libraries/haskell/mtl/1.1.0.2.nix           | 5 +----
 pkgs/development/libraries/haskell/mtl/1.1.1.1.nix           | 5 +----
 pkgs/development/libraries/haskell/mtl/2.0.1.0.nix           | 5 +----
 pkgs/development/libraries/haskell/mtlparse/default.nix      | 5 +----
 pkgs/development/libraries/haskell/multiarg/default.nix      | 5 +----
 pkgs/development/libraries/haskell/multiplate/default.nix    | 5 +----
 pkgs/development/libraries/haskell/multirec/default.nix      | 5 +----
 pkgs/development/libraries/haskell/multiset/default.nix      | 5 +----
 pkgs/development/libraries/haskell/murmur-hash/default.nix   | 5 +----
 pkgs/development/libraries/haskell/mwc-random/default.nix    | 5 +----
 pkgs/development/libraries/haskell/network/2.2.1.4.nix       | 5 +----
 pkgs/development/libraries/haskell/network/2.2.1.7.nix       | 5 +----
 pkgs/development/libraries/haskell/network/2.3.0.11.nix      | 5 +----
 pkgs/development/libraries/haskell/network/2.3.0.2.nix       | 5 +----
 pkgs/development/libraries/haskell/network/2.3.0.5.nix       | 5 +----
 pkgs/development/libraries/haskell/network/2.3.0.7.nix       | 5 +----
 pkgs/development/libraries/haskell/non-negative/default.nix  | 5 +----
 .../libraries/haskell/numeric-prelude/default.nix            | 5 +----
 pkgs/development/libraries/haskell/numtype/default.nix       | 5 +----
 pkgs/development/libraries/haskell/pandoc-types/default.nix  | 5 +----
 pkgs/development/libraries/haskell/pandoc/default.nix        | 5 +----
 pkgs/development/libraries/haskell/pango/default.nix         | 5 +----
 pkgs/development/libraries/haskell/parallel/1.1.0.1.nix      | 5 +----
 pkgs/development/libraries/haskell/parallel/2.2.0.1.nix      | 5 +----
 pkgs/development/libraries/haskell/parallel/3.1.0.1.nix      | 5 +----
 pkgs/development/libraries/haskell/parallel/3.2.0.2.nix      | 5 +----
 pkgs/development/libraries/haskell/parseargs/default.nix     | 5 +----
 pkgs/development/libraries/haskell/parsec/2.1.0.1.nix        | 5 +----
 pkgs/development/libraries/haskell/parsec/3.1.1.nix          | 5 +----
 pkgs/development/libraries/haskell/parsec/3.1.2.nix          | 5 +----
 pkgs/development/libraries/haskell/parsimony/default.nix     | 5 +----
 pkgs/development/libraries/haskell/path-pieces/0.0.0.nix     | 5 +----
 pkgs/development/libraries/haskell/path-pieces/0.1.0.nix     | 5 +----
 pkgs/development/libraries/haskell/pathtype/default.nix      | 5 +----
 pkgs/development/libraries/haskell/pcre-light/default.nix    | 5 +----
 pkgs/development/libraries/haskell/permutation/default.nix   | 5 +----
 .../libraries/haskell/persistent-sqlite/default.nix          | 5 +----
 .../libraries/haskell/persistent-template/default.nix        | 5 +----
 pkgs/development/libraries/haskell/persistent/default.nix    | 5 +----
 pkgs/development/libraries/haskell/polyparse/1.7.nix         | 5 +----
 pkgs/development/libraries/haskell/polyparse/1.8.nix         | 5 +----
 pkgs/development/libraries/haskell/pool-conduit/default.nix  | 5 +----
 pkgs/development/libraries/haskell/ppm/default.nix           | 5 +----
 pkgs/development/libraries/haskell/pretty-show/default.nix   | 5 +----
 pkgs/development/libraries/haskell/primitive/default.nix     | 5 +----
 .../libraries/haskell/prolog-graph-lib/default.nix           | 5 +----
 pkgs/development/libraries/haskell/prolog-graph/default.nix  | 5 +----
 pkgs/development/libraries/haskell/prolog/default.nix        | 5 +----
 pkgs/development/libraries/haskell/pureMD5/default.nix       | 5 +----
 pkgs/development/libraries/haskell/pwstore-fast/default.nix  | 5 +----
 pkgs/development/libraries/haskell/random-fu/default.nix     | 5 +----
 .../development/libraries/haskell/random-shuffle/default.nix | 5 +----
 pkgs/development/libraries/haskell/random-source/default.nix | 5 +----
 pkgs/development/libraries/haskell/random/1.0.1.1.nix        | 5 +----
 pkgs/development/libraries/haskell/ranges/default.nix        | 5 +----
 pkgs/development/libraries/haskell/recaptcha/default.nix     | 5 +----
 pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix   | 5 +----
 pkgs/development/libraries/haskell/regex-base/0.93.1.nix     | 5 +----
 pkgs/development/libraries/haskell/regex-base/0.93.2.nix     | 5 +----
 pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix | 5 +----
 pkgs/development/libraries/haskell/regex-compat/0.92.nix     | 5 +----
 pkgs/development/libraries/haskell/regex-compat/0.93.1.nix   | 5 +----
 pkgs/development/libraries/haskell/regex-compat/0.95.1.nix   | 5 +----
 .../libraries/haskell/regex-pcre-builtin/default.nix         | 5 +----
 pkgs/development/libraries/haskell/regex-pcre/default.nix    | 5 +----
 pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix  | 5 +----
 pkgs/development/libraries/haskell/regex-posix/0.94.1.nix    | 5 +----
 pkgs/development/libraries/haskell/regex-posix/0.94.2.nix    | 5 +----
 pkgs/development/libraries/haskell/regex-posix/0.94.4.nix    | 5 +----
 pkgs/development/libraries/haskell/regex-posix/0.95.1.nix    | 5 +----
 pkgs/development/libraries/haskell/regex-tdfa/default.nix    | 5 +----
 pkgs/development/libraries/haskell/regexpr/default.nix       | 5 +----
 pkgs/development/libraries/haskell/regular/default.nix       | 5 +----
 .../libraries/haskell/repa-algorithms/default.nix            | 5 +----
 .../libraries/haskell/repa-bytestring/default.nix            | 5 +----
 pkgs/development/libraries/haskell/repa-examples/default.nix | 5 +----
 pkgs/development/libraries/haskell/repa-io/default.nix       | 5 +----
 pkgs/development/libraries/haskell/repa/default.nix          | 5 +----
 pkgs/development/libraries/haskell/repr/default.nix          | 5 +----
 pkgs/development/libraries/haskell/resource-pool/default.nix | 5 +----
 pkgs/development/libraries/haskell/resourcet/default.nix     | 5 +----
 pkgs/development/libraries/haskell/rvar/default.nix          | 5 +----
 pkgs/development/libraries/haskell/safe/default.nix          | 5 +----
 pkgs/development/libraries/haskell/semigroups/default.nix    | 5 +----
 pkgs/development/libraries/haskell/sendfile/default.nix      | 5 +----
 .../libraries/haskell/shakespeare-css/default.nix            | 5 +----
 .../libraries/haskell/shakespeare-i18n/default.nix           | 5 +----
 .../development/libraries/haskell/shakespeare-js/default.nix | 5 +----
 .../libraries/haskell/shakespeare-text/default.nix           | 5 +----
 pkgs/development/libraries/haskell/shakespeare/default.nix   | 5 +----
 .../libraries/haskell/simple-sendfile/default.nix            | 5 +----
 pkgs/development/libraries/haskell/skein/default.nix         | 5 +----
 pkgs/development/libraries/haskell/smallcheck/default.nix    | 5 +----
 pkgs/development/libraries/haskell/snap/core.nix             | 5 +----
 pkgs/development/libraries/haskell/snap/server.nix           | 5 +----
 pkgs/development/libraries/haskell/socks/default.nix         | 5 +----
 pkgs/development/libraries/haskell/split/default.nix         | 5 +----
 pkgs/development/libraries/haskell/stateref/default.nix      | 5 +----
 pkgs/development/libraries/haskell/statistics/default.nix    | 5 +----
 pkgs/development/libraries/haskell/stb-image/default.nix     | 5 +----
 pkgs/development/libraries/haskell/stm/2.1.1.2.nix           | 5 +----
 pkgs/development/libraries/haskell/stm/2.1.2.1.nix           | 5 +----
 pkgs/development/libraries/haskell/stm/2.2.0.1.nix           | 5 +----
 pkgs/development/libraries/haskell/stm/2.3.nix               | 5 +----
 .../libraries/haskell/storable-complex/default.nix           | 5 +----
 .../libraries/haskell/storable-record/default.nix            | 5 +----
 pkgs/development/libraries/haskell/streamproc/default.nix    | 5 +----
 pkgs/development/libraries/haskell/strict/default.nix        | 5 +----
 .../libraries/haskell/strictConcurrency/default.nix          | 5 +----
 .../libraries/haskell/string-combinators/default.nix         | 5 +----
 pkgs/development/libraries/haskell/svgcairo/default.nix      | 5 +----
 pkgs/development/libraries/haskell/syb/0.2.2.nix             | 5 +----
 pkgs/development/libraries/haskell/syb/0.3.3.nix             | 5 +----
 pkgs/development/libraries/haskell/syb/0.3.5.nix             | 5 +----
 pkgs/development/libraries/haskell/syb/0.3.6.nix             | 5 +----
 pkgs/development/libraries/haskell/syb/0.3.nix               | 5 +----
 pkgs/development/libraries/haskell/syb/default.nix           | 5 +----
 .../libraries/haskell/syb/syb-with-class-instances-text.nix  | 5 +----
 pkgs/development/libraries/haskell/syb/syb-with-class.nix    | 5 +----
 pkgs/development/libraries/haskell/system-fileio/default.nix | 5 +----
 .../libraries/haskell/system-filepath/default.nix            | 5 +----
 pkgs/development/libraries/haskell/tabular/default.nix       | 5 +----
 pkgs/development/libraries/haskell/tagged/default.nix        | 5 +----
 pkgs/development/libraries/haskell/tagsoup/default.nix       | 5 +----
 pkgs/development/libraries/haskell/temporary/default.nix     | 5 +----
 pkgs/development/libraries/haskell/terminfo/default.nix      | 5 +----
 .../libraries/haskell/test-framework-hunit/default.nix       | 5 +----
 .../libraries/haskell/test-framework-quickcheck/default.nix  | 5 +----
 .../libraries/haskell/test-framework-quickcheck2/default.nix | 5 +----
 .../libraries/haskell/test-framework-th/default.nix          | 5 +----
 pkgs/development/libraries/haskell/test-framework/0.5.nix    | 5 +----
 pkgs/development/libraries/haskell/test-framework/0.6.nix    | 5 +----
 pkgs/development/libraries/haskell/testpack/default.nix      | 5 +----
 pkgs/development/libraries/haskell/texmath/0.4.nix           | 5 +----
 pkgs/development/libraries/haskell/texmath/default.nix       | 5 +----
 pkgs/development/libraries/haskell/text/0.11.0.5.nix         | 5 +----
 pkgs/development/libraries/haskell/text/0.11.0.6.nix         | 5 +----
 pkgs/development/libraries/haskell/text/0.11.1.12.nix        | 5 +----
 pkgs/development/libraries/haskell/text/0.11.1.13.nix        | 5 +----
 pkgs/development/libraries/haskell/text/0.11.1.5.nix         | 5 +----
 pkgs/development/libraries/haskell/th-extras/default.nix     | 5 +----
 pkgs/development/libraries/haskell/th-lift/default.nix       | 5 +----
 pkgs/development/libraries/haskell/thespian/default.nix      | 5 +----
 pkgs/development/libraries/haskell/threadmanager/default.nix | 5 +----
 pkgs/development/libraries/haskell/time/1.1.2.4.nix          | 5 +----
 pkgs/development/libraries/haskell/time/1.1.3.nix            | 5 +----
 pkgs/development/libraries/haskell/time/1.2.0.3.nix          | 5 +----
 pkgs/development/libraries/haskell/time/1.2.0.5.nix          | 5 +----
 pkgs/development/libraries/haskell/time/1.4.0.1.nix          | 5 +----
 pkgs/development/libraries/haskell/tls-extra/default.nix     | 5 +----
 pkgs/development/libraries/haskell/tls/default.nix           | 5 +----
 .../libraries/haskell/transformers-base/default.nix          | 5 +----
 pkgs/development/libraries/haskell/transformers/0.2.2.0.nix  | 5 +----
 pkgs/development/libraries/haskell/transformers/0.3.0.0.nix  | 5 +----
 pkgs/development/libraries/haskell/tuple/default.nix         | 5 +----
 pkgs/development/libraries/haskell/type-equality/default.nix | 5 +----
 pkgs/development/libraries/haskell/unbound/default.nix       | 5 +----
 pkgs/development/libraries/haskell/uniplate/default.nix      | 5 +----
 pkgs/development/libraries/haskell/uniqueid/default.nix      | 5 +----
 pkgs/development/libraries/haskell/unix-compat/default.nix   | 5 +----
 .../libraries/haskell/unordered-containers/default.nix       | 5 +----
 pkgs/development/libraries/haskell/url/default.nix           | 5 +----
 pkgs/development/libraries/haskell/utf8-light/default.nix    | 5 +----
 pkgs/development/libraries/haskell/utf8-string/default.nix   | 5 +----
 pkgs/development/libraries/haskell/utility-ht/default.nix    | 5 +----
 pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 5 +----
 pkgs/development/libraries/haskell/uulib/default.nix         | 5 +----
 pkgs/development/libraries/haskell/vacuum-cairo/default.nix  | 5 +----
 pkgs/development/libraries/haskell/vacuum/default.nix        | 5 +----
 pkgs/development/libraries/haskell/vault/default.nix         | 5 +----
 .../libraries/haskell/vector-algorithms/default.nix          | 5 +----
 pkgs/development/libraries/haskell/vector-space/default.nix  | 5 +----
 pkgs/development/libraries/haskell/vector/default.nix        | 5 +----
 pkgs/development/libraries/haskell/vty/default.nix           | 5 +----
 .../development/libraries/haskell/wai-app-static/default.nix | 5 +----
 pkgs/development/libraries/haskell/wai-extra/default.nix     | 5 +----
 pkgs/development/libraries/haskell/wai-logger/default.nix    | 5 +----
 pkgs/development/libraries/haskell/wai/default.nix           | 5 +----
 pkgs/development/libraries/haskell/warp/default.nix          | 5 +----
 .../development/libraries/haskell/wl-pprint-text/default.nix | 5 +----
 pkgs/development/libraries/haskell/wxHaskell/wx.nix          | 5 +----
 pkgs/development/libraries/haskell/wxHaskell/wxcore.nix      | 5 +----
 pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix    | 5 +----
 pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix      | 5 +----
 pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix      | 5 +----
 pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix      | 5 +----
 pkgs/development/libraries/haskell/xml-conduit/default.nix   | 5 +----
 pkgs/development/libraries/haskell/xml-types/default.nix     | 5 +----
 pkgs/development/libraries/haskell/xml/default.nix           | 5 +----
 pkgs/development/libraries/haskell/xss-sanitize/default.nix  | 5 +----
 pkgs/development/libraries/haskell/yaml/default.nix          | 5 +----
 pkgs/development/libraries/haskell/yap/default.nix           | 5 +----
 pkgs/development/libraries/haskell/yesod-auth/default.nix    | 5 +----
 pkgs/development/libraries/haskell/yesod-core/default.nix    | 5 +----
 pkgs/development/libraries/haskell/yesod-default/default.nix | 5 +----
 pkgs/development/libraries/haskell/yesod-form/default.nix    | 5 +----
 pkgs/development/libraries/haskell/yesod-json/default.nix    | 5 +----
 .../libraries/haskell/yesod-persistent/default.nix           | 5 +----
 pkgs/development/libraries/haskell/yesod-routes/default.nix  | 5 +----
 pkgs/development/libraries/haskell/yesod-static/default.nix  | 5 +----
 pkgs/development/libraries/haskell/yesod/default.nix         | 5 +----
 pkgs/development/libraries/haskell/yst/default.nix           | 5 +----
 .../development/libraries/haskell/zeromq-haskell/default.nix | 5 +----
 pkgs/development/libraries/haskell/zip-archive/default.nix   | 5 +----
 pkgs/development/libraries/haskell/zipper/default.nix        | 5 +----
 pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix | 5 +----
 pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix   | 5 +----
 pkgs/development/libraries/haskell/zlib-conduit/default.nix  | 5 +----
 pkgs/development/libraries/haskell/zlib-enum/default.nix     | 5 +----
 pkgs/development/libraries/haskell/zlib/0.5.0.0.nix          | 5 +----
 pkgs/development/libraries/haskell/zlib/0.5.2.0.nix          | 5 +----
 pkgs/development/libraries/haskell/zlib/0.5.3.1.nix          | 5 +----
 pkgs/development/libraries/haskell/zlib/0.5.3.3.nix          | 5 +----
 pkgs/development/tools/documentation/haddock/2.10.0.nix      | 5 +----
 pkgs/development/tools/documentation/haddock/2.4.2.nix       | 5 +----
 pkgs/development/tools/documentation/haddock/2.9.4.nix       | 5 +----
 pkgs/development/tools/haskell/BNFC-meta/default.nix         | 5 +----
 pkgs/development/tools/haskell/HaRe/default.nix              | 5 +----
 pkgs/development/tools/haskell/SourceGraph/default.nix       | 5 +----
 pkgs/development/tools/haskell/alex-meta/default.nix         | 5 +----
 pkgs/development/tools/haskell/cabal-ghci/default.nix        | 5 +----
 pkgs/development/tools/haskell/happy-meta/default.nix        | 5 +----
 pkgs/development/tools/haskell/haskdogs/default.nix          | 5 +----
 pkgs/development/tools/haskell/hasktags/default.nix          | 5 +----
 pkgs/development/tools/haskell/hlint/default.nix             | 5 +----
 pkgs/development/tools/haskell/hslogger/default.nix          | 5 +----
 pkgs/development/tools/haskell/tar/0.3.2.0.nix               | 5 +----
 pkgs/development/tools/haskell/tar/0.4.0.0.nix               | 5 +----
 pkgs/development/tools/haskell/threadscope/default.nix       | 5 +----
 pkgs/development/tools/haskell/uuagc/bootstrap.nix           | 5 +----
 pkgs/development/tools/haskell/uuagc/cabal.nix               | 5 +----
 pkgs/development/tools/haskell/uuagc/default.nix             | 5 +----
 pkgs/development/tools/misc/cpphs/default.nix                | 5 +----
 pkgs/development/tools/parsing/alex/2.3.1.nix                | 5 +----
 pkgs/development/tools/parsing/alex/2.3.2.nix                | 5 +----
 pkgs/development/tools/parsing/alex/2.3.3.nix                | 5 +----
 pkgs/development/tools/parsing/alex/2.3.5.nix                | 5 +----
 pkgs/development/tools/parsing/alex/3.0.1.nix                | 5 +----
 pkgs/development/tools/parsing/happy/1.18.4.nix              | 5 +----
 pkgs/development/tools/parsing/happy/1.18.5.nix              | 5 +----
 pkgs/development/tools/parsing/happy/1.18.6.nix              | 5 +----
 pkgs/development/tools/parsing/happy/1.18.8.nix              | 5 +----
 pkgs/development/tools/parsing/happy/1.18.9.nix              | 5 +----
 pkgs/games/LambdaHack/default.nix                            | 5 +----
 pkgs/games/MazesOfMonad/default.nix                          | 5 +----
 pkgs/tools/package-management/cabal-install/0.10.2.nix       | 5 +----
 pkgs/tools/package-management/cabal-install/0.6.2.nix        | 5 +----
 pkgs/tools/package-management/cabal-install/0.8.0.nix        | 5 +----
 pkgs/tools/package-management/cabal-install/0.8.2.nix        | 5 +----
 572 files changed, 571 insertions(+), 2285 deletions(-)

diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix
index 2bbffd853a4..40b5687ea91 100644
--- a/pkgs/applications/editors/leksah/default.nix
+++ b/pkgs/applications/editors/leksah/default.nix
@@ -22,9 +22,6 @@ cabal.mkDerivation (self: {
     description = "Haskell IDE written in Haskell";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/applications/misc/mathblog/default.nix b/pkgs/applications/misc/mathblog/default.nix
index 2944df496f2..e5ed53a56a0 100644
--- a/pkgs/applications/misc/mathblog/default.nix
+++ b/pkgs/applications/misc/mathblog/default.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "A program for creating and managing a static weblog with LaTeX math and function graphs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index b6bfe8df25e..5fa4ecfc3ff 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -18,9 +18,6 @@ cabal.mkDerivation (self: {
     description = "A Minimalistic Text Based Status Bar";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index a76d5ad2eac..60b9309bbdc 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -19,9 +19,6 @@ cabal.mkDerivation (self: {
     description = "a distributed, interactive, smart revision control system";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 6bb06f7d4a5..11c8531ad17 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "Third party extensions for xmonad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
index 249310b6411..ce3b9fed7b7 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "Third party extensions for xmonad with wacky dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/compilers/Agda-executable/default.nix b/pkgs/development/compilers/Agda-executable/default.nix
index acf1c026565..823a412459f 100644
--- a/pkgs/development/compilers/Agda-executable/default.nix
+++ b/pkgs/development/compilers/Agda-executable/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Command-line program for type-checking and compiling Agda programs";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix
index 9060d313be5..1767a61a7d1 100644
--- a/pkgs/development/compilers/epic/default.nix
+++ b/pkgs/development/compilers/epic/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "Compiler for a simple functional language";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index f0fd33e439f..7ca767170a3 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -18,9 +18,6 @@ cabal.mkDerivation (self: {
     description = "Functional Programming Language with Dependent Types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix
index e4b78876c57..bbcfd4a0c92 100644
--- a/pkgs/development/libraries/haskell/AC-Vector/default.nix
+++ b/pkgs/development/libraries/haskell/AC-Vector/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Efficient geometric vectors and transformations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix
index 1ab394b820a..1aa4d4f8423 100644
--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@@ -18,9 +18,6 @@ cabal.mkDerivation (self: {
     description = "A dependently typed functional programming language and proof assistant";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix
index 347fc5ff9c9..3b2df825a73 100644
--- a/pkgs/development/libraries/haskell/AspectAG/default.nix
+++ b/pkgs/development/libraries/haskell/AspectAG/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Attribute Grammars in the form of an EDSL";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
index 720d6046169..58bdf8b9970 100644
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ b/pkgs/development/libraries/haskell/Boolean/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Generalized booleans";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
index 608ac1abe3c..b424551a2f9 100644
--- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
+++ b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A framework for packaging Haskell software";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
index 1976472da23..4c4584bf9a2 100644
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "A library for generating 2D Charts and Plots";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
index d8cfb2ee407..70382d1cd63 100644
--- a/pkgs/development/libraries/haskell/ConfigFile/default.nix
+++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "Configuration file reading & writing";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix
index 98002a4c469..3642d402615 100644
--- a/pkgs/development/libraries/haskell/CouchDB/default.nix
+++ b/pkgs/development/libraries/haskell/CouchDB/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "CouchDB interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix
index 0ccc9d810df..8f525b18df6 100644
--- a/pkgs/development/libraries/haskell/DSH/default.nix
+++ b/pkgs/development/libraries/haskell/DSH/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "Database Supported Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix
index f54344882bb..c28bef5cbd7 100644
--- a/pkgs/development/libraries/haskell/Diff/default.nix
+++ b/pkgs/development/libraries/haskell/Diff/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "O(ND) diff algorithm in haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/FerryCore/default.nix b/pkgs/development/libraries/haskell/FerryCore/default.nix
index e7167baab7d..daef52bec75 100644
--- a/pkgs/development/libraries/haskell/FerryCore/default.nix
+++ b/pkgs/development/libraries/haskell/FerryCore/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Ferry Core Components";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix
index 1a9179b9877..59095ba7927 100644
--- a/pkgs/development/libraries/haskell/GLFW/default.nix
+++ b/pkgs/development/libraries/haskell/GLFW/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A Haskell binding for GLFW";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix
index 1397bea4f2b..459c7b99e5c 100644
--- a/pkgs/development/libraries/haskell/GLURaw/default.nix
+++ b/pkgs/development/libraries/haskell/GLURaw/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A raw binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
index 302b1fb8fb9..32e45aebeb2 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL Utility Toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
index d6551c6c6d9..761d6e9e3f0 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL Utility Toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
index 3248631be3e..e5ff3951d3c 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL Utility Toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix
index 109ea000b43..7725d1c8303 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL Utility Toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix
index 421e64ee7a2..d22273f2030 100644
--- a/pkgs/development/libraries/haskell/GlomeVec/default.nix
+++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Simple 3D vector library";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
index 0b918dc4c85..eb1b3b3ddaa 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "ODBC driver for HDBC";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
index a78d46541f7..b66ed3ce28f 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "PostgreSQL driver for HDBC";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
index aa983026c91..783c4c186e2 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "Sqlite v3 driver for HDBC";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix
index 4044c179810..03000b68811 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Haskell Database Connectivity";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HGL/default.nix b/pkgs/development/libraries/haskell/HGL/default.nix
index 4b8d6e24c4b..954401b31e3 100644
--- a/pkgs/development/libraries/haskell/HGL/default.nix
+++ b/pkgs/development/libraries/haskell/HGL/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A simple graphics library based on X11 or Win32";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix
index 657e4899b7b..35b03f77dde 100644
--- a/pkgs/development/libraries/haskell/HList/default.nix
+++ b/pkgs/development/libraries/haskell/HList/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Heterogeneous lists";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix
index ad6ee08bffd..40620901839 100644
--- a/pkgs/development/libraries/haskell/HSH/default.nix
+++ b/pkgs/development/libraries/haskell/HSH/default.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "Library to mix shell scripting with Haskell programs";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
index 98989a7c44b..0048a9c470d 100644
--- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix
+++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "StringTemplate implementation in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
index 13d271dfc36..c87b38af452 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
index fee3431829f..493da3337b9 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
index d007467e0e3..28a3bd5fe95 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
index 5dcb4cbe618..a75c72f6a28 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
index a707189ed5e..5c6057ace9e 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
index 082c3ddc3ac..5fbb2ed8a84 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
index ebf561825ce..01130de10cd 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A unit testing framework for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
index ec65d160e86..e14aad1a015 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A unit testing framework for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
index 9c58da37b50..2cb9f859f46 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A unit testing framework for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix
index e0dd6bd2bc1..8ad518ee1f6 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A unit testing framework for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix
index 80c16e862a2..e1b061690fe 100644
--- a/pkgs/development/libraries/haskell/HaXml/default.nix
+++ b/pkgs/development/libraries/haskell/HaXml/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Utilities for manipulating XML documents";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
index a70474698aa..8b802e6579a 100644
--- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
+++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index 7cf502281fb..ea2bc8cfc2c 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A Haskell binding for Chipmunk";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index 3060eb2fa90..a283acacd6d 100644
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "(Incomplete) OpenSSL binding for Haskell";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HsSyck/default.nix b/pkgs/development/libraries/haskell/HsSyck/default.nix
index f27d1f97f37..56e999d7b83 100644
--- a/pkgs/development/libraries/haskell/HsSyck/default.nix
+++ b/pkgs/development/libraries/haskell/HsSyck/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Fast, lightweight YAML loader and dumper";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/IfElse/default.nix b/pkgs/development/libraries/haskell/IfElse/default.nix
index 632de1f30e5..960868e3ab0 100644
--- a/pkgs/development/libraries/haskell/IfElse/default.nix
+++ b/pkgs/development/libraries/haskell/IfElse/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Anaphoric and miscellaneous useful control-flow";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/JsContracts/default.nix b/pkgs/development/libraries/haskell/JsContracts/default.nix
index 95a7ab52fd3..713e67fbf60 100644
--- a/pkgs/development/libraries/haskell/JsContracts/default.nix
+++ b/pkgs/development/libraries/haskell/JsContracts/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Design-by-contract for JavaScript";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix
index 523f59de5e9..a50fdb8ddc0 100644
--- a/pkgs/development/libraries/haskell/ListLike/default.nix
+++ b/pkgs/development/libraries/haskell/ListLike/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Generic support for list-like structures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix
index 34856050862..a29997f9de9 100644
--- a/pkgs/development/libraries/haskell/MaybeT/default.nix
+++ b/pkgs/development/libraries/haskell/MaybeT/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "MaybeT monad transformer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix
index 61ba44a4924..ee9f87ae8a8 100644
--- a/pkgs/development/libraries/haskell/MemoTrie/default.nix
+++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Trie-based memo functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index b975965752d..52e26fe1f83 100644
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "Large utility library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
index bcbf6b79868..10b28522a50 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Monad-transformer version of the Control.Exception module";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
index 52080c26a3b..5ee945d2678 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Monad-transformer compatible version of the Control.Exception module";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
index daf961f1550..6d8e66952e4 100644
--- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix
+++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "MonadPrompt, implementation & examples";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix
index f9c68ce7b43..1ee1734a9e4 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/default.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Random-number generation monad";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix
index 4bf301bd66d..490aeb4167b 100644
--- a/pkgs/development/libraries/haskell/NanoProlog/default.nix
+++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Very small interpreter for a Prolog-like language";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix
index 8aa6dec08cb..4d258f5634d 100644
--- a/pkgs/development/libraries/haskell/NumInstances/default.nix
+++ b/pkgs/development/libraries/haskell/NumInstances/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Instances of numeric classes for functions and tuples";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix
index 0be7c3dd22c..27f9b444a71 100755
--- a/pkgs/development/libraries/haskell/ObjectName/default.nix
+++ b/pkgs/development/libraries/haskell/ObjectName/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Explicitly handled object names";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OneTuple/default.nix b/pkgs/development/libraries/haskell/OneTuple/default.nix
index 2ecc841a8a4..945e12438b5 100644
--- a/pkgs/development/libraries/haskell/OneTuple/default.nix
+++ b/pkgs/development/libraries/haskell/OneTuple/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Singleton Tuple";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix
index a4a77aa8244..155e19ec50e 100644
--- a/pkgs/development/libraries/haskell/OpenAL/default.nix
+++ b/pkgs/development/libraries/haskell/OpenAL/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A binding to the OpenAL cross-platform 3D audio API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
index e74fcdca024..2e4ac90c79e 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
index 65e3da59367..25133657ccb 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
index 73b5c741bbb..c8cfd796afd 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix
index 8e616e4e069..9d8c1bb29ae 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
index 70c25ea9ac6..b51e12eab65 100644
--- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
+++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A raw binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/PSQueue/default.nix b/pkgs/development/libraries/haskell/PSQueue/default.nix
index ff3bd0b8fb5..32497935cdb 100644
--- a/pkgs/development/libraries/haskell/PSQueue/default.nix
+++ b/pkgs/development/libraries/haskell/PSQueue/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Priority Search Queue";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Pathfinder/default.nix b/pkgs/development/libraries/haskell/Pathfinder/default.nix
index 90df60cc8e6..19d7d8abaa5 100644
--- a/pkgs/development/libraries/haskell/Pathfinder/default.nix
+++ b/pkgs/development/libraries/haskell/Pathfinder/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Relational optimiser and code generator";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
index a459fd95317..3cf80d93336 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
index c104a4be27a..6ba32ce71c0 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
index 828255a9860..2f305b8a23c 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
index ac9ac3d2a7d..4e634078a7d 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
index 8eb413d2b31..e2d274dca05 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix
index 69a1c1dc417..b3202cdc4b9 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index c5b8efc67f6..dd8e607f3b7 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix
index 6a6211b6263..e65752e35b4 100644
--- a/pkgs/development/libraries/haskell/Ranged-sets/default.nix
+++ b/pkgs/development/libraries/haskell/Ranged-sets/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Ranged sets for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
index 2b405cf07bf..833e5956b2b 100644
--- a/pkgs/development/libraries/haskell/RepLib/default.nix
+++ b/pkgs/development/libraries/haskell/RepLib/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Generic programming library with representation types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix
index e6695f01358..6c61813ac30 100644
--- a/pkgs/development/libraries/haskell/SDL-image/default.nix
+++ b/pkgs/development/libraries/haskell/SDL-image/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Binding to libSDL_image";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix
index 674282e30a8..8690d7e8916 100644
--- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix
+++ b/pkgs/development/libraries/haskell/SDL-mixer/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Binding to libSDL_mixer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix
index f48e0dbab51..f58674f2520 100644
--- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix
+++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Binding to libSDL_ttf";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix
index da1e8df9715..a83518f9e10 100644
--- a/pkgs/development/libraries/haskell/SDL/default.nix
+++ b/pkgs/development/libraries/haskell/SDL/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Binding to libSDL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix
index 659b06f72b7..7aaf6c51321 100644
--- a/pkgs/development/libraries/haskell/SHA/default.nix
+++ b/pkgs/development/libraries/haskell/SHA/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Implementations of the SHA suite of message digest functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix
index 755c17eee8e..1e2dee4fcdc 100644
--- a/pkgs/development/libraries/haskell/SMTPClient/default.nix
+++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A simple SMTP client library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix
index c31f0e5d289..4ce09964cc6 100644
--- a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix
+++ b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Haskeline backend module for Shellac";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix
index 20fee419fe9..a39ddf3383e 100644
--- a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix
+++ b/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Readline backend module for Shellac";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix
index 8f36e8ebc08..d896eab923d 100644
--- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix
+++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A framework for creating shell envinronments";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix
index 95148607b6f..3b27022bea0 100755
--- a/pkgs/development/libraries/haskell/StateVar/default.nix
+++ b/pkgs/development/libraries/haskell/StateVar/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "State variables";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Stream/default.nix b/pkgs/development/libraries/haskell/Stream/default.nix
index 4dc274850df..83789765ec7 100644
--- a/pkgs/development/libraries/haskell/Stream/default.nix
+++ b/pkgs/development/libraries/haskell/Stream/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A library for manipulating infinite lists";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/TableAlgebra/default.nix b/pkgs/development/libraries/haskell/TableAlgebra/default.nix
index f1c212d7a49..c4960813f3e 100644
--- a/pkgs/development/libraries/haskell/TableAlgebra/default.nix
+++ b/pkgs/development/libraries/haskell/TableAlgebra/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Ferry Table Algebra";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix
index 3856409819d..d62b42833a3 100755
--- a/pkgs/development/libraries/haskell/Tensor/default.nix
+++ b/pkgs/development/libraries/haskell/Tensor/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Tensor data types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix
index 94c157765d3..232fb0f7272 100644
--- a/pkgs/development/libraries/haskell/Vec/default.nix
+++ b/pkgs/development/libraries/haskell/Vec/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Fixed-length lists and low-dimensional linear algebra";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
index 18371c57f08..d69ac78b83d 100644
--- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
+++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
index cd34f3161f3..26f14a08774 100644
--- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
+++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits/1.0.nix b/pkgs/development/libraries/haskell/WebBits/1.0.nix
index 89161608843..49bcd8ed112 100644
--- a/pkgs/development/libraries/haskell/WebBits/1.0.nix
+++ b/pkgs/development/libraries/haskell/WebBits/1.0.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits/2.0.nix b/pkgs/development/libraries/haskell/WebBits/2.0.nix
index 88502db4dff..0638ce06ef9 100644
--- a/pkgs/development/libraries/haskell/WebBits/2.0.nix
+++ b/pkgs/development/libraries/haskell/WebBits/2.0.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits/2.1.nix b/pkgs/development/libraries/haskell/WebBits/2.1.nix
index 915ff0b1d60..829427fe63d 100644
--- a/pkgs/development/libraries/haskell/WebBits/2.1.nix
+++ b/pkgs/development/libraries/haskell/WebBits/2.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix
index d9eee5f5e1c..1690ec9031e 100644
--- a/pkgs/development/libraries/haskell/X11-xft/default.nix
+++ b/pkgs/development/libraries/haskell/X11-xft/default.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix
index 6b0047085bc..e36b940e923 100644
--- a/pkgs/development/libraries/haskell/X11/default.nix
+++ b/pkgs/development/libraries/haskell/X11/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A binding to the X11 graphics library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Zwaluw/default.nix b/pkgs/development/libraries/haskell/Zwaluw/default.nix
index 125da2a795e..1cb214b94b0 100644
--- a/pkgs/development/libraries/haskell/Zwaluw/default.nix
+++ b/pkgs/development/libraries/haskell/Zwaluw/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Combinators for bidirectional URL routing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index 2c55bdfc357..4cb67db36f6 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Fast JSON parsing and encoding";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/alternative-io/default.nix b/pkgs/development/libraries/haskell/alternative-io/default.nix
index 1f3259c1e6b..23c79325755 100644
--- a/pkgs/development/libraries/haskell/alternative-io/default.nix
+++ b/pkgs/development/libraries/haskell/alternative-io/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "IO as Alternative instance";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
index 484736c7098..90a0a9b2b00 100644
--- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix
+++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Simple ANSI terminal support, with Windows compatibility";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
index 5730588ab9e..f34fcf6559d 100755
--- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
+++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix
index 9584a4a3e09..baebfbce0f6 100644
--- a/pkgs/development/libraries/haskell/arrows/default.nix
+++ b/pkgs/development/libraries/haskell/arrows/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Arrow classes and transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix
index c90d7a0425a..60e795f6e2e 100644
--- a/pkgs/development/libraries/haskell/asn1-data/default.nix
+++ b/pkgs/development/libraries/haskell/asn1-data/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "ASN1 data reader and writer in RAW, BER, DER and CER forms";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix
index 20cca829736..d66ab5e8658 100755
--- a/pkgs/development/libraries/haskell/async/default.nix
+++ b/pkgs/development/libraries/haskell/async/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Asynchronous Computations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix b/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix
index 52a16a8ac1c..a08f09b5503 100644
--- a/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix
+++ b/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Concrete data type for handling extensible exceptions as failures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attempt/0.4.0.nix b/pkgs/development/libraries/haskell/attempt/0.4.0.nix
index 2c5fc47ea31..c000002d499 100644
--- a/pkgs/development/libraries/haskell/attempt/0.4.0.nix
+++ b/pkgs/development/libraries/haskell/attempt/0.4.0.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Concrete data type for handling extensible exceptions as failures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index 9f58a5af748..59060ef0682 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Turn attoparsec parsers into sinks";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix
index fb755000477..bc05f92b561 100644
--- a/pkgs/development/libraries/haskell/attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Fast combinator parsing for bytestrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
index ad73d41f587..ee4b42a49bd 100644
--- a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Pass input from an enumerator to an Attoparsec parser";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index 6aa1e449840..f5359ee0d6a 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "Authentication methods for Haskell web applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
index ae9d23f57d4..020bce0a82c 100644
--- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
+++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Unicode alternatives for common functions and operators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix
index b09024851de..43bc5253538 100644
--- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Fast base16 (hex) encoding and decoding for ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix
index 3690c8cff76..014256b9049 100644
--- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Fast base64 encoding and deconding for ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base64-string/default.nix b/pkgs/development/libraries/haskell/base64-string/default.nix
index e77d5b96ea7..9e0a781039b 100644
--- a/pkgs/development/libraries/haskell/base64-string/default.nix
+++ b/pkgs/development/libraries/haskell/base64-string/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Base64 implementation for String's";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix
index 5b69e6d901e..8be4478ce63 100644
--- a/pkgs/development/libraries/haskell/benchpress/default.nix
+++ b/pkgs/development/libraries/haskell/benchpress/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Micro-benchmarking with detailed statistics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix
index 2b132f9cad0..98814e75a9d 100644
--- a/pkgs/development/libraries/haskell/bimap/default.nix
+++ b/pkgs/development/libraries/haskell/bimap/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Bidirectional mapping between two key types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix
index 340230b506d..63ba8acddf6 100644
--- a/pkgs/development/libraries/haskell/binary-shared/default.nix
+++ b/pkgs/development/libraries/haskell/binary-shared/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Sharing for the binary package";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix
index 9195e24d529..01a9483c554 100644
--- a/pkgs/development/libraries/haskell/binary/default.nix
+++ b/pkgs/development/libraries/haskell/binary/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Binary serialisation for Haskell values using lazy ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bitarray/default.nix b/pkgs/development/libraries/haskell/bitarray/default.nix
index faf51870ae9..edda97480d8 100644
--- a/pkgs/development/libraries/haskell/bitarray/default.nix
+++ b/pkgs/development/libraries/haskell/bitarray/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Mutable and immutable bit arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix
index 53f85710281..b120c8cf953 100644
--- a/pkgs/development/libraries/haskell/bitmap/default.nix
+++ b/pkgs/development/libraries/haskell/bitmap/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bktrees/default.nix b/pkgs/development/libraries/haskell/bktrees/default.nix
index 23493e50c19..70369034eaa 100644
--- a/pkgs/development/libraries/haskell/bktrees/default.nix
+++ b/pkgs/development/libraries/haskell/bktrees/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "A set data structure with approximate searching";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
index ff6f7429c79..5d92e3ba28d 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Convert streams of builders to streams of bytestrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
index ccc8d36d6fd..f8c63958860 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Enumeratees for the incremental conversion of builders to bytestrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
index f5835393895..aa4eb4c5357 100644
--- a/pkgs/development/libraries/haskell/blaze-builder/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Efficient buffered output";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index 0231b9e8e00..343e54c47b0 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A blazingly fast HTML combinator library for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix
index 67d87905143..f673f708707 100644
--- a/pkgs/development/libraries/haskell/blaze-textual/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Fast rendering of common datatypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix
index ff7d8421a5e..fb88cf3d50a 100644
--- a/pkgs/development/libraries/haskell/bloomfilter/default.nix
+++ b/pkgs/development/libraries/haskell/bloomfilter/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Pure and impure Bloom Filter implementations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix
index 19f69ede610..a4590926272 100644
--- a/pkgs/development/libraries/haskell/bmp/default.nix
+++ b/pkgs/development/libraries/haskell/bmp/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     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
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix
index 53a8ee3ba46..3e0aacbaa9d 100644
--- a/pkgs/development/libraries/haskell/bson/default.nix
+++ b/pkgs/development/libraries/haskell/bson/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "BSON documents are JSON-like objects with a standard binary encoding";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix
index d3af223418b..bdbad6f5e63 100644
--- a/pkgs/development/libraries/haskell/byteorder/default.nix
+++ b/pkgs/development/libraries/haskell/byteorder/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Exposes the native endianness or byte ordering of the system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
index 05b316f2412..2de7eec8eb5 100644
--- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Parse and produce literals efficiently from strict or lazy bytestrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
index cf68d1e7fa5..5f9e322fbf0 100755
--- a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "mmap support for strict ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
index 20228b9eed1..9659bea3f77 100644
--- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Parse numeric literals from ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix
index 1dc56c420b6..41c31b1fed5 100644
--- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "An efficient finite map from (byte)strings to values";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
index 790ac305ac7..c57e46cb8bb 100644
--- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Template Haskell expressions for reading fields from a project's cabal file";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index b485a27c4ad..46180b9a827 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "Binding to the Cairo library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix
index 9d72d8cedf7..4187716f026 100644
--- a/pkgs/development/libraries/haskell/case-insensitive/default.nix
+++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Case insensitive string comparison";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix
index 816ed6fadae..bbdb6d350c8 100644
--- a/pkgs/development/libraries/haskell/cautious-file/default.nix
+++ b/pkgs/development/libraries/haskell/cautious-file/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix
index 53c974dd56a..a2a87fda385 100644
--- a/pkgs/development/libraries/haskell/cereal/default.nix
+++ b/pkgs/development/libraries/haskell/cereal/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "A binary serialization library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
index abb4bcad643..8d5cc095937 100644
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ b/pkgs/development/libraries/haskell/certificate/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Certificates and Key Reader/Writer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
index 9cb92640ee4..60669590c2f 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A library for writing CGI programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
index 7e91e25209e..bf1920d434d 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A library for writing CGI programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
index 0c1f8d709c3..c1dc7076c77 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A library for writing CGI programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
index 3621b1fac1b..97e5556bacd 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A library for writing CGI programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix
index 686555330f3..d77bd227f8b 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "A library for writing CGI programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
index 4551eafb474..3cd0c09c3b2 100644
--- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix
+++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "A Citation Style Language implementation in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index e89be643ea4..98bda13ddb7 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Securely store session data in a client-side cookie";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index 6f1650724ef..adc3c10c851 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Command line argument processing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix
index 7b29ba58004..0a71649f0e9 100644
--- a/pkgs/development/libraries/haskell/cmdlib/default.nix
+++ b/pkgs/development/libraries/haskell/cmdlib/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "a library for command line parsing & online help";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/colorize-haskell/default.nix b/pkgs/development/libraries/haskell/colorize-haskell/default.nix
index 702ddd0b9ec..fa2b9880123 100644
--- a/pkgs/development/libraries/haskell/colorize-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/colorize-haskell/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Highligt Haskell source";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix
index 7f4fde5ef97..06bcc8ed981 100644
--- a/pkgs/development/libraries/haskell/colour/default.nix
+++ b/pkgs/development/libraries/haskell/colour/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A model for human colour/color perception";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix
index 416826298bb..fb0b6a1f1cb 100644
--- a/pkgs/development/libraries/haskell/compact-string-fix/default.nix
+++ b/pkgs/development/libraries/haskell/compact-string-fix/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index e2963b2ad20..52345c9446f 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "Streaming data processing library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix
index 26b683c1969..095d0a17984 100755
--- a/pkgs/development/libraries/haskell/continued-fractions/default.nix
+++ b/pkgs/development/libraries/haskell/continued-fractions/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Continued fractions";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix
index 6c128285285..50d95cb8851 100755
--- a/pkgs/development/libraries/haskell/converge/default.nix
+++ b/pkgs/development/libraries/haskell/converge/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Limit operations for converging sequences";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/convertible-text/default.nix b/pkgs/development/libraries/haskell/convertible-text/default.nix
index 7444583bd9f..7d8b40654ec 100644
--- a/pkgs/development/libraries/haskell/convertible-text/default.nix
+++ b/pkgs/development/libraries/haskell/convertible-text/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Typeclasses and instances for converting between types (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix
index a3fa0208e2d..8a79e50527d 100644
--- a/pkgs/development/libraries/haskell/convertible/default.nix
+++ b/pkgs/development/libraries/haskell/convertible/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     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
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix
index 4896ba1d39e..1b958b3240e 100644
--- a/pkgs/development/libraries/haskell/cookie/default.nix
+++ b/pkgs/development/libraries/haskell/cookie/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "HTTP cookie parsing and rendering";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix
index 0a40bd29575..881d4519a53 100644
--- a/pkgs/development/libraries/haskell/cprng-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Crypto Pseudo Random Number Generator using AES in counter mode";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index 0cc873402b2..a687a592baa 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Robust, reliable performance measurement and analysis";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
index 546392d7087..51b827c9e25 100644
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A generic interface for cryptographic operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
index 736d5f666d0..552a40b6659 100644
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Conduit interface for cryptographic operations (from crypto-api)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
index 27f99665d67..fa3151d893c 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Generic cryptography Public keys algorithm types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
index a95e3ec1f64..904c33b7431 100644
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "Symmetrical Block, Stream and PubKey Ciphers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 4336be8318d..26af168e8a4 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "collection of crypto hashes, fast, pure and practical";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix
index 609eb593ebb..9970d87fbe0 100644
--- a/pkgs/development/libraries/haskell/css-text/default.nix
+++ b/pkgs/development/libraries/haskell/css-text/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "CSS parser and renderer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/csv/default.nix b/pkgs/development/libraries/haskell/csv/default.nix
index ae149be79da..f56a9b89423 100644
--- a/pkgs/development/libraries/haskell/csv/default.nix
+++ b/pkgs/development/libraries/haskell/csv/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "CSV loader and dumper";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix
index c512820114f..072b8f2d6e6 100644
--- a/pkgs/development/libraries/haskell/curl/default.nix
+++ b/pkgs/development/libraries/haskell/curl/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Haskell binding to libcurl";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
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 a160aa3f708..077e31c683e 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Utilities for accessing and manipulating fields of records";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
index 76bee6c05a8..b3bb3408bcf 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Utilities for accessing and manipulating fields of records";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
index 48786b509fa..08f6b654f3b 100644
--- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
+++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Parser/Serialiser for IEEE-754 floating-point values";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix
index 593c7b3bd3c..dbb5ce9fc41 100644
--- a/pkgs/development/libraries/haskell/data-default/default.nix
+++ b/pkgs/development/libraries/haskell/data-default/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A class for types with a default value";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-reify/default.nix b/pkgs/development/libraries/haskell/data-reify/default.nix
index 2618ef6a690..6599d25f68e 100644
--- a/pkgs/development/libraries/haskell/data-reify/default.nix
+++ b/pkgs/development/libraries/haskell/data-reify/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Reify a recursive data structure into an explicit graph";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
index 7f7b65702b0..d2428600ce9 100644
--- a/pkgs/development/libraries/haskell/dataenc/default.nix
+++ b/pkgs/development/libraries/haskell/dataenc/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Data encoding library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix
index 72f3d1c937f..faf0b40b94d 100644
--- a/pkgs/development/libraries/haskell/datetime/default.nix
+++ b/pkgs/development/libraries/haskell/datetime/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Utilities to make Data.Time.* easier to use.";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix
index ccffbe54f02..36ab9f8a8e9 100644
--- a/pkgs/development/libraries/haskell/deepseq-th/default.nix
+++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Template Haskell based deriver for optimised NFData instances";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix
index 2c61618cd08..c13abe9e31c 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Fully evaluate data structures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix
index 4af1d5bff9c..99db69e612a 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Deep evaluation of data structures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
index 35fca66fa86..f4ef61cbbff 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Deep evaluation of data structures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix
index e2c9c926aa7..2470dcdf89f 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Deep evaluation of data structures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index 356dd948e22..d3ed9b4c954 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "A program and library to derive instances for data types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix
index 99b072b63a4..5595c909aa0 100644
--- a/pkgs/development/libraries/haskell/derp/default.nix
+++ b/pkgs/development/libraries/haskell/derp/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Derivative Parsing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix
index 50bce7090b3..bd6d249eee3 100644
--- a/pkgs/development/libraries/haskell/digest/default.nix
+++ b/pkgs/development/libraries/haskell/digest/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index d36f351fcf6..329722abe8e 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Statically checked physical dimensions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix
index 70c232da691..f99e043cf9e 100644
--- a/pkgs/development/libraries/haskell/directory-tree/default.nix
+++ b/pkgs/development/libraries/haskell/directory-tree/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A simple directory-like tree datatype, with useful IO functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix
index a88b38650c7..1a7fc56efd5 100644
--- a/pkgs/development/libraries/haskell/dlist/default.nix
+++ b/pkgs/development/libraries/haskell/dlist/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Differences lists";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix
index 06a3e6a09fe..a7fe5b791f0 100644
--- a/pkgs/development/libraries/haskell/dotgen/default.nix
+++ b/pkgs/development/libraries/haskell/dotgen/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A simple interface for building .dot graph files.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix
index 7c810a29565..82a1e4d4c39 100644
--- a/pkgs/development/libraries/haskell/double-conversion/default.nix
+++ b/pkgs/development/libraries/haskell/double-conversion/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Fast conversion between double precision floating point and text";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix
index dd7fb892fde..935004a6bb0 100644
--- a/pkgs/development/libraries/haskell/download-curl/default.nix
+++ b/pkgs/development/libraries/haskell/download-curl/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "High-level file download based on URLs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix
index c0895ac2938..06c34bf9acb 100644
--- a/pkgs/development/libraries/haskell/download/default.nix
+++ b/pkgs/development/libraries/haskell/download/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "High-level file download based on URLs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix
index 0b979e179f4..e025b00f837 100644
--- a/pkgs/development/libraries/haskell/dstring/default.nix
+++ b/pkgs/development/libraries/haskell/dstring/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Difference strings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/editline/default.nix b/pkgs/development/libraries/haskell/editline/default.nix
index b8fe0d25ed4..aee315d01fc 100644
--- a/pkgs/development/libraries/haskell/editline/default.nix
+++ b/pkgs/development/libraries/haskell/editline/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Bindings to the editline library (libedit)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix
index 2906b0a9e64..89c5ddb02d7 100644
--- a/pkgs/development/libraries/haskell/email-validate/default.nix
+++ b/pkgs/development/libraries/haskell/email-validate/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Validating an email address string against RFC 5322";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
index e877124b963..004d7492c51 100644
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A platform independent entropy source";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix
index b0e9f03a31b..9592b3009cb 100644
--- a/pkgs/development/libraries/haskell/enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/enumerator/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Reliable, high-performance processing with left-fold enumerators";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix
index 25d64b3faaf..1a6331bcd6f 100644
--- a/pkgs/development/libraries/haskell/erf/default.nix
+++ b/pkgs/development/libraries/haskell/erf/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "The error function, erf, and related functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix
index 2a95faafaf6..47c0f57252b 100644
--- a/pkgs/development/libraries/haskell/explicit-exception/default.nix
+++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Exceptions which are explicit in the type signature";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix
index 8a928931e3e..0eca0eb78ee 100644
--- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix
+++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix
index 329bb2a42c4..946a808ddc5 100644
--- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix
index d349a1f17e3..577f7d4657a 100644
--- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix
+++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix
index f217db39bc6..2ca255d2999 100644
--- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix
+++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/failure/0.1.2.nix b/pkgs/development/libraries/haskell/failure/0.1.2.nix
index fc5c9488e59..51212385922 100644
--- a/pkgs/development/libraries/haskell/failure/0.1.2.nix
+++ b/pkgs/development/libraries/haskell/failure/0.1.2.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A simple type class for success/failure computations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/failure/0.2.0.nix b/pkgs/development/libraries/haskell/failure/0.2.0.nix
index 05b1b0c173c..3ed3ad704ad 100644
--- a/pkgs/development/libraries/haskell/failure/0.2.0.nix
+++ b/pkgs/development/libraries/haskell/failure/0.2.0.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A simple type class for success/failure computations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index 272cc735155..56248997723 100644
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A fast logging system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index 1f9a1152831..6475d245ed6 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "First class accessor labels";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
index 8ad5c4318f7..d15906e0be5 100644
--- a/pkgs/development/libraries/haskell/feed/default.nix
+++ b/pkgs/development/libraries/haskell/feed/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
index 7299daddb14..c367b74f6a3 100644
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Martin Erwig's Functional Graph Library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
index 7417a32745c..8691d10c684 100644
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Martin Erwig's Functional Graph Library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix
index 7b6aa799944..6a7aa22cef1 100644
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Martin Erwig's Functional Graph Library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix
index d24d30adfcb..3cb11471baa 100644
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ b/pkgs/development/libraries/haskell/file-embed/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Use Template Haskell to embed file contents directly";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix
index 3511cddeee2..ae28bdc2e41 100644
--- a/pkgs/development/libraries/haskell/filepath/default.nix
+++ b/pkgs/development/libraries/haskell/filepath/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Library for manipulating FilePaths in a cross platform way";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index 0abd073c51c..6b34efc2077 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Interface for versioning file stores";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix
index 37f66a12ba6..71afad2cdbc 100644
--- a/pkgs/development/libraries/haskell/fingertree/default.nix
+++ b/pkgs/development/libraries/haskell/fingertree/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Generic finger-tree structure, with example instances";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
index 3c7e45ce0d5..40ac59d1c9e 100755
--- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix
+++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Generate default function implementations for complex type classes";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix
index 1f26b0847d2..f6893cc3797 100755
--- a/pkgs/development/libraries/haskell/funcmp/default.nix
+++ b/pkgs/development/libraries/haskell/funcmp/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Functional MetaPost";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix
index 2853fbca768..8fbdb57d48b 100755
--- a/pkgs/development/libraries/haskell/gamma/default.nix
+++ b/pkgs/development/libraries/haskell/gamma/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Gamma function and related functions";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix
index 44c15b23d4b..27423ce4ecd 100644
--- a/pkgs/development/libraries/haskell/gd/default.nix
+++ b/pkgs/development/libraries/haskell/gd/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A Haskell binding to a subset of the GD graphics library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix
index 929b717f552..e14857aaa5b 100644
--- a/pkgs/development/libraries/haskell/gdiff/default.nix
+++ b/pkgs/development/libraries/haskell/gdiff/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Generic diff and patch";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
index b34c394cac7..0ed052acd3e 100644
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Generic programming library for generalized deriving";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix
index ef1cf8401b4..fd1e45d1e2e 100644
--- a/pkgs/development/libraries/haskell/ghc-core/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-core/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Display GHC's core and assembly output in a pager";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
index 31b6c32d304..fa6ae059e84 100644
--- a/pkgs/development/libraries/haskell/ghc-events/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-events/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Library and tool for parsing .eventlog files from GHC";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
index d67f455471f..f885b9a5313 100644
--- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-paths/default.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix
index 1fa7e662f02..8f01db02f99 100644
--- a/pkgs/development/libraries/haskell/ghc-paths/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-paths/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Knowledge of GHC's installation directories";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
index ce2cb87c096..804e55a2245 100644
--- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate utilities for the GHC API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-syb/default.nix b/pkgs/development/libraries/haskell/ghc-syb/default.nix
index d0a766940fe..21a2f0f00eb 100644
--- a/pkgs/development/libraries/haskell/ghc-syb/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-syb/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Data and Typeable instances for the GHC API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix
index b9d6f906af4..98a3d32348e 100644
--- a/pkgs/development/libraries/haskell/gio/default.nix
+++ b/pkgs/development/libraries/haskell/gio/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Binding to the GIO";
     license = self.stdenv.lib.licenses.lgpl21;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index b9fc9fa3ae9..61251bfabc3 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -23,9 +23,6 @@ cabal.mkDerivation (self: {
     description = "Wiki using happstack, git or darcs, and pandoc";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix
index f1bae4ad9fe..7c49b956aa9 100644
--- a/pkgs/development/libraries/haskell/glade/default.nix
+++ b/pkgs/development/libraries/haskell/glade/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Binding to the glade library";
     license = self.stdenv.lib.licenses.lgpl21;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
index 8dedf471a9f..4183ac45f70 100644
--- a/pkgs/development/libraries/haskell/glib/default.nix
+++ b/pkgs/development/libraries/haskell/glib/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Binding to the GLIB library for Gtk2Hs";
     license = self.stdenv.lib.licenses.lgpl21;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 46921fcba9e..a1641ebedce 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Painless 2D vector graphics, animations and simulations";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index fe6119d5a6a..224cff2124a 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "Bindings to Graphviz for graph visualisation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
index 4bf8c3b7359..81c34f20c1c 100644
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ b/pkgs/development/libraries/haskell/gtk/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Binding to the Gtk+ graphical user interface library";
     license = self.stdenv.lib.licenses.lgpl21;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
index 01d40a2a5ab..782e3fc9444 100644
--- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "Tools to build the Gtk2Hs suite of User Interface libraries";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
index 7ab1b1eda71..353ae9e441d 100644
--- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix
+++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Binding to the GtkSourceView library";
     license = self.stdenv.lib.licenses.lgpl21;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix
index 1f0f75ffeb8..9c4c9681b5f 100644
--- a/pkgs/development/libraries/haskell/hS3/default.nix
+++ b/pkgs/development/libraries/haskell/hS3/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "Interface to Amazon's Simple Storage Service (S3)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix
index 37698cebb38..b27ff78d8f9 100644
--- a/pkgs/development/libraries/haskell/hackage-db/default.nix
+++ b/pkgs/development/libraries/haskell/hackage-db/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "provide access to the Hackage database via Data.Map";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 73fe6f0ba68..31b2c4fdafb 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "A static website compiler library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 5f03e1c7003..57bd463fecb 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "Haml-like template files that are compile-time checked";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix
index 6f39e82739d..bdf27495d82 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-data.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "Happstack data manipulation libraries";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index 7ebab5feb21..28a4459f3b0 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Support for Hamlet HTML templates in Happstack";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index c6cf467d1f6..f02586d51a4 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -20,9 +20,6 @@ cabal.mkDerivation (self: {
     description = "Web related tools and services";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
index f22664fa842..f63d253864c 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "Web framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix
index 0632472e6b6..c706b020fef 100644
--- a/pkgs/development/libraries/haskell/hashable/default.nix
+++ b/pkgs/development/libraries/haskell/hashable/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A class for types that can be converted to a hash value";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix
index 7d99cc4f6aa..04f465bb9fe 100644
--- a/pkgs/development/libraries/haskell/hashed-storage/default.nix
+++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Hashed file storage support code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix
index 990a998a689..a091d972a45 100644
--- a/pkgs/development/libraries/haskell/hashtables/default.nix
+++ b/pkgs/development/libraries/haskell/hashtables/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Mutable hash tables in the ST monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskeline-class/default.nix b/pkgs/development/libraries/haskell/haskeline-class/default.nix
index acf6a6c0d4f..76080574fcc 100644
--- a/pkgs/development/libraries/haskell/haskeline-class/default.nix
+++ b/pkgs/development/libraries/haskell/haskeline-class/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Class interface for working with Haskeline";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix
index 4e67ed5443a..b29b73309ee 100644
--- a/pkgs/development/libraries/haskell/haskeline/default.nix
+++ b/pkgs/development/libraries/haskell/haskeline/default.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "A command-line interface for user input, written in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-lexer/default.nix b/pkgs/development/libraries/haskell/haskell-lexer/default.nix
index 90c4a599bc4..9aa1bdea951 100644
--- a/pkgs/development/libraries/haskell/haskell-lexer/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-lexer/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "A fully compliant Haskell 98 lexer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
index 649bf29f58f..9df67a70c6c 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index 972e93a6901..5fd332c1d34 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Parse source to template-haskell abstract syntax";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix
index 0bec7376544..6729cbef2aa 100644
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Manipulating Haskell source code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix
index 949efadea96..1895a655d92 100644
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Support for manipulating Haskell source code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
index dd62d57a02a..1dbbbec550a 100644
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Support for manipulating Haskell source code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix
index 63cdbd31583..ef11e344b44 100644
--- a/pkgs/development/libraries/haskell/hastache/default.nix
+++ b/pkgs/development/libraries/haskell/hastache/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "Haskell implementation of Mustache templates";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haxr-th/default.nix b/pkgs/development/libraries/haskell/haxr-th/default.nix
index 83917cf8891..b319857bac3 100644
--- a/pkgs/development/libraries/haskell/haxr-th/default.nix
+++ b/pkgs/development/libraries/haskell/haxr-th/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Automatic deriving of XML-RPC structs for Haskell records";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix
index 5caea80d6c8..3e14485ea1a 100644
--- a/pkgs/development/libraries/haskell/haxr/default.nix
+++ b/pkgs/development/libraries/haskell/haxr/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "XML-RPC client and server library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index e01adbcf428..4e8d4cb50ed 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Syntax highlighting";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
index 7c6dabf8085..795d8c1d674 100644
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Runtime Haskell interpreter (GHC API wrapper)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index 588a6006f7e..46aebc66e24 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Haskell implementation of a javascript minifier";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index 4d9186ce1c5..62a90257d1d 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Core data types, parsers and utilities for the hledger accounting tool";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hledger-vty/default.nix b/pkgs/development/libraries/haskell/hledger-vty/default.nix
index 0a6dd1cf202..c304a6646ec 100644
--- a/pkgs/development/libraries/haskell/hledger-vty/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-vty/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "A curses-style console interface for the hledger accounting tool";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index df16514e91f..6b4ef21dea6 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -24,9 +24,6 @@ cabal.mkDerivation (self: {
     description = "A web interface for the hledger accounting tool";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 1b53fd04a05..e53f08618b1 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "The main command-line interface for the hledger accounting tool";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index acda91808ad..398299872d5 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -16,7 +16,6 @@ cabal.mkDerivation (self: {
     maintainers = [
       self.stdenv.lib.maintainers.andres
       self.stdenv.lib.maintainers.guibert
-      self.stdenv.lib.maintainers.simons
     ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hopenssl/default.nix b/pkgs/development/libraries/haskell/hopenssl/default.nix
index fec3f5dccf4..5c62cbf3fe0 100644
--- a/pkgs/development/libraries/haskell/hopenssl/default.nix
+++ b/pkgs/development/libraries/haskell/hopenssl/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "FFI bindings to OpenSSL's EVP digest interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hostname/default.nix b/pkgs/development/libraries/haskell/hostname/default.nix
index 69653ca2699..75886f8daad 100644
--- a/pkgs/development/libraries/haskell/hostname/default.nix
+++ b/pkgs/development/libraries/haskell/hostname/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "A very simple package providing a cross-platform means of determining the hostname";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix
index 4ed3ae9948a..37e6000a3c0 100644
--- a/pkgs/development/libraries/haskell/hp2any-core/default.nix
+++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Heap profiling helper library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix
index 340def04cd8..98b9518c7de 100644
--- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix
+++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix
index ebba81acf4f..c96e6aeaac6 100644
--- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix
+++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Haskell bindings to bibutils, the bibliography conversion utilities";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix
index 9992faf048c..c608f6341a2 100644
--- a/pkgs/development/libraries/haskell/hscolour/default.nix
+++ b/pkgs/development/libraries/haskell/hscolour/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Colourise Haskell code";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix
index 2a83df47f09..aab6530fcc9 100644
--- a/pkgs/development/libraries/haskell/hsdns/default.nix
+++ b/pkgs/development/libraries/haskell/hsdns/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Asynchronous DNS Resolver";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix
index 3ba0249c4df..cdacd2b362c 100644
--- a/pkgs/development/libraries/haskell/hsemail/default.nix
+++ b/pkgs/development/libraries/haskell/hsemail/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Internet Message Parsers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix
index 4ee2f0e75df..5351bbb1777 100644
--- a/pkgs/development/libraries/haskell/hslogger-template/default.nix
+++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Automatic generation of hslogger functions";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hspread/default.nix b/pkgs/development/libraries/haskell/hspread/default.nix
index c1ee264ea84..dbd1a4a0923 100644
--- a/pkgs/development/libraries/haskell/hspread/default.nix
+++ b/pkgs/development/libraries/haskell/hspread/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A client library for the spread toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix
index baa19065041..d5043024fd6 100755
--- a/pkgs/development/libraries/haskell/hsyslog/default.nix
+++ b/pkgs/development/libraries/haskell/hsyslog/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "FFI interface to syslog(3) from POSIX.1-2001.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/html/1.0.1.2.nix b/pkgs/development/libraries/haskell/html/1.0.1.2.nix
index f420bad2959..de8dc75a5fa 100644
--- a/pkgs/development/libraries/haskell/html/1.0.1.2.nix
+++ b/pkgs/development/libraries/haskell/html/1.0.1.2.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "HTML combinator library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 6621f13df8e..d49b0dde7d6 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -22,9 +22,6 @@ cabal.mkDerivation (self: {
     description = "HTTP client package with conduit interface and HTTPS support";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix
index a12542e3846..82e6d8477b6 100644
--- a/pkgs/development/libraries/haskell/http-date/default.nix
+++ b/pkgs/development/libraries/haskell/http-date/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "HTTP Date parser/formatter";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix
index 543b54e599a..3346f2b3328 100644
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix
@@ -22,9 +22,6 @@ cabal.mkDerivation (self: {
     description = "HTTP client package with enumerator interface and HTTPS support";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
index dff38078295..83cb547896f 100644
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ b/pkgs/development/libraries/haskell/http-types/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Generic HTTP types for Haskell (for both client and server code)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix
index e56a95437db..d1d3f28b049 100644
--- a/pkgs/development/libraries/haskell/httpd-shed/default.nix
+++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A simple web-server with an interact style API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
index 9e2b9a21bb3..86605ae55a5 100644
--- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Character properties and classes for XML and Unicode";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
index c18bdea3875..fb2e4a2c1e5 100644
--- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A regular expression library for W3C XML Schema regular expressions";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
index 6584a69b4ba..731c63b5378 100644
--- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index 0e1668a5818..203bb89ef09 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "A collection of tools for processing XML with Haskell";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix
index 3a731c62623..6eb5f262516 100644
--- a/pkgs/development/libraries/haskell/ieee754/default.nix
+++ b/pkgs/development/libraries/haskell/ieee754/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Utilities for dealing with IEEE floating point numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix
index 2a51e8d344b..5893e0b9d05 100644
--- a/pkgs/development/libraries/haskell/instant-generics/default.nix
+++ b/pkgs/development/libraries/haskell/instant-generics/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Generic programming library with a sum of products view";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/io-storage/default.nix b/pkgs/development/libraries/haskell/io-storage/default.nix
index 55b88ac1d36..32e60325acc 100644
--- a/pkgs/development/libraries/haskell/io-storage/default.nix
+++ b/pkgs/development/libraries/haskell/io-storage/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A key-value store in the IO monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix
index c7e222e1d14..613f03c80c1 100644
--- a/pkgs/development/libraries/haskell/irc/default.nix
+++ b/pkgs/development/libraries/haskell/irc/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A small library for parsing IRC messages";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index 670055a7dec..901f3c5e81a 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Iteratee-based I/O";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix
index a7fc6b7e6e1..d062ec29869 100644
--- a/pkgs/development/libraries/haskell/ivor/default.nix
+++ b/pkgs/development/libraries/haskell/ivor/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Theorem proving library based on dependent type theory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix
index 872f2fb394f..c93aa0411d4 100644
--- a/pkgs/development/libraries/haskell/jpeg/default.nix
+++ b/pkgs/development/libraries/haskell/jpeg/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A library for decoding JPEG files written in pure Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jsonTypes/default.nix b/pkgs/development/libraries/haskell/jsonTypes/default.nix
index 44be8624a41..dd6c3eb058f 100644
--- a/pkgs/development/libraries/haskell/jsonTypes/default.nix
+++ b/pkgs/development/libraries/haskell/jsonTypes/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Basic types for representing JSON";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
index d0ecb017dba..7cbbce517f6 100644
--- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
+++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Module to automatically extract functions from the local code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index bb79a262b94..053bbef01eb 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "Parser for JavaScript";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix
index d6716abe55f..0c526652399 100644
--- a/pkgs/development/libraries/haskell/largeword/default.nix
+++ b/pkgs/development/libraries/haskell/largeword/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
index 5881baf7430..f409d99987d 100644
--- a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A library for demand-driven testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
index 5ad27e008c8..f3658bdfe58 100644
--- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix
+++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
@@ -19,9 +19,6 @@ cabal.mkDerivation (self: {
     description = "Metadata collection for leksah";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/leksah/process-leksah.nix b/pkgs/development/libraries/haskell/leksah/process-leksah.nix
index 75059e70512..b8f0ed37d4c 100644
--- a/pkgs/development/libraries/haskell/leksah/process-leksah.nix
+++ b/pkgs/development/libraries/haskell/leksah/process-leksah.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Process libraries";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
index 65b58c19ed5..f9deadd8537 100644
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ b/pkgs/development/libraries/haskell/libmpd/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "An MPD client library";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index 255570f6c6e..bc4af6298de 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "lifted IO operations from the base library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/logfloat/default.nix b/pkgs/development/libraries/haskell/logfloat/default.nix
index 5f438fb4060..3088004d0a8 100644
--- a/pkgs/development/libraries/haskell/logfloat/default.nix
+++ b/pkgs/development/libraries/haskell/logfloat/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Log-domain floating point numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ltk/default.nix b/pkgs/development/libraries/haskell/ltk/default.nix
index 9d0a32c54df..a45169b4cc1 100644
--- a/pkgs/development/libraries/haskell/ltk/default.nix
+++ b/pkgs/development/libraries/haskell/ltk/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Leksah tool kit";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix
index ebc4ea5287a..fda06d718ed 100644
--- a/pkgs/development/libraries/haskell/math-functions/default.nix
+++ b/pkgs/development/libraries/haskell/math-functions/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Special functions and Chebyshev polynomials";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix
index 1344f7759af..709156d290f 100644
--- a/pkgs/development/libraries/haskell/maude/default.nix
+++ b/pkgs/development/libraries/haskell/maude/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "An interface to the Maude rewriting system";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
index 3153bb6f608..590290e76c3 100644
--- a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
+++ b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index 7838afc6756..37e76284919 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Compose MIME email messages";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix
index 817cae52295..5861d7d6760 100644
--- a/pkgs/development/libraries/haskell/mmap/default.nix
+++ b/pkgs/development/libraries/haskell/mmap/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Memory mapped files for POSIX and Windows";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
index b3d9208bd25..d313df8f65b 100644
--- a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
+++ b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Lift control operations, like exception catching, through monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix b/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix
index 8c651936d3e..67608ebbf81 100644
--- a/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix
+++ b/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Lift control operations, like exception catching, through monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-control/0.3.1.nix b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix
index bf4ca6d0042..d04308a4aa2 100644
--- a/pkgs/development/libraries/haskell/monad-control/0.3.1.nix
+++ b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Lift control operations, like exception catching, through monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix
index 9e9d8ed5a1a..8aca5bbfc5a 100644
--- a/pkgs/development/libraries/haskell/monad-loops/default.nix
+++ b/pkgs/development/libraries/haskell/monad-loops/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Monadic loops";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-par/default.nix b/pkgs/development/libraries/haskell/monad-par/default.nix
index e8a2e298c98..1bfac2b13d2 100644
--- a/pkgs/development/libraries/haskell/monad-par/default.nix
+++ b/pkgs/development/libraries/haskell/monad-par/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A library for parallel programming based on a monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-peel/default.nix b/pkgs/development/libraries/haskell/monad-peel/default.nix
index 670b6aaf79b..69ab9b0365b 100644
--- a/pkgs/development/libraries/haskell/monad-peel/default.nix
+++ b/pkgs/development/libraries/haskell/monad-peel/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Lift control operations like exception catching through monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix
index d61922dc508..53c0a2cad8e 100644
--- a/pkgs/development/libraries/haskell/monads-tf/default.nix
+++ b/pkgs/development/libraries/haskell/monads-tf/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Monad classes, using type families";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix
index 374521d36c5..ddbbdcb8093 100644
--- a/pkgs/development/libraries/haskell/mongoDB/default.nix
+++ b/pkgs/development/libraries/haskell/mongoDB/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mpppc/default.nix b/pkgs/development/libraries/haskell/mpppc/default.nix
index 31dd91a2d2f..fa19197871d 100644
--- a/pkgs/development/libraries/haskell/mpppc/default.nix
+++ b/pkgs/development/libraries/haskell/mpppc/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Multi-dimensional parametric pretty-printer with color";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
index d609fc75cd7..fc8fdaef752 100644
--- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
+++ b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Monad transformer library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
index 05e84b90dd0..d7e6029a4ed 100644
--- a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
+++ b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Monad transformer library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
index dc2ddedc121..3c91b65efa0 100644
--- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
+++ b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Monad classes, using functional dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtlparse/default.nix b/pkgs/development/libraries/haskell/mtlparse/default.nix
index 349fea712eb..37be70cebcb 100644
--- a/pkgs/development/libraries/haskell/mtlparse/default.nix
+++ b/pkgs/development/libraries/haskell/mtlparse/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "parse library using mtl package";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index 5f12e4cee92..446c47a41dc 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "Combinators to build command line parsers";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix
index 13059f0183e..b53c0b955e5 100644
--- a/pkgs/development/libraries/haskell/multiplate/default.nix
+++ b/pkgs/development/libraries/haskell/multiplate/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Lightweight generic library for mutually recursive data types";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
index c001783a13b..e636fc9dc8e 100644
--- a/pkgs/development/libraries/haskell/multirec/default.nix
+++ b/pkgs/development/libraries/haskell/multirec/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Generic programming for families of recursive datatypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multiset/default.nix b/pkgs/development/libraries/haskell/multiset/default.nix
index eb5df93d5bc..9f85317505c 100644
--- a/pkgs/development/libraries/haskell/multiset/default.nix
+++ b/pkgs/development/libraries/haskell/multiset/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "The Data.MultiSet container type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix
index d20822244ef..8f1ee9fa6a3 100644
--- a/pkgs/development/libraries/haskell/murmur-hash/default.nix
+++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "MurmurHash2 implementation for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix
index faeb3de2567..27dabe57f32 100644
--- a/pkgs/development/libraries/haskell/mwc-random/default.nix
+++ b/pkgs/development/libraries/haskell/mwc-random/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Fast, high quality pseudo random number generation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.2.1.4.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix
index 7d99df9ee1c..68c7937497c 100644
--- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix
+++ b/pkgs/development/libraries/haskell/network/2.2.1.4.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Networking-related facilities";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix
index ba33bc36643..f66d81f79f4 100644
--- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix
+++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Networking-related facilities";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.11.nix b/pkgs/development/libraries/haskell/network/2.3.0.11.nix
index 7007211a721..db53fef9394 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.11.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.11.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Low-level networking interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix
index 9d2642a487d..a1a9a36d738 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.2.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Low-level networking interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix
index bf9330eb256..9434d83d7f0 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.5.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Low-level networking interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.7.nix b/pkgs/development/libraries/haskell/network/2.3.0.7.nix
index 3c0e0065ed9..fa194ae4507 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.7.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.7.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Low-level networking interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix
index 934bb76dcd4..a50710791db 100644
--- a/pkgs/development/libraries/haskell/non-negative/default.nix
+++ b/pkgs/development/libraries/haskell/non-negative/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Non-negative numbers";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
index 94ec52e0ac7..d4eef1b1511 100644
--- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "An experimental alternative hierarchy of numeric type classes";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix
index b55e0c50b4b..be90f003f7f 100644
--- a/pkgs/development/libraries/haskell/numtype/default.nix
+++ b/pkgs/development/libraries/haskell/numtype/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Type-level (low cardinality) integers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix
index b55c214bb75..6dfbc1fc15f 100644
--- a/pkgs/development/libraries/haskell/pandoc-types/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Types for representing a structured document";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index e905bb237d8..d7003cc82fc 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -20,9 +20,6 @@ cabal.mkDerivation (self: {
     description = "Conversion between markup formats";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
index 46dedc24d43..ca764844c16 100644
--- a/pkgs/development/libraries/haskell/pango/default.nix
+++ b/pkgs/development/libraries/haskell/pango/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "Binding to the Pango text rendering engine";
     license = self.stdenv.lib.licenses.lgpl21;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
index 2977a60964c..5212e6b2847 100644
--- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
index 185e86b02e8..9fb661fd481 100644
--- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
index 37d537185cb..83283c2317b 100644
--- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix
index 81d37e3a2b0..365ed196841 100644
--- a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix
+++ b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix
index 4f50be5f700..d51533a0653 100644
--- a/pkgs/development/libraries/haskell/parseargs/default.nix
+++ b/pkgs/development/libraries/haskell/parseargs/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Command-line argument parsing library for Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
index 155e4f09007..17c046a06e1 100644
--- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.1.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix
index e740ca91dba..62c5b67b0e9 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.1.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.1.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix
index 95ef6219dbb..ecbdbb3aef0 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.1.2.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix
index 55bc7f74d29..4245fcf7f40 100644
--- a/pkgs/development/libraries/haskell/parsimony/default.nix
+++ b/pkgs/development/libraries/haskell/parsimony/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators derived from Parsec";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
index 6230ac2e8a3..6b5168e50c1 100755
--- a/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
+++ b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Components of paths";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
index 9c3c8dbc79a..ea66d1d54bd 100755
--- a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
+++ b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Components of paths";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix
index 8c776e68b1a..f08ded72968 100644
--- a/pkgs/development/libraries/haskell/pathtype/default.nix
+++ b/pkgs/development/libraries/haskell/pathtype/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Type-safe replacement for System.FilePath etc";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix
index 3336b8f1c8a..71e0ddadb59 100644
--- a/pkgs/development/libraries/haskell/pcre-light/default.nix
+++ b/pkgs/development/libraries/haskell/pcre-light/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/permutation/default.nix b/pkgs/development/libraries/haskell/permutation/default.nix
index e21a8993a97..5903cb27f71 100644
--- a/pkgs/development/libraries/haskell/permutation/default.nix
+++ b/pkgs/development/libraries/haskell/permutation/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A library for permutations and combinations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index e9cfbaeff50..d1a067bcbb0 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "Backend for the persistent library using sqlite3";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index e6affc56d2a..22948d89946 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Type-safe, non-relational, multi-backend persistence";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 4ddd53ba75a..0ebb1d2d7c0 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -19,9 +19,6 @@ cabal.mkDerivation (self: {
     description = "Type-safe, multi-backend data serialization";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/polyparse/1.7.nix b/pkgs/development/libraries/haskell/polyparse/1.7.nix
index b27dc9cc695..23a0af761c1 100644
--- a/pkgs/development/libraries/haskell/polyparse/1.7.nix
+++ b/pkgs/development/libraries/haskell/polyparse/1.7.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A variety of alternative parser combinator libraries";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/polyparse/1.8.nix b/pkgs/development/libraries/haskell/polyparse/1.8.nix
index a0ee0e199bb..24425c6b5e6 100644
--- a/pkgs/development/libraries/haskell/polyparse/1.8.nix
+++ b/pkgs/development/libraries/haskell/polyparse/1.8.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A variety of alternative parser combinator libraries";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix
index 339ec70593c..4d4f9101456 100644
--- a/pkgs/development/libraries/haskell/pool-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Resource pool allocations via ResourceT";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ppm/default.nix b/pkgs/development/libraries/haskell/ppm/default.nix
index df204fa2482..c55fc0226e9 100644
--- a/pkgs/development/libraries/haskell/ppm/default.nix
+++ b/pkgs/development/libraries/haskell/ppm/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "a tiny PPM image generator";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix
index 19398be7ac7..577848ab459 100644
--- a/pkgs/development/libraries/haskell/pretty-show/default.nix
+++ b/pkgs/development/libraries/haskell/pretty-show/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Tools for working with derived Show instances";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/default.nix
index ab8dc18ad0a..9daef669c57 100644
--- a/pkgs/development/libraries/haskell/primitive/default.nix
+++ b/pkgs/development/libraries/haskell/primitive/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Wrappers for primitive operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
index 5459b8fa6dc..973a37a0983 100644
--- a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
+++ b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Generating images of resolution trees for Prolog queries";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix
index 446a430ed7c..8016095a402 100644
--- a/pkgs/development/libraries/haskell/prolog-graph/default.nix
+++ b/pkgs/development/libraries/haskell/prolog-graph/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "A command line tool to visualize query resolution in Prolog";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix
index 6702e2e3887..96525599d13 100644
--- a/pkgs/development/libraries/haskell/prolog/default.nix
+++ b/pkgs/development/libraries/haskell/prolog/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A Prolog interpreter written in Haskell";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix
index 2dfc0091799..9501c7ffff1 100644
--- a/pkgs/development/libraries/haskell/pureMD5/default.nix
+++ b/pkgs/development/libraries/haskell/pureMD5/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
index a78471d8ebb..add66a0bed2 100644
--- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix
+++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Secure password storage";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index 2f4893dba08..dff11ae2033 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Random number generation";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix
index 174bc9ef842..b4fc02da2f0 100644
--- a/pkgs/development/libraries/haskell/random-shuffle/default.nix
+++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Random shuffle implementation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix
index caa4b65814c..e4dab92dcb7 100755
--- a/pkgs/development/libraries/haskell/random-source/default.nix
+++ b/pkgs/development/libraries/haskell/random-source/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Generic basis for random number generators";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix
index a4feee31d02..1f4901a4d91 100644
--- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix
+++ b/pkgs/development/libraries/haskell/random/1.0.1.1.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "random number library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix
index 0ba35027050..2182e6410b5 100644
--- a/pkgs/development/libraries/haskell/ranges/default.nix
+++ b/pkgs/development/libraries/haskell/ranges/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Ranges and various functions on them";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix
index 60747bbda68..37fb26208f4 100644
--- a/pkgs/development/libraries/haskell/recaptcha/default.nix
+++ b/pkgs/development/libraries/haskell/recaptcha/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Functions for using the reCAPTCHA service in web applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix
index 09e4906da01..e94a233d9f1 100644
--- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix
+++ b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
index 8fbc2f9e84d..5a49d2b6407 100644
--- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
+++ b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
index 50f039a3d27..1dc559e6370 100644
--- a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
+++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix
index ed88e247e5b..623db0cc48b 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix
index 3db0f5d4065..8b9e666d6ae 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.92.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
index 3a28e505a82..df3a7abf13f 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix
index 138702e1d41..52c28d8b800 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
index f3c6e02caf5..67180215fde 100644
--- a/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
+++ b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix
index 68c39818517..48785e97a2f 100644
--- a/pkgs/development/libraries/haskell/regex-pcre/default.nix
+++ b/pkgs/development/libraries/haskell/regex-pcre/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix
index 961aab9e2f7..f1f6a89dc3d 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
index 223c9baedcd..662d8236c45 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
index 9a570d4ca20..11e02b398b5 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix
index e78c7fe2584..42ee42ba7ef 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
index ca6358baeed..58106bc8b74 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
index 82fa24016bc..67073790d25 100644
--- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix
+++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regexpr/default.nix b/pkgs/development/libraries/haskell/regexpr/default.nix
index 538b980b438..c5389a7b663 100644
--- a/pkgs/development/libraries/haskell/regexpr/default.nix
+++ b/pkgs/development/libraries/haskell/regexpr/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "regular expression like Perl/Ruby in Haskell";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix
index 0085d866567..c37c54e8bfa 100644
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ b/pkgs/development/libraries/haskell/regular/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Generic programming library for regular datatypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
index 991c1a3d779..f9798196693 100644
--- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Algorithms using the Repa array library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa-bytestring/default.nix b/pkgs/development/libraries/haskell/repa-bytestring/default.nix
index b06072d798b..1d03f5c6458 100644
--- a/pkgs/development/libraries/haskell/repa-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/repa-bytestring/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Conversions between Repa Arrays and ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix
index 75d18daa635..18a8cb44bd6 100644
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ b/pkgs/development/libraries/haskell/repa-examples/default.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "Examples using the Repa array library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix
index e4eb113a435..0d4772016fb 100644
--- a/pkgs/development/libraries/haskell/repa-io/default.nix
+++ b/pkgs/development/libraries/haskell/repa-io/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Read and write Repa arrays in various formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index ffa75a9fd4f..5bb059a457c 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "High performance, regular, shape polymorphic parallel arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix
index bad1e93d6b9..2558f4fbd31 100644
--- a/pkgs/development/libraries/haskell/repr/default.nix
+++ b/pkgs/development/libraries/haskell/repr/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Render overloaded expressions to their textual representation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix
index 51952598f61..7ed81b8d986 100644
--- a/pkgs/development/libraries/haskell/resource-pool/default.nix
+++ b/pkgs/development/libraries/haskell/resource-pool/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "A high-performance striped resource pooling implementation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index 490908b6fa2..0525ee78e36 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "Deterministic allocation and freeing of scarce resources";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix
index 640faeb7d59..3f2f3915ddf 100755
--- a/pkgs/development/libraries/haskell/rvar/default.nix
+++ b/pkgs/development/libraries/haskell/rvar/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Random Variables";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix
index 067b7c4cf67..6c16af12107 100644
--- a/pkgs/development/libraries/haskell/safe/default.nix
+++ b/pkgs/development/libraries/haskell/safe/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Library for safe (pattern match free) functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index 71b9a6c6c47..6c070bc6d24 100755
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 semigroups";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix
index 875bbf45eb3..a4b410f4561 100644
--- a/pkgs/development/libraries/haskell/sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/sendfile/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A portable sendfile library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 4507fde8a43..d24529425d0 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Stick your haskell variables into css at compile time";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
index 72ee7216739..47749bf0565 100644
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A type-based approach to internationalization";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 314e4345685..eb8d029496b 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Stick your haskell variables into javascript/coffeescript at compile time";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index d40fee7155f..acf55d9d082 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Interpolation with quasi-quotation: put variables strings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index daf3dc22929..04305bbed22 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A toolkit for making compile-time interpolated templates";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index 256ac903dd7..3df9ac1a5e1 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Cross platform library for the sendfile system call";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 844e13c11dc..a1123c793f3 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix
index 2193b818868..1086a1929a8 100644
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/smallcheck/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A property-based testing library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index 3ae933f5087..21d95eca679 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -22,9 +22,6 @@ cabal.mkDerivation (self: {
     description = "Snap: A Haskell Web Framework (core interfaces and types)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index 040889ed1d7..028d8175861 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -21,9 +21,6 @@ cabal.mkDerivation (self: {
     description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix
index ab52a72f6ce..eca78fc90df 100644
--- a/pkgs/development/libraries/haskell/socks/default.nix
+++ b/pkgs/development/libraries/haskell/socks/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Socks proxy (version 5) implementation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/default.nix
index 604c4a0a0f2..271d695fa9b 100644
--- a/pkgs/development/libraries/haskell/split/default.nix
+++ b/pkgs/development/libraries/haskell/split/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Combinator library for splitting lists";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix
index b14fd6ebade..bc3913f6726 100644
--- a/pkgs/development/libraries/haskell/stateref/default.nix
+++ b/pkgs/development/libraries/haskell/stateref/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Abstraction for things that work like IORef";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix
index 97202c4ec60..d977fabb92c 100644
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ b/pkgs/development/libraries/haskell/statistics/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     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
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix
index 1521763f2bf..1b1f1ba705b 100644
--- a/pkgs/development/libraries/haskell/stb-image/default.nix
+++ b/pkgs/development/libraries/haskell/stb-image/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A wrapper around Sean Barrett's JPEG/PNG decoder";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
index 6184a324181..fe308211ebb 100644
--- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
index 8615f10be80..492fb6e3557 100644
--- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
+++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix
index 1174a9740e5..fc33a979adf 100644
--- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/stm/2.3.nix
index 7057ede7052..4057b1f7fb3 100644
--- a/pkgs/development/libraries/haskell/stm/2.3.nix
+++ b/pkgs/development/libraries/haskell/stm/2.3.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/storable-complex/default.nix b/pkgs/development/libraries/haskell/storable-complex/default.nix
index dc36d53f046..4450308a910 100644
--- a/pkgs/development/libraries/haskell/storable-complex/default.nix
+++ b/pkgs/development/libraries/haskell/storable-complex/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Storable instance for Complex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix
index 180f47939cc..61085b1c719 100644
--- a/pkgs/development/libraries/haskell/storable-record/default.nix
+++ b/pkgs/development/libraries/haskell/storable-record/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Elegant definition of Storable instances for records";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix
index fef81d92212..36080e9044e 100755
--- a/pkgs/development/libraries/haskell/streamproc/default.nix
+++ b/pkgs/development/libraries/haskell/streamproc/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Stream Processer Arrow";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/strict/default.nix b/pkgs/development/libraries/haskell/strict/default.nix
index 99239884b0a..61b34efbe45 100644
--- a/pkgs/development/libraries/haskell/strict/default.nix
+++ b/pkgs/development/libraries/haskell/strict/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Strict data types and String IO";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
index 083f3e06d5b..915fad7006a 100644
--- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix
+++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Strict concurrency abstractions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix
index 6d04dcf10db..03587d24d02 100644
--- a/pkgs/development/libraries/haskell/string-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/string-combinators/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Polymorphic functions to build and combine stringlike values";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix
index 9d1ae862ee1..6bacea99b59 100644
--- a/pkgs/development/libraries/haskell/svgcairo/default.nix
+++ b/pkgs/development/libraries/haskell/svgcairo/default.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "Binding to the libsvg-cairo library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.2.2.nix b/pkgs/development/libraries/haskell/syb/0.2.2.nix
index 070279fadfd..b03cb947d27 100644
--- a/pkgs/development/libraries/haskell/syb/0.2.2.nix
+++ b/pkgs/development/libraries/haskell/syb/0.2.2.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix
index 01cc80c883d..7caf5908a2d 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.3.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.3.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.5.nix b/pkgs/development/libraries/haskell/syb/0.3.5.nix
index f15911c08bd..b1264ecb437 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.5.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.5.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.nix b/pkgs/development/libraries/haskell/syb/0.3.6.nix
index a40b25cc1bc..6d9393f60c2 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.6.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.6.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix
index ddf16ad41e5..4b999a94416 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/default.nix b/pkgs/development/libraries/haskell/syb/default.nix
index a98cf1e2da6..65dd5e0e018 100644
--- a/pkgs/development/libraries/haskell/syb/default.nix
+++ b/pkgs/development/libraries/haskell/syb/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
index 2f3167ff628..0cf40a87d41 100644
--- a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
+++ b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate With Class Text instance";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
index 79b90feaa85..10f9f226f69 100644
--- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix
+++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate With Class";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
index 716bd99f43a..4176cf2f6e2 100644
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ b/pkgs/development/libraries/haskell/system-fileio/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Consistent filesystem interaction across GHC versions";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
index 6dc4d44ee96..d4ffbf82d2a 100644
--- a/pkgs/development/libraries/haskell/system-filepath/default.nix
+++ b/pkgs/development/libraries/haskell/system-filepath/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "High-level, byte-based file and directory path manipulations";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix
index a649ca04fec..ddfc4aac7d6 100644
--- a/pkgs/development/libraries/haskell/tabular/default.nix
+++ b/pkgs/development/libraries/haskell/tabular/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Two-dimensional data tables with rendering functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index 1f30245a320..07d671ac33d 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix
index a6fcea3c1c2..f6d2dd29dbf 100644
--- a/pkgs/development/libraries/haskell/tagsoup/default.nix
+++ b/pkgs/development/libraries/haskell/tagsoup/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix
index 72c90ab3dd2..99ce29b1991 100644
--- a/pkgs/development/libraries/haskell/temporary/default.nix
+++ b/pkgs/development/libraries/haskell/temporary/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix
index 66212bbe385..ea105935cea 100644
--- a/pkgs/development/libraries/haskell/terminfo/default.nix
+++ b/pkgs/development/libraries/haskell/terminfo/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Haskell bindings to the terminfo library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
index e280d497bee..42e2e448529 100644
--- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "HUnit support for the test-framework package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
index db70ec18a98..50a79401290 100644
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "QuickCheck support for the test-framework package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
index f011cc76ce5..34d5b6ae51f 100644
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "QuickCheck2 support for the test-framework package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix
index 0c16a9e9e24..64164c7f161 100644
--- a/pkgs/development/libraries/haskell/test-framework-th/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-th/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework/0.5.nix b/pkgs/development/libraries/haskell/test-framework/0.5.nix
index 6ac60c1df2d..d69bd131774 100644
--- a/pkgs/development/libraries/haskell/test-framework/0.5.nix
+++ b/pkgs/development/libraries/haskell/test-framework/0.5.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "Framework for running and organising tests, with HUnit and QuickCheck support";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework/0.6.nix b/pkgs/development/libraries/haskell/test-framework/0.6.nix
index 12238fc199e..94054894568 100644
--- a/pkgs/development/libraries/haskell/test-framework/0.6.nix
+++ b/pkgs/development/libraries/haskell/test-framework/0.6.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "Framework for running and organising tests, with HUnit and QuickCheck support";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/testpack/default.nix b/pkgs/development/libraries/haskell/testpack/default.nix
index bb729ef3120..a308594060f 100644
--- a/pkgs/development/libraries/haskell/testpack/default.nix
+++ b/pkgs/development/libraries/haskell/testpack/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Test Utililty Pack for HUnit and QuickCheck";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/texmath/0.4.nix b/pkgs/development/libraries/haskell/texmath/0.4.nix
index a59120015dd..9d9a4f07586 100644
--- a/pkgs/development/libraries/haskell/texmath/0.4.nix
+++ b/pkgs/development/libraries/haskell/texmath/0.4.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Conversion of LaTeX math formulas to MathML";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 7bd8217b434..7391896817d 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Conversion of LaTeX math formulas to MathML or OMML";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix
index b997c60868b..0b415d28aea 100644
--- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix
index 5c593235dee..354621fd5cd 100644
--- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.0.6.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.1.12.nix b/pkgs/development/libraries/haskell/text/0.11.1.12.nix
index 805c96d2af0..e860e1c61a1 100644
--- a/pkgs/development/libraries/haskell/text/0.11.1.12.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.1.12.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.1.13.nix b/pkgs/development/libraries/haskell/text/0.11.1.13.nix
index 9576e1806e1..edf109a79cf 100644
--- a/pkgs/development/libraries/haskell/text/0.11.1.13.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.1.13.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix
index db438a54bc2..3f4132a87a2 100644
--- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix
index 9a5f4a32cda..be78bbaef31 100644
--- a/pkgs/development/libraries/haskell/th-extras/default.nix
+++ b/pkgs/development/libraries/haskell/th-extras/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A grab bag of useful functions for use with Template Haskell";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix
index aa7b5224de6..b8a118b56a6 100644
--- a/pkgs/development/libraries/haskell/th-lift/default.nix
+++ b/pkgs/development/libraries/haskell/th-lift/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Derive Template Haskell's Lift class for datatypes";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix
index d4108f0a012..aa848e4aa08 100644
--- a/pkgs/development/libraries/haskell/thespian/default.nix
+++ b/pkgs/development/libraries/haskell/thespian/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Lightweight Erlang-style actors for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix
index d7f5a70bc34..776a2422265 100644
--- a/pkgs/development/libraries/haskell/threadmanager/default.nix
+++ b/pkgs/development/libraries/haskell/threadmanager/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Simple thread management";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix
index 7ced3956a8a..56072676b67 100644
--- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix
+++ b/pkgs/development/libraries/haskell/time/1.1.2.4.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A time library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/time/1.1.3.nix b/pkgs/development/libraries/haskell/time/1.1.3.nix
index c8a7fe12985..55c52e8a73c 100644
--- a/pkgs/development/libraries/haskell/time/1.1.3.nix
+++ b/pkgs/development/libraries/haskell/time/1.1.3.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A time library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/time/1.2.0.3.nix b/pkgs/development/libraries/haskell/time/1.2.0.3.nix
index 23cec7ab90f..23c07f9dd23 100644
--- a/pkgs/development/libraries/haskell/time/1.2.0.3.nix
+++ b/pkgs/development/libraries/haskell/time/1.2.0.3.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A time library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/time/1.2.0.5.nix b/pkgs/development/libraries/haskell/time/1.2.0.5.nix
index 78fed9b5754..9d059245d7b 100644
--- a/pkgs/development/libraries/haskell/time/1.2.0.5.nix
+++ b/pkgs/development/libraries/haskell/time/1.2.0.5.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A time library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/time/1.4.0.1.nix b/pkgs/development/libraries/haskell/time/1.4.0.1.nix
index 8d9f810f724..107c7cee037 100644
--- a/pkgs/development/libraries/haskell/time/1.4.0.1.nix
+++ b/pkgs/development/libraries/haskell/time/1.4.0.1.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A time library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index 278ca4bc1b8..5a58a2002b1 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "TLS extra default values and helpers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 55626e3bae1..31b261c920c 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     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
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix
index 951458eb4eb..e323905f81b 100644
--- a/pkgs/development/libraries/haskell/transformers-base/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-base/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Lift computations from the bottom of a transformer stack";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
index f38605c17ad..6d2e374687f 100644
--- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
+++ b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Concrete functor and monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
index 50675d901ec..ec1b85248d9 100644
--- a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
+++ b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Concrete functor and monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix
index fa06558fc0d..90441f31867 100644
--- a/pkgs/development/libraries/haskell/tuple/default.nix
+++ b/pkgs/development/libraries/haskell/tuple/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Various functions on tuples";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix
index 922f7bbd62f..f660ea6193a 100644
--- a/pkgs/development/libraries/haskell/type-equality/default.nix
+++ b/pkgs/development/libraries/haskell/type-equality/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Type equality, coercion/cast and other operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
index 228e2c43f1f..8525b027049 100644
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Generic support for programming with names and binders";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix
index 1e5aea854fc..909b7f7659e 100644
--- a/pkgs/development/libraries/haskell/uniplate/default.nix
+++ b/pkgs/development/libraries/haskell/uniplate/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Help writing simple, concise and fast generic operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix
index d717bd27871..399ac02e3ce 100644
--- a/pkgs/development/libraries/haskell/uniqueid/default.nix
+++ b/pkgs/development/libraries/haskell/uniqueid/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Splittable Unique Identifier Supply";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix
index 83b670ee2c2..85e6bb81533 100644
--- a/pkgs/development/libraries/haskell/unix-compat/default.nix
+++ b/pkgs/development/libraries/haskell/unix-compat/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Portable POSIX-compatibility layer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix
index 8682fcd2f6a..21ec0c92b06 100644
--- a/pkgs/development/libraries/haskell/unordered-containers/default.nix
+++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Efficient hashing-based container types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix
index e4726ef011d..5353895815d 100644
--- a/pkgs/development/libraries/haskell/url/default.nix
+++ b/pkgs/development/libraries/haskell/url/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A library for working with URLs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix
index 59ebfe3b5e6..42591158cd7 100644
--- a/pkgs/development/libraries/haskell/utf8-light/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-light/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Unicode";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix
index 0928ae0347b..e627c77bda2 100644
--- a/pkgs/development/libraries/haskell/utf8-string/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-string/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Support for reading and writing UTF8 Strings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix
index 9a90eb5dd9f..93b4cc1480e 100644
--- a/pkgs/development/libraries/haskell/utility-ht/default.nix
+++ b/pkgs/development/libraries/haskell/utility-ht/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
index ed6701976dd..8e2ad732aa2 100644
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, idiomatic parser combinators";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix
index 38e9d27f1f0..991f3808098 100644
--- a/pkgs/development/libraries/haskell/uulib/default.nix
+++ b/pkgs/development/libraries/haskell/uulib/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Haskell Utrecht Tools Library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
index ccabd8cc7fa..5ab1d4f8546 100644
--- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
index 1b5b5d540fd..764a55402e7 100644
--- a/pkgs/development/libraries/haskell/vacuum/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Extract graph representations of ghc heap values";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix
index 2781de9ebe6..707b217babb 100644
--- a/pkgs/development/libraries/haskell/vault/default.nix
+++ b/pkgs/development/libraries/haskell/vault/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "a typed, persistent store for values of arbitrary types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
index 6988cae0276..f98cc09918a 100644
--- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Efficient algorithms for vector arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix
index b9ba9bae525..c3e6c45482f 100644
--- a/pkgs/development/libraries/haskell/vector-space/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Vector & affine spaces, linear maps, and derivatives";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector/default.nix b/pkgs/development/libraries/haskell/vector/default.nix
index c5c06fe93e5..63add64226d 100644
--- a/pkgs/development/libraries/haskell/vector/default.nix
+++ b/pkgs/development/libraries/haskell/vector/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Efficient Arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix
index 209eb667c77..39126b2c7fa 100644
--- a/pkgs/development/libraries/haskell/vty/default.nix
+++ b/pkgs/development/libraries/haskell/vty/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "A simple terminal access library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 79baedeb239..0f181935cef 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "WAI application for static serving";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 734e8a6fe1c..077fd7ae24f 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "Provides some basic WAI handlers and middleware";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix
index 83b43004bc0..d943e2495e6 100644
--- a/pkgs/development/libraries/haskell/wai-logger/default.nix
+++ b/pkgs/development/libraries/haskell/wai-logger/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "A logging system for WAI";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index 4fb6227d2e8..e08981e9c9c 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "Web Application Interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 03dee23b78b..45632743e67 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "A fast, light-weight web server for WAI applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
index 5833af8efaa..0db3ef08060 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "A Wadler/Leijen Pretty Printer for Text values";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
index 450597c22e1..6a7a10e0102 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "wxHaskell";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index 889bc595d9d..ab90f6a1ebe 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "wxHaskell core";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
index b2df725223d..f6f487633a1 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "helper tool for building wxHaskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix
index 3c369103486..605339d0811 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "An XHTML combinator library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix
index 33527b9affd..3a72cb8fba0 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "An XHTML combinator library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
index c5a374eb2d0..05e13b4a7b3 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "An XHTML combinator library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 8c654ca9046..16d142ea955 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "Pure-Haskell utilities for dealing with XML with the conduit package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix
index 721d49dc588..bad66b19e3d 100644
--- a/pkgs/development/libraries/haskell/xml-types/default.nix
+++ b/pkgs/development/libraries/haskell/xml-types/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Basic types for representing XML";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix
index 8a8e6e3e2ad..dc2e7dc70bd 100644
--- a/pkgs/development/libraries/haskell/xml/default.nix
+++ b/pkgs/development/libraries/haskell/xml/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "A simple XML library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index aa74f72ba3e..6df83a35723 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "sanitize untrusted HTML to prevent XSS attacks";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 4256705fe24..0f41c7ace7b 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Low-level binding to the libyaml C library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix
index 62dc82b1068..ab162988c95 100644
--- a/pkgs/development/libraries/haskell/yap/default.nix
+++ b/pkgs/development/libraries/haskell/yap/default.nix
@@ -8,9 +8,6 @@ cabal.mkDerivation (self: {
     description = "yet another prelude - a simplistic refactoring with algebraic classes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 4cb1bb336ee..f656c17ffd1 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -20,9 +20,6 @@ cabal.mkDerivation (self: {
     description = "Authentication for Yesod";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index b137ad744bc..25dc59952c7 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -23,9 +23,6 @@ cabal.mkDerivation (self: {
     description = "Creation of type-safe, RESTful web applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix
index fb89b511504..f839b5a16db 100644
--- a/pkgs/development/libraries/haskell/yesod-default/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-default/default.nix
@@ -15,9 +15,6 @@ cabal.mkDerivation (self: {
     description = "Default config and main functions for your yesod application";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 663a14f7e77..8be3b65b93f 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "Form handling support for Yesod Web Framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
index 66c31e868d6..25a4ba34f16 100644
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "Generate content for Yesod using the aeson package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
index 11a85b9cf8e..b50e34df8b3 100644
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Some helpers for using Persistent from Yesod";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix
index c93b5e1db8c..78781dc3f74 100644
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Efficient routing for Yesod";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 815932e6248..dc065b572b2 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "Static file serving subsite for Yesod Web Framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 2222699c9dd..f9320acc6e7 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -23,9 +23,6 @@ cabal.mkDerivation (self: {
     description = "Creation of type-safe, RESTful web applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix
index f5df012fde4..6a94987ba91 100644
--- a/pkgs/development/libraries/haskell/yst/default.nix
+++ b/pkgs/development/libraries/haskell/yst/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "Builds a static website from templates and data in YAML or CSV files";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
index 8f09178a7c2..f5166f0f1f0 100644
--- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Bindings to ZeroMQ 2.1.x";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix
index 865c545b783..a7029cc953e 100644
--- a/pkgs/development/libraries/haskell/zip-archive/default.nix
+++ b/pkgs/development/libraries/haskell/zip-archive/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Library for creating and modifying zip archives";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix
index c36def2683c..bf27fa78162 100644
--- a/pkgs/development/libraries/haskell/zipper/default.nix
+++ b/pkgs/development/libraries/haskell/zipper/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Generic zipper for families of recursive datatypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix b/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix
index a2240ca327c..ba2a14a23d0 100644
--- a/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix
+++ b/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Low-level bindings to the zlib package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix b/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix
index 783de42cf8c..a396a3eaa4d 100644
--- a/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix
+++ b/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Low-level bindings to the zlib package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
index 1b8d40efe28..260ef687edb 100644
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Streaming compression/decompression via conduits";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix
index 3e99ed8d5c9..9ee7063317f 100644
--- a/pkgs/development/libraries/haskell/zlib-enum/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Enumerator interface for zlib compression";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix
index 60f81e7f984..28f109e8c36 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Compression and decompression in the gzip and zlib formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
index 5ec59a9690f..6a917af1fe7 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Compression and decompression in the gzip and zlib formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix
index f4355c0a954..f13b9f7b1d4 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Compression and decompression in the gzip and zlib formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
index 909754db3e7..a151a45c0e7 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Compression and decompression in the gzip and zlib formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix
index a1510f58f7e..5c608c440aa 100644
--- a/pkgs/development/tools/documentation/haddock/2.10.0.nix
+++ b/pkgs/development/tools/documentation/haddock/2.10.0.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     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
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix
index 35299f2901a..dd7b9de9725 100644
--- a/pkgs/development/tools/documentation/haddock/2.4.2.nix
+++ b/pkgs/development/tools/documentation/haddock/2.4.2.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     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
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix
index 1303473f807..15ed35f5758 100644
--- a/pkgs/development/tools/documentation/haddock/2.9.4.nix
+++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     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
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix
index 4f2e4b0968b..e19a452e7ef 100644
--- a/pkgs/development/tools/haskell/BNFC-meta/default.nix
+++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Deriving Quasi-Quoters from BNF Grammars";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
index cd36d5f58e9..88f5d0baee6 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "the Haskell Refactorer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix
index cb476d561f4..80714727741 100644
--- a/pkgs/development/tools/haskell/SourceGraph/default.nix
+++ b/pkgs/development/tools/haskell/SourceGraph/default.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "Static code analysis using graph-theoretic techniques";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix
index f9c700824cb..ca82ef1e580 100644
--- a/pkgs/development/tools/haskell/alex-meta/default.nix
+++ b/pkgs/development/tools/haskell/alex-meta/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Quasi-quoter for Alex lexers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix
index c48a6d6a61d..4676850fd93 100644
--- a/pkgs/development/tools/haskell/cabal-ghci/default.nix
+++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Set up ghci with options taken from a .cabal file";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix
index a57ff5f6b88..5ffc3edbb37 100644
--- a/pkgs/development/tools/haskell/happy-meta/default.nix
+++ b/pkgs/development/tools/haskell/happy-meta/default.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Quasi-quoter for Happy parsers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/haskdogs/default.nix b/pkgs/development/tools/haskell/haskdogs/default.nix
index 2e158abaf89..d67fb302d31 100644
--- a/pkgs/development/tools/haskell/haskdogs/default.nix
+++ b/pkgs/development/tools/haskell/haskdogs/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Generate ctags file for haskell project directory and it's deps";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix
index d3c373ae4df..f1e1f639e80 100644
--- a/pkgs/development/tools/haskell/hasktags/default.nix
+++ b/pkgs/development/tools/haskell/hasktags/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 0e5b1ae7aa0..0b5d53c3efa 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "Source code suggestions";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix
index 78863fab185..b181f164ed9 100644
--- a/pkgs/development/tools/haskell/hslogger/default.nix
+++ b/pkgs/development/tools/haskell/hslogger/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Versatile logging framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/tar/0.3.2.0.nix b/pkgs/development/tools/haskell/tar/0.3.2.0.nix
index ec1ea4f4226..15bb647b542 100644
--- a/pkgs/development/tools/haskell/tar/0.3.2.0.nix
+++ b/pkgs/development/tools/haskell/tar/0.3.2.0.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Reading, writing and manipulating \".tar\" archive files.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/tar/0.4.0.0.nix b/pkgs/development/tools/haskell/tar/0.4.0.0.nix
index bc259cf5acf..7f6b70a52e6 100644
--- a/pkgs/development/tools/haskell/tar/0.4.0.0.nix
+++ b/pkgs/development/tools/haskell/tar/0.4.0.0.nix
@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
     description = "Reading, writing and manipulating \".tar\" archive files.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix
index e6cf8347243..f0d80e84c5a 100644
--- a/pkgs/development/tools/haskell/threadscope/default.nix
+++ b/pkgs/development/tools/haskell/threadscope/default.nix
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     description = "A graphical tool for profiling parallel Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix
index 749fbb6978d..d24d22f350a 100644
--- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix
+++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Attribute Grammar System of Universiteit Utrecht";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix
index 91899c94638..24eded529b3 100644
--- a/pkgs/development/tools/haskell/uuagc/cabal.nix
+++ b/pkgs/development/tools/haskell/uuagc/cabal.nix
@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
     description = "Cabal plugin for the Universiteit Utrecht Attribute Grammar System";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index 158d48689f6..833189b89ac 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     description = "Attribute Grammar System of Universiteit Utrecht";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 7dd3cf61a82..fe20037cb95 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "A liberalised re-implementation of cpp, the C pre-processor";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix
index fd239d580bf..e1d77561eb1 100644
--- a/pkgs/development/tools/parsing/alex/2.3.1.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.1.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Alex is a tool for generating lexical analysers in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix
index d3a4778f3f3..5a79036b082 100644
--- a/pkgs/development/tools/parsing/alex/2.3.2.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.2.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Alex is a tool for generating lexical analysers in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix
index c9e7671c944..b0b40fecbed 100644
--- a/pkgs/development/tools/parsing/alex/2.3.3.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.3.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Alex is a tool for generating lexical analysers in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix
index db676a90684..cda27316792 100644
--- a/pkgs/development/tools/parsing/alex/2.3.5.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.5.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "Alex is a tool for generating lexical analysers in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix
index 6725fed5279..85e0474b745 100644
--- a/pkgs/development/tools/parsing/alex/3.0.1.nix
+++ b/pkgs/development/tools/parsing/alex/3.0.1.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "Alex is a tool for generating lexical analysers in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix
index cc5c60a3d43..401c4d1475c 100644
--- a/pkgs/development/tools/parsing/happy/1.18.4.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.4.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     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
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix
index 41532651c99..d64d8983e9c 100644
--- a/pkgs/development/tools/parsing/happy/1.18.5.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.5.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     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
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix
index 60b8d253659..fdc483fe571 100644
--- a/pkgs/development/tools/parsing/happy/1.18.6.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.6.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     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
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix
index b1ba0b165dd..decc992809a 100644
--- a/pkgs/development/tools/parsing/happy/1.18.8.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.8.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     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
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix
index cb47eaa8bdb..b1f752ae35f 100644
--- a/pkgs/development/tools/parsing/happy/1.18.9.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.9.nix
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     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
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index dc82a1a000a..197a830c2a1 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "A roguelike game engine in early and very active development";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/games/MazesOfMonad/default.nix b/pkgs/games/MazesOfMonad/default.nix
index 92c7a17d7d9..0e2abf6d7c7 100644
--- a/pkgs/games/MazesOfMonad/default.nix
+++ b/pkgs/games/MazesOfMonad/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
     description = "Console-based Role Playing Game";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/tools/package-management/cabal-install/0.10.2.nix b/pkgs/tools/package-management/cabal-install/0.10.2.nix
index 16853cab7fc..e97c9be9702 100644
--- a/pkgs/tools/package-management/cabal-install/0.10.2.nix
+++ b/pkgs/tools/package-management/cabal-install/0.10.2.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "The command-line interface for Cabal and Hackage";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/tools/package-management/cabal-install/0.6.2.nix b/pkgs/tools/package-management/cabal-install/0.6.2.nix
index 140c3628405..f98aa8c306d 100644
--- a/pkgs/tools/package-management/cabal-install/0.6.2.nix
+++ b/pkgs/tools/package-management/cabal-install/0.6.2.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "The command-line interface for Cabal and Hackage";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/tools/package-management/cabal-install/0.8.0.nix b/pkgs/tools/package-management/cabal-install/0.8.0.nix
index ed84d069d10..c0ea0752d13 100644
--- a/pkgs/tools/package-management/cabal-install/0.8.0.nix
+++ b/pkgs/tools/package-management/cabal-install/0.8.0.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "The command-line interface for Cabal and Hackage";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/tools/package-management/cabal-install/0.8.2.nix b/pkgs/tools/package-management/cabal-install/0.8.2.nix
index a53460b6319..4b00985297f 100644
--- a/pkgs/tools/package-management/cabal-install/0.8.2.nix
+++ b/pkgs/tools/package-management/cabal-install/0.8.2.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "The command-line interface for Cabal and Hackage";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

From 1aa8a93bf617d856e71b4d991c8d5531eb44932a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 Mar 2012 10:21:43 +0000
Subject: [PATCH 161/208] pkgs/lib/maintainers.nix: re-enabled my e-mail
 account for Hydra notifications

svn path=/nixpkgs/trunk/; revision=33393
---
 pkgs/lib/maintainers.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 9df7da673c9..d4c08515545 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -26,8 +26,7 @@
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   shlevy = "Shea Levy <shea@shealevy.com>";
-  simons = "";
-  # simons = "Peter Simons <simons@cryp.to>";
+  simons = "Peter Simons <simons@cryp.to>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
   viric = "Lluís Batlle i Rossell <viric@viric.name>";

From 6b0f1dab5c63b00c9d5b1a609c96703f5d66eb69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 Mar 2012 10:21:48 +0000
Subject: [PATCH 162/208] Updated Haskell packages.

 - LambdaHack: updated to version 0.2.1
 - OpenAL: updated to version 1.4.0.1
 - cabal2nix: updated to version 1.29
 - unbound: updated to version 0.4.0.1

svn path=/nixpkgs/trunk/; revision=33394
---
 pkgs/development/libraries/haskell/OpenAL/default.nix  | 4 ++--
 pkgs/development/libraries/haskell/unbound/default.nix | 5 ++---
 pkgs/development/tools/haskell/cabal2nix/default.nix   | 4 ++--
 pkgs/games/LambdaHack/default.nix                      | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix
index 155e19ec50e..206e78eb728 100644
--- a/pkgs/development/libraries/haskell/OpenAL/default.nix
+++ b/pkgs/development/libraries/haskell/OpenAL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "OpenAL";
-  version = "1.4.0.0";
-  sha256 = "1vn9r8fd4zwqm8a9d8bgvi9vs1lmygn8sw1rlv819b5wmjwz3ms2";
+  version = "1.4.0.1";
+  sha256 = "180f84sjakhd1b8h5n3l92by2wmic20n6ax0z5fi3fvk9w73khyv";
   buildDepends = [ ObjectName StateVar Tensor ];
   extraLibraries = [ openal ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
index 8525b027049..1a186b4a508 100644
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "unbound";
-  version = "0.4";
-  sha256 = "0s4aybbxz5qvkf09wn65qavw10hk0rsyyc2d0ydr02rzz10vd270";
+  version = "0.4.0.1";
+  sha256 = "0zb029wji85b643iqf4cnkd9d68accrjxnk8422xs82zik2kn6zf";
   buildDepends = [ mtl RepLib transformers ];
-  noHaddock = true;
   meta = {
     homepage = "http://code.google.com/p/replib/";
     description = "Generic support for programming with names and binders";
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 83909d0ff80..f00c45ee33b 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.28";
-  sha256 = "04996v4b0767qzyi2g42anl30h1abaip77hvdj6hhfrvyrgdfsaw";
+  version = "1.29";
+  sha256 = "1gqrl8085i7g64q085knjawqb3ynk13swrmry077ygw42hpvp2wg";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index 197a830c2a1..f7375172f06 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "LambdaHack";
-  version = "0.2.0";
-  sha256 = "09lgbpwrlw29n797q3k5aafvkg04nd8cw6pi41g914phf7lxzq4c";
+  version = "0.2.1";
+  sha256 = "1d2mnpy8fl9m5584rbskgary18mqibivwmlz9gfv87gg0lzhw2ab";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary ConfigFile filepath gtk mtl random zlib ];

From a3051025899be7d51a9275464fa19c0eda2ba356 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 24 Mar 2012 13:22:14 +0000
Subject: [PATCH 163/208] Adding Petri-Foo, a fork of the Specimen sampler
 project

svn path=/nixpkgs/trunk/; revision=33395
---
 pkgs/applications/audio/petrifoo/default.nix | 29 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/audio/petrifoo/default.nix

diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix
new file mode 100644
index 00000000000..2e53a22bff3
--- /dev/null
+++ b/pkgs/applications/audio/petrifoo/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, alsaLib, cmake, gtk, jackaudio, libgnomecanvas
+, libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
+, pkgconfig }:
+
+stdenv.mkDerivation  rec {
+  name = "petri-foo";
+
+  src = fetchgit {
+    url = https://github.com/licnep/Petri-Foo.git;
+    rev = "eef3b6efebe842d2fa18ed32b881fea4562b84e0";
+    sha256 = "a20c3f1a633500a65c099c528c7dc2405daa60738b64d881bb8f2036ae59913c";
+  };
+
+  buildInputs =
+   [ alsaLib cmake  gtk jackaudio libgnomecanvas libpthreadstubs
+     libsamplerate libsndfile libtool libxml2 pkgconfig
+   ];
+
+  dontUseCmakeBuildDir=true;
+
+  meta = with stdenv.lib; {
+    description = "MIDI controllable audio sampler";
+    longDescription = "a fork of Specimen";
+    homepage = http://petri-foo.sourceforge.net;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6891b36567..2ee5bb3e200 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7144,6 +7144,10 @@ let
 
   paraview = callPackage ../applications/graphics/paraview { };
 
+  petrifoo = callPackage ../applications/audio/petrifoo {
+    inherit (gnome) libgnomecanvas;
+  };
+
   pdftk = callPackage ../tools/typesetting/pdftk { };
 
   pidgin = callPackage ../applications/networking/instant-messengers/pidgin {

From 32df0f365e2501042ad13166a687760446052ef6 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 24 Mar 2012 18:08:34 +0000
Subject: [PATCH 164/208] Removing the obsolete specimen folder (replaced by
 petrifoo)

svn path=/nixpkgs/trunk/; revision=33396

From d2d41e9b78a8e9b67c52b00dc604929e00ada483 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 24 Mar 2012 18:59:26 +0000
Subject: [PATCH 165/208] Adding mhwaveedit, a sample editor

svn path=/nixpkgs/trunk/; revision=33397
---
 .../applications/audio/mhwaveedit/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/audio/mhwaveedit/default.nix

diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix
new file mode 100644
index 00000000000..8f8fadb02e4
--- /dev/null
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, SDL , alsaLib, gtk, jackaudio, ladspaH
+, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }:
+
+stdenv.mkDerivation  rec {
+  name = "mhwaveedit-${version}";
+  version = "1.4.21";
+
+  src = fetchurl {
+    url = "http://download.gna.org/mhwaveedit/${name}.tar.bz2";
+    sha256 = "0jl7gvhwsz4fcn5d146h4m6i3hlxdsw4mmj280cv9g70p6zqi1w7";
+  };
+
+  buildInputs =
+   [ SDL alsaLib gtk jackaudio ladspaH libsamplerate libsndfile
+     pkgconfig pulseaudio
+   ];
+
+  configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa";
+
+  meta = with stdenv.lib; {
+    description = "graphical program for editing, playing and recording sound files";
+    homepage = https://gna.org/projects/mhwaveedit;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ee5bb3e200..901214e3b1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6992,6 +6992,8 @@ let
     qt = qt47;
   };
 
+  mhwaveedit = callPackage ../applications/audio/mhwaveedit {};
+
   midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
     inherit imagemagick intltool python pkgconfig webkit libxml2
       which gettext makeWrapper file libidn sqlite docutils libnotify

From 9810e6110f936466ea43d039277a87cdceca19df Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 24 Mar 2012 19:52:46 +0000
Subject: [PATCH 166/208] Upgrading to 2.0.1, bugfix for smb error. Thanks to
 Kirill Elagin

svn path=/nixpkgs/trunk/; revision=33398
---
 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 bb78773e729..00459a2d484 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.0.0";
+  version = "2.0.1";
 
   src = fetchurl {
     url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
-    sha256 = "455fc04b5f7ce3d7294ed71a9dd172ff4eb97875cfc30b554ef4ce55ec6f5106";
+    sha256 = "7f485725c17487a77d70844cbd9acf528360d65cd6ff79d206657920f4fcbf4b";
   };
 
   buildInputs =

From 797c0f86faf6829f15d1e0abd212c1910304d057 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Sat, 24 Mar 2012 22:59:08 +0000
Subject: [PATCH 167/208] Recovered OCaml 3.11 by using version 3.11.2 and a
 patch from ocaml's bugtracker.

svn path=/nixpkgs/trunk/; revision=33399
---
 pkgs/development/compilers/ocaml/3.11.2.nix | 71 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  3 +
 2 files changed, 74 insertions(+)
 create mode 100644 pkgs/development/compilers/ocaml/3.11.2.nix

diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix
new file mode 100644
index 00000000000..9c0b3d1d192
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/3.11.2.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchurl, ncurses, x11 }:
+
+let
+   useX11 = stdenv.isi686 || stdenv.isx86_64;
+   useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips;
+   inherit (stdenv.lib) optionals optionalString;
+in
+
+stdenv.mkDerivation rec {
+  
+  name = "ocaml-3.11.2";
+  
+  src = fetchurl {
+    url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2";
+    sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
+  };
+
+  # Needed to avoid a SIGBUS on the final executable on mips
+  NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else "";
+
+  patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ] ++
+    [ (fetchurl {
+        name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch";
+        url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug";
+	sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
+      })
+    ];
+
+  prefixKey = "-prefix ";
+  configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
+  buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
+  buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
+  installTargets = "install" + optionalString useNativeCompilers " installopt";
+  prePatch = ''
+    CAT=$(type -tp cat)
+    sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
+    patch -p0 < ${./mips64.patch}
+  '';
+  postBuild = ''
+    ensureDir $out/include
+    ln -sv $out/lib/ocaml/caml $out/include/caml
+  '';
+
+  meta = {
+    homepage = http://caml.inria.fr/ocaml;
+    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    description = "Objective Caml, the most popular variant of the Caml language";
+
+    longDescription =
+      '' Objective Caml is the most popular variant of the Caml language.
+         From a language standpoint, it extends the core Caml language with a
+         fully-fledged object-oriented layer, as well as a powerful module
+         system, all connected by a sound, polymorphic type system featuring
+         type inference.
+
+         The Objective Caml system is an industrial-strength implementation
+         of this language, featuring a high-performance native-code compiler
+         (ocamlopt) for 9 processor architectures (IA32, PowerPC, AMD64,
+         Alpha, Sparc, Mips, IA64, HPPA, StrongArm), as well as a bytecode
+         compiler (ocamlc) and an interactive read-eval-print loop (ocaml)
+         for quick development and portability.  The Objective Caml
+         distribution includes a comprehensive standard library, a replay
+         debugger (ocamldebug), lexer (ocamllex) and parser (ocamlyacc)
+         generators, a pre-processor pretty-printer (camlp4) and a
+         documentation generator (ocamldoc).
+       '';
+
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 901214e3b1b..a1c716fb95f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2382,6 +2382,8 @@ let
 
   ocaml_3_10_0 = callPackage ../development/compilers/ocaml/3.10.0.nix { };
 
+  ocaml_3_11_2 = callPackage ../development/compilers/ocaml/3.11.2.nix { };
+
   ocaml_3_12_1 = callPackage ../development/compilers/ocaml/3.12.1.nix { };
 
   metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
@@ -2477,6 +2479,7 @@ let
 
   ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1;
   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;
 
   ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };

From 2ccec99d8c9bf788af188262d678203a25ee9b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 25 Mar 2012 11:27:13 +0000
Subject: [PATCH 168/208] Making webkit build further. They want an older perl.

svn path=/nixpkgs/trunk/; revision=33401
---
 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 a1c716fb95f..a4fc579e020 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4742,13 +4742,14 @@ let
       inherit gtk atk pango glib;
       inherit freetype fontconfig gettext gperf curl
         libjpeg libtiff libxml2 libxslt sqlite
-        icu cairo perl intltool automake libtool
+        icu cairo intltool automake libtool
         pkgconfig autoconf bison libproxy enchant
         python ruby which flex geoclue;
       inherit gstreamer gst_plugins_base gst_ffmpeg
         gst_plugins_good;
       inherit (xlibs) libXt renderproto libXrender;
       libpng = libpng12;
+      perl = perl510;
     };
 
   webkitSVN =

From e4443dfc8dae3c676cc40baf825dbad6491a45d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 25 Mar 2012 11:39:43 +0000
Subject: [PATCH 169/208] Telling hydra to build vimprobable.

svn path=/nixpkgs/trunk/; revision=33402
---
 pkgs/applications/networking/browsers/vimprobable2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 924139dc32e..b537d4f16d0 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation {
     homepage = "http://sourceforge.net/apps/trac/vimprobable";
     license = "MIT";
     maintainers = ["Alexander Foremny <alexanderforemny@googlemail.com>"];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
-

From b1952ce5876a8f419d7a41cabc42891e005d6b95 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Sun, 25 Mar 2012 13:50:39 +0000
Subject: [PATCH 170/208] desktops/e17: Updated.

svn path=/nixpkgs/trunk/; revision=33404
---
 pkgs/desktops/e17/e_dbus/default.nix |  6 +++---
 pkgs/desktops/e17/ecore/d.nix        | 18 ------------------
 pkgs/desktops/e17/ecore/default.nix  |  6 +++---
 pkgs/desktops/e17/edje/default.nix   |  6 +++---
 pkgs/desktops/e17/eet/default.nix    |  6 +++---
 pkgs/desktops/e17/eeze/default.nix   |  6 +++---
 pkgs/desktops/e17/efreet/default.nix |  6 +++---
 pkgs/desktops/e17/eina/default.nix   |  6 +++---
 pkgs/desktops/e17/embryo/default.nix |  6 +++---
 pkgs/desktops/e17/evas/default.nix   |  6 +++---
 10 files changed, 27 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/desktops/e17/ecore/d.nix

diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix
index 7c078eee0ee..1b3ba2c7256 100644
--- a/pkgs/desktops/e17/e_dbus/default.nix
+++ b/pkgs/desktops/e17/e_dbus/default.nix
@@ -2,10 +2,10 @@
 , dbus_libs }:
 stdenv.mkDerivation rec {
   name = "e_dbus-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
   src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "10y68f023jjq6dinjc0brpr41acnd7clxgb0q1j2i9isalx1473z";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1kky76v7yydsjihgi1hbwpyqhdmbxmxj2dw4p7kiqbl67dmsjhxg";
   };
   buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ];
   propagatedBuildInputs = [ dbus_libs ];
diff --git a/pkgs/desktops/e17/ecore/d.nix b/pkgs/desktops/e17/ecore/d.nix
deleted file mode 100644
index 73b318c4cde..00000000000
--- a/pkgs/desktops/e17/ecore/d.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, eina, evas, xproto, libX11, libXext }:
-stdenv.mkDerivation rec {
-  name = "ecore-${version}";
-  version = "1.0.1";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1vi03zxnsdnrjv1rh5r3v0si0b20ikrfb8hf5374i2sqvi1g65j0";
-  };
-  buildInputs = [ pkgconfig eina evas xproto ];
-  propagatedBuildInputs = [ libX11 libXext ];
-  meta = {
-    description = "";
-    longDescription = ''
-    '';
-    homepage = http://enlightenment.org/;
-    license = "BSD-style???";
-  };
-}
diff --git a/pkgs/desktops/e17/ecore/default.nix b/pkgs/desktops/e17/ecore/default.nix
index 010a8022fca..47e9e05fd65 100644
--- a/pkgs/desktops/e17/ecore/default.nix
+++ b/pkgs/desktops/e17/ecore/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }:
 stdenv.mkDerivation rec {
   name = "ecore-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
   src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "12iqhrklp3k5lvbxf7lhqd53wpl1csvricfkzlcv2nny4y3r31m0";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1fq3prr2i9n14jppfpns3dg1mkk3iy0ijv2d47pm4krymd7l4hs4";
   };
   buildInputs = [ pkgconfig eina evas ];
   propagatedBuildInputs = [ libX11 libXext ];
diff --git a/pkgs/desktops/e17/edje/default.nix b/pkgs/desktops/e17/edje/default.nix
index 6c9e58c65fd..b48794e147e 100644
--- a/pkgs/desktops/e17/edje/default.nix
+++ b/pkgs/desktops/e17/edje/default.nix
@@ -2,10 +2,10 @@
 , ecore, embryo }:
 stdenv.mkDerivation rec {
   name = "edje-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
   src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0fjn4psl70hkfbjmczk06if8yxarg67w5hp2i1vq49kfkpyn2cx7";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "15vh0plb9gb75q0lgbqv4kjz0pyhbfxk39x3inzn87ih567z73xx";
   };
   buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ];
   meta = {
diff --git a/pkgs/desktops/e17/eet/default.nix b/pkgs/desktops/e17/eet/default.nix
index 98cdca08179..6ac119161c5 100644
--- a/pkgs/desktops/e17/eet/default.nix
+++ b/pkgs/desktops/e17/eet/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }:
 stdenv.mkDerivation rec {
   name = "eet-${version}";
-  version = "1.5.0";
+  version = "1.6.0-alpha";
   src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0csk2s0y3qllf40q06i4wqaj8y2p1csh5jxcqnlmf6lrk1ycjv32";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1cq6i9g020mi5mr069jykx1fvihd18k1y4x49skmhzfh7dv10dfp";
   };
   buildInputs = [ pkgconfig eina zlib libjpeg ];
   meta = {
diff --git a/pkgs/desktops/e17/eeze/default.nix b/pkgs/desktops/e17/eeze/default.nix
index c095e25f886..4931dbf6203 100644
--- a/pkgs/desktops/e17/eeze/default.nix
+++ b/pkgs/desktops/e17/eeze/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, ecore, udev }:
 stdenv.mkDerivation rec {
   name = "eeze-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
   src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "10n2qd7rf1cnsgd3mhh1wd1qm7hsf1lxx1ig72xyj55i4i5dllh3";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1v0n6bn3g04bjq0cxp6ixw7hb4kjbqpvywpvgik960xkn4pva76p";
   };
   buildInputs = [ pkgconfig eina ecore ];
   propagatedBuildInputs = [ udev ];
diff --git a/pkgs/desktops/e17/efreet/default.nix b/pkgs/desktops/e17/efreet/default.nix
index 291ea2f63f9..960a8694b86 100644
--- a/pkgs/desktops/e17/efreet/default.nix
+++ b/pkgs/desktops/e17/efreet/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, eet, ecore }:
 stdenv.mkDerivation rec {
   name = "efreet-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
   src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0fqrrp8dvaqhwczlh7xyh1x6wr4flpmpy6ihrjh1ywymgcvrfwkf";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1nydy3ahdq7q6b0xxaj79a8kd4b4xy3hzf1fdh117c9pwp4fxhl0";
   };
   buildInputs = [ pkgconfig eina eet ecore ];
   meta = {
diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix
index d3f02e595c1..51b938790ec 100644
--- a/pkgs/desktops/e17/eina/default.nix
+++ b/pkgs/desktops/e17/eina/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   name = "eina-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
   src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0h2vmvr7bmnb19n124bjvi2rddv7vm15pv19lrpc7av3idk7ic4j";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1vchzb34hd9z8ghh75ch7sdf90gmzzpxryk3yq8hjcdxd0zjx9yj";
   };
   meta = {
     description = "Enlightenment's core data structure library";
diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix
index 2dd1a5cbab0..f09bc6b2ded 100644
--- a/pkgs/desktops/e17/embryo/default.nix
+++ b/pkgs/desktops/e17/embryo/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina }:
 stdenv.mkDerivation rec {
   name = "embryo-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
   src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0nk7jajsgi5xf02yxahwr3cm7bml5477fb1mas1i7a788bw7i6zn";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "0hcjlf0rljz4zs1y5l4h0gn2gyqb1h4msfsaps8flaym4mxrvvd9";
   };
   buildInputs = [ pkgconfig eina ];
   meta = {
diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix
index 84dae4822ba..71b54f502a2 100644
--- a/pkgs/desktops/e17/evas/default.nix
+++ b/pkgs/desktops/e17/evas/default.nix
@@ -2,10 +2,10 @@
 , libX11, libXext, eina, eet }:
 stdenv.mkDerivation rec {
   name = "evas-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
   src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1qjmxn5a5qhc2slxjx7bsas76w0zlnrbs6hx9swr8xarkifjk3dv";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1lyya0nc8p0vs63azkflwq7lqqml94cqzjpg12h43sbvza342rsq";
   };
   buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg
                   libX11 libXext eina eet

From b24bab3873d5f8331c551e0a6388abca711b97cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 25 Mar 2012 13:53:07 +0000
Subject: [PATCH 171/208] Getting a much newer version of the openchrome X
 driver

svn path=/nixpkgs/trunk/; revision=33405
---
 pkgs/servers/x11/xorg/overrides.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a1d2040483d..517e0f11b63 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -141,16 +141,13 @@ in
     buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
   };
 
-  xf86videoopenchrome = attrs: attrs // {
-    name = "xf86-video-openchrome-svn-816";
-    src = args.fetchsvn {
-      url = http://svn.openchrome.org/svn/trunk;
-      sha256 = "1mhfh1n1x7fnxdbbkbz13lzd57m6xi3n9cblzgm43mz5bamacr02";
-      rev = 816;
-      };
-    buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa args.automake args.autoconf args.libtool xorg.libXext];
-    preConfigure = "chmod +x autogen.sh";
-    configureScript = "./autogen.sh";
+  xf86videoopenchrome = attrs: attrs // rec {
+    name = "xf86-video-openchrome-0.2.905";
+    src = args.fetchurl {
+      url = "http://openchrome.org/releases/${name}.tar.bz2";
+      sha256 = "1llbm020s0fck9chs0906xz7jr4h3whxan4s10ls9046g7xib3qc";
+    };
+    buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa xorg.libXext];
   };
 
   xdriinfo = attrs: attrs // {

From fa183b675b7b4f33926a194fd7343b144e31548c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 25 Mar 2012 13:59:17 +0000
Subject: [PATCH 172/208] Adding wrapFirefox for midori and vimprobable2, so
 they can enjoy the flash plugin.

OTH, I'd prefer naming the attributes like "midoriWrapped" instead of "midoriWrapper".
But I chose the 2nd to follow the example of those already in all-packages.


svn path=/nixpkgs/trunk/; revision=33406
---
 pkgs/top-level/all-packages.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4fc579e020..9d901f903d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7008,6 +7008,11 @@ let
     inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto;
   };
 
+  midoriWrapper = wrapFirefox
+    { browser = midori; browserName = "midori"; desktopName = "Midori";
+      icon = "${midori}/share/icons/hicolor/22x22/apps/midori.png";
+    };
+
   minicom = callPackage ../tools/misc/minicom { };
 
   minidjvu = callPackage ../applications/graphics/minidjvu { };
@@ -8537,6 +8542,10 @@ let
     inherit (gnome) libsoup;
   };
 
+  vimprobable2Wrapper = wrapFirefox
+    { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2";
+    };
+
   VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
 
   # Wine cannot be built in 64-bit; use a 32-bit build instead.

From 41081c4eb05ada868938aa2f71cb14e45d017d70 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2012 18:10:30 +0000
Subject: [PATCH 173/208] nbd: re-introduced linking with -lrt, and added an
 additional -lpthread on top of it

Linking these libraries makes sure that they can be found at run-time,
because a proper rpath into the Nix store is added to the generated
executable. Without that rpath, nbd-server will try to load the system's
libpthread.so.0, which may not be what we want.

svn path=/nixpkgs/trunk/; revision=33408
---
 pkgs/tools/networking/nbd/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 929db017152..a478fe9454c 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation {
   # The test suite doesn't succeed on Hydra.
   doCheck = false;
 
+  # Glib calls `clock_gettime', which is in librt. Linking that library
+  # here ensures that a proper rpath is added to the executable so that
+  # it can be loaded at run-time.
+  NIX_LDFLAGS = "-lrt -lpthread";
+
   meta = {
     homepage = "http://nbd.sourceforge.net";
     description = "map arbitrary files as block devices over the network";

From 48ce33903a0af6ed7acb566ff4be4069009a65c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2012 18:22:20 +0000
Subject: [PATCH 174/208] haskell-hoogle: added version 4.2.10

svn path=/nixpkgs/trunk/; revision=33409
---
 .../libraries/haskell/hoogle/default.nix      | 23 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hoogle/default.nix

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
new file mode 100644
index 00000000000..c9de0ef46c2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -0,0 +1,23 @@
+{ cabal, binary, blazeBuilder, Cabal, caseInsensitive, cmdargs
+, conduit, filepath, haskellSrcExts, httpTypes, parsec, random
+, safe, tagsoup, time, transformers, uniplate, wai, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hoogle";
+  version = "4.2.10";
+  sha256 = "0vb4jj9m512v476fclmjzlk725hgba8q5njx2h1xwb0a76qvj2mg";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    binary blazeBuilder Cabal caseInsensitive cmdargs conduit filepath
+    haskellSrcExts httpTypes parsec random safe tagsoup time
+    transformers uniplate wai warp
+  ];
+  meta = {
+    homepage = "http://www.haskell.org/hoogle/";
+    description = "Haskell API Search";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0d3d43ab64c..9da648faddb 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.final x y);
 
   hmatrix = callPackage ../development/libraries/haskell/hmatrix {};
 
+  hoogle = callPackage ../development/libraries/haskell/hoogle {};
+
   hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
 
   hostname = callPackage ../development/libraries/haskell/hostname {};

From a058381657cb9173867aa1846cc4dbf5b61916e1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2012 19:33:48 +0000
Subject: [PATCH 175/208] haskell-ghc-mod: updated to version 1.10.11

This expression can now be generated by cabal2nix. Note that it doesn't
propagate Emacs and haskell-mode, though, these dependencies must be
installed by the user in addition to ghc-mod.

To active ghc-mod, add the following snippet to your ~/.emacs file:

  (autoload 'ghc-init "ghc" nil t)
  (add-hook 'haskell-mode-hook (lambda () (ghc-init)))

svn path=/nixpkgs/trunk/; revision=33410
---
 .../libraries/haskell/ghc-mod/default.nix     | 20 +++++++++++--------
 pkgs/top-level/haskell-packages.nix           |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index d8d8fe5a02e..68af9388bed 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -1,14 +1,18 @@
-{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacsPackages }:
+{ cabal, Cabal, emacs, filepath, ghcPaths, ghcSybUtils, hlint
+, ioChoice, regexPosix, syb, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "1.10.5";
-  sha256 = "0hbimrrlasa2rkmdz9d4fcyk70fynmwx0zqyl470hrwz8d8v73rc";
-  buildDepends = [
-    attoparsec attoparsecEnumerator ghcPaths hlint regexPosix
-  ];
-  propagatedBuildInputs = [emacsPackages.emacs emacsPackages.haskellMode];
+  version = "1.10.11";
+  sha256 = "0s2amrikrlcgiy9iw6f1s43k2lzy9jaiddky078qp1pbk68dhbk9";
+  isLibrary = false;
   isExecutable = true;
+  buildDepends = [
+    Cabal filepath ghcPaths ghcSybUtils hlint ioChoice regexPosix syb
+    transformers
+  ];
+  buildTools = [ emacs ];
   postInstall = ''
     cd $out/share/$pname-$version
     make
@@ -20,7 +24,7 @@ cabal.mkDerivation (self: {
 
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
-    description = "Happy Haskell programming on Emacs";
+    description = "Happy Haskell programming on Emacs/Vim";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9da648faddb..fe02ffcffe3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -706,7 +706,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
 
   ghcMod = callPackage ../development/libraries/haskell/ghc-mod {
-    emacsPackages = pkgs.emacs23Packages;
+    inherit (pkgs) emacs;
   };
 
   ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};

From d44e55866aecb5af7d64b0d96afb71bfb5562683 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2012 19:33:53 +0000
Subject: [PATCH 176/208] Updated Haskell packages.

 - cabal2nix: updated to version 1.30
 - cmdargs: updated to version 0.9.5
 - derive: updated to version 2.5.6
 - hlint: updated to version 1.8.25
 - io-choice: added version 0.0.1

svn path=/nixpkgs/trunk/; revision=33411
---
 .../libraries/haskell/cmdargs/default.nix       |  4 ++--
 .../libraries/haskell/derive/default.nix        |  4 ++--
 .../libraries/haskell/hoogle/default.nix        |  1 +
 .../libraries/haskell/io-choice/default.nix     | 17 +++++++++++++++++
 .../tools/haskell/cabal2nix/default.nix         |  4 ++--
 .../development/tools/haskell/hlint/default.nix |  4 ++--
 pkgs/top-level/haskell-packages.nix             |  2 ++
 7 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/io-choice/default.nix

diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index adc3c10c851..55c50cb99fb 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cmdargs";
-  version = "0.9.3";
-  sha256 = "1mm16249nprclmgplw5bmmzsnmfm8dlkc5janrwvmlssbxw5hgnk";
+  version = "0.9.5";
+  sha256 = "0ihanswhq5d29d9ll5q4grkbaq64dwfsayws7y4xa387d5s9p3iv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath transformers ];
diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index d3ed9b4c954..b6c560f70ac 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.5";
-  sha256 = "1vv7y2jfyxq2abh4avyjwia309a6rylbyiqia1m0ka7zwv2rxd6y";
+  version = "2.5.6";
+  sha256 = "1ckxm6s2y9dvlj1785b27a2zvah4radypxjpq7sxn970r6m5dv0h";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index c9de0ef46c2..c03484b93f5 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "Haskell API Search";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix
new file mode 100644
index 00000000000..85e49f5a67f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/io-choice/default.nix
@@ -0,0 +1,17 @@
+{ cabal, liftedBase, monadControl, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "io-choice";
+  version = "0.0.1";
+  sha256 = "0jwxqs65g88q9l0w4xzllj7svz3qr2zgiaq2fyq5jmh33lz74r63";
+  buildDepends = [
+    liftedBase monadControl transformers transformersBase
+  ];
+  meta = {
+    description = "Choice for IO and lifted IO";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index f00c45ee33b..d81d92c5cfa 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.29";
-  sha256 = "1gqrl8085i7g64q085knjawqb3ynk13swrmry077ygw42hpvp2wg";
+  version = "1.30";
+  sha256 = "1qkrdxqvasm0q4sh98c50qwpm7nff6yzp4yjhx8sdy39v4gvbw2b";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 0b5d53c3efa..074695a8247 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.24";
-  sha256 = "1crxhpgy49xg3j225cyfxflnc8zgck2xa8hb04chd0yh9n03h6kx";
+  version = "1.8.25";
+  sha256 = "1pxdkwqg04hjynck06ib94spjviri3y1ivhagc8icwjwlizbn5ib";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index fe02ffcffe3..a183e43f134 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -927,6 +927,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   instantGenerics = callPackage ../development/libraries/haskell/instant-generics {};
 
+  ioChoice = callPackage ../development/libraries/haskell/io-choice {};
+
   ioStorage = callPackage ../development/libraries/haskell/io-storage {};
 
   irc = callPackage ../development/libraries/haskell/irc {

From 31507bc2740f193b7ca7018c5a13f68257388664 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2012 19:40:04 +0000
Subject: [PATCH 177/208] nbd: don't try to link -lrt and -lpthread on
 non-Linux platforms

svn path=/nixpkgs/trunk/; revision=33412
---
 pkgs/tools/networking/nbd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index a478fe9454c..987b5d261cd 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   # Glib calls `clock_gettime', which is in librt. Linking that library
   # here ensures that a proper rpath is added to the executable so that
   # it can be loaded at run-time.
-  NIX_LDFLAGS = "-lrt -lpthread";
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lrt -lpthread";
 
   meta = {
     homepage = "http://nbd.sourceforge.net";

From 343fb0be1ef86b035aca99c74166ce0d5abcc73f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Mar 2012 20:05:36 +0000
Subject: [PATCH 178/208] Add kmod, the replacement for the now-defunct
 module-init-tools

The kmod tools appear to take a flag to name the location of the modules
directory, so we may not need to migrate our module-init-tools patches

svn path=/nixpkgs/trunk/; revision=33413
---
 pkgs/os-specific/linux/kmod/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kmod/default.nix

diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
new file mode 100644
index 00000000000..c75b8bec146
--- /dev/null
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, xz, zlib, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "kmod-7";
+
+  src = fetchurl {
+    url = ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-7.tar.xz;
+    sha256 = "1xvsy2zcfdimj4j5b5yyxaqx2byabmwq8qlzjm0hqzpyxxgfw1lq";
+  };
+
+  buildInputs = [ pkgconfig xz zlib ];
+
+  configureFlags = [ "--with-xz" "--with-zlib" ];
+
+  meta = {
+    homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/;
+    description = "Tools for loading and managing Linux kernel modules";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d901f903d2..b4d588a9208 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5808,6 +5808,8 @@ let
 
   klibcShrunk = callPackage ../os-specific/linux/klibc/shrunk.nix { };
 
+  kmod = callPackage ../os-specific/linux/kmod { };
+
   kvm = qemu_kvm;
 
   libcap = callPackage ../os-specific/linux/libcap { };

From f389901fd252abbaec6f97900c09dccf0f42d57f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 25 Mar 2012 20:10:25 +0000
Subject: [PATCH 179/208] Adding 'tabbed'. I think Alexander Foremny wanted to
 send this patch long ago, but I could not find it.

svn path=/nixpkgs/trunk/; revision=33414
---
 .../window-managers/tabbed/default.nix        | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/window-managers/tabbed/default.nix

diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
new file mode 100644
index 00000000000..79d00cb823e
--- /dev/null
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchhg, xproto, libX11, patches ? []}:
+
+stdenv.mkDerivation rec {
+  name = "tabbed-20120209";
+ 
+  src = fetchhg {
+    url = http://hg.suckless.org/tabbed;
+    tag = "d7542a6f6dc5";
+    sha256 = "1963jsazfmh5k7923c1mfwppz1xbh48z16j0sa64fiscq22as2gj";
+  };
+
+  # Allow users set their own list of patches
+  inherit patches;
+
+  buildInputs = [ xproto libX11 ];
+
+  preInstall = ''
+    export makeFlags="PREFIX=$out"
+  '';
+ 
+  meta = {
+    homepage = http://tools.suckless.org/tabbed;
+    description = "Simple generic tabbed fronted to xembed aware applications";
+    license="MIT"
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4d588a9208..b983c76c88c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7354,6 +7354,8 @@ let
   # linux only by now
   synergy = callPackage ../applications/misc/synergy { };
 
+  tabbed = callPackage ../applications/window-managers/tabbed { };
+
   tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {
     inherit (pythonPackages) twisted foolscap simplejson nevow zfec
       pycryptopp pysqlite darcsver setuptoolsTrial setuptoolsDarcs

From 0589bffdf4b249961ed6ad4a932923ab003b5d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 25 Mar 2012 20:11:32 +0000
Subject: [PATCH 180/208] Typo of semicolon.

svn path=/nixpkgs/trunk/; revision=33415
---
 pkgs/applications/window-managers/tabbed/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 79d00cb823e..3ab950bf4d0 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://tools.suckless.org/tabbed;
     description = "Simple generic tabbed fronted to xembed aware applications";
-    license="MIT"
+    license="MIT";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };

From 778abfc6c071ce0b46bc16fdabba0abecb8605d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 25 Mar 2012 20:16:01 +0000
Subject: [PATCH 181/208] Updating vimprobable2.

svn path=/nixpkgs/trunk/; revision=33416
---
 .../networking/browsers/vimprobable2/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index b537d4f16d0..dad29a27803 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -2,10 +2,10 @@
 glib_networking}:
 
 stdenv.mkDerivation {
-  name = "vimprobable2-0.9.11.2";
+  name = "vimprobable2-0.9.12.0";
   src = fetchurl {
-    url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.11.2.tar.bz2";
-    sha256 = "017qwhndchmpsn2g38v85rjx00fss69aa1nmgj3v85k5zskv7z65";
+    url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.12.0.tar.bz2";
+    sha256 = "1b6xs6rd4rxy9kdsva13bbx7pd2gy159ad8ncd4pplsqr46hw8fb";
   };
   buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit gtk ];
   installPhase = ''

From 00dc25ba430a0392d689a1a0ed3fff06e124c3cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 25 Mar 2012 20:21:45 +0000
Subject: [PATCH 182/208] Making wrapFirefox also propagate the browser to the
 userenv, so it gets the manpages. That's useful for vimperator2 for example.

svn path=/nixpkgs/trunk/; revision=33417
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index a89db87809b..b937615b2ae 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -32,6 +32,10 @@ stdenv.mkDerivation {
 
     mkdir -p $out/share/applications
     cp $desktopItem/share/applications/* $out/share/applications
+
+    # For manpages, in case the program supplies them
+    mkdir -p $out/nix-support
+    echo ${browser} > $out/nix-support/propagated-user-env-packages
   '';
 
   # Let each plugin tell us (through its `mozillaPlugin') attribute

From 510308e039371b67db070f897e7f28f46b28618b Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sun, 25 Mar 2012 20:43:00 +0000
Subject: [PATCH 183/208] Adding a package for a preview release of Matita.

svn path=/nixpkgs/trunk/; revision=33418
---
 .../science/logic/matita/130312.nix           | 66 +++++++++++++++++++
 .../science/logic/matita/130312.patch         | 42 ++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++
 3 files changed, 113 insertions(+)
 create mode 100644 pkgs/applications/science/logic/matita/130312.nix
 create mode 100644 pkgs/applications/science/logic/matita/130312.patch

diff --git a/pkgs/applications/science/logic/matita/130312.nix b/pkgs/applications/science/logic/matita/130312.nix
new file mode 100644
index 00000000000..3501072fbfe
--- /dev/null
+++ b/pkgs/applications/science/logic/matita/130312.nix
@@ -0,0 +1,66 @@
+{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, ocaml_mysql, ocamlnet, ulex08, camlzip, ocaml_pcre, automake, autoconf }:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  version = "0.9.1pre130312";
+  pname = "matita";
+
+in
+
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://matita.cs.unibo.it/sources/${pname}_130312.tar.gz"; 
+    sha256 = "13mjvvldv53dcdid6wmc6g8yn98xca26xq2rgq2jg700lqsni59s";
+  };
+
+  sourceRoot="${pname}-${version}";
+
+  unpackPhase = ''
+   mkdir $sourceRoot
+   tar -xvzf $src -C $sourceRoot
+   echo "source root is $sourceRoot"
+  '';
+
+  prePatch = ''
+   autoreconf -fvi 
+  '';
+
+  buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre automake autoconf];
+
+  postPatch = ''
+    BASH=$(type -tp bash)
+    substituteInPlace components/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH"
+    substituteInPlace matita/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH"
+    substituteInPlace configure --replace "ulex08" "ulex"
+    substituteInPlace components/METAS/meta.helm-content_pres.src --replace "ulex08" "ulex"
+    substituteInPlace components/content_pres/Makefile --replace "ulex08" "ulex"
+    substituteInPlace components/METAS/meta.helm-grafite_parser.src --replace "ulex08" "ulex"
+    substituteInPlace components/grafite_parser/Makefile --replace "ulex08" "ulex"
+    substituteInPlace configure --replace "zip" "camlzip"
+    substituteInPlace components/METAS/meta.helm-getter.src --replace "zip" "camlzip"
+    substituteInPlace components/METAS/meta.helm-xml.src --replace "zip" "camlzip"
+  '';
+
+  patches = [ ./configure_130312.patch ./130312.patch ];
+
+  preConfigure = ''
+    # Setup for findlib.
+    OCAMLPATH=$(pwd)/components/METAS:$OCAMLPATH
+    RTDIR=$out/share/matita
+    export configureFlags="--with-runtime-dir=$RTDIR"
+  '';
+
+  postInstall = ''
+    mkdir -p $out/bin
+    ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin
+  '';
+
+  meta = {
+    homepage = http://matita.cs.unibo.it/;
+    description = "Matita is an experimental, interactive theorem prover";
+    license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.roconnor ];
+  };
+}
diff --git a/pkgs/applications/science/logic/matita/130312.patch b/pkgs/applications/science/logic/matita/130312.patch
new file mode 100644
index 00000000000..4596f7fde2e
--- /dev/null
+++ b/pkgs/applications/science/logic/matita/130312.patch
@@ -0,0 +1,42 @@
+--- matita/components/content_pres/cicNotationParser.ml 2012-03-25 15:47:03.144583445 -0400
++++ matita/components/content_pres/cicNotationParser.ml 2012-03-25 15:48:30.776209560 -0400
+@@ -209,8 +209,8 @@
+           match magic with
+           | Ast.List0 (_, None) -> Gramext.Slist0 s
+           | Ast.List1 (_, None) -> Gramext.Slist1 s
+-          | Ast.List0 (_, Some l) -> Gramext.Slist0sep (s, gram_of_literal l, false)
+-          | Ast.List1 (_, Some l) -> Gramext.Slist1sep (s, gram_of_literal l, false)
++          | Ast.List0 (_, Some l) -> Gramext.Slist0sep (s, gram_of_literal l)
++          | Ast.List1 (_, Some l) -> Gramext.Slist1sep (s, gram_of_literal l)
+           | _ -> assert false
+         in
+         [ Env (List.map Env.list_declaration p_names),
+--- matita/components/grafite_parser/print_grammar.ml   2012-03-25 15:47:03.123583779 -0400
++++ matita/components/grafite_parser/print_grammar.ml   2012-03-25 15:49:43.900079528 -0400
+@@ -87,7 +87,7 @@
+   | Smeta (_, lt, _) -> List.for_all is_symbol_dummy lt
+   | Snterm e | Snterml (e, _) -> is_entry_dummy e
+   | Slist1 x | Slist0 x -> is_symbol_dummy x
+-  | Slist1sep (x,y,false) | Slist0sep (x,y,false) -> is_symbol_dummy x && is_symbol_dummy y
++  | Slist1sep (x,y) | Slist0sep (x,y) -> is_symbol_dummy x && is_symbol_dummy y
+   | Sopt x -> is_symbol_dummy x
+   | Sself | Snext -> false
+   | Stree t -> is_tree_dummy t
+@@ -186,7 +186,7 @@
+         let todo = visit_symbol symbol todo is_son in
+         Format.fprintf fmt "@]} @ ";
+         todo
+-    | Slist0sep (symbol,sep,false) ->
++    | Slist0sep (symbol,sep) ->
+         Format.fprintf fmt "[@[<hov2> ";
+         let todo = visit_symbol symbol todo is_son in
+         Format.fprintf fmt "{@[<hov2> ";
+@@ -200,7 +200,7 @@
+         let todo = visit_symbol symbol todo is_son in
+         Format.fprintf fmt "@]}+ @ ";
+         todo 
+-    | Slist1sep (symbol,sep,false) ->
++    | Slist1sep (symbol,sep) ->
+         let todo = visit_symbol symbol todo is_son  in
+         Format.fprintf fmt "{@[<hov2> ";
+         let todo = visit_symbol sep todo is_son in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b983c76c88c..f32d1023d58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8200,6 +8200,11 @@ let
             lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre;
   };
 
+  matita_130312 = lowPrio (callPackage ../applications/science/logic/matita/130312.nix {
+    inherit (ocamlPackages) findlib lablgtk ocaml_expat gmetadom ocaml_http
+            ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre;
+  });
+
   minisat = callPackage ../applications/science/logic/minisat {};
 
   opensmt = callPackage ../applications/science/logic/opensmt { };

From 4bccef4db2a3a7d7b4efcb914fe76d2af8e4557d Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sun, 25 Mar 2012 21:24:23 +0000
Subject: [PATCH 184/208] Updating hash for ocaml_sqlite3

Markus Mottl <markus.mottl@gmail.com> said by email to me that

``Note that this link is served by a Mercurial Apache module, i.e. this
is not static content.  It's likely that e.g. tar or bzip2 produce
slightly different output, which would explain changing hashes.

So I guess we shouldn't worry too much about the change in hash?


svn path=/nixpkgs/trunk/; revision=33419
---
 pkgs/development/ocaml-modules/sqlite3/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix
index 1903068bb0b..d1203e6f290 100644
--- a/pkgs/development/ocaml-modules/sqlite3/default.nix
+++ b/pkgs/development/ocaml-modules/sqlite3/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://hg.ocaml.info/release/ocaml-sqlite3/archive/" +
           "release-${version}.tar.bz2";
-    sha256 = "0ccy9b4pl9586vlzdkk3kvkz8xqc023ih1aw4nndyjnabkvgl832";
+    sha256 = "0fqbxm90mc2gk6jp9p8s53kay0hbcd0qc0adq8znanz99n8zqp53";
   };
 
   buildInputs = [ocaml findlib];

From ec5dda12d26c15b0837983260ee2599f421c976b Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sun, 25 Mar 2012 21:27:30 +0000
Subject: [PATCH 185/208] Reparing stable build of Matita.

Also correcting the version and simplifying the prerelease package of Matita.


svn path=/nixpkgs/trunk/; revision=33420
---
 .../science/logic/matita/130312.nix           |  4 +-
 .../science/logic/matita/130312.patch         | 42 -------------------
 pkgs/top-level/all-packages.nix               |  8 ++--
 3 files changed, 7 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/matita/130312.patch

diff --git a/pkgs/applications/science/logic/matita/130312.nix b/pkgs/applications/science/logic/matita/130312.nix
index 3501072fbfe..f77e9d34a2a 100644
--- a/pkgs/applications/science/logic/matita/130312.nix
+++ b/pkgs/applications/science/logic/matita/130312.nix
@@ -2,7 +2,7 @@
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "0.9.1pre130312";
+  version = "0.99.1pre130312";
   pname = "matita";
 
 in
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     substituteInPlace components/METAS/meta.helm-xml.src --replace "zip" "camlzip"
   '';
 
-  patches = [ ./configure_130312.patch ./130312.patch ];
+  patches = [ ./configure_130312.patch ];
 
   preConfigure = ''
     # Setup for findlib.
diff --git a/pkgs/applications/science/logic/matita/130312.patch b/pkgs/applications/science/logic/matita/130312.patch
deleted file mode 100644
index 4596f7fde2e..00000000000
--- a/pkgs/applications/science/logic/matita/130312.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- matita/components/content_pres/cicNotationParser.ml 2012-03-25 15:47:03.144583445 -0400
-+++ matita/components/content_pres/cicNotationParser.ml 2012-03-25 15:48:30.776209560 -0400
-@@ -209,8 +209,8 @@
-           match magic with
-           | Ast.List0 (_, None) -> Gramext.Slist0 s
-           | Ast.List1 (_, None) -> Gramext.Slist1 s
--          | Ast.List0 (_, Some l) -> Gramext.Slist0sep (s, gram_of_literal l, false)
--          | Ast.List1 (_, Some l) -> Gramext.Slist1sep (s, gram_of_literal l, false)
-+          | Ast.List0 (_, Some l) -> Gramext.Slist0sep (s, gram_of_literal l)
-+          | Ast.List1 (_, Some l) -> Gramext.Slist1sep (s, gram_of_literal l)
-           | _ -> assert false
-         in
-         [ Env (List.map Env.list_declaration p_names),
---- matita/components/grafite_parser/print_grammar.ml   2012-03-25 15:47:03.123583779 -0400
-+++ matita/components/grafite_parser/print_grammar.ml   2012-03-25 15:49:43.900079528 -0400
-@@ -87,7 +87,7 @@
-   | Smeta (_, lt, _) -> List.for_all is_symbol_dummy lt
-   | Snterm e | Snterml (e, _) -> is_entry_dummy e
-   | Slist1 x | Slist0 x -> is_symbol_dummy x
--  | Slist1sep (x,y,false) | Slist0sep (x,y,false) -> is_symbol_dummy x && is_symbol_dummy y
-+  | Slist1sep (x,y) | Slist0sep (x,y) -> is_symbol_dummy x && is_symbol_dummy y
-   | Sopt x -> is_symbol_dummy x
-   | Sself | Snext -> false
-   | Stree t -> is_tree_dummy t
-@@ -186,7 +186,7 @@
-         let todo = visit_symbol symbol todo is_son in
-         Format.fprintf fmt "@]} @ ";
-         todo
--    | Slist0sep (symbol,sep,false) ->
-+    | Slist0sep (symbol,sep) ->
-         Format.fprintf fmt "[@[<hov2> ";
-         let todo = visit_symbol symbol todo is_son in
-         Format.fprintf fmt "{@[<hov2> ";
-@@ -200,7 +200,7 @@
-         let todo = visit_symbol symbol todo is_son in
-         Format.fprintf fmt "@]}+ @ ";
-         todo 
--    | Slist1sep (symbol,sep,false) ->
-+    | Slist1sep (symbol,sep) ->
-         let todo = visit_symbol symbol todo is_son  in
-         Format.fprintf fmt "{@[<hov2> ";
-         let todo = visit_symbol sep todo is_son in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f32d1023d58..c92c7517db4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2465,7 +2465,7 @@ let
     ulex = callPackage ../development/ocaml-modules/ulex { };
 
     ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 {
-      camlp5 = camlp5_5_transitional;
+      camlp5 = camlp5_transitional;
     };
 
     ocaml_typeconv = callPackage ../development/ocaml-modules/typeconv { };
@@ -8196,8 +8196,10 @@ let
   leo2 = callPackage ../applications/science/logic/leo2 {};
 
   matita = callPackage ../applications/science/logic/matita {
-    inherit (ocamlPackages) findlib lablgtk ocaml_expat gmetadom ocaml_http
-            lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre;
+    ocaml = ocaml_3_11_2;
+    inherit (ocamlPackages_3_11_2) findlib lablgtk ocaml_expat gmetadom ocaml_http
+            lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet camlzip ocaml_pcre;
+    ulex08 = ocamlPackages_3_11_2.ulex08.override { camlp5 = ocamlPackages_3_11_2.camlp5_5_transitional; };
   };
 
   matita_130312 = lowPrio (callPackage ../applications/science/logic/matita/130312.nix {

From 9f73f39527b60d658a6b223f4b18361959f21f10 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Mon, 26 Mar 2012 10:20:32 +0000
Subject: [PATCH 186/208] renamed load-sdl-env to load-env-sdl so that 'nix-env
 -i env-sdl' and 'load-env-sdl' have a common naming scheme

svn path=/nixpkgs/trunk/; revision=33421
---
 pkgs/misc/my-env/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 660b757f327..dc729ec557a 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -14,7 +14,7 @@
   # Then you can install it by:  
   #  $ nix-env -i sdl-env
   # And you can load it simply calling:  
-  #  $ load-sdl-env
+  #  $ load-env-sdl
   # and this will update your env vars to have 'make' and 'gcc' finding the SDL
   # headers and libs.
 
@@ -49,8 +49,8 @@
   # Now we should build our newly defined custom environment using this command on a shell, so type:
   #  $ nix-env -i env-nix
 
-  # You can load the environment simply typing a "load-${name}-env" command.
-  #  $ load-nix-env
+  # You can load the environment simply typing a "load-env-${name}" command.
+  #  $ load-env-nix
   # The result using that command should be:
   #  env-nix loaded
   and show you a shell with a prefixed prompt.
@@ -129,7 +129,7 @@ mkDerivation {
 
     mkdir -p $out/bin
     sed -e s,@shell@,${shell}, -e s,@myenvpath@,$out/dev-envs/${name}, \
-      -e s,@name@,${name}, ${./loadenv.sh} > $out/bin/load-${name}-env
-    chmod +x $out/bin/load-${name}-env
+      -e s,@name@,${name}, ${./loadenv.sh} > $out/bin/load-env-${name}
+    chmod +x $out/bin/load-env-${name}
   '';
 }

From 2d0e07c24203f5f6b206f8237122a9069ec59d7f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Mar 2012 10:22:27 +0000
Subject: [PATCH 187/208] * Don't recurse into perl510Packages.  It confuses
 nix-env -u since it   can't distinguish between 5.10 and 5.14 packages.  (We
 should   probably include the Perl version number in the name of Perl  
 packages, like GHC packages.)

svn path=/nixpkgs/trunk/; revision=33422
---
 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 c92c7517db4..1cf32638a83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4930,12 +4930,12 @@ let
     inherit pkgs;
   });
 
-  perl510Packages = recurseIntoAttrs (import ./perl-packages.nix {
+  perl510Packages = import ./perl-packages.nix {
     pkgs = pkgs // {
       perl = perl510;
       buildPerlPackage = import ../development/perl-modules/generic perl510;
     };
-  });
+  };
 
   perlXMLParser = perlPackages.XMLParser;
 

From b62900880a13a863cf0732349f8bb19911cb4014 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Mar 2012 11:38:49 +0000
Subject: [PATCH 188/208] * Fix the build of Task::Catalyst::Tutorial
 (http://hydra.nixos.org/build/2307296).

svn path=/nixpkgs/trunk/; revision=33423
---
 pkgs/top-level/perl-packages.nix | 160 +++++++++++++++++++++++--------
 pkgs/top-level/release.nix       |   4 -
 2 files changed, 122 insertions(+), 42 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index fbef4c36976..9e38bbba10d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -231,10 +231,10 @@ rec {
   };
 
   CaptchaReCAPTCHA = buildPerlPackage rec {
-    name = "Captcha-reCAPTCHA-0.92";
+    name = "Captcha-reCAPTCHA-0.94";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz";
-      sha256 = "1fm0fvdy9b7z8k1cyah2qbj0gqlv01chxmqmashwj16198yr7vrc";
+      sha256 = "01rnyqsd9b446b2wa1mycrfyiaigqdsjb3kbf7f3rrjgw3rwbf4d";
     };
     propagatedBuildInputs = [HTMLTiny LWP];
     buildInputs = [TestPod];
@@ -407,6 +407,7 @@ rec {
         MooseXGetopt MooseXTypesCommon StringRewritePrefix
         MooseXTypesLoadableClass Plack PlackMiddlewareReverseProxy
       ];
+    meta.platforms = stdenv.lib.platforms.linux;
   };
 
   CatalystPluginAccessLog = buildPerlPackage rec {
@@ -1008,15 +1009,14 @@ rec {
   };
 
   DataVisitor = buildPerlPackage rec {
-    name = "Data-Visitor-0.25";
+    name = "Data-Visitor-0.28";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
-      sha256 = "11i1svvj57m31w8gh6qp7mvkiff9036qwfljm4hpbyh7f83clzq9";
+      url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz";
+      sha256 = "1998syyprmqnhpgznmk7ia3zd8saw34q7pbaprxarcz7a3bncyjc";
     };
-    propagatedBuildInputs = [
-      TestMockObject TaskWeaken TestUseOk TieToObject
-      NamespaceClean AnyMoose
-    ];
+    buildInputs = [ TestRequires ];
+    propagatedBuildInputs = 
+      [ ClassLoad Moose TaskWeaken TieToObject NamespaceClean ];
   };
 
   DateCalc = buildPerlPackage {
@@ -1036,13 +1036,14 @@ rec {
     };
   };
 
-  DateTime = buildPerlPackage rec {
-    name = "DateTime-0.4501";
+  DateTime = buildModule rec {
+    name = "DateTime-0.74";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "1hqhc4xfjgcc1r488gjbi498ws3pxiayabl46607lq02qddcv57s";
+      sha256 = "0wabln41nk73w4j3lc1ri8jzmxd3yyskdlagv9jflqaz8awcs8qy";
     };
-    propagatedBuildInputs = [DateTimeLocale DateTimeTimeZone];
+    buildInputs = [ TestFatal ];
+    propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone MathRound ];
   };
 
   DateTimeFormatBuilder = buildPerlPackage rec {
@@ -1071,14 +1072,13 @@ rec {
   };
 
   DateTimeFormatStrptime = buildPerlPackage rec {
-    name = "DateTime-Format-Strptime-1.0800";
+    name = "DateTime-Format-Strptime-1.5000";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RI/RICKM/${name}.tgz";
-      sha256 = "10vsmwlhnc62krsh5fm2i0ya7bgjgjsm6nmj56f0bfifjh57ya1j";
+      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
+      sha256 = "0m55rqbixrsfa6g6mqs8aa0rhcxh6aj2g3n8fgl63wyz9an93w8y";
     };
-    propagatedBuildInputs = [
-      DateTime DateTimeLocale DateTimeTimeZone ParamsValidate
-    ];
+    propagatedBuildInputs =
+      [ DateTime DateTimeLocale DateTimeTimeZone ParamsValidate ];
   };
 
   DateTimeLocale = buildPerlPackage rec {
@@ -1091,12 +1091,13 @@ rec {
   };
 
   DateTimeTimeZone = buildPerlPackage rec {
-    name = "DateTime-TimeZone-0.84";
+    name = "DateTime-TimeZone-1.45";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "0jwbldr3x1cl2ibd9dcshdmpg6s5ddc4qiaxcxyqc82cq09ah2vs";
+      sha256 = "0wnjg6mcpcy7hg79jdsg3vi8ad89rghkcgqjmqiq6pqc0k9sbq2q";
     };
-    propagatedBuildInputs = [ClassSingleton ParamsValidate];
+    buildInputs = [ TestOutput ];
+    propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate TryTiny ];
   };
 
   DBDSQLite = import ../development/perl-modules/DBD-SQLite {
@@ -1621,6 +1622,15 @@ rec {
     };
   };
 
+  HashFlatten = buildPerlPackage rec {
+    name = "Hash-Flatten-1.19";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Hash/${name}.tar.gz";
+      sha256 = "162b9qgkr19f97w4pic6igyk3zd0sbnrhl3s8530fikciffw9ikh";
+    };
+    buildInputs = [ TestAssertions LogTrace ];
+  };
+
   HashMerge = buildPerlPackage rec {
     name = "Hash-Merge-0.12";
     src = fetchurl {
@@ -1657,21 +1667,22 @@ rec {
   };
 
   HTMLFormFu = buildPerlPackage rec {
-    name = "HTML-FormFu-0.03007";
+    name = "HTML-FormFu-0.09007";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz";
-      sha256 = "03lc4pvygp4wn9rsgdkbwk8zkh8x2z5vp8613c6q74imwrfmmfqy";
+      url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz";
+      sha256 = "1yg9fy6s8f1jscfxf7a9hm91x43cjhk3ijw46z94sw8133h50rvy";
     };
-    propagatedBuildInputs = [
-      ClassAccessorChained ClassC3 ConfigAny
-      DateCalc ListMoreUtils LWP EmailValid
-      DataVisitor DateTime DateTimeFormatBuilder
-      DateTimeFormatStrptime DateTimeFormatNatural
-      Readonly YAMLSyck RegexpCopy
-      HTMLTokeParserSimple TestNoWarnings RegexpCommon
-      CaptchaReCAPTCHA HTMLScrubber FileShareDir
-      TemplateToolkit CryptCBC CryptDES
-    ];
+    propagatedBuildInputs = 
+      [ ClassAccessorChained Clone ConfigAny
+        DateCalc ListMoreUtils EmailValid
+        DataVisitor DateTime DateTimeFormatBuilder
+        DateTimeFormatStrptime DateTimeFormatNatural
+        Readonly YAMLLibYAML NumberFormat HashFlatten 
+        HTMLTokeParserSimple RegexpCommon
+        CaptchaReCAPTCHA HTMLScrubber FileShareDir
+        TemplateToolkit CryptCBC CryptDES PathClass
+        MooseXAttributeChained MooseXAliases MooseXSetOnce
+      ];
   };
 
   HTMLParser = buildPerlPackage rec {
@@ -2169,6 +2180,14 @@ rec {
     };
   };
 
+  LogTrace = buildPerlPackage rec {
+    name = "Log-Trace-1.070";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Log/${name}.tar.gz";
+      sha256 = "1qrnxn9b05cqyw1286djllnj8wzys10754glxx6z5hihxxc85jwy";
+    };
+  };
+
   LWP = buildPerlPackage rec {
     name = "libwww-perl-6.03";
     src = fetchurl {
@@ -2221,6 +2240,14 @@ rec {
     propagatedBuildInputs = [TimeDate TestPod];
   };
 
+  MathRound = buildPerlPackage rec {
+    name = "Math-Round-0.06";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz";
+      sha256 = "194dvggf1cmzc701j4wma38jgrcv2pwwzk69rnysjjdcjdv6y255";
+    };
+  };
+
   MIMEBase64 = buildPerlPackage rec {
     name = "MIME-Base64-3.09";
     src = fetchurl {
@@ -2321,6 +2348,25 @@ rec {
     propagatedBuildInputs = [Moose TestException Autobox Perl6Junction];
   };
 
+  MooseXAliases = buildPerlPackage rec {
+    name = "MooseX-Aliases-0.10";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz";
+      sha256 = "1n3z06x6d7sl2can7gn1q4qpclg6sjl6i8fd9y3yipmaxbk97clz";
+    };
+    buildInputs = [ TestFatal TestRequires ];
+    propagatedBuildInputs = [ Moose ];
+  };
+
+  MooseXAttributeChained = buildModule rec {
+    name = "MooseX-Attribute-Chained-1.0.1";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz";
+      sha256 = "101kwjzidppcsnyvp9x1vw8vpvkp1cc1csqmzbashwvqy8d0g4af";
+    };
+    propagatedBuildInputs = [ Moose TryTiny ];
+  };
+
   MooseXEmulateClassAccessorFast = buildPerlPackage rec {
     name = "MooseX-Emulate-Class-Accessor-Fast-0.00903";
     src = fetchurl {
@@ -2361,6 +2407,16 @@ rec {
     propagatedBuildInputs = [ ListMoreUtils Moose ];
   };
 
+  MooseXSetOnce = buildPerlPackage rec {
+    name = "MooseX-SetOnce-0.200001";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz";
+      sha256 = "0qa2i45g2zn4r0wg7hba9va68nin5l63gr9l8b5q3hr4cjn97ll6";
+    };
+    buildInputs = [ TestFatal ];
+    propagatedBuildInputs = [ Moose ];
+  };
+
   MooseXParamsValidate = buildPerlPackage rec {
     name = "MooseX-Params-Validate-0.10";
     src = fetchurl {
@@ -2613,6 +2669,14 @@ rec {
     };
   };
 
+  NumberFormat = buildPerlPackage rec {
+    name = "Number-Format-1.73";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Number/${name}.tar.gz";
+      sha256 = "0v74hscnc807kf65x0am0rddk74nz7nfk3gf16yr5ar1xwibg8l4";
+    };
+  };
+
   ObjectSignature = buildPerlPackage {
     name = "Object-Signature-1.05";
     src = fetchurl {
@@ -2914,10 +2978,10 @@ rec {
   };
 
   RegexpAssemble = buildPerlPackage rec {
-    name = "Regexp-Assemble-0.34";
+    name = "Regexp-Assemble-0.35";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DL/DLAND/${name}.tar.gz";
-      sha256 = "173dnzi3dag88afr4xf5v0hki15cfaffyjimjfmvzv6gbx6fp96f";
+      url = "mirror://cpan/modules/by-module/Regexp/${name}.tar.gz";
+      sha256 = "1msxrriq74q8iacn2hkcw6g4qjjwv777avryiyz1w29h55mwq083";
     };
   };
 
@@ -3264,6 +3328,7 @@ rec {
       CatalystControllerHTMLFormFu
     ];
     buildInputs = [TestPodCoverage];
+    meta.platforms = stdenv.lib.platforms.linux;
   };
 
   TaskPlack = buildPerlPackage rec {
@@ -3338,6 +3403,15 @@ rec {
     doCheck = false;
   };
 
+  TestAssertions = buildPerlPackage rec {
+    name = "Test-Assertions-1.054";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
+      sha256 = "10026w4r3yv6k3vc6cby7d61mxddlqh0ls6z39c82f17awfy9p7w";
+    };
+    buildInputs = [ LogTrace ];
+  };
+
   TestDeep = buildPerlPackage rec {
     name = "Test-Deep-0.109";
     src = fetchurl {
@@ -3426,6 +3500,16 @@ rec {
     };
   };
 
+  TestOutput = buildPerlPackage rec {
+    name = "Test-Output-1.01";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
+      sha256 = "0hg2hv6sify6qcx4865m4gyfdfbi96aw7fx39zpvnrivk3i2jdcd";
+    };
+    buildInputs = [ TestTester ];
+    propagatedBuildInputs = [ SubExporter ];
+  };
+
   TestPerlCritic = buildPerlPackage rec {
     name = "Test-Perl-Critic-1.02";
     src = fetchurl {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f88ac212d6c..571f468aa0d 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -427,10 +427,6 @@ with (import ./release-lib.nix);
     dryad = linux;
   };
 
-  perlPackages = {
-    TaskCatalystTutorial = linux;
-  };
-
   pythonPackages = {
     zfec = linux;
   };

From a559cc270eccd51ddc6dd83953094ddaed6a9a9d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Mar 2012 14:07:34 +0000
Subject: [PATCH 189/208] * Let nix-env only search Python 2.7 packages. 
 Reported by Konrad   Hinsen.

  We should add a check to enforce that every package/version pair in
  "nix-env -qa" is unique :-)

svn path=/nixpkgs/trunk/; revision=33424
---
 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 1cf32638a83..06f02ae601a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4950,10 +4950,10 @@ let
 
   pythonPackages = python27Packages;
 
-  python26Packages = recurseIntoAttrs (import ./python-packages.nix {
+  python26Packages = import ./python-packages.nix {
     inherit pkgs;
     python = python26;
-  });
+  };
 
   python27Packages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;

From e1b49fe69d95ce9c2763b204e9101efd3817b917 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Mar 2012 14:22:28 +0000
Subject: [PATCH 190/208] * Drop some recurseIntoAttrs calls.

svn path=/nixpkgs/trunk/; revision=33425
---
 pkgs/top-level/all-packages.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06f02ae601a..52b3173fc59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5764,19 +5764,17 @@ let
   # Build the kernel modules for the some of the kernels.
   linuxPackages_2_6_27 = recurseIntoAttrs (linuxPackagesFor linux_2_6_27 pkgs.linuxPackages_2_6_27);
   linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 pkgs.linuxPackages_2_6_32);
-  linuxPackages_2_6_32_systemtap =
-    recurseIntoAttrs (linuxPackagesFor linux_2_6_32_systemtap pkgs.linuxPackages_2_6_32_systemtap);
-  linuxPackages_2_6_32_xen =
-    recurseIntoAttrs (linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen);
+  linuxPackages_2_6_32_systemtap = linuxPackagesFor linux_2_6_32_systemtap pkgs.linuxPackages_2_6_32_systemtap;
+  linuxPackages_2_6_32_xen = linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen;
   linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35);
   linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38);
-  linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38);
+  linuxPackages_2_6_38_ati = linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38;
   linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39);
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0);
   linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1);
-  linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
-  linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
-  linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
+  linuxPackages_nanonote_jz_2_6_34 = linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34;
+  linuxPackages_nanonote_jz_2_6_35 = linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35;
+  linuxPackages_nanonote_jz_2_6_36 = linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36;
   linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2);
   linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3);
 

From d465b0798cd9e10e4a35e4150a3d0cac47e6a7a3 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 26 Mar 2012 15:07:37 +0000
Subject: [PATCH 191/208] virtuoso-6.1.5

svn path=/nixpkgs/trunk/; revision=33426
---
 pkgs/servers/sql/virtuoso/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix
index 8271ea8daf4..6d732fde182 100644
--- a/pkgs/servers/sql/virtuoso/default.nix
+++ b/pkgs/servers/sql/virtuoso/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxml2, openssl, readline, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "virtuoso-opensource-6.1.4";
+  name = "virtuoso-opensource-6.1.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
-    sha256 = "0khm81hvjh6p4l0ca4zj00fk41ixjv998k6y9g7mvq1338hr4gqm";
+    sha256 = "02aax76f51ya5slp1slv4r1ihcb7zpb040n33b581g8n1ppgj2ps";
   };
 
   buildInputs = [ libxml2 openssl readline gawk ];

From f6af9b84c6bfe021fe8763c810926b2049417ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 26 Mar 2012 15:36:43 +0000
Subject: [PATCH 192/208] GCC 4.7.0.

svn path=/nixpkgs/trunk/; revision=33431
---
 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 52b3173fc59..a116fb34d1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1925,8 +1925,8 @@ let
   gcc47 = lowPrio (wrapGCC (lib.overrideDerivation gcc46_debug.gcc (a: {
     name = "gcc-debug-4.7.0rc20120314";
     src = fetchurl {
-      url = "ftp://gcc.gnu.org/pub/gcc/snapshots/4.7.0-RC-20120314/gcc-4.7.0-RC-20120314.tar.bz2";
-      sha256 = "0dhzmrhrzlgvsxfbjc1x98pf2y89zkw2lgijyghmxiczc5gniszp";
+      url = "mirror://gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2";
+      sha256 = "19f9kpqwq75ax3iz1jzzpdqhxrqjk5rbjifdgamnsrbg04z0i056";
     };
 
     configureFlags = a.configureFlags

From 95703347b6b1f4112611c16a08bf583666dda00b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 26 Mar 2012 17:47:47 +0000
Subject: [PATCH 193/208] GCC 4.7: Fix the `name' attribute.

svn path=/nixpkgs/trunk/; revision=33432
---
 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 a116fb34d1c..00b810a6439 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1923,7 +1923,7 @@ let
   }));
 
   gcc47 = lowPrio (wrapGCC (lib.overrideDerivation gcc46_debug.gcc (a: {
-    name = "gcc-debug-4.7.0rc20120314";
+    name = "gcc-debug-4.7.0";
     src = fetchurl {
       url = "mirror://gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2";
       sha256 = "19f9kpqwq75ax3iz1jzzpdqhxrqjk5rbjifdgamnsrbg04z0i056";

From bba264d897c9fd2cbe6a8d0159199a75fb00138b Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Mon, 26 Mar 2012 19:11:25 +0000
Subject: [PATCH 194/208] Adding forgotten configure_130312 patch for matitia.

svn path=/nixpkgs/trunk/; revision=33433
---
 .../logic/matita/configure_130312.patch       | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/applications/science/logic/matita/configure_130312.patch

diff --git a/pkgs/applications/science/logic/matita/configure_130312.patch b/pkgs/applications/science/logic/matita/configure_130312.patch
new file mode 100644
index 00000000000..255feec566b
--- /dev/null
+++ b/pkgs/applications/science/logic/matita/configure_130312.patch
@@ -0,0 +1,35 @@
+--- matita/configure     2011-11-22 06:04:17.000000000 -0500
++++ matita/configure     2011-11-24 11:43:11.584847938 -0500
+@@ -1905,6 +1905,7 @@
+ # look for METAS dir
+ 
+ LIBSPATH="`pwd`/components"
++OLDCAMLPATH="$OCAMLPATH"
+ OCAMLPATH="$LIBSPATH/METAS"
+ 
+ # creating META.*
+@@ -1927,7 +1928,7 @@
+ gdome2 \
+ http \
+ lablgtk2 \
+-lablgtksourceview2.gtksourceview2 \
++lablgtk2.gtksourceview \
+ mysql \
+ netstring \
+ ulex08 \
+@@ -1953,13 +1954,13 @@
+ FINDLIB_REQUIRES="\
+ $FINDLIB_CREQUIRES \
+ lablgtk2.glade \
+-lablgtksourceview2.gtksourceview2 \
++lablgtk2.gtksourceview \
+ "
+ for r in $FINDLIB_LIBSREQUIRES $FINDLIB_REQUIRES
+ do
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $r ocaml library" >&5
+ $as_echo_n "checking for $r ocaml library... " >&6; }
+-  if OCAMLPATH=$OCAMLPATH $OCAMLFIND query $r &> /dev/null; then
++  if OCAMLPATH=$OCAMLPATH:$OLDCAMLPATH $OCAMLFIND query $r &> /dev/null; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+   else

From e85794243f4a4f179223451664b0d14d6e5f4848 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Mar 2012 10:31:45 +0000
Subject: [PATCH 195/208] Update Haskell packages.

 - blaze-html: updated to version 0.4.3.2
 - ghc-mod: updated to version 1.10.12
 - gloss: updated to version 1.7.0.1

svn path=/nixpkgs/trunk/; revision=33436
---
 pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++--
 pkgs/development/libraries/haskell/ghc-mod/default.nix    | 4 ++--
 pkgs/development/libraries/haskell/gloss/default.nix      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index 343e54c47b0..7820566e42d 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.4.3.1";
-  sha256 = "0yhwlwmjy3jagxscz2i0yjfy6akqpamn9c35ffxcgpr0kj6qlpfp";
+  version = "0.4.3.2";
+  sha256 = "1mqfvkmjfqy777h4skvgm9nxjgyi12k8alg7mvsk0aj1i80gvkki";
   buildDepends = [ blazeBuilder text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 68af9388bed..248387cf64c 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 = "1.10.11";
-  sha256 = "0s2amrikrlcgiy9iw6f1s43k2lzy9jaiddky078qp1pbk68dhbk9";
+  version = "1.10.12";
+  sha256 = "1r06phm9fjrzwga63065lzdd7dn24sqn3g4fkyh8s30n531672rg";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index a1641ebedce..46c453a5f30 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.6.2.1";
-  sha256 = "0lczr3lm0i19cznkyxx6dhrlg08698mq84wjn7b0im32par1qjj5";
+  version = "1.7.0.1";
+  sha256 = "1wsgrdkimpmii6iagcixsky5cnd6h0w1ssmrjcc15jlcmw460dfx";
   buildDepends = [ bmp GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";

From bb311ce1d091375bfb7cdce66d658397381a084e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Mar 2012 10:48:45 +0000
Subject: [PATCH 196/208] * Boto updated to 2.3.0.

svn path=/nixpkgs/trunk/; revision=33437
---
 pkgs/top-level/python-packages.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d3a3c410d6..32505c106b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -174,16 +174,19 @@ let pythonPackages = python.modules // rec {
   });
 
 
-  boto = buildPythonPackage (rec {
-    name = "boto-2.0b4";
+  boto = buildPythonPackage rec {
+    name = "boto-2.3.0";
 
     src = fetchurl {
-      url = "http://boto.googlecode.com/files/${name}.tar.gz";
-      sha1 = "3e1deab58b8432d01baef1d37f17cbf6fa999f8d";
+      url = "https://github.com/downloads/boto/boto/${name}.tar.gz";
+      sha256 = "05im9vyk9wq8cjw4cp93jlqb9v98rnrm067p93ih7f0ynnlnjaf1";
     };
 
+    # The tests seem to require AWS credentials.
+    doCheck = false;
+
     meta = {
-      homepage = http://code.google.com/p/boto/;
+      homepage = https://github.com/boto/boto;
 
       license = "bsd";
 
@@ -195,7 +198,7 @@ let pythonPackages = python.modules // rec {
         Services.  This includes S3, SQS, EC2, among others.
       '';
     };
-  });
+  };
 
 
   carrot = buildPythonPackage rec {

From 194c822cce1ca62a1053fc1f08a503b2d6ff0145 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Tue, 27 Mar 2012 11:07:53 +0000
Subject: [PATCH 197/208] version 88.0 of spring has arrived

svn path=/nixpkgs/trunk/; revision=33438
---
 pkgs/games/spring/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 99b0c35aedb..09eb41f7267 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
-, openal, libvorbis, glew, freetype, xlibs, SDL, mesa
+, openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils
 , jdk ? null, python ? null
 , withAI ? true # support for AI Interfaces and Skirmish AIs
 }:
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-  version = "0.87.0";
+  version = "0.88.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/springrts/spring_87.0_src.tar.lzma";
-    sha256 = "4c8528966b62e3fede63a4acb3cd5f13ecfed195688e135293bdc747980738b2";
+    url = "mirror://sourceforge/springrts/spring_88.0_src.tar.lzma";
+    sha256 = "f203114b849a83795fe2d413d01c843b6f5b50df0832ce570bc476502f89e6fa";
   };
 
   buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL

From 5a3a3a4e17fd98aabf8d8a1f015d81d8b5c0697b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 27 Mar 2012 11:19:00 +0000
Subject: [PATCH 198/208]   * Fix JDK/JRE error:
 /nix/store/.../jre/lib/i386/xawt/libmawt.so: file not recognized: File format
 not recognized.     Patch provided by Ambrus Kaposi.

svn path=/nixpkgs/trunk/; revision=33439
---
 pkgs/development/compilers/jdk/dlj-bundle-builder.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
index f0d36347ab0..cf59a28164b 100644
--- a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
+++ b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
@@ -53,5 +53,3 @@ fi
 mkdir $jrePath/lib/$architecture/plugins
 ln -s $jrePath/lib/$architecture/libnpjp2.so $jrePath/lib/$architecture/plugins
 
-# Workaround for assertions in xlib, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6532373.
-substituteInPlace $jrePath/lib/*/xawt/libmawt.so --replace XINERAMA FAKEEXTN

From a0f057e80550aee7c0630ea698371ecf3f92605f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Mar 2012 11:31:25 +0000
Subject: [PATCH 199/208] * Updated jdiskreport.

svn path=/nixpkgs/trunk/; revision=33440
---
 pkgs/tools/misc/jdiskreport/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index da0bbf0fb87..7a4de418a8c 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -1,18 +1,22 @@
-{stdenv, fetchurl, unzip, jdk}:
+{ stdenv, fetchurl, unzip, jdk }:
 
-#assert jdk.swingSupport;
-
-stdenv.mkDerivation {
-  name = "jdiskreport-1.3.0";
+stdenv.mkDerivation rec {
+  name = "jdiskreport-1.4.0";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_3_0.zip;
-    sha256 = "1vgiq797gqc6i89w4kscg57snn74wi8x566bhi9xn8r0fbphihxb";
+    url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_0.zip;
+    sha256 = "0kx43480p89wlyza94lzqygqfafsdf964syc2c24q28y42psz4kd";
   };
   
-  buildInputs = [unzip];
+  buildInputs = [ unzip ];
   
   inherit jdk;
+
+  meta = {
+    homepage = http://www.jgoodies.com/freeware/jdiskreport/;
+    description = "A graphical utility to visualize disk usage";
+    license = "unfree-redistributable";
+  };  
 }

From 092487c1fb4bd52f600d70c202ecf2f297c0146c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Mar 2012 15:14:13 +0000
Subject: [PATCH 200/208] Update rubygems

svn path=/nixpkgs/trunk/; revision=33443
---
 .../interpreters/ruby/generated.nix           | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 5786fac0758..7b3250172b1 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -15,7 +15,7 @@ g: # Get dependencies from patched gems
     autotest_rails = g.autotest_rails_4_1_2;
     builder = g.builder_3_0_0;
     buildr = g.buildr_1_4_6;
-    bundler = g.bundler_1_1_2;
+    bundler = g.bundler_1_1_3;
     childprocess = g.childprocess_0_3_1;
     diff_lcs = g.diff_lcs_1_1_3;
     erubis = g.erubis_2_7_0;
@@ -25,12 +25,12 @@ g: # Get dependencies from patched gems
     hoe = g.hoe_2_3_3;
     i18n = g.i18n_0_6_0;
     journey = g.journey_1_0_3;
-    json = g.json_1_6_5;
-    json_pure = g.json_pure_1_6_5;
+    json = g.json_1_6_6;
+    json_pure = g.json_pure_1_6_6;
     mail = g.mail_2_4_4;
     mime_types = g.mime_types_1_18;
     minitar = g.minitar_0_5_3;
-    multi_json = g.multi_json_1_1_0;
+    multi_json = g.multi_json_1_2_0;
     net_sftp = g.net_sftp_2_0_4;
     net_ssh = g.net_ssh_2_3_0;
     nix = g.nix_0_1_1;
@@ -155,7 +155,7 @@ installed versions.'';
         longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
       };
       name = ''activesupport-3.2.2'';
-      requiredGems = [ g.i18n_0_6_0 g.multi_json_1_1_0 ];
+      requiredGems = [ g.i18n_0_6_0 g.multi_json_1_2_0 ];
       sha256 = ''0d7rzjd2rv5qjs1mgfyhdmj08hx8lz0f1vnjq6lhz2k776qiiaxh'';
     };
     arel_3_0_2 = {
@@ -253,16 +253,16 @@ for those one-off tasks, with a language that's a joy to use.
       requiredGems = [ g.rake_0_8_7 g.builder_2_1_2 g.net_ssh_2_0_23 g.net_sftp_2_0_4 g.rubyzip_0_9_4 g.highline_1_5_1 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_3_3 g.atoulme_Antwrap_0_7_1 g.diff_lcs_1_1_2 g.rspec_expectations_2_1_0 g.rspec_mocks_2_1_0 g.rspec_core_2_1_0 g.rspec_2_1_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ];
       sha256 = ''11qwqrdnmzzi4zhgajfq1f1ckvd4kpfm9gyqrfjfalphs4gi0vxz'';
     };
-    bundler_1_1_2 = {
+    bundler_1_1_3 = {
       basename = ''bundler'';
       meta = {
         description = ''The best way to manage your application's dependencies'';
         homepage = ''http://gembundler.com'';
         longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
       };
-      name = ''bundler-1.1.2'';
+      name = ''bundler-1.1.3'';
       requiredGems = [  ];
-      sha256 = ''130b2z724bv5k1xzvpzsnv7wxkl4yyigm5vra9lp0km6l1nfbnab'';
+      sha256 = ''0078yv2iivpirw04v6s71vx3brx7is2p3bmb5v7ybfi9c8myap6z'';
     };
     childprocess_0_3_1 = {
       basename = ''childprocess'';
@@ -423,16 +423,16 @@ See class rdoc for help. Hint: ri Hoe'';
       requiredGems = [  ];
       sha256 = ''15bxq7dqhk88n7cjvmx0ipizc22mzf5mnb58r1nq2sq5mcpag6gb'';
     };
-    json_1_6_5 = {
+    json_1_6_6 = {
       basename = ''json'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
       };
-      name = ''json-1.6.5'';
+      name = ''json-1.6.6'';
       requiredGems = [  ];
-      sha256 = ''0zmdzxbczpciyra7zskn7ayfi0z43p2f3n060gsjgjiqcb5bvz75'';
+      sha256 = ''0g26j5r3hznmn8c4b8hadgfzdr7lvdy3xrr4za8dm60m79i0nvbd'';
     };
     json_pure_1_4_3 = {
       basename = ''json_pure'';
@@ -445,16 +445,16 @@ See class rdoc for help. Hint: ri Hoe'';
       requiredGems = [  ];
       sha256 = ''1xw357gkmk6712c94lhpsrq8j9v91mgc2nxlr1m6n20yl6sz2g9r'';
     };
-    json_pure_1_6_5 = {
+    json_pure_1_6_6 = {
       basename = ''json_pure'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation in pure Ruby.'';
       };
-      name = ''json_pure-1.6.5'';
+      name = ''json_pure-1.6.6'';
       requiredGems = [  ];
-      sha256 = ''09s5qymc4y9q0376zjiwf5bjm69fcivr75ar8ji0kmhjkk2rwc55'';
+      sha256 = ''0n1qs826h18ckgqa0k9wsw2ypm61jjicd4s9nsyaakaqyf62p9cg'';
     };
     mail_2_4_4 = {
       basename = ''mail'';
@@ -498,16 +498,16 @@ longer happen.
       requiredGems = [  ];
       sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
     };
-    multi_json_1_1_0 = {
+    multi_json_1_2_0 = {
       basename = ''multi_json'';
       meta = {
         description = ''A gem to provide swappable JSON backends.'';
         homepage = ''http://github.com/intridea/multi_json'';
-        longDescription = ''A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, JSON pure, or a vendored version of okjson.'';
+        longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
       };
-      name = ''multi_json-1.1.0'';
+      name = ''multi_json-1.2.0'';
       requiredGems = [  ];
-      sha256 = ''0dsqx39l6zwfw9l9zyl4l9rr83617a6i1rznw218jskxhi7jsqxr'';
+      sha256 = ''1pv5bzj2xniyr2lqh1a4ac5k4gj7k6dmwxp5z4kmyz46bbjkgpg2'';
     };
     net_sftp_2_0_4 = {
       basename = ''net_sftp'';
@@ -630,7 +630,7 @@ request helpers feature.'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
       name = ''rails-3.2.2'';
-      requiredGems = [ g.activesupport_3_2_2 g.actionpack_3_2_2 g.activerecord_3_2_2 g.activeresource_3_2_2 g.actionmailer_3_2_2 g.railties_3_2_2 g.bundler_1_1_2 ];
+      requiredGems = [ g.activesupport_3_2_2 g.actionpack_3_2_2 g.activerecord_3_2_2 g.activeresource_3_2_2 g.actionmailer_3_2_2 g.railties_3_2_2 g.bundler_1_1_3 ];
       sha256 = ''0kwh8142zxyvrva09m5g85cmwhby714q87j1mb8s6wikv4gvfmy9'';
     };
     railties_3_2_2 = {
@@ -689,7 +689,7 @@ documentation.
 See RDoc for a description of RDoc's markup and basic use.'';
       };
       name = ''rdoc-3.12'';
-      requiredGems = [ g.json_1_6_5 ];
+      requiredGems = [ g.json_1_6_6 ];
       sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp'';
     };
     rjb_1_3_3 = {
@@ -775,7 +775,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
 * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
       };
       name = ''rubyforge-2.0.3'';
-      requiredGems = [ g.json_pure_1_6_5 ];
+      requiredGems = [ g.json_pure_1_6_6 ];
       sha256 = ''1ck9hkad55dy25819v4gd1nmnpvcrb3i4np3hc03h1j6q8qpxg5p'';
     };
     rubyforge_2_0_4 = {

From db28c68df050ff788f3a1cd723e401bebc9bb70e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Mar 2012 15:20:37 +0000
Subject: [PATCH 201/208] mkDerivation handles propagatedUserEnvPkgs properly
 now

svn path=/nixpkgs/trunk/; revision=33444
---
 pkgs/development/interpreters/ruby/gem.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix
index 8ec80b785de..124c7cd747f 100644
--- a/pkgs/development/interpreters/ruby/gem.nix
+++ b/pkgs/development/interpreters/ruby/gem.nix
@@ -43,12 +43,6 @@ let
     '';
 
     propagatedUserEnvPkgs = requiredGems;
-    postFixup = ''
-      if [ -n "$propagatedUserEnvPkgs" ]; then
-          mkdir -p "$out/nix-support"
-          echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages"
-      fi
-    '';
 
   };
   mb = stdenv.lib.maybeAttr;

From 68b5044cc00224ef650e10db29d6e179c038450a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 27 Mar 2012 20:33:49 +0000
Subject: [PATCH 202/208] Adding 'usernixos', where I start a modular
 kind-of-nixos that can go into "nix-env -i" profiles, as a container for
 flexible configuration at the style of nixos, to be defined in
 .nixpkgs/config.nix, with the main target of generating an activation script.

svn path=/nixpkgs/trunk/; revision=33445
---
 pkgs/build-support/usernixos/activation.nix  | 26 +++++++++
 pkgs/build-support/usernixos/bashrc.nix      | 59 ++++++++++++++++++++
 pkgs/build-support/usernixos/eval-config.nix | 31 ++++++++++
 pkgs/build-support/usernixos/module-list.nix |  4 ++
 pkgs/top-level/all-packages.nix              | 10 ++++
 5 files changed, 130 insertions(+)
 create mode 100644 pkgs/build-support/usernixos/activation.nix
 create mode 100644 pkgs/build-support/usernixos/bashrc.nix
 create mode 100644 pkgs/build-support/usernixos/eval-config.nix
 create mode 100644 pkgs/build-support/usernixos/module-list.nix

diff --git a/pkgs/build-support/usernixos/activation.nix b/pkgs/build-support/usernixos/activation.nix
new file mode 100644
index 00000000000..2e3f0af2bf7
--- /dev/null
+++ b/pkgs/build-support/usernixos/activation.nix
@@ -0,0 +1,26 @@
+{ pkgs, config, ... }:
+
+let
+  script = pkgs.writeScriptBin "usernixos" (''
+    #!${pkgs.bash}/bin/bash
+  '' + config.activationContents);
+in
+with pkgs.lib;
+{
+  options = {
+    activation = mkOption {
+      default = {};
+    };
+
+    activationContents = mkOption {
+      default = "";
+      internal = true;
+      merge = concatStringsSep "\n";
+      description = ''
+        Commands to run at activation
+      '';
+    };
+  };
+
+  config.activation.toplevel = script;
+}
diff --git a/pkgs/build-support/usernixos/bashrc.nix b/pkgs/build-support/usernixos/bashrc.nix
new file mode 100644
index 00000000000..1860f4b2e89
--- /dev/null
+++ b/pkgs/build-support/usernixos/bashrc.nix
@@ -0,0 +1,59 @@
+# Generator for .bashrc
+{pkgs, config, ...}:
+
+with pkgs.lib;
+
+let
+  bashrcFile = pkgs.writeScript "bashrc" config.bashrc.contents;
+  cfg = config.bashrc;
+in
+{
+  options = {
+    environment.editor = mkOption {
+      default = "${pkgs.vim}/bin/vim";
+      type = types.string;
+      description = ''
+        Editor
+      '';
+    };
+
+    bashrc = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable of .bashrc generation on activation
+        '';
+      };
+
+      destination = mkOption {
+        default = "~/.bashrc";
+        type = types.string;
+        description = ''
+          The symlink that will point to the generated bashrc at activation time
+        '';
+      };
+
+      contents = mkOption {
+        default = "";
+        type = types.string;
+        merge = concatStringsSep "\n";
+        description = ''
+          Enable of .bashrc generation on activation
+        '';
+      };
+    };
+  };
+
+  config.bashrc.contents = ''
+    export EDITOR="${config.environment.editor}"
+  '';
+
+  config.activationContents = mkIf cfg.enable ''
+    if [ -e "${cfg.destination}" ]; then
+      echo Cannot set "${cfg.destination}", it exists
+      exit 1
+    fi
+    ln -sf ${bashrcFile} "${cfg.destination}"
+  '';
+}
diff --git a/pkgs/build-support/usernixos/eval-config.nix b/pkgs/build-support/usernixos/eval-config.nix
new file mode 100644
index 00000000000..300ddd2444e
--- /dev/null
+++ b/pkgs/build-support/usernixos/eval-config.nix
@@ -0,0 +1,31 @@
+{ system ? builtins.currentSystem
+, pkgs ? null
+, baseModules ? import ./module-list.nix
+, extraArgs ? {}
+, modules
+}:
+
+let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in
+
+rec {
+
+  # These are the NixOS modules that constitute the system configuration.
+  configComponents = modules ++ baseModules;
+
+  # Merge the option definitions in all modules, forming the full
+  # system configuration.  It's not checked for undeclared options.
+  systemModule =
+    pkgs.lib.fixMergeModules configComponents extraArgs;
+
+  optionDefinitions = systemModule.config;
+  optionDeclarations = systemModule.options;
+  inherit (systemModule) options;
+
+  # These are the extra arguments passed to every module.  In
+  # particular, Nixpkgs is passed through the "pkgs" argument.
+  extraArgs = extraArgs_ // {
+    inherit pkgs modules baseModules;
+  };
+
+  config = systemModule.config;
+}
diff --git a/pkgs/build-support/usernixos/module-list.nix b/pkgs/build-support/usernixos/module-list.nix
new file mode 100644
index 00000000000..2aa5329940b
--- /dev/null
+++ b/pkgs/build-support/usernixos/module-list.nix
@@ -0,0 +1,4 @@
+[
+  ./activation.nix
+  ./bashrc.nix
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00b810a6439..1299081d516 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -353,6 +353,16 @@ let
     inherit pkgs lib;
   };
 
+  usernixos = let
+      configmodule = getConfig [ "usernixos" ] null;
+      eval = (import ../build-support/usernixos/eval-config.nix) {
+        inherit pkgs system;
+        modules = [ configmodule ];
+      };
+    in
+      assert configmodule != null;
+      eval.config.activation.toplevel;
+
   platforms = import ./platforms.nix;
 
 

From 6d23fe4501b4b449e675cb91ea6bfcad28e480fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 27 Mar 2012 22:05:03 +0000
Subject: [PATCH 203/208] Adding meta to busybox, and setting me as maintainer,
 and asking hydra to build it.

svn path=/nixpkgs/trunk/; revision=33446
---
 pkgs/misc/busybox/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix
index b5bf9e038c9..ce42a156605 100644
--- a/pkgs/misc/busybox/default.nix
+++ b/pkgs/misc/busybox/default.nix
@@ -64,4 +64,12 @@ stdenv.mkDerivation rec {
         CONFIG_IONICE n
       '' else "");
   };
+
+  meta = {
+    description = "Tiny versions of common UNIX utilities in a single small executable";
+    homepage = http://busybox.net/;
+    license = "GPLv2";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
 }

From a6238bce68f5b76062f949e7854899f17d900c75 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 28 Mar 2012 08:40:41 +0000
Subject: [PATCH 204/208] avidemux: upgraded to 2.5.6

- added support for vp8 (libvpx)
- added support for xvid
- added support for libva output

svn path=/nixpkgs/trunk/; revision=33447
---
 pkgs/applications/video/avidemux/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 4aaf2ef9cc1..d706d16241c 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -1,20 +1,20 @@
 {stdenv, fetchurl, cmake, pkgconfig, libxml2, qt4, gtk, gettext, SDL,
 libXv, pixman, libpthreadstubs, libXau, libXdmcp, libxslt, x264,
-alsaLib, lame, faac, faad2, libvorbis }:
+alsaLib, lame, faac, faad2, libvorbis, yasm, libvpx, xvidcore, libva }:
 
 assert stdenv ? glibc;
 
 stdenv.mkDerivation {
-  name = "avidemux-2.5.2";
+  name = "avidemux-2.5.6";
   
   src = fetchurl {
-    url = mirror://sourceforge/avidemux/avidemux_2.5.2.tar.gz;
-    sha256 = "1apq5s79ik562xmhyvg6nvkmk2bhm5fcjwsrwrpxwipn6swkfpk8";
+    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 ];
+    lame faac faad2 libvorbis yasm libvpx xvidcore libva ];
 
   cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" +
     " -DGETTEXT_INCLUDE_DIR=${gettext}/include" +

From 37e67f9888ef832acdf4e577478115ce7d233182 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Wed, 28 Mar 2012 13:21:42 +0000
Subject: [PATCH 205/208] wgetpaste is a handy shell utility getting things
 pasted on pasting services online

svn path=/nixpkgs/trunk/; revision=33450
---
 pkgs/tools/text/wgetpaste/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  6 ++++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/text/wgetpaste/default.nix

diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
new file mode 100644
index 00000000000..c9993ec4282
--- /dev/null
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, wget, bash, coreutils}:
+  stdenv.mkDerivation rec {
+    version = "2.18";
+    name = "wgetpaste-${version}";
+      src = fetchurl {
+        url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
+        sha256 = "95ee46eac37ca74ce960c1726afc19f4a1dde4d1875ac860fdc5e45d3cb05d3e";
+    };
+    # currently zsh-autocompletion support is not installed
+
+    prePatch = ''
+      substituteInPlace wgetpaste --replace "/usr/bin/env bash" "${bash}/bin/bash"
+    '';
+
+    installPhase = ''
+      mkdir -p $out/bin;
+      cp wgetpaste $out/bin;
+    '';
+
+    meta = {
+      description = "wgetpaste";
+      homepage = http://wgetpaste.zlin.dk/;
+      license = "publicDomain";
+      maintainers = with stdenv.lib.maintainers; [qknight];
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1299081d516..130a70d8ce4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -606,6 +606,8 @@ let
 
   diffutils = callPackage ../tools/text/diffutils { };
 
+  wgetpaste = callPackage ../tools/text/wgetpaste { };
+
   dirmngr = callPackage ../tools/security/dirmngr { };
 
   disper = callPackage ../tools/misc/disper { };
@@ -7481,6 +7483,10 @@ let
 
   virtviewer = callPackage ../applications/virtualization/virt-viewer {};
 
+  virtmanager = callPackage ../applications/virtualization/virt-manager {};
+
+  virtinst = callPackage ../applications/virtualization/virtinst {};
+
   virtualgl = callPackage ../tools/X11/virtualgl { };
 
   bumblebee = callPackage ../tools/X11/bumblebee { };

From b575fa12590be07fb6bca6a438364e52fa420c38 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Mar 2012 13:49:14 +0000
Subject: [PATCH 206/208] all-packages.nix: removed virtmanager and virtinst
 attributes, which point to non-existent files

svn path=/nixpkgs/trunk/; revision=33451
---
 pkgs/top-level/all-packages.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 130a70d8ce4..e5cefbbe80d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7483,10 +7483,6 @@ let
 
   virtviewer = callPackage ../applications/virtualization/virt-viewer {};
 
-  virtmanager = callPackage ../applications/virtualization/virt-manager {};
-
-  virtinst = callPackage ../applications/virtualization/virtinst {};
-
   virtualgl = callPackage ../tools/X11/virtualgl { };
 
   bumblebee = callPackage ../tools/X11/bumblebee { };

From e94fd0e83cf7787fec988f40dfac11c80e996c14 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Mar 2012 13:49:16 +0000
Subject: [PATCH 207/208] all-packages.nix: stripped trailing whitespace

svn path=/nixpkgs/trunk/; revision=33452
---
 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 e5cefbbe80d..a5eec370973 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5178,7 +5178,7 @@ let
   oidentd = callPackage ../servers/identd/oidentd { };
 
   openfire = callPackage ../servers/xmpp/openfire { };
- 
+
   OVMF = callPackage ../applications/virtualization/OVMF { };
 
   postgresql = postgresql83;
@@ -6102,7 +6102,7 @@ let
 
   xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
 
-  xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau { 
+  xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau {
     inherit (xorg) xorgserver xproto fontsproto xf86driproto renderproto
       videoproto utilmacros;
   };
@@ -8452,7 +8452,7 @@ let
   pgf1 = callPackage ../tools/typesetting/tex/pgf/1.x.nix { };
 
   pgf2 = callPackage ../tools/typesetting/tex/pgf/2.x.nix { };
-  
+
   pgfplots = callPackage ../tools/typesetting/tex/pgfplots { };
 
   pjsip = callPackage ../applications/networking/pjsip { };

From db8f709430e20ad07e040af1813529e133ec823b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Mar 2012 13:49:20 +0000
Subject: [PATCH 208/208] Updated Haskell packages.

 - derp: updated to version 0.1.6
 - happstack-server: updated to version 6.6.5
 - hlint: updated to version 1.8.26

svn path=/nixpkgs/trunk/; revision=33453
---
 pkgs/development/libraries/haskell/derp/default.nix           | 4 ++--
 .../libraries/haskell/happstack/happstack-server.nix          | 4 ++--
 pkgs/development/tools/haskell/hlint/default.nix              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix
index 5595c909aa0..ca702b60356 100644
--- a/pkgs/development/libraries/haskell/derp/default.nix
+++ b/pkgs/development/libraries/haskell/derp/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "derp";
-  version = "0.1.5";
-  sha256 = "0mpc4hav5iqrcjns5sz8q0v2c0d7nb2hbzn58cmbl7cma2kp36li";
+  version = "0.1.6";
+  sha256 = "0g8y98qjjampbwnxhvjzrs2jczh2mcwsacjq95jxpidgsld00shk";
   meta = {
     description = "Derivative Parsing";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index f02586d51a4..29ba6b50d8f 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "6.6.4";
-  sha256 = "1bdgazyrin7flfqi5ix8pp3ldisb101s4p8539h19xc8jw22x6sk";
+  version = "6.6.5";
+  sha256 = "1s0sa0sk2g6q55xwmzzdca327kp7mhxwc4dlg8lrdqa4dr3hm3gj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 074695a8247..2945a661a36 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.25";
-  sha256 = "1pxdkwqg04hjynck06ib94spjviri3y1ivhagc8icwjwlizbn5ib";
+  version = "1.8.26";
+  sha256 = "001id2853bkxnbh7jc0bvfyq7v9595zn31n7hhma3il0dqim71lp";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [