From 27e2fb68956bb2c0b5e55dc6311abc600ecf26b1 Mon Sep 17 00:00:00 2001
From: Malcolm Matalka <mmatalka@gmail.com>
Date: Fri, 15 Mar 2013 12:41:01 +0100
Subject: [PATCH 001/394] Upgrade to 1.0.0

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

diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 0a0dd4e6fe22..c36d0004992a 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -27,13 +27,13 @@ let
       sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81";
     };
     opam = fetchurl {
-      url = "https://github.com/OCamlPro/opam/archive/0.9.5.zip";
-      sha256 = "2ec706330a3283b4d057abc562c6078351988d0ae98ad507fe51cae598b43afd";
+      url = "https://github.com/OCamlPro/opam/archive/1.0.0.zip";
+      sha256 = "f8d94a91c2b8d110fa5e3b0a87c512a860acbae110654498a164c5c888c40bda";
     };
   };
 in
 stdenv.mkDerivation rec {
-  name = "opam-0.9.5";
+  name = "opam-1.0.0";
 
   buildInputs = [unzip curl ncurses ocaml];
 

From 4e5b7cd5d1dc6c4af752f894566dff7a43ac7d1c Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Sat, 16 Mar 2013 14:59:35 +0100
Subject: [PATCH 002/394] Add cloc-1.58

---
 pkgs/tools/misc/cloc/default.nix | 30 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  4 ++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/misc/cloc/default.nix

diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
new file mode 100644
index 000000000000..dfe5476f8130
--- /dev/null
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, perl, AlgorithmDiff, RegexpCommon }:
+
+stdenv.mkDerivation rec {
+  
+  name = "cloc-${version}";
+
+  version = "1.58";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cloc/cloc-${version}.tar.gz";
+    sha256 = "1k92jldy4m717lh1xd6yachx3l2hhpx76qhj1ipnx12hsxw1zc8w";
+  };
+
+  buildInputs = [ perl AlgorithmDiff RegexpCommon ];
+
+  unpackPhase = ''
+    mkdir ${name}
+    tar xf $src -C ${name}
+    cd ${name}
+  '';
+
+  makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ];
+
+  meta = {
+    description = "A program that counts lines of source code";
+    homepage = http://cloc.sourceforge.net;
+    license = stdenv.lib.licenses.gpl2;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 896d9ee99c90..4afdd3f49903 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -587,6 +587,10 @@ let
 
   clamav = callPackage ../tools/security/clamav { };
 
+  cloc = callPackage ../tools/misc/cloc {
+    inherit (perlPackages) perl AlgorithmDiff RegexpCommon;
+  };
+
   cloog = callPackage ../development/libraries/cloog { };
 
   cloogppl = callPackage ../development/libraries/cloog-ppl { };

From 47ca534deb502a8ddf50ca25014525787480492e Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Sat, 16 Mar 2013 15:14:29 +0100
Subject: [PATCH 003/394] Add haskell-netwire

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

diff --git a/pkgs/development/libraries/haskell/netwire/default.nix b/pkgs/development/libraries/haskell/netwire/default.nix
new file mode 100644
index 000000000000..d7ab9539e0c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/netwire/default.nix
@@ -0,0 +1,18 @@
+{ cabal, bifunctors, deepseq, liftedBase, monadControl, mtl
+, profunctors, random, semigroups, tagged, time, vectorSpace
+}:
+
+cabal.mkDerivation (self: {
+  pname = "netwire";
+  version = "4.0.7";
+  sha256 = "035jz7j19c7n4za9xi8vj6yl9m2b2v6d53mp711gf8609wv0cx0c";
+  buildDepends = [
+    bifunctors deepseq liftedBase monadControl mtl profunctors random
+    semigroups tagged time vectorSpace
+  ];
+  meta = {
+    description = "Flexible wire arrows for FRP";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4ffd314f3c99..1ca8d0b14c45 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1318,6 +1318,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   netlistToVhdl = callPackage ../development/libraries/haskell/netlist-to-vhdl {};
 
+  netwire = callPackage ../development/libraries/haskell/netwire {};
+
   network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {};
   network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
   network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {};

From 4873645bef130a11524eadcddd28ea8e2da39c20 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Sat, 16 Mar 2013 15:24:09 +0100
Subject: [PATCH 004/394] Add haskell-cereal-conduit

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

diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
new file mode 100644
index 000000000000..8637724e11a4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
@@ -0,0 +1,14 @@
+{ cabal, cereal, conduit, transformers, HUnit }:
+
+cabal.mkDerivation (self: {
+  pname = "cereal-conduit";
+  version = "0.7";
+  sha256 = "0cf0lp47qiilrdrzmn58hwh3q7fh7g55f2a1r1bw31xapp1cvbix";
+  buildDepends = [ cereal conduit transformers HUnit ];
+  meta = {
+    homepage = "https://github.com/litherum/cereal-conduit";
+    description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4ffd314f3c99..765ad5b6cca4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -583,6 +583,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cereal = callPackage ../development/libraries/haskell/cereal {};
 
+  cerealConduit = callPackage ../development/libraries/haskell/cereal-conduit {};
+
   certificate = callPackage ../development/libraries/haskell/certificate {};
 
   cgi_3001_1_7_1 = callPackage ../development/libraries/haskell/cgi/3001.1.7.1.nix {};

From 8082dd3753e98b260a2aaa2553560fe7fae6e08c Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Sat, 16 Mar 2013 15:33:16 +0100
Subject: [PATCH 005/394] Add haskell-stm-conduit

This adds the dependency haskell-stm-chans as well.
---
 .../libraries/haskell/stm-chans/default.nix    | 14 ++++++++++++++
 .../libraries/haskell/stm-conduit/default.nix  | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  4 ++++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/stm-chans/default.nix
 create mode 100644 pkgs/development/libraries/haskell/stm-conduit/default.nix

diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix
new file mode 100644
index 000000000000..74e121e5af99
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm-chans/default.nix
@@ -0,0 +1,14 @@
+{ cabal, stm }:
+
+cabal.mkDerivation (self: {
+  pname = "stm-chans";
+  version = "1.3.1";
+  sha256 = "15agd0d3r3zmya72hpi9pkmzqw7mj6l84946dhds0hsb6d12r6qj";
+  buildDepends = [ stm ];
+  meta = {
+    homepage = "http://code.haskell.org/~wren/";
+    description = "Additional types of channels for STM";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
new file mode 100644
index 000000000000..e6c1d64857df
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -0,0 +1,18 @@
+{ cabal, conduit, resourcet, stm, stmChans, transformers, HUnit, QuickCheck
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }:
+
+cabal.mkDerivation (self: {
+  pname = "stm-conduit";
+  version = "1.0.0";
+  sha256 = "1kkx3x3qdqw5jp9vn9kxbxmmb8x0wdbp8jch08azw45pwjh3ga7v";
+  buildDepends = [
+    conduit resourcet stm stmChans transformers HUnit QuickCheck
+    testFramework testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "https://github.com/wowus/stm-conduit";
+    description = "Introduces conduits to channels, and promotes using conduits concurrently";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4ffd314f3c99..52d331af75a8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1687,6 +1687,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   stm_2_4_2 = callPackage ../development/libraries/haskell/stm/2.4.2.nix {};
   stm = self.stm_2_4_2;
 
+  stmChans = callPackage ../development/libraries/haskell/stm-chans {};
+
+  stmConduit = callPackage ../development/libraries/haskell/stm-conduit {};
+
   storableComplex = callPackage ../development/libraries/haskell/storable-complex {};
 
   storableRecord = callPackage ../development/libraries/haskell/storable-record {};

From 16972d2415af915ed1aaa9e20dfc352f5486a0fc Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 17 Mar 2013 12:24:49 +0000
Subject: [PATCH 006/394] screen: fix some annoying bugs by importing patches
 from ArchLinux

---
 pkgs/tools/misc/screen/default.nix            |  3 ++
 .../screen/screen-4.0.3-caption-colors.patch  | 25 ++++++++++++++++
 .../misc/screen/screen-4.0.3-long-term.patch  | 29 +++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch
 create mode 100644 pkgs/tools/misc/screen/screen-4.0.3-long-term.patch

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 2a5256761926..2a3f53d67417 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -8,6 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "0xvckv1ia5pjxk7fs4za6gz2njwmfd54sc464n8ab13096qxbw3q";
   };
 
+  patches = [ ./screen-4.0.3-caption-colors.patch
+              ./screen-4.0.3-long-term.patch ];
+
   preConfigure = ''
     configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc"
     sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in
diff --git a/pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch b/pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch
new file mode 100644
index 000000000000..14365dc81c1b
--- /dev/null
+++ b/pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch
@@ -0,0 +1,25 @@
+# Source:
+# https://projects.archlinux.org/svntogit/packages.git/plain/screen/trunk/screen-4.0.3-caption-colors.patch
+# modified by hand for nixpkgs
+
+From e6a28cf8bfdac15faa6c267bf476ddcaddf48d67 Mon Sep 17 00:00:00 2001
+From: Sadrul Habib Chowdhury <sadrul@users.sourceforge.net>
+Date: Tue, 26 Jan 2010 20:17:26 +0000
+Subject: Accommodate more color changes in the caption.
+
+---
+diff --git a/src/screen.c b/src/screen.c
+index b1c3dfb..2cceae0 100644
+--- a/screen.c
++++ b/screen.c
+@@ -2204,7 +2204,7 @@ static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
+ #endif
+ 
+ static char winmsg_buf[MAXSTR];
+-#define MAX_WINMSG_REND 16	/* rendition changes */
++#define MAX_WINMSG_REND 256	/* rendition changes */
+ static int winmsg_rend[MAX_WINMSG_REND];
+ static int winmsg_rendpos[MAX_WINMSG_REND];
+ static int winmsg_numrend;
+--
+cgit v0.8.3.4
diff --git a/pkgs/tools/misc/screen/screen-4.0.3-long-term.patch b/pkgs/tools/misc/screen/screen-4.0.3-long-term.patch
new file mode 100644
index 000000000000..f94f9da8ac4a
--- /dev/null
+++ b/pkgs/tools/misc/screen/screen-4.0.3-long-term.patch
@@ -0,0 +1,29 @@
+# Source:
+# https://projects.archlinux.org/svntogit/packages.git/plain/screen/trunk/screen-4.0.3-long-term.patch
+
+# This fixes long terminal names handling, e.g. TERM=rxvt-unicode-256colors works
+# as expected.
+diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h
+--- screen-4.0.3-orig//display.h	2003-07-02 00:01:42.000000000 +1000
++++ screen-4.0.3/display.h	2010-12-03 20:19:23.826671689 +1000
+@@ -85,7 +85,7 @@
+   struct win *d_other;		/* pointer to other window */
+   int   d_nonblock;		/* -1 don't block if obufmax reached */
+ 				/* >0: block after nonblock secs */
+-  char  d_termname[20 + 1];	/* $TERM */
++  char  d_termname[40 + 1];	/* $TERM */
+   char	*d_tentry;		/* buffer for tgetstr */
+   char	d_tcinited;		/* termcap inited flag */
+   int	d_width, d_height;	/* width/height of the screen */
+diff -Naur screen-4.0.3-orig//screen.h screen-4.0.3/screen.h
+--- screen-4.0.3-orig//screen.h	2003-08-22 22:28:43.000000000 +1000
++++ screen-4.0.3/screen.h	2010-12-03 20:19:43.163338333 +1000
+@@ -202,7 +202,7 @@
+ 	  char preselect[20];
+ 	  int esc;		/* his new escape character unless -1 */
+ 	  int meta_esc;		/* his new meta esc character unless -1 */
+-	  char envterm[20 + 1];	/* terminal type */
++	  char envterm[40 + 1];	/* terminal type */
+ 	  int encoding;		/* encoding of display */
+ 	}
+       attach;

From 16f6c3b752f8e951237cb62eef750566197b15e5 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 17 Mar 2013 14:45:37 +0100
Subject: [PATCH 007/394] i3: update to 4.5 also updating i3status to 2.7

---
 pkgs/applications/window-managers/i3/default.nix | 12 ++++++------
 pkgs/applications/window-managers/i3/status.nix  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 94ac84f838c2..f8e4e16655aa 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,18 +1,18 @@
-{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison,
-  xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex,
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil,
+  xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl,
   libXcursor, coreutils, perl }:
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
-  version = "4.4";
+  version = "4.5";
 
   src = fetchurl {
     url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "06s8gzcxxh06zp1586kp4bxaj8yj5i9jacwg0nizbmmnx94mg1wr";
+    sha256 = "1kiffcbvvjljqchw9ffgy9s8f9z06i8805jvjas58q5i2yxl5kcy";
   };
 
-  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
-    libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm
+    libstartup_notification libX11 pcre libev yajl libXcursor perl ];
 
   patchPhase = ''
     sed -i -e '/^# Pango/,/^$/d' common.mk
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 60db6188f70c..76fc487ba4ab 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -2,11 +2,11 @@
   }:
 
 stdenv.mkDerivation rec {
-  name = "i3status-2.6";
+  name = "i3status-2.7";
 
   src = fetchurl {
     url = "http://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "e7e710cc271887bcd22757269e1b00a5618fb53abdb3455140116b3d38797bce";
+    sha256 = "0cm6fhsc7hzsqni8pwhjl2l0rfd458paabn54cgzqnmwwdflwgq7";
   };
 
   buildInputs = [ confuse yajl alsaLib wirelesstools ];

From 464fd741cd3744d308339941569fd738da072157 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 17 Mar 2013 15:13:53 +0100
Subject: [PATCH 008/394] notmuch: update to 0.15.2

---
 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 147d5f491517..1477cd82cf44 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.15";
+  name = "notmuch-0.15.2";
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "07bi87jxfh761b4fvcwf4svlksd7jlznnzhnsp983gdldkabg60q";
+    sha256 = "03cwylm0y9xld0hn753v0hn62f96nagdmzxv8jlz8vdbh9iszs56";
   };
 
   buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];

From 44ec42ed93ee533cc2984d3db8f2f6366fe2b562 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 17 Mar 2013 15:15:56 +0100
Subject: [PATCH 009/394] pythonPackages.alot: update to 0.3.4 (and stable
 revision)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 877d2d3ed7c2..7d5d885ca9d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -124,13 +124,13 @@ pythonPackages = python.modules // rec {
 
 
   alot = buildPythonPackage rec {
-    rev = "c765ebd6041a845a800cc9fd30705102ae2d040f";
-    name = "alot-0.3.3_${rev}";
+    rev = "d3c1880a60ddd8ded397d92cddf310a948b97fdc";
+    name = "alot-0.3.4_${rev}";
 
     src = fetchurl {
       url = "https://github.com/pazz/alot/tarball/${rev}";
       name = "${name}.tar.bz";
-      sha256 = "0yyp3nz5n1zfwf0l4rkkphq5l6prd988b57ighnmi2samzqa9yv4";
+      sha256 = "049fzxs83zry5xr3al5wjvh7bcjq63wilf9wxh2c6sjmg96kpvvl";
     };
 
     # error: invalid command 'test'

From cdcfc953bfe07256313b313464bfbb2b66e82263 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 17 Mar 2013 15:17:20 +0100
Subject: [PATCH 010/394] pythonPackages.httplib2: update to 0.8

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7d5d885ca9d1..bdda69591b7a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1321,11 +1321,11 @@ pythonPackages = python.modules // rec {
   });
 
   httplib2 = buildPythonPackage rec {
-    name = "httplib2-0.7.7";
+    name = "httplib2-0.8";
 
     src = fetchurl {
       url = "http://httplib2.googlecode.com/files/${name}.tar.gz";
-      sha256 = "2e2ce18092c32d1ec54f8a447e14e33585e30f240b883bfeeca65f12b3bcfaf6";
+      sha256 = "0gww8axb4j1vysbk9kfsk5vrws9a403gh30dxchmga8hrg1rns5g";
     };
 
     meta = {

From cad8f4b0f6111609ed8ba1fc75fc918db7225600 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 17 Mar 2013 15:23:56 +0100
Subject: [PATCH 011/394] pythonPackage.flake8: update to 2.0

flake8 is not depending on pyflakes, mccabe, pep8 which were also updated or added.
---
 pkgs/top-level/python-packages.nix | 65 +++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bdda69591b7a..52fd1c92bb02 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1049,17 +1049,18 @@ pythonPackages = python.modules // rec {
 
 
   flake8 = buildPythonPackage (rec {
-    name = "flake8-1.7.0";
+    name = "flake8-2.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz";
-      md5 = "a7830d1a6c23e889bc1fcaa4a87f53bd";
+      md5 = "176c6b3613777122721db181560aa1e3";
     };
 
     buildInputs = [ nose ];
+    propagatedBuildInputs = [ pyflakes pep8 mccabe ];
 
     # 3 failing tests
-    doCheck = false;
+    #doCheck = false;
 
     meta = {
       description = "code checking using pep8 and pyflakes.";
@@ -1651,6 +1652,25 @@ pythonPackages = python.modules // rec {
   });
 
 
+  mccabe = buildPythonPackage (rec {
+    name = "mccabe-0.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz";
+      md5 = "c1012c7c24081471f45aab864d4e3805";
+    };
+
+    buildInputs = [ ];
+
+    meta = {
+      description = "McCabe checker, plugin for flake8";
+      homepage = "https://github.com/flintwork/mccabe";
+      license = pkgs.lib.licenses.mit;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+    };
+  });
+
+
   mechanize = buildPythonPackage (rec {
     name = "mechanize-0.1.11";
 
@@ -2183,17 +2203,32 @@ pythonPackages = python.modules // rec {
 
   pep8 = buildPythonPackage rec {
     name = "pep8-${version}";
-    version = "1.3.3";
+    version = "1.4.5";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz";
-      md5 = "093a99ced0cc3b58c01549d7350f5a73";
+      md5 = "055dbd22ac5669232fdba752612e9686";
     };
 
+    #======================================================================
+    #FAIL: test_check_simple (testsuite.test_shell.ShellTestCase)
+    #----------------------------------------------------------------------
+    #Traceback (most recent call last):
+    #  File "/tmp/nix-build-python-pep8-1.4.5.drv-0/pep8-1.4.5/testsuite/test_shell.py", line 84, in test_check_simple
+    #    self.assertTrue(config_filename.endswith('tox.ini'))
+    #AssertionError: False is not true
+    #
+    #----------------------------------------------------------------------
+    #Ran 21 tests in 0.711s
+    #
+    #FAILED (failures=1)
+    doCheck = false;
+
     meta = {
-      homepage = http://pypi.python.org/pypi/pep8/;
+      homepage = "http://pep8.readthedocs.org/";
       description = "Python style guide checker";
       license = pkgs.lib.licenses.mit;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
 
@@ -2530,6 +2565,24 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  pyflakes = buildPythonPackage rec {
+    name = "pyflakes-0.6.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyflakes/${name}.tar.gz";
+      md5 = "00debd2280b962e915dfee552a675915";
+    };
+
+    buildInputs = [ unittest2 ];
+
+    meta = {
+      homepage = "https://launchpad.net/pyflakes";
+      description = "A simple program which checks Python source files for errors.";
+      license = pkgs.lib.licenses.mit;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+    };
+  };
+
   pyglet = buildPythonPackage rec {
     name = "pyglet-1.1.4";
 

From 4ec3035a04fbbb6e5922cf81ea6374b3f92f46d4 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 17 Mar 2013 15:24:45 +0100
Subject: [PATCH 012/394] pythonPackage.turses: update to 0.2.13

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 52fd1c92bb02..86ea190ee28c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3694,11 +3694,11 @@ pythonPackages = python.modules // rec {
 
 
   turses = buildPythonPackage (rec {
-    name = "turses-0.2.12";
+    name = "turses-0.2.13";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";
-      sha256 = "016fw2ch1gy3rrlfjsdpd6y11mkrbjw4h84h7954k2vhc84l1gm0";
+      sha256 = "0sygm40z04zifcfqwby8wwwnj3i1bpl41r7xgnjcipxwirjmnp2k";
     };
 
     propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse;

From e8ab3a7549fd01d0e16ee12de2c1cb45b53fb406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 17 Mar 2013 21:17:12 +0100
Subject: [PATCH 013/394] octave: removing texlive dependency

I saw I added it, but I can't remember why, and now I don't see what is
it for. It gets into octave closure, so it's a bit annoying for its size.
---
 pkgs/development/interpreters/octave/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index b545fe8b55f2..c19a7a48616e 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
-    graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl
+    graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl
     fftw fftwSinglePrec qrupdate ];
 
   doCheck = true;

From 8c5eaf18407a7da82bd4323067b846e2c2e8499f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 17 Mar 2013 22:05:14 +0100
Subject: [PATCH 014/394] octave: update to 3.6.4

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

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index c19a7a48616e..73f13c11a7db 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -3,10 +3,10 @@ libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk,
 fftw, fftwSinglePrec, zlib, curl, qrupdate }:
 
 stdenv.mkDerivation rec {
-  name = "octave-3.6.3";
+  name = "octave-3.6.4";
   src = fetchurl {
     url = "mirror://gnu/octave/${name}.tar.bz2";
-    sha256 = "11i82vyf514rvdqcgdanw0ppvag8lcm6198rars0dd0w1xahjzg3";
+    sha256 = "0qn9s7jrjmrn6w3rvp8d7vfnymyv0spnxzrp9l7p8p8zb7wms67s";
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11

From 51528e61d9d8ebdc3f5f577409f92c053a9032a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 17 Mar 2013 22:27:55 +0100
Subject: [PATCH 015/394] transmission: update to 2.77, but leave the old 2.60
 for its gtk client

The gtk client in 2.61 and above require a gtk3 we don't have in nixpkgs yet.
---
 .../networking/p2p/transmission/2.60.nix      | 41 +++++++++++++++++++
 .../networking/p2p/transmission/default.nix   | 13 ++++--
 pkgs/top-level/all-packages.nix               |  3 ++
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/networking/p2p/transmission/2.60.nix

diff --git a/pkgs/applications/networking/p2p/transmission/2.60.nix b/pkgs/applications/networking/p2p/transmission/2.60.nix
new file mode 100644
index 000000000000..c59fddf6364b
--- /dev/null
+++ b/pkgs/applications/networking/p2p/transmission/2.60.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent,
+  file, inotifyTools, gtk ? null }:
+
+stdenv.mkDerivation rec {
+  name = "transmission-2.60"; # transmission >= 2.61 requires gtk3
+
+  src = fetchurl {
+    url = "http://download.transmissionbt.com/files/${name}.tar.xz";
+    sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4";
+  };
+
+  buildInputs = [ pkgconfig openssl curl intltool libevent
+                  file inotifyTools gtk ];
+
+  preConfigure = ''
+    sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
+  '';
+
+  postInstall = ''
+    rm -f $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = {
+    description = "A fast, easy and free BitTorrent client";
+    longDescription = ''
+      Transmission is a BitTorrent client which features a simple interface
+      on top of a cross-platform back-end.
+      Feature spotlight:
+        * Uses fewer resources than other clients
+        * Native Mac, GTK+ and Qt GUI clients
+        * Daemon ideal for servers, embedded systems, and headless use
+        * All these can be remote controlled by Web and Terminal clients
+        * Bluetack (PeerGuardian) blocklists with automatic updates
+        * Full encryption, DHT, and PEX support
+    '';
+    homepage = http://www.transmissionbt.com/;
+    license = [ "GPLv2" ];
+    maintainers = [ stdenv.lib.maintainers.astsmtl ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index c59fddf6364b..14ec49c4e8da 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent,
-  file, inotifyTools, gtk ? null }:
+{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent
+, file, inotifyTools
+, enableGtk ? false, gtk ? null }:
+
+assert enableGtk -> gtk != null;
 
 stdenv.mkDerivation rec {
-  name = "transmission-2.60"; # transmission >= 2.61 requires gtk3
+  name = "transmission-2.77"; # transmission >= 2.61 requires gtk3
 
   src = fetchurl {
     url = "http://download.transmissionbt.com/files/${name}.tar.xz";
-    sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4";
+    sha256 = "1phzhj4wds6r2ziclva1b5l6l9xjsx5ji7s3m4xia44aq4znbcam";
   };
 
   buildInputs = [ pkgconfig openssl curl intltool libevent
@@ -16,6 +19,8 @@ stdenv.mkDerivation rec {
     sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
   '';
 
+  configureFlags = stdenv.lib.optional enableGtk "--with-gtk";
+
   postInstall = ''
     rm -f $out/share/icons/hicolor/icon-theme.cache
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e59923c85b43..ba6f934f01e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7860,6 +7860,9 @@ let
     wrapPython = pythonPackages.wrapPython;
   };
 
+  # This builds the gtk client
+  transmission_260 = callPackage ../applications/networking/p2p/transmission/2.60.nix { };
+
   transmission = callPackage ../applications/networking/p2p/transmission { };
 
   transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {};

From 470a015950e62ce62d27992ca9908473714285b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 17 Mar 2013 22:30:42 +0100
Subject: [PATCH 016/394] transmission: nicer about disabling gtk

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

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 14ec49c4e8da..2c6106d13040 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -13,13 +13,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig openssl curl intltool libevent
-                  file inotifyTools gtk ];
+                  file inotifyTools ]
+    ++ stdenv.lib.optional enableGtk gtk;
 
   preConfigure = ''
     sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
   '';
 
-  configureFlags = stdenv.lib.optional enableGtk "--with-gtk";
+  configureFlags = stdenv.lib.optionalString enableGtk "--with-gtk";
 
   postInstall = ''
     rm -f $out/share/icons/hicolor/icon-theme.cache

From dbee2b8ee9e51868d4fb09d6d685a41959630f4f Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Sun, 17 Mar 2013 16:18:36 -0700
Subject: [PATCH 017/394] cuetools-1.3.1

---
 pkgs/tools/cd-dvd/cuetools/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/cd-dvd/cuetools/default.nix

diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix
new file mode 100644
index 000000000000..fd58e3ea6e27
--- /dev/null
+++ b/pkgs/tools/cd-dvd/cuetools/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, automake, autoconf, flex, bison }:
+
+stdenv.mkDerivation {
+  name = "cuetools-1.3.1";
+
+  src = fetchurl {
+    url = https://github.com/svend/cuetools/archive/cuetools-1.3.1.tar.gz;
+    sha256 = "1cap3wl0mlcqrjywpz46003w8jws05rr3r87pzqkz1g89v9459dg";
+  };
+
+  preConfigure = "autoreconf -fiv";
+
+  buildInputs = [ automake autoconf flex bison ]; 
+
+  meta = {
+    description = "cue and toc file parsers and utilities";
+    homepage = https://github.com/svend/cuetools;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba6f934f01e7..9af85e06f3f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -579,6 +579,8 @@ let
 
   cowsay = callPackage ../tools/misc/cowsay { };
 
+  cuetools = callPackage ../tools/cd-dvd/cuetools { };
+
   unifdef = callPackage ../development/tools/misc/unifdef { };
 
   "unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { };

From 4fcb4a1ca1c8d7589db35978dcb385dbbbd2351b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 11:36:16 +0100
Subject: [PATCH 018/394] gv: update to version 3.7.4

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

diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix
index 7a02100b2cb9..70e810bb8d7b 100644
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, Xaw3d, ghostscriptX, perl }:
 
 let
-  name = "gv-3.7.3";
+  name = "gv-3.7.4";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://gnu/gv/${name}.tar.gz";
-    sha256 = "ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b";
+    sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1";
   };
 
   buildInputs = [ Xaw3d ghostscriptX perl ];

From 8e9ff8e1ab25fcfc347f3e38a3ac39bf9835ad20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 11:37:46 +0100
Subject: [PATCH 019/394] cppi: update to version 1.18

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

diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix
index 0ae8b8c76c5f..f9246df9e567 100644
--- a/pkgs/development/tools/misc/cppi/default.nix
+++ b/pkgs/development/tools/misc/cppi/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "cppi-1.16";
+  name = "cppi-1.18";
 
   src = fetchurl {
     url = "mirror://gnu/cppi/${name}.tar.xz";
-    sha256 = "16i4j80wam7p189xc9i2ijrcgjn684296rym6ja3nlqv8rv90lm8";
+    sha256 = "1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j";
   };
 
   doCheck = true;

From 26a39d2dbc360aed0ca8064025fece350035b942 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 11:45:44 +0100
Subject: [PATCH 020/394] haskell-monad-par: update to version 0.3.4.1

---
 .../libraries/haskell/monad-par/{0.3.4.nix => 0.3.4.1.nix}    | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/monad-par/{0.3.4.nix => 0.3.4.1.nix} (90%)

diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix
similarity index 90%
rename from pkgs/development/libraries/haskell/monad-par/0.3.4.nix
rename to pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix
index 342bea47f6b1..3fc819542eb4 100644
--- a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix
+++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par";
-  version = "0.3.4";
-  sha256 = "1j1xskd8smpfi2dpiwnpwakw0hs0i2yn1lrs9l06wz4b148hwc4k";
+  version = "0.3.4.1";
+  sha256 = "0v0gnxzv49zvmgm2cb20dlb8m7mn4chpwrc61g4zp69nabjpwwm8";
   buildDepends = [
     abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
     parallel
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4ffd314f3c99..45e0b723d5ca 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1258,8 +1258,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   monadLogger = callPackage ../development/libraries/haskell/monad-logger {};
 
   monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {};
-  monadPar_0_3_4 = callPackage ../development/libraries/haskell/monad-par/0.3.4.nix {};
-  monadPar = self.monadPar_0_3_4;
+  monadPar_0_3_4_1 = callPackage ../development/libraries/haskell/monad-par/0.3.4.1.nix {};
+  monadPar = self.monadPar_0_3_4_1;
 
   monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {};
 

From 852350301f7435d1324d314e0bba14d8c25a1dbe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 11:46:01 +0100
Subject: [PATCH 021/394] haskell-mmorph: add version 1.0.0

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

diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix
new file mode 100644
index 000000000000..c4379499fad9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mmorph/default.nix
@@ -0,0 +1,13 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "mmorph";
+  version = "1.0.0";
+  sha256 = "10r8frcn6ar56n1vxy8rkys8j52f8xkqan8qxqanka1150k6khqk";
+  buildDepends = [ transformers ];
+  meta = {
+    description = "Monad morphisms";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 45e0b723d5ca..336fd15a0d95 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1275,6 +1275,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   mongoDB = callPackage ../development/libraries/haskell/mongoDB {};
 
+  mmorph = callPackage ../development/libraries/haskell/mmorph {};
+
   mpppc = callPackage ../development/libraries/haskell/mpppc {};
 
   mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {};

From f642dcd638f7ac0da74286c3d14a19444e483ed3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 11:50:03 +0100
Subject: [PATCH 022/394] haskell-OpenGL: add version 2.8.0.0

---
 .../libraries/haskell/OpenGL/2.8.0.0.nix         | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  5 +++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix

diff --git a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
new file mode 100644
index 000000000000..72183c86192c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
@@ -0,0 +1,16 @@
+{ cabal, GLURaw, libX11, mesa, OpenGLRaw }:
+
+cabal.mkDerivation (self: {
+  pname = "OpenGL";
+  version = "2.8.0.0";
+  sha256 = "1wb5772dhh4a81ks9zxz8adpfxa97hcna9s263h9cl2vny6ksxff";
+  buildDepends = [ GLURaw OpenGLRaw ];
+  extraLibraries = [ libX11 mesa ];
+  meta = {
+    homepage = "http://www.haskell.org/haskellwiki/Opengl";
+    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 ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 336fd15a0d95..ecd7fc44ec62 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -142,7 +142,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     HUnit        = self.HUnit_1_2_5_1;          # 7.6 ok
     mtl          = self.mtl_2_1_2;              # 7.6 ok
     network      = self.network_2_4_1_2;        # 7.6 ok
-    OpenGL       = self.OpenGL_2_6_0_1;         # 7.6 ok
+    OpenGL       = self.OpenGL_2_8_0_0;         # 7.6 ok
     parallel     = self.parallel_3_2_0_3;       # 7.6 ok
     parsec       = self.parsec_3_1_3;           # 7.6 ok
     QuickCheck   = self.QuickCheck_2_6;         # 7.6 ok
@@ -1370,7 +1370,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   OpenGL_2_2_3_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.1.nix {};
   OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {};
   OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {};
-  OpenGL = self.OpenGL_2_6_0_1;
+  OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {};
+  OpenGL = self.OpenGL_2_8_0_0;
 
   OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
 

From 07bbcaf29eb9875f3655a4ee1e3365f970524730 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 11:50:22 +0100
Subject: [PATCH 023/394] haskell-GLUT: add version 2.4.0.0

---
 .../libraries/haskell/GLUT/2.4.0.0.nix         | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  7 +++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix

diff --git a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix
new file mode 100644
index 000000000000..a7a7e7f371ad
--- /dev/null
+++ b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix
@@ -0,0 +1,18 @@
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
+, OpenGLRaw
+}:
+
+cabal.mkDerivation (self: {
+  pname = "GLUT";
+  version = "2.4.0.0";
+  sha256 = "1g6bnj2p9hj6c04pmkjwlw9brp7rrva1fyylr2q2dbfz4kbz438h";
+  buildDepends = [ OpenGL OpenGLRaw ];
+  extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
+  meta = {
+    homepage = "http://www.haskell.org/haskellwiki/Opengl";
+    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 ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ecd7fc44ec62..17e74fe6eff5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -135,7 +135,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     async        = self.async_2_0_1_4;          # 7.6 ok
     cgi          = self.cgi_3001_1_8_3;         # 7.6 ok
     fgl          = self.fgl_5_4_2_4;            # 7.6 ok
-    GLUT         = self.GLUT_2_3_1_0;           # 7.6 ok
+    GLUT         = self.GLUT_2_4_0_0;           # 7.6 ok
     haskellSrc   = self.haskellSrc_1_0_1_5;     # 7.6 ok
     html         = self.html_1_0_1_2;           # 7.6 ok
     HTTP         = self.HTTP_4000_2_8;          # 7.6 ok
@@ -924,7 +924,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix {
     OpenGL = self.OpenGL_2_6_0_1;
   };
-  GLUT = self.GLUT_2_3_1_0;
+  GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix {
+    OpenGL = self.OpenGL_2_8_0_0;
+  };
+  GLUT = self.GLUT_2_4_0_0;
 
   gnuidn = callPackage ../development/libraries/haskell/gnuidn {};
 

From da3b05204b03ebdeb9a3915fd26d0a0ea3ae752c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:03 +0100
Subject: [PATCH 024/394] haskell-Boolean: update to version 0.2

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

diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
index 4503c0fec548..bc8e9dca159c 100644
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ b/pkgs/development/libraries/haskell/Boolean/default.nix
@@ -2,10 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "Boolean";
-  version = "0.1.2";
-  sha256 = "07mhg9zf98hlm7qq9gdbrq68a8rpvdby1jwmgrvf3nv2k47dimx6";
+  version = "0.2";
+  sha256 = "1r8qvsfbfjfp453pdy9ci9w584ad9bm4xv0ynx4b1yny34ag3zr3";
   meta = {
-    description = "Generalized booleans";
+    description = "Generalized booleans and numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

From c435b3447160e0eb9bf73cd61b63a30aa3696ead Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:03 +0100
Subject: [PATCH 025/394] haskell-HStringTemplate: update to version 0.7.1

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

diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
index 3011f3a44466..6f96bbbcb7f4 100644
--- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix
+++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HStringTemplate";
-  version = "0.7.0";
-  sha256 = "0xxxikgjw1dhx7kx3mjyvgh70m9avcd1kbp2bpig6gjwswk0mmai";
+  version = "0.7.1";
+  sha256 = "0hqc1496xazihlww8j90m1cwzj7cihqbfjdly9s8kjf8d5my64ld";
   buildDepends = [
     blazeBuilder deepseq filepath mtl parsec syb text time utf8String
     void

From 2eaec021cce6c15857a39bcbe24ff4ae48e34ce7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:03 +0100
Subject: [PATCH 026/394] haskell-classy-prelude: update to version 0.5.4

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

diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index 4d0f5441e414..e105726540b8 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.5.3";
-  sha256 = "0xlhdxkxvrzj9y8wdl2f1pz94zz2gfa9vfbia9prhr7skirxvsad";
+  version = "0.5.4";
+  sha256 = "1p30f1inp0kj2dsvqnxaplxl83kd8bv41jmszvbdbf3vijjpk6kr";
   buildDepends = [
     basicPrelude hashable liftedBase systemFilepath text transformers
     unorderedContainers vector

From ba21dc51bc963ec669a4a88faad07460a96a1015 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:03 +0100
Subject: [PATCH 027/394] haskell-conduit: update to version 1.0.4

---
 pkgs/development/libraries/haskell/conduit/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 8614b24bacca..8bfb77a8706d 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -1,13 +1,13 @@
-{ cabal, doctest, hspec, liftedBase, monadControl, QuickCheck
-, resourcet, text, transformers, transformersBase, void
+{ cabal, doctest, hspec, liftedBase, mmorph, monadControl
+, QuickCheck, resourcet, text, transformers, transformersBase, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.3";
-  sha256 = "1jvbm5v25h1m5a9gd0f417mhpabp3kcfzsjm8887gcyimp2d0z07";
+  version = "1.0.4";
+  sha256 = "1y97wc273i3qvq4nqp9kr3bgl8mca257hv92f3lbq2wzqkr5vahk";
   buildDepends = [
-    liftedBase monadControl resourcet text transformers
+    liftedBase mmorph monadControl resourcet text transformers
     transformersBase void
   ];
   testDepends = [

From 872f114a4f8d4c69c29c2c782b3a7ff6bf8b97fe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:04 +0100
Subject: [PATCH 028/394] haskell-doctest: update to version 0.9.5.1

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

diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index ce418a8d053f..63298ebaf7ef 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "doctest";
-  version = "0.9.5";
-  sha256 = "073q56gyhkb7r4f94b9nx341dkmgapy8gig7f668jkghv2zci5ws";
+  version = "0.9.5.1";
+  sha256 = "0phakf605pdwp89y522wm17n1bflxlgqkgahklnf10wnywxwm7cs";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ deepseq filepath ghcPaths syb transformers ];
@@ -13,7 +13,6 @@ cabal.mkDerivation (self: {
     baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv
     silently stringbuilder syb transformers
   ];
-  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "https://github.com/sol/doctest-haskell#readme";

From 68ac128d2d8a1ddac3973fd9297a31e6134c2d5f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:04 +0100
Subject: [PATCH 029/394] haskell-ghc-mod: update to version 1.12.3

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

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 3e86d440d5d3..f12f789ea991 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.12.2";
-  sha256 = "0kwf1szw26iz4sw2slv10birpngf1cfy9jzmllzr0nvybh1pv7a9";
+  version = "1.12.3";
+  sha256 = "1dc919xbq7aqvpayqh9czvpzz4w4j082d1fjv0n9b7i4a780xghv";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From faba47220461377035cf1b112b4c72773fe3fab6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:04 +0100
Subject: [PATCH 030/394] haskell-hS3: update to version 0.5.7

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

diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix
index 9c4c9681b5f0..83ee2c810ebd 100644
--- a/pkgs/development/libraries/haskell/hS3/default.nix
+++ b/pkgs/development/libraries/haskell/hS3/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hS3";
-  version = "0.5.6";
-  sha256 = "1cd6dzvhfkfp0lzw8lwfcr0wn8wqi2hm8pgb5idp4vg4z00yf2zc";
+  version = "0.5.7";
+  sha256 = "1p5p6vwazqi5kpi3i0msbgcdf6flp25b2v1an6lvj7y8dx1pk6f2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From bcba4c0829d55b3d581d7bc86e0b6cc0f773cccb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:04 +0100
Subject: [PATCH 031/394] haskell-hamlet: update to version 1.1.6.4

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

diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 7b61aee26dfa..489c38e86f8d 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.6.3";
-  sha256 = "1kpj8j47licmdf364n0fn5908hsl6ib1wkiqhcx3m0nimb7pjnss";
+  version = "1.1.6.4";
+  sha256 = "1cjv32sajwq9lhgh3a8xb0z6j89121k8ndp6g21lmbdzc9fhpws0";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
   ];

From c1cc7cfd00682814cbefab656ce3d2e093b54660 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:04 +0100
Subject: [PATCH 032/394] haskell-hspec-meta: update to version 1.4.5

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

diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index c86db3bf0d72..5f3ca918b0a9 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.4.4";
-  sha256 = "1p1miiaa38rd92bz695znlwd6wyvs8zpp2idyw5pkzvhqi8w10a1";
+  version = "1.4.5";
+  sha256 = "0k50vwzg3ka4727bj63y4gsvw4g80gnalj31rsbvj3afl9gikkk7";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 76ffb599df8baad9a5b4dfb496bd9b0971a74a66 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:04 +0100
Subject: [PATCH 033/394] haskell-hspec: update to version 1.4.5

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

diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 949874bfa910..4161cf8bc03b 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.4.4";
-  sha256 = "09wrvdlqzpa3vjcnirnzpj8nsvqnn5xbilnxaqmjm2agbl8xfj5r";
+  version = "1.4.5";
+  sha256 = "1dfwc1gjsawafi6k19hsw4kd5ahp8a9hdkyrm7nhjp4kjzgd2ymf";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From fff5c6f0a0bf1abf5421d96f3d04f7c4c62af059 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:04 +0100
Subject: [PATCH 034/394] haskell-http-conduit: update to version 1.9.2.2

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

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 715d5ce7dba2..e4ffe2482f55 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.9.2.1";
-  sha256 = "1zzw9gdljn7pmp0d6k051gp1wiw9412c3gdbpwbpng6m5jhk079i";
+  version = "1.9.2.2";
+  sha256 = "16njcgdnzs2la5xvs1pqs3zcjyzqlk3yfis89h9x7qg2w8hq8pxf";
   buildDepends = [
     asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive certificate conduit cookie cprngAes dataDefault

From 9d7344d8aa42a458617199e9937baafed40d4481 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:04 +0100
Subject: [PATCH 035/394] haskell-pandoc: update to version 1.11.1

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

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 184e3fd9536d..f81fb4e56d9e 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.11";
-  sha256 = "1v32z6fmfkllwf5y64sjbk3ckss2kfcs71b64a7fjdhp82m4i4yh";
+  version = "1.11.1";
+  sha256 = "0b23vrgkm1csykx1zrldkg5ka816j6m7a5fhs4cxffalifq91c7b";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -24,7 +24,6 @@ cabal.mkDerivation (self: {
     testFrameworkQuickcheck2 text
   ];
   configureFlags = "-fblaze_html_0_5";
-  patchPhase = "sed -i -e 's|QuickCheck >= 2.4 && < 2.6,|QuickCheck,|' pandoc.cabal";
   doCheck = false;
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";

From a36ecf090c24fb71b3b820b6fbbb88ee142a584e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:04 +0100
Subject: [PATCH 036/394] haskell-persistent-template: update to version 1.1.3

---
 .../libraries/haskell/persistent-template/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 8cdc7caafc9b..ae2245f73c99 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.1.2.5";
-  sha256 = "142b02ini1b5c566rzhykv45n4byzvhp9r6yyavy4zyvgdj7ligj";
+  version = "1.1.3";
+  sha256 = "1jvr71qfjv2f4vx4xbz78x5a325zkdpg2qvcbglizz10xwrm5j9d";
   buildDepends = [ aeson monadControl persistent text transformers ];
   testDepends = [ aeson hspec persistent QuickCheck text ];
   meta = {

From b76ede07c9dc11d0188ddfc7060575df0a9a8ab2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:04 +0100
Subject: [PATCH 037/394] haskell-resourcet: update to version 0.4.7

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

diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index f0dde62ef979..dc4ff618e164 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -1,13 +1,13 @@
-{ cabal, hspec, liftedBase, monadControl, mtl, transformers
+{ cabal, hspec, liftedBase, mmorph, monadControl, mtl, transformers
 , transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.4.5";
-  sha256 = "1i2n0y4ridlzi2fn319f8jg1whb10gajgyvbz0rx2mwxj15bbgni";
+  version = "0.4.7";
+  sha256 = "0cmh9hhiy0qksigm2rvycyaw58r8357fl6xhv8x465ykw1va0by8";
   buildDepends = [
-    liftedBase monadControl mtl transformers transformersBase
+    liftedBase mmorph monadControl mtl transformers transformersBase
   ];
   testDepends = [ hspec liftedBase transformers ];
   meta = {

From 944f2263118645524fc4e8875e3c7287c9726533 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:04 +0100
Subject: [PATCH 038/394] haskell-shake: update to version 0.10.1

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

diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index dd4f985e6183..a3c6d69af869 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.9.1";
-  sha256 = "19jpnf7794ii1v0rfafmcrs71flwz6hmz72ng529ll12iy64xwkv";
+  version = "0.10.1";
+  sha256 = "0k8hk5aw5xk4aq7g8yjlkn1rjhcdy3jd5mna9phjs23kmfsmayk6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From a5c4b2e236bbc029326d02c0e30565a4161eee4b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:04 +0100
Subject: [PATCH 039/394] haskell-tagged: update to version 0.4.5

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

diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index e435671fe227..2489f5650924 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tagged";
-  version = "0.4.4";
-  sha256 = "0bc88q33pyz4sx429awhxmnjzvmsg7vwwsqi2w7yf8lrmz5ph08x";
+  version = "0.4.5";
+  sha256 = "1ipj7ff2ya3r3w39clcrxs766hm568lj2kb2kd3npg87jj05wgv0";
   meta = {
     homepage = "http://github.com/ekmett/tagged";
     description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";

From 4f347dc96d2dbb6b5a5659923b8620191c3d34e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:05 +0100
Subject: [PATCH 040/394] haskell-uu-parsinglib: update to version 2.7.4.3

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

diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
index d9477f4233da..f011aa725d35 100644
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uu-parsinglib";
-  version = "2.7.4.2";
-  sha256 = "10ddm6x9km3lzs9ahqpsl9krvslsn9glimwzq4hspgsp6izd1dmq";
+  version = "2.7.4.3";
+  sha256 = "0q907gfxia7i63wc1p0zfmp102f5xpanhrq5pa259mp1nwqq6lyg";
   buildDepends = [ ListLike time ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";

From db5a48aebc8e1f8ebe24d49da8a0a02e4487ae55 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:05 +0100
Subject: [PATCH 041/394] haskell-wai-test: update to version 1.3.0.5

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

diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
index 9995cd6b9770..423f738fbfbf 100644
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -1,14 +1,15 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, cookie, httpTypes, HUnit, text, transformers, wai
+, conduit, cookie, httpTypes, HUnit, network, text, transformers
+, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-test";
-  version = "1.3.0.4";
-  sha256 = "1si54frsn8s8r0ykqc9h571rqbapf82jcvbz8bd49bbylv4j6yy0";
+  version = "1.3.0.5";
+  sha256 = "0v0x1sk7q36xy8syinc96y1jsyjvw6756cich4hxq86l2jfbgccw";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
-    httpTypes HUnit text transformers wai
+    httpTypes HUnit network text transformers wai
   ];
   meta = {
     homepage = "http://www.yesodweb.com/book/web-application-interface";

From ac022ec7af3f7240652d7737f0b0827ccec9a745 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:02:43 +0100
Subject: [PATCH 042/394] smartmontools: update to version 6.1 (using latest
 drivedb.h revision 3797 from trunk)

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

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 1e310ce6c43e..909b0d832f78 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -2,17 +2,17 @@
 
 let
   driverdb = fetchurl {
-    url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3781";
-    sha256 = "0m39ji2kf80dsws5ksg2pmkpn8x00lrlvl5nlc6ldjfss7sjvc9x";
+    url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3797";
+    sha256 = "01ycm3vffxpfvfga9vp1d38jy3lqpkpxnxf78pidc8q1nn8bpdyz";
     name = "smartmontools-drivedb.h";
   };
 in
 stdenv.mkDerivation rec {
-  name = "smartmontools-6.0";
+  name = "smartmontools-6.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
-    sha256 = "9fe4ff2b7bcd00fde19db82bba168f5462ed6e857d3ef439495e304e3231d3a6";
+    sha256 = "01yfv6hqsqandg6x8mnwa4g42hhqvc7dfxnfb3v849n8rj5kn059";
   };
 
   patchPhase = ''

From 21a7031e3e03806db00404cf740927201bafdc85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Mar 2013 12:15:30 +0100
Subject: [PATCH 043/394] haskell-vty-ui: jailbreak to fix build with recent
 versions of QuickCheck

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

diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix
index 5d0c9ffd91a8..3b38db8c1de4 100644
--- a/pkgs/development/libraries/haskell/vty-ui/default.nix
+++ b/pkgs/development/libraries/haskell/vty-ui/default.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     filepath mtl QuickCheck random regexBase stm text time vector vty
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://jtdaugherty.github.com/vty-ui/";
     description = "An interactive terminal user interface library for Vty";

From 36054d4e3c71334bd80d7e5bf8500d74761cb675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 18 Mar 2013 12:20:43 +0100
Subject: [PATCH 044/394] podofo: update 0.9.1 to 0.9.2

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

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 6b79482c330e..243a792f6b9c 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -2,10 +2,10 @@
 openssl, libpng, lua5}:
 
 stdenv.mkDerivation rec {
-  name = "podofo-0.9.1";
+  name = "podofo-0.9.2";
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
-    sha256 = "0icpxh1l1dpviq2zwy764dhg8y03zwyf4pgw4s7kb165nvh9v5kv";
+    sha256 = "1wx3s0718rmhdzdwyi8hgpf2s92sk3hijy8f4glrmnjpiihr2la6";
   };
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
   nativeBuildInputs = [ cmake ];

From 1e1b6ee733eb19b41bfc205bd88093418075e2ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 18 Mar 2013 12:21:00 +0100
Subject: [PATCH 045/394] iputils: update 20101006 to 20121221

Still without manpages! I don't know where to get SGML tools.
---
 pkgs/os-specific/linux/iputils/default.nix | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index a50aefaec97d..a2717bbe3785 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -1,24 +1,27 @@
-{ stdenv, fetchurl, libsysfs, openssl }:
+{ stdenv, fetchurl, libsysfs, gnutls, openssl, libcap }:
 
 assert stdenv ? glibc;
 
-stdenv.mkDerivation {
-  name = "iputils-20101006";
+let
+  time = "20121221";
+in
+stdenv.mkDerivation rec {
+  name = "iputils-${time}";
   
   src = fetchurl {
-    url = http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2;
-    sha256 = "1rvfvdnmzlmgy9a6xv5v4n785zmn10v2l7yaq83rdfgbh1ng8fpx";
+    url = "http://www.skbuff.net/iputils/iputils-s${time}.tar.bz2";
+    sha256 = "17riqp8dh8dvx32zv3hyrghpxz6xnxa6vai9b4yc485nqngm83s5";
   };
 
-  buildInputs = [ libsysfs openssl ];
+  buildInputs = [ libsysfs gnutls openssl libcap ];
 
-  # Urgh, it uses Make's `-l' dependency "feature". 
-  makeFlags = "VPATH=${libsysfs}/lib:${stdenv.glibc}/lib:${openssl}/lib";
+  buildFlags = "all ninfod";
 
   installPhase =
     ''
-      mkdir -p $out/sbin
-      cp -p arping ping ping6 rdisc tracepath tracepath6 traceroute6 $out/sbin/
+      mkdir -p $out/sbin $out/bin
+      cp -p ping ping6 tracepath tracepath6 traceroute6 $out/bin/
+      cp -p clockdiff arping rdisc ninfod/ninfod $out/sbin/
     '';
     
   meta = {

From 7c071ade78b5d84bf8c8b24c845688e4d0e71cb6 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Mon, 18 Mar 2013 13:29:00 +0100
Subject: [PATCH 046/394] Add haskell-authenticate-oauth

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

diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
new file mode 100644
index 000000000000..67acd7b08695
--- /dev/null
+++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
@@ -0,0 +1,21 @@
+{ cabal, base64Bytestring, blazeBuilder, blazeBuilderConduit
+, conduit, cryptoPubkeyTypes, dataDefault, httpConduit, httpTypes
+, monadControl, random, resourcet, RSA, SHA, time, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "authenticate-oauth";
+  version = "1.4.0.5";
+  sha256 = "0yic95glkc0j35sdq04z5n2607ch0k64vyi3y0kfji31qzd3d44x";
+  buildDepends = [
+    base64Bytestring blazeBuilder blazeBuilderConduit conduit
+    cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl
+    random resourcet RSA SHA time transformers
+  ];
+  meta = {
+    homepage = "http://github.com/yesodweb/authenticate";
+    description = "Library to authenticate with OAuth for Haskell web applications";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4a7d22891459..5e87b46cab4b 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);
 
   authenticate = callPackage ../development/libraries/haskell/authenticate {};
 
+  authenticateOauth = callPackage ../development/libraries/haskell/authenticate-oauth {};
+
   base16Bytestring = callPackage ../development/libraries/haskell/base16-bytestring {};
 
   base64String = callPackage ../development/libraries/haskell/base64-string {};

From ec99c8625b81a1cafaf9ded2c71395cbcc0fa081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 18 Mar 2013 13:56:51 +0100
Subject: [PATCH 047/394] openjade: making it build

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61a81193a99e..604fad0228e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1283,7 +1283,9 @@ let
 
   opendkim = callPackage ../development/libraries/opendkim { };
 
-  openjade = callPackage ../tools/text/sgml/openjade { };
+  openjade = callPackage ../tools/text/sgml/openjade {
+    perl = perl510;
+  };
 
   openobex = callPackage ../tools/bluetooth/openobex { };
 

From 4ef33e7a670a69d19a01af670cab6c01a51e4044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 18 Mar 2013 15:04:28 +0100
Subject: [PATCH 048/394] perlPackages: add SGMLSpm

Required by iputils to create the manpages.
---
 pkgs/top-level/perl-packages.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1110bd14e426..d31a572eea1c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4179,6 +4179,14 @@ rec {
     };
   };
 
+  SGMLSpm = buildPerlPackage {
+    name = "SGMLSpm-1.1";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RA/RAAB/SGMLSpm-1.1.tar.gz;
+      sha256 = "1gdjf3mcz2bxir0l9iljxiz6qqqg3a9gg23y5wjg538w552r432m";
+    };
+  };
+
   Socket6 = buildPerlPackage rec {
     name = "Socket6-0.23";
     src = fetchurl {

From 4ae71ad19d3931488464985d1073817770fbdfd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 18 Mar 2013 15:05:08 +0100
Subject: [PATCH 049/394] Adding the sgml dtd for docbook 3.1

Required by iputils manpages.
---
 .../sgml+xml/schemas/sgml-dtd/docbook/3.1.nix | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix

diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix
new file mode 100644
index 000000000000..6f29c78eca69
--- /dev/null
+++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, unzip }:
+
+let 
+
+  src = fetchurl {
+    url = http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip;
+    sha256 = "0f25ch7bywwhdxb1qa0hl28mgq1blqdap3rxzamm585rf4kis9i0";
+  };
+
+  isoents = fetchurl {
+    url = http://www.oasis-open.org/cover/ISOEnts.zip;
+    sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w";
+  };
+
+in
+
+stdenv.mkDerivation {
+  name = "docbook-sgml-3.1";
+
+  unpackPhase = "true";
+
+  buildInputs = [ unzip ];
+
+  installPhase =
+    ''
+      o=$out/sgml/dtd/docbook-3.1
+      mkdir -p $o
+      cd $o
+      unzip ${src}
+      unzip ${isoents}
+      sed -e "s/iso-/ISO/" -e "s/.gml//" -i docbook.cat
+    '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 604fad0228e2..618b423b1608 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5749,7 +5749,10 @@ let
 
   iproute = callPackage ../os-specific/linux/iproute { };
 
-  iputils = callPackage ../os-specific/linux/iputils { };
+  iputils = callPackage ../os-specific/linux/iputils {
+    sp = spCompat;
+    inherit (perlPackages) SGMLSpm;
+  };
 
   iptables = callPackage ../os-specific/linux/iptables { };
 
@@ -6433,6 +6436,8 @@ let
 
   docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { };
 
+  docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { };
+
   docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { };
 
   docbook_xml_dtd_412 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { };

From d711dcc070ac80074db96ab8cf744955489ec68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 18 Mar 2013 15:05:53 +0100
Subject: [PATCH 050/394] Adding setup-hook for opensp, to set the sgml catalog
 files

This sets the SGML_CATALOG_FILES, similar to how libxml2 does the same with
XML_CATALOG_FILES.

I based the hook on the libxml2 one, and I followed the instructions about this
variable here:
http://docbook.sourceforge.net/release/dsssl/1.79/doc/install.html
---
 pkgs/tools/text/sgml/opensp/compat.nix    |  6 +++++-
 pkgs/tools/text/sgml/opensp/default.nix   |  2 ++
 pkgs/tools/text/sgml/opensp/setup-hook.sh | 22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/text/sgml/opensp/setup-hook.sh

diff --git a/pkgs/tools/text/sgml/opensp/compat.nix b/pkgs/tools/text/sgml/opensp/compat.nix
index 8e521da20848..3e9d9152d36a 100644
--- a/pkgs/tools/text/sgml/opensp/compat.nix
+++ b/pkgs/tools/text/sgml/opensp/compat.nix
@@ -3,13 +3,17 @@
 stdenv.mkDerivation {
   name = "sp-compat-${builtins.substring 7 100 opensp.name}";
 
-  buildCommand = ''
+  phases = [ "fixupPhase" "installPhase" ];
+
+  installPhase = ''
     mkdir -pv $out/bin
     for i in ${opensp}/bin/o*; do
       ln -sv $i $out/bin/''${i#${opensp}/bin/o}
     done
     '';
 
+  setupHook = opensp.setupHook;
+
   meta.description =
     "Compatibility wrapper for old programs looking for original sp programs";
 }
diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix
index 76efbd0b1af6..e30567000dd1 100644
--- a/pkgs/tools/text/sgml/opensp/default.nix
+++ b/pkgs/tools/text/sgml/opensp/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
       docsrc/*.xml
   '';
 
+  setupHook = ./setup-hook.sh;
+
   buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ];
 
   meta = {
diff --git a/pkgs/tools/text/sgml/opensp/setup-hook.sh b/pkgs/tools/text/sgml/opensp/setup-hook.sh
new file mode 100644
index 000000000000..2c9142da1016
--- /dev/null
+++ b/pkgs/tools/text/sgml/opensp/setup-hook.sh
@@ -0,0 +1,22 @@
+addSGMLCatalogs () {
+      if test -d $1/sgml/dtd; then
+          for i in $(find $1/sgml/dtd -name docbook.cat); do
+              export SGML_CATALOG_FILES="${SGML_CATALOG_FILES:+:}$i"
+          done
+      fi
+}
+
+if test -z "$sgmlHookDone"; then
+    sgmlHookDone=1
+
+    # Set http_proxy and ftp_proxy to a invalid host to prevent
+    # xmllint and xsltproc from trying to download DTDs from the
+    # network even when --nonet is not given.  That would be impure.
+    # (Note that .invalid is a reserved domain guaranteed not to
+    # work.)
+    export http_proxy=http://nodtd.invalid/
+    export ftp_proxy=http://nodtd.invalid/
+
+    export SGML_CATALOG_FILES
+    envHooks=(${envHooks[@]} addSGMLCatalogs)
+fi

From 0236cc5d8826e3429fe8eb5e8b2851f68dfdad16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 18 Mar 2013 15:07:03 +0100
Subject: [PATCH 051/394] iputils: build and install the manpages

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

diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index a2717bbe3785..76b328d9c0d8 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, libsysfs, gnutls, openssl, libcap }:
+{ stdenv, fetchurl, libsysfs, gnutls, openssl, libcap, sp, docbook_sgml_dtd_31
+, SGMLSpm }:
 
 assert stdenv ? glibc;
 
@@ -13,15 +14,28 @@ stdenv.mkDerivation rec {
     sha256 = "17riqp8dh8dvx32zv3hyrghpxz6xnxa6vai9b4yc485nqngm83s5";
   };
 
-  buildInputs = [ libsysfs gnutls openssl libcap ];
+  prePatch = ''
+    sed -i s/sgmlspl/sgmlspl.pl/ doc/Makefile
+  '';
 
-  buildFlags = "all ninfod";
+  buildInputs = [ libsysfs gnutls openssl libcap sp docbook_sgml_dtd_31 SGMLSpm ];
+
+  buildFlags = "man all ninfod";
+
+  # Stdenv doesn't handle symlinks well for that
+  dontGzipMan = true;
 
   installPhase =
     ''
       mkdir -p $out/sbin $out/bin
       cp -p ping ping6 tracepath tracepath6 traceroute6 $out/bin/
       cp -p clockdiff arping rdisc ninfod/ninfod $out/sbin/
+
+      mkdir -p $out/share/man/man8
+      cp -p doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 \
+        doc/tracepath.8 doc/ninfod.8 $out/share/man/man8
+      ln -s $out/share/man/man8/{ping,ping6}.8
+      ln -s $out/share/man/man8/{tracepath,tracepath6}.8
     '';
     
   meta = {

From 93a963f347627cefb0830d028193d9416f18c94d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Mar 2013 22:35:33 +0100
Subject: [PATCH 052/394] nixUnstable: Update to the latest

This is mostly to get rid of those annoying Perl warnings in NixOS...
---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 pkgs/top-level/all-packages.nix                | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index ff36e0cc3cc5..41ad7b4f4f21 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.4pre3056_79a3ba7";
+  name = "nix-1.5.2pre3079_c3fc60d";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/4070551/download/5/${name}.tar.xz";
-    sha256 = "7478fd6fea91ec094645e8487b9ef001abd300703d79e04743f4d212469cf13d";
+    url = "http://hydra.nixos.org/build/4445767/download/5/${name}.tar.xz";
+    sha256 = "0422ceb1439cf1140e86f86514bdcb04b0706881ea31a9f6ee5206b9faad009b";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 618b423b1608..0d3e4cca9a24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8910,14 +8910,10 @@ let
     stateDir = config.nix.stateDir or "/nix/var";
   };
 
-  nixUnstable = nixStable;
-
-  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = config.nix.storeDir or "/nix/store";
     stateDir = config.nix.stateDir or "/nix/var";
   };
-  */
 
   nut = callPackage ../applications/misc/nut { };
 

From ac807625a76295def5da00f7e3a899260fbe0c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 18 Mar 2013 22:45:16 +0100
Subject: [PATCH 053/394] storebrowse: update fixing bugs

I try to add build rules for arm too.
---
 pkgs/tools/system/storebrowse/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix
index 905818a59df2..c46372bcd4b6 100644
--- a/pkgs/tools/system/storebrowse/default.nix
+++ b/pkgs/tools/system/storebrowse/default.nix
@@ -1,16 +1,17 @@
 { stdenv, fetchurl, fetchhg, go, sqlite}:
 
-assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64);
+assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm);
 
 stdenv.mkDerivation rec {
-  name = "storebrowse-20130316140138";
+  name = "storebrowse-20130318212204";
 
   src = fetchurl {
-    url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-881990147c.tar.gz?uuid=881990147c";
+    url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-775928f68e53.tar.gz?uuid=775928f68e53";
     name = "${name}.tar.gz";
-    sha256 = "183b6gz7xv88c94i9mgmjslsdn75v5vsbchl19kjv7mbrxfx5mvl";
+    sha256 = "1yb8qbw95d9561s10k12a6lwv3my8h52arsbfcpizx74dwfsv7in";
   };
 
+  # This source has license BSD
   srcGoSqlite = fetchhg {
     url = "https://code.google.com/p/gosqlite/";
     tag = "5baefb109e18";
@@ -22,6 +23,8 @@ stdenv.mkDerivation rec {
     mkdir $TMPDIR/go
     export GOPATH=$TMPDIR/go
 
+    ${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "export GOARM=5"}
+
     GOSQLITE=$GOPATH/src/code.google.com/p/gosqlite
     mkdir -p $GOSQLITE
     cp -R $srcGoSqlite/* $GOSQLITE/

From c306d2f899e6cf42911821cbcf62594deab1894d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 19 Mar 2013 13:21:04 +0400
Subject: [PATCH 054/394] Fix references to ifconfig and route

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

diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix
index 4328eb36b6dc..09a449bbede9 100644
--- a/pkgs/os-specific/linux/gogoclient/default.nix
+++ b/pkgs/os-specific/linux/gogoclient/default.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
     rm $out/bin/gogoc.conf.sample
 
     substituteInPlace "$out/template/linux.sh" \
-      --replace "/sbin/ifconfig" "${nettools}/sbin/ifconfig" \
-      --replace "/sbin/route"    "${nettools}/sbin/route" \
+      --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \
+      --replace "/sbin/route"    "${nettools}/bin/route" \
       --replace "/sbin/ip"       "${iproute}/sbin/ip" \
       --replace "/sbin/sysctl"   "${procps}/sbin/sysctl"
     sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh

From 2d2123b8d7085e0db9e27eae81480323ac4acdd7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 19 Mar 2013 13:34:57 +0400
Subject: [PATCH 055/394] Update Linux 3.9-rc to rc3

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix
index 4b3f5d444e3a..1f0e60ee0d72 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix
@@ -251,8 +251,8 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.9-rc2";
-    modDirVersion = "3.9.0-rc1";
+    version = "3.9-rc3";
+    modDirVersion = "3.9.0-rc3";
     testing = true;
 
     preConfigure = ''
@@ -261,7 +261,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1aan14n6sw43qk9kpmdrpcakb1398kj2djqca8cvijc8g76973in";
+      sha256 = "1fbg952zzn6nkch2fpd1fzkwc6xsf66fnmkxrmc77yz8d29qddi5";
     };
 
     config = configWithPlatform stdenv.platform;

From 61f9b4f61b3e98303792dcaf403d011b7c1a31f6 Mon Sep 17 00:00:00 2001
From: Lluis Batlle <viriketo@gmail.com>
Date: Tue, 19 Mar 2013 11:46:47 +0100
Subject: [PATCH 056/394] Fixing the go timezones. glibc doesn't include the
 zoneinfo anymore.

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

diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix
index 955daa0ad9fc..9e74643e161f 100644
--- a/pkgs/development/compilers/go/default.nix
+++ b/pkgs/development/compilers/go/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper}:
+{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}:
 
 let
   loader386 = "${glibc}/lib/ld-linux.so.2";
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
     sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
     sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
-    sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
+    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
 
     #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
     #  -e 's,/bin/echo,${coreutils}/bin/echo,' \

From cd3caeaf8f3212f2d0ab6cbd079be6a3fa06881e Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 19 Mar 2013 14:49:45 +0100
Subject: [PATCH 057/394] Update ProofGeneral to version 4.2

---
 .../editors/emacs-modes/proofgeneral/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
index 18c16569cf8e..fba3c71e36ad 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }:
 
 stdenv.mkDerivation (rec {
-  name = "ProofGeneral-4.1";
+  name = "ProofGeneral-4.2";
 
   src = fetchurl {
-    url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.1.tgz;
-    sha256 = "1ivxx8c6j7cfdfj2pj0gzdqac7hpb679bjmwdqdcz1c1ni34s9ia";
+    url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.2.tgz;
+    sha256 = "09qb0myq66fw17v4ziz401ilsb5xlxz1nl2wsp69d0vrfy0bcrrm";
   };
 
   sourceRoot = name;
@@ -24,7 +24,7 @@ stdenv.mkDerivation (rec {
        sed -i '101d' doc/ProofGeneral.texi
 
        # Emacs 24 compatibility.
-       sed -i 's|interactive-p|called-interactively-p '\'''any|' isar/isabelle-system.el generic/proof-{menu,script,splash}.el lib/scomint.el
+       #sed -i 's|interactive-p|called-interactively-p '\'''any|' isar/isabelle-system.el generic/proof-{menu,script,splash}.el lib/scomint.el
     '';
 
   preBuild = ''

From a7359deca809381d11a53bb866e42397aee93949 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 19 Mar 2013 13:59:40 -0400
Subject: [PATCH 058/394] edk2: Update

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/edk2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 9633967da6a9..949324ba8b1c 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -10,12 +10,12 @@ else
   throw "Unsupported architecture";
 
 edk2 = stdenv.mkDerivation {
-  name = "edk2-2012-03-13";
+  name = "edk2-2013-03-19";
   
   src = fetchsvn {
     url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2;
-    rev = "13783";
-    sha256 = "18sx0nwcnghij7737xdnmgwk5vm0ax4p0v3ybggqqs8cdhzfghil";
+    rev = "14211";
+    sha256 = "1rhrv7cyazb1d4gw3s8fv0c245iankvb9pqx6nngbkkxkcswvnw7";
   };
 
   buildInputs = [ libuuid pythonFull ];

From 36ca429641f86cb91ef2390d6a210e941506aead Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 19 Mar 2013 18:56:55 +0100
Subject: [PATCH 059/394] ipdbplugin: nose ipdb plugin, nosetests --ipdb

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86ea190ee28c..93bcb49db05d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1389,6 +1389,16 @@ pythonPackages = python.modules // rec {
     propagatedBuildInputs = [ ipython ];
   };
 
+  ipdbplugin = buildPythonPackage {
+    name = "ipdbplugin-1.2";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.2.tar.gz";
+      md5 = "39169b00a2186b99469249c5b0613753";
+    };
+    propagatedBuildInputs = [ nose ipython ];
+  };
+
+
   jedi = buildPythonPackage (rec {
     name = "jedi-0.5b5";
 

From 4ab9c00850fdd2007c724131b3e59934760eeccd Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 19 Mar 2013 19:01:35 +0100
Subject: [PATCH 060/394] openldap-2.4.34

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

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 5c9fedb7fc55..a074721d5922 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}:
 
 stdenv.mkDerivation rec {
-  name = "openldap-2.4.31";
+  name = "openldap-2.4.34";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz";
-    sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6";
+    sha256 = "01h6zq6zki9b1k07pbyps5vxj9w39ybzjvkyz5h9xk09dd54raza";
   };
 
   buildInputs = [openssl cyrus_sasl db4 groff];

From 1c86db4bc3f363ea170c7159e03b4ce7717e2e4c Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 19 Mar 2013 19:14:40 +0100
Subject: [PATCH 061/394] openldap: support building without cyrus-sasl and tls

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

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index a074721d5922..1d5a09613408 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -8,7 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "01h6zq6zki9b1k07pbyps5vxj9w39ybzjvkyz5h9xk09dd54raza";
   };
 
-  buildInputs = [openssl cyrus_sasl db4 groff];
+  buildInputs = [ openssl cyrus_sasl db4 groff ];
+
+  configureFlags =
+    [ "--enable-overlays"
+    ] ++ stdenv.lib.optional (openssl == null) "--without-tls"
+      ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl";
 
   dontPatchELF = 1; # !!!
 

From 1eb437784021521d57ae96980bf447e9162d4415 Mon Sep 17 00:00:00 2001
From: modulistic <modulistic@gmail.com>
Date: Wed, 20 Mar 2013 00:11:58 +0100
Subject: [PATCH 062/394] i3 window manager: cairo.override with xcbSupport
 enabled, on par with i3lock

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d3e4cca9a24..a1c0d4bc72e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7224,7 +7224,9 @@ let
 
   hydrogen = callPackage ../applications/audio/hydrogen { };
 
-  i3 = callPackage ../applications/window-managers/i3 { };
+  i3 = callPackage ../applications/window-managers/i3 {
+    cairo = cairo.override { xcbSupport = true; };
+  };
 
   i3lock = callPackage ../applications/window-managers/i3/lock.nix {
     cairo = cairo.override { xcbSupport = true; };

From f976962d7b7087920a6635ca90f07b06e8a44202 Mon Sep 17 00:00:00 2001
From: modulistic <modulistic@gmail.com>
Date: Wed, 20 Mar 2013 00:13:44 +0100
Subject: [PATCH 063/394] i3 window manager: enable Pango support for
 antialiased fonts

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

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index f8e4e16655aa..b977a6af50df 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil,
   xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl,
-  libXcursor, coreutils, perl }:
+  libXcursor, coreutils, perl, pango }:
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
@@ -12,10 +12,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm
-    libstartup_notification libX11 pcre libev yajl libXcursor perl ];
+    libstartup_notification libX11 pcre libev yajl libXcursor perl pango ];
 
   patchPhase = ''
-    sed -i -e '/^# Pango/,/^$/d' common.mk
     patchShebangs .
   '';
 

From ae9b33ac51dee8b24479cbdb54fe8d752a912ce4 Mon Sep 17 00:00:00 2001
From: modulistic <modulistic@gmail.com>
Date: Wed, 20 Mar 2013 00:14:22 +0100
Subject: [PATCH 064/394] i3 window manager: version bump from 4.5 to 4.5.1

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

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index b977a6af50df..4173660f542d 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
-  version = "4.5";
+  version = "4.5.1";
 
   src = fetchurl {
     url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "1kiffcbvvjljqchw9ffgy9s8f9z06i8805jvjas58q5i2yxl5kcy";
+    sha256 = "bae55f1c7c4a21d71aae182e4fab6038ba65ba4be5d1ceff9e269f4f74b823f2";
   };
 
   buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm

From a1a7448e5b8838db060ada9f641d15a426b94425 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Mar 2013 09:50:06 +0100
Subject: [PATCH 065/394] topgit: update to version 0.9

---
 .../git-and-tools/default.nix                 |  2 +-
 .../git-and-tools/topgit/default.nix          | 30 +++++++------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 066da4bff4a9..57aea0dcab15 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -72,7 +72,7 @@ rec {
   };
 
   topGit = lib.makeOverridable (import ./topgit) {
-    inherit stdenv fetchurl unzip;
+    inherit stdenv fetchurl;
   };
 
   tig = import ./tig {
diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
index 4b1926051822..dfe113634b4a 100644
--- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
@@ -1,33 +1,25 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
 
-let
-  version = "0.8-45-gd279e29";
-  lib = stdenv.lib;
-in
-stdenv.mkDerivation {
-  name = "topgit-${version}";
+stdenv.mkDerivation rec {
+  name = "topgit-0.9";
 
   src = fetchurl {
-    url = "http://repo.or.cz/w/topgit.git/snapshot/topgit-${version}.zip";
-    sha256 = "0vzrng1w2k7m4z0x9h6zbrcf33dx08ly8fnbxzz3ms2k2dbsmpl6";
+    url = "https://github.com/greenrd/topgit/archive/${name}.tar.gz";
+    sha256 = "1z9x42a0cmn8n2n961qcfl522nd6j9a3dpx1jbqfp24ddrk5zd94";
   };
 
-  buildInputs = [unzip];
-  configurePhase = "export prefix=$out";
+  configurePhase = "makeFlags=prefix=$out";
 
   postInstall = ''
-    mkdir -p "$out/share/doc/topgit-${version}"
-    cp README "$out/share/doc/topgit-${version}/"
-    mkdir -p "$out/etc/bash_completion.d"
-    make prefix="$out" install
-    mv "contrib/tg-completion.bash" "$out/etc/bash_completion.d/"
+    install -D README "$out/share/doc/${name}/README"
+    install -D contrib/tg-completion.bash "$out/etc/bash_completion.d/tg-completion.bash"
   '';
 
   meta = {
-    description = "TopGit aims to make handling of large amount of interdependent topic branches easier";
-    maintainers = [ lib.maintainers.marcweber lib.maintainers.ludo lib.maintainers.simons ];
-    homepage = http://repo.or.cz/w/topgit.git;
+    homepage = "https://github.com/greenrd/topgit";
+    description = "TopGit manages large amount of interdependent topic branches";
     license = "GPLv2";
     platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ marcweber ludo simons ];
   };
 }

From 51e64392ea8f4537743513adebe36c8febe355d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Mar 2013 10:15:06 +0100
Subject: [PATCH 066/394] git-annex: update to version 4.20130314

---
 .../git-and-tools/default.nix                 |  5 ++--
 .../git-and-tools/git-annex/default.nix       | 26 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 57aea0dcab15..b0d8cf7d9c5d 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -49,10 +49,9 @@ rec {
       editDistance extensibleExceptions filepath gnutls hamlet hinotify hS3
       hslogger httpConduit httpTypes HUnit IfElse json liftedBase MissingH
       monadControl mtl network networkInfo networkMulticast networkProtocolXmpp
-      QuickCheck random regexCompat SafeSemaphore SHA stm text time
+      QuickCheck random regexCompat SafeSemaphore SHA stm text time regexTdfa
       transformers transformersBase utf8String uuid wai waiLogger warp
-      xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack
-      cabalInstall;
+      xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack;
   };
 
   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 4ea0a5df8c17..697e7d3b42e0 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
@@ -6,19 +6,18 @@
 , networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck
 , random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers
 , transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes
-, yesod, yesodDefault, yesodForm, yesodStatic, testpack
-, cabalInstall		# TODO: remove this build input at the next update
+, yesod, yesodDefault, yesodForm, yesodStatic, testpack, regexTdfa
 }:
 
 let
-  version = "4.20130227";
+  version = "4.20130314";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
-    sha256 = "1zw5kzb08zz43ahbhrazjpq9zn73l3kwnqilp464frf7fg7rwan6";
+    sha256 = "0rwirg9qdbd75c7wl6413blv9045sbxmw20idvbm47qc4q14gzv9";
     name = "git-annex-${version}.tar.gz";
   };
 
@@ -30,20 +29,21 @@ stdenv.mkDerivation {
     networkProtocolXmpp openssh QuickCheck random regexCompat rsync
     SafeSemaphore SHA stm text time transformers transformersBase utf8String
     uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm
-    yesodStatic which perl testpack cabalInstall ];
+    yesodStatic which perl testpack regexTdfa ];
 
   configurePhase = ''
-    makeFlagsArray=( PREFIX=$out )
+    makeFlagsArray=( PREFIX=$out CABAL=./Setup )
     patchShebangs .
-
-    # cabal-install wants to store stuff in $HOME
-    mkdir ../tmp
-    export HOME=$PWD/../tmp
-
-    cabal configure -f-fast -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
+    ghc -O2 --make Setup
+    ./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
   '';
 
-  checkPhase = "./git-annex test";
+  doCheck = true;
+  checkPhase = ''
+    export HOME="$NIX_BUILD_TOP/tmp"
+    mkdir "$HOME"
+    ./git-annex test
+  '';
 
   meta = {
     homepage = "http://git-annex.branchable.com/";

From 7ee864141020854b3dbdb7b0d350ae33ef33ad83 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Mar 2013 10:44:54 +0100
Subject: [PATCH 067/394] haskell-xmonad-contrib: update to version 0.11.1

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

diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 6716591eabae..6282af4e2eb4 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmonad-contrib";
-  version = "0.11";
-  sha256 = "188brys16b3wmxd22j4284wnpasm8bixdjfxl1jr2q2xi45nzks0";
+  version = "0.11.1";
+  sha256 = "1356dn8ipw7fgn2xijppn69f64zg36gcxbw9qndxbbmml5gq0zrl";
   buildDepends = [
     extensibleExceptions mtl random utf8String X11 X11Xft xmonad
   ];

From 60295ebd98c46a9f20922a760e6fa5110e93ab6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Mar 2013 10:44:54 +0100
Subject: [PATCH 068/394] haskell-X11: update to version 1.6.1.1

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

diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix
index dff5bca4400b..c304a58b9a51 100644
--- a/pkgs/development/libraries/haskell/X11/default.nix
+++ b/pkgs/development/libraries/haskell/X11/default.nix
@@ -1,9 +1,12 @@
-{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender }:
+{ cabal, dataDefault, libX11, libXext, libXinerama, libXrandr
+, libXrender
+}:
 
 cabal.mkDerivation (self: {
   pname = "X11";
-  version = "1.6.0.2";
-  sha256 = "0z1g93k2zbkb9is2zy6pfwp13bv11cvs30b9cz253wjv2liphshw";
+  version = "1.6.1.1";
+  sha256 = "1bkfnxcmf8qia0l3x5n3j4f1zakjwnlq0mhdnbpp6v3q2g37brbw";
+  buildDepends = [ dataDefault ];
   extraLibraries = [
     libX11 libXext libXinerama libXrandr libXrender
   ];

From 2d00a0f8d5538c80a3d98832381a571b95fa3aa0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Mar 2013 10:44:55 +0100
Subject: [PATCH 069/394] haskell-bson: update to version 0.2.2

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

diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix
index 6b76aee47a1e..2aa8f54b884c 100644
--- a/pkgs/development/libraries/haskell/bson/default.nix
+++ b/pkgs/development/libraries/haskell/bson/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bson";
-  version = "0.2.1";
-  sha256 = "1g5xvkpn5j2yn9figxiv5dindwv6gg90np56k235hy9cwmdicmwq";
+  version = "0.2.2";
+  sha256 = "043lbaj4rrvh4a1yc033np51vi8xlbczflbhyx2bsiryzbi27waf";
   buildDepends = [
     binary cryptohash dataBinaryIeee754 mtl network text time
   ];

From 4d54ec04443a132a09b02c9c43125fb6c451ac89 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Mar 2013 10:44:55 +0100
Subject: [PATCH 070/394] haskell-cereal-conduit: update to version 0.7

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

diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
index 8637724e11a4..464e8dbb5e76 100644
--- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
@@ -1,10 +1,11 @@
-{ cabal, cereal, conduit, transformers, HUnit }:
+{ cabal, cereal, conduit, HUnit, mtl, resourcet, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "cereal-conduit";
   version = "0.7";
   sha256 = "0cf0lp47qiilrdrzmn58hwh3q7fh7g55f2a1r1bw31xapp1cvbix";
-  buildDepends = [ cereal conduit transformers HUnit ];
+  buildDepends = [ cereal conduit transformers ];
+  testDepends = [ cereal conduit HUnit mtl resourcet transformers ];
   meta = {
     homepage = "https://github.com/litherum/cereal-conduit";
     description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";

From e61805cc771813a77691460970a843aaa8b4f5c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Mar 2013 10:44:55 +0100
Subject: [PATCH 071/394] haskell-comonad: update to version 3.0.2

---
 pkgs/development/libraries/haskell/comonad/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
index b37ffdf596e1..7e11886fc582 100644
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -1,10 +1,11 @@
-{ cabal, semigroups, transformers }:
+{ cabal, doctest, filepath, semigroups, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "comonad";
-  version = "3.0.1.1";
-  sha256 = "01zqxrqxy6x6nf6rynzmncbhlgbbpshhw10pkimnw5isg3b8qhc2";
+  version = "3.0.2";
+  sha256 = "0ryyifcxc5rmjrf9323zzj357709mah1hdsrnrbakd5ck7grjfay";
   buildDepends = [ semigroups transformers ];
+  testDepends = [ doctest filepath ];
   meta = {
     homepage = "http://github.com/ekmett/comonad/";
     description = "Haskell 98 compatible comonads";

From 5bc4ec3f075c200a317de57c488e914b0ca14b71 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Mar 2013 10:44:55 +0100
Subject: [PATCH 072/394] haskell-stm-conduit: update to version 1.0.0

---
 .../libraries/haskell/stm-conduit/default.nix       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index e6c1d64857df..94117bd16635 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -1,13 +1,16 @@
-{ cabal, conduit, resourcet, stm, stmChans, transformers, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }:
+{ cabal, conduit, HUnit, QuickCheck, resourcet, stm, stmChans
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
   version = "1.0.0";
   sha256 = "1kkx3x3qdqw5jp9vn9kxbxmmb8x0wdbp8jch08azw45pwjh3ga7v";
-  buildDepends = [
-    conduit resourcet stm stmChans transformers HUnit QuickCheck
-    testFramework testFrameworkHunit testFrameworkQuickcheck2
+  buildDepends = [ conduit resourcet stm stmChans transformers ];
+  testDepends = [
+    conduit HUnit QuickCheck stm stmChans testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 transformers
   ];
   meta = {
     homepage = "https://github.com/wowus/stm-conduit";

From 35520356fdb1e40694f842f951b5a51a1dd3f112 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Mar 2013 10:44:55 +0100
Subject: [PATCH 073/394] haskell-warp: update to version 1.3.7.5

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

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index d924d4f38b07..7b48ae92b1f3 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.7.4";
-  sha256 = "0z043v1fjblbvkn44hzp7j8iawqzbwf67qxq7gsv7jfq1q58xbrx";
+  version = "1.3.7.5";
+  sha256 = "1y6xnlrqfd763s5r79f53vlbk4iirnci6wpaicrm14f791w2mppc";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpTypes liftedBase network networkConduit simpleSendfile

From d28d3f37a8fbcc1dead6eb941a4d1cc134099903 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Mar 2013 11:43:43 +0100
Subject: [PATCH 074/394] topgit: fix build on FreeBSD

The BSD unices have a version of install(1) that doesn't support the -D flag. Grr.
---
 .../version-management/git-and-tools/topgit/default.nix      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
index dfe113634b4a..5290a12a54ac 100644
--- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
   configurePhase = "makeFlags=prefix=$out";
 
   postInstall = ''
-    install -D README "$out/share/doc/${name}/README"
-    install -D contrib/tg-completion.bash "$out/etc/bash_completion.d/tg-completion.bash"
+    mkdir -p "$out/share/doc/${name}" "$out/etc/bash_completion.d/"
+    mv README "$out/share/doc/${name}/"
+    mv contrib/tg-completion.bash "$out/etc/bash_completion.d/"
   '';
 
   meta = {

From cd370052b8d44fbd1e038436de885bff98e13d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 20 Mar 2013 20:18:11 +0100
Subject: [PATCH 075/394] libopus: update

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

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index d4c90ee33fbe..d08ae8ef72a9 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fixedPoint ? false }:
 
 stdenv.mkDerivation rec {
-  name = "libopus-1.0.1";
+  name = "libopus-1.0.2";
   
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/opus/opus-1.0.1.tar.gz";
-    sha256 = "1vs133z6c03xi1a7b8bkqxlb6ipwchawwb52z1lgvh1amwy5ryl0";
+    url = "http://downloads.xiph.org/releases/opus/opus-1.0.2.tar.gz";
+    sha256 = "12npbkrcwvh3fl9l18cwrxwg269cg2j6j7876cc9q0axxvdmwqfs";
   };
 
   configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point";

From 0d23e5458820bf906b06a6eb7f571c4ca959b5f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 20 Mar 2013 20:28:26 +0100
Subject: [PATCH 076/394] opus-tools: update

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

diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix
index 6b7e1e2aeff6..a543aa32eea5 100644
--- a/pkgs/applications/audio/opus-tools/default.nix
+++ b/pkgs/applications/audio/opus-tools/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, libogg, libao, pkgconfig, libopus}:
 
 stdenv.mkDerivation rec {
-  name = "opus-tools-0.1.5";
+  name = "opus-tools-0.1.6";
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
-    sha256 = "0184zfamg3qcjknk4liz4smws3mbv77gjhq2pn9xgcx9nw78srvn";
+    sha256 = "1hd2ych34y3qy4rj4hd5cp29ixy891afizlsxphsfvfplk1dp1nc";
   };
 
   buildInputs = [ libogg libao pkgconfig libopus ];

From c2d3d2434962af8b9f8628c2fe4ae0937d493109 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 20 Mar 2013 21:19:43 +0100
Subject: [PATCH 077/394] Add dunst, a lightweight notification daemon.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/misc/dunst/default.nix | 31 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/misc/dunst/default.nix

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
new file mode 100644
index 000000000000..466aa2071e9a
--- /dev/null
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus
+, freetype, xdg_utils , libXext, glib, pango , cairo, libX11
+, libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl
+}:
+
+stdenv.mkDerivation rec {
+  name = "dunst-0.5.0";
+  version = "0.5.0";
+
+  src = fetchurl {
+    url = "https://github.com/knopwob/dunst/archive/v0.5.0.zip";
+    sha256 = "08myzhpb1afffcfk3mpmc7gs9305x853b0553fxf3lkgksmg70a6";
+  };
+
+  buildInputs =
+  [ coreutils unzip which pkgconfig dbus freetype
+    xdg_utils libXext glib pango cairo libX11 libxdg_basedir
+    libXScrnSaver xproto libXinerama perl];
+
+  buildPhase = ''
+    export VERSION=${version};
+    export PREFIX=$out;
+    make dunst;
+  '';
+
+  meta = {
+    description = "lightweight and customizable notification daemon";
+    homepage = http://www.knopwob.org/dunst/;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d3e4cca9a24..78cc5523066e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6772,6 +6772,8 @@ let
     inherit (xlibs) libX11;
   };
 
+  dunst = callPackage ../applications/misc/dunst { };
+
   dvb_apps  = callPackage ../applications/video/dvb-apps { };
 
   dvdauthor = callPackage ../applications/video/dvdauthor { };

From a799b8ef5d869d04cd55654f55305e63874bae6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 20 Mar 2013 21:48:26 +0100
Subject: [PATCH 078/394] ffmpeg: add opus support, enabled by default

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

diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix
index 100e3456ca43..622cec98f184 100644
--- a/pkgs/development/libraries/ffmpeg/1.1.nix
+++ b/pkgs/development/libraries/ffmpeg/1.1.nix
@@ -6,6 +6,7 @@
 , vpxSupport ? false, libvpx ? null
 , x264Support ? true, x264 ? null
 , xvidSupport ? true, xvidcore ? null
+, opusSupport ? true, libopus ? null
 , vdpauSupport ? true, libvdpau ? null
 , vaapiSupport ? true, libva ? null
 , faacSupport ? false, faac ? null
@@ -19,6 +20,7 @@ assert vorbisSupport -> libvorbis != null;
 assert vpxSupport -> libvpx != null;
 assert x264Support -> x264 != null;
 assert xvidSupport -> xvidcore != null;
+assert opusSupport -> libopus != null;
 assert vdpauSupport -> libvdpau != null;
 assert vaapiSupport -> libva != null;
 assert faacSupport -> faac != null;
@@ -51,6 +53,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
     ++ stdenv.lib.optional x264Support "--enable-libx264"
     ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
+    ++ stdenv.lib.optional opusSupport "--enable-libopus"
     ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
     ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
     ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
@@ -64,6 +67,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional vpxSupport libvpx
     ++ stdenv.lib.optional x264Support x264
     ++ stdenv.lib.optional xvidSupport xvidcore
+    ++ stdenv.lib.optional opusSupport libopus
     ++ stdenv.lib.optional vdpauSupport libvdpau
     ++ stdenv.lib.optional vaapiSupport libva
     ++ stdenv.lib.optional faacSupport faac

From 39be94cb6803cb6506b19a9ab61a11d4fddb4584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 20 Mar 2013 22:20:15 +0100
Subject: [PATCH 079/394] ffmpeg: enabling ffplay

Playing sound, it displays great ffts.
---
 pkgs/development/libraries/ffmpeg/1.1.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix
index 622cec98f184..9266250527e6 100644
--- a/pkgs/development/libraries/ffmpeg/1.1.nix
+++ b/pkgs/development/libraries/ffmpeg/1.1.nix
@@ -12,6 +12,7 @@
 , faacSupport ? false, faac ? null
 , dc1394Support ? false, libdc1394 ? null
 , x11grabSupport ? false, libXext ? null, libXfixes ? null
+, playSupport ? true, SDL ? null
 }:
 
 assert speexSupport -> speex != null;
@@ -25,6 +26,7 @@ assert vdpauSupport -> libvdpau != null;
 assert vaapiSupport -> libva != null;
 assert faacSupport -> faac != null;
 assert x11grabSupport -> libXext != null && libXfixes != null;
+assert playSupport -> SDL != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-1.1.3";
@@ -41,7 +43,6 @@ stdenv.mkDerivation rec {
     "--enable-gpl"
     "--enable-postproc"
     "--enable-swscale"
-    "--disable-ffplay"
     "--enable-shared"
     "--enable-avresample"
     "--enable-runtime-cpudetect"
@@ -57,7 +58,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
     ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
     ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
-    ++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
+    ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
+    ++ stdenv.lib.optional playSupport "--enable-ffplay";
 
   buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
     ++ stdenv.lib.optional mp3Support lame
@@ -72,7 +74,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional vaapiSupport libva
     ++ stdenv.lib.optional faacSupport faac
     ++ stdenv.lib.optional dc1394Support libdc1394
-    ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];
+    ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
+    ++ stdenv.lib.optional playSupport SDL;
 
   enableParallelBuilding = true;
     

From 90b2dcdd2ae30f34e8354d78eda4090bc6a6b188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 20 Mar 2013 22:38:27 +0100
Subject: [PATCH 080/394] Revert "i3 window manager: cairo.override with
 xcbSupport enabled, on par with i3lock"

i3 doesn't want cairo at all.

This reverts commit 1eb437784021521d57ae96980bf447e9162d4415.
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1c0d4bc72e4..0d3e4cca9a24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7224,9 +7224,7 @@ let
 
   hydrogen = callPackage ../applications/audio/hydrogen { };
 
-  i3 = callPackage ../applications/window-managers/i3 {
-    cairo = cairo.override { xcbSupport = true; };
-  };
+  i3 = callPackage ../applications/window-managers/i3 { };
 
   i3lock = callPackage ../applications/window-managers/i3/lock.nix {
     cairo = cairo.override { xcbSupport = true; };

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

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

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

From 72e4be65cca54964bfb7d808a4db74ca04dd8983 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 11:01:16 +0100
Subject: [PATCH 082/394] mini-httpd: update to version 1.3

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

diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix
index f853b3ebacc7..5cdff23d0a3a 100644
--- a/pkgs/servers/http/mini-httpd/default.nix
+++ b/pkgs/servers/http/mini-httpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, boostHeaders }:
 
 stdenv.mkDerivation rec {
-  name = "mini-httpd-1.2";
+  name = "mini-httpd-1.3";
 
   src = fetchurl {
     url = "mirror://savannah/mini-httpd/${name}.tar.gz";
-    sha256 = "1547312rg2phxwny9vm1bkyid251n7wy4p1mgs6f5yq6ypwrsr6p";
+    sha256 = "16n33hyp3fcjvd71yrny3ym3kqvxr1jy2hh9wgf6b7zjri3gfak3";
   };
 
   buildInputs = [ boostHeaders ];

From 75551477ce49ff3d0631b46fea94a278bbfcc793 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 11:15:42 +0100
Subject: [PATCH 083/394] haskell-active: update to version 0.1.0.4

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

diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
index 19afa5ab75e6..209341e22e76 100644
--- a/pkgs/development/libraries/haskell/active/default.nix
+++ b/pkgs/development/libraries/haskell/active/default.nix
@@ -4,13 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "active";
-  version = "0.1.0.3";
-  sha256 = "0jarc270z6raak1vz30jy2gl0pkj9a2x3ib5hq7vsl2ljbvbgyqi";
+  version = "0.1.0.4";
+  sha256 = "0f4bgx7l9vx2kywl87zpxpjbfix79lp8chf6xzfpmh4wrbmfgi1s";
   buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
   testDepends = [
     newtype QuickCheck semigroupoids semigroups vectorSpace
   ];
-  jailbreak = true;
   meta = {
     description = "Abstractions for animation";
     license = self.stdenv.lib.licenses.bsd3;

From 53b329cd9d952a606536b7df8a103cdd7784259a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 11:15:42 +0100
Subject: [PATCH 084/394] haskell-bytestring-lexing: update to version 0.4.2

---
 .../libraries/haskell/bytestring-lexing/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
index 2de7eec8eb5a..77bf20f3d817 100644
--- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bytestring-lexing";
-  version = "0.4.0";
-  sha256 = "1lww38rab9k8drndqkg306kiq6663i89sq6l1bvjv6cs13acc8wr";
+  version = "0.4.2";
+  sha256 = "0s9rip1ik7f29n2i88277vhy7dqhc2bb5bb9l6fd47disb78ic9h";
   buildTools = [ alex ];
   meta = {
     homepage = "http://code.haskell.org/~wren/";

From c06acb1bfb491da32182f9d63e7998c9abe588a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 11:15:42 +0100
Subject: [PATCH 085/394] haskell-diagrams-contrib: update to version 0.6.0.4

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

diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index 3ecfe2db8527..2e5c97d07cc5 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "0.6.0.3";
-  sha256 = "0j0wmf2nksqh3rqmzyw468bp25zikc5icif5f3rfi1v06ghsk0i5";
+  version = "0.6.0.4";
+  sha256 = "190wn56bmrpbijsxf793xbjy1a4rci3vj40ri6i2dv3an6p0ka0q";
   buildDepends = [
     colour dataDefault diagramsLib forceLayout lens mtl vectorSpace
   ];

From fda16ef2321c73612538fc0e4f73c34392a36b2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 11:15:42 +0100
Subject: [PATCH 086/394] haskell-filestore: update to version 0.6.0.1

---
 .../libraries/haskell/filestore/default.nix          | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index 5e93300b23cb..04321d34ffa1 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -4,14 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "filestore";
-  version = "0.6";
-  sha256 = "1bmsqxrkiqw791h0xwasry3jm56rjsyvl9l5r78209bhiv5v6xk0";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Diff filepath HUnit mtl parsec split time utf8String xml
-  ];
-  jailbreak = true;
+  version = "0.6.0.1";
+  sha256 = "1la30bimcjngcv5dyx1a9x8lr8c4zs0dp4kzh8y5mjf8snky1avf";
+  buildDepends = [ Diff filepath parsec split time utf8String xml ];
+  testDepends = [ Diff filepath HUnit mtl time ];
   doCheck = false;
   meta = {
     description = "Interface for versioning file stores";

From bbc516c59e42759201e998a8aad8546d8c656a09 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 11:15:42 +0100
Subject: [PATCH 087/394] haskell-gitit: update to version 0.10.3.1

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

diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 1c7dfdd10e10..9213c534fa3d 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gitit";
-  version = "0.10.3";
-  sha256 = "1hz4ddym2vn01nd22gb995dya48fzc7nsmsqywdc8hjczmn93qyg";
+  version = "0.10.3.1";
+  sha256 = "1sm6rryfyqr0nd4flbc5d520xyw2ajnkylvqf4fi4dhl6fnbpam5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 95961786c7859fca2980848f5a78b6b0d3cf8c3e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 11:15:42 +0100
Subject: [PATCH 088/394] haskell-libxml-sax: update to version 0.7.4

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

diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix
index b41ca8dfa543..afdd782fe094 100644
--- a/pkgs/development/libraries/haskell/libxml-sax/default.nix
+++ b/pkgs/development/libraries/haskell/libxml-sax/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "libxml-sax";
-  version = "0.7.3";
-  sha256 = "1514ix5n8y1dwjdm0kmr17fdigc0ic89gzwdvfgh542sjm11100r";
+  version = "0.7.4";
+  sha256 = "1vbxrmxxb6a58hd6dd81kz8fh198jkvwv4gxzbbfw44170946c0z";
   buildDepends = [ text xmlTypes ];
   extraLibraries = [ libxml2 ];
   pkgconfigDepends = [ libxml2 ];

From e4fd98a2ef4482ab9544b370112c578edd00f03e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 11:15:42 +0100
Subject: [PATCH 089/394] haskell-persistent-template: update to version
 1.1.3.1

---
 .../libraries/haskell/persistent-template/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index ae2245f73c99..396f51f69cb7 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.1.3";
-  sha256 = "1jvr71qfjv2f4vx4xbz78x5a325zkdpg2qvcbglizz10xwrm5j9d";
+  version = "1.1.3.1";
+  sha256 = "0171x8mv3ff9ppllkp3mgpwa8p1zg3y6fykq70z9h0hx1ny0407p";
   buildDepends = [ aeson monadControl persistent text transformers ];
   testDepends = [ aeson hspec persistent QuickCheck text ];
   meta = {

From 899367760726d33e883d7428acffff72db3a0c02 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 11:15:43 +0100
Subject: [PATCH 090/394] haskell-transformers-compat: update to version
 0.1.1.1

---
 .../libraries/haskell/transformers-compat/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
index d36ace0eb299..f3120a61f201 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "transformers-compat";
-  version = "0.1";
-  sha256 = "100xw00h2l6iipg6lq5bbncpil3bl6w3frak99klpi8gn6ihd8ah";
+  version = "0.1.1.1";
+  sha256 = "0i0bcfmqsnqa8fyp81virr5bh3hk23261xyx28jcfamrc18ly9ij";
   buildDepends = [ transformers ];
   noHaddock = true;
   meta = {
     homepage = "http://github.com/ekmett/transformers-compat/";
-    description = "Lenses, Folds and Traversals";
+    description = "A small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };

From d69e680035775ada41ff043a07652d79cf1a8fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 21 Mar 2013 13:08:19 +0100
Subject: [PATCH 091/394] glibc 2.17: Reinstate support for cross-GNU builds.

---
 .../libraries/glibc/2.17/common.nix           | 22 ++++++++++++++-----
 .../libraries/glibc/2.17/default.nix          |  8 +++----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix
index 3006ff490136..fb4083066de5 100644
--- a/pkgs/development/libraries/glibc/2.17/common.nix
+++ b/pkgs/development/libraries/glibc/2.17/common.nix
@@ -3,7 +3,7 @@
 
 cross:
 
-{ name, fetchurl, stdenv, installLocales ? false
+{ name, fetchurl, fetchgit ? null, stdenv, installLocales ? false
 , gccCross ? null, kernelHeaders ? null
 , machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
 , mig ? null
@@ -118,16 +118,26 @@ stdenv.mkDerivation ({
 
 # Remove the `gccCross' attribute so that the *native* glibc store path
 # doesn't depend on whether `gccCross' is null or not.
-// (removeAttrs args [ "gccCross" "fetchurl" ]) //
+// (removeAttrs args [ "gccCross" "fetchurl" "fetchgit" ]) //
 
 {
   name = name + "-${version}" +
     stdenv.lib.optionalString (cross != null) "-${cross.config}";
 
-  src = fetchurl {
-    url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
-    sha256 = "0ym3zk9ii64279wgw7pw9xkbxczy2ci7ka6mnfs05rhlainhicm3";
-  };
+  src =
+    if hurdHeaders != null
+    then fetchgit {
+      # Shamefully the "official" glibc won't build on GNU, so use the one
+      # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
+      # See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
+      url = "git://git.sv.gnu.org/hurd/glibc.git";
+      sha256 = "cecec9dd5a2bafc875c56b058b6d7628a22b250b53747513dec304f31ffdb82d";
+      rev = "d3cdecf18e6550b0984a42b43ed48c5fb26501e1";
+    }
+    else fetchurl {
+      url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
+      sha256 = "0ym3zk9ii64279wgw7pw9xkbxczy2ci7ka6mnfs05rhlainhicm3";
+    };
 
   # Remove absolute paths from `configure' & co.; build out-of-tree.
   preConfigure = ''
diff --git a/pkgs/development/libraries/glibc/2.17/default.nix b/pkgs/development/libraries/glibc/2.17/default.nix
index 0a0752570f32..1985790e9a1f 100644
--- a/pkgs/development/libraries/glibc/2.17/default.nix
+++ b/pkgs/development/libraries/glibc/2.17/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernelHeaders
+{ stdenv, fetchurl, fetchgit, kernelHeaders
 , machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
 , mig ? null
 , installLocales ? true
@@ -18,8 +18,8 @@ in
       + stdenv.lib.optionalString (hurdHeaders != null) "-hurd"
       + stdenv.lib.optionalString debugSymbols "-debug";
 
-    inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries
-      gccCross;
+    inherit fetchurl fetchgit stdenv kernelHeaders installLocales
+      profilingLibraries gccCross;
 
     builder = ./builder.sh;
 
@@ -56,7 +56,7 @@ in
 
   (if hurdHeaders != null
    then rec {
-     inherit machHeaders hurdHeaders libpthreadHeaders mig;
+     inherit machHeaders hurdHeaders libpthreadHeaders mig fetchgit;
 
      propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ];
 

From c8ff101724a7e290c2e76b33f4dcdf2e3b5c7430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 21 Mar 2013 13:25:51 +0100
Subject: [PATCH 092/394] glibc 2.17: Make the `fetchgit' argument optional.

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

diff --git a/pkgs/development/libraries/glibc/2.17/default.nix b/pkgs/development/libraries/glibc/2.17/default.nix
index 1985790e9a1f..b6d91c932db8 100644
--- a/pkgs/development/libraries/glibc/2.17/default.nix
+++ b/pkgs/development/libraries/glibc/2.17/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, kernelHeaders
+{ stdenv, fetchurl, fetchgit ? null, kernelHeaders
 , machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
 , mig ? null
 , installLocales ? true

From 1dbd3a55c4790394ecf43fc8f3b2442856df8241 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 21 Mar 2013 13:56:33 +0100
Subject: [PATCH 093/394] libv8-rubygem: Implemented a very depressing
 workaround that allows scons to build libv8.a, it's ugly but it works

---
 .../development/interpreters/ruby/patches.nix | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index 10b0b2023877..c4da956b57c8 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -1,5 +1,5 @@
 { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi
-, zlib, libuuid, gems, jdk, python }:
+, zlib, libuuid, gems, jdk, python, stdenv }:
 
 let
 
@@ -15,7 +15,32 @@ in
 {
   sup = { buildInputs = [ gems.ncursesw ]; };
 
-  libv8 = { buildInputs = [ python ]; };
+  libv8 = {
+    # This fix is needed to fool scons, which clears the environment by default.
+    # It's ugly, but it works.
+    #
+    # We create a gcc wrapper wrapper, which reexposes the environment variables
+    # that scons hides. Furthermore, they treat warnings as errors causing the
+    # build to fail, due to an unused variable.
+    #
+    # Finally, we must set CC and AR explicitly to allow scons to find the
+    # compiler and archiver
+    
+    preBuild = ''
+      cat > $TMPDIR/g++ <<EOF
+      #! ${stdenv.shell}
+      $(export)
+      
+      g++ \$(echo \$@ | sed 's/-Werror//g')
+      EOF
+      chmod +x $TMPDIR/g++
+      
+      
+      export CXX=$TMPDIR/g++
+      export AR=$(type -p ar)
+    '';
+    buildInputs = [ python ];
+  };
   
   sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
   

From 647bca444ced822a2735cbd39c23eff67b785729 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 21 Mar 2013 14:11:58 +0100
Subject: [PATCH 094/394] Allow appnames with spaces everywhere

---
 pkgs/development/mobile/androidenv/build-app.nix  | 7 ++++---
 pkgs/development/mobile/titaniumenv/build-app.nix | 8 ++++++--
 pkgs/development/mobile/xcodeenv/build-app.nix    | 7 ++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
index 3f8af65f3bd8..cf1d1fce50f0 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -13,7 +13,8 @@ let
   androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; };
 in
 stdenv.mkDerivation {
-  inherit name src;
+  name = stdenv.lib.replaceChars [" "] [""] name;
+  inherit src;
   
   ANDROID_HOME = "${androidsdkComposition}/libexec/android-sdk-${platformName}";
 
@@ -36,9 +37,9 @@ stdenv.mkDerivation {
   
   installPhase = ''
     mkdir -p $out
-    mv bin/*-${if release then "release" else "debug"}.apk $out
+    mv "bin/*-${if release then "release" else "debug"}.apk" $out
     
     mkdir -p $out/nix-support
-    echo "file binary-dist $(echo $out/*.apk)" > $out/nix-support/hydra-build-products
+    echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products
   '';
 }
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 8fe9846c15af..0d35e6c3c2a6 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -110,13 +110,17 @@ stdenv.mkDerivation {
         if target == "android" then
           ''cp $(ls build/android/bin/*.apk | grep -v '\-unsigned.apk') $out''
         else if target == "iphone" && release then
-           "cp -av build/iphone/build/* $out"
+           ''
+             cp -av build/iphone/build/* $out
+             mkdir -p $out/nix-support
+             echo "file binary-dist \"$(echo $out/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products
+           ''
         else if target == "iphone" then ""
         else throw "Target: ${target} is not supported!"}
     
     ${if target == "android" then ''
         mkdir -p $out/nix-support
-        echo "file binary-dist $(ls $out/*.apk)" > $out/nix-support/hydra-build-products
+        echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products
     '' else ""}
   '';
   
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index 535ec0992c13..ac6bbc7f282d 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -44,7 +44,8 @@ let
   deleteKeychain = "security delete-keychain $keychainName";
 in
 stdenv.mkDerivation {
-  inherit name src;
+  name = stdenv.lib.replaceChars [" "] [""] name;
+  inherit src;
   buildInputs = [ xcodewrapper ];
   buildPhase = ''
     ${stdenv.lib.optionalString release ''
@@ -79,11 +80,11 @@ stdenv.mkDerivation {
     ${stdenv.lib.optionalString release ''
       ${stdenv.lib.optionalString generateIPA ''
         # Produce an IPA file
-        xcrun -sdk iphoneos PackageApplication -v $out/*.app -o $out/${name}.ipa
+        xcrun -sdk iphoneos PackageApplication -v $out/*.app -o "$out/${name}.ipa"
         
         # Add IPA to Hydra build products
         mkdir -p $out/nix-support
-        echo "file binary-dist $(echo $out/*.ipa)" > $out/nix-support/hydra-build-products
+        echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
       ''}
       
       # Delete our temp keychain

From 770741b5b44cd13b12c2f0219c0c6b6a2e3a1eb5 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 21 Mar 2013 14:21:20 +0100
Subject: [PATCH 095/394] androidenv: fix error with obsolete quotation

---
 pkgs/development/mobile/androidenv/build-app.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
index cf1d1fce50f0..8b770ede0fc7 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   
   installPhase = ''
     mkdir -p $out
-    mv "bin/*-${if release then "release" else "debug"}.apk" $out
+    mv bin/*-${if release then "release" else "debug"}.apk $out
     
     mkdir -p $out/nix-support
     echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products

From 31c513d4b75d6202feaba4b185f01efcff7e4c7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 21 Mar 2013 14:26:50 +0100
Subject: [PATCH 096/394] gawk: Remove now-unneeded Cygwin patch.

---
 pkgs/tools/text/gawk/cygwin-identifiers.patch | 75 -------------------
 pkgs/tools/text/gawk/default.nix              |  2 +-
 2 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 pkgs/tools/text/gawk/cygwin-identifiers.patch

diff --git a/pkgs/tools/text/gawk/cygwin-identifiers.patch b/pkgs/tools/text/gawk/cygwin-identifiers.patch
deleted file mode 100644
index baff9b55481d..000000000000
--- a/pkgs/tools/text/gawk/cygwin-identifiers.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-This patch fixes compilation on Windows, where some of the identifiers
-would clash.
-
-commit 5a0b7f9953f24dc034eca4052214da49fbad8bd0
-Author: Arnold D. Robbins <arnold@skeeve.com>
-Date:   Fri Jul 29 13:25:57 2011 +0300
-
-    Fix DJGPP problem with libsigsegv.
-
-diff --git a/builtin.c b/builtin.c
-index 4d87592..941f5ad 100644
---- a/builtin.c
-+++ b/builtin.c
-@@ -605,7 +605,7 @@ format_tree(
- 	NODE *arg;
- 	long fw, prec, argnum;
- 	int used_dollar;
--	int lj, alt, big, bigbig, small, have_prec, need_format;
-+	int lj, alt, big_flag, bigbig_flag, small_flag, have_prec, need_format;
- 	long *cur = NULL;
- 	uintmax_t uval;
- 	int sgn;
-@@ -725,7 +725,7 @@ format_tree(
- 		signchar = FALSE;
- 		zero_flag = FALSE;
- 		quote_flag = FALSE;
--		lj = alt = big = bigbig = small = FALSE;
-+		lj = alt = big_flag = bigbig_flag = small_flag = FALSE;
- 		fill = sp;
- 		cp = cend;
- 		chbuf = lchbuf;
-@@ -907,7 +907,7 @@ check_pos:
- 			goto retry;  
- #endif
- 		case 'l':
--			if (big)
-+			if (big_flag)
- 				break;
- 			else {
- 				static short warned = FALSE;
-@@ -921,10 +921,10 @@ check_pos:
- 					goto out;
- 				}
- 			}
--			big = TRUE;
-+			big_flag = TRUE;
- 			goto retry;
- 		case 'L':
--			if (bigbig)
-+			if (bigbig_flag)
- 				break;
- 			else {
- 				static short warned = FALSE;
-@@ -938,10 +938,10 @@ check_pos:
- 					goto out;
- 				}
- 			}
--			bigbig = TRUE;
-+			bigbig_flag = TRUE;
- 			goto retry;
- 		case 'h':
--			if (small)
-+			if (small_flag)
- 				break;
- 			else {
- 				static short warned = FALSE;
-@@ -955,7 +955,7 @@ check_pos:
- 					goto out;
- 				}
- 			}
--			small = TRUE;
-+			small_flag = TRUE;
- 			goto retry;
- 		case 'c':
- 			need_format = FALSE;
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 29b3936a0ba9..eba1dc2ac7fd 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "04vd0axif762mf781pj3days6ilv2333b9zi9c50y5mma66g5q91";
   };
 
-  patches = stdenv.lib.optional stdenv.isCygwin [ ./cygwin-identifiers.patch ];
+  patches = [];
 
   doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
 

From efd18b91fdd0bef1c00567595a0b016959aee47a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 22:43:34 +0100
Subject: [PATCH 097/394] haskell-HSH: fix build with ghc 7.4.x

---
 pkgs/development/libraries/haskell/HSH/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix
index f80f74a3dc2b..107e3df979b2 100644
--- a/pkgs/development/libraries/haskell/HSH/default.nix
+++ b/pkgs/development/libraries/haskell/HSH/default.nix
@@ -1,5 +1,5 @@
 { cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat
-, regexPosix
+, regexPosix, fetchurl
 }:
 
 cabal.mkDerivation (self: {
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     filepath hslogger MissingH mtl regexBase regexCompat regexPosix
   ];
+  patches = [ (fetchurl { url = "https://github.com/jgoerzen/hsh/pull/10.patch"; sha256 = "0fw2ihl4hlncggwf3v4d7aydm3rzgzpcxplfbwq7janysix4q950"; }) ];
   meta = {
     homepage = "http://software.complete.org/hsh";
     description = "Library to mix shell scripting with Haskell programs";

From 8b39202106e780668a7f01cfa61169db664e424a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 21 Mar 2013 14:55:42 +0100
Subject: [PATCH 098/394] add dutch tax application for 2012

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

diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix
new file mode 100644
index 000000000000..056ad81feb59
--- /dev/null
+++ b/pkgs/applications/taxes/aangifte-2012/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
+
+stdenv.mkDerivation {
+  name = "aangifte2012-1";
+
+  src = fetchurl {
+    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2012_linux.tar.gz;
+    sha256 = "05bahvk514lncgfr9kybcafahyz1rgfpwp5cykchxbbc033zm0xy";
+  };
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  buildInputs = [ makeWrapper ];
+
+  buildPhase =
+    ''
+      for i in bin/*; do
+          patchelf \
+              --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
+              $i
+      done
+    '';
+
+  installPhase =
+    ''
+      mkdir -p $out
+      cp -prvd * $out/
+      wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin
+    '';
+
+  meta = {
+    description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)";
+    url = http://www.belastingdienst.nl/particulier/aangifte2012/download/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d3e4cca9a24..f78bc6dbdaf6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6563,6 +6563,8 @@ let
 
   aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { };
 
+  aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { };
+
   abcde = callPackage ../applications/audio/abcde {
     inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID;
   };

From 42d29c2afb4861c85255dbbf5720ef9897d48c89 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 21 Mar 2013 15:45:08 +0100
Subject: [PATCH 099/394] linux-3.8: upgrade to 3.8.4

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix
index 87421b1900d2..174c7553eeab 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix
@@ -251,7 +251,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.8.3";
+    version = "3.8.4";
     testing = false;
 
     preConfigure = ''
@@ -260,7 +260,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "15jdsnsswpah8936xmq6r1jpfsp1kbq643i4l0bgc6n749f512ig";
+      sha256 = "0sxh4nwmj49n9l0rnfpgvgvgxx47mdfmpg5syvn854zfb5sv0fvy";
     };
 
     config = configWithPlatform stdenv.platform;

From b7bb81bc1f26023b6454c0b8555ae11f4de8b384 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 21 Mar 2013 15:45:22 +0100
Subject: [PATCH 100/394] linux-3.4: upgrade to 3.4.37

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index ec80aabef0cf..0f2caeac4f7b 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -244,7 +244,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.4.35";
+    version = "3.4.37";
     testing = false;
 
     preConfigure = ''
@@ -253,7 +253,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1gyl0zgrbvx5w7qwh7amr4f3gl35hdm21zniksgsyx9cbyfxf8a4";
+      sha256 = "0f7gbspi28a29vvvv0x2818pwhyjry4wzdm5d1nknf3a0cdi8an7";
     };
 
     config = configWithPlatform stdenv.platform;

From 7560812cfa97024b7504e58c17dd6c874d1ad25c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 21 Mar 2013 15:45:45 +0100
Subject: [PATCH 101/394] linux-3.2: upgrade to 3.2.41

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index f567fe084ef0..dc088d29e112 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -239,7 +239,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.2.39";
+    version = "3.2.41";
 
     modDirVersion = version;
 
@@ -249,7 +249,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.xz";
-      sha256 = "066vgyz37jxxwmdskwzazg7xa09mirk4krlyxpvsx68ai5rjf826";
+      sha256 = "0dwk0pg07kq5s4i8h0mzv4n3dc68hp0ayd1lqis3ix86m8qkhv4j";
     };
 
     config = configWithPlatform stdenv.platform;

From 1f43786616e7d71c0c03cb2567792d8e1bfc3e3f Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 21 Mar 2013 15:45:56 +0100
Subject: [PATCH 102/394] linux-3.0: upgrade to 3.0.70

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index adaef56e55f7..0f269a630e9d 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -230,7 +230,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.0.68";
+    version = "3.0.70";
 
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -238,7 +238,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-      sha256 = "1l9ifmwfxh17r2yv5sscar46r46lc1lar1k0cyvn4hd594xmf5cw";
+      sha256 = "0hxb457mixpcq43dg0lnbkfdjnzqw4ajfcfkyyfgdzn5496li6va";
     };
 
     config = configWithPlatform stdenv.platform;

From 011fc66a7cb61d7d04e95483e1c5e4315128dc7a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 21 Mar 2013 15:46:30 +0100
Subject: [PATCH 103/394] bbswitch: upgrade to 0.6

---
 pkgs/os-specific/linux/bbswitch/default.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index dccfeeb8a692..bdfa6f5da6fb 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -1,13 +1,9 @@
 { stdenv, fetchurl, kernel }:
 
 let
-  baseName = "bbswitch-0.5";
-  name = "${baseName}-${kernel.version}";
-
-  linux38Compatibility = fetchurl {
-    url = "http://github.com/Bumblebee-Project/bbswitch/commit/5593d95.patch";
-    sha256 = "0m6y5sdagf4brhk1lsp86rx94xf628sixzf6j71bn7jnqs4jslr6";
-  };
+  baseName = "bbswitch";
+  version = "0.6";
+  name = "${baseName}-${version}-${kernel.version}";
 
 in
 
@@ -15,12 +11,10 @@ stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://github.com/downloads/Bumblebee-Project/bbswitch/${baseName}.tar.gz";
-    sha256 = "19775r3bsf5l3ssbayr30fij09gavj2qjrr438hdcmzswvlj2dpv";
+    url = "https://github.com/Bumblebee-Project/${baseName}/archive/v${version}.tar.gz";
+    sha256 = "1y1wggfrlpxybz5cvrbvvpqa2hh6ncazzdlg9c94sx40n6p5dcf4";
   };
 
-  patches = [ linux38Compatibility ];
-
   preBuild = ''
     substituteInPlace Makefile \
       --replace "\$(shell uname -r)" "${kernel.modDirVersion}" \

From ebf71f78efa429551a8f3c390369c555a991f822 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 21 Mar 2013 20:46:38 +0100
Subject: [PATCH 104/394] gtypist: fix patch hash

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

diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix
index 8fd2e28e77b3..d0793a8d13dd 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/pkgs/games/gtypist/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   patches = [ (fetchurl {
     url = "http://projects.archlinux.org/svntogit/community.git/plain/trunk/ncurses.patch?h=packages/gtypist";
-    sha256 = "1chdr4xkm140cjwv1n3ydk04qdwgycd12d9adz2sjc58lybqp7sy";
+    sha256 = "14crgh21gghszwijxjvixpijqzsgn62wx6kz28zkjskdw0p5vij1";
   })];
 
   meta = {

From b73b3c9d62c995924b78c53963f0e01b9335b76d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 21 Mar 2013 20:56:25 +0100
Subject: [PATCH 105/394] htmlize: upgrade to 1.47

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

diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix
index da3bde88d752..d4c428e5a1e5 100644
--- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix
+++ b/pkgs/applications/editors/emacs-modes/htmlize/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "htmlize-1.43";
+  name = "htmlize-1.47";
 
   builder = ./builder.sh;
 
   src = fetchurl {
     url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi;
-    sha256 = "0bdaxh3pjf4z55i7vz4yz3yz45720h8aalhmx13bgkrpijzn93bi";
+    sha256 = "0m7lby95w9sj0xlqv39imlbp80x8ajd295cs6079jyhmryf6mr10";
   };
 
   meta = {

From 69237ccb124b778d7cf1c7246e99046b38cded95 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 21 Mar 2013 21:26:03 +0100
Subject: [PATCH 106/394] haskell-bson: disable tests

they need an older version of test-framework
using jailbreak didn't work in this case so for now, disabling tests
is the easiest solution until upstream upgrades its test-framework
---
 pkgs/development/libraries/haskell/bson/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix
index 2aa8f54b884c..e572e366bdd0 100644
--- a/pkgs/development/libraries/haskell/bson/default.nix
+++ b/pkgs/development/libraries/haskell/bson/default.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     binary cryptohash dataBinaryIeee754 mtl network QuickCheck
     testFramework testFrameworkQuickcheck2 text time
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/selectel/bson-haskell";
     description = "BSON documents are JSON-like objects with a standard binary encoding";

From 208a35558ef5b46556dc36c935046f15b0b64359 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 21 Mar 2013 23:24:36 +0100
Subject: [PATCH 107/394] emacs-w3m: upgrade to current cvs

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

diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
index 751330550f1a..5c425326aaa9 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
@@ -1,6 +1,6 @@
 { fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoconf }:
 
-let date = "2012-01-15"; in
+let date = "2013-03-21"; in
 stdenv.mkDerivation rec {
   name = "emacs-w3m-cvs${date}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     inherit date;
     cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
     module = "emacs-w3m";
-    sha256 = "7a6d90b9d25f137d5a204cfa29f6c6afa8edb1ee302f969110ffda11f11909cc";
+    sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5";
   };
 
   buildInputs = [ emacs w3m texinfo autoconf ];

From 1ee0f43bb1aff87207094fd18647bb460b2d8a31 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 22 Mar 2013 01:53:41 +0100
Subject: [PATCH 108/394] bacula: add postgresql support, add myself as
 maintainer and set meta.platforms

---
 pkgs/tools/backup/bacula/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index 5f3cb2b48d38..ad594c0ea48f 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, sqlite, zlib, acl, ncurses, openssl, readline}:
+{stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline}:
 
 stdenv.mkDerivation rec {
   name = "bacula-5.2.13";
@@ -8,13 +8,18 @@ stdenv.mkDerivation rec {
     sha256 = "1n3sc0kd7r0afpyi708y3md0a24rbldnfcdz0syqj600pxcd9gm4";
   };
 
-  buildInputs = [ sqlite zlib acl ncurses openssl readline ];
+  buildInputs = [ postgresql sqlite zlib acl ncurses openssl readline ];
 
-  configureFlags = [ "--with-sqlite3=${sqlite}" ];
+  configureFlags = [ 
+    "--with-sqlite3=${sqlite}" 
+    "--with-postgresql=${postgresql}"
+  ];
 
   meta = {
     description = "Enterprise ready, Network Backup Tool";
     homepage = http://bacula.org/;
     license = "GPLv2";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.iElectric ];
   };
 }

From 73c610e1d6a69f2958cd9d927bccbb30fefa6260 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Mar 2013 02:10:20 +0100
Subject: [PATCH 109/394] git: update to version 1.8.2

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

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 9aeea223ba7c..47f86bece826 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -10,7 +10,7 @@
 
 let
 
-  version = "1.8.1.3";
+  version = "1.8.2";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "1waz35cwgcwhgmgzmc4s00yd2vivhy77p49crgqsl0nqpxyj8lrp";
+    sha256 = "1rhkya4kfs7iayasgj3bk8zg1pfk3h7wqhfy9d6aaqjgzb75pwy2";
   };
 
   patches = [ ./docbook2texi.patch ];

From 930ace150b9336d79f1c2c3925a8a3bd653a4e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 22 Mar 2013 12:10:02 +0100
Subject: [PATCH 110/394] Adding teamviewer client for linux
 (www.teamviewer.com)

In fact it uses wine.
---
 .../networking/remote/teamviewer/default.nix  | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/networking/remote/teamviewer/default.nix

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
new file mode 100644
index 000000000000..5c668b6e920e
--- /dev/null
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper
+, bash }:
+
+assert stdenv.system == "i686-linux";
+let
+  topath = wine;
+
+  toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 
+    [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]);
+in
+stdenv.mkDerivation {
+  name = "teamviewer-7.0.9377";
+  src = fetchurl {
+    url = "http://www.teamviewer.com/download/version_7x/teamviewer_linux.tar.gz";
+    sha256 = "1f8934jqj093m1z56yl6k2ah6njkk6pz1rjvpqnryi29pp5piaiy";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  # I need patching, mainly for it not try to use its own 'wine' (in the tarball).
+  installPhase = ''
+    mkdir -p $out/share/teamviewer $out/bin
+    cp -a .tvscript/* $out/share/teamviewer
+    cp -a .wine/drive_c $out/share/teamviewer
+    sed -i -e 's/^tv_Run//' \
+      -e 's/^  setup_tar_env//' \
+      -e 's/^  setup_env//' \
+      -e 's,^  TV_Wine_dir=.*,  TV_Wine_dir=${wine},' \
+      -e 's,progsrc=.*drive_c,progsrc='$out'"/share/teamviewer/drive_c,' \
+      $out/share/teamviewer/wrapper
+
+    cat > $out/bin/teamviewer << EOF
+    #!${bash}/bin/sh
+    export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
+    export PATH=${topath}\''${PATH:+:\$PATH}
+    $out/share/teamviewer/wrapper wine "c:\Program Files\TeamViewer\Version7\TeamViewer.exe" "\$@"
+    EOF
+    chmod +x $out/bin/teamviewer
+  '';
+
+  meta = {
+    homepage = "http://www.teamviewer.com";
+    license = "unfree";
+    description = "Desktop sharing application, providing remote support and online meetings";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f78bc6dbdaf6..153c3364bc92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1629,6 +1629,8 @@ let
 
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
+  teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { };
+
   telnet = callPackage ../tools/networking/telnet { };
 
   texmacs = callPackage ../applications/editors/texmacs {

From 6f64c0c6d6717d39f2f5feada46fd89cbae35e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 22 Mar 2013 12:17:05 +0100
Subject: [PATCH 111/394] teamviewer: fixing broken wine reference

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

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 5c668b6e920e..8c6295197643 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -3,7 +3,7 @@
 
 assert stdenv.system == "i686-linux";
 let
-  topath = wine;
+  topath = "${wine}/bin";
 
   toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 
     [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]);

From d716731cf4fa2c5936d00968b2cb2e430ae02206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 22 Mar 2013 12:41:16 +0100
Subject: [PATCH 112/394] teamviewer: adding a work-in-progress lowprio version
 8.

It requires root running a daemon, just to use the client. Suspicious.
---
 .../networking/remote/teamviewer/8.nix        | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/remote/teamviewer/8.nix

diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix
new file mode 100644
index 000000000000..b38a95ad2e9c
--- /dev/null
+++ b/pkgs/applications/networking/remote/teamviewer/8.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper
+, bash }:
+
+# Work in progress.
+
+# It doesn't want to start unless teamviewerd is running as root.
+# I haven't tried to make the daemon run.
+
+let
+  topath = "${wine}/bin";
+
+  toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 
+    [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]);
+in
+stdenv.mkDerivation {
+  name = "teamviewer-8.0.17147";
+  src = fetchurl {
+    url = "http://download.teamviewer.com/download/teamviewer_linux_x64.deb";
+    sha256 = "01iynk954pphl5mq4avs843xyzvdfzng1lpsy7skgwvw0k9cx5ab";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  unpackPhase = ''
+    ar x $src
+    tar xf data.tar.gz
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/teamviewer8 $out/bin
+    cp -a opt/teamviewer8/* $out/share/teamviewer8
+    rm -R $out/share/teamviewer8/tv_bin/wine/{bin,lib,share}
+
+    cat > $out/bin/teamviewer << EOF
+    #!${bash}/bin/sh
+    export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
+    export PATH=${topath}\''${PATH:+:\$PATH}
+    $out/share/teamviewer8/tv_bin/script/teamviewer
+    EOF
+    chmod +x $out/bin/teamviewer
+  '';
+
+  meta = {
+    homepage = "http://www.teamviewer.com";
+    license = "unfree";
+    description = "Desktop sharing application, providing remote support and online meetings";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 153c3364bc92..2ef3953e76b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1629,7 +1629,10 @@ let
 
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
-  teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { };
+  teamviewer = callPackage ../applications/networking/remote/teamviewer { };
+
+  # Work In Progress: it doesn't start unless running a daemon as root
+  teamviewer8 = lowPrio (callPackage ../applications/networking/remote/teamviewer/8.nix { });
 
   telnet = callPackage ../tools/networking/telnet { };
 

From 617394eaf81ddcf5da0d143b68d5ddc92e31cc67 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Mar 2013 12:49:53 +0100
Subject: [PATCH 113/394] latex2html: update meta information

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

diff --git a/pkgs/tools/typesetting/tex/latex2html/default.nix b/pkgs/tools/typesetting/tex/latex2html/default.nix
index 354cb6d22b0e..6fbb8a4f069a 100644
--- a/pkgs/tools/typesetting/tex/latex2html/default.nix
+++ b/pkgs/tools/typesetting/tex/latex2html/default.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    homepage = http://www.latex2html.org/;
-    license = "unfree-redistributable";
+    homepage = "http://www.latex2html.org/";
     description = "Convertor written in Perl that converts LaTeX documents to HTML";
   };
+    license = stdenv.lib.licenses.gpl2Plus;
 
 }

From 7e24ae77fe59114f6df877d936eb16fa6a1cdaf0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Mar 2013 12:50:13 +0100
Subject: [PATCH 114/394] latex2html: update to version 2008

---
 .../typesetting/tex/latex2html/default.nix    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/latex2html/default.nix b/pkgs/tools/typesetting/tex/latex2html/default.nix
index 6fbb8a4f069a..1d1746e9a4b3 100644
--- a/pkgs/tools/typesetting/tex/latex2html/default.nix
+++ b/pkgs/tools/typesetting/tex/latex2html/default.nix
@@ -1,23 +1,25 @@
-{stdenv, fetchurl, tex, perl, netpbm, ghostscript}:
+{ stdenv, fetchurl, tex, perl, netpbm, ghostscript }:
+
+stdenv.mkDerivation rec {
+  name = "latex2html-2008";
+
+  src = fetchurl {
+    url = "http://www.latex2html.org/~latex2ht/current/${name}.tar.gz";
+    sha256 = "1b9pld6wz01p1pf5qwxjipdkhq34hmmw9mfkjp150hlqlcanhiar";
+  };
 
-stdenv.mkDerivation {
-  name = "latex2html-2002-1";
-  
   buildInputs = [ tex perl ghostscript netpbm ];
 
   preConfigure = ''
-      configureFlags="--with-texpath=$out/share/texmf-nix";
+    patchShebangs .
+    sed -i -e "s|#! /bin/cat|#! $(type -p cat)|" configure
+    configureFlags="--with-texpath=$out/share/texmf-nix";
   '';
 
-  src = fetchurl {
-    url = mirror://ubuntu/pool/multiverse/l/latex2html/latex2html_2002-2-1-20050114.orig.tar.gz;
-    sha256 = "22049a77cf88a647776e61e06800ace4f9a06afc6ffe2590574487f023d0881f";
-  };
-
   meta = {
     homepage = "http://www.latex2html.org/";
     description = "Convertor written in Perl that converts LaTeX documents to HTML";
-  };
     license = stdenv.lib.licenses.gpl2Plus;
+  };
 
 }

From 7df21af24233919c830e4860397b022ed45a9cd4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Mar 2013 12:53:07 +0100
Subject: [PATCH 115/394] wxmaxima: don't try to build this package on FreeBSD

---
 pkgs/applications/science/math/wxmaxima/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 559c4448c316..2f616b2bed0d 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
     description = "Cross platform GUI for the computer algebra system Maxima.";
     license = "GPL2";
     homepage = http://wxmaxima.sourceforge.net;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From fb7b910aa3104c48cf9161d4f8f837e6bcc1ba25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 22 Mar 2013 12:54:49 +0100
Subject: [PATCH 116/394] Fixing tarball (missed assertion)

---
 pkgs/applications/networking/remote/teamviewer/8.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix
index b38a95ad2e9c..cc332d65dece 100644
--- a/pkgs/applications/networking/remote/teamviewer/8.nix
+++ b/pkgs/applications/networking/remote/teamviewer/8.nix
@@ -6,6 +6,7 @@
 # It doesn't want to start unless teamviewerd is running as root.
 # I haven't tried to make the daemon run.
 
+assert stdenv.system = "i686-linux";
 let
   topath = "${wine}/bin";
 

From c4ffd2cac967d716bef256e17800da542b24f7d6 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 22 Mar 2013 13:00:49 +0100
Subject: [PATCH 117/394] dunst: Add meta.platforms.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/misc/dunst/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 466aa2071e9a..457f20b4d441 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -27,5 +27,7 @@ stdenv.mkDerivation rec {
     description = "lightweight and customizable notification daemon";
     homepage = http://www.knopwob.org/dunst/;
     license = stdenv.lib.licenses.bsd3;
+    # NOTE: 'unix' or even 'all' COULD work too, I'm not sure
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 381660cf3179c2808c0e1edbf5bf5ef808918969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Fri, 22 Mar 2013 15:44:27 +0100
Subject: [PATCH 118/394] doxygen: update to 1.8.3.1

There are many bugfixes and some new features over 1.8.1.
---
 pkgs/development/tools/documentation/doxygen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 047da44a7937..4f2ef6df8498 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, perl, flex, bison, qt4 }:
 
 let
-  name = "doxygen-1.8.1";
+  name = "doxygen-1.8.3.1";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
-    sha256 = "0qmprax8d5fwx6sc7x9l06ilh2ffgvm6xs0rh54k3v5q5879r7mg";
+    sha256 = "0m9bwxg9g2h5fp9as0l0rmibm9ing39nssfrn3608v0v21l9yx0c";
   };
 
   patches = [ ./tmake.patch ];

From 48a871ffb7c04df1feff2a1f771e45608afff6d3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Fri, 22 Mar 2013 17:00:05 +0200
Subject: [PATCH 119/394] Update nvidia legacy 304 driver so that it compiles
 with new kernels

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
index c88eb77c12f9..1a8761afbf0f 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 
-let versionNumber = "304.64"; in
+let versionNumber = "304.84"; in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@@ -19,12 +19,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "0li27nlhx9bbln9424xpxw46sarjdch2fxpn4kvh0npaywll2ii3";
+        sha256 = "14hfx3rhf3vf3x3klkhz5qkjrg51r22nqqdzffilcwkxdjfg10j1";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "1x33f6b9zcsnpjcxlv38l1w0blimsv1y3bbrrzg48wwwb5wvynxl";
+        sha256 = "1ixxkykl78g874g537apvxalggp3kw0mm5q69rl99jlw6jibbm80";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From 4144141c7b5d0b942e57f84eb352a7e0cc92a6f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 22 Mar 2013 16:16:10 +0100
Subject: [PATCH 120/394] Fixing the teamviewer evaluation and builds.

Now tested even the tarball, before committing.
---
 pkgs/applications/networking/remote/teamviewer/8.nix | 2 +-
 pkgs/top-level/all-packages.nix                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix
index cc332d65dece..8113e33e0a72 100644
--- a/pkgs/applications/networking/remote/teamviewer/8.nix
+++ b/pkgs/applications/networking/remote/teamviewer/8.nix
@@ -6,7 +6,7 @@
 # It doesn't want to start unless teamviewerd is running as root.
 # I haven't tried to make the daemon run.
 
-assert stdenv.system = "i686-linux";
+assert stdenv.system == "i686-linux";
 let
   topath = "${wine}/bin";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad6f6145a42b..1e269b6f97d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1629,10 +1629,10 @@ let
 
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
-  teamviewer = callPackage ../applications/networking/remote/teamviewer { };
+  teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { };
 
   # Work In Progress: it doesn't start unless running a daemon as root
-  teamviewer8 = lowPrio (callPackage ../applications/networking/remote/teamviewer/8.nix { });
+  teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { });
 
   telnet = callPackage ../tools/networking/telnet { };
 

From fb127d28cb02e2bf5a84e06f6749b48562d971a2 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 23 Mar 2013 00:38:18 +0100
Subject: [PATCH 121/394] ipython: adding depenencies for ipython's notebook

---
 pkgs/shells/ipython/default.nix    |  2 +-
 pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index a64c20520561..95eaea7390e7 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "1m4m0zf3llnicfgrbnl2h08p3662px7v2pzbhq4fq24vnyz6x5w2";
   };
 
-  propagatedBuildInputs = [ pythonPackages.readline pythonPackages.sqlite3 ];
+  propagatedBuildInputs = [ pythonPackages.readline pythonPackages.sqlite3 pythonPackages.tornado pythonPackages.pyzmq ];
 
   doCheck = false;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93bcb49db05d..9c816188b715 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4596,6 +4596,28 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  tornado = buildPythonPackage rec {
+    name = "tornado-2.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/t/tornado/tornado-2.4.tar.gz";
+      md5 = "c738af97c31dd70f41f6726cf0968941";
+    };
+    doCheck = false;
+  };
+
+
+  pyzmq = buildPythonPackage rec {
+    name = "pyzmq-13.0.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyzmq/pyzmq-13.0.0.zip";
+      md5 = "fa2199022e54a393052d380c6e1a0934";
+    };
+    buildInputs = [ pkgs.unzip pkgs.zeromq3 ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+  };
+
+
   tracing = buildPythonPackage rec {
     name = "tracing-0.7";
 

From 54d81f1b6b0abe5528c89b037e97593a84bc3f56 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 23 Mar 2013 00:44:19 +0100
Subject: [PATCH 122/394] opencv: python bindings

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

diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 09a36247348d..291ca560c03d 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
-, pkgconfig, gstreamer, xineLib, glib }:
+, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages }:
 
 let v = "2.4.3"; in
 
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "16zmyr383x9ka81mp6h2s9hlfzd383njddf3x1rswkldjy2ykyzq";
   };
 
-  buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer ];
+  buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer
+    python27 python27Packages.numpy ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 

From 5add198e3d2b17a87c8c593b59cbc3fff02a1511 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sat, 23 Mar 2013 15:24:59 +0100
Subject: [PATCH 123/394] nijs: updated to 0.0.5

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

diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index db5b672a5991..48a21d04bcf0 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -751,13 +751,13 @@ let self = {
     ];
   };
 
-  "nijs" = self."nijs-0.0.4";
+  "nijs" = self."nijs-0.0.5";
 
-  "nijs-0.0.4" = self.buildNodePackage rec {
-    name = "nijs-0.0.4";
+  "nijs-0.0.5" = self.buildNodePackage rec {
+    name = "nijs-0.0.5";
     src = fetchurl {
       url = "http://registry.npmjs.org/nijs/-/${name}.tgz";
-      sha256 = "0hr7chc4wrynq5mlakchx3p715i50ycakbqj4jcngx62wk9l42qd";
+      sha256 = "026lxgm75mqy5n1yjsk1n8xbgq5n9lw43lqa5nmy2mq74hzzksf5";
     };
     deps = [
       self."optparse"

From 3aab8525ed82a4738e75d5cbd443e65d98f0f4f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Mar 2013 14:14:40 +0100
Subject: [PATCH 124/394] haskell-bytestring-lexing: update to version 0.4.3

---
 .../libraries/haskell/bytestring-lexing/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
index 77bf20f3d817..93c8b2aa2290 100644
--- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bytestring-lexing";
-  version = "0.4.2";
-  sha256 = "0s9rip1ik7f29n2i88277vhy7dqhc2bb5bb9l6fd47disb78ic9h";
+  version = "0.4.3";
+  sha256 = "0dynfrf8ym01v2dl57422h8r75kdlqh2qzqi9yc0f1bmbfqxap6r";
   buildTools = [ alex ];
   meta = {
     homepage = "http://code.haskell.org/~wren/";

From 9e5910620f70e726b80130bea2fa55738bcb5e1b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Mar 2013 14:14:40 +0100
Subject: [PATCH 125/394] haskell-void: update to version 0.6

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

diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix
index 91b641c5f9ac..591040a95480 100644
--- a/pkgs/development/libraries/haskell/void/default.nix
+++ b/pkgs/development/libraries/haskell/void/default.nix
@@ -1,10 +1,10 @@
-{ cabal, semigroups }:
+{ cabal, hashable, semigroups }:
 
 cabal.mkDerivation (self: {
   pname = "void";
-  version = "0.5.12";
-  sha256 = "03fqcap94saj7mx3y4pvvfj4z8dy6rsk2kvhgbnk2wvz5xm7xvci";
-  buildDepends = [ semigroups ];
+  version = "0.6";
+  sha256 = "0g1dja7qcp2d9a4m8j1f4ddyvbl003znyk7yn5w5qiiqr1pacs1n";
+  buildDepends = [ hashable semigroups ];
   meta = {
     homepage = "http://github.com/ekmett/void";
     description = "A Haskell 98 logically uninhabited data type";

From 81970ff44582f37bd15d7dd6e950d849418b1eb1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Mar 2013 14:31:29 +0100
Subject: [PATCH 126/394] haskell-conduit: jailbreak to fix build with latest
 version of 'void'

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 8bfb77a8706d..a183a00cdda3 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     doctest hspec QuickCheck resourcet text transformers void
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Streaming data processing library";

From ac8b39f66aac7bdea32cd6c43b13d792bca72081 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Mar 2013 14:37:17 +0100
Subject: [PATCH 127/394] haskell-wai-extra: jailbreak to fix build with latest
 version of 'void'

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

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 7e331d69da09..b14da93a54d0 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
     blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit
     text transformers wai waiTest zlib zlibBindings
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/yesodweb/wai";
     description = "Provides some basic WAI handlers and middleware";

From 6fc2cccfe6a2a0518ca5e4347aaac2f387e956d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Mar 2013 14:57:25 +0100
Subject: [PATCH 128/394] Add myself as a maintainer to all Haskell packages
 (re-)generated by hackage4nix.

---
 pkgs/applications/editors/leksah/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/Cabal/1.16.0.3.nix        | 5 ++++-
 pkgs/development/libraries/haskell/Chart/default.nix         | 5 ++++-
 .../development/libraries/haskell/ChasingBottoms/default.nix | 1 +
 pkgs/development/libraries/haskell/ConfigFile/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/CouchDB/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/Crypto/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/DAV/default.nix           | 1 +
 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.1.2.2.nix          | 5 ++++-
 pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix          | 5 ++++-
 pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix          | 5 ++++-
 pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix          | 5 ++++-
 pkgs/development/libraries/haskell/Glob/default.nix          | 1 +
 pkgs/development/libraries/haskell/GlomeVec/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/Graphalyze/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 ++++-
 .../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/HTTP/4000.2.3.nix         | 5 ++++-
 pkgs/development/libraries/haskell/HTTP/4000.2.5.nix         | 5 ++++-
 pkgs/development/libraries/haskell/HTTP/4000.2.8.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/HUnit/1.2.4.3.nix         | 5 ++++-
 pkgs/development/libraries/haskell/HUnit/1.2.5.1.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/IORefCAS/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/IOSpec/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/IfElse/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/JsContracts/default.nix   | 5 ++++-
 pkgs/development/libraries/haskell/JuicyPixels/default.nix   | 5 ++++-
 pkgs/development/libraries/haskell/List/default.nix          | 1 +
 pkgs/development/libraries/haskell/ListLike/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/ListZipper/default.nix    | 1 +
 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.2.3.1.nix        | 5 ++++-
 pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix        | 5 ++++-
 pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix        | 5 ++++-
 pkgs/development/libraries/haskell/OpenGL/2.8.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/QuickCheck/2.5.1.1.nix    | 5 ++++-
 pkgs/development/libraries/haskell/QuickCheck/2.6.nix        | 5 ++++-
 pkgs/development/libraries/haskell/RSA/default.nix           | 5 ++++-
 pkgs/development/libraries/haskell/Ranged-sets/default.nix   | 5 ++++-
 pkgs/development/libraries/haskell/ReadArgs/default.nix      | 1 +
 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 ++++-
 pkgs/development/libraries/haskell/SafeSemaphore/default.nix | 1 +
 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.2.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 ++++-
 .../development/libraries/haskell/abstract-deque/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/abstract-par/default.nix  | 5 ++++-
 .../libraries/haskell/accelerate-cuda/default.nix            | 5 ++++-
 .../libraries/haskell/accelerate-examples/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/accelerate-io/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/accelerate/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/active/default.nix        | 1 +
 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/appar/default.nix         | 1 +
 pkgs/development/libraries/haskell/arrows/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/asn1-data/default.nix     | 5 ++++-
 pkgs/development/libraries/haskell/async/2.0.1.3.nix         | 5 ++++-
 pkgs/development/libraries/haskell/async/2.0.1.4.nix         | 5 ++++-
 pkgs/development/libraries/haskell/attempt/default.nix       | 5 ++++-
 .../libraries/haskell/attoparsec-binary/default.nix          | 1 +
 .../libraries/haskell/attoparsec-conduit/default.nix         | 5 ++++-
 pkgs/development/libraries/haskell/attoparsec/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/attoparsec/enumerator.nix | 5 ++++-
 .../libraries/haskell/authenticate-oauth/default.nix         | 1 +
 pkgs/development/libraries/haskell/authenticate/default.nix  | 5 ++++-
 pkgs/development/libraries/haskell/base-compat/default.nix   | 1 +
 .../libraries/haskell/base-unicode-symbols/default.nix       | 5 ++++-
 .../libraries/haskell/base16-bytestring/default.nix          | 5 ++++-
 .../libraries/haskell/base64-bytestring/default.nix          | 5 ++++-
 .../development/libraries/haskell/base64-conduit/default.nix | 1 +
 pkgs/development/libraries/haskell/base64-string/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/basic-prelude/default.nix | 1 +
 pkgs/development/libraries/haskell/benchpress/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/bifunctors/default.nix    | 1 +
 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/bits-atomic/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-markup/default.nix  | 5 ++++-
 pkgs/development/libraries/haskell/blaze-svg/default.nix     | 1 +
 pkgs/development/libraries/haskell/blaze-textual/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/bloomfilter/default.nix   | 5 ++++-
 pkgs/development/libraries/haskell/bmp/1.2.2.1.nix           | 5 ++++-
 pkgs/development/libraries/haskell/bmp/1.2.4.1.nix           | 5 ++++-
 pkgs/development/libraries/haskell/boomerang/default.nix     | 1 +
 pkgs/development/libraries/haskell/brainfuck/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/c2hs/default.nix          | 5 ++++-
 pkgs/development/libraries/haskell/cabal-file-th/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/cabal-macosx/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 ++++-
 .../development/libraries/haskell/cereal-conduit/default.nix | 1 +
 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.3.nix        | 5 ++++-
 pkgs/development/libraries/haskell/cipher-aes/default.nix    | 1 +
 pkgs/development/libraries/haskell/cipher-rc4/default.nix    | 1 +
 pkgs/development/libraries/haskell/citeproc-hs/default.nix   | 5 ++++-
 .../libraries/haskell/classy-prelude-conduit/default.nix     | 1 +
 .../development/libraries/haskell/classy-prelude/default.nix | 1 +
 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/comonad-transformers/default.nix       | 1 +
 pkgs/development/libraries/haskell/comonad/default.nix       | 1 +
 pkgs/development/libraries/haskell/comonads-fd/default.nix   | 1 +
 .../libraries/haskell/compact-string-fix/default.nix         | 5 ++++-
 .../libraries/haskell/concurrent-extra/default.nix           | 1 +
 pkgs/development/libraries/haskell/conduit/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/configurator/default.nix  | 1 +
 pkgs/development/libraries/haskell/constraints/default.nix   | 5 ++++-
 .../libraries/haskell/continued-fractions/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/contravariant/default.nix | 1 +
 pkgs/development/libraries/haskell/converge/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/cpu/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 ++++-
 .../development/libraries/haskell/crypto-numbers/default.nix | 1 +
 .../libraries/haskell/crypto-pubkey-types/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/crypto-pubkey/default.nix | 1 +
 .../libraries/haskell/crypto-random-api/default.nix          | 1 +
 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/cuda/default.nix          | 5 ++++-
 pkgs/development/libraries/haskell/curl/default.nix          | 5 ++++-
 .../haskell/data-accessor/data-accessor-template.nix         | 5 ++++-
 .../haskell/data-accessor/data-accessor-transformers.nix     | 1 +
 .../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-inttrie/default.nix  | 5 ++++-
 .../libraries/haskell/data-lens-template/default.nix         | 1 +
 pkgs/development/libraries/haskell/data-lens/default.nix     | 1 +
 .../libraries/haskell/data-memocombinators/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/data-reify/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/dataenc/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/date-cache/default.nix    | 1 +
 pkgs/development/libraries/haskell/datetime/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/dbus/default.nix          | 1 +
 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.1.nix       | 5 ++++-
 pkgs/development/libraries/haskell/derive/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/derp/default.nix          | 5 ++++-
 pkgs/development/libraries/haskell/diagrams/cairo.nix        | 1 +
 pkgs/development/libraries/haskell/diagrams/contrib.nix      | 1 +
 pkgs/development/libraries/haskell/diagrams/core.nix         | 1 +
 pkgs/development/libraries/haskell/diagrams/diagrams.nix     | 1 +
 pkgs/development/libraries/haskell/diagrams/lib.nix          | 1 +
 pkgs/development/libraries/haskell/diagrams/svg.nix          | 1 +
 pkgs/development/libraries/haskell/digest/default.nix        | 5 ++++-
 .../libraries/haskell/digestive-functors-heist/default.nix   | 1 +
 .../libraries/haskell/digestive-functors-snap/default.nix    | 1 +
 .../libraries/haskell/digestive-functors/default.nix         | 1 +
 .../development/libraries/haskell/dimensional-tf/default.nix | 1 +
 pkgs/development/libraries/haskell/dimensional/default.nix   | 5 ++++-
 .../development/libraries/haskell/directory-tree/default.nix | 5 ++++-
 .../haskell/distributed-process-simplelocalnet/default.nix   | 5 ++++-
 .../libraries/haskell/distributed-process/default.nix        | 5 ++++-
 .../libraries/haskell/distributed-static/default.nix         | 5 ++++-
 pkgs/development/libraries/haskell/distributive/default.nix  | 1 +
 pkgs/development/libraries/haskell/dlist/default.nix         | 5 ++++-
 pkgs/development/libraries/haskell/dns/default.nix           | 1 +
 pkgs/development/libraries/haskell/doctest/default.nix       | 1 +
 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/dual-tree/default.nix     | 1 +
 pkgs/development/libraries/haskell/dyre/default.nix          | 1 +
 pkgs/development/libraries/haskell/edit-distance/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/editline/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/either/default.nix        | 1 +
 pkgs/development/libraries/haskell/elerea/default.nix        | 1 +
 .../development/libraries/haskell/email-validate/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/encoding/default.nix      | 1 +
 pkgs/development/libraries/haskell/entropy/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/enumerator/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/erf/default.nix           | 5 ++++-
 pkgs/development/libraries/haskell/errors/default.nix        | 1 +
 pkgs/development/libraries/haskell/exception-mtl/default.nix | 5 ++++-
 .../libraries/haskell/exception-transformers/default.nix     | 5 ++++-
 .../libraries/haskell/executable-path/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/default.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-visualize/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/file-location/default.nix | 1 +
 pkgs/development/libraries/haskell/filepath/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/filestore/default.nix     | 5 ++++-
 .../libraries/haskell/filesystem-conduit/default.nix         | 1 +
 pkgs/development/libraries/haskell/fingertree/default.nix    | 5 ++++-
 .../libraries/haskell/flexible-defaults/default.nix          | 5 ++++-
 pkgs/development/libraries/haskell/force-layout/default.nix  | 1 +
 pkgs/development/libraries/haskell/fsnotify/default.nix      | 1 +
 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/geniplate/default.nix     | 1 +
 pkgs/development/libraries/haskell/ghc-core/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/ghc-events/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/ghc-heap-view/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/ghc-mtl/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/ghc-vis/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/glpk-hs/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/gnuidn/default.nix        | 1 +
 pkgs/development/libraries/haskell/gnutls/default.nix        | 1 +
 pkgs/development/libraries/haskell/graphviz/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/groupoids/default.nix     | 1 +
 pkgs/development/libraries/haskell/gsasl/default.nix         | 1 +
 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/hakyll/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/hamlet/default.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/1.1.2.5.nix      | 5 ++++-
 pkgs/development/libraries/haskell/hashable/1.2.0.5.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/0.6.4.7.nix     | 5 ++++-
 pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix     | 5 ++++-
 pkgs/development/libraries/haskell/haskell-lexer/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/haskell-mpi/default.nix   | 5 ++++-
 .../libraries/haskell/haskell-src-exts/1.11.1.nix            | 5 ++++-
 .../libraries/haskell/haskell-src-exts/1.13.5.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 ++++-
 pkgs/development/libraries/haskell/heist/default.nix         | 1 +
 pkgs/development/libraries/haskell/hexpat/default.nix        | 1 +
 .../libraries/haskell/highlighting-kate/default.nix          | 5 ++++-
 pkgs/development/libraries/haskell/hinotify/default.nix      | 1 +
 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/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/hmatrix/default.nix       | 1 +
 pkgs/development/libraries/haskell/hoauth/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/hoogle/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 ++++-
 .../libraries/haskell/hslogger-template/default.nix          | 5 ++++-
 .../libraries/haskell/hspec-expectations/default.nix         | 1 +
 pkgs/development/libraries/haskell/hspec-meta/default.nix    | 1 +
 pkgs/development/libraries/haskell/hspec/default.nix         | 1 +
 pkgs/development/libraries/haskell/hspread/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/hsyslog/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/html-conduit/default.nix  | 1 +
 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-reverse-proxy/default.nix         | 1 +
 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/idna/default.nix          | 1 +
 pkgs/development/libraries/haskell/ieee754/default.nix       | 5 ++++-
 .../libraries/haskell/instant-generics/default.nix           | 5 ++++-
 pkgs/development/libraries/haskell/io-choice/default.nix     | 5 ++++-
 pkgs/development/libraries/haskell/io-storage/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/iproute/default.nix       | 1 +
 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/json/default.nix          | 5 ++++-
 pkgs/development/libraries/haskell/jsonTypes/default.nix     | 5 ++++-
 pkgs/development/libraries/haskell/kansas-lava/default.nix   | 1 +
 .../libraries/haskell/lambdabot-utils/default.nix            | 5 ++++-
 pkgs/development/libraries/haskell/lambdabot/default.nix     | 5 ++++-
 .../libraries/haskell/lambdacube-engine/default.nix          | 1 +
 .../libraries/haskell/language-c-quote/default.nix           | 5 ++++-
 pkgs/development/libraries/haskell/language-c/0.3.2.1.nix    | 5 ++++-
 pkgs/development/libraries/haskell/language-c/0.4.2.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/lens/default.nix          | 1 +
 pkgs/development/libraries/haskell/liblastfm/default.nix     | 1 +
 pkgs/development/libraries/haskell/libmpd/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/libxml-sax/default.nix    | 1 +
 pkgs/development/libraries/haskell/lifted-base/default.nix   | 5 ++++-
 .../development/libraries/haskell/lockfree-queue/default.nix | 1 +
 pkgs/development/libraries/haskell/logfloat/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/logict/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/lrucache/default.nix      | 1 +
 pkgs/development/libraries/haskell/ltk/default.nix           | 5 ++++-
 pkgs/development/libraries/haskell/maccatcher/default.nix    | 1 +
 .../libraries/haskell/mainland-pretty/default.nix            | 5 ++++-
 .../development/libraries/haskell/markdown-unlit/default.nix | 1 +
 .../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/mime-types/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/minimorph/default.nix     | 1 +
 pkgs/development/libraries/haskell/miniutter/default.nix     | 1 +
 pkgs/development/libraries/haskell/mmap/default.nix          | 5 ++++-
 pkgs/development/libraries/haskell/mmorph/default.nix        | 1 +
 pkgs/development/libraries/haskell/monad-control/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/monad-logger/default.nix  | 1 +
 pkgs/development/libraries/haskell/monad-loops/default.nix   | 5 ++++-
 .../libraries/haskell/monad-par-extras/default.nix           | 5 ++++-
 pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix     | 5 ++++-
 pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix     | 5 ++++-
 pkgs/development/libraries/haskell/monad-peel/default.nix    | 5 ++++-
 .../libraries/haskell/monadcryptorandom/default.nix          | 5 ++++-
 pkgs/development/libraries/haskell/monads-tf/default.nix     | 5 ++++-
 pkgs/development/libraries/haskell/mongoDB/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/monoid-extras/default.nix | 1 +
 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/mtl/2.1.1.nix             | 5 ++++-
 pkgs/development/libraries/haskell/mtl/2.1.2.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/0.2.1.nix        | 5 ++++-
 pkgs/development/libraries/haskell/multiset/0.2.2.nix        | 5 ++++-
 pkgs/development/libraries/haskell/murmur-hash/default.nix   | 5 ++++-
 pkgs/development/libraries/haskell/mwc-random/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/nanospec/default.nix      | 1 +
 pkgs/development/libraries/haskell/nat/default.nix           | 1 +
 pkgs/development/libraries/haskell/nats/default.nix          | 1 +
 pkgs/development/libraries/haskell/naturals/default.nix      | 1 +
 .../libraries/haskell/netlist-to-vhdl/default.nix            | 1 +
 pkgs/development/libraries/haskell/netlist/default.nix       | 1 +
 pkgs/development/libraries/haskell/netwire/default.nix       | 1 +
 .../libraries/haskell/network-conduit/default.nix            | 5 ++++-
 pkgs/development/libraries/haskell/network-info/default.nix  | 1 +
 .../libraries/haskell/network-multicast/default.nix          | 5 ++++-
 .../libraries/haskell/network-protocol-xmpp/default.nix      | 1 +
 .../libraries/haskell/network-transport-tcp/default.nix      | 5 ++++-
 .../libraries/haskell/network-transport-tests/default.nix    | 1 +
 .../libraries/haskell/network-transport/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.13.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.1.0.nix       | 5 ++++-
 pkgs/development/libraries/haskell/network/2.4.1.2.nix       | 5 ++++-
 pkgs/development/libraries/haskell/newtype/default.nix       | 1 +
 pkgs/development/libraries/haskell/non-negative/default.nix  | 5 ++++-
 pkgs/development/libraries/haskell/numbers/default.nix       | 5 ++++-
 .../libraries/haskell/numeric-prelude/default.nix            | 5 ++++-
 pkgs/development/libraries/haskell/numtype-tf/default.nix    | 1 +
 pkgs/development/libraries/haskell/numtype/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/oeis/default.nix          | 5 ++++-
 .../libraries/haskell/optparse-applicative/default.nix       | 1 +
 pkgs/development/libraries/haskell/pandoc-types/default.nix  | 5 ++++-
 pkgs/development/libraries/haskell/pango/default.nix         | 5 ++++-
 pkgs/development/libraries/haskell/parallel-io/default.nix   | 1 +
 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/parallel/3.2.0.3.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/parsec/3.1.3.nix          | 5 ++++-
 pkgs/development/libraries/haskell/parsimony/default.nix     | 5 ++++-
 pkgs/development/libraries/haskell/path-pieces/default.nix   | 5 ++++-
 pkgs/development/libraries/haskell/pathtype/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/pcre-light/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/pem/default.nix           | 5 ++++-
 pkgs/development/libraries/haskell/permutation/default.nix   | 5 ++++-
 .../libraries/haskell/persistent-postgresql/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/pgm/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 ++++-
 .../libraries/haskell/postgresql-libpq/default.nix           | 5 ++++-
 .../libraries/haskell/postgresql-simple/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/0.4.1.nix       | 5 ++++-
 pkgs/development/libraries/haskell/primitive/0.5.0.1.nix     | 5 ++++-
 pkgs/development/libraries/haskell/primitive/0.5.nix         | 5 ++++-
 .../development/libraries/haskell/process-extras/default.nix | 5 ++++-
 .../libraries/haskell/profunctor-extras/default.nix          | 1 +
 pkgs/development/libraries/haskell/profunctors/default.nix   | 1 +
 .../libraries/haskell/project-template/default.nix           | 1 +
 .../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 ++++-
 .../libraries/haskell/publicsuffixlist/default.nix           | 1 +
 pkgs/development/libraries/haskell/punycode/default.nix      | 1 +
 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/rank1dynamic/default.nix  | 5 ++++-
 .../libraries/haskell/reactive-banana-wx/default.nix         | 5 ++++-
 .../libraries/haskell/reactive-banana/default.nix            | 1 +
 pkgs/development/libraries/haskell/recaptcha/default.nix     | 5 ++++-
 pkgs/development/libraries/haskell/reflection/default.nix    | 1 +
 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 ++++-
 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-posix/0.95.2.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 ++++-
 pkgs/development/libraries/haskell/remote/default.nix        | 5 ++++-
 .../libraries/haskell/repa-algorithms/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 ++++-
 .../libraries/haskell/semigroupoid-extras/default.nix        | 1 +
 pkgs/development/libraries/haskell/semigroupoids/default.nix | 1 +
 pkgs/development/libraries/haskell/semigroups/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/sendfile/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/setenv/default.nix        | 1 +
 pkgs/development/libraries/haskell/shake/default.nix         | 1 +
 .../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 ++++-
 pkgs/development/libraries/haskell/shelly/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/show/default.nix          | 5 ++++-
 pkgs/development/libraries/haskell/silently/default.nix      | 1 +
 .../development/libraries/haskell/simple-reflect/default.nix | 1 +
 .../libraries/haskell/simple-sendfile/default.nix            | 5 ++++-
 pkgs/development/libraries/haskell/sized-types/default.nix   | 1 +
 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/loader-dynamic.nix   | 1 +
 pkgs/development/libraries/haskell/snap/loader-static.nix    | 1 +
 pkgs/development/libraries/haskell/snap/server.nix           | 5 ++++-
 pkgs/development/libraries/haskell/snap/snap.nix             | 1 +
 pkgs/development/libraries/haskell/socks/default.nix         | 5 ++++-
 pkgs/development/libraries/haskell/split/0.2.1.1.nix         | 5 ++++-
 pkgs/development/libraries/haskell/split/0.2.1.2.nix         | 5 ++++-
 pkgs/development/libraries/haskell/srcloc/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-chans/default.nix     | 1 +
 pkgs/development/libraries/haskell/stm-conduit/default.nix   | 1 +
 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 ++++-
 pkgs/development/libraries/haskell/stm/2.4.2.nix             | 5 ++++-
 pkgs/development/libraries/haskell/stm/2.4.nix               | 5 ++++-
 .../libraries/haskell/storable-complex/default.nix           | 5 ++++-
 .../libraries/haskell/storable-record/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/string-qq/default.nix     | 1 +
 pkgs/development/libraries/haskell/stringbuilder/default.nix | 1 +
 pkgs/development/libraries/haskell/stringprep/default.nix    | 1 +
 pkgs/development/libraries/haskell/stringsearch/default.nix  | 5 ++++-
 pkgs/development/libraries/haskell/strptime/default.nix      | 1 +
 .../libraries/haskell/stylish-haskell/default.nix            | 1 +
 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.6.1.nix           | 5 ++++-
 pkgs/development/libraries/haskell/syb/0.3.6.2.nix           | 5 ++++-
 pkgs/development/libraries/haskell/syb/0.3.7.nix             | 5 ++++-
 pkgs/development/libraries/haskell/syb/0.3.nix               | 5 ++++-
 pkgs/development/libraries/haskell/syb/0.4.0.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/symbol/default.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 ++++-
 .../libraries/haskell/tagstream-conduit/default.nix          | 1 +
 pkgs/development/libraries/haskell/tar/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-prime/default.nix    | 1 +
 .../libraries/haskell/test-framework-th/default.nix          | 5 ++++-
 .../development/libraries/haskell/test-framework/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/texmath/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/text-icu/default.nix      | 1 +
 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.13.nix        | 5 ++++-
 pkgs/development/libraries/haskell/text/0.11.1.5.nix         | 5 ++++-
 pkgs/development/libraries/haskell/text/0.11.2.0.nix         | 5 ++++-
 pkgs/development/libraries/haskell/text/0.11.2.3.nix         | 5 ++++-
 pkgs/development/libraries/haskell/th-extras/default.nix     | 5 ++++-
 pkgs/development/libraries/haskell/th-lift/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/th-orphans/default.nix    | 1 +
 pkgs/development/libraries/haskell/thespian/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/threadmanager/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/threads/default.nix       | 1 +
 pkgs/development/libraries/haskell/time-compat/default.nix   | 1 +
 pkgs/development/libraries/haskell/time/1.1.2.4.nix          | 5 ++++-
 pkgs/development/libraries/haskell/time/1.4.0.2.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 ++++-
 .../libraries/haskell/transformers-compat/default.nix        | 1 +
 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 ++++-
 .../libraries/haskell/type-level-natural-number/default.nix  | 1 +
 pkgs/development/libraries/haskell/unbound/default.nix       | 5 ++++-
 .../libraries/haskell/unbounded-delays/default.nix           | 1 +
 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 ++++-
 pkgs/development/libraries/haskell/unix-time/default.nix     | 1 +
 pkgs/development/libraries/haskell/unlambda/default.nix      | 5 ++++-
 .../libraries/haskell/unordered-containers/default.nix       | 5 ++++-
 pkgs/development/libraries/haskell/url/default.nix           | 5 ++++-
 pkgs/development/libraries/haskell/urlencoded/default.nix    | 1 +
 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/uuid/default.nix          | 1 +
 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 ++++-
 pkgs/development/libraries/haskell/vcs-revision/default.nix  | 1 +
 pkgs/development/libraries/haskell/vect/default.nix          | 1 +
 .../libraries/haskell/vector-algorithms/default.nix          | 5 ++++-
 .../libraries/haskell/vector-space-points/default.nix        | 1 +
 pkgs/development/libraries/haskell/vector-space/default.nix  | 5 ++++-
 pkgs/development/libraries/haskell/vector/0.10.0.1.nix       | 5 ++++-
 pkgs/development/libraries/haskell/vector/0.10.nix           | 5 ++++-
 pkgs/development/libraries/haskell/vector/0.9.1.nix          | 5 ++++-
 pkgs/development/libraries/haskell/void/default.nix          | 5 ++++-
 pkgs/development/libraries/haskell/vty-ui/default.nix        | 1 +
 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-test/default.nix      | 1 +
 pkgs/development/libraries/haskell/wai/default.nix           | 5 ++++-
 pkgs/development/libraries/haskell/warp/default.nix          | 5 ++++-
 .../libraries/haskell/wl-pprint-extras/default.nix           | 1 +
 .../libraries/haskell/wl-pprint-terminfo/default.nix         | 1 +
 .../development/libraries/haskell/wl-pprint-text/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/wl-pprint/default.nix     | 1 +
 pkgs/development/libraries/haskell/word8/default.nix         | 1 +
 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/xdg-basedir/default.nix   | 1 +
 pkgs/development/libraries/haskell/xdot/default.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/xhtml/3000.2.1.nix        | 5 ++++-
 pkgs/development/libraries/haskell/xml-conduit/default.nix   | 5 ++++-
 pkgs/development/libraries/haskell/xml-hamlet/default.nix    | 1 +
 pkgs/development/libraries/haskell/xml-types/default.nix     | 5 ++++-
 pkgs/development/libraries/haskell/xml/default.nix           | 5 ++++-
 pkgs/development/libraries/haskell/xmlhtml/default.nix       | 1 +
 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-test/default.nix    | 1 +
 pkgs/development/libraries/haskell/yesod/default.nix         | 5 ++++-
 pkgs/development/libraries/haskell/yst/default.nix           | 5 ++++-
 .../development/libraries/haskell/zeromq-haskell/default.nix | 5 ++++-
 .../libraries/haskell/zeromq3-haskell/default.nix            | 1 +
 pkgs/development/libraries/haskell/zip-archive/default.nix   | 5 ++++-
 pkgs/development/libraries/haskell/zipper/default.nix        | 5 ++++-
 pkgs/development/libraries/haskell/zlib-bindings/default.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/libraries/haskell/zlib/0.5.4.0.nix          | 5 ++++-
 pkgs/development/libraries/haskell/zlib/0.5.4.1.nix          | 5 ++++-
 pkgs/development/tools/documentation/haddock/2.10.0.nix      | 5 ++++-
 pkgs/development/tools/documentation/haddock/2.11.0.nix      | 5 ++++-
 pkgs/development/tools/documentation/haddock/2.12.0.nix      | 5 ++++-
 pkgs/development/tools/documentation/haddock/2.13.1.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/cabal2ghci/default.nix        | 1 +
 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/packunused/default.nix        | 1 +
 pkgs/development/tools/haskell/splot/default.nix             | 1 +
 pkgs/development/tools/haskell/threadscope/default.nix       | 5 ++++-
 pkgs/development/tools/haskell/timeplot/default.nix          | 1 +
 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/alex/3.0.2.nix                | 5 ++++-
 pkgs/development/tools/parsing/happy/1.18.10.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 ++++-
 806 files changed, 2753 insertions(+), 649 deletions(-)

diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix
index 86f0106ed050..5c17a6c18155 100644
--- a/pkgs/applications/editors/leksah/default.nix
+++ b/pkgs/applications/editors/leksah/default.nix
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
     description = "Haskell IDE written in Haskell";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 6282af4e2eb4..218e2126a154 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
index 025bab67e968..f4aed5a18503 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/compilers/Agda-executable/default.nix b/pkgs/development/compilers/Agda-executable/default.nix
index f9acff43ef71..6b5e58e77520 100644
--- a/pkgs/development/compilers/Agda-executable/default.nix
+++ b/pkgs/development/compilers/Agda-executable/default.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix
index 1767a61a7d19..9060d313be5a 100644
--- a/pkgs/development/compilers/epic/default.nix
+++ b/pkgs/development/compilers/epic/default.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index b5f9446b8a4a..982f43ec2e94 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix
index bbcfd4a0c921..e4b78876c57a 100644
--- a/pkgs/development/libraries/haskell/AC-Vector/default.nix
+++ b/pkgs/development/libraries/haskell/AC-Vector/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix
index ea32e6358987..0c3a87a4059e 100644
--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@@ -21,6 +21,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix
index 6cbd760b4aca..89661b14481b 100644
--- a/pkgs/development/libraries/haskell/AspectAG/default.nix
+++ b/pkgs/development/libraries/haskell/AspectAG/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
index bc8e9dca159c..2a8fc76b53c1 100644
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ b/pkgs/development/libraries/haskell/Boolean/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Generalized booleans and numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
index 09171ab25706..7b666a1cf6e0 100644
--- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
+++ b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
index 2814eae845f2..16facf73f9fc 100644
--- a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
+++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
index a59e4ca7f422..31789974b6bc 100644
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
index 48231a1b6d2b..d2ed408c401f 100644
--- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
+++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "For testing partial and infinite values";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
index 29d417562ccb..bdc86cf1385a 100644
--- a/pkgs/development/libraries/haskell/ConfigFile/default.nix
+++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Configuration file reading & writing";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix
index 4a413e2e7b85..ee584e2ed8fe 100644
--- a/pkgs/development/libraries/haskell/CouchDB/default.nix
+++ b/pkgs/development/libraries/haskell/CouchDB/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "CouchDB interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix
index c7d10d0160d8..feb28002355a 100644
--- a/pkgs/development/libraries/haskell/Crypto/default.nix
+++ b/pkgs/development/libraries/haskell/Crypto/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Collects together existing Haskell cryptographic functions into a package";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
index e3c6b11e55b1..54106de1e091 100644
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
     description = "RFC 4918 WebDAV support";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix
index 409afcd45b07..94fdb79fbcb1 100644
--- a/pkgs/development/libraries/haskell/DSH/default.nix
+++ b/pkgs/development/libraries/haskell/DSH/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Database Supported Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix
index 04149400ff8c..134a7fc3f986 100644
--- a/pkgs/development/libraries/haskell/Diff/default.nix
+++ b/pkgs/development/libraries/haskell/Diff/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/FerryCore/default.nix b/pkgs/development/libraries/haskell/FerryCore/default.nix
index daef52bec752..e7167baab7d7 100644
--- a/pkgs/development/libraries/haskell/FerryCore/default.nix
+++ b/pkgs/development/libraries/haskell/FerryCore/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Ferry Core Components";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix
index f204bcdf6554..cb266ac99ce5 100644
--- a/pkgs/development/libraries/haskell/GLFW/default.nix
+++ b/pkgs/development/libraries/haskell/GLFW/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix
index d719e8179d45..91bd5737cf93 100644
--- a/pkgs/development/libraries/haskell/GLURaw/default.nix
+++ b/pkgs/development/libraries/haskell/GLURaw/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 32e45aebeb27..302b1fb8fb9e 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 64bc7feaf176..13f513551c4f 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix
index 2b9a0fadfc92..955fd51b702b 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 e5ff3951d3c3..3248631be3e2 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
index d65dfa15c6f3..4e80684cbae9 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix
index a7a7e7f371ad..710f2b2ab844 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix
index 08ae46179569..922b18d9f83a 100644
--- a/pkgs/development/libraries/haskell/Glob/default.nix
+++ b/pkgs/development/libraries/haskell/Glob/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Globbing library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix
index d22273f2030b..421e64ee7a24 100644
--- a/pkgs/development/libraries/haskell/GlomeVec/default.nix
+++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Simple 3D vector library";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix
index d61abc7a245d..88563876132e 100644
--- a/pkgs/development/libraries/haskell/Graphalyze/default.nix
+++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Graph-Theoretic Analysis library";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
index 50994384c966..40091d3e7ba4 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
index b66ed3ce28f6..a78d46541f74 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
index 783c4c186e2c..aa983026c915 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix
index a8275c31b858..c39c68d9f76b 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Haskell Database Connectivity";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HGL/default.nix b/pkgs/development/libraries/haskell/HGL/default.nix
index 954401b31e3d..4b8d6e24c4b8 100644
--- a/pkgs/development/libraries/haskell/HGL/default.nix
+++ b/pkgs/development/libraries/haskell/HGL/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix
index 35b03f77dde6..657e4899b7b2 100644
--- a/pkgs/development/libraries/haskell/HList/default.nix
+++ b/pkgs/development/libraries/haskell/HList/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Heterogeneous lists";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
index 6f96bbbcb7f4..ee150c3e946d 100644
--- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix
+++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
index ac4ac232edf8..69e84d88f881 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
index 0beebbfe2944..1f17f7488855 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
index 31cfdddac79e..405e7672bfb3 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
index 8d4a39526b2a..1a54d1ed8bb5 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
index f3da4a5ccf22..11af0863cf17 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
index e6238a5e738f..b21d853b7146 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
index d9e422f9e895..78ba7772b1ec 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix
index 93ba5e949db8..ca17c1869ab8 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix
@@ -18,6 +18,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
index 1b52261dea08..3ad33fe86c13 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
@@ -18,6 +18,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 01130de10cd9..ebf561825ce0 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 e14aad1a015c..ec65d160e866 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 2cb9f859f462..9c58da37b503 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 8ad518ee1f6d..e0dd6bd2bc17 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix
index 9ac01e70865d..2682c0ab4202 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix
index 06ac5fa1bbf6..e98d2a785180 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix
index 55898e9d9d9e..d598c09148f8 100644
--- a/pkgs/development/libraries/haskell/HaXml/default.nix
+++ b/pkgs/development/libraries/haskell/HaXml/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Utilities for manipulating XML documents";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
index 417ded6da54f..0e344a865450 100644
--- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
+++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index fee714491429..1f917fafc3c5 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A Haskell binding for Chipmunk";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index 9eefaaef84a0..2adf5701eb04 100644
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HsSyck/default.nix b/pkgs/development/libraries/haskell/HsSyck/default.nix
index 56e999d7b83e..f27d1f97f374 100644
--- a/pkgs/development/libraries/haskell/HsSyck/default.nix
+++ b/pkgs/development/libraries/haskell/HsSyck/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/IORefCAS/default.nix b/pkgs/development/libraries/haskell/IORefCAS/default.nix
index beec7ded7893..7e7c23c0a854 100644
--- a/pkgs/development/libraries/haskell/IORefCAS/default.nix
+++ b/pkgs/development/libraries/haskell/IORefCAS/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Atomic compare and swap for IORefs and STRefs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix
index 84b5f6fe6107..b01de9175c02 100644
--- a/pkgs/development/libraries/haskell/IOSpec/default.nix
+++ b/pkgs/development/libraries/haskell/IOSpec/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A pure specification of the IO monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/IfElse/default.nix b/pkgs/development/libraries/haskell/IfElse/default.nix
index 960868e3ab0a..632de1f30e5b 100644
--- a/pkgs/development/libraries/haskell/IfElse/default.nix
+++ b/pkgs/development/libraries/haskell/IfElse/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/JsContracts/default.nix b/pkgs/development/libraries/haskell/JsContracts/default.nix
index 713e67fbf608..95a7ab52fd3a 100644
--- a/pkgs/development/libraries/haskell/JsContracts/default.nix
+++ b/pkgs/development/libraries/haskell/JsContracts/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index c289c0092567..7e377ebc66cd 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Picture loading/serialization (in png, jpeg, bitmap, radiance and gif)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/List/default.nix b/pkgs/development/libraries/haskell/List/default.nix
index 65c90c0824ea..ca221a5a9de8 100644
--- a/pkgs/development/libraries/haskell/List/default.nix
+++ b/pkgs/development/libraries/haskell/List/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "List monad transformer and class";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix
index 2fa427b1f57e..68d7f25e431b 100644
--- a/pkgs/development/libraries/haskell/ListLike/default.nix
+++ b/pkgs/development/libraries/haskell/ListLike/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ListZipper/default.nix b/pkgs/development/libraries/haskell/ListZipper/default.nix
index d7307bde5d71..f2c56fdd2ce4 100644
--- a/pkgs/development/libraries/haskell/ListZipper/default.nix
+++ b/pkgs/development/libraries/haskell/ListZipper/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Simple zipper for lists";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix
index a29997f9de95..348560508622 100644
--- a/pkgs/development/libraries/haskell/MaybeT/default.nix
+++ b/pkgs/development/libraries/haskell/MaybeT/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "MaybeT monad transformer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix
index f3bd183d1373..195af40d1f03 100644
--- a/pkgs/development/libraries/haskell/MemoTrie/default.nix
+++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index 659a1158d0f3..c2b6b067b2f1 100644
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Large utility library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
index 9b044f6dbab5..b9be1488e4e3 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
index 4edd801d08d8..e675ae6b6a1c 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
index 6d8e66952e40..daf961f15506 100644
--- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix
+++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "MonadPrompt, implementation & examples";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix
index d8c492f23b61..c276e1eac800 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/default.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Random-number generation monad";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix
index 490aeb4167b5..4bf301bd66d0 100644
--- a/pkgs/development/libraries/haskell/NanoProlog/default.nix
+++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix
index 4f06a97002d6..24f056af5cec 100644
--- a/pkgs/development/libraries/haskell/NumInstances/default.nix
+++ b/pkgs/development/libraries/haskell/NumInstances/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix
index 27f9b444a711..0be7c3dd22c9 100644
--- a/pkgs/development/libraries/haskell/ObjectName/default.nix
+++ b/pkgs/development/libraries/haskell/ObjectName/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OneTuple/default.nix b/pkgs/development/libraries/haskell/OneTuple/default.nix
index 945e12438b58..2ecc841a8a47 100644
--- a/pkgs/development/libraries/haskell/OneTuple/default.nix
+++ b/pkgs/development/libraries/haskell/OneTuple/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Singleton Tuple";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix
index a04aea993fa2..534fa1c8667d 100644
--- a/pkgs/development/libraries/haskell/OpenAL/default.nix
+++ b/pkgs/development/libraries/haskell/OpenAL/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 2e4ac90c79e1..e74fcdca0245 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 25133657ccb4..65e3da59367a 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
index 33e9c4d21a0a..cf1bee122afc 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 c8cfd796afd0..73b5c741bbb2 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
index 318bdf197486..1e56e88de384 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
index 72183c86192c..7714f08e698f 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
index a6a45bf5b248..c0d62685e49f 100644
--- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
+++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/PSQueue/default.nix b/pkgs/development/libraries/haskell/PSQueue/default.nix
index 32497935cdbe..ff3bd0b8fb5f 100644
--- a/pkgs/development/libraries/haskell/PSQueue/default.nix
+++ b/pkgs/development/libraries/haskell/PSQueue/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Priority Search Queue";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Pathfinder/default.nix b/pkgs/development/libraries/haskell/Pathfinder/default.nix
index 19d7d8abaa54..90df60cc8e6e 100644
--- a/pkgs/development/libraries/haskell/Pathfinder/default.nix
+++ b/pkgs/development/libraries/haskell/Pathfinder/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 3cf80d93336e..a459fd953175 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 6ba32ce71c0b..c104a4be27a8 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 2f305b8a23ce..828255a9860c 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 4e634078a7d8..ac9ac3d2a7de 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 e2d274dca05c..8eb413d2b31c 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix
index b3202cdc4b93..69a1c1dc417a 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix
index 24e16a4955f5..98548b938638 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix
index 39c97859e657..8a9413989088 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index c5257c5b2620..cdaa5b5136b3 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix
index e65752e35b4c..6a6211b6263a 100644
--- a/pkgs/development/libraries/haskell/Ranged-sets/default.nix
+++ b/pkgs/development/libraries/haskell/Ranged-sets/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix
index 12c3e34571e8..1adec3b3d6d9 100644
--- a/pkgs/development/libraries/haskell/ReadArgs/default.nix
+++ b/pkgs/development/libraries/haskell/ReadArgs/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Simple command line argument parsing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
index 15cba0c0b283..d49242256f22 100644
--- a/pkgs/development/libraries/haskell/RepLib/default.nix
+++ b/pkgs/development/libraries/haskell/RepLib/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix
index 6c61813ac308..e6695f013580 100644
--- a/pkgs/development/libraries/haskell/SDL-image/default.nix
+++ b/pkgs/development/libraries/haskell/SDL-image/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix
index 8690d7e89163..674282e30a86 100644
--- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix
+++ b/pkgs/development/libraries/haskell/SDL-mixer/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix
index f1a0489167e5..50b7bcd33105 100644
--- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix
+++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix
index 62731657e82a..0d333097b451 100644
--- a/pkgs/development/libraries/haskell/SDL/default.nix
+++ b/pkgs/development/libraries/haskell/SDL/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Binding to libSDL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix
index 343412700842..b0c30d93605c 100644
--- a/pkgs/development/libraries/haskell/SHA/default.nix
+++ b/pkgs/development/libraries/haskell/SHA/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix
index 91c128756f42..ea9c60adeabb 100644
--- a/pkgs/development/libraries/haskell/SMTPClient/default.nix
+++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
index d4cc74902776..b43c22244fe2 100644
--- a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
+++ b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Much safer replacement for QSemN, QSem, and SampleVar";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix
index d896eab923d9..8f36e8ebc088 100644
--- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix
+++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix
index 3b27022bea07..95148607b6fe 100644
--- a/pkgs/development/libraries/haskell/StateVar/default.nix
+++ b/pkgs/development/libraries/haskell/StateVar/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "State variables";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Stream/default.nix b/pkgs/development/libraries/haskell/Stream/default.nix
index a95b30761373..aea9af862d22 100644
--- a/pkgs/development/libraries/haskell/Stream/default.nix
+++ b/pkgs/development/libraries/haskell/Stream/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/TableAlgebra/default.nix b/pkgs/development/libraries/haskell/TableAlgebra/default.nix
index c4960813f3eb..f1c212d7a491 100644
--- a/pkgs/development/libraries/haskell/TableAlgebra/default.nix
+++ b/pkgs/development/libraries/haskell/TableAlgebra/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Ferry Table Algebra";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix
index d62b42833a3e..3856409819df 100644
--- a/pkgs/development/libraries/haskell/Tensor/default.nix
+++ b/pkgs/development/libraries/haskell/Tensor/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Tensor data types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix
index 85fdcfd0b4af..dd305cab560b 100644
--- a/pkgs/development/libraries/haskell/Vec/default.nix
+++ b/pkgs/development/libraries/haskell/Vec/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 d69ac78b83d1..18371c57f082 100644
--- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
+++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 26f14a087748..cd34f3161f3d 100644
--- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
+++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits/1.0.nix b/pkgs/development/libraries/haskell/WebBits/1.0.nix
index 49bcd8ed112a..89161608843e 100644
--- a/pkgs/development/libraries/haskell/WebBits/1.0.nix
+++ b/pkgs/development/libraries/haskell/WebBits/1.0.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits/2.0.nix b/pkgs/development/libraries/haskell/WebBits/2.0.nix
index 0638ce06ef91..88502db4dfff 100644
--- a/pkgs/development/libraries/haskell/WebBits/2.0.nix
+++ b/pkgs/development/libraries/haskell/WebBits/2.0.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits/2.2.nix b/pkgs/development/libraries/haskell/WebBits/2.2.nix
index 4240d7b9ce94..6603117c77e1 100644
--- a/pkgs/development/libraries/haskell/WebBits/2.2.nix
+++ b/pkgs/development/libraries/haskell/WebBits/2.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix
index 1690ec9031e6..d9eee5f5e1c5 100644
--- a/pkgs/development/libraries/haskell/X11-xft/default.nix
+++ b/pkgs/development/libraries/haskell/X11-xft/default.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix
index c304a58b9a51..fa1cc44d9909 100644
--- a/pkgs/development/libraries/haskell/X11/default.nix
+++ b/pkgs/development/libraries/haskell/X11/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Zwaluw/default.nix b/pkgs/development/libraries/haskell/Zwaluw/default.nix
index 1cb214b94b01..125da2a795e1 100644
--- a/pkgs/development/libraries/haskell/Zwaluw/default.nix
+++ b/pkgs/development/libraries/haskell/Zwaluw/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix
index a6219a4b2a0d..c527d34f738b 100644
--- a/pkgs/development/libraries/haskell/abstract-deque/default.nix
+++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Abstract, parameterized interface to mutable Deques";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/abstract-par/default.nix b/pkgs/development/libraries/haskell/abstract-par/default.nix
index 033fc242321d..797d42319bb6 100644
--- a/pkgs/development/libraries/haskell/abstract-par/default.nix
+++ b/pkgs/development/libraries/haskell/abstract-par/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Type classes generalizing the functionality of the 'monad-par' library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
index 26f2c0a14c06..22fdb877ff4d 100644
--- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Accelerate backend for NVIDIA GPUs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.stdenv.lib.platforms.none;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix
index f88824c21fed..095d2ff16649 100644
--- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
     description = "Examples using the Accelerate library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.stdenv.lib.platforms.none;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/accelerate-io/default.nix b/pkgs/development/libraries/haskell/accelerate-io/default.nix
index 1cefda353250..d327d710e3b6 100644
--- a/pkgs/development/libraries/haskell/accelerate-io/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-io/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Read and write Accelerate arrays in various formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix
index a2dc4cb2e592..24f09f66d357 100644
--- a/pkgs/development/libraries/haskell/accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "An embedded language for accelerated array processing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
index 209341e22e76..cadcb223366d 100644
--- a/pkgs/development/libraries/haskell/active/default.nix
+++ b/pkgs/development/libraries/haskell/active/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Abstractions for animation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index 515cec37a995..4f0b55a50792 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -20,6 +20,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/alternative-io/default.nix b/pkgs/development/libraries/haskell/alternative-io/default.nix
index 9daf9406742c..4d9c9d44dd61 100644
--- a/pkgs/development/libraries/haskell/alternative-io/default.nix
+++ b/pkgs/development/libraries/haskell/alternative-io/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "IO as Alternative instance (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
index 6d598f29ec95..1f13d67d3e8d 100644
--- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix
+++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
index bfccdcffd746..79492bc2eebb 100644
--- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
+++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/appar/default.nix b/pkgs/development/libraries/haskell/appar/default.nix
index 4c2f5a9ce464..012e771d1816 100644
--- a/pkgs/development/libraries/haskell/appar/default.nix
+++ b/pkgs/development/libraries/haskell/appar/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "A simple applicative parser";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix
index 149f5f951e5d..f9ba4b422a25 100644
--- a/pkgs/development/libraries/haskell/arrows/default.nix
+++ b/pkgs/development/libraries/haskell/arrows/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix
index a90e8e769e23..f35f5769a0c5 100644
--- a/pkgs/development/libraries/haskell/asn1-data/default.nix
+++ b/pkgs/development/libraries/haskell/asn1-data/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "ASN1 data reader and writer in RAW, BER and DER forms";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix
index 1b943208dea4..fc32f366ce42 100644
--- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix
+++ b/pkgs/development/libraries/haskell/async/2.0.1.3.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Run IO operations asynchronously and wait for their results";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/async/2.0.1.4.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix
index 5dd76b4d6e00..ef6ee614053a 100644
--- a/pkgs/development/libraries/haskell/async/2.0.1.4.nix
+++ b/pkgs/development/libraries/haskell/async/2.0.1.4.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Run IO operations asynchronously and wait for their results";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attempt/default.nix b/pkgs/development/libraries/haskell/attempt/default.nix
index c000002d4998..2c5fc47ea314 100644
--- a/pkgs/development/libraries/haskell/attempt/default.nix
+++ b/pkgs/development/libraries/haskell/attempt/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix
index 623ae1040901..bdba04cf14d8 100644
--- a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Binary processing extensions to Attoparsec";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index 37af5eec0af5..d05b6a0c3e09 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Consume attoparsec parsers via conduit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix
index c352ce7ca8ec..d7fa58de5d7b 100644
--- a/pkgs/development/libraries/haskell/attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Fast combinator parsing for bytestrings and text";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
index d52687d80801..880181fa4a1d 100644
--- a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
index 67acd7b08695..445cf0a90388 100644
--- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Library to authenticate with OAuth for Haskell web applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index f0a1969ffbab..a94b6b9ef3ee 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix
index ca208b7c1a34..8e76bfa698da 100644
--- a/pkgs/development/libraries/haskell/base-compat/default.nix
+++ b/pkgs/development/libraries/haskell/base-compat/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "A compatibility layer for base";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
index 3eccd0a4ffac..d624213111b5 100644
--- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
+++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix
index 3f81258f4263..5004032997c7 100644
--- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix
index 67450dc88874..e043d35ffb1d 100644
--- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Fast base64 encoding and decoding for ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix
index 3a2d044de64d..08af81a606d7 100644
--- a/pkgs/development/libraries/haskell/base64-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/base64-conduit/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Base64-encode and decode streams of bytes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base64-string/default.nix b/pkgs/development/libraries/haskell/base64-string/default.nix
index 9e0a781039b1..e77d5b96ea79 100644
--- a/pkgs/development/libraries/haskell/base64-string/default.nix
+++ b/pkgs/development/libraries/haskell/base64-string/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Base64 implementation for String's";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix
index 04f3842be41b..0d18233ef214 100644
--- a/pkgs/development/libraries/haskell/basic-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "An enhanced core prelude; a common foundation for alternate preludes";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix
index c80f04f966db..2cdd3581fba8 100644
--- a/pkgs/development/libraries/haskell/benchpress/default.nix
+++ b/pkgs/development/libraries/haskell/benchpress/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix
index c659c3bc3bea..ea46422ecae7 100644
--- a/pkgs/development/libraries/haskell/bifunctors/default.nix
+++ b/pkgs/development/libraries/haskell/bifunctors/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 bifunctors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix
index 98814e75a9d5..2b132f9cad0b 100644
--- a/pkgs/development/libraries/haskell/bimap/default.nix
+++ b/pkgs/development/libraries/haskell/bimap/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix
index 6d70e384c380..45d587697c08 100644
--- a/pkgs/development/libraries/haskell/binary-shared/default.nix
+++ b/pkgs/development/libraries/haskell/binary-shared/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Sharing for the binary package";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix
index 6273a099f739..d7a5edbf58d5 100644
--- a/pkgs/development/libraries/haskell/binary/default.nix
+++ b/pkgs/development/libraries/haskell/binary/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bitarray/default.nix b/pkgs/development/libraries/haskell/bitarray/default.nix
index edda97480d8c..faf51870ae9b 100644
--- a/pkgs/development/libraries/haskell/bitarray/default.nix
+++ b/pkgs/development/libraries/haskell/bitarray/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix
index b120c8cf9537..53f857102816 100644
--- a/pkgs/development/libraries/haskell/bitmap/default.nix
+++ b/pkgs/development/libraries/haskell/bitmap/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bits-atomic/default.nix b/pkgs/development/libraries/haskell/bits-atomic/default.nix
index e6add5883aaa..b8dd09f43b84 100644
--- a/pkgs/development/libraries/haskell/bits-atomic/default.nix
+++ b/pkgs/development/libraries/haskell/bits-atomic/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Atomic bit operations on memory locations for low-level synchronization";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bktrees/default.nix b/pkgs/development/libraries/haskell/bktrees/default.nix
index 70369034eaad..23493e50c19c 100644
--- a/pkgs/development/libraries/haskell/bktrees/default.nix
+++ b/pkgs/development/libraries/haskell/bktrees/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
index 16c352b7a332..bef4668cbc28 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
index 00176d215bae..5e533a415a29 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
index aa4eb4c53571..f58353938950 100644
--- a/pkgs/development/libraries/haskell/blaze-builder/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Efficient buffered output";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index ec21e3fcd84b..2370021da600 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix
index 0c544119d5ff..e8272c2c5ad5 100644
--- a/pkgs/development/libraries/haskell/blaze-markup/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "A blazingly fast markup combinator library for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-svg/default.nix b/pkgs/development/libraries/haskell/blaze-svg/default.nix
index 7b3ec55dc577..caa06482b672 100644
--- a/pkgs/development/libraries/haskell/blaze-svg/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-svg/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "SVG combinator library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix
index ede82e5c2ed3..b3ab183c57fd 100644
--- a/pkgs/development/libraries/haskell/blaze-textual/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix
index 7c8c2d348498..9d7f550c4fd4 100644
--- a/pkgs/development/libraries/haskell/bloomfilter/default.nix
+++ b/pkgs/development/libraries/haskell/bloomfilter/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix b/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix
index e018ac7a8d28..213afd59c5ae 100644
--- a/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix
+++ b/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix
index a3de1d11830c..8e1685296cac 100644
--- a/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix
+++ b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix
index 963448a56e73..a5a1145295b1 100644
--- a/pkgs/development/libraries/haskell/boomerang/default.nix
+++ b/pkgs/development/libraries/haskell/boomerang/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Library for invertible parsing and printing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix
index a406d1fa5000..1dd75661ce68 100644
--- a/pkgs/development/libraries/haskell/brainfuck/default.nix
+++ b/pkgs/development/libraries/haskell/brainfuck/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Brainfuck interpreter";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix
index e572e366bdd0..042c212e801e 100644
--- a/pkgs/development/libraries/haskell/bson/default.nix
+++ b/pkgs/development/libraries/haskell/bson/default.nix
@@ -19,6 +19,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix
index bdbad6f5e635..d3af223418bb 100644
--- a/pkgs/development/libraries/haskell/byteorder/default.nix
+++ b/pkgs/development/libraries/haskell/byteorder/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
index 93c8b2aa2290..9d67a1cb3ee0 100644
--- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
index 5f9e322fbf0b..cf68d1e7fa50 100644
--- a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
index e78a64781518..36ef166baaf6 100644
--- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix
index 41c31b1fed5c..1dc56c420b67 100644
--- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
index 6ad4db61cfdc..c0befa37d2a8 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/libraries/haskell/c2hs/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "C->Haskell FFI tool that gives some cross-language type safety";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
index 55b4fea36fec..0bdb33ceede7 100644
--- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix
index 0f651e1eaae3..ab59d7c50893 100644
--- a/pkgs/development/libraries/haskell/cabal-macosx/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-macosx/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Cabal support for creating Mac OSX application bundles";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index 59126959bfb5..35b11decc43c 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix
index 51425084e1c3..c43ea95322d4 100644
--- a/pkgs/development/libraries/haskell/case-insensitive/default.nix
+++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix
index 44ed255bb634..711e6a152596 100644
--- a/pkgs/development/libraries/haskell/cautious-file/default.nix
+++ b/pkgs/development/libraries/haskell/cautious-file/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
index 464e8dbb5e76..c322ef8b54f4 100644
--- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix
index a28ea11c511e..8e8202d9c5e6 100644
--- a/pkgs/development/libraries/haskell/cereal/default.nix
+++ b/pkgs/development/libraries/haskell/cereal/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
index 036e7ddc124c..ac792514386a 100644
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ b/pkgs/development/libraries/haskell/certificate/default.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 60669590c2f9..9cb92640ee45 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 bf1920d434df..7e91e25209ee 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 c1dc7076c77d..0c1f8d709c3b 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 97e5556bacd5..3621b1fac1b8 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix
index cfe95ab8e1e3..08b0477039d9 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix
index ca2f36159292..e32929fb4eef 100644
--- a/pkgs/development/libraries/haskell/cipher-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Fast AES cipher implementation with advanced mode of operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix
index 7d3cacdd67a9..1563efa125b8 100644
--- a/pkgs/development/libraries/haskell/cipher-rc4/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Fast RC4 cipher implementation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
index 2c68fd24d1fa..b55e20d91c54 100644
--- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix
+++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
index c04b4dfc25e1..c3e4619c72fa 100644
--- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "conduit instances for classy-prelude";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index e105726540b8..9c830545f763 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "A typeclass-based Prelude";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index edbb079eec42..fd0ebd2065a7 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index 6780d02e674e..f9053fa31748 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix
index 0a71649f0e91..7b29ba580046 100644
--- a/pkgs/development/libraries/haskell/cmdlib/default.nix
+++ b/pkgs/development/libraries/haskell/cmdlib/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/colorize-haskell/default.nix b/pkgs/development/libraries/haskell/colorize-haskell/default.nix
index fa2b98801233..702ddd0b9ec6 100644
--- a/pkgs/development/libraries/haskell/colorize-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/colorize-haskell/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Highligt Haskell source";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix
index 06bcc8ed9819..7f4fde5ef970 100644
--- a/pkgs/development/libraries/haskell/colour/default.nix
+++ b/pkgs/development/libraries/haskell/colour/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
index 3a56b37edf9b..0d754ec4308c 100644
--- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Comonad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
index 7e11886fc582..61d0823141d2 100644
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 compatible comonads";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix
index 5921d8b07d39..f09d488fa6c2 100644
--- a/pkgs/development/libraries/haskell/comonads-fd/default.nix
+++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Comonad transformers using functional dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix
index fb0b6a1f1cba..416826298bb4 100644
--- a/pkgs/development/libraries/haskell/compact-string-fix/default.nix
+++ b/pkgs/development/libraries/haskell/compact-string-fix/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
index db380f03b5bd..0a36b3e9b736 100644
--- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix
+++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Extra concurrency primitives";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index a183a00cdda3..f13691b471e9 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -19,6 +19,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix
index 775c2e5027f8..558a8935c04f 100644
--- a/pkgs/development/libraries/haskell/configurator/default.nix
+++ b/pkgs/development/libraries/haskell/configurator/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Configuration management";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix
index 0fe2cb8864a6..86690db7162c 100644
--- a/pkgs/development/libraries/haskell/constraints/default.nix
+++ b/pkgs/development/libraries/haskell/constraints/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Constraint manipulation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix
index 095d0a179846..26b683c19696 100644
--- a/pkgs/development/libraries/haskell/continued-fractions/default.nix
+++ b/pkgs/development/libraries/haskell/continued-fractions/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Continued fractions";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
index 2c967d26085a..e09043519a86 100644
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 contravariant functors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix
index 50d95cb88511..6c1282852851 100644
--- a/pkgs/development/libraries/haskell/converge/default.nix
+++ b/pkgs/development/libraries/haskell/converge/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix
index 8a79e50527d8..a3fa0208e2d0 100644
--- a/pkgs/development/libraries/haskell/convertible/default.nix
+++ b/pkgs/development/libraries/haskell/convertible/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix
index b7dae5d4a9b1..06cdf62e53cc 100644
--- a/pkgs/development/libraries/haskell/cookie/default.nix
+++ b/pkgs/development/libraries/haskell/cookie/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix
index 4f2aa58b7d29..2d8989437fb8 100644
--- a/pkgs/development/libraries/haskell/cprng-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix
index dc27553c2a3b..3187036539e0 100644
--- a/pkgs/development/libraries/haskell/cpu/default.nix
+++ b/pkgs/development/libraries/haskell/cpu/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Cpu information and properties helpers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index 004f74cd7e7f..5a722ea4fabe 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
index dbfc60c189c7..ed840b8ba3e0 100644
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
index 2b967a5b5649..efea0bb0d8a1 100644
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix
index af6985cd9ede..99665c22df2e 100644
--- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Cryptographic numbers: functions and algorithms";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
index 72ba3d20b021..81cfdac0151d 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
index b095b1ea5f4e..dc0885518776 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "Public Key cryptography";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-random-api/default.nix b/pkgs/development/libraries/haskell/crypto-random-api/default.nix
index 7c3b10a38386..c3b10cbe329e 100644
--- a/pkgs/development/libraries/haskell/crypto-random-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-random-api/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Simple random generators API for cryptography related code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
index dba34752611e..12392e439250 100644
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "Symmetrical block and stream ciphers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 81b361a24779..521a950e581c 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix
index f59a80b2b65a..64dadbb4e4ca 100644
--- a/pkgs/development/libraries/haskell/css-text/default.nix
+++ b/pkgs/development/libraries/haskell/css-text/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/csv/default.nix b/pkgs/development/libraries/haskell/csv/default.nix
index f56a9b89423c..ae149be79dac 100644
--- a/pkgs/development/libraries/haskell/csv/default.nix
+++ b/pkgs/development/libraries/haskell/csv/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix
index f03e1907ec08..00b6ae2a406c 100644
--- a/pkgs/development/libraries/haskell/cuda/default.nix
+++ b/pkgs/development/libraries/haskell/cuda/default.nix
@@ -35,6 +35,9 @@ cabal.mkDerivation (self: {
     description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.stdenv.lib.platforms.none;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix
index a530044ca6ed..3842707c613b 100644
--- a/pkgs/development/libraries/haskell/curl/default.nix
+++ b/pkgs/development/libraries/haskell/curl/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 41bd23470124..9f0e1c11c851 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
index 83712b858c25..078234c19c42 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Use Accessor to access state in transformers State monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
index 7c1de10b20b0..29038616a8bf 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
index 5066a83c5f60..b91dc6d05233 100644
--- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
+++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix
index 4fb21ed5f551..2945f7c5a8f2 100644
--- a/pkgs/development/libraries/haskell/data-default/default.nix
+++ b/pkgs/development/libraries/haskell/data-default/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix
index ecb0748df6a9..a9eaf5471865 100644
--- a/pkgs/development/libraries/haskell/data-inttrie/default.nix
+++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A lazy, infinite trie of integers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix
index 7ba9e3f9da74..208f021e8af4 100644
--- a/pkgs/development/libraries/haskell/data-lens-template/default.nix
+++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Utilities for Data.Lens";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix
index e4cff67f3761..8e3a8b40751d 100644
--- a/pkgs/development/libraries/haskell/data-lens/default.nix
+++ b/pkgs/development/libraries/haskell/data-lens/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 Lenses";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
index 2b3adde1d728..5c4c3cbeaf00 100644
--- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix
+++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Combinators for building memo tables";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-reify/default.nix b/pkgs/development/libraries/haskell/data-reify/default.nix
index 6599d25f68eb..2618ef6a6906 100644
--- a/pkgs/development/libraries/haskell/data-reify/default.nix
+++ b/pkgs/development/libraries/haskell/data-reify/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
index 9c4de4a1b84d..fa9287e6f075 100644
--- a/pkgs/development/libraries/haskell/dataenc/default.nix
+++ b/pkgs/development/libraries/haskell/dataenc/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Data encoding library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/date-cache/default.nix b/pkgs/development/libraries/haskell/date-cache/default.nix
index a460dcbdafc5..b672e797fa06 100644
--- a/pkgs/development/libraries/haskell/date-cache/default.nix
+++ b/pkgs/development/libraries/haskell/date-cache/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "Date cacher";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix
index faf0b40b94d1..72f3d1c937f3 100644
--- a/pkgs/development/libraries/haskell/datetime/default.nix
+++ b/pkgs/development/libraries/haskell/datetime/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix
index 16cb2c7ca033..26306eccfcb6 100644
--- a/pkgs/development/libraries/haskell/dbus/default.nix
+++ b/pkgs/development/libraries/haskell/dbus/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "A client library for the D-Bus IPC system";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix
index 228fcd28c785..b65ddb5e786e 100644
--- a/pkgs/development/libraries/haskell/deepseq-th/default.nix
+++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 c13abe9e31c9..2c61618cd081 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 99db69e612aa..4af1d5bff9c7 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 f4ef61cbbffc..35fca66fa869 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix
index 78f9273e46a2..bf6d93de2835 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index 906c51fc0722..c3aa09d9550e 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix
index ca702b60356c..6b8de51e1d7f 100644
--- a/pkgs/development/libraries/haskell/derp/default.nix
+++ b/pkgs/development/libraries/haskell/derp/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Derivative Parsing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index bc2abf5c16d5..4a55eeaac65a 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Cairo backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index 2e5c97d07cc5..2e29a6c614a3 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "Collection of user contributions to diagrams EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index ebea3fd60908..985a69dce135 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Core libraries for diagrams EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
index 293cdab1f9ef..01561f426c52 100644
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Embedded domain-specific language for declarative vector graphics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 1bd77db85803..d83a43bbadbb 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Embedded domain-specific language for declarative graphics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 561f32118c22..f6fd22ecd99c 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "SVG backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix
index c315c0813eb9..a341726bf537 100644
--- a/pkgs/development/libraries/haskell/digest/default.nix
+++ b/pkgs/development/libraries/haskell/digest/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index 48853c136550..9e0cbbc6bdc3 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Heist frontend for the digestive-functors library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
index f23ee6d06910..03f34b31b618 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Snap backend for the digestive-functors library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix
index 0b956680a84f..bf11f9675bcd 100644
--- a/pkgs/development/libraries/haskell/digestive-functors/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "A practical formlet library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
index 70995ecb3ce7..1ed368d24a1f 100644
--- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Statically checked physical dimensions, implemented using type families";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index 329722abe8e9..d36f351fcf60 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix
index 5c8b357593e4..848ad5631252 100644
--- a/pkgs/development/libraries/haskell/directory-tree/default.nix
+++ b/pkgs/development/libraries/haskell/directory-tree/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
index aaca850c0d7a..b2b58825469d 100644
--- a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
+++ b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "Simple zero-configuration backend for Cloud Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix
index d23a5ef0228d..be5d9fbfe6d4 100644
--- a/pkgs/development/libraries/haskell/distributed-process/default.nix
+++ b/pkgs/development/libraries/haskell/distributed-process/default.nix
@@ -26,6 +26,9 @@ cabal.mkDerivation (self: {
     description = "Cloud Haskell: Erlang-style concurrency in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix
index 9147b724ba22..e682ec474aae 100644
--- a/pkgs/development/libraries/haskell/distributed-static/default.nix
+++ b/pkgs/development/libraries/haskell/distributed-static/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Compositional, type-safe, polymorphic static values and closures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix
index d40952024ef2..55a9fc41ed0b 100644
--- a/pkgs/development/libraries/haskell/distributive/default.nix
+++ b/pkgs/development/libraries/haskell/distributive/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 Distributive functors -- Dual to Traversable";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix
index 1a7fc56efd5f..a88b38650c7d 100644
--- a/pkgs/development/libraries/haskell/dlist/default.nix
+++ b/pkgs/development/libraries/haskell/dlist/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Differences lists";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index 0854f39efcef..e8d0284487af 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "DNS library in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index 63298ebaf7ef..499163a11017 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "Test interactive Haskell examples";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix
index a7fe5b791f0d..06a3e6a09fe5 100644
--- a/pkgs/development/libraries/haskell/dotgen/default.nix
+++ b/pkgs/development/libraries/haskell/dotgen/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix
index cad61e52ee0c..5bd90719ac44 100644
--- a/pkgs/development/libraries/haskell/double-conversion/default.nix
+++ b/pkgs/development/libraries/haskell/double-conversion/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix
index 935004a6bb0f..dd7fb892fdea 100644
--- a/pkgs/development/libraries/haskell/download-curl/default.nix
+++ b/pkgs/development/libraries/haskell/download-curl/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix
index 06c34bf9acb0..c0895ac2938e 100644
--- a/pkgs/development/libraries/haskell/download/default.nix
+++ b/pkgs/development/libraries/haskell/download/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix
index 4b5dd2b38883..6b37b0a30998 100644
--- a/pkgs/development/libraries/haskell/dstring/default.nix
+++ b/pkgs/development/libraries/haskell/dstring/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Difference strings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix
index ebca3b5a3be6..a37b86521502 100644
--- a/pkgs/development/libraries/haskell/dual-tree/default.nix
+++ b/pkgs/development/libraries/haskell/dual-tree/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Rose trees with cached and accumulating monoidal annotations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dyre/default.nix b/pkgs/development/libraries/haskell/dyre/default.nix
index 8b3d2cab677a..0c9623b11a5c 100644
--- a/pkgs/development/libraries/haskell/dyre/default.nix
+++ b/pkgs/development/libraries/haskell/dyre/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Dynamic reconfiguration in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix
index 22f5953b7e04..cc3183b8bda7 100644
--- a/pkgs/development/libraries/haskell/edit-distance/default.nix
+++ b/pkgs/development/libraries/haskell/edit-distance/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/editline/default.nix b/pkgs/development/libraries/haskell/editline/default.nix
index 309847a28e4f..e5f7237a1bac 100644
--- a/pkgs/development/libraries/haskell/editline/default.nix
+++ b/pkgs/development/libraries/haskell/editline/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index 4730af585697..b75793435b36 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "An either monad transformer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/elerea/default.nix b/pkgs/development/libraries/haskell/elerea/default.nix
index 8ba4687d3e3b..784977000299 100644
--- a/pkgs/development/libraries/haskell/elerea/default.nix
+++ b/pkgs/development/libraries/haskell/elerea/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "A minimalistic FRP library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix
index 3ba059261794..a3bfd8cbafc7 100644
--- a/pkgs/development/libraries/haskell/email-validate/default.nix
+++ b/pkgs/development/libraries/haskell/email-validate/default.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix
index 1b7ef1bcd1dc..73ba94bcad9d 100644
--- a/pkgs/development/libraries/haskell/encoding/default.nix
+++ b/pkgs/development/libraries/haskell/encoding/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "A library for various character encodings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
index 004d7492c51f..e877124b9635 100644
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix
index 5b44c9efc62a..27a85b1df97f 100644
--- a/pkgs/development/libraries/haskell/enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/enumerator/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix
index 1a6331bcd6f1..25d64b3faafc 100644
--- a/pkgs/development/libraries/haskell/erf/default.nix
+++ b/pkgs/development/libraries/haskell/erf/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix
index 7ed890c513c5..7fdae9135013 100644
--- a/pkgs/development/libraries/haskell/errors/default.nix
+++ b/pkgs/development/libraries/haskell/errors/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Simplified error-handling";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix
index 2c64598d1d01..b340591c33ac 100644
--- a/pkgs/development/libraries/haskell/exception-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Exception monad transformer instances for mtl2 classes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix
index a4d0cfd247a1..c8a9849cad1a 100644
--- a/pkgs/development/libraries/haskell/exception-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Type classes and monads for unchecked extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/executable-path/default.nix b/pkgs/development/libraries/haskell/executable-path/default.nix
index 5c69969c20d2..5faf06230f62 100644
--- a/pkgs/development/libraries/haskell/executable-path/default.nix
+++ b/pkgs/development/libraries/haskell/executable-path/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Finding out the full path of the executable";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix
index 0f2385a004ff..151ce5b785c8 100644
--- a/pkgs/development/libraries/haskell/explicit-exception/default.nix
+++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 0eca0eb78eec..8a928931e3e7 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,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 946a808ddc52..329bb2a42c48 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,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 577f7d4657a5..d349a1f17e36 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,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 2ca255d29997..f217db39bc61 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,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix
index bc2821e3e8c5..3e60885352ea 100644
--- a/pkgs/development/libraries/haskell/failure/default.nix
+++ b/pkgs/development/libraries/haskell/failure/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index c9544b2c1f69..8843062fc258 100644
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index 79ea3160df22..9ab8c6a0a3ea 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
index d15906e0be51..8ad5c4318f7d 100644
--- a/pkgs/development/libraries/haskell/feed/default.nix
+++ b/pkgs/development/libraries/haskell/feed/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fgl-visualize/default.nix b/pkgs/development/libraries/haskell/fgl-visualize/default.nix
index 279f25eaca20..9938d181d88f 100644
--- a/pkgs/development/libraries/haskell/fgl-visualize/default.nix
+++ b/pkgs/development/libraries/haskell/fgl-visualize/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Convert FGL graphs to dot (graphviz) files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 c367b74f6a3f..7299daddb14c 100644
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 8691d10c684e..7417a32745c5 100644
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 6a7aa22cef10..7b6aa799944b 100644
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix
index 145d3c1c203d..efb8e9d7894f 100644
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ b/pkgs/development/libraries/haskell/file-embed/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/file-location/default.nix b/pkgs/development/libraries/haskell/file-location/default.nix
index 8a28d0b27fb1..e9806cfb1fba 100644
--- a/pkgs/development/libraries/haskell/file-location/default.nix
+++ b/pkgs/development/libraries/haskell/file-location/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "common functions that show file location information";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix
index 0cd65bb1905e..3409079210ba 100644
--- a/pkgs/development/libraries/haskell/filepath/default.nix
+++ b/pkgs/development/libraries/haskell/filepath/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index 04321d34ffa1..137846f85f6f 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
index 46ae27fc0901..a44134344808 100644
--- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Use system-filepath data types with conduits";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix
index 299b2e926dbd..ea3d9b6fbdf7 100644
--- a/pkgs/development/libraries/haskell/fingertree/default.nix
+++ b/pkgs/development/libraries/haskell/fingertree/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
index 7be21dbbf347..2a94174f5ed0 100644
--- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix
+++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index 025ed14869f8..e46f582c024b 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Simple force-directed layout";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix
index cfc80c4d547a..e740f7f819aa 100644
--- a/pkgs/development/libraries/haskell/fsnotify/default.nix
+++ b/pkgs/development/libraries/haskell/fsnotify/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Cross platform library for file creation, modification, and deletion notification";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix
index 8fbdb57d48bf..2853fbca7685 100644
--- a/pkgs/development/libraries/haskell/gamma/default.nix
+++ b/pkgs/development/libraries/haskell/gamma/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix
index 27423ce4ecd4..44c15b23d4ba 100644
--- a/pkgs/development/libraries/haskell/gd/default.nix
+++ b/pkgs/development/libraries/haskell/gd/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix
index e14857aaa5b7..929b717f552b 100644
--- a/pkgs/development/libraries/haskell/gdiff/default.nix
+++ b/pkgs/development/libraries/haskell/gdiff/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
index c071aba7decd..8082201e71ce 100644
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Generic programming library for generalised deriving";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/geniplate/default.nix b/pkgs/development/libraries/haskell/geniplate/default.nix
index eff79afa416c..508075044eca 100644
--- a/pkgs/development/libraries/haskell/geniplate/default.nix
+++ b/pkgs/development/libraries/haskell/geniplate/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Use template Haskell to generate Uniplate-like functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix
index 8c2f481122bc..18110f3c0f76 100644
--- a/pkgs/development/libraries/haskell/ghc-core/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-core/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
index 5b7decf9416b..f4c7bfbb264d 100644
--- a/pkgs/development/libraries/haskell/ghc-events/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-events/default.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
index 6e0cd15c248a..6213734881d8 100644
--- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Extract the heap representation of Haskell values and thunks";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
index ea2495f6586a..2db4ea5817cd 100644
--- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
index 6f5f14585074..aef62af9e163 100644
--- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-syb/default.nix b/pkgs/development/libraries/haskell/ghc-syb/default.nix
index 21a2f0f00eb9..d0a766940fe8 100644
--- a/pkgs/development/libraries/haskell/ghc-syb/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-syb/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index 3fd1230073e7..7d3d47f1a036 100644
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Live visualization of data structures in GHCi";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix
index e9d295798b63..082032f75a3a 100644
--- a/pkgs/development/libraries/haskell/gio/default.nix
+++ b/pkgs/development/libraries/haskell/gio/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 9213c534fa3d..d241442e616a 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -23,6 +23,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix
index 7c49b956aa98..f1bae4ad9fe0 100644
--- a/pkgs/development/libraries/haskell/glade/default.nix
+++ b/pkgs/development/libraries/haskell/glade/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
index 29d2f92d7bac..a9c3023c41b5 100644
--- a/pkgs/development/libraries/haskell/glib/default.nix
+++ b/pkgs/development/libraries/haskell/glib/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index ededea21fcc1..a4af25459a06 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/glpk-hs/default.nix b/pkgs/development/libraries/haskell/glpk-hs/default.nix
index fbbe7d31c2a5..2ac665472596 100644
--- a/pkgs/development/libraries/haskell/glpk-hs/default.nix
+++ b/pkgs/development/libraries/haskell/glpk-hs/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Comprehensive GLPK linear programming bindings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gnuidn/default.nix b/pkgs/development/libraries/haskell/gnuidn/default.nix
index 6ae78cf49b6a..27d7860be66c 100644
--- a/pkgs/development/libraries/haskell/gnuidn/default.nix
+++ b/pkgs/development/libraries/haskell/gnuidn/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Bindings for GNU IDN";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gnutls/default.nix b/pkgs/development/libraries/haskell/gnutls/default.nix
index 72f98677ce66..6aa16600707a 100644
--- a/pkgs/development/libraries/haskell/gnutls/default.nix
+++ b/pkgs/development/libraries/haskell/gnutls/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Bindings for GNU libgnutls";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index 77245ec8c91b..134f05afb49a 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -20,6 +20,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/groupoids/default.nix b/pkgs/development/libraries/haskell/groupoids/default.nix
index 4c085c0ae23b..471c5586fe93 100644
--- a/pkgs/development/libraries/haskell/groupoids/default.nix
+++ b/pkgs/development/libraries/haskell/groupoids/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 Groupoids";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gsasl/default.nix b/pkgs/development/libraries/haskell/gsasl/default.nix
index 5a654cdd11de..aa727cb9412e 100644
--- a/pkgs/development/libraries/haskell/gsasl/default.nix
+++ b/pkgs/development/libraries/haskell/gsasl/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Bindings for GNU libgsasl";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
index ed5244d72629..e817312f9f61 100644
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ b/pkgs/development/libraries/haskell/gtk/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
index 677c6c15214b..be1f53937e1b 100644
--- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
index 756e1a1df978..bb7680b34077 100644
--- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix
+++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix
index 83ee2c810ebd..da16347a8ddf 100644
--- a/pkgs/development/libraries/haskell/hS3/default.nix
+++ b/pkgs/development/libraries/haskell/hS3/default.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 35204f853a35..792c49f51f10 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -28,6 +28,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 489c38e86f8d..883eb825fecf 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Haml-like template files that are compile-time checked";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index fad611798e9d..64bf08ef5336 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 0185e4e6ce92..3ea0262a6f4c 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -22,6 +22,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
index 8dfac311a9a5..63e6c47b5b32 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "Web framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix
index ffb3f98e8b33..cc261a552355 100644
--- a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix
+++ b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix
index 0547fd67b1f7..d7d89ee86122 100644
--- a/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix
+++ b/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix
index 77a4251259d3..88e5839363e7 100644
--- a/pkgs/development/libraries/haskell/hashed-storage/default.nix
+++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix
index ae62c051ec5e..14407a038b82 100644
--- a/pkgs/development/libraries/haskell/hashtables/default.nix
+++ b/pkgs/development/libraries/haskell/hashtables/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskeline-class/default.nix b/pkgs/development/libraries/haskell/haskeline-class/default.nix
index 76080574fcc8..acf6a6c0d4fa 100644
--- a/pkgs/development/libraries/haskell/haskeline-class/default.nix
+++ b/pkgs/development/libraries/haskell/haskeline-class/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix b/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix
index 9863293c41de..9dff76cfe47e 100644
--- a/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix
+++ b/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix b/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix
index 3d51d396c7f5..c804e328500d 100644
--- a/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix
+++ b/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-lexer/default.nix b/pkgs/development/libraries/haskell/haskell-lexer/default.nix
index 9aa1bdea9514..90c4a599bc4c 100644
--- a/pkgs/development/libraries/haskell/haskell-lexer/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-lexer/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-mpi/default.nix b/pkgs/development/libraries/haskell/haskell-mpi/default.nix
index add910b61936..bcd1e22037c0 100644
--- a/pkgs/development/libraries/haskell/haskell-mpi/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-mpi/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Distributed parallel programming in Haskell using MPI";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
index 1918260cc62f..bad9ab911759 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix
index 5521e037b4eb..280fa347d897 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index 7b6ccb696338..84df55723959 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 6729cbef2aa6..0bec73765444 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,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 1895a655d92f..949efadea96a 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,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 1dbbbec550a4..dd62d57a02ab 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,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix
index 15d32de346df..a98c3b3ed372 100644
--- a/pkgs/development/libraries/haskell/hastache/default.nix
+++ b/pkgs/development/libraries/haskell/hastache/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haxr-th/default.nix b/pkgs/development/libraries/haskell/haxr-th/default.nix
index b319857bac3d..83917cf88919 100644
--- a/pkgs/development/libraries/haskell/haxr-th/default.nix
+++ b/pkgs/development/libraries/haskell/haxr-th/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix
index 1283d3a4a59e..deedba1673dc 100644
--- a/pkgs/development/libraries/haskell/haxr/default.nix
+++ b/pkgs/development/libraries/haskell/haxr/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
index 45ff3fea7f0f..ff1c893cd0e7 100644
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "An Haskell template system supporting both HTML5 and XML";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix
index 5a656bc19c78..f1c6f8785262 100644
--- a/pkgs/development/libraries/haskell/hexpat/default.nix
+++ b/pkgs/development/libraries/haskell/hexpat/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "XML parser/formatter based on expat";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index 9d6185dc5266..e137f58c11c6 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Syntax highlighting";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix
index de1c0e127597..1c6a0bfc7d45 100644
--- a/pkgs/development/libraries/haskell/hinotify/default.nix
+++ b/pkgs/development/libraries/haskell/hinotify/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Haskell binding to inotify";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
index 8cf1accca9c7..4a9c835e1fb7 100644
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index 9551581dadf6..7bfe5a8fa957 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index b5d9d7abbaac..f0edce802339 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 4099b1896a58..8de78340b1ca 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -18,6 +18,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 2542e2005865..d22bd1b186c2 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -16,6 +16,7 @@ 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/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix
index c568b292c3c1..d2ff9c480800 100644
--- a/pkgs/development/libraries/haskell/hoauth/default.nix
+++ b/pkgs/development/libraries/haskell/hoauth/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "A Haskell implementation of OAuth 1.0a protocol.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 1e722a186dc4..306ee1437ba6 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -19,6 +19,9 @@ cabal.mkDerivation (self: {
     description = "Haskell API Search";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hostname/default.nix b/pkgs/development/libraries/haskell/hostname/default.nix
index 75886f8daadf..69653ca2699f 100644
--- a/pkgs/development/libraries/haskell/hostname/default.nix
+++ b/pkgs/development/libraries/haskell/hostname/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix
index 96ac397da79c..f77d0ea677fe 100644
--- a/pkgs/development/libraries/haskell/hp2any-core/default.nix
+++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix
index 83369ac008b7..e1494f50693d 100644
--- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix
+++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix
index 3a1ed14785ba..0674ed31659a 100644
--- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix
+++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix
index d8bc08b4b33c..63b615607230 100644
--- a/pkgs/development/libraries/haskell/hscolour/default.nix
+++ b/pkgs/development/libraries/haskell/hscolour/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Colourise Haskell code";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix
index be78bea938cf..e7f75fb74d3e 100644
--- a/pkgs/development/libraries/haskell/hslogger-template/default.nix
+++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
index 8c9885d4378f..41019c9caa3e 100644
--- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Catchy combinators for HUnit";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index 5f3ca918b0a9..85547842dc86 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
     description = "A version of Hspec which is used to test Hspec itself";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 4161cf8bc03b..4856c1eb72a5 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -22,5 +22,6 @@ cabal.mkDerivation (self: {
     description = "Behavior-Driven Development for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hspread/default.nix b/pkgs/development/libraries/haskell/hspread/default.nix
index dbd1a4a0923b..c1ee264ea84a 100644
--- a/pkgs/development/libraries/haskell/hspread/default.nix
+++ b/pkgs/development/libraries/haskell/hspread/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix
index e26a9d9e02a3..3f4754256599 100644
--- a/pkgs/development/libraries/haskell/hsyslog/default.nix
+++ b/pkgs/development/libraries/haskell/hsyslog/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix
index eaf1754b6223..7745c125e11b 100644
--- a/pkgs/development/libraries/haskell/html-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/html-conduit/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Parse HTML documents using xml-conduit datatypes";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
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 de8dc75a5faa..f420bad2959c 100644
--- a/pkgs/development/libraries/haskell/html/1.0.1.2.nix
+++ b/pkgs/development/libraries/haskell/html/1.0.1.2.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "HTML combinator library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index e4ffe2482f55..3c0e1b3a2025 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -32,6 +32,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix
index 3571c160f6b7..adbabc0734b3 100644
--- a/pkgs/development/libraries/haskell/http-date/default.nix
+++ b/pkgs/development/libraries/haskell/http-date/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index 39091256ec0f..ce10da775b0a 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -22,5 +22,6 @@ cabal.mkDerivation (self: {
     description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
index c4c064fbf811..9cc9d3859d63 100644
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ b/pkgs/development/libraries/haskell/http-types/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix
index d1d3f28b0496..e56a95437dbe 100644
--- a/pkgs/development/libraries/haskell/httpd-shed/default.nix
+++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
index 86605ae55a56..9e2b9a21bb38 100644
--- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
index 879ff0affdc7..61465a789058 100644
--- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
index 731c63b5378b..6584a69b4bae 100644
--- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index 35783c7762ef..53f7af3e52ad 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/idna/default.nix b/pkgs/development/libraries/haskell/idna/default.nix
index 1d5bc92bf6f1..2ca926ffae7f 100644
--- a/pkgs/development/libraries/haskell/idna/default.nix
+++ b/pkgs/development/libraries/haskell/idna/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Implements IDNA (RFC 3490)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix
index 6eb5f262516f..3a731c626231 100644
--- a/pkgs/development/libraries/haskell/ieee754/default.nix
+++ b/pkgs/development/libraries/haskell/ieee754/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix
index 61e580b6293d..4725ca37fca1 100644
--- a/pkgs/development/libraries/haskell/instant-generics/default.nix
+++ b/pkgs/development/libraries/haskell/instant-generics/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix
index cdf269b0d3c3..e085cebcef55 100644
--- a/pkgs/development/libraries/haskell/io-choice/default.nix
+++ b/pkgs/development/libraries/haskell/io-choice/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Choice for IO and lifted IO";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/io-storage/default.nix b/pkgs/development/libraries/haskell/io-storage/default.nix
index 32e60325acc9..55b88ac1d36a 100644
--- a/pkgs/development/libraries/haskell/io-storage/default.nix
+++ b/pkgs/development/libraries/haskell/io-storage/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix
index 045bb64035c4..e5092ccb1ace 100644
--- a/pkgs/development/libraries/haskell/iproute/default.nix
+++ b/pkgs/development/libraries/haskell/iproute/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "IP Routing Table";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix
index 89d277d1f406..8bfcde01282e 100644
--- a/pkgs/development/libraries/haskell/irc/default.nix
+++ b/pkgs/development/libraries/haskell/irc/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index ee9026bae493..fa906583afcf 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix
index d062ec298690..a7fc6b7e6e11 100644
--- a/pkgs/development/libraries/haskell/ivor/default.nix
+++ b/pkgs/development/libraries/haskell/ivor/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix
index c93aa0411d40..872f2fb394f7 100644
--- a/pkgs/development/libraries/haskell/jpeg/default.nix
+++ b/pkgs/development/libraries/haskell/jpeg/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix
index 9a56f412fe2b..3e2f2cca387f 100644
--- a/pkgs/development/libraries/haskell/json/default.nix
+++ b/pkgs/development/libraries/haskell/json/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Support for serialising Haskell to and from JSON";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jsonTypes/default.nix b/pkgs/development/libraries/haskell/jsonTypes/default.nix
index dd6c3eb058f2..44be8624a41a 100644
--- a/pkgs/development/libraries/haskell/jsonTypes/default.nix
+++ b/pkgs/development/libraries/haskell/jsonTypes/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/kansas-lava/default.nix b/pkgs/development/libraries/haskell/kansas-lava/default.nix
index 6ae0447b1fe6..489d4e9cdb3f 100644
--- a/pkgs/development/libraries/haskell/kansas-lava/default.nix
+++ b/pkgs/development/libraries/haskell/kansas-lava/default.nix
@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
     description = "Kansas Lava is a hardware simulator and VHDL generator";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
index 51db50a75b76..2a8813d72a5f 100644
--- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
+++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Utility libraries for the advanced IRC bot, Lambdabot";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix
index 926c5acafbab..68269106e5d4 100644
--- a/pkgs/development/libraries/haskell/lambdabot/default.nix
+++ b/pkgs/development/libraries/haskell/lambdabot/default.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "Lambdabot is a development tool and advanced IRC bot";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
index f3c9a8af4eab..6d7f756c6866 100644
--- a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
+++ b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "3D rendering engine written entirely in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
index fc8c15edf570..7e96fd6c6a55 100644
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix
@@ -21,6 +21,9 @@ cabal.mkDerivation (self: {
     description = "C/CUDA/OpenCL quasiquoting library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
index 154bc68c3c5c..aa9cb12412f0 100644
--- a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
+++ b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Analysis and generation of C code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-c/0.4.2.nix b/pkgs/development/libraries/haskell/language-c/0.4.2.nix
index 5b638ea9dab4..71e514ddbc11 100644
--- a/pkgs/development/libraries/haskell/language-c/0.4.2.nix
+++ b/pkgs/development/libraries/haskell/language-c/0.4.2.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Analysis and generation of C code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
index a77040a5578c..d81d4a818e20 100644
--- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
+++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index 4571b869e3bd..2ecf3490af66 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Parser for JavaScript";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix
index aa3cd5fcdf60..a38099b761b9 100644
--- a/pkgs/development/libraries/haskell/largeword/default.nix
+++ b/pkgs/development/libraries/haskell/largeword/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
index f409d99987d9..5881baf7430b 100644
--- a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
index 1a907a384f1f..07804ef1b7d1 100644
--- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix
+++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     description = "Metadata collection for leksah";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/leksah/process-leksah.nix b/pkgs/development/libraries/haskell/leksah/process-leksah.nix
index b8f0ed37d4cb..75059e705124 100644
--- a/pkgs/development/libraries/haskell/leksah/process-leksah.nix
+++ b/pkgs/development/libraries/haskell/leksah/process-leksah.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Process libraries";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 84a66d019dcc..1dfd50f69e14 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -31,5 +31,6 @@ cabal.mkDerivation (self: {
     description = "Lenses, Folds and Traversals";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
index 3222f4607e7f..323f1797fef0 100644
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Lastfm API interface";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
index 7402d6f31db3..64a4906fa597 100644
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ b/pkgs/development/libraries/haskell/libmpd/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "An MPD client library";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix
index afdd782fe094..de30698e2e7e 100644
--- a/pkgs/development/libraries/haskell/libxml-sax/default.nix
+++ b/pkgs/development/libraries/haskell/libxml-sax/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Bindings for the libXML2 SAX interface";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index 1d675e88d874..2eaf950023a6 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -18,6 +18,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lockfree-queue/default.nix b/pkgs/development/libraries/haskell/lockfree-queue/default.nix
index 7efe6b25b391..b8aeeaa2b73a 100644
--- a/pkgs/development/libraries/haskell/lockfree-queue/default.nix
+++ b/pkgs/development/libraries/haskell/lockfree-queue/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Michael and Scott lock-free queues";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/logfloat/default.nix b/pkgs/development/libraries/haskell/logfloat/default.nix
index 3088004d0a88..5f438fb40601 100644
--- a/pkgs/development/libraries/haskell/logfloat/default.nix
+++ b/pkgs/development/libraries/haskell/logfloat/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
index 0a03ed45fee6..129a7d7c9004 100644
--- a/pkgs/development/libraries/haskell/logict/default.nix
+++ b/pkgs/development/libraries/haskell/logict/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A backtracking logic-programming monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix
index 2d494f4a8969..a43b5f0fadec 100644
--- a/pkgs/development/libraries/haskell/lrucache/default.nix
+++ b/pkgs/development/libraries/haskell/lrucache/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "a simple, pure LRU cache";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ltk/default.nix b/pkgs/development/libraries/haskell/ltk/default.nix
index 7960395eb098..2983313e0cce 100644
--- a/pkgs/development/libraries/haskell/ltk/default.nix
+++ b/pkgs/development/libraries/haskell/ltk/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Leksah tool kit";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/maccatcher/default.nix b/pkgs/development/libraries/haskell/maccatcher/default.nix
index 6109f33f82fe..03731a91d87a 100644
--- a/pkgs/development/libraries/haskell/maccatcher/default.nix
+++ b/pkgs/development/libraries/haskell/maccatcher/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Obtain the host MAC address on *NIX and Windows";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
index 30681bd340bc..21110ffdbe79 100644
--- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix
+++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Pretty printing designed for printing source code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix
index 06c1b9e2fcae..617d6caf2c9a 100644
--- a/pkgs/development/libraries/haskell/markdown-unlit/default.nix
+++ b/pkgs/development/libraries/haskell/markdown-unlit/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Literate Haskell support for Markdown";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix
index 2e29269a9fdf..f5046748a0b2 100644
--- a/pkgs/development/libraries/haskell/math-functions/default.nix
+++ b/pkgs/development/libraries/haskell/math-functions/default.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix
index 84f0d83a9242..f03b771b8fda 100644
--- a/pkgs/development/libraries/haskell/maude/default.nix
+++ b/pkgs/development/libraries/haskell/maude/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
index 590290e76c34..3153bb6f6086 100644
--- a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
+++ b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index d24bf5719bde..f9c1b69706a4 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix
index 5dd5f65c9e74..18056986cb0f 100644
--- a/pkgs/development/libraries/haskell/mime-types/default.nix
+++ b/pkgs/development/libraries/haskell/mime-types/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Basic mime-type handling types and functions";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/minimorph/default.nix b/pkgs/development/libraries/haskell/minimorph/default.nix
index 06dcfaa11390..b036d638caec 100644
--- a/pkgs/development/libraries/haskell/minimorph/default.nix
+++ b/pkgs/development/libraries/haskell/minimorph/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "English spelling functions with an emphasis on simplicity";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix
index 22018087226e..6cfbf687e5a6 100644
--- a/pkgs/development/libraries/haskell/miniutter/default.nix
+++ b/pkgs/development/libraries/haskell/miniutter/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Simple English clause creation from arbitrary words";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix
index 4d0b9fcabeb7..f810186a62bb 100644
--- a/pkgs/development/libraries/haskell/mmap/default.nix
+++ b/pkgs/development/libraries/haskell/mmap/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix
index c4379499fad9..0d8e61530495 100644
--- a/pkgs/development/libraries/haskell/mmorph/default.nix
+++ b/pkgs/development/libraries/haskell/mmorph/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Monad morphisms";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
index 1cdf917cf8fb..aa794357b9f8 100644
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
index c06809c261dc..d57d6e5ee1cf 100644
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "A class of monads which can log messages";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix
index ef7d6c27173b..fb6ead581c62 100644
--- a/pkgs/development/libraries/haskell/monad-loops/default.nix
+++ b/pkgs/development/libraries/haskell/monad-loops/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Monadic loops";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
index fb8773372212..b651575e0a6e 100644
--- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Combinators and extra features for Par monads";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
index 8692d6267cbe..6430ec3c7606 100644
--- a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
+++ b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix
index 3fc819542eb4..6ded217c4d7e 100644
--- a/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix
+++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix
@@ -23,6 +23,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-peel/default.nix b/pkgs/development/libraries/haskell/monad-peel/default.nix
index 39f911dae938..afa31d1a0d5f 100644
--- a/pkgs/development/libraries/haskell/monad-peel/default.nix
+++ b/pkgs/development/libraries/haskell/monad-peel/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
index df63e3ec6591..4daba276730a 100644
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A monad for using CryptoRandomGen";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix
index f51fd8c840ae..652b561de84e 100644
--- a/pkgs/development/libraries/haskell/monads-tf/default.nix
+++ b/pkgs/development/libraries/haskell/monads-tf/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix
index 83b04869e68c..caa30fe6fca0 100644
--- a/pkgs/development/libraries/haskell/mongoDB/default.nix
+++ b/pkgs/development/libraries/haskell/mongoDB/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index a67017298a83..1161fe817b5a 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Various extra monoid-related definitions and utilities";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mpppc/default.nix b/pkgs/development/libraries/haskell/mpppc/default.nix
index 543578211718..d5cb3e9769f4 100644
--- a/pkgs/development/libraries/haskell/mpppc/default.nix
+++ b/pkgs/development/libraries/haskell/mpppc/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Multi-dimensional parametric pretty-printer with color";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 fc8fdaef7525..d609fc75cd78 100644
--- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
+++ b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Monad transformer library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 d7e6029a4edc..05e84b90dd07 100644
--- a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
+++ b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Monad transformer library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 3c91b65efa04..dc2ddedc121e 100644
--- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
+++ b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtl/2.1.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.1.nix
index b9298325c207..427411d41088 100644
--- a/pkgs/development/libraries/haskell/mtl/2.1.1.nix
+++ b/pkgs/development/libraries/haskell/mtl/2.1.1.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtl/2.1.2.nix b/pkgs/development/libraries/haskell/mtl/2.1.2.nix
index c10f526acf21..5048a4b99686 100644
--- a/pkgs/development/libraries/haskell/mtl/2.1.2.nix
+++ b/pkgs/development/libraries/haskell/mtl/2.1.2.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtlparse/default.nix b/pkgs/development/libraries/haskell/mtlparse/default.nix
index 37be70cebcb1..349fea712eba 100644
--- a/pkgs/development/libraries/haskell/mtlparse/default.nix
+++ b/pkgs/development/libraries/haskell/mtlparse/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "parse library using mtl package";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index 0a2495a07e9d..9af9210d74cb 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Combinators to build command line parsers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix
index 14310f50ef6f..a586b89982c0 100644
--- a/pkgs/development/libraries/haskell/multiplate/default.nix
+++ b/pkgs/development/libraries/haskell/multiplate/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
index a7d7459b4558..98cab8421de4 100644
--- a/pkgs/development/libraries/haskell/multirec/default.nix
+++ b/pkgs/development/libraries/haskell/multirec/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multiset/0.2.1.nix b/pkgs/development/libraries/haskell/multiset/0.2.1.nix
index 9f85317505c9..eb5df93d5bca 100644
--- a/pkgs/development/libraries/haskell/multiset/0.2.1.nix
+++ b/pkgs/development/libraries/haskell/multiset/0.2.1.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multiset/0.2.2.nix b/pkgs/development/libraries/haskell/multiset/0.2.2.nix
index 16fcf155747d..4ca3e4fb19f0 100644
--- a/pkgs/development/libraries/haskell/multiset/0.2.2.nix
+++ b/pkgs/development/libraries/haskell/multiset/0.2.2.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix
index 0c4058eb1119..8d4c59b959e5 100644
--- a/pkgs/development/libraries/haskell/murmur-hash/default.nix
+++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix
index 3e9be2c5e587..bccde70459aa 100644
--- a/pkgs/development/libraries/haskell/mwc-random/default.nix
+++ b/pkgs/development/libraries/haskell/mwc-random/default.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/nanospec/default.nix b/pkgs/development/libraries/haskell/nanospec/default.nix
index b7f498a35c83..bd3f7d7edd51 100644
--- a/pkgs/development/libraries/haskell/nanospec/default.nix
+++ b/pkgs/development/libraries/haskell/nanospec/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "A lightweight implementation of a subset of Hspec's API";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/nat/default.nix b/pkgs/development/libraries/haskell/nat/default.nix
index 3ad4240e2892..b8fb5f9e4efc 100644
--- a/pkgs/development/libraries/haskell/nat/default.nix
+++ b/pkgs/development/libraries/haskell/nat/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "Lazy binary natural numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix
index 02f5c289836e..f48a64221009 100644
--- a/pkgs/development/libraries/haskell/nats/default.nix
+++ b/pkgs/development/libraries/haskell/nats/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 natural numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/naturals/default.nix b/pkgs/development/libraries/haskell/naturals/default.nix
index 787ac70ffa96..e08c05ac6325 100644
--- a/pkgs/development/libraries/haskell/naturals/default.nix
+++ b/pkgs/development/libraries/haskell/naturals/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Constructors and related functions for natural numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix b/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix
index ff9ed1ac0bfa..47e3b62138aa 100644
--- a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix
+++ b/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Convert a Netlist AST to VHDL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/netlist/default.nix b/pkgs/development/libraries/haskell/netlist/default.nix
index 57550dcb3d86..91f7042509b9 100644
--- a/pkgs/development/libraries/haskell/netlist/default.nix
+++ b/pkgs/development/libraries/haskell/netlist/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Netlist AST";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/netwire/default.nix b/pkgs/development/libraries/haskell/netwire/default.nix
index d7ab9539e0c8..fbc143fbfaf3 100644
--- a/pkgs/development/libraries/haskell/netwire/default.nix
+++ b/pkgs/development/libraries/haskell/netwire/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Flexible wire arrows for FRP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index 032592f974ba..80d9fc05bd82 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Stream socket data using conduits";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix
index c1bfea43bde6..f15a94082a16 100644
--- a/pkgs/development/libraries/haskell/network-info/default.nix
+++ b/pkgs/development/libraries/haskell/network-info/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Access the local computer's basic network configuration";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix
index 3a461a51f53b..089a34638341 100644
--- a/pkgs/development/libraries/haskell/network-multicast/default.nix
+++ b/pkgs/development/libraries/haskell/network-multicast/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Simple multicast library";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
index 304017d3d240..e58bf679fdc5 100644
--- a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
+++ b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Client library for the XMPP protocol";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
index 840712e34160..47718bc3468e 100644
--- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
+++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     description = "TCP instantiation of Network.Transport";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix
index 7aedea7995b7..c709f7b853c5 100644
--- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix
+++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Unit tests for Network.Transport implementations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix
index eaa41944a6bd..86656974aa89 100644
--- a/pkgs/development/libraries/haskell/network-transport/default.nix
+++ b/pkgs/development/libraries/haskell/network-transport/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Network abstraction layer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 68c7937497c4..7d99df9ee1c8 100644
--- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix
+++ b/pkgs/development/libraries/haskell/network/2.2.1.4.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Networking-related facilities";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 f66d81f79f45..ba33bc36643b 100644
--- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix
+++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Networking-related facilities";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.13.nix b/pkgs/development/libraries/haskell/network/2.3.0.13.nix
index 557dea081fdb..107d4f50f353 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.13.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.13.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 a1a9a36d7382..9d2642a487d2 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.2.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 9434d83d7f01..bf9330eb256a 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.5.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix
index dc0c1811e591..7cd500521dfd 100644
--- a/pkgs/development/libraries/haskell/network/2.3.1.0.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.1.0.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.4.1.2.nix b/pkgs/development/libraries/haskell/network/2.4.1.2.nix
index 6f245cf18400..a4b2f8ac8e93 100644
--- a/pkgs/development/libraries/haskell/network/2.4.1.2.nix
+++ b/pkgs/development/libraries/haskell/network/2.4.1.2.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/newtype/default.nix b/pkgs/development/libraries/haskell/newtype/default.nix
index 40354c9472ce..a08ff33c0e48 100644
--- a/pkgs/development/libraries/haskell/newtype/default.nix
+++ b/pkgs/development/libraries/haskell/newtype/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "A typeclass and set of functions for working with newtypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix
index a50710791dbc..934bb76dcd42 100644
--- a/pkgs/development/libraries/haskell/non-negative/default.nix
+++ b/pkgs/development/libraries/haskell/non-negative/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Non-negative numbers";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix
index 81a3e866dc01..72b3ac1c7d5d 100644
--- a/pkgs/development/libraries/haskell/numbers/default.nix
+++ b/pkgs/development/libraries/haskell/numbers/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Various number types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
index 1cb6ab49bcd6..329317f6834d 100644
--- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix
index 76f57daca385..d7e88e882cd8 100644
--- a/pkgs/development/libraries/haskell/numtype-tf/default.nix
+++ b/pkgs/development/libraries/haskell/numtype-tf/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Type-level (low cardinality) integers, implemented using type families";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix
index be90f003f7fb..b55e0c50b4b3 100644
--- a/pkgs/development/libraries/haskell/numtype/default.nix
+++ b/pkgs/development/libraries/haskell/numtype/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
index c8b9e984eb1c..6d16100ccc12 100644
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Interface to the Online Encyclopedia of Integer Sequences";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
index 46f530b8cd4f..21aba33a004f 100644
--- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix
+++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Utilities and combinators for parsing command line options";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix
index d4f49791d306..ce7888cd4b7f 100644
--- a/pkgs/development/libraries/haskell/pandoc-types/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Types for representing a structured document";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
index bbd935eb043f..d11b33e2096b 100644
--- a/pkgs/development/libraries/haskell/pango/default.nix
+++ b/pkgs/development/libraries/haskell/pango/default.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix
index 56c1a1306964..9d0c82f1aed1 100644
--- a/pkgs/development/libraries/haskell/parallel-io/default.nix
+++ b/pkgs/development/libraries/haskell/parallel-io/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Combinators for executing IO actions in parallel on a thread pool";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
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 5212e6b2847a..2977a60964cf 100644
--- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 9fb661fd481f..185e86b02e89 100644
--- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 83283c2317b0..37d537185cb6 100644
--- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 365ed1968419..81d37e3a2b0c 100644
--- a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix
+++ b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix
index e089c8dce8ea..ee8265950b76 100644
--- a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix
+++ b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix
index 4287015115c8..197376d608b0 100644
--- a/pkgs/development/libraries/haskell/parseargs/default.nix
+++ b/pkgs/development/libraries/haskell/parseargs/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 17c046a06e1d..155e4f09007c 100644
--- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.1.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix
index 62c5b67b0e9a..e740ca91dba2 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.1.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.1.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix
index ecbdbb3aef0a..95ef6219dbb7 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.1.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.3.nix b/pkgs/development/libraries/haskell/parsec/3.1.3.nix
index b9b10f2e5b0d..5f6521e45833 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.3.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.1.3.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix
index 4245fcf7f40b..55bc7f74d297 100644
--- a/pkgs/development/libraries/haskell/parsimony/default.nix
+++ b/pkgs/development/libraries/haskell/parsimony/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix
index 14b9f8d70813..83a8c2d3faff 100644
--- a/pkgs/development/libraries/haskell/path-pieces/default.nix
+++ b/pkgs/development/libraries/haskell/path-pieces/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Components of paths";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix
index f0be81e64ae3..00d33238c428 100644
--- a/pkgs/development/libraries/haskell/pathtype/default.nix
+++ b/pkgs/development/libraries/haskell/pathtype/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix
index 71e0ddadb59c..3336b8f1c8a4 100644
--- a/pkgs/development/libraries/haskell/pcre-light/default.nix
+++ b/pkgs/development/libraries/haskell/pcre-light/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix
index 16b47a9c8ae0..35f8ae70cfe3 100644
--- a/pkgs/development/libraries/haskell/pem/default.nix
+++ b/pkgs/development/libraries/haskell/pem/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Privacy Enhanced Mail (PEM) format reader and writer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/permutation/default.nix b/pkgs/development/libraries/haskell/permutation/default.nix
index 4f38dfcaa12f..6e7f44727536 100644
--- a/pkgs/development/libraries/haskell/permutation/default.nix
+++ b/pkgs/development/libraries/haskell/permutation/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index 52c74af4d4d9..0ee5e625db4f 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Backend for the persistent library using postgresql";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index 947f75342d45..86bbe4e27883 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Backend for the persistent library using sqlite3";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 396f51f69cb7..926b4fa4cb60 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Type-safe, non-relational, multi-backend persistence";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 036deebae20d..8ca0febfd840 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "Type-safe, multi-backend data serialization";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pgm/default.nix b/pkgs/development/libraries/haskell/pgm/default.nix
index b1be8dd6d035..c101ec60a36d 100644
--- a/pkgs/development/libraries/haskell/pgm/default.nix
+++ b/pkgs/development/libraries/haskell/pgm/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Pure Haskell implementation of PGM image format";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/polyparse/1.7.nix b/pkgs/development/libraries/haskell/polyparse/1.7.nix
index 23a0af761c13..b27dc9cc6952 100644
--- a/pkgs/development/libraries/haskell/polyparse/1.7.nix
+++ b/pkgs/development/libraries/haskell/polyparse/1.7.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A variety of alternative parser combinator libraries";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/polyparse/1.8.nix b/pkgs/development/libraries/haskell/polyparse/1.8.nix
index 24425c6b5e65..a0ee0e199bb9 100644
--- a/pkgs/development/libraries/haskell/polyparse/1.8.nix
+++ b/pkgs/development/libraries/haskell/polyparse/1.8.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A variety of alternative parser combinator libraries";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix
index 08c035f18268..bec8f7882f11 100644
--- a/pkgs/development/libraries/haskell/pool-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Resource pool allocations via ResourceT";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
index 90a92019f0e1..bba70d7139b5 100644
--- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "low-level binding to libpq";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 81a5f67c45b9..9c30ad00e5c2 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Mid-Level PostgreSQL client library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ppm/default.nix b/pkgs/development/libraries/haskell/ppm/default.nix
index c55fc0226e9c..df204fa2482f 100644
--- a/pkgs/development/libraries/haskell/ppm/default.nix
+++ b/pkgs/development/libraries/haskell/ppm/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix
index 5fedd0aca292..6d76aeb9bf6f 100644
--- a/pkgs/development/libraries/haskell/pretty-show/default.nix
+++ b/pkgs/development/libraries/haskell/pretty-show/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Tools for working with derived `Show` instances and generic inspection of values";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/primitive/0.4.1.nix b/pkgs/development/libraries/haskell/primitive/0.4.1.nix
index 9daef669c577..ab8dc18ad0ae 100644
--- a/pkgs/development/libraries/haskell/primitive/0.4.1.nix
+++ b/pkgs/development/libraries/haskell/primitive/0.4.1.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
index af6778ccd141..680904992835 100644
--- a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
+++ b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Primitive memory-related operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.nix b/pkgs/development/libraries/haskell/primitive/0.5.nix
index d09359aaeb92..2a7ce3532d40 100644
--- a/pkgs/development/libraries/haskell/primitive/0.5.nix
+++ b/pkgs/development/libraries/haskell/primitive/0.5.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Primitive memory-related operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix
index 1d9cb4f80620..f1baf67bec72 100644
--- a/pkgs/development/libraries/haskell/process-extras/default.nix
+++ b/pkgs/development/libraries/haskell/process-extras/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Process extras";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
index df16898ddd3e..b7b1e209ae9c 100644
--- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix
+++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Profunctor extras";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix
index e2194bf90597..936230131e7e 100644
--- a/pkgs/development/libraries/haskell/profunctors/default.nix
+++ b/pkgs/development/libraries/haskell/profunctors/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 Profunctors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix
index fa60370f1f5e..2b225d6a87dc 100644
--- a/pkgs/development/libraries/haskell/project-template/default.nix
+++ b/pkgs/development/libraries/haskell/project-template/default.nix
@@ -20,5 +20,6 @@ cabal.mkDerivation (self: {
     description = "Specify Haskell project templates and generate files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
index 98b65bb59f02..c4923836bb26 100644
--- a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
+++ b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix
index 8016095a4020..446a430ed7c0 100644
--- a/pkgs/development/libraries/haskell/prolog-graph/default.nix
+++ b/pkgs/development/libraries/haskell/prolog-graph/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix
index b1e6e1d4e303..253903d3e3fe 100644
--- a/pkgs/development/libraries/haskell/prolog/default.nix
+++ b/pkgs/development/libraries/haskell/prolog/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix
index a091b62b3b16..e42d0a2bc789 100644
--- a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix
+++ b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Is a given string a domain suffix?";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/punycode/default.nix b/pkgs/development/libraries/haskell/punycode/default.nix
index a4ad760d8ffe..fabc39123d07 100644
--- a/pkgs/development/libraries/haskell/punycode/default.nix
+++ b/pkgs/development/libraries/haskell/punycode/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Encode unicode strings to ascii forms according to RFC 3492";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix
index 8e66b2c3c037..e6d0a3f4d80c 100644
--- a/pkgs/development/libraries/haskell/pureMD5/default.nix
+++ b/pkgs/development/libraries/haskell/pureMD5/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
index d75823d6025e..4d50729604e0 100644
--- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix
+++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Secure password storage";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index 8dd228ad3db3..37ed0f7ab974 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Random number generation";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix
index 1104091ae57f..9c9dedde25d9 100644
--- a/pkgs/development/libraries/haskell/random-shuffle/default.nix
+++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Random shuffle implementation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix
index acc0285a59a4..707477609b64 100644
--- a/pkgs/development/libraries/haskell/random-source/default.nix
+++ b/pkgs/development/libraries/haskell/random-source/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 1f4901a4d91d..a4feee31d023 100644
--- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix
+++ b/pkgs/development/libraries/haskell/random/1.0.1.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "random number library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix
index 2182e6410b53..0ba350270505 100644
--- a/pkgs/development/libraries/haskell/ranges/default.nix
+++ b/pkgs/development/libraries/haskell/ranges/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix
index 8694d2399b2b..d30375f46e83 100644
--- a/pkgs/development/libraries/haskell/rank1dynamic/default.nix
+++ b/pkgs/development/libraries/haskell/rank1dynamic/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
index ee408fea4805..0fbd9d74d19c 100644
--- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Examples for the reactive-banana library, using wxHaskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 8d62f67a1281..682943e80f14 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
     maintainers = [
       self.stdenv.lib.maintainers.andres
       self.stdenv.lib.maintainers.bluescreen303
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix
index 37fb26208f48..60747bbda68b 100644
--- a/pkgs/development/libraries/haskell/recaptcha/default.nix
+++ b/pkgs/development/libraries/haskell/recaptcha/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix
index 1819b3d217df..9d3acb72d6b9 100644
--- a/pkgs/development/libraries/haskell/reflection/default.nix
+++ b/pkgs/development/libraries/haskell/reflection/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Reifies arbitrary terms into types that can be reflected back into terms";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
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 e94a233d9f16..09e4906da011 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,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 5a49d2b6407c..8fbc2f9e84d0 100644
--- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
+++ b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 1dc559e63702..50f039a3d27a 100644
--- a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
+++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 623db0cc48b9..ed88e247e5b7 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,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix
index 8b9e666d6aee..3db0f5d40656 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.92.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 df3a7abf13f0..3a28e505a82d 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 52c28d8b800b..138702e1d416 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix
index 2b7f53e4572a..a34d90fa9847 100644
--- a/pkgs/development/libraries/haskell/regex-pcre/default.nix
+++ b/pkgs/development/libraries/haskell/regex-pcre/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 f1f6a89dc3d9..961aab9e2f77 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,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 662d8236c45a..223c9baedcdd 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 11e02b398b5c..9a570d4ca20d 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 42ee42ba7ef7..e78c7fe2584d 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 58106bc8b741..ca6358baeedb 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix
index 6d7fac51658e..22e1dca23ba0 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
index 67073790d25b..82fa24016bc5 100644
--- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix
+++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regexpr/default.nix b/pkgs/development/libraries/haskell/regexpr/default.nix
index c5389a7b6636..538b980b4383 100644
--- a/pkgs/development/libraries/haskell/regexpr/default.nix
+++ b/pkgs/development/libraries/haskell/regexpr/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "regular expression like Perl/Ruby in Haskell";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix
index 8a3e740491cb..bee3cf33d1ae 100644
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ b/pkgs/development/libraries/haskell/regular/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/remote/default.nix b/pkgs/development/libraries/haskell/remote/default.nix
index 3e160130ea8f..75c94bea23be 100644
--- a/pkgs/development/libraries/haskell/remote/default.nix
+++ b/pkgs/development/libraries/haskell/remote/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Cloud Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
index acf9dc712f35..b81a37f8ee5f 100644
--- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix
index bea9d9f7f043..03941f57316e 100644
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ b/pkgs/development/libraries/haskell/repa-examples/default.nix
@@ -18,6 +18,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix
index 046fafca43a7..23e8b2b761ef 100644
--- a/pkgs/development/libraries/haskell/repa-io/default.nix
+++ b/pkgs/development/libraries/haskell/repa-io/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index 4eb21c5661a5..63f3eaa982e7 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix
index c44735eda00b..951288c04aae 100644
--- a/pkgs/development/libraries/haskell/repr/default.nix
+++ b/pkgs/development/libraries/haskell/repr/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix
index 77bc91051937..c8c28f0e7749 100644
--- a/pkgs/development/libraries/haskell/resource-pool/default.nix
+++ b/pkgs/development/libraries/haskell/resource-pool/default.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index dc4ff618e164..2421b64b374c 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -15,6 +15,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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix
index 6f2ed95ab636..c6435cfc8df0 100644
--- a/pkgs/development/libraries/haskell/rvar/default.nix
+++ b/pkgs/development/libraries/haskell/rvar/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Random Variables";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix
index 6c16af12107d..067b7c4cf67d 100644
--- a/pkgs/development/libraries/haskell/safe/default.nix
+++ b/pkgs/development/libraries/haskell/safe/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
index 263adb42f253..26949f5004d7 100644
--- a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Semigroupoids requiring Haskell extensions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
index 4f1367dd559d..dcbb09b5613f 100644
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 semigroupoids: Category sans id";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index ea0f2813b55f..dbdce2eabe51 100644
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 semigroups";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix
index dc1f24757af2..0cc3a64ccc8f 100644
--- a/pkgs/development/libraries/haskell/sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/sendfile/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix
index b19728820aad..02df359df868 100644
--- a/pkgs/development/libraries/haskell/setenv/default.nix
+++ b/pkgs/development/libraries/haskell/setenv/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "A cross-platform library for setting environment variables";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index a3c6d69af869..f3a23533865c 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Build system library, like Make, but more accurate dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 56174254c219..486b8a1cc271 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Stick your haskell variables into css at compile time";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
index 1150ead03941..a624bb140d15 100644
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A type-based approach to internationalization";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 7f00530a7f94..c187854be064 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Stick your haskell variables into javascript/coffeescript at compile time";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index d4cc135cc62a..d5551d0ef8cd 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Interpolation with quasi-quotation: put variables strings";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index d38002eebdaa..4b8a29b6abff 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A toolkit for making compile-time interpolated templates";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 1e9e1f8c6ccb..9c167eb126be 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "shell-like (systems) programming in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix
index 411684e4953c..7eed37f5a40d 100644
--- a/pkgs/development/libraries/haskell/show/default.nix
+++ b/pkgs/development/libraries/haskell/show/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "'Show' instances for Lambdabot";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix
index fcd7a0a872a5..87a3ac1d4633 100644
--- a/pkgs/development/libraries/haskell/silently/default.nix
+++ b/pkgs/development/libraries/haskell/silently/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Prevent or capture writing to stdout and other handles";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/simple-reflect/default.nix b/pkgs/development/libraries/haskell/simple-reflect/default.nix
index 7a7f40c6d833..af6a6a6e6943 100644
--- a/pkgs/development/libraries/haskell/simple-reflect/default.nix
+++ b/pkgs/development/libraries/haskell/simple-reflect/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Simple reflection of expressions containing variables";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index 9e8f638c65cf..f1d245f9358e 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/sized-types/default.nix b/pkgs/development/libraries/haskell/sized-types/default.nix
index 672b2c090ef2..99cb87b7c046 100644
--- a/pkgs/development/libraries/haskell/sized-types/default.nix
+++ b/pkgs/development/libraries/haskell/sized-types/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Sized types in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 7fdb7e3a1dcc..9f085cce70d9 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix
index 6d82e7e5132d..ff710b0ea07d 100644
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/smallcheck/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index a20ec8e7ca5a..7aa6cfae73e9 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -20,6 +20,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
index abe4d4cc074b..85a39546e45f 100644
--- a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
+++ b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Snap: A Haskell Web Framework: dynamic loader";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/loader-static.nix b/pkgs/development/libraries/haskell/snap/loader-static.nix
index e75ae50d6c87..09402c1a5502 100644
--- a/pkgs/development/libraries/haskell/snap/loader-static.nix
+++ b/pkgs/development/libraries/haskell/snap/loader-static.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Snap: A Haskell Web Framework: static loader";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index c11dfe4f398f..7bd2ca8fdbe9 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -18,6 +18,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index b87cde894472..f5da92f6c8e3 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -25,5 +25,6 @@ cabal.mkDerivation (self: {
     description = "Top-level package for the Snap Web Framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix
index 34e4bf978a4f..485b912c2a88 100644
--- a/pkgs/development/libraries/haskell/socks/default.nix
+++ b/pkgs/development/libraries/haskell/socks/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/split/0.2.1.1.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix
index 0fb28b53ac94..c9f9ecad73cf 100644
--- a/pkgs/development/libraries/haskell/split/0.2.1.1.nix
+++ b/pkgs/development/libraries/haskell/split/0.2.1.1.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/split/0.2.1.2.nix b/pkgs/development/libraries/haskell/split/0.2.1.2.nix
index e98e36fe6558..0482fb243a51 100644
--- a/pkgs/development/libraries/haskell/split/0.2.1.2.nix
+++ b/pkgs/development/libraries/haskell/split/0.2.1.2.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix
index f652ed001e40..eef8a1505cfc 100644
--- a/pkgs/development/libraries/haskell/srcloc/default.nix
+++ b/pkgs/development/libraries/haskell/srcloc/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Data types for managing source code locations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix
index bc3913f6726d..b14fd6ebadeb 100644
--- a/pkgs/development/libraries/haskell/stateref/default.nix
+++ b/pkgs/development/libraries/haskell/stateref/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix
index f53e7a341d6e..40f9214ad33d 100644
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ b/pkgs/development/libraries/haskell/statistics/default.nix
@@ -22,6 +22,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix
index 1b1f1ba705bf..1521763f2bfe 100644
--- a/pkgs/development/libraries/haskell/stb-image/default.nix
+++ b/pkgs/development/libraries/haskell/stb-image/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix
index 74e121e5af99..07bc40d42d68 100644
--- a/pkgs/development/libraries/haskell/stm-chans/default.nix
+++ b/pkgs/development/libraries/haskell/stm-chans/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Additional types of channels for STM";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index 94117bd16635..5cfc61d064ee 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Introduces conduits to channels, and promotes using conduits concurrently";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
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 fe308211ebb5..6184a324181f 100644
--- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 492fb6e3557f..8615f10be80f 100644
--- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
+++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 fc33a979adff..1174a9740e5b 100644
--- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/stm/2.3.nix
index 4057b1f7fb3c..7057ede7052e 100644
--- a/pkgs/development/libraries/haskell/stm/2.3.nix
+++ b/pkgs/development/libraries/haskell/stm/2.3.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm/2.4.2.nix b/pkgs/development/libraries/haskell/stm/2.4.2.nix
index a3fa76e4a519..d75f133d896a 100644
--- a/pkgs/development/libraries/haskell/stm/2.4.2.nix
+++ b/pkgs/development/libraries/haskell/stm/2.4.2.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm/2.4.nix b/pkgs/development/libraries/haskell/stm/2.4.nix
index a949474cef12..13d3653ff653 100644
--- a/pkgs/development/libraries/haskell/stm/2.4.nix
+++ b/pkgs/development/libraries/haskell/stm/2.4.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/storable-complex/default.nix b/pkgs/development/libraries/haskell/storable-complex/default.nix
index 4450308a9107..dc36d53f046a 100644
--- a/pkgs/development/libraries/haskell/storable-complex/default.nix
+++ b/pkgs/development/libraries/haskell/storable-complex/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix
index 455d860ba5e9..caf8e218b181 100644
--- a/pkgs/development/libraries/haskell/storable-record/default.nix
+++ b/pkgs/development/libraries/haskell/storable-record/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/strict/default.nix b/pkgs/development/libraries/haskell/strict/default.nix
index 61b34efbe451..99239884b0a3 100644
--- a/pkgs/development/libraries/haskell/strict/default.nix
+++ b/pkgs/development/libraries/haskell/strict/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
index 915fad7006a4..083f3e06d5b7 100644
--- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix
+++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Strict concurrency abstractions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix
index bfc38fb07e89..75c31a3971f9 100644
--- a/pkgs/development/libraries/haskell/string-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/string-combinators/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/string-qq/default.nix b/pkgs/development/libraries/haskell/string-qq/default.nix
index 78fe1c3930f7..eb5d7303cdd3 100644
--- a/pkgs/development/libraries/haskell/string-qq/default.nix
+++ b/pkgs/development/libraries/haskell/string-qq/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stringbuilder/default.nix b/pkgs/development/libraries/haskell/stringbuilder/default.nix
index efe0956afc0f..ddb219cc3075 100644
--- a/pkgs/development/libraries/haskell/stringbuilder/default.nix
+++ b/pkgs/development/libraries/haskell/stringbuilder/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "A writer monad for multi-line string literals";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stringprep/default.nix b/pkgs/development/libraries/haskell/stringprep/default.nix
index f1654751f753..b37be3680cb7 100644
--- a/pkgs/development/libraries/haskell/stringprep/default.nix
+++ b/pkgs/development/libraries/haskell/stringprep/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Implements the \"StringPrep\" algorithm";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix
index f8032f8cde41..dc3bdd6a2c35 100644
--- a/pkgs/development/libraries/haskell/stringsearch/default.nix
+++ b/pkgs/development/libraries/haskell/stringsearch/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Fast searching, splitting and replacing of ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix
index c092f0c0d15b..9e50b646e3b7 100644
--- a/pkgs/development/libraries/haskell/strptime/default.nix
+++ b/pkgs/development/libraries/haskell/strptime/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
index 1d2cea756ffb..87d79b6e0610 100644
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
@@ -20,5 +20,6 @@ cabal.mkDerivation (self: {
     description = "Haskell code prettifier";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix
index e7aafd37264e..08c812f74241 100644
--- a/pkgs/development/libraries/haskell/svgcairo/default.nix
+++ b/pkgs/development/libraries/haskell/svgcairo/default.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.2.2.nix b/pkgs/development/libraries/haskell/syb/0.2.2.nix
index b03cb947d27d..070279fadfde 100644
--- a/pkgs/development/libraries/haskell/syb/0.2.2.nix
+++ b/pkgs/development/libraries/haskell/syb/0.2.2.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix
index 7caf5908a2dc..01cc80c883dd 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.3.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.3.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix
index 7638ab3332f2..04e5b7e1b0e7 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.2.nix b/pkgs/development/libraries/haskell/syb/0.3.6.2.nix
index a37e238ff710..70f1b01db0ac 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.6.2.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.6.2.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.7.nix b/pkgs/development/libraries/haskell/syb/0.3.7.nix
index 44a16e0bf5ca..5063009b93af 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.7.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.7.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix
index 4b999a94416d..ddf16ad41e55 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.4.0.nix b/pkgs/development/libraries/haskell/syb/0.4.0.nix
index 7408d0ac5375..f6ca59529659 100644
--- a/pkgs/development/libraries/haskell/syb/0.4.0.nix
+++ b/pkgs/development/libraries/haskell/syb/0.4.0.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 0cf40a87d417..2f3167ff6280 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,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
index c6a85e27df15..81a5529e9cae 100644
--- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix
+++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix
index d82a19688782..2b91c145e8b0 100644
--- a/pkgs/development/libraries/haskell/symbol/default.nix
+++ b/pkgs/development/libraries/haskell/symbol/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A 'Symbol' type for fast symbol comparison";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
index f61dedb7b8c5..1f78cd4c5115 100644
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ b/pkgs/development/libraries/haskell/system-fileio/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
index 851b28baafea..f845ca852669 100644
--- a/pkgs/development/libraries/haskell/system-filepath/default.nix
+++ b/pkgs/development/libraries/haskell/system-filepath/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix
index 32ede2f660b3..bde48cd3d5e0 100644
--- a/pkgs/development/libraries/haskell/tabular/default.nix
+++ b/pkgs/development/libraries/haskell/tabular/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index 2489f5650924..6c4c4d70cacd 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix
index 3258267f0120..4fbea6c0cc20 100644
--- a/pkgs/development/libraries/haskell/tagsoup/default.nix
+++ b/pkgs/development/libraries/haskell/tagsoup/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
index 1b290bd310ba..089593c5da34 100644
--- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "streamlined html tag parser";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tar/default.nix b/pkgs/development/libraries/haskell/tar/default.nix
index 04257960a64c..4a10c2ff0410 100644
--- a/pkgs/development/libraries/haskell/tar/default.nix
+++ b/pkgs/development/libraries/haskell/tar/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix
index df93cae198a0..f24b9e1b162f 100644
--- a/pkgs/development/libraries/haskell/temporary/default.nix
+++ b/pkgs/development/libraries/haskell/temporary/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix
index 24221912025a..cb08aabfdeee 100644
--- a/pkgs/development/libraries/haskell/terminfo/default.nix
+++ b/pkgs/development/libraries/haskell/terminfo/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
index 011d791643cc..a4bbc52b1b64 100644
--- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
index cabc0fe1d0a4..7133c9a144ea 100644
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
index b944c1e104cc..ac70e3d2aff7 100644
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
index ebcd608eb6a6..e7d9ade6d401 100644
--- a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Template Haskell for test framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix
index f70e522a2ce4..31f293ac9e2f 100644
--- a/pkgs/development/libraries/haskell/test-framework-th/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-th/default.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix
index b9f335e1a5af..fb9f4f7fd4ca 100644
--- a/pkgs/development/libraries/haskell/test-framework/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework/default.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 581cede2e879..a8b1c8090b10 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix
index 16115809f5b1..ba467ce6d134 100644
--- a/pkgs/development/libraries/haskell/text-icu/default.nix
+++ b/pkgs/development/libraries/haskell/text-icu/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Bindings to the ICU library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
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 59644d057201..e64be4197df3 100644
--- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 04fd250dfe9f..6bc6baf36ce4 100644
--- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.0.6.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 71d0c28e48d7..41569875a9eb 100644
--- a/pkgs/development/libraries/haskell/text/0.11.1.13.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.1.13.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 03c2d90ff8da..79804b49b2a1 100644
--- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix
index ab784807bfa2..a2a737b01990 100644
--- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.2.0.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.2.3.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix
index afa0e7eb5d3d..9bdf7fc97caa 100644
--- a/pkgs/development/libraries/haskell/text/0.11.2.3.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.2.3.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix
index 3475ccb804a0..e8df62c6190f 100644
--- a/pkgs/development/libraries/haskell/th-extras/default.nix
+++ b/pkgs/development/libraries/haskell/th-extras/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A grab bag of functions for use with Template Haskell";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix
index b8a118b56a65..aa7b5224de61 100644
--- a/pkgs/development/libraries/haskell/th-lift/default.nix
+++ b/pkgs/development/libraries/haskell/th-lift/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
index da14adfe339b..6b6a971bf688 100644
--- a/pkgs/development/libraries/haskell/th-orphans/default.nix
+++ b/pkgs/development/libraries/haskell/th-orphans/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Orphan instances for TH datatypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix
index aa848e4aa087..d4108f0a012e 100644
--- a/pkgs/development/libraries/haskell/thespian/default.nix
+++ b/pkgs/development/libraries/haskell/thespian/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix
index dc058844247d..4517a5f45126 100644
--- a/pkgs/development/libraries/haskell/threadmanager/default.nix
+++ b/pkgs/development/libraries/haskell/threadmanager/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Simple thread management";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix
index d802790da9d7..ad02cca08de6 100644
--- a/pkgs/development/libraries/haskell/threads/default.nix
+++ b/pkgs/development/libraries/haskell/threads/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Fork threads and wait for their result";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/time-compat/default.nix b/pkgs/development/libraries/haskell/time-compat/default.nix
index fa7c3ff41855..50535015a215 100644
--- a/pkgs/development/libraries/haskell/time-compat/default.nix
+++ b/pkgs/development/libraries/haskell/time-compat/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Compatibility with old-time for the time package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
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 56072676b67b..7ced3956a8a3 100644
--- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix
+++ b/pkgs/development/libraries/haskell/time/1.1.2.4.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A time library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/time/1.4.0.2.nix b/pkgs/development/libraries/haskell/time/1.4.0.2.nix
index 62232d1aa5a7..2c6f0ae55947 100644
--- a/pkgs/development/libraries/haskell/time/1.4.0.2.nix
+++ b/pkgs/development/libraries/haskell/time/1.4.0.2.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "A time library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index c9ab989ed76d..163852c312ec 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -18,6 +18,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 72e0976ceaff..c900975e8740 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -21,6 +21,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix
index e323905f81b6..951458eb4eb1 100644
--- a/pkgs/development/libraries/haskell/transformers-base/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-base/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
index f3120a61f201..0eb34b9444c4 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "A small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
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 6d2e374687fc..f38605c17ad3 100644
--- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
+++ b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 ec1b85248d9c..50675d901ec0 100644
--- a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
+++ b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix
index 90441f31867c..fa06558fc0dd 100644
--- a/pkgs/development/libraries/haskell/tuple/default.nix
+++ b/pkgs/development/libraries/haskell/tuple/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix
index 2cc98f00bb56..979fdc57a3be 100644
--- a/pkgs/development/libraries/haskell/type-equality/default.nix
+++ b/pkgs/development/libraries/haskell/type-equality/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
index 8dff0ffd58fc..80af1951f586 100644
--- a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
+++ b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "Simple, Haskell 2010-compatible type level natural numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
index a90381202e1a..1db17d844e75 100644
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
index ccccf9d95d38..ea4e66a95fae 100644
--- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix
+++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Unbounded thread delays and timeouts";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix
index 8519ff451b2e..a5fef1484ff6 100644
--- a/pkgs/development/libraries/haskell/uniplate/default.nix
+++ b/pkgs/development/libraries/haskell/uniplate/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix
index 399ac02e3ce2..d717bd27871a 100644
--- a/pkgs/development/libraries/haskell/uniqueid/default.nix
+++ b/pkgs/development/libraries/haskell/uniqueid/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix
index 582764204818..d65a440bb22f 100644
--- a/pkgs/development/libraries/haskell/unix-compat/default.nix
+++ b/pkgs/development/libraries/haskell/unix-compat/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
index ddb24e46f4de..9e1614117932 100644
--- a/pkgs/development/libraries/haskell/unix-time/default.nix
+++ b/pkgs/development/libraries/haskell/unix-time/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Unix time parser/formatter and utilities";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix
index 474bb1a8b092..2344e4606932 100644
--- a/pkgs/development/libraries/haskell/unlambda/default.nix
+++ b/pkgs/development/libraries/haskell/unlambda/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Unlambda interpreter";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix
index 288e559ce980..4c3fbbc2e52b 100644
--- a/pkgs/development/libraries/haskell/unordered-containers/default.nix
+++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix
index 5353895815d9..e4726ef011d6 100644
--- a/pkgs/development/libraries/haskell/url/default.nix
+++ b/pkgs/development/libraries/haskell/url/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix
index 05bd2ab09bbd..bb2ec05db0bc 100644
--- a/pkgs/development/libraries/haskell/urlencoded/default.nix
+++ b/pkgs/development/libraries/haskell/urlencoded/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Generate or process x-www-urlencoded data";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix
index 42591158cd7c..59ebfe3b5e6f 100644
--- a/pkgs/development/libraries/haskell/utf8-light/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-light/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Unicode";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix
index e627c77bda2b..0928ae0347b1 100644
--- a/pkgs/development/libraries/haskell/utf8-string/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-string/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix
index c921b4198ed2..49d1af13977e 100644
--- a/pkgs/development/libraries/haskell/utility-ht/default.nix
+++ b/pkgs/development/libraries/haskell/utility-ht/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
index f011aa725d35..31c504139bbe 100644
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix
index ed7e23f6c219..e119b2ab737e 100644
--- a/pkgs/development/libraries/haskell/uuid/default.nix
+++ b/pkgs/development/libraries/haskell/uuid/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix
index 2521c44bec6e..9b1660404ee2 100644
--- a/pkgs/development/libraries/haskell/uulib/default.nix
+++ b/pkgs/development/libraries/haskell/uulib/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
index 5ab1d4f85464..ccabd8cc7fa2 100644
--- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
index 8506e5805022..8be1ffee5287 100644
--- a/pkgs/development/libraries/haskell/vacuum/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Graph representation of the GHC heap";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix
index 6039e7424772..6aed9be5799c 100644
--- a/pkgs/development/libraries/haskell/vault/default.nix
+++ b/pkgs/development/libraries/haskell/vault/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "a persistent store for values of arbitrary types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vcs-revision/default.nix b/pkgs/development/libraries/haskell/vcs-revision/default.nix
index a1cd2783931f..1b34c7b55782 100644
--- a/pkgs/development/libraries/haskell/vcs-revision/default.nix
+++ b/pkgs/development/libraries/haskell/vcs-revision/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "Facilities for accessing the version control revision of the current directory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vect/default.nix b/pkgs/development/libraries/haskell/vect/default.nix
index 2d81a0131766..636ea7d0259b 100644
--- a/pkgs/development/libraries/haskell/vect/default.nix
+++ b/pkgs/development/libraries/haskell/vect/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "A low-dimensional linear algebra library, tailored to computer graphics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
index dc8c9dd35bae..d933d7e009f5 100644
--- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix
index 1debf3f0f713..264391de95f5 100644
--- a/pkgs/development/libraries/haskell/vector-space-points/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "A type for points, as distinct from vectors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix
index c6d440a5d471..7d59f7874aa0 100644
--- a/pkgs/development/libraries/haskell/vector-space/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix
index 7acc89d6a91c..66173051e8ab 100644
--- a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix
+++ b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Efficient Arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector/0.10.nix b/pkgs/development/libraries/haskell/vector/0.10.nix
index 8fac71eed4b3..9d9fd8c71caf 100644
--- a/pkgs/development/libraries/haskell/vector/0.10.nix
+++ b/pkgs/development/libraries/haskell/vector/0.10.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Efficient Arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector/0.9.1.nix b/pkgs/development/libraries/haskell/vector/0.9.1.nix
index 63add64226d6..c5c06fe93e5c 100644
--- a/pkgs/development/libraries/haskell/vector/0.9.1.nix
+++ b/pkgs/development/libraries/haskell/vector/0.9.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Efficient Arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix
index 591040a95480..59220ee3c1ce 100644
--- a/pkgs/development/libraries/haskell/void/default.nix
+++ b/pkgs/development/libraries/haskell/void/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A Haskell 98 logically uninhabited data type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix
index 3b38db8c1de4..aac778973be2 100644
--- a/pkgs/development/libraries/haskell/vty-ui/default.nix
+++ b/pkgs/development/libraries/haskell/vty-ui/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "An interactive terminal user interface library for Vty";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix
index 3121399b3a90..e2b223df58b5 100644
--- a/pkgs/development/libraries/haskell/vty/default.nix
+++ b/pkgs/development/libraries/haskell/vty/default.nix
@@ -21,6 +21,9 @@ cabal.mkDerivation (self: {
     description = "A simple terminal UI library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 7feed2df4bc4..10e9073dcf34 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "WAI application for static serving";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index b14da93a54d0..d8c48f0e56af 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -25,6 +25,9 @@ cabal.mkDerivation (self: {
     description = "Provides some basic WAI handlers and middleware";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix
index 16f02f877462..a6c534937bab 100644
--- a/pkgs/development/libraries/haskell/wai-logger/default.nix
+++ b/pkgs/development/libraries/haskell/wai-logger/default.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
index 423f738fbfbf..388c238944c9 100644
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Unit test framework (built on HUnit) for WAI applications";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index deb1090dd4ab..7594474c0719 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Web Application Interface";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 7b48ae92b1f3..2fe4dd8d5649 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
     description = "A fast, light-weight web server for WAI applications";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
index 77670b4f117e..93f151dcabfb 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "A free monad based on the Wadler/Leijen pretty printer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
index d2bd35eebd41..57baeee387c5 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "A color pretty printer with terminfo support";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
index 083f269255a0..d13768d5e220 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wl-pprint/default.nix b/pkgs/development/libraries/haskell/wl-pprint/default.nix
index 9849d4fab0e5..5cfea69b266d 100644
--- a/pkgs/development/libraries/haskell/wl-pprint/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "The Wadler/Leijen Pretty Printer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix
index e8abded24381..0b63bed127fa 100644
--- a/pkgs/development/libraries/haskell/word8/default.nix
+++ b/pkgs/development/libraries/haskell/word8/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Word8 library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
index dc030f68059a..44bb4f411a27 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "wxHaskell";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index 98032d91c8e4..a8186f517eab 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "wxHaskell core";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
index a1caaef1bc9e..7ad6a04c01ce 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xdg-basedir/default.nix b/pkgs/development/libraries/haskell/xdg-basedir/default.nix
index 3a12faf07c9e..a62b52242f79 100644
--- a/pkgs/development/libraries/haskell/xdg-basedir/default.nix
+++ b/pkgs/development/libraries/haskell/xdg-basedir/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "A basic implementation of the XDG Base Directory specification";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix
index d1702862f422..57548517bfec 100644
--- a/pkgs/development/libraries/haskell/xdot/default.nix
+++ b/pkgs/development/libraries/haskell/xdot/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 605339d0811f..3c369103486a 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 3a72cb8fba0b..33527b9affd4 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 05e13b4a7b33..c5a374eb2d0c 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix
index 66196c806acc..2078c317123f 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index b586a6336bca..a1192955540b 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -21,6 +21,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
index 9c85223d654b..bc6b7b2537ff 100644
--- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Hamlet-style quasiquoter for XML content";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix
index 48bd32b7c897..d123a4db7329 100644
--- a/pkgs/development/libraries/haskell/xml-types/default.nix
+++ b/pkgs/development/libraries/haskell/xml-types/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix
index dc2e7dc70bd4..8a8e6e3e2ad0 100644
--- a/pkgs/development/libraries/haskell/xml/default.nix
+++ b/pkgs/development/libraries/haskell/xml/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix
index 66c1f645267a..d550e4725908 100644
--- a/pkgs/development/libraries/haskell/xmlhtml/default.nix
+++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "XML parser and renderer with HTML 5 quirks mode";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index 89bdab65b17d..b21caa38afb3 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 2c2f39451e6b..8a3beafb8e47 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "Support for parsing and rendering YAML documents";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix
index ab162988c958..62dc82b10685 100644
--- a/pkgs/development/libraries/haskell/yap/default.nix
+++ b/pkgs/development/libraries/haskell/yap/default.nix
@@ -8,6 +8,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 8456aa39a8eb..6f9fe09de4f1 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "Authentication for Yesod";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index a25916316de8..a1c7cf79f3ad 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -28,6 +28,9 @@ cabal.mkDerivation (self: {
     description = "Creation of type-safe, RESTful web applications";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix
index b0e720ff4879..8fac7f9e2b87 100644
--- a/pkgs/development/libraries/haskell/yesod-default/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-default/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Default config and main functions for your yesod application";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index adf11916b90d..6719fa20a934 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     description = "Form handling support for Yesod Web Framework";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
index b395645557b5..3506ca89f15a 100644
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Generate content for Yesod using the aeson package";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
index e69bc2a51275..bb4b686c4566 100644
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Some helpers for using Persistent from Yesod";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix
index 0ebfeb92bf10..ee68874cbfcd 100644
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Efficient routing for Yesod";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index a7e90de2990a..59c2167dc5e1 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "Static file serving subsite for Yesod Web Framework";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index 8b32b48af873..27f700932eb5 100644
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -20,5 +20,6 @@ cabal.mkDerivation (self: {
     description = "integration testing for WAI/Yesod Applications";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 9998790ea739..1a956f84ca9b 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -32,6 +32,9 @@ cabal.mkDerivation (self: {
     description = "Creation of type-safe, RESTful web applications";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix
index d194b1970c8d..157eaeaaa2c4 100644
--- a/pkgs/development/libraries/haskell/yst/default.nix
+++ b/pkgs/development/libraries/haskell/yst/default.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
index 20d414ac6b14..030cbe13b0a0 100644
--- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
index 82dae54839ff..9d92f264930e 100644
--- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Bindings to ZeroMQ 3.x";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix
index 38290c8cd544..53ebf3709d82 100644
--- a/pkgs/development/libraries/haskell/zip-archive/default.nix
+++ b/pkgs/development/libraries/haskell/zip-archive/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Library for creating and modifying zip archives";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix
index 5ff1da422efa..0995ec4d0c42 100644
--- a/pkgs/development/libraries/haskell/zipper/default.nix
+++ b/pkgs/development/libraries/haskell/zipper/default.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
index f69be8ae99e2..97d829119082 100644
--- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
index b283c496a299..bb67c04489cb 100644
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix
index f799194c0f69..e6c118ff3e1f 100644
--- a/pkgs/development/libraries/haskell/zlib-enum/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 28f109e8c364..60f81e7f9846 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 6a917af1fe7a..5ec59a9690f3 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 f13b9f7b1d48..f4355c0a9549 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 bba9e1a13fe4..2835605529e0 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix
index abeed295e035..4d1166db2501 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix
index c1fa7d78d0a9..3f6c85f1cd6e 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix
index cfda3b66704a..f65df4b5ad05 100644
--- a/pkgs/development/tools/documentation/haddock/2.10.0.nix
+++ b/pkgs/development/tools/documentation/haddock/2.10.0.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix
index 968efe2260b0..a294680607d2 100644
--- a/pkgs/development/tools/documentation/haddock/2.11.0.nix
+++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix
index 12907a64d214..a618b546f00c 100644
--- a/pkgs/development/tools/documentation/haddock/2.12.0.nix
+++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.13.1.nix b/pkgs/development/tools/documentation/haddock/2.13.1.nix
index e53ab715992e..a932e6ce1e21 100644
--- a/pkgs/development/tools/documentation/haddock/2.13.1.nix
+++ b/pkgs/development/tools/documentation/haddock/2.13.1.nix
@@ -15,6 +15,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix
index 811ffd2855da..88c6e045e531 100644
--- a/pkgs/development/tools/documentation/haddock/2.4.2.nix
+++ b/pkgs/development/tools/documentation/haddock/2.4.2.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix
index 8a57dd851c2d..c9e7b810866a 100644
--- a/pkgs/development/tools/documentation/haddock/2.9.4.nix
+++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix
@@ -16,6 +16,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix
index d39544342b3a..94758e3eff4a 100644
--- a/pkgs/development/tools/haskell/BNFC-meta/default.nix
+++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Deriving Parsers and Quasi-Quoters from BNF Grammars";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
index 88f5d0baee67..cd36d5f58e9c 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "the Haskell Refactorer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix
index 17d191064816..78cb968ff050 100644
--- a/pkgs/development/tools/haskell/SourceGraph/default.nix
+++ b/pkgs/development/tools/haskell/SourceGraph/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Static code analysis using graph-theoretic techniques";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix
index 5bb298e739ad..4487715cdc51 100644
--- a/pkgs/development/tools/haskell/alex-meta/default.nix
+++ b/pkgs/development/tools/haskell/alex-meta/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix
index 4676850fd938..c48a6d6a61db 100644
--- a/pkgs/development/tools/haskell/cabal-ghci/default.nix
+++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/cabal2ghci/default.nix b/pkgs/development/tools/haskell/cabal2ghci/default.nix
index 881328d875b6..3ec96e3fb2ae 100644
--- a/pkgs/development/tools/haskell/cabal2ghci/default.nix
+++ b/pkgs/development/tools/haskell/cabal2ghci/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "A tool to generate .ghci file from .cabal";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix
index a3d885c60084..f00708bb55f1 100644
--- a/pkgs/development/tools/haskell/happy-meta/default.nix
+++ b/pkgs/development/tools/haskell/happy-meta/default.nix
@@ -9,6 +9,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/haskdogs/default.nix b/pkgs/development/tools/haskell/haskdogs/default.nix
index d67fb302d31b..2e158abaf898 100644
--- a/pkgs/development/tools/haskell/haskdogs/default.nix
+++ b/pkgs/development/tools/haskell/haskdogs/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix
index f1e1f639e80d..d3c373ae4df7 100644
--- a/pkgs/development/tools/haskell/hasktags/default.nix
+++ b/pkgs/development/tools/haskell/hasktags/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index c914e9c82253..83dc4d72929e 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Source code suggestions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix
index 4443637def47..efbf48322b34 100644
--- a/pkgs/development/tools/haskell/hslogger/default.nix
+++ b/pkgs/development/tools/haskell/hslogger/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Versatile logging framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/packunused/default.nix b/pkgs/development/tools/haskell/packunused/default.nix
index 814c2774cb27..41b77e22b46c 100644
--- a/pkgs/development/tools/haskell/packunused/default.nix
+++ b/pkgs/development/tools/haskell/packunused/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Tool for detecting redundant Cabal package dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix
index 4bd47b8decd4..8bcd07dc2afb 100644
--- a/pkgs/development/tools/haskell/splot/default.nix
+++ b/pkgs/development/tools/haskell/splot/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix
index 4928c40e1291..f2b3d9d17cf4 100644
--- a/pkgs/development/tools/haskell/threadscope/default.nix
+++ b/pkgs/development/tools/haskell/threadscope/default.nix
@@ -17,6 +17,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix
index d95c8cea03f3..9025d5d97aa0 100644
--- a/pkgs/development/tools/haskell/timeplot/default.nix
+++ b/pkgs/development/tools/haskell/timeplot/default.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "A tool for visualizing time series from log files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix
index d24d22f350ad..749fbb6978d9 100644
--- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix
+++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix
index ea981ad423b0..6de37716579b 100644
--- a/pkgs/development/tools/haskell/uuagc/cabal.nix
+++ b/pkgs/development/tools/haskell/uuagc/cabal.nix
@@ -10,6 +10,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index 4e3214ee1df0..dfb20e0ac76c 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 2e419f67eb05..3406c708851e 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix
index 7dc17cd4153a..92db61e08a20 100644
--- a/pkgs/development/tools/parsing/alex/2.3.1.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.1.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix
index 5d10dbd69951..2ec395d463f2 100644
--- a/pkgs/development/tools/parsing/alex/2.3.2.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.2.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix
index bbe413d478ff..920c5fd9cc28 100644
--- a/pkgs/development/tools/parsing/alex/2.3.3.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.3.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix
index 3fb843e69557..3635b2487877 100644
--- a/pkgs/development/tools/parsing/alex/2.3.5.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.5.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix
index cdcaead86356..a32de50e61eb 100644
--- a/pkgs/development/tools/parsing/alex/3.0.1.nix
+++ b/pkgs/development/tools/parsing/alex/3.0.1.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/3.0.2.nix b/pkgs/development/tools/parsing/alex/3.0.2.nix
index 9011db12c7dd..85087bfc9a47 100644
--- a/pkgs/development/tools/parsing/alex/3.0.2.nix
+++ b/pkgs/development/tools/parsing/alex/3.0.2.nix
@@ -14,6 +14,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.10.nix b/pkgs/development/tools/parsing/happy/1.18.10.nix
index d342d3381c82..52c4775267c2 100644
--- a/pkgs/development/tools/parsing/happy/1.18.10.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.10.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix
index 401c4d1475ce..cc5c60a3d43b 100644
--- a/pkgs/development/tools/parsing/happy/1.18.4.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.4.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix
index d64d8983e9cb..41532651c995 100644
--- a/pkgs/development/tools/parsing/happy/1.18.5.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.5.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix
index fdc483fe5714..60b8d253659e 100644
--- a/pkgs/development/tools/parsing/happy/1.18.6.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.6.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix
index decc992809a2..b1ba0b165dd7 100644
--- a/pkgs/development/tools/parsing/happy/1.18.8.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.8.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix
index b1f752ae35f5..cb47eaa8bdb2 100644
--- a/pkgs/development/tools/parsing/happy/1.18.9.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.9.nix
@@ -13,6 +13,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index 48c4809e5cd9..5e6596d19ddf 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "A roguelike game engine in early and active development";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/games/MazesOfMonad/default.nix b/pkgs/games/MazesOfMonad/default.nix
index 0e2abf6d7c77..92c7a17d7d96 100644
--- a/pkgs/games/MazesOfMonad/default.nix
+++ b/pkgs/games/MazesOfMonad/default.nix
@@ -11,6 +11,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 e97c9be97029..16853cab7fca 100644
--- a/pkgs/tools/package-management/cabal-install/0.10.2.nix
+++ b/pkgs/tools/package-management/cabal-install/0.10.2.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 f98aa8c306d4..140c36284055 100644
--- a/pkgs/tools/package-management/cabal-install/0.6.2.nix
+++ b/pkgs/tools/package-management/cabal-install/0.6.2.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 c0ea0752d13e..ed84d069d103 100644
--- a/pkgs/tools/package-management/cabal-install/0.8.0.nix
+++ b/pkgs/tools/package-management/cabal-install/0.8.0.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 4b00985297fa..a53460b6319c 100644
--- a/pkgs/tools/package-management/cabal-install/0.8.2.nix
+++ b/pkgs/tools/package-management/cabal-install/0.8.2.nix
@@ -12,6 +12,9 @@ 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 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

From 573e61ea6ffee9f5088a950f81430ce496a72044 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Mar 2013 15:50:35 +0100
Subject: [PATCH 129/394] pkgs/top-level/release-haskell.nix: configure Hydra
 to verify that important Haskell packages build

At the moment, this file is used only by my own Hydra instance.
---
 pkgs/top-level/release-haskell.nix | 487 +++++++++++++++++++++++++++++
 1 file changed, 487 insertions(+)
 create mode 100644 pkgs/top-level/release-haskell.nix

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
new file mode 100644
index 000000000000..ca158ec39184
--- /dev/null
+++ b/pkgs/top-level/release-haskell.nix
@@ -0,0 +1,487 @@
+/* Essential Haskell packages that must build. */
+
+with (import ./release-lib.nix);
+
+let
+
+  linux = ["x86_64-linux"];
+
+in
+
+mapTestOn (rec {
+
+  gitAndTools.gitAnnex = linux;
+
+  haskellPackages_ghc742 = {
+    abstractPar = linux;
+    ACVector = linux;
+    aeson = linux;
+    AgdaExecutable = linux;
+    alex = linux;
+    alexMeta = linux;
+    alternativeIo = linux;
+    ansiTerminal = linux;
+    ansiWlPprint = linux;
+    asn1Data = linux;
+    AspectAG = linux;
+    async = linux;
+    attempt = linux;
+    attoparsecEnumerator = linux;
+    attoparsec = linux;
+    authenticate = linux;
+    base64Bytestring = linux;
+    baseUnicodeSymbols = linux;
+    benchpress = linux;
+    bimap = linux;
+    binaryShared = linux;
+    bitmap = linux;
+    bktrees = linux;
+    blazeBuilderEnumerator = linux;
+    blazeBuilder = linux;
+    blazeHtml = linux;
+    blazeTextual = linux;
+    bloomfilter = linux;
+    bmp = linux;
+    BNFC = linux;
+    BNFCMeta = linux;
+    Boolean = linux;
+    bytestringMmap = linux;
+    bytestringNums = linux;
+    bytestringTrie = linux;
+    cabal2Ghci = linux;
+    cabal2nix = linux;
+    cabalDev = linux;
+    cabalGhci = linux;
+    cabalInstall = linux;
+    cairo = linux;
+    caseInsensitive = linux;
+    cautiousFile = linux;
+    cereal = linux;
+    certificate = linux;
+    cgi = linux;
+    Chart = linux;
+    citeprocHs = linux;
+    clientsession = linux;
+    cmdargs = linux;
+    cmdlib = linux;
+    colorizeHaskell = linux;
+    colour = linux;
+    comonadsFd = linux;
+    conduit = linux;
+    ConfigFile = linux;
+    continuedFractions = linux;
+    converge = linux;
+    convertible = linux;
+    cookie = linux;
+    cpphs = linux;
+    cprngAes = linux;
+    criterion = linux;
+    cryptoApi = linux;
+    cryptocipher = linux;
+    cryptohash = linux;
+    Crypto = linux;
+    cssText = linux;
+    csv = linux;
+    darcs = linux;
+    dataAccessor = linux;
+    dataAccessorTemplate = linux;
+    dataDefault = linux;
+    dataenc = linux;
+    dataReify = linux;
+    datetime = linux;
+    DAV = linux;
+    dbus = linux;
+    derive = linux;
+    diagrams = linux;
+    Diff = linux;
+    digestiveFunctorsHeist = linux;
+    digestiveFunctorsSnap = linux;
+    digest = linux;
+    dimensional = linux;
+    dimensionalTf = linux;
+    directoryTree = linux;
+    distributedProcess = linux;
+    dlist = linux;
+    dns = linux;
+    doctest = linux;
+    dotgen = linux;
+    doubleConversion = linux;
+    Ebnf2ps = linux;
+    editDistance = linux;
+    editline = linux;
+    emailValidate = linux;
+    entropy = linux;
+    enumerator = linux;
+    epic = linux;
+    erf = linux;
+    failure = linux;
+    fclabels = linux;
+    feed = linux;
+    fgl = linux;
+    fileEmbed = linux;
+    filestore = linux;
+    fingertree = linux;
+    flexibleDefaults = linux;
+    funcmp = linux;
+    gamma = linux;
+    gdiff = linux;
+    ghcEvents = linux;
+    ghc = linux;
+    ghcMtl = linux;
+    ghcPaths = linux;
+    ghcSybUtils = linux;
+    githubBackup = linux;
+    github = linux;
+    gitit = linux;
+    glade = linux;
+    glib = linux;
+    Glob = linux;
+    gloss = linux;
+    GLUT = linux;
+    gnutls = linux;
+    graphviz = linux;
+    gtk = linux;
+    gtksourceview2 = linux;
+    hackageDb = linux;
+    haddock = linux;
+    hakyll = linux;
+    hamlet = linux;
+    happstackHamlet = linux;
+    happstackServer = linux;
+    happstackUtil = linux;
+    happy = linux;
+    hashable = linux;
+    hashedStorage = linux;
+    haskeline = linux;
+    haskellLexer = linux;
+    haskellPlatform = linux;
+    haskellSrcExts = linux;
+    haskellSrc = linux;
+    haskellSrcMeta = linux;
+    HaXml = linux;
+    haxr = linux;
+    HDBC = linux;
+    HDBCPostgresql = linux;
+    HDBCSqlite3 = linux;
+    HFuse = linux;
+    highlightingKate = linux;
+    hinotify = linux;
+    hint = linux;
+    Hipmunk = linux;
+    hledgerInterest = linux;
+    hledgerLib = linux;
+    hledger = linux;
+    hledgerWeb = linux;
+    hlint = linux;
+    HList = linux;
+    hmatrix = linux;
+    hoogle = linux;
+    hopenssl = linux;
+    hostname = linux;
+    hp2anyCore = linux;
+    hp2anyGraph = linux;
+    hS3 = linux;
+    hscolour = linux;
+    hsdns = linux;
+    hsemail = linux;
+    hslogger = linux;
+    hsloggerTemplate = linux;
+    hspec = linux;
+    hspread = linux;
+    HsSyck = linux;
+    HStringTemplate = linux;
+    hsyslog = linux;
+    html = linux;
+    httpConduit = linux;
+    httpDate = linux;
+    httpdShed = linux;
+    HTTP = linux;
+    httpTypes = linux;
+    HUnit = linux;
+    hxt = linux;
+    IfElse = linux;
+    irc = linux;
+    iteratee = linux;
+    jailbreakCabal = linux;
+    json = linux;
+    jsonTypes = linux;
+    lambdabot = linux;
+    languageCQuote = linux;
+    languageJavascript = linux;
+    largeword = linux;
+    lens = linux;
+    libxmlSax = linux;
+    liftedBase = linux;
+    ListLike = linux;
+    logfloat = linux;
+    ltk = linux;
+    mainlandPretty = linux;
+    maude = linux;
+    MaybeT = linux;
+    MemoTrie = linux;
+    mersenneRandomPure64 = linux;
+    mimeMail = linux;
+    MissingH = linux;
+    mmap = linux;
+    MonadCatchIOMtl = linux;
+    MonadCatchIOTransformers = linux;
+    monadControl = linux;
+    monadLoops = linux;
+    monadPar = linux;
+    monadPeel = linux;
+    MonadPrompt = linux;
+    MonadRandom = linux;
+    mpppc = linux;
+    mtl = linux;
+    mtlparse = linux;
+    multiplate = linux;
+    multirec = linux;
+    multiset = linux;
+    murmurHash = linux;
+    mwcRandom = linux;
+    nat = linux;
+    nats = linux;
+    naturals = linux;
+    networkInfo = linux;
+    network = linux;
+    networkMulticast = linux;
+    networkProtocolXmpp = linux;
+    nonNegative = linux;
+    numericPrelude = linux;
+    numtype = linux;
+    numtypeTf = linux;
+    ObjectName = linux;
+    OneTuple = linux;
+    OpenAL = linux;
+    OpenGL = linux;
+    packunused = linux;
+    pandoc = linux;
+    pandocTypes = linux;
+    pango = linux;
+    parallel = linux;
+    parseargs = linux;
+    parsec3 = linux;
+    parsec = linux;
+    parsimony = linux;
+    pathPieces = linux;
+    pathtype = linux;
+    pcreLight = linux;
+    permutation = linux;
+    persistent = linux;
+    persistentPostgresql = linux;
+    persistentSqlite = linux;
+    persistentTemplate = linux;
+    polyparse = linux;
+    ppm = linux;
+    prettyShow = linux;
+    primitive = linux;
+    PSQueue = linux;
+    pureMD5 = linux;
+    pwstoreFast = linux;
+    QuickCheck2 = linux;
+    QuickCheck = linux;
+    randomFu = linux;
+    random = linux;
+    randomShuffle = linux;
+    randomSource = linux;
+    RangedSets = linux;
+    ranges = linux;
+    readline = linux;
+    recaptcha = linux;
+    regexBase = linux;
+    regexCompat = linux;
+    regexPCRE = linux;
+    regexPosix = linux;
+    regexpr = linux;
+    regexTDFA = linux;
+    regular = linux;
+    RSA = linux;
+    rvar = linux;
+    safe = linux;
+    SafeSemaphore = linux;
+    SDLImage = linux;
+    SDL = linux;
+    SDLMixer = linux;
+    SDLTtf = linux;
+    semigroups = linux;
+    sendfile = linux;
+    shake = linux;
+    SHA = linux;
+    Shellac = linux;
+    shelly = linux;
+    simpleSendfile = linux;
+    smallcheck = linux;
+    SMTPClient = linux;
+    snapCore = linux;
+    snap = linux;
+    snapLoaderStatic = linux;
+    snapServer = linux;
+    split = linux;
+    splot = linux;
+    srcloc = linux;
+    stateref = linux;
+    StateVar = linux;
+    statistics = linux;
+    stbImage = linux;
+    stm = linux;
+    storableComplex = linux;
+    storableRecord = linux;
+    streamproc = linux;
+    strictConcurrency = linux;
+    strict = linux;
+    strptime = linux;
+    svgcairo = linux;
+    syb = linux;
+    sybWithClassInstancesText = linux;
+    sybWithClass = linux;
+    tabular = linux;
+    tagged = linux;
+    tagsoup = linux;
+    tar = linux;
+    Tensor = linux;
+    terminfo = linux;
+    testFramework = linux;
+    testpack = linux;
+    texmath = linux;
+    text = linux;
+    thLift = linux;
+    timeplot = linux;
+    tlsExtra = linux;
+    tls = linux;
+    transformersBase = linux;
+    transformersCompat = linux;
+    transformers = linux;
+    tuple = linux;
+    typeLlevelNaturalNumber = linux;
+    uniplate = linux;
+    uniqueid = linux;
+    unixCompat = linux;
+    unorderedContainers = linux;
+    url = linux;
+    utf8Light = linux;
+    utf8String = linux;
+    utilityHt = linux;
+    uuagc = linux;
+    uuid = linux;
+    uulib = linux;
+    vacuumCairo = linux;
+    vacuum = linux;
+    vcsRevision = linux;
+    Vec = linux;
+    vectorAlgorithms = linux;
+    vector = linux;
+    vectorSpace = linux;
+    vty = linux;
+    waiAppStatic = linux;
+    waiExtra = linux;
+    wai = linux;
+    waiLogger = linux;
+    warp = linux;
+    wlPprintExtras = linux;
+    wlPprint = linux;
+    wlPprintTerminfo = linux;
+    wxcore = linux;
+    wxdirect = linux;
+    wx = linux;
+    X11 = linux;
+    xhtml = linux;
+    xmlConduit = linux;
+    xmlHamlet = linux;
+    xml = linux;
+    xmlTypes = linux;
+    xmobar = linux;
+    xmonadContrib = linux;
+    xmonadExtras = linux;
+    xmonad = linux;
+    xssSanitize = linux;
+    yesodAuth = linux;
+    yesodCore = linux;
+    yesodDefault = linux;
+    yesodForm = linux;
+    yesodJson = linux;
+    yesod = linux;
+    yesodPersistent = linux;
+    yesodStatic = linux;
+    zeromq3Haskell = linux;
+    zeromqHaskell = linux;
+    zipArchive = linux;
+    zipper = linux;
+    zlibBindings = linux;
+    zlibEnum = linux;
+    zlib = linux;
+  };
+
+  haskellPackages_ghc762 = {
+    alex = linux;
+    async = linux;
+    BNFC = linux;
+    cabal2nix = linux;
+    cabalDev = linux;
+    cabalGhci = linux;
+    cabalInstall = linux;
+    cgi = linux;
+    cmdlib = linux;
+    criterion = linux;
+    dimensional = linux;
+    dimensionalTf = linux;
+    doctest = linux;
+    fgl = linux;
+    funcmp = linux;
+    ghcMod = linux;
+    GLUT = linux;
+    graphviz = linux;
+    hackageDb = linux;
+    haddock = linux;
+    happy = linux;
+    haskellSrc = linux;
+    hledgerInterest = linux;
+    hledgerLib = linux;
+    hledger = linux;
+    hlint = linux;
+    HList = linux;
+    hoogle = linux;
+    hopenssl = linux;
+    hsdns = linux;
+    hsemail = linux;
+    hspec = linux;
+    HStringTemplate = linux;
+    hsyslog = linux;
+    html = linux;
+    HTTP = linux;
+    HUnit = linux;
+    monadPar = linux;
+    mtl = linux;
+    network = linux;
+    OpenGL = linux;
+    pandoc = linux;
+    parallel = linux;
+    parsec = linux;
+    permutation = linux;
+    primitive = linux;
+    QuickCheck = linux;
+    random = linux;
+    regexBase = linux;
+    regexCompat = linux;
+    regexPosix = linux;
+    smallcheck = linux;
+    split = linux;
+    stm = linux;
+    streamproc = linux;
+    syb = linux;
+    tar = linux;
+    testFrameworkHunit = linux;
+    testFramework = linux;
+    text = linux;
+    transformers = linux;
+    uulib = linux;
+    vector = linux;
+    wlPprint = linux;
+    xhtml = linux;
+    xmobar = linux;
+    xmonadContrib = linux;
+    xmonadExtras = linux;
+    xmonad = linux;
+    zlib = linux;
+  };
+
+})

From 83d0a3a37c68b380bfd23d2fd6fde090571d9423 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Mar 2013 13:05:43 +0100
Subject: [PATCH 130/394] ghc: add meta.license attribute to all compiler
 versions

---
 pkgs/development/compilers/ghc/6.10.1-binary.nix | 1 +
 pkgs/development/compilers/ghc/6.10.1.nix        | 2 +-
 pkgs/development/compilers/ghc/6.10.2-binary.nix | 1 +
 pkgs/development/compilers/ghc/6.10.2.nix        | 2 +-
 pkgs/development/compilers/ghc/6.10.3.nix        | 2 +-
 pkgs/development/compilers/ghc/6.10.4.nix        | 2 +-
 pkgs/development/compilers/ghc/6.11.nix          | 2 +-
 pkgs/development/compilers/ghc/6.12.1-binary.nix | 1 +
 pkgs/development/compilers/ghc/6.12.1.nix        | 2 +-
 pkgs/development/compilers/ghc/6.12.2.nix        | 2 +-
 pkgs/development/compilers/ghc/6.12.3.nix        | 2 +-
 pkgs/development/compilers/ghc/6.4.2-binary.nix  | 1 +
 pkgs/development/compilers/ghc/6.4.2.nix         | 2 +-
 pkgs/development/compilers/ghc/6.6.1.nix         | 2 +-
 pkgs/development/compilers/ghc/6.8.2.nix         | 2 +-
 pkgs/development/compilers/ghc/6.8.3.nix         | 2 +-
 pkgs/development/compilers/ghc/7.0.1.nix         | 2 +-
 pkgs/development/compilers/ghc/7.0.2.nix         | 2 +-
 pkgs/development/compilers/ghc/7.0.3.nix         | 2 +-
 pkgs/development/compilers/ghc/7.0.4-binary.nix  | 1 +
 pkgs/development/compilers/ghc/7.2.1.nix         | 2 +-
 pkgs/development/compilers/ghc/7.2.2.nix         | 2 +-
 pkgs/development/compilers/ghc/7.4.2-binary.nix  | 1 +
 pkgs/development/compilers/ghc/7.4.2.nix         | 2 +-
 pkgs/development/compilers/ghc/7.6.1.nix         | 2 +-
 pkgs/development/compilers/ghc/7.6.2.nix         | 2 +-
 pkgs/development/compilers/ghc/head.nix          | 2 +-
 27 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix
index 353a4176ea46..dd79ef9c8e75 100644
--- a/pkgs/development/compilers/ghc/6.10.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix
@@ -98,5 +98,6 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
+  meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
 }
diff --git a/pkgs/development/compilers/ghc/6.10.1.nix b/pkgs/development/compilers/ghc/6.10.1.nix
index b53ce9aced37..ccb9f434230a 100644
--- a/pkgs/development/compilers/ghc/6.10.1.nix
+++ b/pkgs/development/compilers/ghc/6.10.1.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     inherit homepage;
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 02f1db354a1e..7effff83c69a 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -97,5 +97,6 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
+  meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "i686-linux"];
 }
diff --git a/pkgs/development/compilers/ghc/6.10.2.nix b/pkgs/development/compilers/ghc/6.10.2.nix
index 2df43a4c7d75..4988734f5809 100644
--- a/pkgs/development/compilers/ghc/6.10.2.nix
+++ b/pkgs/development/compilers/ghc/6.10.2.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     inherit homepage;
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   passthru = {
diff --git a/pkgs/development/compilers/ghc/6.10.3.nix b/pkgs/development/compilers/ghc/6.10.3.nix
index 2ecf35eedfe9..f6683278e454 100644
--- a/pkgs/development/compilers/ghc/6.10.3.nix
+++ b/pkgs/development/compilers/ghc/6.10.3.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     inherit homepage;
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 
diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix
index 53fd1c522168..92afc0f4b88b 100644
--- a/pkgs/development/compilers/ghc/6.10.4.nix
+++ b/pkgs/development/compilers/ghc/6.10.4.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     inherit homepage;
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   passthru = {
diff --git a/pkgs/development/compilers/ghc/6.11.nix b/pkgs/development/compilers/ghc/6.11.nix
index 778b819aa703..914403cdd660 100644
--- a/pkgs/development/compilers/ghc/6.11.nix
+++ b/pkgs/development/compilers/ghc/6.11.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
   meta = {
     inherit homepage;
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 }
diff --git a/pkgs/development/compilers/ghc/6.12.1-binary.nix b/pkgs/development/compilers/ghc/6.12.1-binary.nix
index 23486b5f4fa5..6f3411da4af6 100644
--- a/pkgs/development/compilers/ghc/6.12.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.12.1-binary.nix
@@ -99,5 +99,6 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
+  meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "i686-linux"];
 }
diff --git a/pkgs/development/compilers/ghc/6.12.1.nix b/pkgs/development/compilers/ghc/6.12.1.nix
index 78a000de309e..31c763c4505c 100644
--- a/pkgs/development/compilers/ghc/6.12.1.nix
+++ b/pkgs/development/compilers/ghc/6.12.1.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   # TODO: requires a comment as to what it does and why it is needed.
diff --git a/pkgs/development/compilers/ghc/6.12.2.nix b/pkgs/development/compilers/ghc/6.12.2.nix
index 1a48d6cf3183..5db5fc49fc66 100644
--- a/pkgs/development/compilers/ghc/6.12.2.nix
+++ b/pkgs/development/compilers/ghc/6.12.2.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   # TODO: requires a comment as to what it does and why it is needed.
diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix
index bc2d8967cd4b..05ceba030b9f 100644
--- a/pkgs/development/compilers/ghc/6.12.3.nix
+++ b/pkgs/development/compilers/ghc/6.12.3.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   # TODO: requires a comment as to what it does and why it is needed.
diff --git a/pkgs/development/compilers/ghc/6.4.2-binary.nix b/pkgs/development/compilers/ghc/6.4.2-binary.nix
index 1a5bf059e9f5..8e4e6c58a3f9 100644
--- a/pkgs/development/compilers/ghc/6.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix
@@ -62,5 +62,6 @@ stdenv.mkDerivation {
 
   '' else "";
 
+  meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
 }
diff --git a/pkgs/development/compilers/ghc/6.4.2.nix b/pkgs/development/compilers/ghc/6.4.2.nix
index c526e5d6cb45..e336d4e83b1b 100644
--- a/pkgs/development/compilers/ghc/6.4.2.nix
+++ b/pkgs/development/compilers/ghc/6.4.2.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 }
diff --git a/pkgs/development/compilers/ghc/6.6.1.nix b/pkgs/development/compilers/ghc/6.6.1.nix
index 994ebc286c30..0f91b9d5052c 100644
--- a/pkgs/development/compilers/ghc/6.6.1.nix
+++ b/pkgs/development/compilers/ghc/6.6.1.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (rec {
 
   meta = {
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   postInstall = ''
diff --git a/pkgs/development/compilers/ghc/6.8.2.nix b/pkgs/development/compilers/ghc/6.8.2.nix
index 2681f325c929..8af158625906 100644
--- a/pkgs/development/compilers/ghc/6.8.2.nix
+++ b/pkgs/development/compilers/ghc/6.8.2.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (rec {
 
   meta = {
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   configureFlags=[
diff --git a/pkgs/development/compilers/ghc/6.8.3.nix b/pkgs/development/compilers/ghc/6.8.3.nix
index b6900321552c..281ff61b700c 100644
--- a/pkgs/development/compilers/ghc/6.8.3.nix
+++ b/pkgs/development/compilers/ghc/6.8.3.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   configureFlags=[
diff --git a/pkgs/development/compilers/ghc/7.0.1.nix b/pkgs/development/compilers/ghc/7.0.1.nix
index db696d2b218c..da7e81f5730c 100644
--- a/pkgs/development/compilers/ghc/7.0.1.nix
+++ b/pkgs/development/compilers/ghc/7.0.1.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   # TODO: requires a comment as to what it does and why it is needed.
diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix
index 426c8725d0ba..6706b99e2034 100644
--- a/pkgs/development/compilers/ghc/7.0.2.nix
+++ b/pkgs/development/compilers/ghc/7.0.2.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.0.3.nix b/pkgs/development/compilers/ghc/7.0.3.nix
index ad80dd9e79d9..0b422043ae28 100644
--- a/pkgs/development/compilers/ghc/7.0.3.nix
+++ b/pkgs/development/compilers/ghc/7.0.3.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix
index 0bfc81a17a4e..455d552b91ac 100644
--- a/pkgs/development/compilers/ghc/7.0.4-binary.nix
+++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix
@@ -87,5 +87,6 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
+  meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
 }
diff --git a/pkgs/development/compilers/ghc/7.2.1.nix b/pkgs/development/compilers/ghc/7.2.1.nix
index 3938d608d331..867df5aae6bf 100644
--- a/pkgs/development/compilers/ghc/7.2.1.nix
+++ b/pkgs/development/compilers/ghc/7.2.1.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.andres
       stdenv.lib.maintainers.simons
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix
index 0450537ad900..c6ec0cb75c4d 100644
--- a/pkgs/development/compilers/ghc/7.2.2.nix
+++ b/pkgs/development/compilers/ghc/7.2.2.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.andres
       stdenv.lib.maintainers.simons
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index e0a8fee4b660..59eb957a45f4 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -87,5 +87,6 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
+  meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
 }
diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
index ea44e49cca3d..51f3f7f9df4b 100644
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.andres
       stdenv.lib.maintainers.simons
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.6.1.nix b/pkgs/development/compilers/ghc/7.6.1.nix
index 335befb6c125..99c93c7a980a 100644
--- a/pkgs/development/compilers/ghc/7.6.1.nix
+++ b/pkgs/development/compilers/ghc/7.6.1.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.andres
       stdenv.lib.maintainers.simons
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.6.2.nix b/pkgs/development/compilers/ghc/7.6.2.nix
index fd678d090a27..ac2810c62b26 100644
--- a/pkgs/development/compilers/ghc/7.6.2.nix
+++ b/pkgs/development/compilers/ghc/7.6.2.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.andres
       stdenv.lib.maintainers.simons
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 157b25779b3d..8258ac274190 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.andres
       stdenv.lib.maintainers.simons
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }

From c0e0604c4dc0d415517e9a648b482cc0b6f7483e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Mar 2013 13:58:34 +0100
Subject: [PATCH 131/394] nvidia-x11: change meta.license from "unfree" to
 "proprietary"

I'm not entirely sure what the appropriate license attribute for this
package is. The license [1] says:

 | 2.1.2 Linux/FreeBSD Exception. Notwithstanding the foregoing terms of
 | Section 2.1.1, SOFTWARE designed exclusively for use on the Linux or
 | FreeBSD operating systems, or other operating systems derived from
 | the source code to these operating systems, may be copied and
 | redistributed, provided that the binary files thereof are not
 | modified in any way (except for unzipping of compressed files).

It sounds to me like this gives NixOS the right to re-distribute the
files (because we don't modify them). The 'proprietary' license sort-of
fits that. On the other hand, we seem to assume that proprietary
software cannot be redistributed, which doesn't apply here.

[1] http://www.nvidia.com/content/DriverDownload-March2009/licence.php?lang=us
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index c965ef01c72b..829e68698c67 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "X.org driver and kernel module for NVIDIA graphics cards";
-    license = "unfree";
+    license = stdenv.lib.licenses.proprietary;
   };
 }

From 6617f5ca9e92f307c468018a7d05c8c080c5441e Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 23 Mar 2013 18:19:32 +0100
Subject: [PATCH 132/394] chromium-25.0.1364.172, 26.0.1410.40, 27.0.1448.0

26.0.1410.28 was broken for me
---
 .../networking/browsers/chromium/sources.nix   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index a14b10fcfde7..eabdc35eb078 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "26.0.1410.28";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
-    sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
+    version = "27.0.1448.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1448.0.tar.bz2";
+    sha256 = "";
   };
   beta = {
-    version = "26.0.1410.28";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
-    sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
+    version = "26.0.1410.40";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.40-lite.tar.xz";
+    sha256 = "0f0kfdiqbkh9jwgqg034bkfkr0snbig4ifydqfka7gcxjqwxr32h";
   };
   stable = {
-    version = "25.0.1364.152";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.152.tar.bz2";
-    sha256 = "1v8zpqk3q21d5hars1clss75n187hlg4zxbr68jj1ysmqclzbni8";
+    version = "25.0.1364.172";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.172.tar.bz2";
+    sha256 = "124j6w3z385mg7r0nlbapalnrjrmrsj9qfz0dni6jz6pvdhzz8qw";
   };
 }

From 32fb6ed5e392f3a7ad23578cfea75a78ae0ee4c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Mar 2013 17:00:11 +0100
Subject: [PATCH 133/394] pkgs/build-support/cabal: disable doCheck by default
 on GHC 7.0.x platforms

Trying to run the unit tests with GHC 7.0.4 causes so many builds to
fail that it's probably not worth-while.
---
 pkgs/build-support/cabal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index c1b8d6d5fea6..d4c823f4a847 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -92,7 +92,7 @@
 
             # pass the '--enable-tests' flag to cabal in the configure stage
             # and run any regression test suites the package might have
-            doCheck = stdenv.lib.versionOlder "7" ghc.ghcVersion;
+            doCheck = stdenv.lib.versionOlder "7.4" ghc.ghcVersion;
 
             extraConfigureFlags = [
               (stdenv.lib.enableFeature enableLibraryProfiling "library-profiling")

From f684ed19ba9ee0d8c4e5913be6d9036098b9f099 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Mar 2013 17:10:42 +0100
Subject: [PATCH 134/394] haskell-editline: add old version 0.2.1.0

---
 .../libraries/haskell/editline/0.2.1.0.nix        | 15 +++++++++++++++
 .../haskell/editline/{default.nix => 0.2.1.1.nix} |  4 ----
 pkgs/top-level/haskell-packages.nix               |  4 +++-
 3 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/editline/0.2.1.0.nix
 rename pkgs/development/libraries/haskell/editline/{default.nix => 0.2.1.1.nix} (79%)

diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix
new file mode 100644
index 000000000000..7d92bcb027ae
--- /dev/null
+++ b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix
@@ -0,0 +1,15 @@
+{ cabal, libedit }:
+
+cabal.mkDerivation (self: {
+  pname = "editline";
+  version = "0.2.1.0";
+  sha256 = "1qa65iqr5k3ajq1glf5y84lld132i2i3l0zmsw8xqkq7hrgqwqc3";
+  extraLibraries = [ libedit ];
+  meta = {
+    homepage = "http://code.haskell.org/editline";
+    description = "Bindings to the editline library (libedit)";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/editline/default.nix b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix
similarity index 79%
rename from pkgs/development/libraries/haskell/editline/default.nix
rename to pkgs/development/libraries/haskell/editline/0.2.1.1.nix
index e5f7237a1bac..cf9f1e099a2a 100644
--- a/pkgs/development/libraries/haskell/editline/default.nix
+++ b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix
@@ -10,9 +10,5 @@ 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
-    ];
   };
 })
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5e87b46cab4b..4754e3b6ec8e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -781,7 +781,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   editDistance = callPackage ../development/libraries/haskell/edit-distance {};
 
-  editline = callPackage ../development/libraries/haskell/editline {};
+  editline_0_2_1_0 = callPackage ../development/libraries/haskell/editline/0.2.1.0.nix {};
+  editline_0_2_1_1 = callPackage ../development/libraries/haskell/editline/0.2.1.1.nix {};
+  editline = self.editline_0_2_1_1;
 
   elerea = callPackage ../development/libraries/haskell/elerea {};
 

From 439809b6c64874494e9da590da823becfe59d205 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Mar 2013 17:11:26 +0100
Subject: [PATCH 135/394] Fix build of haskell-platform 2009.2.0.2.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4754e3b6ec8e..1db252bc97a1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -407,10 +407,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
       (self.haskellPlatformArgs_2010_1_0_0 self);
 
   haskellPlatformArgs_2009_2_0_2 = self : {
-    inherit (self) cabal ghc editline;
+    inherit (self) cabal ghc;
     time         = self.time_1_1_2_4;
     haddock      = self.haddock_2_4_2;
     cgi          = self.cgi_3001_1_7_1;
+    editline     = self.editline_0_2_1_0;
     fgl          = self.fgl_5_4_2_2;
     GLUT         = self.GLUT_2_1_1_2;
     haskellSrc   = self.haskellSrc_1_0_1_3;

From 35c86a3d99cc2a4b25458527ffdc0be9c840832c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Mar 2013 17:29:44 +0100
Subject: [PATCH 136/394] release-haskell.nix: configure package set for ghc
 6.10.4, 6.12.3 and 7.0.4

---
 pkgs/top-level/release-haskell.nix | 122 +++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index ca158ec39184..bbc610d7c0c9 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -12,6 +12,8 @@ mapTestOn (rec {
 
   gitAndTools.gitAnnex = linux;
 
+  jhc = linux;
+
   haskellPackages_ghc742 = {
     abstractPar = linux;
     ACVector = linux;
@@ -449,6 +451,7 @@ mapTestOn (rec {
     html = linux;
     HTTP = linux;
     HUnit = linux;
+    jailbreakCabal = linux;
     monadPar = linux;
     mtl = linux;
     network = linux;
@@ -484,4 +487,123 @@ mapTestOn (rec {
     zlib = linux;
   };
 
+  haskellPackages_ghc704 = {
+    alex = linux;
+    cabal2nix = linux;
+    cabalInstall = linux;
+    cgi = linux;
+    fgl = linux;
+    funcmp = linux;
+    GLUT = linux;
+    haddock = linux;
+    happy = linux;
+    haskellPlatform = linux;
+    haskellSrc = linux;
+    hopenssl = linux;
+    hsdns = linux;
+    hsemail = linux;
+    hsyslog = linux;
+    html = linux;
+    HTTP = linux;
+    HUnit = linux;
+    # This attribute causes an infinite recursion in Hydra!
+    # jailbreakCabal = linux;
+    mtl = linux;
+    network = linux;
+    OpenGL = linux;
+    parallel = linux;
+    parsec = linux;
+    primitive = linux;
+    QuickCheck = linux;
+    regexBase = linux;
+    regexCompat = linux;
+    regexPosix = linux;
+    stm = linux;
+    streamproc = linux;
+    syb = linux;
+    text = linux;
+    transformers = linux;
+    vector = linux;
+    xhtml = linux;
+    zlib = linux;
+  };
+
+  haskellPackages_ghc6123 = {
+    alex = linux;
+    cabal2nix = linux;
+    cabalInstall = linux;
+    cgi = linux;
+    fgl = linux;
+    funcmp = linux;
+    GLUT = linux;
+    haddock = linux;
+    happy = linux;
+    haskellPlatform = linux;
+    haskellSrc = linux;
+    hopenssl = linux;
+    hsdns = linux;
+    hsemail = linux;
+    hsyslog = linux;
+    html = linux;
+    HTTP = linux;
+    HUnit = linux;
+    # This attribute causes an infinite recursion in Hydra!
+    # jailbreakCabal = linux;
+    mtl = linux;
+    network = linux;
+    OpenGL = linux;
+    parallel = linux;
+    parsec = linux;
+    primitive = linux;
+    QuickCheck = linux;
+    regexBase = linux;
+    regexCompat = linux;
+    regexPosix = linux;
+    stm = linux;
+    streamproc = linux;
+    text = linux;
+    transformers = linux;
+    vector = linux;
+    xhtml = linux;
+    zlib = linux;
+  };
+
+  haskellPackages_ghc6104 = {
+    alex = linux;
+    cabalInstall = linux;
+    cgi = linux;
+    fgl = linux;
+    funcmp = linux;
+    GLUT = linux;
+    haddock = linux;
+    happy = linux;
+    haskellPlatform = linux;
+    haskellSrc = linux;
+    hopenssl = linux;
+    hsdns = linux;
+    hsyslog = linux;
+    html = linux;
+    HTTP = linux;
+    HUnit = linux;
+    # This attribute causes an infinite recursion in Hydra!
+    # jailbreakCabal = linux;
+    mtl = linux;
+    network = linux;
+    OpenGL = linux;
+    parallel = linux;
+    parsec = linux;
+    primitive = linux;
+    QuickCheck = linux;
+    regexBase = linux;
+    regexCompat = linux;
+    regexPosix = linux;
+    stm = linux;
+    streamproc = linux;
+    text = linux;
+    transformers = linux;
+    vector = linux;
+    xhtml = linux;
+    zlib = linux;
+  };
+
 })

From f8fb55b4cc2809dc02c9ca392802716d78d5f4c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 23 Mar 2013 20:25:05 +0100
Subject: [PATCH 137/394] gparted: update

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

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 1bd40025e5d1..9e8b1f9e3224 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -2,11 +2,11 @@
 , pkgconfig, gtkmm, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.14.1";
+  name = "gparted-0.15.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/gparted/${name}.tar.bz2";
-    sha256 = "0697sq2dbs9cn689bk68gs9pj3k08bfp9wfg6j291zrprdd3rddi";
+    sha256 = "03s9dp2q281lkkfjgk9ahc8i6dk4d2a03z4bh2d19a7r3b2mmdww";
   };
 
   configureFlags = "--disable-doc";

From 4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 24 Mar 2013 07:45:00 -0400
Subject: [PATCH 138/394] Partially revert my recent kernelPackages changes

First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)

Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)

The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../virtualization/virtualbox/default.nix     |   8 +-
 .../virtualbox/guest-additions/default.nix    |   8 +-
 pkgs/os-specific/linux/acpi-call/default.nix  |  10 +-
 pkgs/os-specific/linux/atheros/0.9.4.nix      |   6 +-
 .../os-specific/linux/ati-drivers/default.nix |   8 +-
 pkgs/os-specific/linux/aufs-util/2.nix        |   6 +-
 pkgs/os-specific/linux/aufs-util/3.nix        |   6 +-
 pkgs/os-specific/linux/aufs/2.nix             |  14 +-
 pkgs/os-specific/linux/aufs/3.nix             |  14 +-
 pkgs/os-specific/linux/bbswitch/default.nix   |  12 +-
 pkgs/os-specific/linux/blcr/default.nix       |  12 +-
 .../linux/broadcom-sta/default.nix            |  10 +-
 pkgs/os-specific/linux/cryptodev/default.nix  |   8 +-
 pkgs/os-specific/linux/e1000e/default.nix     |  10 +-
 pkgs/os-specific/linux/exmap/default.nix      |   8 +-
 pkgs/os-specific/linux/frandom/default.nix    |  10 +-
 .../os-specific/linux/iscsitarget/default.nix |   6 +-
 pkgs/os-specific/linux/iwlwifi/default.nix    |  10 +-
 pkgs/os-specific/linux/kernel/perf.nix        |   6 +-
 pkgs/os-specific/linux/klibc/default.nix      |  12 +-
 pkgs/os-specific/linux/kqemu/default.nix      |   8 +-
 .../os-specific/linux/ndiswrapper/default.nix |   8 +-
 pkgs/os-specific/linux/nvidia-x11/default.nix |   6 +-
 .../linux/nvidia-x11/legacy173.nix            |   8 +-
 .../linux/nvidia-x11/legacy304.nix            |   6 +-
 .../os-specific/linux/nvidia-x11/legacy96.nix |   8 +-
 pkgs/os-specific/linux/open-iscsi/default.nix |   6 +-
 pkgs/os-specific/linux/spl/default.nix        |  12 +-
 pkgs/os-specific/linux/tp_smapi/default.nix   |  12 +-
 pkgs/os-specific/linux/v86d/default.nix       |   6 +-
 pkgs/os-specific/linux/wis-go7007/default.nix |  10 +-
 pkgs/os-specific/linux/zfs/default.nix        |  14 +-
 pkgs/servers/openafs-client/default.nix       |   6 +-
 pkgs/top-level/all-packages.nix               | 159 +++++++++---------
 34 files changed, 228 insertions(+), 225 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index bf19ecd99ca0..d385d431fa39 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
-, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
+, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernelDev, lvm2
 , which, alsaLib, curl, gawk
 , xorriso, makeself, perl, pkgconfig
 , javaBindings ? false, jdk ? null
@@ -40,7 +40,7 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "virtualbox-${version}-${kernel.version}";
+  name = "virtualbox-${version}-${kernelDev.version}";
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
@@ -49,7 +49,7 @@ in stdenv.mkDerivation {
 
   buildInputs =
     [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
-      libcap glib kernel lvm2 python alsaLib curl pam xorriso makeself perl
+      libcap glib kernelDev lvm2 python alsaLib curl pam xorriso makeself perl
       pkgconfig which libXmu ]
     ++ optional javaBindings jdk
     ++ optional pythonBindings python;
@@ -61,7 +61,7 @@ in stdenv.mkDerivation {
 
   prePatch = ''
     set -x
-    MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
+    MODULES_BUILD_DIR=`echo ${kernelDev}/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 ""}@' \
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index f648cb3c7377..20ef5c66997b 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
+{ stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper
 , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
 , dbus }:
 
 let version = "4.2.8"; in
 
 stdenv.mkDerivation {
-  name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
+  name = "VirtualBox-GuestAdditions-${version}-${kernelDev.version}";
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
     sha256 = "04a5402d8dcdefc83ffb2785351ddc57758781a3759137974469189392ae4ad5";
   };
 
-  KERN_DIR = "${kernel}/lib/modules/*/build";
+  KERN_DIR = "${kernelDev}/lib/modules/*/build";
 
   buildInputs = [ patchelf cdrkit makeWrapper dbus ];
 
@@ -112,7 +112,7 @@ stdenv.mkDerivation {
     for i in *
     do
         cd $i
-        kernelVersion=$(cd ${kernel}/lib/modules; ls)
+        kernelVersion=$(cd ${kernelDev}/lib/modules; ls)
         export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
         find . -type f | xargs sed -i -e "s|-o root||g" \
                                       -e "s|-g root||g"
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index 0689663832e4..43902aded673 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchgit, kernel }:
+{ stdenv, fetchgit, kernelDev }:
 
 stdenv.mkDerivation {
-  name = "acpi-call-${kernel.version}";
+  name = "acpi-call-${kernelDev.version}";
 
   src = fetchgit {
     url = "git://github.com/mkottman/acpi_call.git";
@@ -12,12 +12,12 @@ stdenv.mkDerivation {
   preBuild = ''
     sed -e 's/break/true/' -i test_off.sh
     sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh
-    sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/${kernel.modDirVersion}@" -i Makefile
+    sed -e "s@/lib/modules/\$(.*)@${kernelDev}/lib/modules/${kernelDev.modDirVersion}@" -i Makefile
   '';
  
   installPhase = ''
-    mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc
-    cp acpi_call.ko $out/lib/modules/${kernel.modDirVersion}/misc
+    mkdir -p $out/lib/modules/${kernelDev.modDirVersion}/misc
+    cp acpi_call.ko $out/lib/modules/${kernelDev.modDirVersion}/misc
     mkdir -p $out/bin
     cp test_off.sh $out/bin/test_discrete_video_off.sh
     chmod a+x $out/bin/test_discrete_video_off.sh
diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix
index 87470da9649c..341bdc3f1bbf 100644
--- a/pkgs/os-specific/linux/atheros/0.9.4.nix
+++ b/pkgs/os-specific/linux/atheros/0.9.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, builderDefs, kernel }:
+{ stdenv, fetchurl, builderDefs, kernelDev }:
 	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 		fetchurl {
@@ -8,7 +8,7 @@
 
 		buildInputs = [];
 		configureFlags = [];
-		makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
+		makeFlags = [''KERNELPATH=${kernelDev}/lib/modules/*/build'' ''DESTDIR=$out''];
 	};
 	in with localDefs;
 let 
@@ -17,7 +17,7 @@ postInstall = fullDepEntry (''
 '') [minInit doMakeInstall];
 in
 stdenv.mkDerivation rec {
-	name = "atheros-0.9.4-${kernel.version}";
+	name = "atheros-0.9.4-${kernelDev.version}";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doMakeInstall 
 			postInstall doForceShare doPropagate]);
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index c30d18fe75b6..ff508deed122 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel, xlibs, which, imake
+{ stdenv, fetchurl, kernelDev, xlibs, which, imake
 , mesa # for fgl_glxgears
 , libXxf86vm, xf86vidmodeproto # for fglrx_gamma
 , xorg, makeWrapper, glibc, patchelf
@@ -23,7 +23,7 @@
 assert stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation rec {
-  name = "ati-drivers-${version}-${kernel.version}";
+  name = "ati-drivers-${version}-${kernelDev.version}";
   version = "10-11-x86";
 
   builder = ./builder.sh;
@@ -46,7 +46,9 @@ stdenv.mkDerivation rec {
       unzip
     ];
 
-  inherit kernel glibc /* glibc only used for setting interpreter */;
+  kernel = kernelDev;
+
+  inherit glibc /* glibc only used for setting interpreter */;
 
   LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
     [ "${xorg.libXrandr}/lib"
diff --git a/pkgs/os-specific/linux/aufs-util/2.nix b/pkgs/os-specific/linux/aufs-util/2.nix
index 501dcbf4b94b..130cfd85ee75 100644
--- a/pkgs/os-specific/linux/aufs-util/2.nix
+++ b/pkgs/os-specific/linux/aufs-util/2.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, kernel, aufs }:
+{ stdenv, fetchurl, kernelDev, aufs }:
 
 assert aufs != null;
 
 let version = "20100506"; in
 
 stdenv.mkDerivation {
-  name = "aufs2-util-${version}-${kernel.version}";
+  name = "aufs2-util-${version}-${kernelDev.version}";
 
   src = fetchurl {
     url = "http://nixos.org/tarballs/aufs2-util-git-${version}.tar.bz2";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [ aufs ];
 
   makeFlags =
-    [ "KDIR=${kernel}/lib/modules/${kernel.version}/build"
+    [ "KDIR=${kernelDev}/lib/modules/${kernelDev.version}/build"
       "Install=install"
       "DESTDIR=$(out)"
     ];
diff --git a/pkgs/os-specific/linux/aufs-util/3.nix b/pkgs/os-specific/linux/aufs-util/3.nix
index d75f51d38c94..9997c2743a50 100644
--- a/pkgs/os-specific/linux/aufs-util/3.nix
+++ b/pkgs/os-specific/linux/aufs-util/3.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchgit, kernel, aufs }:
+{ stdenv, fetchgit, kernelDev, aufs }:
 
 assert aufs != null;
 
 stdenv.mkDerivation {
-  name = "aufs3-util-${aufs.patch.version}-${kernel.version}";
+  name = "aufs3-util-${aufs.patch.version}-${kernelDev.version}";
 
   src = fetchgit {
     url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git;
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ aufs ];
 
   makeFlags =
-    [ "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build"
+    [ "KDIR=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build"
       "Install=install"
       "DESTDIR=$(out)"
     ];
diff --git a/pkgs/os-specific/linux/aufs/2.nix b/pkgs/os-specific/linux/aufs/2.nix
index 4d80ddae0b87..87d16c113a53 100644
--- a/pkgs/os-specific/linux/aufs/2.nix
+++ b/pkgs/os-specific/linux/aufs/2.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, kernel, perl, fetchgit }:
+{ stdenv, fetchurl, kernelDev, perl, fetchgit }:
 
-assert kernel.features ? aufsBase;
+assert kernelDev.features ? aufsBase;
 
 let version = "20100522"; in
 
 stdenv.mkDerivation {
-  name = "aufs2-${version}-${kernel.version}";
+  name = "aufs2-${version}-${kernelDev.version}";
 
   src = 
-  if (builtins.lessThan (builtins.compareVersions kernel.version "2.6.35") 0) then
+  if (builtins.lessThan (builtins.compareVersions kernelDev.version "2.6.35") 0) then
     fetchurl {
       url = "http://nixos.org/tarballs/aufs2-standalone-git-${version}.tar.bz2";
       sha256 = "1g4mw4qx2xzpygdwjiw36bkhfz1hi7wxx7w79n2h0lr5grzzdnd6";
@@ -22,12 +22,12 @@ stdenv.mkDerivation {
 
   buildInputs = [ perl ];
 
-  makeFlags = "KDIR=${kernel}/lib/modules/${kernel.version}/build";
+  makeFlags = "KDIR=${kernelDev}/lib/modules/${kernelDev.version}/build";
 
   installPhase =
     ''
-      mkdir -p $out/lib/modules/${kernel.version}/misc
-      cp aufs.ko $out/lib/modules/${kernel.version}/misc
+      mkdir -p $out/lib/modules/${kernelDev.version}/misc
+      cp aufs.ko $out/lib/modules/${kernelDev.version}/misc
 
       # Install the headers because aufs2-util requires them.
       cp -prvd include $out/
diff --git a/pkgs/os-specific/linux/aufs/3.nix b/pkgs/os-specific/linux/aufs/3.nix
index 255804a31de9..2f566d3abff7 100644
--- a/pkgs/os-specific/linux/aufs/3.nix
+++ b/pkgs/os-specific/linux/aufs/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, kernel, perl }:
+{ stdenv, kernelDev, perl }:
 
 let
 
@@ -7,25 +7,25 @@ let
       (if x.features ? aufs3 then x.features.aufs3 else false)
     else false;
   featureAbort = abort "This kernel does not have aufs 3 support";
-  patch = stdenv.lib.findFirst aufsPredicate featureAbort kernel.kernelPatches;
+  patch = stdenv.lib.findFirst aufsPredicate featureAbort kernelDev.kernelPatches;
 
 in
 
 stdenv.mkDerivation {
-  name = "aufs3-${patch.version}-${kernel.version}";
+  name = "aufs3-${patch.version}-${kernelDev.version}";
 
   src = patch.patch.src;
 
   buildInputs = [ perl ];
 
-  makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build";
+  makeFlags = "KDIR=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build";
 
-  NIX_CFLAGS_COMPILE="-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated";
+  NIX_CFLAGS_COMPILE="-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated";
 
   installPhase =
     ''
-      mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc
-      cp -v aufs.ko $out/lib/modules/${kernel.modDirVersion}/misc
+      mkdir -p $out/lib/modules/${kernelDev.modDirVersion}/misc
+      cp -v aufs.ko $out/lib/modules/${kernelDev.modDirVersion}/misc
 
       # Install the headers because aufs3-util requires them.
       mkdir -p $out/include/linux
diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index bdfa6f5da6fb..692ec0df5bdc 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchurl, kernelDev }:
 
 let
   baseName = "bbswitch";
   version = "0.6";
-  name = "${baseName}-${version}-${kernel.version}";
+  name = "${baseName}-${version}-${kernelDev.version}";
 
 in
 
@@ -17,13 +17,13 @@ stdenv.mkDerivation {
 
   preBuild = ''
     substituteInPlace Makefile \
-      --replace "\$(shell uname -r)" "${kernel.modDirVersion}" \
-      --replace "/lib/modules" "${kernel}/lib/modules"
+      --replace "\$(shell uname -r)" "${kernelDev.modDirVersion}" \
+      --replace "/lib/modules" "${kernelDev}/lib/modules"
   '';
 
   installPhase = ''
-    ensureDir $out/lib/modules/${kernel.modDirVersion}/misc
-    cp bbswitch.ko $out/lib/modules/${kernel.modDirVersion}/misc
+    ensureDir $out/lib/modules/${kernelDev.modDirVersion}/misc
+    cp bbswitch.ko $out/lib/modules/${kernelDev.modDirVersion}/misc
 
     ensureDir $out/bin
     tee $out/bin/discrete_vga_poweroff << EOF
diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
index 9c2821d7776f..d0d81abb244b 100644
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, kernel, perl, makeWrapper }:
+{ stdenv, fetchurl, kernelDev, perl, makeWrapper }:
 
 # BLCR 0.8.4 works for kernel version up to 2.6.38 (including 2.6.38.x)
 # BLCR 0.8.5 should works for kernel version up to 3.7.1
 
 assert stdenv.isLinux;
-assert builtins.compareVersions "3.7.2" kernel.version == 1;
+assert builtins.compareVersions "3.7.2" kernelDev.version == 1;
 
 stdenv.mkDerivation {
-  name = "blcr_${kernel.version}-0.8.5";
+  name = "blcr_${kernelDev.version}-0.8.5";
 
   src = fetchurl {
     url = http://crd.lbl.gov/assets/Uploads/FTG/Projects/CheckpointRestart/downloads/blcr-0.8.5.tar.gz;
@@ -18,9 +18,9 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     configureFlagsArray=(
-      --with-linux=${kernel}/lib/modules/${kernel.modDirVersion}/build
-      --with-kmod-dir=$out/lib/modules/${kernel.modDirVersion}
-      --with-system-map=${kernel}/System.map
+      --with-linux=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
+      --with-kmod-dir=$out/lib/modules/${kernelDev.modDirVersion}
+      --with-system-map=${kernelDev}/System.map
     )
   '';
 
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 041141cdad25..43ba9dfc2b5e 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchurl, kernelDev }:
 
 let version = "5_100_82_112";
     bits = if stdenv.system == "i686-linux" then "32" else
@@ -6,7 +6,7 @@ let version = "5_100_82_112";
 in
 
 stdenv.mkDerivation {
-  name = "broadcom-sta-${version}-${kernel.version}";
+  name = "broadcom-sta-${version}-${kernelDev.version}";
 
   src = fetchurl {
     url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_${bits}-v${version}.tar.gz";
@@ -15,13 +15,13 @@ stdenv.mkDerivation {
       else "1qsarnry10f5m8a73wbr9cg2ifs00sqg6x0ay59l72vl9hb2zlww";
   };
 
-  buildInputs = [ kernel ];
+  buildInputs = [ kernelDev ];
   patches =
     [ ./makefile.patch ./linux-2.6.39.patch ./linux-3.2.patch
       ./linux-3.4.patch ./license.patch
     ];
 
-  makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build";
+  makeFlags = "KDIR=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build";
 
   unpackPhase =
     ''
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   installPhase =
     ''
-      binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+      binDir="$out/lib/modules/${kernelDev.modDirVersion}/kernel/net/wireless/"
       docDir="$out/share/doc/broadcom-sta/"
       mkdir -p "$binDir" "$docDir"
       cp wl.ko "$binDir"
diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix
index b9e5690e80e9..e80256f7299f 100644
--- a/pkgs/os-specific/linux/cryptodev/default.nix
+++ b/pkgs/os-specific/linux/cryptodev/default.nix
@@ -1,8 +1,8 @@
-{ fetchurl, stdenv, kernel, onlyHeaders ? false }:
+{ fetchurl, stdenv, kernelDev, onlyHeaders ? false }:
 
 stdenv.mkDerivation rec {
   pname = "cryptodev-linux-1.5";
-  name = "${pname}-${kernel.version}";
+  name = "${pname}-${kernelDev.version}";
 
   src = fetchurl {
     url = "http://download.gna.org/cryptodev-linux/${pname}.tar.gz";
@@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
   };
 
   buildPhase = if !onlyHeaders then ''
-    make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \
+    make -C ${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build \
       SUBDIRS=`pwd` INSTALL_PATH=$out
   '' else ":";
 
   installPhase = stdenv.lib.optionalString (!onlyHeaders) ''
-    make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \
+    make -C ${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build \
       INSTALL_MOD_PATH=$out SUBDIRS=`pwd` modules_install
   '' + ''
     mkdir -p $out/include/crypto
diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix
index 709befd9dc5b..8d1320afc681 100644
--- a/pkgs/os-specific/linux/e1000e/default.nix
+++ b/pkgs/os-specific/linux/e1000e/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchurl, kernelDev }:
 
 stdenv.mkDerivation {
-  name = "e1000e-1.5.1-${kernel.version}";
+  name = "e1000e-1.5.1-${kernelDev.version}";
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/e1000/e1000e-1.5.1.tar.gz";
     sha256 = "0nzjlarpqcpm5y112n3vzra4qv32hiygpfkk10y8g4nln4adhqsw";
   };
 
-  buildInputs = [ kernel ];
+  buildInputs = [ kernelDev ];
 
   configurePhase = ''
     cd src
-    kernel_version=$( cd ${kernel}/lib/modules && echo * )
-    sed -i -e 's|/lib/modules|${kernel}/lib/modules|' Makefile
+    kernel_version=$( cd ${kernelDev}/lib/modules && echo * )
+    sed -i -e 's|/lib/modules|${kernelDev}/lib/modules|' Makefile
     export makeFlags="BUILD_KERNEL=$kernel_version"
   '';
 
diff --git a/pkgs/os-specific/linux/exmap/default.nix b/pkgs/os-specific/linux/exmap/default.nix
index c39b2acf4e1b..1b372ca3dbfc 100644
--- a/pkgs/os-specific/linux/exmap/default.nix
+++ b/pkgs/os-specific/linux/exmap/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, stdenv, kernel, pkgconfig, gtkmm, boost, pcre }:
+{ fetchurl, stdenv, kernelDev, pkgconfig, gtkmm, boost, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "exmap-0.10-${kernel.version}";
+  name = "exmap-0.10-${kernelDev.version}";
 
   src = fetchurl {
     url = "http://www.berthels.co.uk/exmap/download/${name}.tgz";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     substituteInPlace "kernel/Makefile" \
       --replace '/lib/modules/$(shell uname -r)/build' \
-                ${kernel}/lib/modules/*/build
+                ${kernelDev}/lib/modules/*/build
 
     # The `proc_root' variable (the root of `/proc') is no longer exported
     # since 2.6.26.  Fortunately, one can pass `NULL' instead of `&proc_root'.
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     substituteInPlace "src/Makefile" --replace "-Werror" ""
   '';
 
-  buildInputs = [ kernel pkgconfig gtkmm boost pcre ];
+  buildInputs = [ kernelDev pkgconfig gtkmm boost pcre ];
 
   buildPhase = "make build";
 
diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix
index 7894e86ded98..10876e96fc82 100644
--- a/pkgs/os-specific/linux/frandom/default.nix
+++ b/pkgs/os-specific/linux/frandom/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchurl, kernelDev }:
 
 let baseName = "frandom-1.1";
 in
 
 stdenv.mkDerivation rec {
-  name = "${baseName}-${kernel.version}";
+  name = "${baseName}-${kernelDev.version}";
 
   src = fetchurl {
     url = "http://sourceforge.net/projects/frandom/files/${baseName}.tar.gz";
@@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
   };
 
   preBuild = ''
-    kernelVersion=$(cd ${kernel}/lib/modules && ls)
+    kernelVersion=$(cd ${kernelDev}/lib/modules && ls)
     substituteInPlace Makefile \
       --replace "\$(shell uname -r)" "$kernelVersion" \
-      --replace "/lib/modules" "${kernel}/lib/modules"
+      --replace "/lib/modules" "${kernelDev}/lib/modules"
   '';
  
   installPhase = ''
-    kernelVersion=$(cd ${kernel}/lib/modules && ls)
+    kernelVersion=$(cd ${kernelDev}/lib/modules && ls)
     ensureDir $out/lib/modules/$kernelVersion/misc
     cp frandom.ko $out/lib/modules/$kernelVersion/misc
 
diff --git a/pkgs/os-specific/linux/iscsitarget/default.nix b/pkgs/os-specific/linux/iscsitarget/default.nix
index 214fae01cfcc..e07409aa08d3 100644
--- a/pkgs/os-specific/linux/iscsitarget/default.nix
+++ b/pkgs/os-specific/linux/iscsitarget/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, kernel, module_init_tools}:
+{ stdenv, fetchurl, kernelDev, module_init_tools}:
 
 stdenv.mkDerivation rec {
-  name = "iscsitarget-1.4.20.2-${kernel.version}";
+  name = "iscsitarget-1.4.20.2-${kernelDev.version}";
   
   src = fetchurl {
     url = "mirror://sourceforge/iscsitarget/iscsitarget/1.4.20.2/${name}.tar.gz";
     sha256 = "126kp0yc7vmvdbaw2xfav89340b0h91dvvyib5qbvyrq40n8wg0g";
   };
   
-  KSRC = "${kernel}/lib/modules/*/build";
+  KSRC = "${kernelDev}/lib/modules/*/build";
   
   DESTDIR = "$(out)";
   
diff --git a/pkgs/os-specific/linux/iwlwifi/default.nix b/pkgs/os-specific/linux/iwlwifi/default.nix
index c993886c21db..1a28720f0042 100644
--- a/pkgs/os-specific/linux/iwlwifi/default.nix
+++ b/pkgs/os-specific/linux/iwlwifi/default.nix
@@ -1,9 +1,9 @@
-{stdenv, fetchurl, kernel}:
+{stdenv, fetchurl, kernelDev}:
 
 let version = "1.2.25"; in
 
 stdenv.mkDerivation rec {
-  name = "iwlwifi-${version}-${kernel.version}";
+  name = "iwlwifi-${version}-${kernelDev.version}";
 
   src = fetchurl {
     url = "http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-${version}.tgz";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
     # Urgh, we need the complete kernel sources for some header
     # files.  So unpack the original kernel source tarball and copy
     # the configured include directory etc. on top of it.
-    kernelVersion=$(cd ${kernel}/lib/modules && ls)
-    kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/source)
-    tar xvfj ${kernel.src}
+    kernelVersion=$(cd ${kernelDev}/lib/modules && ls)
+    kernelBuild=$(echo ${kernelDev}/lib/modules/$kernelVersion/source)
+    tar xvfj ${kernelDev.src}
     kernelSource=$(echo $(pwd)/linux-*)
     cp -prd $kernelBuild/* $kernelSource
 
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 8f2db1b15bd2..ebbf9557245a 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -1,13 +1,13 @@
-{ stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto
+{ stdenv, kernelDev, elfutils, python, perl, newt, slang, asciidoc, xmlto
 , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig
 , withGtk ? false, gtk ? null }:
 
 assert withGtk -> gtk != null;
 
 stdenv.mkDerivation {
-  name = "perf-linux-${kernel.version}";
+  name = "perf-linux-${kernelDev.version}";
 
-  inherit (kernel) src patches;
+  inherit (kernelDev) src patches;
 
   preConfigure = ''
     cd tools/perf
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 42fd6097da0b..97bdd9ebacb2 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, bison, mktemp, linuxHeaders, linuxHeadersCross, kernel ? null }:
+{ stdenv, fetchurl, perl, bison, mktemp, linuxHeaders, linuxHeadersCross, kernelDev ? null }:
 
 assert stdenv.isLinux;
 
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "klibc-${version}${stdenv.lib.optionalString (kernel != null) "-${kernel.version}"}";
+  name = "klibc-${version}${stdenv.lib.optionalString (kernelDev != null) "-${kernelDev.version}"}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/libs/klibc/1.5/klibc-${version}.tar.bz2";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   # So it cannot run the 'make headers_install' it wants to run.
   # We don't install the headers, so klibc will not be useful as libc, but
   # usually in nixpkgs we only use the userspace tools comming with klibc.
-  prePatch = stdenv.lib.optionalString (kernel == null) ''
+  prePatch = stdenv.lib.optionalString (kernelDev == null) ''
     sed -i -e /headers_install/d scripts/Kbuild.install
   '';
   
@@ -49,15 +49,15 @@ stdenv.mkDerivation {
     echo "CONFIG_AEABI=y" >> defconfig
     makeFlags=$(eval "echo $makeFlags")
 
-  '' + (if kernel == null then ''
+  '' + (if kernelDev == null then ''
     mkdir linux
     cp -prsd $linuxHeaders/include linux/
     chmod -R u+w linux/include/
   '' else ''
-    tar xvf ${kernel.src}
+    tar xvf ${kernelDev.src}
     mv linux* linux
     cd linux
-    ln -sv ${kernel}/config .config
+    ln -sv ${kernelDev}/config .config
     make prepare
     cd ..
   '');
diff --git a/pkgs/os-specific/linux/kqemu/default.nix b/pkgs/os-specific/linux/kqemu/default.nix
index c703ca4e4a43..97b7c495bb38 100644
--- a/pkgs/os-specific/linux/kqemu/default.nix
+++ b/pkgs/os-specific/linux/kqemu/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, kernel, perl }:
+{ stdenv, fetchurl, kernelDev, perl }:
 
 stdenv.mkDerivation rec {
-  name = "kqemu-1.4.0pre1-${kernel.version}";
+  name = "kqemu-1.4.0pre1-${kernelDev.version}";
   
   src = fetchurl {
     url = "http://www.nongnu.org/qemu/${name}.tar.gz";
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ perl ];
   
-  configureFlags = [ ''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'' ];
+  configureFlags = [ ''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernelDev}/lib/modules/*/build)'' ];
   
   preConfigure = '' 
     sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
 
     sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
-    sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh
+    sed -e 's/`uname -r`/'"$(basename ${kernelDev}/lib/modules/*)"'/' -i install.sh
     sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
     sed -e '/depmod/d' -i install.sh
     cat install.sh
diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index c41649e0285b..109faac97c5e 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, kernel, perl }:
+{ stdenv, fetchurl, kernelDev, perl }:
 
 stdenv.mkDerivation {
-  name = "ndiswrapper-1.56-${kernel.version}";
+  name = "ndiswrapper-1.56-${kernelDev.version}";
 
   # need at least .config and include 
-  inherit kernel;
+  kernel = kernelDev;
 
   buildPhase = "
     echo make KBUILD=$(echo \$kernel/lib/modules/*/build);
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     sha256 = "10yqg1a08v6z1qm1qr1v4rbhl35c90gzrazapr09vp372hky8f57";
   };
 
-  buildInputs = [ kernel perl ];
+  buildInputs = [ kernelDev perl ];
 
   # this is a patch against svn head, not stable version
   patches = [./prefix.patch];
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 829e68698c67..2ef590fcafc5 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
+{ stdenv, fetchurl, kernelDev ? null, xlibs, zlib, perl
 , gtk, atk, pango, glib, gdk_pixbuf
 , # Whether to build the libraries only (i.e. not the kernel module or
   # nvidia-settings).  Used to support 32-bit binaries on 64-bit
@@ -11,7 +11,7 @@ with stdenv.lib;
 let versionNumber = "310.32"; in
 
 stdenv.mkDerivation {
-  name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
+  name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
 
   builder = ./builder.sh;
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   inherit versionNumber libsOnly;
 
-  kernel = if libsOnly then null else kernel;
+  kernel = if libsOnly then null else kernelDev;
 
   dontStrip = true;
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
index 90ff989b759a..a03e3d4ca7e4 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}:
+{stdenv, fetchurl, kernelDev, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}:
 
 let 
 
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "nvidia-x11-${versionNumber}-${kernel.version}";
+  name = "nvidia-x11-${versionNumber}-${kernelDev.version}";
   
   builder = ./builder-legacy.sh;
   
@@ -24,7 +24,9 @@ stdenv.mkDerivation {
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
-  inherit versionNumber kernel;
+  kernel = kernelDev;
+
+  inherit versionNumber;
 
   dontStrip = true;
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
index 1a8761afbf0f..e2739b291d40 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
+{ stdenv, fetchurl, kernelDev ? null, xlibs, zlib, perl
 , gtk, atk, pango, glib, gdk_pixbuf
 , # Whether to build the libraries only (i.e. not the kernel module or
   # nvidia-settings).  Used to support 32-bit binaries on 64-bit
@@ -11,7 +11,7 @@ with stdenv.lib;
 let versionNumber = "304.84"; in
 
 stdenv.mkDerivation {
-  name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
+  name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
 
   builder = ./builder-legacy304.sh;
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 
   inherit versionNumber libsOnly;
 
-  kernel = if libsOnly then null else kernel;
+  kernel = if libsOnly then null else kernelDev;
 
   dontStrip = true;
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix
index 8e1fb784ae34..32fc3632b05a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib}:
+{stdenv, fetchurl, kernelDev, xlibs, zlib, gtk, atk, pango, glib}:
 
 let 
 
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "nvidia-x11-${versionNumber}-${kernel.version}";
+  name = "nvidia-x11-${versionNumber}-${kernelDev.version}";
   
   builder = ./builder-legacy.sh;
   
@@ -24,7 +24,9 @@ stdenv.mkDerivation {
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
-  inherit versionNumber kernel;
+  kernel = kernelDev;
+
+  inherit versionNumber;
 
   dontStrip = true;
 
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index eccdde30b130..60e0e4d189c0 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, kernel}:
+{ stdenv, fetchurl, kernelDev}:
 
 stdenv.mkDerivation rec {
-  name = "open-iscsi-2.0-871-${kernel.version}";
+  name = "open-iscsi-2.0-871-${kernelDev.version}";
   
   src = fetchurl {
     url = "http://www.open-iscsi.org/bits/${name}.tar.gz";
     sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw";
   };
   
-  KSRC = "${kernel}/lib/modules/*/build";
+  KSRC = "${kernelDev}/lib/modules/*/build";
   DESTDIR = "$(out)";
   
   preConfigure = ''
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index b07a51c1ace3..3d949511af0a 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }:
+{ stdenv, fetchurl, kernelDev, perl, autoconf, automake, libtool, coreutils, gawk }:
 
 stdenv.mkDerivation {
-  name = "spl-0.6.0-rc14-${kernel.version}";
+  name = "spl-0.6.0-rc14-${kernelDev.version}";
   src = fetchurl {
     url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz;
     sha256 = "00wyamf13z8ins4s14xf0b3hfjfz4w084mr17hs3k5xifb5jxa8g";
@@ -9,9 +9,9 @@ stdenv.mkDerivation {
 
   patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ];
 
-  buildInputs = [ perl kernel autoconf automake libtool ];
+  buildInputs = [ perl kernelDev autoconf automake libtool ];
 
-  NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated";
+  NIX_CFLAGS_COMPILE = "-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated";
 
   preConfigure = ''
     ./autogen.sh
@@ -25,8 +25,8 @@ stdenv.mkDerivation {
   '';
 
   configureFlags = ''
-     --with-linux=${kernel}/lib/modules/${kernel.modDirVersion}/build
-     --with-linux-obj=${kernel}/lib/modules/${kernel.modDirVersion}/build
+     --with-linux=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
+     --with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix
index 224b808721bf..140021605eaf 100644
--- a/pkgs/os-specific/linux/tp_smapi/default.nix
+++ b/pkgs/os-specific/linux/tp_smapi/default.nix
@@ -1,23 +1,23 @@
-{stdenv, fetchurl, kernel}:
+{stdenv, fetchurl, kernelDev}:
 
 stdenv.mkDerivation {
-  name = "tp_smapi-0.41-${kernel.version}";
+  name = "tp_smapi-0.41-${kernelDev.version}";
 
   src = fetchurl {
     url = "https://github.com/downloads/evgeni/tp_smapi/tp_smapi-0.41.tar.gz";
     sha256 = "6aef02b92d10360ac9be0db29ae390636be55017990063a092a285c70b54e666";
   };
 
-  buildInputs = [ kernel ];
+  buildInputs = [ kernelDev ];
 
   makeFlags = [
-    "KBASE=${kernel}/lib/modules/${kernel.modDirVersion}"
+    "KBASE=${kernelDev}/lib/modules/${kernelDev.modDirVersion}"
     "SHELL=/bin/sh"
   ];
 
   installPhase = ''
-    install -v -D -m 644 thinkpad_ec.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/firmware/thinkpad_ec.ko"
-    install -v -D -m 644 tp_smapi.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/firmware/tp_smapi.ko"
+    install -v -D -m 644 thinkpad_ec.ko "$out/lib/modules/${kernelDev.modDirVersion}/kernel/drivers/firmware/thinkpad_ec.ko"
+    install -v -D -m 644 tp_smapi.ko "$out/lib/modules/${kernelDev.modDirVersion}/kernel/drivers/firmware/tp_smapi.ko"
   '';
 
   dontStrip = true;
diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix
index 220abf88ae7a..698a7ab4ec88 100644
--- a/pkgs/os-specific/linux/v86d/default.nix
+++ b/pkgs/os-specific/linux/v86d/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, klibc, kernel, withKlibc ? true}:
+{stdenv, fetchurl, klibc, kernelDev, withKlibc ? true}:
 
 stdenv.mkDerivation rec {
-  name = "v86d-${version}-${kernel.version}";
+  name = "v86d-${version}-${kernelDev.version}";
   version = "0.1.10";
 
   src = fetchurl {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags = if withKlibc then [ "--with-klibc" ] else [ "--default" ];
 
   makeFlags = [
-    "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/source"
+    "KDIR=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/source"
     "DESTDIR=$(out)"
   ];
 
diff --git a/pkgs/os-specific/linux/wis-go7007/default.nix b/pkgs/os-specific/linux/wis-go7007/default.nix
index 4fff3ed37c0c..7f27196ba6bd 100644
--- a/pkgs/os-specific/linux/wis-go7007/default.nix
+++ b/pkgs/os-specific/linux/wis-go7007/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernel, ncurses, fxload}:
+{stdenv, fetchurl, kernelDev, ncurses, fxload}:
 
 let
 
@@ -12,7 +12,7 @@ let
 in   
 
 stdenv.mkDerivation {
-  name = "wis-go7007-0.9.8-${kernel.version}";
+  name = "wis-go7007-0.9.8-${kernelDev.version}";
 
   src = fetchurl {
     url = http://gentoo.osuosl.org/distfiles/wis-go7007-linux-0.9.8.tar.bz2;
@@ -50,9 +50,9 @@ stdenv.mkDerivation {
     # Urgh, we need the complete kernel sources for some header
     # files.  So unpack the original kernel source tarball and copy
     # the configured include directory etc. on top of it.
-    kernelVersion=$(cd ${kernel}/lib/modules && ls)
-    kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/source)
-    tar xvfj ${kernel.src}
+    kernelVersion=$(cd ${kernelDev}/lib/modules && ls)
+    kernelBuild=$(echo ${kernelDev}/lib/modules/$kernelVersion/source)
+    tar xvfj ${kernelDev.src}
     kernelSource=$(echo $(pwd)/linux-*)
     cp -prd $kernelBuild/* $kernelSource
 
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 33a5dbc0735f..8da4906f8fe1 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
+{ stdenv, fetchurl, kernelDev, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
 
 stdenv.mkDerivation {
-  name = "zfs-0.6.0-rc14-${kernel.version}";
+  name = "zfs-0.6.0-rc14-${kernelDev.version}";
 
   src = fetchurl {
     url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz;
@@ -10,11 +10,11 @@ stdenv.mkDerivation {
 
   patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ];
 
-  buildInputs = [ kernel spl perl autoconf automake libtool zlib libuuid coreutils ];
+  buildInputs = [ kernelDev spl perl autoconf automake libtool zlib libuuid coreutils ];
 
   # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
   NIX_CFLAGS_LINK = "-lgcc_s";
-  NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated";
+  NIX_CFLAGS_COMPILE = "-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated";
 
   preConfigure = ''
     ./autogen.sh
@@ -29,9 +29,9 @@ stdenv.mkDerivation {
   '';
 
   configureFlags = ''
-    --with-linux=${kernel}/lib/modules/${kernel.modDirVersion}/build 
-    --with-linux-obj=${kernel}/lib/modules/${kernel.modDirVersion}/build 
-    --with-spl=${spl}/libexec/spl/${kernel.modDirVersion}
+    --with-linux=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build 
+    --with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build 
+    --with-spl=${spl}/libexec/spl/${kernelDev.modDirVersion}
     ${if stdenv.system == "i686-linux"  then "--enable-atomic-spinlocks" else ""}
   '';
 
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index efbcd151de58..247628c30a62 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, which, autoconf, automake, flex, yacc,
-  kernel, glibc, ncurses, perl, krb5 }:
+  kernelDev, glibc, ncurses, perl, krb5 }:
 
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "openafs-1.6.1-${kernel.version}";
+  name = "openafs-1.6.1-${kernelDev.version}";
 
   src = fetchurl {
     url = http://www.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-src.tar.bz2;
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ autoconf automake flex yacc ncurses perl which ];
 
   preConfigure = ''
-    ln -s ${kernel}/lib/modules/*/build $TMP/linux
+    ln -s ${kernelDev}/lib/modules/*/build $TMP/linux
 
     patchShebangs .
     for i in `grep -l -R '/usr/\(include\|src\)' .`; do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e269b6f97d5..ec2a13e138e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5956,123 +5956,120 @@ let
      for a specific kernel.  This function can then be called for
      whatever kernel you're using. */
 
-  linuxPackagesFor = kernel:
-    let
-      callPackage = newScope self;
+  linuxPackagesFor = kernel: self: let callPackage = newScope self; in {
+    inherit kernel;
 
-      self = {
-        kernel = kernel.dev or kernel;
+    kernelDev = kernel.dev or kernel;
 
-        acpi_call = callPackage ../os-specific/linux/acpi-call {};
+    acpi_call = callPackage ../os-specific/linux/acpi-call {};
 
-        bbswitch = callPackage ../os-specific/linux/bbswitch {};
+    bbswitch = callPackage ../os-specific/linux/bbswitch {};
 
-        ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
+    ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
 
-        aufs =
-          if self.kernel.features ? aufs2 then
-            callPackage ../os-specific/linux/aufs/2.nix { }
-          else if self.kernel.features ? aufs3 then
-            callPackage ../os-specific/linux/aufs/3.nix { }
-          else null;
+    aufs =
+      if self.kernel.features ? aufs2 then
+        callPackage ../os-specific/linux/aufs/2.nix { }
+      else if self.kernel.features ? aufs3 then
+        callPackage ../os-specific/linux/aufs/3.nix { }
+      else null;
 
-        aufs_util =
-          if self.kernel.features ? aufs2 then
-            callPackage ../os-specific/linux/aufs-util/2.nix { }
-          else if self.kernel.features ? aufs3 then
-            callPackage ../os-specific/linux/aufs-util/3.nix { }
-          else null;
+    aufs_util =
+      if self.kernel.features ? aufs2 then
+        callPackage ../os-specific/linux/aufs-util/2.nix { }
+      else if self.kernel.features ? aufs3 then
+        callPackage ../os-specific/linux/aufs-util/3.nix { }
+      else null;
 
-        blcr = callPackage ../os-specific/linux/blcr { };
+    blcr = callPackage ../os-specific/linux/blcr { };
 
-        cryptodev = callPackage ../os-specific/linux/cryptodev { };
+    cryptodev = callPackage ../os-specific/linux/cryptodev { };
 
-        e1000e = callPackage ../os-specific/linux/e1000e {};
+    e1000e = callPackage ../os-specific/linux/e1000e {};
 
-        exmap = callPackage ../os-specific/linux/exmap { };
+    exmap = callPackage ../os-specific/linux/exmap { };
 
-        frandom = callPackage ../os-specific/linux/frandom { };
+    frandom = callPackage ../os-specific/linux/frandom { };
 
-        iscsitarget = callPackage ../os-specific/linux/iscsitarget { };
+    iscsitarget = callPackage ../os-specific/linux/iscsitarget { };
 
-        iwlwifi = callPackage ../os-specific/linux/iwlwifi { };
+    iwlwifi = callPackage ../os-specific/linux/iwlwifi { };
 
-        iwlwifi4965ucode =
-          if builtins.compareVersions self.kernel.version "2.6.27" == 0
-             || builtins.compareVersions self.kernel.version "2.6.27" == 1
-          then iwlwifi4965ucodeV2
-          else iwlwifi4965ucodeV1;
+    iwlwifi4965ucode =
+      if builtins.compareVersions self.kernel.version "2.6.27" == 0
+         || builtins.compareVersions self.kernel.version "2.6.27" == 1
+      then iwlwifi4965ucodeV2
+      else iwlwifi4965ucodeV1;
 
-        atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { };
+    atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { };
 
-        broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
+    broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
 
-        nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { };
+    nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { };
 
-        nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { };
-        nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
-        nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { };
+    nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { };
+    nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
+    nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { };
 
-        openafsClient = callPackage ../servers/openafs-client { };
+    openafsClient = callPackage ../servers/openafs-client { };
 
-        openiscsi = callPackage ../os-specific/linux/open-iscsi { };
+    openiscsi = callPackage ../os-specific/linux/open-iscsi { };
 
-        wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };
+    wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };
 
-        kqemu = callPackage ../os-specific/linux/kqemu { };
+    kqemu = callPackage ../os-specific/linux/kqemu { };
 
-        klibc = callPackage ../os-specific/linux/klibc {
-          linuxHeaders = glibc.kernelHeaders;
-        };
+    klibc = callPackage ../os-specific/linux/klibc {
+      linuxHeaders = glibc.kernelHeaders;
+    };
 
-        splashutils = let hasFbConDecor = if self.kernel ? features
-          then self.kernel.features ? fbConDecor
-          else self.kernel.config.isEnabled "FB_CON_DECOR";
-        in if hasFbConDecor then pkgs.splashutils else null;
+    splashutils = let hasFbConDecor = if self.kernel ? features
+      then self.kernel.features ? fbConDecor
+      else self.kernel.config.isEnabled "FB_CON_DECOR";
+    in if hasFbConDecor then pkgs.splashutils else null;
 
-        /* compiles but has to be integrated into the kernel somehow
-           Let's have it uncommented and finish it..
-        */
-        ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { };
+    /* compiles but has to be integrated into the kernel somehow
+       Let's have it uncommented and finish it..
+    */
+    ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { };
 
-        perf = callPackage ../os-specific/linux/kernel/perf.nix { };
+    perf = callPackage ../os-specific/linux/kernel/perf.nix { };
 
-        spl = callPackage ../os-specific/linux/spl/default.nix { };
+    spl = callPackage ../os-specific/linux/spl/default.nix { };
 
-        sysprof = callPackage ../development/tools/profiling/sysprof {
-          inherit (gnome) libglade;
-        };
+    sysprof = callPackage ../development/tools/profiling/sysprof {
+      inherit (gnome) libglade;
+    };
 
-        systemtap = callPackage ../development/tools/profiling/systemtap {
-          linux = self.kernel;
-          inherit (gnome) libglademm;
-        };
+    systemtap = callPackage ../development/tools/profiling/systemtap {
+      linux = self.kernelDev;
+      inherit (gnome) libglademm;
+    };
 
-        tp_smapi = callPackage ../os-specific/linux/tp_smapi { };
+    tp_smapi = callPackage ../os-specific/linux/tp_smapi { };
 
-        v86d = callPackage ../os-specific/linux/v86d { };
+    v86d = callPackage ../os-specific/linux/v86d { };
 
-        virtualbox = callPackage ../applications/virtualization/virtualbox {
-          stdenv = stdenv_32bit;
-          inherit (gnome) libIDL;
-        };
+    virtualbox = callPackage ../applications/virtualization/virtualbox {
+      stdenv = stdenv_32bit;
+      inherit (gnome) libIDL;
+    };
 
-        virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { };
+    virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { };
 
-        zfs = callPackage ../os-specific/linux/zfs/default.nix { };
-      };
-    in (self // { kernel = self.kernel.out; });
+    zfs = callPackage ../os-specific/linux/zfs/default.nix { };
+  };
 
   # Build the kernel modules for the some of the kernels.
-  linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32);
-  linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35);
-  linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0);
-  linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2);
-  linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen);
-  linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4);
-  linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi);
-  linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7);
-  linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8);
+  linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 linuxPackages_2_6_32);
+  linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 linuxPackages_2_6_35);
+  linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0);
+  linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
+  linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen);
+  linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
+  linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi);
+  linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7);
+  linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8);
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;

From 98860f429ddd01ed14f2a6802e5e2d024d1cc352 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 24 Mar 2013 08:29:10 -0400
Subject: [PATCH 139/394] Add the addPassthru library function

With multiple outputs, adding attributes to a derivation without
changing the {drv,out}Path is no longer as trivial as simply using the
`//' operator, as we usually want to add the attribute to _each_ output,
and even if we only care about one that one output can be reached via
multiple paths.

For stdenv.mkDerivation, we already had code in place to add passthru
and meta attributes to derivations. This commit simply factors part of
that code out into a lib function addPassthru, which takes a derivation
and an attribute set and appends the attribute set to each output of the
derivation.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/lib/customisation.nix      | 17 +++++++
 pkgs/stdenv/generic/default.nix | 89 ++++++++++++++-------------------
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix
index 18cec3209f97..a35b44e9f6ee 100644
--- a/pkgs/lib/customisation.nix
+++ b/pkgs/lib/customisation.nix
@@ -99,4 +99,21 @@ rec {
     let f = if builtins.isFunction fn then fn else import fn; in
     makeOverridable f ((builtins.intersectAttrs (builtins.functionArgs f) autoArgs) // args);
 
+  /* Add attributes to each output of a derivation without changing the derivation itself */
+  addPassthru = drv: passthru:
+    let
+      outputs = drv.outputs or [ "out" ];
+
+      commonAttrs = drv // (builtins.listToAttrs outputsList) //
+        ({ all = map (x: x.value) outputsList; }) // passthru;
+
+      outputToAttrListElement = outputName:
+        { name = outputName;
+          value = commonAttrs // {
+            inherit (builtins.getAttr outputName drv) outPath drvPath type outputName;
+          };
+        };
+
+      outputsList = map outputToAttrListElement outputs;
+  in builtins.getAttr drv.outputName commonAttrs;
 }
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index fd7b3218e347..fe4bbbc94dd6 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -52,59 +52,44 @@ let
           if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable" || l == lib.licenses.proprietary) then
             throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate"
           else
-            let
-              drv = derivation (
-                (removeAttrs attrs ["meta" "passthru" "crossAttrs"])
-                // (let
-                  buildInputs = attrs.buildInputs or [];
-                  nativeBuildInputs = attrs.nativeBuildInputs or [];
-                  propagatedBuildInputs = attrs.propagatedBuildInputs or [];
-                  propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or [];
-                  crossConfig = attrs.crossConfig or null;
-                in
-                {
-                  builder = attrs.realBuilder or shell;
-                  args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
-                  stdenv = result;
-                  system = result.system;
-                  userHook = config.stdenv.userHook or null;
+            lib.addPassthru (derivation (
+              (removeAttrs attrs ["meta" "passthru" "crossAttrs"])
+              // (let
+                buildInputs = attrs.buildInputs or [];
+                nativeBuildInputs = attrs.nativeBuildInputs or [];
+                propagatedBuildInputs = attrs.propagatedBuildInputs or [];
+                propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or [];
+                crossConfig = attrs.crossConfig or null;
+              in
+              {
+                builder = attrs.realBuilder or shell;
+                args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
+                stdenv = result;
+                system = result.system;
+                userHook = config.stdenv.userHook or null;
 
-                  # Inputs built by the cross compiler.
-                  buildInputs = lib.optionals (crossConfig != null) buildInputs;
-                  propagatedBuildInputs = lib.optionals (crossConfig != null)
-                      propagatedBuildInputs;
-                  # Inputs built by the usual native compiler.
-                  nativeBuildInputs = nativeBuildInputs ++ lib.optionals
-                    (crossConfig == null) buildInputs;
-                  propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
-                    lib.optionals (crossConfig == null) propagatedBuildInputs;
-              }));
-
-              outputs = drv.outputs or [ "out" ];
-
-              commonAttrs = drv // (builtins.listToAttrs outputsList) //
-                ({ all = map (x: x.value) outputsList;
-                  # The meta attribute is passed in the resulting attribute set,
-                  # but it's not part of the actual derivation, i.e., it's not
-                  # passed to the builder and is not a dependency.  But since we
-                  # include it in the result, it *is* available to nix-env for
-                  # queries.
-                  meta = attrs.meta or {};
-                }) //
-                # Pass through extra attributes that are not inputs, but
-                # should be made available to Nix expressions using the
-                # derivation (e.g., in assertions).
-                (attrs.passthru or {});
-
-              outputToAttrListElement = outputName:
-                { name = outputName;
-                  value = commonAttrs // {
-                    inherit (builtins.getAttr outputName drv) outPath drvPath type outputName;
-                  };
-                };
-
-              outputsList = map outputToAttrListElement outputs;
-            in (builtins.head outputsList).value;
+                # Inputs built by the cross compiler.
+                buildInputs = lib.optionals (crossConfig != null) buildInputs;
+                propagatedBuildInputs = lib.optionals (crossConfig != null)
+                    propagatedBuildInputs;
+                # Inputs built by the usual native compiler.
+                nativeBuildInputs = nativeBuildInputs ++ lib.optionals
+                  (crossConfig == null) buildInputs;
+                propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
+                  lib.optionals (crossConfig == null) propagatedBuildInputs;
+            }))) (
+            {
+              # The meta attribute is passed in the resulting attribute set,
+              # but it's not part of the actual derivation, i.e., it's not
+              # passed to the builder and is not a dependency.  But since we
+              # include it in the result, it *is* available to nix-env for
+              # queries.
+              meta = attrs.meta or {};
+            } //
+            # Pass through extra attributes that are not inputs, but
+            # should be made available to Nix expressions using the
+            # derivation (e.g., in assertions).
+            (attrs.passthru or {}));
 
         # Utility flags to test the type of platform.
         isDarwin = result.system == "x86_64-darwin";

From c93aebb87e373248e774820fe27979de141d7eb3 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sun, 24 Mar 2013 14:43:20 +0100
Subject: [PATCH 140/394] get iptraf to compile

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

diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix
index 8ddf784adc04..1d4c772d6f7c 100644
--- a/pkgs/applications/networking/iptraf/default.nix
+++ b/pkgs/applications/networking/iptraf/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "0qsi5f8d84mgdszvz22acyv6mjnbrpk55d54km9i5mkkapck7r4y";
   };
 
+  patchPhase = ''
+    sed -i -e 's,#include <linux/if_tr.h>,#include <netinet/if_tr.h>,' src/*
+  '';
+
   preConfigure = "cd src";
 
   installPhase = ''

From 1670613203b4ba2be939d6dd50dd50680cf25b56 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 17:33:26 +0100
Subject: [PATCH 141/394] haskell-editline: add myself as maintainer

---
 pkgs/development/libraries/haskell/editline/0.2.1.1.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix
index cf9f1e099a2a..af6ca841c7a3 100644
--- a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix
+++ b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix
@@ -10,5 +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.simons ];
   };
 })

From b6aaccc8166c2054437c17613b7f1978cd2b4cc2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 17:33:52 +0100
Subject: [PATCH 142/394] haskell-attoparsec-conduit: update to version 1.0.1

---
 .../libraries/haskell/attoparsec-conduit/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index d05b6a0c3e09..690196c80ffd 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-conduit";
-  version = "1.0.0";
-  sha256 = "1aw071qcwhxwpd6azhgaiia97rhj50rms4pysbc19iihmdih3ib8";
+  version = "1.0.1";
+  sha256 = "14b6ym5sjvg1x82ijydhrjk5445kg0fvwqzqwqld59akbqb6fpg5";
   buildDepends = [ attoparsec conduit text transformers ];
   testDepends = [ attoparsec conduit hspec resourcet text ];
   meta = {

From 17a4e0f13c1e83f43e6cb6a890127ca7848fcf8c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 17:33:53 +0100
Subject: [PATCH 143/394] haskell-blaze-builder: update to version 0.3.1.1

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

diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
index f58353938950..ffd307bf13e6 100644
--- a/pkgs/development/libraries/haskell/blaze-builder/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder";
-  version = "0.3.1.0";
-  sha256 = "192pqmr6mcjnflqpvp93nycfbdi0ifab8ifvrxvmwbrdkiidvai6";
+  version = "0.3.1.1";
+  sha256 = "1pnw5kjpyxf3mh72cb9a0f1qwpq3a2bkgqp1j3ny8l6nmzw0c9d1";
   buildDepends = [ text ];
   meta = {
     homepage = "http://github.com/meiersi/blaze-builder";

From 9497164f619f09c9ccf7f06612cd9d1689e2e124 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 17:33:53 +0100
Subject: [PATCH 144/394] haskell-conduit: update to version 1.0.4.1

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index f13691b471e9..4d0650747d13 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.4";
-  sha256 = "1y97wc273i3qvq4nqp9kr3bgl8mca257hv92f3lbq2wzqkr5vahk";
+  version = "1.0.4.1";
+  sha256 = "1fihn6ixs6cmim5y605w2mzjrcwplr58r835wq9k3arb25d5wnys";
   buildDepends = [
     liftedBase mmorph monadControl resourcet text transformers
     transformersBase void
@@ -13,7 +13,6 @@ cabal.mkDerivation (self: {
   testDepends = [
     doctest hspec QuickCheck resourcet text transformers void
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Streaming data processing library";

From 40b194caf91e78e5ddc3dc5968c7c6eee4b3d34e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 17:33:53 +0100
Subject: [PATCH 145/394] haskell-diagrams-contrib: update to version 0.6.1

---
 .../libraries/haskell/diagrams/contrib.nix           | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index 2e29a6c614a3..12c72e12665b 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -1,14 +1,16 @@
-{ cabal, colour, dataDefault, diagramsLib, forceLayout, HUnit, lens
-, mtl, QuickCheck, testFramework, testFrameworkHunit
+{ cabal, arithmoi, circlePacking, colour, dataDefault, diagramsCore
+, diagramsLib, forceLayout, HUnit, lens, MonadRandom, mtl
+, QuickCheck, split, testFramework, testFrameworkHunit
 , testFrameworkQuickcheck2, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "0.6.0.4";
-  sha256 = "190wn56bmrpbijsxf793xbjy1a4rci3vj40ri6i2dv3an6p0ka0q";
+  version = "0.6.1";
+  sha256 = "0z92sfgqpfk401lzkvnsg3ij05795qc61c4lx12glbmdpfhilcpi";
   buildDepends = [
-    colour dataDefault diagramsLib forceLayout lens mtl vectorSpace
+    arithmoi circlePacking colour dataDefault diagramsCore diagramsLib
+    forceLayout lens MonadRandom mtl split vectorSpace
   ];
   testDepends = [
     diagramsLib HUnit QuickCheck testFramework testFrameworkHunit

From 62480ce4048b5868585fac2744257bb6d6d868c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 17:33:53 +0100
Subject: [PATCH 146/394] haskell-hamlet: update to version 1.1.7

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

diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 883eb825fecf..22acb85788d6 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.6.4";
-  sha256 = "1cjv32sajwq9lhgh3a8xb0z6j89121k8ndp6g21lmbdzc9fhpws0";
+  version = "1.1.7";
+  sha256 = "0vx2z8zvlr3860cypa3lkd8q51k6gngw65jqcbik3bxfbjj2qcv3";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
   ];

From 194673f1f5e6a815266d5dcd6ab42db6547e2cdd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 17:33:53 +0100
Subject: [PATCH 147/394] haskell-wai-extra: update to version 1.3.3.2

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

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index d8c48f0e56af..ec1bd1d3b683 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.3.3.1";
-  sha256 = "0ss58s5m8yp326q0651znifbfl6kpimyhm479wx8r3zx3ndl47q9";
+  version = "1.3.3.2";
+  sha256 = "0kw1v68a8dxpxg87r2vjah6n5906mw6cnyy2xx0jbk95qx5g5z8y";
   buildDepends = [
     ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
     conduit dataDefault dateCache fastLogger httpTypes network
@@ -19,7 +19,6 @@ cabal.mkDerivation (self: {
     blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit
     text transformers wai waiTest zlib zlibBindings
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://github.com/yesodweb/wai";
     description = "Provides some basic WAI handlers and middleware";

From 8de45f4da4ae894c309762b9e22867f1deb9e104 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 17:44:05 +0100
Subject: [PATCH 148/394] haskell-arithmoi: add version 0.4.0.3

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

diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix
new file mode 100644
index 000000000000..181937fdd807
--- /dev/null
+++ b/pkgs/development/libraries/haskell/arithmoi/default.nix
@@ -0,0 +1,14 @@
+{ cabal, mtl, random }:
+
+cabal.mkDerivation (self: {
+  pname = "arithmoi";
+  version = "0.4.0.3";
+  sha256 = "0idn312xzly636h13zmm7cw7ki64bpnniqc97nshqzgp8if5ycrc";
+  buildDepends = [ mtl random ];
+  meta = {
+    homepage = "https://bitbucket.org/dafis/arithmoi";
+    description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1db252bc97a1..ba83bd2a4d2a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -468,6 +468,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {};
 
+  arithmoi = callPackage ../development/libraries/haskell/arithmoi {};
+
   arrows = callPackage ../development/libraries/haskell/arrows {};
 
   asn1Data = callPackage ../development/libraries/haskell/asn1-data {};

From 6f8532316401c17ed30c19f0717b78efcd9c837f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 18:08:35 +0100
Subject: [PATCH 149/394] haskell-circle-packing: add version 0.1.0.2

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

diff --git a/pkgs/development/libraries/haskell/circle-packing/default.nix b/pkgs/development/libraries/haskell/circle-packing/default.nix
new file mode 100644
index 000000000000..bffc72cf73e0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/circle-packing/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "circle-packing";
+  version = "0.1.0.2";
+  sha256 = "182fadwlf6j3jhlfjskaddaickgcb07wlb7fh42yip2680gh9k1j";
+  meta = {
+    description = "Simple heuristic for packing discs of varying radii in a circle";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ba83bd2a4d2a..33e5bd430d7b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -609,6 +609,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cipherRc4 = callPackage ../development/libraries/haskell/cipher-rc4 {};
 
+  circlePacking = callPackage ../development/libraries/haskell/circle-packing {};
+
   classyPrelude = callPackage ../development/libraries/haskell/classy-prelude {};
 
   classyPreludeConduit = callPackage ../development/libraries/haskell/classy-prelude-conduit {};

From a06ec6bb621c0532793e6017edfb123bf78db163 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 22:45:21 +0100
Subject: [PATCH 150/394] pkgs/lib/licenses.nix: add 'unfree' and
 'unfree-redistributable' licenses

---
 pkgs/lib/licenses.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index e1743bddf697..42ef0e816d98 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -187,7 +187,17 @@
     fullName = "Tcl/Tk license";
     url = http://www.tcl.tk/software/tcltk/license.html;
   };
-  
+
+  unfree = {
+    shortName = "unfree";
+    fullName = "unfree non-redistributable license";
+  };
+
+  unfreeRedistributable = {
+    shortName = "unfree-redistributable";
+    fullName = "unfree redistributable license";
+  };
+
   zlib = {
     shortName = "zlib";
     fullName = "zlib license";

From 3388c3433e10149da9bdef4f871452744f586ebc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 22:45:48 +0100
Subject: [PATCH 151/394] pkgs/lib/licenses.nix: strip trailing whitespace

---
 pkgs/lib/licenses.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 42ef0e816d98..634a20e720a9 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -9,7 +9,7 @@
     fullName = "Apache Software License 2.0";
     url = http://www.apache.org/licenses/LICENSE-2.0;
   };
-  
+
   boost = {
     shortName = "boost";
     fullName = "Boost Software License";
@@ -57,13 +57,13 @@
     fullName = "GNU General Public License version 2 only";
     url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html;
   };
-    
+
   gpl2Oss = {
     shortName = "GPLv2+OSS";
     fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)";
     url = http://www.mysql.com/about/legal/licensing/foss-exception;
   };
-  
+
   gpl2Plus = {
     shortName = "GPLv2+";
     fullName = "GNU General Public License version 2 or later";
@@ -75,7 +75,7 @@
     fullName = "GNU General Public License version 3 only";
     url = http://www.fsf.org/licensing/licenses/gpl.html;
   };
-  
+
   gpl3Plus = {
     shortName = "GPLv3+";
     fullName = "GNU General Public License version 3 or later";
@@ -111,66 +111,66 @@
     fullName = "libtiff license";
     url = https://fedoraproject.org/wiki/Licensing/libtiff;
   };
-  
+
   lgpl2 = {
     shortName = "LGPLv2";
     fullName = "GNU Library General Public License version 2";
     url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
   };
-  
+
   lgpl2Plus = {
     shortName = "LGPLv2+";
     fullName = "GNU Library General Public License version 2 or later";
     url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
   };
-  
+
   lgpl21 = {
     shortName = "LGPLv2.1";
     fullName = "GNU Lesser General Public License version 2.1 only";
     url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html;
   };
-  
+
   lgpl21Plus = {
     shortName = "LGPLv2.1+";
     fullName = "GNU Lesser General Public License version 2.1 or later";
     url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html;
   };
-  
+
   lgpl3 = {
     shortName = "LGPLv3";
     fullName = "GNU Lesser General Public License version 3 only";
     url = http://www.fsf.org/licensing/licenses/lgpl.html;
   };
-  
+
   lgpl3Plus = {
     shortName = "LGPLv3+";
     fullName = "GNU Lesser General Public License version 3 or later";
     url = http://www.fsf.org/licensing/licenses/lgpl.html;
   };
-  
+
   mit = {
     shortName = "MIT";
     fullName = "MIT/X11 license";
     url = http://www.opensource.org/licenses/mit-license.php;
   };
-  
+
   mpl11 = {
     shortName = "MPL1.1";
     fullName = "Mozilla Public License version 1.1";
     url = http://www.mozilla.org/MPL/MPL-1.1.html;
   };
-  
+
   openssl = {
     shortName = "openssl";
     fullName = "OpenSSL license";
     url = http://www.openssl.org/source/license.html;
   };
-  
+
   publicDomain = {
     shortName = "Public Domain";
     fullname = "Public Domain";
   };
-  
+
   psfl = {
     shortName = "PSFL";
     fullName = "Python Software Foundation License";

From 41020224ad0fbcb437ece8d10ce652f519061fc7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 22:47:12 +0100
Subject: [PATCH 152/394] nvidia-x11: use the brand-new
 'unfree-redistributable' license for this package

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 2ef590fcafc5..08d55fc6ec61 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "X.org driver and kernel module for NVIDIA graphics cards";
-    license = stdenv.lib.licenses.proprietary;
+    license = stdenv.lib.licenses.unfreeRedistributable;
   };
 }

From d2fff5ed2267a194d827e5c6fdd6f91276839ca3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Mar 2013 23:32:14 +0100
Subject: [PATCH 153/394] gnulib: add version 0.0-7898-gdb9cad7

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

diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
new file mode 100644
index 000000000000..ee8f396708bb
--- /dev/null
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -0,0 +1,7 @@
+{ stdenv, fetchgit }:
+
+stdenv.lib.setName "gnulib-0.0-7898-gdb9cad7" (fetchgit {
+  url = "http://git.savannah.gnu.org/r/gnulib.git";
+  rev = "db9cad7b8b59a010ff9158513a29cb002a2b8ae1";
+  sha256 = "1azdz7mhx1jf0l17wn7zp591wxry0ys4g29ycij5mai7vzhddjn6";
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec2a13e138e5..39fdc0a2f348 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -847,6 +847,8 @@ let
         libiconv = if gnu then null else libiconv;
       };
 
+  gnulib = callPackage ../development/tools/gnulib { };
+
   gnupatch = callPackage ../tools/text/gnupatch { };
 
   gnupg1orig = callPackage ../tools/security/gnupg1 {

From 7b35dcdc623c539ee47b19fff9d6facab2fd3ef5 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Sun, 24 Mar 2013 23:43:18 +0100
Subject: [PATCH 154/394] ProofGeneral: remove dead code (compatibility with
 emacs 23).

---
 pkgs/applications/editors/emacs-modes/proofgeneral/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
index fba3c71e36ad..6ac698ed75f5 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
@@ -22,9 +22,6 @@ stdenv.mkDerivation (rec {
        # @image{ProofGeneral} fails, so remove it.
        sed -i '94d' doc/PG-adapting.texi
        sed -i '101d' doc/ProofGeneral.texi
-
-       # Emacs 24 compatibility.
-       #sed -i 's|interactive-p|called-interactively-p '\'''any|' isar/isabelle-system.el generic/proof-{menu,script,splash}.el lib/scomint.el
     '';
 
   preBuild = ''

From 438e23b45b59344da50fcdab2396a8b6e8871702 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 00:01:56 +0100
Subject: [PATCH 155/394] htop: update to version 1.0.2

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

diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix
index 52db202a15f0..613adb5f5d2f 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "htop-1.0.1";
+  name = "htop-1.0.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/htop/${name}.tar.gz";
-    sha256 = "1wh62mb102nxd5h3pnzakdf0lcyapv1yq44ndcc9wpw30az2rnq7";
+    sha256 = "18fqrhvnm7h4c3939av8lpiwrwxbyw6hcly0jvq0vkjf0ixnaq7f";
   };
 
   buildInputs = [ ncurses ];
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
     description = "An interactive process viewer for Linux";
     homepage = "http://htop.sourceforge.net";
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.rob ];
+    maintainers = [ stdenv.lib.maintainers.rob stdenv.lib.maintainers.simons ];
   };
 }

From 94a3a5e00a6986d2520dee972c3235fc0d51f028 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Sun, 24 Mar 2013 22:08:09 -0700
Subject: [PATCH 156/394] shntool-3.0.10

---
 pkgs/applications/audio/shntool/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/audio/shntool/default.nix

diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix
new file mode 100644
index 000000000000..68fb8bfb1423
--- /dev/null
+++ b/pkgs/applications/audio/shntool/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, flac }:
+
+stdenv.mkDerivation rec {
+  version = "3.0.10";
+  name = "shntool-${version}";
+
+  src = fetchurl {
+    url = http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz;
+    sha256 = "00i1rbjaaws3drkhiczaign3lnbhr161b7rbnjr8z83w8yn2wc3l";
+  };
+
+  buildInputs = [ flac ];
+
+  meta = {
+    description = "multi-purpose WAVE data processing and reporting utility";
+    homepage = http://www.etree.org/shnutils/shntool/;
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e269b6f97d5..bb35ee95dd64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7762,6 +7762,8 @@ let
     guile = guile_1_8;
   };
 
+  shntool = callPackage ../applications/audio/shntool { };
+
   sonic_visualiser = callPackage ../applications/audio/sonic-visualiser {
     inherit (pkgs.vamp) vampSDK;
     inherit (pkgs.xlibs) libX11;

From 9f7aef51eaf86869a7f3d87e733d5af5a7868dbe Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Mon, 25 Mar 2013 07:17:20 +0100
Subject: [PATCH 157/394] Revert "chromium-25.0.1364.172, 26.0.1410.40,
 27.0.1448.0"

This reverts commit 6617f5ca9e92f307c468018a7d05c8c080c5441e.

The old situation was definitely better. Sorry for waiting so long for
the revert.
---
 .../networking/browsers/chromium/sources.nix   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index eabdc35eb078..a14b10fcfde7 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "27.0.1448.0";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1448.0.tar.bz2";
-    sha256 = "";
+    version = "26.0.1410.28";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
+    sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
   };
   beta = {
-    version = "26.0.1410.40";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.40-lite.tar.xz";
-    sha256 = "0f0kfdiqbkh9jwgqg034bkfkr0snbig4ifydqfka7gcxjqwxr32h";
+    version = "26.0.1410.28";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
+    sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
   };
   stable = {
-    version = "25.0.1364.172";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.172.tar.bz2";
-    sha256 = "124j6w3z385mg7r0nlbapalnrjrmrsj9qfz0dni6jz6pvdhzz8qw";
+    version = "25.0.1364.152";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.152.tar.bz2";
+    sha256 = "1v8zpqk3q21d5hars1clss75n187hlg4zxbr68jj1ysmqclzbni8";
   };
 }

From b1200f1a28d9a96dac4476afa1f29b23f8e64aa9 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 22 Mar 2013 21:23:25 +0100
Subject: [PATCH 158/394] mongodb: upgrade to 2.4.0

---
 pkgs/servers/nosql/mongodb/default.nix | 13 ++++++-------
 pkgs/top-level/all-packages.nix        |  4 +---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 345234ba25e8..d99cff6b667b 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, scons, which, v8, useV8 ? false}:
+{ stdenv, fetchurl, scons, which, v8}:
 
 with stdenv.lib;
 
@@ -9,11 +9,11 @@ let installerPatch = fetchurl {
 
 in
 stdenv.mkDerivation rec {
-  name = "mongodb-2.2.0";
+  name = "mongodb-2.4.0";
 
   src = fetchurl {
-    url = http://downloads.mongodb.org/src/mongodb-src-r2.2.0.tar.gz;
-    sha256 = "12v0cpq9j2gmagr9pbw08karqwqgl4j9r223w7x7sx5cfvj2cih8";
+    url = http://downloads.mongodb.org/src/mongodb-src-r2.4.0.tar.gz;
+    sha256 = "115wrw23naxpaiwh8ar6g40f2nsdbz1hdpkp88wbi5yc9m6drg41";
   };
 
   nativeBuildInputs = [ scons which ];
@@ -24,18 +24,17 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace SConstruct --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR"
-  '' + optionalString useV8 ''
     substituteInPlace SConstruct --replace "#/../v8" "${v8}" \
                                  --replace "[\"${v8}/\"]" "[\"${v8}/lib\"]"
   '';
 
   buildPhase = ''
     echo $PATH
-    scons all --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"}
+    scons all --cc=`which gcc` --cxx=`which g++`
   '';
 
   installPhase = ''
-    scons install --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"} --full --prefix=$out
+    scons install --cc=`which gcc` --cxx=`which g++` --full --prefix=$out
     rm -rf $out/lib64 # exact same files as installed in $out/lib
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39fdc0a2f348..aff1585c768b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5464,9 +5464,7 @@ let
 
   #monetdb = callPackage ../servers/sql/monetdb { };
 
-  mongodb = callPackage ../servers/nosql/mongodb {
-    useV8 = (config.mongodb.useV8 or false);
-  };
+  mongodb = callPackage ../servers/nosql/mongodb { };
 
   mysql4 = import ../servers/sql/mysql {
     inherit fetchurl stdenv ncurses zlib perl;

From fa2d85fded5b155ee9b95205195ae84e4cb7d66c Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Mon, 25 Mar 2013 10:56:57 +0100
Subject: [PATCH 159/394] Update HOL Light to rev 157

---
 .../science/logic/hol_light/default.nix        | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 3ba9e7eb49f6..f9549241a45c 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -4,28 +4,20 @@ let
   start_script = ''
     #!/bin/sh
     cd "$out/lib/hol_light"
-    exec ${ocaml}/bin/ocaml -I "$(ocamlfind query camlp5)" -init make.ml
+    exec ${ocaml}/bin/ocaml -I "camlp5 -where" -init make.ml
   '';
 in
 
 stdenv.mkDerivation {
-  name = "hol_light-20130124";
+  name = "hol_light-20130324";
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "155";
-    sha256 = "057223kcv7y2vcnyzvrygvdafn6mb7ycr1m5rj3fsrwz0yl8dqnr";
+    rev = "157";
+    sha256 = "0d0pbnkw2gb11dn30ggfl91lhdxv86kd1fyiqn170w08n0gi805f";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];
 
-  buildPhase = ''
-    make pa_j.ml
-    ocamlc -c \
-      -pp "camlp5r pa_lexer.cmo pa_extend.cmo q_MLast.cmo" \
-      -I "$(ocamlfind query camlp5)" \
-      pa_j.ml
-  '';
-
   installPhase = ''
     mkdir -p "$out/lib/hol_light" "$out/bin"
     cp -a  . $out/lib/hol_light
@@ -45,6 +37,6 @@ can extend it with new theorems and inference rules without compromising its
 soundness.
     '';
     homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
-    license = "BSD";
+    license = stdenv.lib.licenses.bsd2;
   };
 }

From aff27c669eb86476dbc0e18b6a7909c32cad9fad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 11:39:50 +0100
Subject: [PATCH 160/394] haskell-cuda: add version 0.5.0.1

---
 .../haskell/cuda/{default.nix => 0.4.1.1.nix} |  0
 .../libraries/haskell/cuda/0.5.0.1.nix        | 42 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  6 ++-
 3 files changed, 47 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/cuda/{default.nix => 0.4.1.1.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/cuda/0.5.0.1.nix

diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/0.4.1.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/cuda/default.nix
rename to pkgs/development/libraries/haskell/cuda/0.4.1.1.nix
diff --git a/pkgs/development/libraries/haskell/cuda/0.5.0.1.nix b/pkgs/development/libraries/haskell/cuda/0.5.0.1.nix
new file mode 100644
index 000000000000..0d9a594ff5c3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cuda/0.5.0.1.nix
@@ -0,0 +1,42 @@
+{ cabal, c2hs, cudatoolkit, nvidia_x11 }:
+
+cabal.mkDerivation (self: {
+  pname = "cuda";
+  version = "0.5.0.1";
+  sha256 = "0gxkf97c4cm9d7kk0izgz3m44ycys1lcl4bq828c6l1wim1xz28b";
+  buildTools = [ c2hs ];
+  extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];
+  doCheck = false;
+  # Perhaps this should be the default in cabal.nix ...
+  #
+  # The cudatoolkit provides both 64 and 32-bit versions of the
+  # library. GHC's linker fails if the wrong version is found first.
+  # We solve this by eliminating lib64 from the path on 32-bit
+  # platforms and putting lib64 first on 64-bit platforms.
+  libPaths = if self.stdenv.is64bit then "lib64 lib" else "lib";
+  configurePhase = ''
+    for i in Setup.hs Setup.lhs; do
+      test -f $i && ghc --make $i
+    done
+    for p in $extraBuildInputs $propagatedNativeBuildInputs; do
+      if [ -d "$p/include" ]; then
+        extraLibDirs="$extraLibDirs --extra-include-dir=$p/include"
+      fi
+      for d in $libPaths; do
+        if [ -d "$p/$d" ]; then
+          extraLibDirs="$extraLibDirs --extra-lib-dir=$p/$d"
+        fi
+      done
+    done
+    ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags
+  '';
+  meta = {
+    description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.stdenv.lib.platforms.none;
+    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 33e5bd430d7b..0e796f4bf4c9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -675,9 +675,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cryptoRandomApi = callPackage ../development/libraries/haskell/crypto-random-api {};
 
-  cuda = callPackage ../development/libraries/haskell/cuda {
+  cuda_0_4_1_1 = callPackage ../development/libraries/haskell/cuda/0.4.1.1.nix {
     inherit (pkgs.linuxPackages) nvidia_x11;
   };
+  cuda_0_5_0_1 = callPackage ../development/libraries/haskell/cuda/0.5.0.1.nix {
+    inherit (pkgs.linuxPackages) nvidia_x11;
+  };
+  cuda = self.cuda_0_4_1_1;
 
   csv = callPackage ../development/libraries/haskell/csv {};
 

From 7943ac41cd28c1ae19e8ab81e51b7fe41310bf23 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 11:40:12 +0100
Subject: [PATCH 161/394] haskell-circle-packing: add myself as maintainer

---
 pkgs/development/libraries/haskell/arithmoi/default.nix       | 1 +
 pkgs/development/libraries/haskell/circle-packing/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix
index 181937fdd807..1f54347986be 100644
--- a/pkgs/development/libraries/haskell/arithmoi/default.nix
+++ b/pkgs/development/libraries/haskell/arithmoi/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/circle-packing/default.nix b/pkgs/development/libraries/haskell/circle-packing/default.nix
index bffc72cf73e0..a8ca3c699cc4 100644
--- a/pkgs/development/libraries/haskell/circle-packing/default.nix
+++ b/pkgs/development/libraries/haskell/circle-packing/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "Simple heuristic for packing discs of varying radii in a circle";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })

From 67c9b39b60f030c6940a106ad375f26b0e3de04f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 11:40:29 +0100
Subject: [PATCH 162/394] haskell-hakyll: update to version 4.2.2.0

---
 .../libraries/haskell/hakyll/default.nix      | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 792c49f51f10..ce81a4c68320 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -1,26 +1,29 @@
 { cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs
-, cryptohash, deepseq, filepath, httpConduit, httpTypes, HUnit
-, lrucache, mtl, pandoc, parsec, QuickCheck, random, regexBase
-, regexTdfa, snapCore, snapServer, tagsoup, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text, time
+, cryptohash, dataDefault, deepseq, filepath, httpConduit
+, httpTypes, HUnit, lrucache, mtl, pandoc, parsec, QuickCheck
+, random, regexBase, regexTdfa, snapCore, snapServer, tagsoup
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
+, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.2.1.2";
-  sha256 = "0b2jmi9hi5l72lkyjn2w3gwn52zvnvv7c10x5329hp000gzmwbvi";
+  version = "4.2.2.0";
+  sha256 = "0kz8v2ip0hmvqnrxgv44g2863z1dql88razl7aa3fw01q56ihz0y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq
-    filepath httpConduit httpTypes lrucache mtl pandoc parsec random
-    regexBase regexTdfa snapCore snapServer tagsoup text time
+    binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash
+    dataDefault deepseq filepath httpConduit httpTypes lrucache mtl
+    pandoc parsec random regexBase regexTdfa snapCore snapServer
+    tagsoup text time
   ];
   testDepends = [
-    binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq
-    filepath httpConduit httpTypes HUnit lrucache mtl pandoc parsec
-    QuickCheck random regexBase regexTdfa snapCore snapServer tagsoup
-    testFramework testFrameworkHunit testFrameworkQuickcheck2 text time
+    binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash
+    dataDefault deepseq filepath httpConduit httpTypes HUnit lrucache
+    mtl pandoc parsec QuickCheck random regexBase regexTdfa snapCore
+    snapServer tagsoup testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 text time
   ];
   doCheck = false;
   meta = {

From b08ba87b36ec766c0e163c9aaac2a9eeeee7618e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 12:36:12 +0100
Subject: [PATCH 163/394] rsync: add meta.license attribute

---
 pkgs/applications/networking/sync/rsync/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 32b531528d05..5447b21009ff 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://samba.anu.edu.au/rsync/;
     description = "A fast incremental file transfer utility";
+    license = stdenv.lib.licenses.gpl3Plus;
 
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.simons ];

From 03149a85dc3dd7a3120e1ad2ebee24891e527b59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 12:36:32 +0100
Subject: [PATCH 164/394] rsync: fix build an FreeBSD (by disabling ACL
 support)

---
 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 aff1585c768b..1653e26cda5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7704,7 +7704,7 @@ let
   };
 
   rsync = callPackage ../applications/networking/sync/rsync {
-    enableACLs = !(stdenv.isDarwin || stdenv.isSunOS);
+    enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);
     enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false);
   };
 

From ac86eed59c6464584a48ac5109551ab47e0bae0b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 12:37:13 +0100
Subject: [PATCH 165/394] gnumake: disable test suite on FreeBSD

One test fails, unfortunately, but I'm not sure what to do about it.
---
 pkgs/development/tools/build-managers/gnumake/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index 731664f99132..4f3c7defa488 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   /* On Darwin, there are 3 test failures that haven't been investigated
      yet.  */
-  doCheck = !stdenv.isDarwin;
+  doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD;
 
   patches =
     [

From 16863d8ffe24649fb6a7500f2b457dd2e559de47 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 12:40:41 +0100
Subject: [PATCH 166/394] libxslt: fix impurity on 'native-stdenv' platforms

libxslt has optional dependencies which may be found in /usr or
/usr/local on platforms that have a native stdenv. With those features
enabled, the build generated binaries that depend on libraries outside
of the store. In this particular case, the NixOS channel had binaries
for FreeBSD that depended on libgcrypt, apparently because that packages
happens to be installed outside of Nix on the build machine. On other
machines, however, those binaries failed with unresolvable references.
---
 pkgs/development/libraries/libxslt/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index d3b7769754e9..b1fef59c8610 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -8,7 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "09ky3vhlaahvsb0q9gp6h3as53pfj70gincirachjqzj46jdka5n";
   };
 
-  buildInputs = [ libxml2 ];
+  configureFlags = [
+    "--with-libxml-prefix=${libxml2}"
+    "--without-python"
+    "--without-crypto"
+    "--without-debug"
+    "--without-mem-debug"
+    "--without-debugger"
+  ];
 
   postInstall = ''
     mkdir -p $out/nix-support

From ab98d72fad2c657836d36fe0ac2f7dac54f1b778 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 12:21:45 +0100
Subject: [PATCH 167/394] git: fix build on FreeBSD

Our hard-linking code depended on md5sum, which FreeBSD doesn't have in its
system environment. To avoid that impure dependency, the hard-linking is now
done with the 'hardlink' utility from Nixpkgs.
---
 .../git-and-tools/default.nix                 |  2 +-
 .../git-and-tools/git/default.nix             | 38 +++++--------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index b0d8cf7d9c5d..fa2d26470496 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -10,7 +10,7 @@ rec {
   git = lib.makeOverridable (import ./git) {
     inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
       asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
-      cpio tcl tk makeWrapper subversionClient;
+      cpio tcl tk makeWrapper subversionClient hardlink;
     svnSupport = false;		# for git-svn support
     guiSupport = false;		# requires tcl/tk
     sendEmailSupport = false;	# requires plenty of perl libraries
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 47f86bece826..b006354a0149 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep
 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
-, libxslt, tcl, tk, makeWrapper
+, libxslt, tcl, tk, makeWrapper, hardlink
 , svnSupport, subversionClient, perlLibs, smtpPerlLibs
 , guiSupport
 , withManual ? true
@@ -111,46 +111,26 @@ stdenv.mkDerivation {
          notSupported "$out/$prog" \
                       "reinstall with config git = { guiSupport = true; } set"
        done
-     '')
+     '');
 
-   # Don't know why hardlinks aren't created. git installs the same executable
-   # multiple times into $out so replace duplicates by symlinks because I
-   # haven't tested whether the nix distribution system can handle hardlinks.
-   # This reduces the size of $out from 115MB down to 13MB on x86_64-linux!
-   + ''
-      declare -A seen
-      shopt -s globstar
-      for f in "$out/"**; do
-        if [ -L "$f" ]; then continue; fi
-        test -f "$f" || continue
-        sum=$(md5sum "$f");
-        sum=''\${sum/ */}
-        if [ -z "''\${seen["$sum"]}" ]; then
-          seen["$sum"]="$f"
-        else
-          rm "$f"; ln -v -s "''\${seen["$sum"]}" "$f"
-        fi
-      done
-     '';
+  # Git installs many copies of the same binary using hardlinks, but unfortunately
+  # our patchELF phase re-writes those files and destroys the hardlinks in the
+  # process. This utility re-generates them afterwards.
+  postFixup = "${hardlink}/bin/hardlink $out";
 
   enableParallelBuilding = true;
 
   meta = {
-    license = "GPLv2";
-    homepage = http://git-scm.com/;
+    homepage = "http://git-scm.com/";
     description = "Git, a popular distributed version control system";
+    license = stdenv.lib.licenses.gpl2Plus;
 
     longDescription = ''
       Git, a popular distributed version control system designed to
       handle very large projects with speed and efficiency.
     '';
 
-    maintainers =
-      [ # Add your name here!
-        stdenv.lib.maintainers.ludo
-        stdenv.lib.maintainers.simons
-      ];
-
     platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
   };
 }

From e655c6afd76db3c2de238b082ded54b32190d56b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 13:02:03 +0100
Subject: [PATCH 168/394] libxslt: revert impurity fix on 'native-stdenv'
 platforms

Commit 16863d8ffe24649fb6a7500f2b457dd2e559de47 caused massive re-builds.
This change needs to be made differently.
---
 pkgs/development/libraries/libxslt/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index b1fef59c8610..d3b7769754e9 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -8,14 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "09ky3vhlaahvsb0q9gp6h3as53pfj70gincirachjqzj46jdka5n";
   };
 
-  configureFlags = [
-    "--with-libxml-prefix=${libxml2}"
-    "--without-python"
-    "--without-crypto"
-    "--without-debug"
-    "--without-mem-debug"
-    "--without-debugger"
-  ];
+  buildInputs = [ libxml2 ];
 
   postInstall = ''
     mkdir -p $out/nix-support

From 1764ea2b0a635587746d382db1b6cd832483a362 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 13:16:28 +0100
Subject: [PATCH 169/394] libxslt: fix impurity on 'native-stdenv' platforms

libxslt has optional dependencies which may be found in /usr or
/usr/local on platforms that have a native stdenv. With those features
enabled, the build generated binaries that depend on libraries outside
of the store. In this particular case, the NixOS channel had binaries
for FreeBSD that depended on libgcrypt, apparently because that packages
happens to be installed outside of Nix on the build machine. On other
machines, however, those binaries failed with unresolvable references.
---
 pkgs/development/libraries/libxslt/default.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index d3b7769754e9..ed56ffaff736 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libxml2 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "libxslt-1.1.27";
 
   src = fetchurl {
@@ -22,4 +22,15 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.eelco ];
   };
-}
+} // (if !stdenv.isFreeBSD then {} else {
+  buildInputs = [];
+
+  configureFlags = [
+    "--with-libxml-prefix=${libxml2}"
+    "--without-python"
+    "--without-crypto"
+    "--without-debug"
+    "--without-mem-debug"
+    "--without-debugger"
+  ];
+}))

From b7a8b5fc11fb90da13099c2f12461a79c274a310 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 14:25:52 +0100
Subject: [PATCH 170/394] haskell-HGL: drop obsolete library that doesn't
 compile anymore with recent GHCs

---
 .../libraries/haskell/HGL/default.nix           | 17 -----------------
 pkgs/top-level/haskell-packages.nix             |  2 --
 2 files changed, 19 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/HGL/default.nix

diff --git a/pkgs/development/libraries/haskell/HGL/default.nix b/pkgs/development/libraries/haskell/HGL/default.nix
deleted file mode 100644
index 4b8d6e24c4b8..000000000000
--- a/pkgs/development/libraries/haskell/HGL/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, X11 }:
-
-cabal.mkDerivation (self: {
-  pname = "HGL";
-  version = "3.2.0.2";
-  sha256 = "13wcvf6bfii9pihr8m08b81fyslf5n587ds4zzgizbd8m38k81vz";
-  buildDepends = [ X11 ];
-  meta = {
-    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
-    ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0e796f4bf4c9..37fe7cbe281c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1054,8 +1054,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   HFuse = callPackage ../development/libraries/haskell/hfuse {};
 
-  HGL = callPackage ../development/libraries/haskell/HGL {};
-
   highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {};
 
   hinotify = callPackage ../development/libraries/haskell/hinotify {};

From 557b8daa33dba9c639be2cbfad115a1e3942ccac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Mar 2013 14:26:58 +0100
Subject: [PATCH 171/394] haskell-xdot: jailbreak to fix build with recent
 versions of polyparse

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

diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix
index 57548517bfec..2875861676ad 100644
--- a/pkgs/development/libraries/haskell/xdot/default.nix
+++ b/pkgs/development/libraries/haskell/xdot/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.2.3";
   sha256 = "0xb8igsqydiw1w00frn4mxkflhxkayif2vivxmq5fk53am2f43wy";
   buildDepends = [ cairo graphviz gtk mtl polyparse text ];
+  jailbreak = true;
   meta = {
     description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
     license = self.stdenv.lib.licenses.bsd3;

From f85025a30e400ca07305be1def0de7e50d44e7b0 Mon Sep 17 00:00:00 2001
From: Paolo Capriotti <p.capriotti@gmail.com>
Date: Mon, 25 Mar 2013 11:19:35 +0000
Subject: [PATCH 172/394] Add renameutils package.

---
 pkgs/tools/misc/renameutils/default.nix       | 19 +++++++++++++++
 .../tools/misc/renameutils/install-exec.patch | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 45 insertions(+)
 create mode 100644 pkgs/tools/misc/renameutils/default.nix
 create mode 100644 pkgs/tools/misc/renameutils/install-exec.patch

diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix
new file mode 100644
index 000000000000..6d4793a4aab5
--- /dev/null
+++ b/pkgs/tools/misc/renameutils/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, readline}:
+
+stdenv.mkDerivation {
+  name = "renameutils-0.12";
+
+  src = fetchurl {
+    url = mirror://savannah/renameutils/renameutils-0.12.0.tar.gz;
+    sha256 = "18xlkr56jdyajjihcmfqlyyanzyiqqlzbhrm6695mkvw081g1lnb";
+  };
+
+  patches = [ ./install-exec.patch ];
+
+  nativeBuildInputs = [ readline ];
+
+  meta = {
+    homepage = http://www.nongnu.org/renameutils/;
+    description = "A set of programs to make renaming of files faster";
+  };
+}
diff --git a/pkgs/tools/misc/renameutils/install-exec.patch b/pkgs/tools/misc/renameutils/install-exec.patch
new file mode 100644
index 000000000000..32b8de5adb80
--- /dev/null
+++ b/pkgs/tools/misc/renameutils/install-exec.patch
@@ -0,0 +1,24 @@
+diff -Naur renameutils-0.12.0-orig/src/Makefile.am renameutils-0.12.0/src/Makefile.am
+--- renameutils-0.12.0-orig/src/Makefile.am	2012-04-23 12:10:43.000000000 +0100
++++ renameutils-0.12.0/src/Makefile.am	2013-03-25 11:13:21.605447377 +0000
+@@ -49,7 +49,7 @@
+ 	@[ -f icp ] || (echo $(LN_S) icmd icp ; $(LN_S) icmd icp)
+ 
+ install-exec-local:
+-	$(mkdir_p) $(DESTDIR)($bindir)
++	$(mkdir_p) $(DESTDIR)$(bindir)
+ 	@[ -f $(DESTDIR)$(bindir)/qmv ] || (echo $(LN_S) qcmd $(DESTDIR)$(bindir)/qmv ; $(LN_S) qcmd $(DESTDIR)$(bindir)/qmv)
+ 	@[ -f $(DESTDIR)$(bindir)/qcp ] || (echo $(LN_S) qcmd $(DESTDIR)$(bindir)/qcp ; $(LN_S) qcmd $(DESTDIR)$(bindir)/qcp)
+ 	@[ -f $(DESTDIR)$(bindir)/imv ] || (echo $(LN_S) icmd $(DESTDIR)$(bindir)/imv ; $(LN_S) icmd $(DESTDIR)$(bindir)/imv)
+diff -Naur renameutils-0.12.0-orig/src/Makefile.in renameutils-0.12.0/src/Makefile.in
+--- renameutils-0.12.0-orig/src/Makefile.in	2012-04-23 12:24:10.000000000 +0100
++++ renameutils-0.12.0/src/Makefile.in	2013-03-25 11:13:40.549847891 +0000
+@@ -1577,7 +1577,7 @@
+ 	@[ -f icp ] || (echo $(LN_S) icmd icp ; $(LN_S) icmd icp)
+ 
+ install-exec-local:
+-	$(mkdir_p) $(DESTDIR)($bindir)
++	$(mkdir_p) $(DESTDIR)$(bindir)
+ 	@[ -f $(DESTDIR)$(bindir)/qmv ] || (echo $(LN_S) qcmd $(DESTDIR)$(bindir)/qmv ; $(LN_S) qcmd $(DESTDIR)$(bindir)/qmv)
+ 	@[ -f $(DESTDIR)$(bindir)/qcp ] || (echo $(LN_S) qcmd $(DESTDIR)$(bindir)/qcp ; $(LN_S) qcmd $(DESTDIR)$(bindir)/qcp)
+ 	@[ -f $(DESTDIR)$(bindir)/imv ] || (echo $(LN_S) icmd $(DESTDIR)$(bindir)/imv ; $(LN_S) icmd $(DESTDIR)$(bindir)/imv)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aff1585c768b..dcc46cdaf165 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1476,6 +1476,8 @@ let
 
   remmina = callPackage ../applications/networking/remote/remmina {};
 
+  renameutils = callPackage ../tools/misc/renameutils { };
+
   replace = callPackage ../tools/text/replace { };
 
   reptyr = callPackage ../os-specific/linux/reptyr {};

From 1ff424afafe1991a32b81f3e5d6baaac1ab97d87 Mon Sep 17 00:00:00 2001
From: Paolo Capriotti <p.capriotti@gmail.com>
Date: Sun, 24 Mar 2013 20:37:01 +0000
Subject: [PATCH 173/394] Update bitcoin-qt to 0.8.1

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

diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix
index 63f4f77942af..a4048e6f40b2 100644
--- a/pkgs/applications/misc/bitcoin/default.nix
+++ b/pkgs/applications/misc/bitcoin/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.3";
+  version = "0.8.1";
   name = "bitcoin-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/bitcoin/${name}-linux.tar.gz";
-    sha256 = "722d4209ff4a951a9eb5cae26a33ad62770fdcb5dfb5acf0b5c6a8f6f3a8a0ef";
+    sha256 = "161arfkzpya5anh6vh5i9ydvwqpia7bpqgz83p2kd97iklx04zvd";
   };
 
   buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];

From 26ec1abf41f3873d1e6e292d673df7344b8b432c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 25 Mar 2013 14:56:45 +0100
Subject: [PATCH 174/394] Adding Steam Locomotive, for the fun

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

diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix
new file mode 100644
index 000000000000..14cc6c4260f7
--- /dev/null
+++ b/pkgs/tools/misc/sl/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation {
+  name = "sl-3.03";
+
+  src = fetchurl {
+    url = "http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/sl/sl.tar";
+    sha256 = "1x3517aza0wm9hhb02npl8s7xy947cdidxmans27q0gjmj3bvg5j";
+  };
+
+  patchPhase = ''
+    sed -i "s/-lcurses -ltermcap/-lncurses/" Makefile
+  '';
+
+  buildInputs = [ ncurses ];
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp sl $out/bin
+  '';
+
+  meta = {
+    homepage = http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html;
+    license = "unfree"; # I couldn't find its license, only a copyright.
+    description = "Steam Locomotive runs across your terminal when you type 'sl'";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1653e26cda5a..0373a6d0b46f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1577,6 +1577,8 @@ let
 
   fusesmb = callPackage ../tools/filesystems/fusesmb { };
 
+  sl = callPackage ../tools/misc/sl { };
+
   socat = callPackage ../tools/networking/socat { };
 
   sourceHighlight = callPackage ../tools/text/source-highlight { };

From 870f4cca738a3ecfd4667c9236e3ad188e09b3d6 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Mon, 25 Mar 2013 15:12:31 +0100
Subject: [PATCH 175/394] fix pythonWrapper for non-gnu ln

---
 pkgs/development/interpreters/python/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 0f2f46cd568d..d2783ffb085e 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
       makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH"
     done
     ensureDir "$out/share"
-    ln "$python/share/man" "$out/share/man" -s
+    ln -s "$python/share/man" "$out/share/man"
   '';
 
   inherit python;

From fc9bdabd54c682e1db5a2eb6107d3c4ea314b3fe Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Mon, 25 Mar 2013 15:28:09 +0100
Subject: [PATCH 176/394] fix ino

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

diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix
index 6b88a8deaea7..100b3aa87f13 100644
--- a/pkgs/development/arduino/ino/default.nix
+++ b/pkgs/development/arduino/ino/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, buildPythonPackage, minicom, avrdude, arduino_core, avrgcclibc }:
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages, minicom
+, avrdude, arduino_core, avrgcclibc }:
 
 buildPythonPackage {
   name = "ino-0.3.4";
@@ -10,15 +11,20 @@ buildPythonPackage {
   };
 
   # TODO: add avrgcclibc, it must be rebuild with C++ support
-  propagatedBuildInputs = [ minicom avrdude arduino_core ];
+  propagatedBuildInputs =
+    [ arduino_core avrdude minicom pythonPackages.configobj
+      pythonPackages.jinja2 pythonPackages.pyserial ];
 
   patchPhase = ''
     echo "Patching Arduino distribution path"
-    sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' ino/environment.py
+    sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' \
+        ino/environment.py
+    sed -i -e 's@argparse@@' -e 's@ordereddict@@' \
+        requirements.txt
+    sed -i -e 's@from ordereddict@from collections@' \
+        ino/environment.py ino/utils.py
   '';
  
-  doCheck = false;
-
   meta = {
     description = "Command line toolkit for working with Arduino hardware";
     homepage = http://inotool.org/;

From 67a1c3df94443948d177f0642e7bffb1e4f7f402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Mon, 25 Mar 2013 21:52:01 +0100
Subject: [PATCH 177/394] LinuxSampler: fix the build by disabling a check for
 a bug

Without the --disable-nptl-bug-check configure option LinuxSampler
refuses to build. It seems to be a long standing bug. Despite this, I
have used LinuxSampler for over a week now and it seems OK.
---
 pkgs/applications/audio/linuxsampler/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
index c74cd2b0d7d4..d9413c031546 100644
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
 
   patches = ./linuxsampler_lv2_sfz_fix.diff;
 
+  # It fails to compile without this option. I'm not sure what the bug
+  # is, but everything works OK for me (goibhniu).
+  configureFlags = [ "--disable-nptl-bug-check" ];
+
   preConfigure = ''
     sed -e 's/which/type -P/g' -i scripts/generate_parser.sh
     make -f Makefile.cvs

From 70dc36931429d758c4178cb7a0b91e1fb13659ea Mon Sep 17 00:00:00 2001
From: Lluis Batlle <viriketo@gmail.com>
Date: Mon, 25 Mar 2013 21:58:51 +0100
Subject: [PATCH 178/394] Updating the assertion to cpufrequtils: linux pc
 only.

The armv5tel-linux and mips64el-linux fail to build this too.
---
 pkgs/os-specific/linux/cpufrequtils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix
index e9e0a36f1565..85907ff0212a 100644
--- a/pkgs/os-specific/linux/cpufrequtils/default.nix
+++ b/pkgs/os-specific/linux/cpufrequtils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libtool, gettext }:
 
-assert stdenv.isLinux && stdenv.system != "powerpc-linux";
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation {
   name = "cpufrequtils-008";

From 98af10f47693d578e7867ef32498e35eaf5f83c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Mar 2013 00:58:21 +0100
Subject: [PATCH 179/394] all-packages.nix: mark python3 'hiPrio' so that it
 takes precedence when version 2.x and 3.x are installed into the same
 environment

---
 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 354559a1efe2..458e2ef4a90b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2876,7 +2876,7 @@ let
 
   pure = callPackage ../development/interpreters/pure {};
 
-  python3 = python32;
+  python3 = hiPrio python32;
   python32 = callPackage ../development/interpreters/python/3.2 { };
 
   python = python27;

From 270a0009bee37f95fe8c1d741f0d2b78b6571774 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Mar 2013 01:00:21 +0100
Subject: [PATCH 180/394] python3: update to version 3.3.0

---
 .../interpreters/python/{3.2 => 3.3}/default.nix            | 6 +++---
 .../interpreters/python/{3.2 => 3.3}/setup-hook.sh          | 0
 pkgs/top-level/all-packages.nix                             | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename pkgs/development/interpreters/python/{3.2 => 3.3}/default.nix (94%)
 rename pkgs/development/interpreters/python/{3.2 => 3.3}/setup-hook.sh (100%)

diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
similarity index 94%
rename from pkgs/development/interpreters/python/3.2/default.nix
rename to pkgs/development/interpreters/python/3.3/default.nix
index 64442f2e35b6..dc9f99e9cdcc 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -16,8 +16,8 @@ assert readline != null -> ncurses != null;
 with stdenv.lib;
 
 let
-  majorVersion = "3.2";
-  version = "${majorVersion}.3";
+  majorVersion = "3.3";
+  version = "${majorVersion}.0";
 
   buildInputs = filter (p: p != null) [
     zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    sha256 = "5648ec81f93870fde2f0aa4ed45c8718692b15ce6fd9ed309bfb827ae12010aa";
+    sha256 = "1ybdf7wc8pfw51rf7xcywfw27n6l97qyzd1ibpq151q5dkyi7h8m";
   };
 
   preConfigure = ''
diff --git a/pkgs/development/interpreters/python/3.2/setup-hook.sh b/pkgs/development/interpreters/python/3.3/setup-hook.sh
similarity index 100%
rename from pkgs/development/interpreters/python/3.2/setup-hook.sh
rename to pkgs/development/interpreters/python/3.3/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 458e2ef4a90b..fb851c3d5979 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2876,8 +2876,7 @@ let
 
   pure = callPackage ../development/interpreters/pure {};
 
-  python3 = hiPrio python32;
-  python32 = callPackage ../development/interpreters/python/3.2 { };
+  python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { });
 
   python = python27;
   python26 = callPackage ../development/interpreters/python/2.6 { };
@@ -6647,7 +6646,7 @@ let
   };
 
   blender = callPackage  ../applications/misc/blender {
-    python = python32;
+    python = python3;
   };
 
   bristol = callPackage ../applications/audio/bristol { };

From 96dbbc7e211ab56c701340c279428d2c95e10c7c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Mar 2013 01:12:27 +0100
Subject: [PATCH 181/394] gnulib: update to version 0.0-7899-g34f8464 and
 provide a proper meta section

---
 pkgs/development/tools/gnulib/default.nix | 24 ++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index ee8f396708bb..f416a7a113e3 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -1,7 +1,21 @@
 { stdenv, fetchgit }:
 
-stdenv.lib.setName "gnulib-0.0-7898-gdb9cad7" (fetchgit {
-  url = "http://git.savannah.gnu.org/r/gnulib.git";
-  rev = "db9cad7b8b59a010ff9158513a29cb002a2b8ae1";
-  sha256 = "1azdz7mhx1jf0l17wn7zp591wxry0ys4g29ycij5mai7vzhddjn6";
-})
+stdenv.mkDerivation {
+  name = "gnulib-0.0-7899-g34f8464";
+
+  src = fetchgit {
+    url = "http://git.savannah.gnu.org/r/gnulib.git";
+    rev = "34f84640cd015eee3d9aed3b1eddf6f361576890";
+    sha256 = "9267827d6b3f0eb97957eae7851afd4e5ac8aa714a83e3be52e7b660cc27851d";
+  };
+
+  buildPhase = ":";
+
+  installPhase = "mkdir -p $out; mv * $out/";
+
+  meta = {
+    homepage = "http://www.gnu.org/software/gnulib/";
+    description = "central location for code to be shared among GNU packages";
+    license = stdenv.lib.licenses.gpl3Plus;
+  };
+}

From 600d023c3372696e22047e5306a85e9617e03797 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Mar 2013 01:15:12 +0100
Subject: [PATCH 182/394] texinfo-5.1: install tex-related files like
 'texinfo.tex'

---
 pkgs/development/tools/misc/texinfo/5.1.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/tools/misc/texinfo/5.1.nix b/pkgs/development/tools/misc/texinfo/5.1.nix
index 807a3388b4b5..cca368f619a6 100644
--- a/pkgs/development/tools/misc/texinfo/5.1.nix
+++ b/pkgs/development/tools/misc/texinfo/5.1.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses perl ];
 
+  preInstall = ''
+    installFlags="TEXMF=$out/texmf";
+    installTargets="install install-tex";
+  '';
+
   doCheck = true;
 
   meta = {

From f658d72377ecc62a5e1c9e7310fb252d84744c83 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Mar 2013 01:16:09 +0100
Subject: [PATCH 183/394] texLiveFull: include texinfo in the generated
 environment

---
 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 fb851c3d5979..15a6161e8fa3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9027,7 +9027,7 @@ let
 
   texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
     paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
-              texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht ];
+              texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5 ];
   });
 
   /* Look in configurations/misc/raskin.nix for usage example (around revisions

From f2726c5c57b769d7d9f0c636be23a6759afd0980 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Mar 2013 02:19:22 +0100
Subject: [PATCH 184/394] perl-GD: update to version 2.49 in a blind attempt to
 fix test suite failures on x86-linux

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d31a572eea1c..7855a1a1eb3d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2057,10 +2057,10 @@ rec {
   };
 
   GD = buildPerlPackage rec {
-    name = "GD-2.45";
+    name = "GD-2.49";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz";
-      sha256 = "1p84585b4iyqa21hbqni0blj8fzd917ynd3y1hwh3mrmyfqj178x";
+      sha256 = "03wwvhvni22cs7arai7d3wkb2qfa9p20grrb32hdxv41nqxqpihh";
     };
 
     buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype

From b38647766db69308c789da46fe9f3f2b89e782d9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Mar 2013 15:52:08 +0100
Subject: [PATCH 185/394] =?UTF-8?q?releaseTools:=20Add=20=E2=80=98aggregat?=
 =?UTF-8?q?e=E2=80=99=20function?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

An aggregate is a trivial build that depends on other builds.  This is
intended to provide a declarative replacement of Hydra's "view"
mechanism.

For instance, you can define an aggregate named "critical" that
depends on a selected set of jobs:

  critical = releaseTools.aggregate
    { name = "foo-${tarball.version}";
      members =
        [ tarball
          build.x86_64-linux
          ...
        ];
      meta.description = "Release-critical builds";
    };

The "critical" build will only succeed if all its members
(dependencies) succeed.
---
 pkgs/build-support/release/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix
index 2cf2b1f8d6d9..20dcf2fbd0cd 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -39,4 +39,14 @@ rec {
     { inherit stdenv vmTools checkinstall;
     } // args);
 
+  aggregate =
+    { name, members, meta ? { } }:
+    pkgs.runCommand name
+      { inherit members meta;
+        _hydraAggregate = true;
+      }
+      ''
+        echo $members > $out
+      '';
+
 }

From cffc126e140eea1a0bc01a1419c5609c619f5326 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 11:02:29 +0100
Subject: [PATCH 186/394] Make Nixpkgs jobs unique
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

That is, there are now distinct jobs like ‘coreutils.x86_64-linux’ and
‘coreutils.x86_64-darwin’, rather than a single job ‘coreutils’ with
multiple builds.  This means that testing a job is simpler:

  $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux

See https://github.com/NixOS/hydra/issues/60 for the motivation.
---
 pkgs/development/libraries/aterm/2.5.nix |  5 +-
 pkgs/top-level/release-lib.nix           | 69 +++++++++++++-----------
 pkgs/top-level/release.nix               | 20 +++----
 3 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/pkgs/development/libraries/aterm/2.5.nix b/pkgs/development/libraries/aterm/2.5.nix
index daaf6fdd584d..f116da12643e 100644
--- a/pkgs/development/libraries/aterm/2.5.nix
+++ b/pkgs/development/libraries/aterm/2.5.nix
@@ -16,14 +16,15 @@ stdenv.mkDerivation {
     # SIZEOF_LONG, SIZEOF_INT and SIZEOF_VOID_P being set.
     ./sizeof.patch
   ];
-  
+
   doCheck = true;
 
-  dontDisableStatic = true; 
+  dontDisableStatic = true;
 
   meta = {
     homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
     license = "LGPL";
     description = "Library for manipulation of term data structures in C";
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index fed9a1d673ba..ed523d235b8a 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -7,7 +7,8 @@ rec {
 
   pkgs = allPackages { };
 
-  /* !!! Hack: poor man's memoisation function.  Necessary for prevent
+
+  /* !!! Hack: poor man's memoisation function.  Necessary to prevent
      Nixpkgs from being evaluated again and again for every
      job/platform pair. */
   pkgsFor = system:
@@ -26,33 +27,39 @@ rec {
   pkgs_i686_freebsd = allPackages { system = "i686-freebsd"; };
   pkgs_i686_cygwin = allPackages { system = "i686-cygwin"; };
 
+
   /* The working or failing mails for cross builds will be sent only to
      the following maintainers, as most package maintainers will not be
      interested in the result of cross building a package. */
   crossMaintainers = with pkgs.lib.maintainers; [ viric ];
 
+
   /* Set the Hydra scheduling priority for a job.  The default
-     priority (10) should be used for most jobs.  A different
-     priority should only be used for a few particularly interesting
-     jobs (in terms of giving feedback to developers), such as stdenv.
-  */
+     priority (10) should be used for most jobs.  A different priority
+     should only be used for a few particularly interesting jobs (in
+     terms of giving feedback to developers), such as stdenv. */
   prio = level: job: toJob job // { schedulingPriority = level; };
 
+
   toJob = x: if builtins.isAttrs x then x else
     { type = "job"; systems = x; schedulingPriority = 10; };
 
+
   /* Perform a job on the given set of platforms.  The function `f' is
      called by Hydra for each platform, and should return some job
      to build on that platform.  `f' is passed the Nixpkgs collection
      for the platform in question. */
-  testOn = systems: f: {system ? builtins.currentSystem}:
-    if pkgs.lib.elem system systems then f (pkgsFor system) else {};
+  testOn = systems: f: pkgs.lib.genAttrs systems (system: f (pkgsFor system));
 
-  /* Similar to the testOn function, but with an additional 'crossSystem'
-   * parameter for allPackages, defining the target platform for cross builds */
+
+  /* Similar to the testOn function, but with an additional
+     'crossSystem' parameter for allPackages, defining the target
+     platform for cross builds. */
   testOnCross = crossSystem: systems: f: {system ? builtins.currentSystem}:
-    if pkgs.lib.elem system systems then f (allPackages {inherit system
-                crossSystem;}) else {};
+    if pkgs.lib.elem system systems
+    then f (allPackages { inherit system crossSystem; })
+    else {};
+
 
   /* Map an attribute of the form `foo = [platforms...]'  to `testOn
      [platforms...] (pkgs: pkgs.foo)'. */
@@ -82,29 +89,28 @@ rec {
           (pkgs.lib.getAttrFromPath path pkgs));
       in testOnCross crossSystem job.systems getPkg);
 
+
   /* Find all packages that have a meta.platforms field listing the
      supported platforms. */
   packagesWithMetaPlatform = attrSet:
-    if builtins ? tryEval then
-      let pairs = pkgs.lib.concatMap
-        (x:
-          let pair = builtins.tryEval
-                (let
-                   attrVal = (builtins.getAttr x attrSet);
-                 in
-                   {val=(processPackage attrVal);
-                    attrVal = attrVal;
-                    attrValIsAttrs = builtins.isAttrs attrVal;
-                    });
-              success = (builtins.tryEval pair.value.attrVal).success;
-          in
-          if success && pair.value.attrValIsAttrs &&
-              pair.value.val != [] then
-            [{name= x; value=pair.value.val;}] else [])
-        (builtins.attrNames attrSet);
-      in
-        builtins.listToAttrs pairs
-    else {};
+    let pairs = pkgs.lib.concatMap
+      (x:
+        let pair = builtins.tryEval
+              (let
+                 attrVal = (builtins.getAttr x attrSet);
+               in
+                 { val = processPackage attrVal;
+                   attrVal = attrVal;
+                   attrValIsAttrs = builtins.isAttrs attrVal;
+                 });
+            success = (builtins.tryEval pair.value.attrVal).success;
+        in
+        pkgs.lib.optional (success && pair.value.attrValIsAttrs && pair.value.val != [])
+          { name = x; value = pair.value.val; })
+      (builtins.attrNames attrSet);
+    in
+      builtins.listToAttrs pairs;
+
 
   # May fail as much as it wishes, we will catch the error.
   processPackage = attrSet:
@@ -117,6 +123,7 @@ rec {
         then attrSet.meta.platforms
         else [];
 
+
   /* Common platform groups on which to test packages. */
   inherit (pkgs.lib.platforms) linux darwin cygwin allBut all mesaPlatforms;
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 595c6b427a2d..d1b5d8254c4c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -1,13 +1,15 @@
-/*
-  This file will be evaluated by hydra with a call like this:
-  hydra_eval_jobs --gc-roots-dir \
-    /nix/var/nix/gcroots/per-user/hydra/hydra-roots --argstr \
-    system i686-linux --argstr system x86_64-linux --arg \
-    nixpkgs "{outPath = ./}" .... release.nix
+/* This file defines the builds that constitute the Nixpkgs.
+   Everything defined here ends up in the Nixpkgs channel.  Individual
+   jobs can be tested by running:
 
-  Hydra can be installed with "nix-env -i hydra".
+   $ nix-build pkgs/top-level/release.nix -A <jobname>.<system>
+
+   e.g.
+
+   $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
 */
-with (import ./release-lib.nix);
+
+with import ./release-lib.nix;
 
 {
 
@@ -20,8 +22,6 @@ with (import ./release-lib.nix);
   apacheHttpd = linux;
   aspell = all;
   at = linux;
-  aterm25 = all;
-  aterm28 = all;
   audacious = linux;
   autoconf = all;
   automake110x = all;

From 79eda8573e15224fb397d48793c6dfa72e268420 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 11:18:29 +0100
Subject: [PATCH 187/394] =?UTF-8?q?Remove=20broken=20=E2=80=98removeList?=
 =?UTF-8?q?=E2=80=99=20function?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/lib/lists.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix
index 0916355568c3..3c01b165fc1c 100644
--- a/pkgs/lib/lists.nix
+++ b/pkgs/lib/lists.nix
@@ -92,10 +92,6 @@ rec {
   remove = e: filter (x: x != e);
 
   
-  # Given two lists, removes all elements of the first list from the second list
-  removeList = l: filter (x: elem x l);
-
-
   # Return true if `list' has an element `x'.
   elem =
     builtins.elem or

From 78de3c912dea5d4fe87c0c17613e6d558b4ae899 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 11:24:05 +0100
Subject: [PATCH 188/394] Only return Hydra jobs for supported platforms

---
 pkgs/top-level/release-lib.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index ed523d235b8a..6b66bfbb2d15 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -8,6 +8,10 @@ rec {
   pkgs = allPackages { };
 
 
+  # The platforms for which we build Nixpkgs.
+  supportedSystems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ];
+
+
   /* !!! Hack: poor man's memoisation function.  Necessary to prevent
      Nixpkgs from being evaluated again and again for every
      job/platform pair. */
@@ -45,11 +49,14 @@ rec {
     { type = "job"; systems = x; schedulingPriority = 10; };
 
 
-  /* Perform a job on the given set of platforms.  The function `f' is
-     called by Hydra for each platform, and should return some job
-     to build on that platform.  `f' is passed the Nixpkgs collection
-     for the platform in question. */
-  testOn = systems: f: pkgs.lib.genAttrs systems (system: f (pkgsFor system));
+  /* Build a package on the given set of platforms.  The function `f'
+     is called for each supported platform with Nixpkgs for that
+     platform as an argument .  We return an attribute set containing
+     a derivation for each supported platform, i.e. ‘{ x86_64-linux =
+     f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */
+  testOn = systems: f: pkgs.lib.genAttrs
+    (pkgs.lib.filter (x: pkgs.lib.elem x supportedSystems) systems)
+    (system: f (pkgsFor system));
 
 
   /* Similar to the testOn function, but with an additional

From 993fc7206de8719f4e9e94c2f29580617a18a1ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 11:53:36 +0100
Subject: [PATCH 189/394] eval-release.nix: Handle the new job structure

Now that we don't need to pass "system" arguments anymore, this thing
is *almost* obsolete.  (Except for the need to handle assertion
failures, you could just do "nix-instantiate --eval-only ..." on
release.nix.)
---
 maintainers/scripts/eval-release.nix | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix
index ccbe064ee321..7007ce6de418 100644
--- a/maintainers/scripts/eval-release.nix
+++ b/maintainers/scripts/eval-release.nix
@@ -7,26 +7,18 @@ with import ../../pkgs/lib;
 let
   trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);
 
-  rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ];
-
-  seqList = xs: res: fold (x: xs: seq x xs) res xs;
-  
-  strictAttrs = as: seqList (attrValues as) as;
-
-  maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" {};
-
-  call = attrs: flip mapAttrs attrs
-    (n: v: trace n (
-      if builtins.isFunction v then maybe (v { system = "x86_64-linux"; })
-      else if builtins.isAttrs v then call v
-      else null
-    ));
+  rel = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" "xbursttools" ];
 
   # Add the ‘recurseForDerivations’ attribute to ensure that
   # nix-instantiate recurses into nested attribute sets.
   recurse = attrs:
-    if isDerivation attrs
-    then attrs
-    else { recurseForDerivations = true; } // mapAttrs (n: v: recurse v) attrs;
+    if (builtins.tryEval attrs).success then
+      if isDerivation attrs 
+      then
+        if (builtins.tryEval attrs.outPath).success
+        then attrs
+        else { }
+      else { recurseForDerivations = true; } // mapAttrs (n: v: recurse v) attrs
+    else { };
 
-in recurse (call rel)
+in recurse rel

From bcc14c4d3c986b56a3975ca6149abe9fb56221d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 11:57:44 +0100
Subject: [PATCH 190/394] Add an "unstable" aggregate to replace the "unstable"
 view

Views are obsolete, aggregates are the declarative replacement.
---
 pkgs/top-level/all-packages.nix |   2 +-
 pkgs/top-level/make-tarball.nix |   4 +-
 pkgs/top-level/release-lib.nix  |   2 +-
 pkgs/top-level/release.nix      | 837 ++++++++++++++++----------------
 4 files changed, 433 insertions(+), 412 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15a6161e8fa3..f7f9aa08b8c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2185,7 +2185,7 @@ let
       stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc);
       profiledCompiler = false;
       enableMultilib = true;
-    })) else throw "Multilib gcc not supported on this system";
+    })) else throw "Multilib gcc not supported on ‘${system}’";
 
   gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 {
     inherit noSysDirs;
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index cd70773869de..7fb597fd6d8e 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -2,9 +2,7 @@
    also builds the documentation and tests whether the Nix expressions
    evaluate correctly. */
 
-{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
-, officialRelease ? false
-}:
+{ nixpkgs, officialRelease }:
 
 with import nixpkgs.outPath {};
 
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 6b66bfbb2d15..5b7e830a2f19 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -5,7 +5,7 @@ rec {
     config.allowUnfree = false;
   });
 
-  pkgs = allPackages { };
+  pkgs = allPackages { system = "x86_64-linux"; };
 
 
   # The platforms for which we build Nixpkgs.
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index d1b5d8254c4c..ad027cd93460 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -9,428 +9,451 @@
    $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
 */
 
+{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
+, officialRelease ? false
+}:
+
 with import ./release-lib.nix;
 
-{
+let
 
-  tarball = import ./make-tarball.nix;
+  jobs =
+    { tarball = import ./make-tarball.nix { inherit nixpkgs officialRelease; };
 
-} // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec {
+      unstable = pkgs.releaseTools.aggregate
+        { name = "nixpkgs-${jobs.tarball.version}";
+          meta.description = "Release-critical builds for the Nixpkgs unstable channel";
+          members =
+            [ jobs.tarball
+              jobs.stdenv.x86_64-linux
+              jobs.stdenv.i686-linux
+              jobs.stdenv.x86_64-darwin
+              jobs.linux.x86_64-linux
+              jobs.linux.i686-linux
+              # Ensure that X11/GTK+ are in order.
+              jobs.thunderbird.x86_64-linux
+              jobs.thunderbird.i686-linux
+            ];
+        };
 
-  abcde = linux;
-  alsaUtils = linux;
-  apacheHttpd = linux;
-  aspell = all;
-  at = linux;
-  audacious = linux;
-  autoconf = all;
-  automake110x = all;
-  automake111x = all;
-  avahi = allBut "i686-cygwin";  # Cygwin builds fail
-  bash = all;
-  bashInteractive = all;
-  bazaar = linux; # first let sqlite3 work on darwin
-  bc = all;
-  binutils = linux;
-  bind = linux;
-  bitlbee = linux;
-  bittorrent = linux;
-  blender = linux;
-  bsdiff = all;
-  btrfsProgs = linux;
-  bvi = all;
-  bzip2 = all;
-  cabextract = all;
-  castle_combat = linux;
-  cdrkit = linux;
-  chatzilla = linux;
-  cksfv = all;
-  classpath = linux;
-  coreutils = all;
-  cpio = all;
-  cron = linux;
-  cvs = linux;
-  db4 = all;
-  ddrescue = linux;
-  dhcp = linux;
-  dico = linux;
-  dietlibc = linux;
-  diffutils = all;
-  disnix = all;
-  disnixos = linux;
-  DisnixWebService = linux;
-  docbook5 = all;
-  docbook5_xsl = all;
-  docbook_xml_dtd_42 = all;
-  docbook_xml_dtd_43 = all;
-  docbook_xsl = all;
-  dosbox = linux;
-  dovecot = linux;
-  doxygen = linux;
-  dpkg = linux;
-  drgeo = linux;
-  e2fsprogs = linux;
-  ejabberd = linux;
-  elinks = linux;
-  emacs23 = gtkSupported;
-  enscript = all;
-  eprover = linux;
-  evince = linux;
-  expect = linux;
-  exult = linux;
-  fbterm = linux;
-  feh = linux;
-  file = all;
-  findutils = all;
-  flex = all;
-  flex2535 = all;
-  fontforge = linux;
-  fuse = linux;
-  gajim = linux;
-  gawk = all;
-  gcc = linux;
-  gcc33 = linux;
-  gcc34 = linux;
-  gcc42 = linux;
-  gcc43_multi = ["x86_64-linux"];
-  gcc44 = linux;
-  gcj44 = linux;
-  ghdl = linux;
-  ghostscript = linux;
-  ghostscriptX = linux;
-  gimp_2_8 = linux;
-  git = linux;
-  gitFull = linux;
-  glibc = linux;
-  glibcLocales = linux;
-  glxinfo = linux;
-  gnash = linux;
-  gnat44 = linux;
-  gnugrep = all;
-  gnum4 = all;
-  gnumake = all;
-  gnupatch = all;
-  gnupg = linux;
-  gnuplot = allBut "i686-cygwin";
-  gnused = all;
-  gnutar = all;
-  gnutls = linux;
-  gogoclient = linux;
-  gphoto2 = linux;
-  gpm = linux;
-  gprolog = linux;
-  gpsbabel = all;
-  gpscorrelate = linux;
-  gpsd = linux;
-  gqview = gtkSupported;
-  graphviz = all;
-  grub = linux;
-  grub2 = linux;
-  gsl = linux;
-  guile = linux;  # tests fail on Cygwin
-  gv = linux;
-  gzip = all;
-  hddtemp = linux;
-  hello = all;
-  host = linux;
-  htmlTidy = all;
-  hugin = linux;
-  iana_etc = linux;
-  icecat3Xul = linux;
-  icewm = linux;
-  idutils = all;
-  ifplugd = linux;
-  impressive = linux;
-  inetutils = linux;
-  inkscape = linux;
-  iputils = linux;
-  irssi = linux;
-  jfsutils = linux;
-  jfsrec = linux;
-  jnettop = linux;
-  jwhois = linux;
-  kbd = linux;
-  keen4 = ["i686-linux"];
-#  klibc = linux;
-  kvm = linux;
-  qemu = linux;
-  qemu_kvm = linux;
-  less = all;
-  lftp = all;
-  libarchive = linux;
-  libsmbios = linux;
-  libtool = all;
-  libtool_2 = all;
-  lout = linux;
-  lsh = linux;
-  lsof = linux;
-  ltrace = linux;
-  lvm2 = linux;
-  lynx = linux;
-  lzma = linux;
-  man = linux;
-  manpages = linux;
-  maxima = linux;
-  mc = linux;
-  mcabber = linux;
-  mcron = linux;
-  mdadm = linux;
-  mercurial = allBut "i686-cygwin";
-  mercurialFull = allBut "i686-cygwin";
-  mesa = mesaPlatforms;
-  midori = linux;
-  mingetty = linux;
-  mk = linux;
-  mktemp = all;
-  mod_python = linux;
-  module_init_tools = linux;
-  mono = linux;
-  mpg321 = linux;
-  mupen64plus = linux;
-  mutt = linux;
-  mysql = linux;
-  mysql51 = linux;
-  mysql55 = linux;
-  namazu = all;
-  nano = allBut "i686-cygwin";
-  ncat = linux;
-  netcat = all;
-  nfsUtils = linux;
-  nix = all;
-  nixUnstable = all;
-  nmap = linux;
-  nss_ldap = linux;
-  nssmdns = linux;
-  ntfs3g = linux;
-  ntp = linux;
-  ocaml = linux;
-  octave = linux;
-  openssh = linux;
-  openssl = all;
-  pam_console = linux;
-  pam_login = linux;
-  pan = gtkSupported;
-  par2cmdline = all;
-  pavucontrol = linux;
-  pciutils = linux;
-  pdf2xml = all;
-  perl = all;
-  php = linux;
-  pidgin = linux;
-  pinentry = linux;
-  pltScheme = linux;
-  pmccabe = linux;
-  portmap = linux;
-  postgresql = all;
-  postfix = linux;
-  ppl = all;
-  procps = linux;
-  pthreadmanpages = linux;
-  pygtk = linux;
-  pyqt4 = linux;
-  python = allBut "i686-cygwin";
-  pythonFull = linux;
-  sbcl = linux;
-  qt3 = linux;
-  quake3demo = linux;
-  readline = all;
-  reiserfsprogs = linux;
-  rlwrap = all;
-  rogue = all;
-  rpm = linux;
-  rsync = linux;
-  rubber = allBut "i686-cygwin";
-  ruby = all;
-  rxvt_unicode = linux;
-  screen = linux ++ darwin;
-  scrot = linux;
-  sdparm = linux;
-  seccure = linux;
-  sgtpuzzles = linux;
-  sharutils = all;
-  slim = linux;
-  sloccount = allBut "i686-cygwin";
-  smartmontools = linux;
-  socat = linux;
-  spidermonkey = linux;
-  splashutils = linux;
-  sqlite = allBut "i686-cygwin";
-  squid = linux;
-  ssmtp = linux;
-  stdenv = prio 175 all;
-  stlport = linux;
-  strace = linux;
-  su = linux;
-  sudo = linux;
-  superTuxKart = linux;
-  swig = linux;
-  sylpheed = linux;
-  sysklogd = linux;
-  syslinux = ["i686-linux"];
-  sysvinit = linux;
-  sysvtools = linux;
-  tahoelafs = linux;
-  tangogps = linux;
-  tcl = linux;
-  tcpdump = linux;
-  teeworlds = linux;
-  tetex = linux;
-  texLive = linux;
-  texLiveBeamer = linux;
-  texLiveExtra = linux;
-  texinfo = all;
-  tightvnc = linux;
-  time = linux;
-  tinycc = ["i686-linux"];
-  uae = linux;
-  udev = linux;
-  unrar = linux;
-  upstart = linux;
-  usbutils = linux;
-  utillinux = linux;
-  utillinuxCurses = linux;
-  uzbl = linux;
-  viking = linux;
-  vice = linux;
-  vim = linux;
-  vimHugeX = linux;
-  VisualBoyAdvance = linux;
-  vlc = linux;
-  vncrec = linux;
-  vorbisTools = linux;
-  vpnc = linux;
-  vsftpd = linux;
-  w3m = all;
-  webkit = linux;
-  weechat = linux;
-  wget = all;
-  which = all;
-  wicd = linux;
-  wine = ["i686-linux"];
-  wireshark = linux;
-  wirelesstools = linux;
-  wxGTK = linux;
-  x11_ssh_askpass = linux;
-  xchm = linux;
-  xfig = x11Supported;
-  xfsprogs = linux;
-  xineUI = linux;
-  xkeyboard_config = linux;
-  xlockmore = linux;
-  xmltv = linux;
-  xpdf = linux;
-  xscreensaver = linux;
-  xsel = linux;
-  xterm = linux;
-  xxdiff = linux;
-  zdelta = linux;
-  zile = linux;
-  zip = all;
-  zsh = linux;
-  zsnes = ["i686-linux"];
+    } // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec {
 
-  emacs23Packages = {
-    bbdb = linux;
-    cedet = linux;
-    ecb = linux;
-    emacsw3m = linux;
-    emms = linux;
-    jdee = linux;
-  };
+      abcde = linux;
+      alsaUtils = linux;
+      apacheHttpd = linux;
+      aspell = all;
+      at = linux;
+      audacious = linux;
+      autoconf = all;
+      automake110x = all;
+      automake111x = all;
+      avahi = allBut "i686-cygwin";  # Cygwin builds fail
+      bash = all;
+      bashInteractive = all;
+      bazaar = linux; # first let sqlite3 work on darwin
+      bc = all;
+      binutils = linux;
+      bind = linux;
+      bitlbee = linux;
+      bittorrent = linux;
+      blender = linux;
+      bsdiff = all;
+      btrfsProgs = linux;
+      bvi = all;
+      bzip2 = all;
+      cabextract = all;
+      castle_combat = linux;
+      cdrkit = linux;
+      chatzilla = linux;
+      cksfv = all;
+      classpath = linux;
+      coreutils = all;
+      cpio = all;
+      cron = linux;
+      cvs = linux;
+      db4 = all;
+      ddrescue = linux;
+      dhcp = linux;
+      dico = linux;
+      dietlibc = linux;
+      diffutils = all;
+      disnix = all;
+      disnixos = linux;
+      DisnixWebService = linux;
+      docbook5 = all;
+      docbook5_xsl = all;
+      docbook_xml_dtd_42 = all;
+      docbook_xml_dtd_43 = all;
+      docbook_xsl = all;
+      dosbox = linux;
+      dovecot = linux;
+      doxygen = linux;
+      dpkg = linux;
+      drgeo = linux;
+      e2fsprogs = linux;
+      ejabberd = linux;
+      elinks = linux;
+      emacs23 = gtkSupported;
+      enscript = all;
+      eprover = linux;
+      evince = linux;
+      expect = linux;
+      exult = linux;
+      fbterm = linux;
+      feh = linux;
+      file = all;
+      findutils = all;
+      flex = all;
+      flex2535 = all;
+      fontforge = linux;
+      fuse = linux;
+      gajim = linux;
+      gawk = all;
+      gcc = linux;
+      gcc33 = linux;
+      gcc34 = linux;
+      gcc42 = linux;
+      gcc43_multi = ["x86_64-linux"];
+      gcc44 = linux;
+      gcj44 = linux;
+      ghdl = linux;
+      ghostscript = linux;
+      ghostscriptX = linux;
+      gimp_2_8 = linux;
+      git = linux;
+      gitFull = linux;
+      glibc = linux;
+      glibcLocales = linux;
+      glxinfo = linux;
+      gnash = linux;
+      gnat44 = linux;
+      gnugrep = all;
+      gnum4 = all;
+      gnumake = all;
+      gnupatch = all;
+      gnupg = linux;
+      gnuplot = allBut "i686-cygwin";
+      gnused = all;
+      gnutar = all;
+      gnutls = linux;
+      gogoclient = linux;
+      gphoto2 = linux;
+      gpm = linux;
+      gprolog = linux;
+      gpsbabel = all;
+      gpscorrelate = linux;
+      gpsd = linux;
+      gqview = gtkSupported;
+      graphviz = all;
+      grub = linux;
+      grub2 = linux;
+      gsl = linux;
+      guile = linux;  # tests fail on Cygwin
+      gv = linux;
+      gzip = all;
+      hddtemp = linux;
+      hello = all;
+      host = linux;
+      htmlTidy = all;
+      hugin = linux;
+      iana_etc = linux;
+      icecat3Xul = linux;
+      icewm = linux;
+      idutils = all;
+      ifplugd = linux;
+      impressive = linux;
+      inetutils = linux;
+      inkscape = linux;
+      iputils = linux;
+      irssi = linux;
+      jfsutils = linux;
+      jfsrec = linux;
+      jnettop = linux;
+      jwhois = linux;
+      kbd = linux;
+      keen4 = ["i686-linux"];
+    #  klibc = linux;
+      kvm = linux;
+      qemu = linux;
+      qemu_kvm = linux;
+      less = all;
+      lftp = all;
+      libarchive = linux;
+      libsmbios = linux;
+      libtool = all;
+      libtool_2 = all;
+      lout = linux;
+      lsh = linux;
+      lsof = linux;
+      ltrace = linux;
+      lvm2 = linux;
+      lynx = linux;
+      lzma = linux;
+      man = linux;
+      manpages = linux;
+      maxima = linux;
+      mc = linux;
+      mcabber = linux;
+      mcron = linux;
+      mdadm = linux;
+      mercurial = allBut "i686-cygwin";
+      mercurialFull = allBut "i686-cygwin";
+      mesa = mesaPlatforms;
+      midori = linux;
+      mingetty = linux;
+      mk = linux;
+      mktemp = all;
+      mod_python = linux;
+      module_init_tools = linux;
+      mono = linux;
+      mpg321 = linux;
+      mupen64plus = linux;
+      mutt = linux;
+      mysql = linux;
+      mysql51 = linux;
+      mysql55 = linux;
+      namazu = all;
+      nano = allBut "i686-cygwin";
+      ncat = linux;
+      netcat = all;
+      nfsUtils = linux;
+      nix = all;
+      nixUnstable = all;
+      nmap = linux;
+      nss_ldap = linux;
+      nssmdns = linux;
+      ntfs3g = linux;
+      ntp = linux;
+      ocaml = linux;
+      octave = linux;
+      openssh = linux;
+      openssl = all;
+      pam_console = linux;
+      pam_login = linux;
+      pan = gtkSupported;
+      par2cmdline = all;
+      pavucontrol = linux;
+      pciutils = linux;
+      pdf2xml = all;
+      perl = all;
+      php = linux;
+      pidgin = linux;
+      pinentry = linux;
+      pltScheme = linux;
+      pmccabe = linux;
+      portmap = linux;
+      postgresql = all;
+      postfix = linux;
+      ppl = all;
+      procps = linux;
+      pthreadmanpages = linux;
+      pygtk = linux;
+      pyqt4 = linux;
+      python = allBut "i686-cygwin";
+      pythonFull = linux;
+      sbcl = linux;
+      qt3 = linux;
+      quake3demo = linux;
+      readline = all;
+      reiserfsprogs = linux;
+      rlwrap = all;
+      rogue = all;
+      rpm = linux;
+      rsync = linux;
+      rubber = allBut "i686-cygwin";
+      ruby = all;
+      rxvt_unicode = linux;
+      screen = linux ++ darwin;
+      scrot = linux;
+      sdparm = linux;
+      seccure = linux;
+      sgtpuzzles = linux;
+      sharutils = all;
+      slim = linux;
+      sloccount = allBut "i686-cygwin";
+      smartmontools = linux;
+      socat = linux;
+      spidermonkey = linux;
+      splashutils = linux;
+      sqlite = allBut "i686-cygwin";
+      squid = linux;
+      ssmtp = linux;
+      stdenv = prio 175 all;
+      stlport = linux;
+      strace = linux;
+      su = linux;
+      sudo = linux;
+      superTuxKart = linux;
+      swig = linux;
+      sylpheed = linux;
+      sysklogd = linux;
+      syslinux = ["i686-linux"];
+      sysvinit = linux;
+      sysvtools = linux;
+      tahoelafs = linux;
+      tangogps = linux;
+      tcl = linux;
+      tcpdump = linux;
+      teeworlds = linux;
+      tetex = linux;
+      texLive = linux;
+      texLiveBeamer = linux;
+      texLiveExtra = linux;
+      texinfo = all;
+      tightvnc = linux;
+      time = linux;
+      tinycc = ["i686-linux"];
+      uae = linux;
+      udev = linux;
+      unrar = linux;
+      upstart = linux;
+      usbutils = linux;
+      utillinux = linux;
+      utillinuxCurses = linux;
+      uzbl = linux;
+      viking = linux;
+      vice = linux;
+      vim = linux;
+      vimHugeX = linux;
+      VisualBoyAdvance = linux;
+      vlc = linux;
+      vncrec = linux;
+      vorbisTools = linux;
+      vpnc = linux;
+      vsftpd = linux;
+      w3m = all;
+      webkit = linux;
+      weechat = linux;
+      wget = all;
+      which = all;
+      wicd = linux;
+      wine = ["i686-linux"];
+      wireshark = linux;
+      wirelesstools = linux;
+      wxGTK = linux;
+      x11_ssh_askpass = linux;
+      xchm = linux;
+      xfig = x11Supported;
+      xfsprogs = linux;
+      xineUI = linux;
+      xkeyboard_config = linux;
+      xlockmore = linux;
+      xmltv = linux;
+      xpdf = linux;
+      xscreensaver = linux;
+      xsel = linux;
+      xterm = linux;
+      xxdiff = linux;
+      zdelta = linux;
+      zile = linux;
+      zip = all;
+      zsh = linux;
+      zsnes = ["i686-linux"];
 
-  firefox36Pkgs.firefox = linux;
-  firefox19Pkgs.firefox = linux;
+      emacs23Packages = {
+        bbdb = linux;
+        cedet = linux;
+        ecb = linux;
+        emacsw3m = linux;
+        emms = linux;
+        jdee = linux;
+      };
 
-  gnome = {
-    gnome_panel = linux;
-    metacity = linux;
-    gnome_vfs = linux;
-  };
+      firefox36Pkgs.firefox = linux;
+      firefox19Pkgs.firefox = linux;
 
-  haskellPackages_ghc6104 = {
-    ghc = ghcSupported;
-  };
+      gnome = {
+        gnome_panel = linux;
+        metacity = linux;
+        gnome_vfs = linux;
+      };
 
-  haskellPackages_ghc6123 = {
-    ghc = ghcSupported;
-  };
+      haskellPackages_ghc6104 = {
+        ghc = ghcSupported;
+      };
 
-  haskellPackages_ghc704 = {
-    ghc = ghcSupported;
-  };
+      haskellPackages_ghc6123 = {
+        ghc = ghcSupported;
+      };
 
-  haskellPackages_ghc742 = {
-    ghc = ghcSupported;
-  };
+      haskellPackages_ghc704 = {
+        ghc = ghcSupported;
+      };
 
-  haskellPackages_ghc762 = {
-    ghc = ghcSupported;
-  };
+      haskellPackages_ghc742 = {
+        ghc = ghcSupported;
+      };
 
-  strategoPackages = {
-    sdf = linux;
-    strategoxt = linux;
-    javafront = linux;
-    strategoShell = linux ++ darwin;
-    dryad = linux;
-  };
+      haskellPackages_ghc762 = {
+        ghc = ghcSupported;
+      };
 
-  pythonPackages = {
-    zfec = linux;
-  };
+      strategoPackages = {
+        sdf = linux;
+        strategoxt = linux;
+        javafront = linux;
+        strategoShell = linux ++ darwin;
+        dryad = linux;
+      };
 
-  xorg = {
-    fontadobe100dpi = linux;
-    fontadobe75dpi = linux;
-    fontbh100dpi = linux;
-    fontbhlucidatypewriter100dpi = linux;
-    fontbhlucidatypewriter75dpi = linux;
-    fontbhttf = linux;
-    fontcursormisc = linux;
-    fontmiscmisc = linux;
-    iceauth = linux;
-    libX11 = linux;
-    lndir = all;
-    setxkbmap = linux;
-    xauth = linux;
-    xbitmaps = linux;
-    xev = linux;
-    xf86inputevdev = linux;
-    xf86inputkeyboard = linux;
-    xf86inputmouse = linux;
-    xf86inputsynaptics = linux;
-    xf86videoati = linux;
-    xf86videocirrus = linux;
-    xf86videointel = linux;
-    xf86videonv = linux;
-    xf86videovesa = linux;
-    xfs = linux;
-    xkbcomp = linux;
-    xlsclients = linux;
-    xmessage = linux;
-    xorgserver = linux;
-    xprop = linux;
-    xrandr = linux;
-    xrdb = linux;
-    xset = linux;
-    xsetroot = linux;
-    xwininfo = linux;
-  };
+      pythonPackages = {
+        zfec = linux;
+      };
 
-  xfce = {
-    gtk_xfce_engine = linux;
-    mousepad = linux;
-    ristretto = linux;
-    terminal = linux;
-    thunar = linux;
-    xfce4_power_manager = linux;
-    xfce4icontheme = linux;
-    xfce4mixer = linux;
-    xfce4panel = linux;
-    xfce4session = linux;
-    xfce4settings = linux;
-    xfdesktop = linux;
-    xfwm4 = linux;
-  };
+      xorg = {
+        fontadobe100dpi = linux;
+        fontadobe75dpi = linux;
+        fontbh100dpi = linux;
+        fontbhlucidatypewriter100dpi = linux;
+        fontbhlucidatypewriter75dpi = linux;
+        fontbhttf = linux;
+        fontcursormisc = linux;
+        fontmiscmisc = linux;
+        iceauth = linux;
+        libX11 = linux;
+        lndir = all;
+        setxkbmap = linux;
+        xauth = linux;
+        xbitmaps = linux;
+        xev = linux;
+        xf86inputevdev = linux;
+        xf86inputkeyboard = linux;
+        xf86inputmouse = linux;
+        xf86inputsynaptics = linux;
+        xf86videoati = linux;
+        xf86videocirrus = linux;
+        xf86videointel = linux;
+        xf86videonv = linux;
+        xf86videovesa = linux;
+        xfs = linux;
+        xkbcomp = linux;
+        xlsclients = linux;
+        xmessage = linux;
+        xorgserver = linux;
+        xprop = linux;
+        xrandr = linux;
+        xrdb = linux;
+        xset = linux;
+        xsetroot = linux;
+        xwininfo = linux;
+      };
 
-} ))
+      xfce = {
+        gtk_xfce_engine = linux;
+        mousepad = linux;
+        ristretto = linux;
+        terminal = linux;
+        thunar = linux;
+        xfce4_power_manager = linux;
+        xfce4icontheme = linux;
+        xfce4mixer = linux;
+        xfce4panel = linux;
+        xfce4session = linux;
+        xfce4settings = linux;
+        xfdesktop = linux;
+        xfwm4 = linux;
+      };
+
+    } ));
+
+in jobs

From f135b6e53024e6fa4e808452edf83507c073b0a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 12:09:02 +0100
Subject: [PATCH 191/394] Fix comment

---
 maintainers/scripts/eval-release.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix
index 7007ce6de418..4bd2b0f1fa8b 100644
--- a/maintainers/scripts/eval-release.nix
+++ b/maintainers/scripts/eval-release.nix
@@ -1,6 +1,5 @@
-# Evaluate `release.nix' like Hydra would (i.e. call each job
-# attribute with the expected `system' argument).  Too bad
-# nix-instantiate can't to do this.
+# Evaluate `release.nix' like Hydra would.  Too bad nix-instantiate
+# can't to do this.
 
 with import ../../pkgs/lib;
 

From c5f45036e6653f9855f5b05f2a43e05ea072fde2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 13:12:25 +0100
Subject: [PATCH 192/394] release-lib.nix: Make the set of supported platforms
 an argument

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

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 8af1ca90267a..2c688ea71bdc 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -1,4 +1,4 @@
-with (import ./release-lib.nix);
+with import ./release-lib.nix { supportedSystems = []; };
 let
   nativePlatforms = linux;
 
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 5b7e830a2f19..5052a41a96cf 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -1,3 +1,5 @@
+{ supportedSystems }:
+
 rec {
 
   # Ensure that we don't build packages marked as unfree.
@@ -8,10 +10,6 @@ rec {
   pkgs = allPackages { system = "x86_64-linux"; };
 
 
-  # The platforms for which we build Nixpkgs.
-  supportedSystems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ];
-
-
   /* !!! Hack: poor man's memoisation function.  Necessary to prevent
      Nixpkgs from being evaluated again and again for every
      job/platform pair. */
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index ad027cd93460..a3902b8daa8c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -11,9 +11,11 @@
 
 { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
+, # The platforms for which we build Nixpkgs.
+  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]
 }:
 
-with import ./release-lib.nix;
+with import ./release-lib.nix { inherit supportedSystems; };
 
 let
 

From db572bc3ecdad1afa6f98692f13c222d663874bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 15:31:41 +0100
Subject: [PATCH 193/394] iproute2: Update to 3.8.0

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

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 2b22f4a2881b..5c0f48b2901f 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "iproute2-3.6.0";
+  name = "iproute2-3.8.0";
 
   src = fetchurl {
-    url = http://kernel.org/pub/linux/utils/net/iproute2/iproute2-3.6.0.tar.xz;
-    sha256 = "0d05av2s7p552yszgj6glz6d74jlmg392s7n74hicgqfl16m85rd";
+    url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
+    sha256 = "0kqy30wz2krbg4y7750hjq5218hgy2vj9pm5qzkn1bqskxs4b4ap";
   };
 
   patches = [ ./vpnc.patch ];

From 70ae131f6206cfcf5be55f4f1a913e4c07030abe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 26 Mar 2013 15:39:24 +0100
Subject: [PATCH 194/394] gimp: update from 2.8.2 to 2.8.4

---
 pkgs/applications/graphics/gimp/2.8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 44d9330043fb..4a9890720a32 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -4,11 +4,11 @@
 , python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.8.2";
+  name = "gimp-2.8.4";
   
   src = fetchurl {
     url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
-    md5 = "b542138820ca3a41cbd63fc331907955";
+    md5 = "392592e8755d046317878d226145900f";
   };
   
   buildInputs = 

From 1c4e7e78ced8e4504ec29ab72449bf35d2a9a37f Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <rmm@meta.ph>
Date: Tue, 26 Mar 2013 22:52:54 +0800
Subject: [PATCH 195/394] Add chicken-4.8.1

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

diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix
new file mode 100644
index 000000000000..deb93257df73
--- /dev/null
+++ b/pkgs/development/compilers/chicken/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "chicken-4.8.1";
+
+  meta = {
+    homepage = http://www.call-cc.org/;
+    description = "Chicken Scheme";
+  };
+
+  src = fetchurl {
+    url = http://code.call-cc.org/dev-snapshots/2013/01/04/chicken-4.8.1.tar.gz;
+    md5 = "bd758ec7abeaeb4f4c92c290fb5f3db7";
+  };
+
+  buildFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib";
+  installFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7f9aa08b8c5..78bc9fe474df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1940,6 +1940,8 @@ let
 
   bigloo = callPackage ../development/compilers/bigloo { };
 
+  chicken = callPackage ../development/compilers/chicken { };
+
   ccl = builderDefsPackage ../development/compilers/ccl {};
 
   clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix {

From 5262980561605311522cfe6e206fb7e36974547d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 15:58:12 +0100
Subject: [PATCH 196/394] nixUnstable: Bump

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

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 41ad7b4f4f21..fe409526e71d 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.5.2pre3079_c3fc60d";
+  name = "nix-1.5.2pre3082_2398417";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/4445767/download/5/${name}.tar.xz";
-    sha256 = "0422ceb1439cf1140e86f86514bdcb04b0706881ea31a9f6ee5206b9faad009b";
+    url = "http://hydra.nixos.org/build/4480483/download/5/${name}.tar.xz";
+    sha256 = "efea03fd9e15f52564ecfe6942bf9e8a757ef2e83b6ad9832f214342b2cbba83";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

From d4642465abc8afe0ac27cc23a801f42a3ff4d5aa Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 26 Mar 2013 16:39:03 +0100
Subject: [PATCH 197/394] dropbox: add x86 support

---
 .../networking/dropbox/default.nix            | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index b979598e17c4..4e911bc33452 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -16,13 +16,19 @@
 # replace these libraries with the appropriate ones in
 # nixpkgs.
 
-# note: there is a i686 version available as well
-assert stdenv.system == "x86_64-linux";
-
 let
+  arch = if stdenv.system == "x86_64-linux" then "x86_64"
+    else if stdenv.system == "i686-linux" then "x86"
+    else throw "Dropbox client for: ${stdenv.system} not supported!";
+    
+  interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
+    else if stdenv.system == "i686-linux" then "ld-linux.so.2"
+    else throw "Dropbox client for: ${stdenv.system} not supported!";
 
   version = "1.4.21";
-  sha256 = "94073842f4a81feee80bca590e1df73fc3cab47ba879407ceba2de48f30d84e2";
+  sha256 = if stdenv.system == "x86_64-linux" then "94073842f4a81feee80bca590e1df73fc3cab47ba879407ceba2de48f30d84e2"
+    else if stdenv.system == "i686-linux" then "121v92m20l73xjmzng3vmcp4zsp9mlbcfia73f5py5y74kndb2ap"
+    else throw "Dropbox client for: ${stdenv.system} not supported!";
 
   # relative location where the dropbox libraries are stored
   appdir = "opt/dropbox";
@@ -52,8 +58,8 @@ in stdenv.mkDerivation {
     name = "dropbox-${version}.tar.gz";
     # using version-specific URL so if the version is no longer available,
     # build will fail without having to finish downloading first
-    # url = "http://www.dropbox.com/download?plat=lnx.x86_64";
-    url = "http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-${version}.tar.gz";
+    # url = "http://www.dropbox.com/download?plat=lnx.${arch}";
+    url = "http://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz";
     inherit sha256;
   };
 
@@ -69,10 +75,10 @@ in stdenv.mkDerivation {
     ensureDir "$out/bin"
     ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
 
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
+    patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
       "$out/${appdir}/dropbox"
 
-    RPATH=${ldpath}:${gcc.gcc}/lib64:$out/${appdir}
+    RPATH=${ldpath}:${gcc.gcc}/lib:$out/${appdir}
     echo "updating rpaths to: $RPATH"
     find "$out/${appdir}" -type f -a -perm +0100 \
       -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;

From 463378f7ccd82e644737497b1af364fbeba48edc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 26 Mar 2013 19:48:52 +0100
Subject: [PATCH 198/394] fetchsvn: Add ignoreExternals attribute.

There are some SVN repositories out there which don't have revision information
tied to externals. By using ignoreExternals, fetchsvn won't fetch these
externals anymore, so the fetch won't fail with a checksum mismatch, should
there be some changes in some of those external repositories.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/fetchsvn/builder.sh  | 3 ++-
 pkgs/build-support/fetchsvn/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh
index 09358aa694bc..ea52ca19fa67 100644
--- a/pkgs/build-support/fetchsvn/builder.sh
+++ b/pkgs/build-support/fetchsvn/builder.sh
@@ -22,6 +22,7 @@ fi;
 # server's certificate.  This is perfectly safe: we don't care
 # whether the server is being spoofed --- only the cryptographic
 # hash of the output matters.
-echo 'p' | svn export -r "$rev" "$url" $out
+echo 'p' | svn export ${ignoreExternals:+--ignore-externals} \
+    -r "$rev" "$url" "$out"
 
 stopNest
diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index ae8aabf858cd..39272b996082 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@@ -1,5 +1,5 @@
 {stdenv, subversion, sshSupport ? false, openssh ? null}: 
-{url, rev ? "HEAD", md5 ? "", sha256 ? ""}:
+{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false}:
 
 let
   repoName = with stdenv.lib;
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = if sha256 == "" then md5 else sha256;
   
-  inherit url rev sshSupport openssh;
+  inherit url rev sshSupport openssh ignoreExternals;
 
   impureEnvVars = [
     # We borrow these environment variables from the caller to allow

From 735779cee405e3d04f9c3da2558fbf7c63d26ebb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 26 Mar 2013 19:53:05 +0100
Subject: [PATCH 199/394] neko: Update to new upstream version 2.0.0.

This is required in order to support Haxe 3, but won't hurt (tested with a few
projects) even in Haxe 2.x.

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

diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index ddeeb51c25e4..0321ae1f60ab 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "neko-${version}";
-  version = "1.8.2";
+  version = "2.0.0";
 
   src = fetchurl {
     url = "http://nekovm.org/_media/neko-${version}.tar.gz";
-    sha256 = "099727w6dk689z3pcgbhsqjl74zzrh82a5vb2abxynamcqxcgz1w";
+    sha256 = "1lcm1ahbklfpd5lnqjwmvyj2vr85jbq57hszk5jgq0x6yx6p3927";
   };
 
   prePatch = with stdenv.lib; let

From a0716f28afd5b3f9028f40ea17d8b0a9097fcff8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 26 Mar 2013 19:56:09 +0100
Subject: [PATCH 200/394] haxe: Use ignoreExternals and fix build.

Now, our builds shouldn't break anymore once there is a new change in ocamllibs.

I've used revision 256 from ocamllibs, because this was approximately the
revision we had back then when Haxe 2.10 got released.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/compilers/haxe/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 817e4573df24..1b4f237cca5b 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -5,12 +5,22 @@ stdenv.mkDerivation {
 
   buildInputs = [ocaml zlib neko];
 
-  src = fetchsvn {
+  srcs = fetchsvn {
     url = "http://haxe.googlecode.com/svn/tags/v2-10";
-    sha256 = "dbd3c655e4136eb68a165ef83b96bfc1f0f2eb9ec8729603b19bcd717a61a679";
+    sha256 = "0vwdlj0vmmf97bg6cish7yah36aca2q599vwzbr1m0jpjbvindkh";
+    ignoreExternals = true;
+  };
+
+  ocamllibs = fetchsvn {
+    url = "http://ocamllibs.googlecode.com/svn/trunk";
+    sha256 = "143s320xn2xalm0lnw46h1fvy48qg7my3j8cf66f0wwzv2fisr1q";
+    rev = 256;
+    ignoreExternals = true;
   };
 
   prePatch = ''
+    cp -r "$ocamllibs" libs
+    chmod -R u+w libs
     sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml
   '';
 

From adfc5939a7d59d78d3509c152223bd79537d80fd Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 26 Mar 2013 21:06:36 +0100
Subject: [PATCH 201/394] chromium: Fix updater for version 26 and newer.

The updater was actually getting the -lite version, which our expression won't
build with, except if we switch some bundled dependencies to those in nixpkgs.

Of course the problem with fetching version 27 was me being stupid and using a
case statement in the updater, as if there won't be any version after 26 ;-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/update.sh            | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh
index cc38125c1933..0c21213a751c 100755
--- a/pkgs/applications/networking/browsers/chromium/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/update.sh
@@ -62,7 +62,7 @@ then
             sha256="$(nix_getattr "$output_file" "$channel.sha256")";
         fi;
 
-        sha_insert "$version" "$sha256"
+        sha_insert "$version" "$sha256";
         echo "$sha256";
     }
 else
@@ -80,10 +80,11 @@ get_channel_exprs()
         version="${chline##*,}";
 
         # XXX: Remove case after version 26 is stable:
-        case "${version%%.*}" in
-            26) url="${bucket_url%/}/chromium-$version-lite.tar.xz";;
-            *)  url="${bucket_url%/}/chromium-$version.tar.bz2";;
-        esac;
+        if [ "${version%%.*}" -ge 26 ]; then
+            url="${bucket_url%/}/chromium-$version.tar.xz";
+        else
+            url="${bucket_url%/}/chromium-$version.tar.bz2";
+        fi;
 
         echo -n "Checking if sha256 of version $version is cached..." >&2;
         if sha256="$(sha_lookup "$version")";

From 432e0f869cf7cb6eea239b96555bfd1612e93fef Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 26 Mar 2013 22:07:32 +0100
Subject: [PATCH 202/394] chromium: Remove patch for CLONE_DETACHED.

This patch was introduced before (7e5109a) the stdenv-updates merge and is no
longer needed, as the current C library doesn't use this flag anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../browsers/chromium/clone_detached.patch    | 19 -------------------
 .../networking/browsers/chromium/default.nix  |  1 -
 2 files changed, 20 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/clone_detached.patch

diff --git a/pkgs/applications/networking/browsers/chromium/clone_detached.patch b/pkgs/applications/networking/browsers/chromium/clone_detached.patch
deleted file mode 100644
index 682de656459e..000000000000
--- a/pkgs/applications/networking/browsers/chromium/clone_detached.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 222f1e980ab84ffd3a21001feaf06dd537570a1a Mon Sep 17 00:00:00 2001
-From: Ian Farmer <ian@ianfarmer.net>
-Date: Sat, 16 Feb 2013 09:38:10 -0800
-Subject: [PATCH] Update Chromium dev channel version to 26.0.1410.5.
-
-This version requires a patch for compatibility with versions
-of glibc that support older kernel versions.
-
---- a/content/common/sandbox_seccomp_bpf_linux.cc	2013-02-15 23:26:06.000000000 -0800
-+++ b/content/common/sandbox_seccomp_bpf_linux.cc	2013-02-15 23:26:24.000000000 -0800
-@@ -1313,7 +1313,7 @@
-     return Sandbox::Cond(0, ErrorCode::TP_32BIT, ErrorCode::OP_EQUAL,
-         CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-         CLONE_THREAD | CLONE_SYSVSEM | CLONE_SETTLS |
--        CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID,
-+        CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED,
-         ErrorCode(ErrorCode::ERR_ALLOWED),
-         Sandbox::Trap(ReportCloneFailure, NULL));
-   } else {
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 019ba1792f3b..094ddb54c38a 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -126,7 +126,6 @@ in stdenv.mkDerivation rec {
 
   patches = optional cupsSupport ./cups_allow_deprecated.patch
          ++ optional pulseSupport ./pulseaudio_array_bounds.patch
-         ++ optional post25 ./clone_detached.patch
          ++ [ ./glibc-2.16-use-siginfo_t.patch ];
 
   postPatch = ''

From d5c841982361d5d940be4c3a376dd4b766abb570 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 26 Mar 2013 21:10:49 +0100
Subject: [PATCH 203/394] chromium: Update all channels to latest versions.

stable: 25.0.1364.152 -> 26.0.1410.43 (builds fine, tested)
beta:   26.0.1410.28  -> 26.0.1410.43 (builds fine, tested)
dev:    26.0.1410.28  -> 27.0.1448.0  (build fixed and tested)

For version 27, this introduces a new dependency on libXtst and removes the
patch for siginfo_t and the pulseaudio array bounds error.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix   | 12 +++++++++---
 .../networking/browsers/chromium/sources.nix   | 18 +++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 094ddb54c38a..a4f71ffcb259 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -21,6 +21,9 @@
 # dependencies for >= v26
 , speechd, libXdamage
 
+# dependencies for >= v27
+, libXtst
+
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
 
@@ -88,7 +91,9 @@ let
   ];
 
   pre26 = versionOlder sourceInfo.version "26.0.0.0";
+  pre27 = versionOlder sourceInfo.version "27.0.0.0";
   post25 = !pre26;
+  post26 = !pre27;
 
 in stdenv.mkDerivation rec {
   name = "${packageName}-${version}";
@@ -118,15 +123,16 @@ in stdenv.mkDerivation rec {
     ++ optional cupsSupport libgcrypt
     ++ optional pulseSupport pulseaudio
     ++ optional pre26 libvpx
-    ++ optionals post25 [ speechd libXdamage ];
+    ++ optionals post25 [ speechd libXdamage ]
+    ++ optional post26 libXtst;
 
   opensslPatches = optional useOpenSSL openssl.patches;
 
   prePatch = "patchShebangs .";
 
   patches = optional cupsSupport ./cups_allow_deprecated.patch
-         ++ optional pulseSupport ./pulseaudio_array_bounds.patch
-         ++ [ ./glibc-2.16-use-siginfo_t.patch ];
+         ++ optional (pulseSupport && pre27) ./pulseaudio_array_bounds.patch
+         ++ optional pre27 ./glibc-2.16-use-siginfo_t.patch;
 
   postPatch = ''
     sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index a14b10fcfde7..9e4c0cff5634 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "26.0.1410.28";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
-    sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
+    version = "27.0.1448.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1448.0.tar.xz";
+    sha256 = "03sarp8drf9a6likk4m73lgk2i4nhqqri8ja9h8qiglqc4sf2hn0";
   };
   beta = {
-    version = "26.0.1410.28";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
-    sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
+    version = "26.0.1410.43";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz";
+    sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii";
   };
   stable = {
-    version = "25.0.1364.152";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.152.tar.bz2";
-    sha256 = "1v8zpqk3q21d5hars1clss75n187hlg4zxbr68jj1ysmqclzbni8";
+    version = "26.0.1410.43";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz";
+    sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii";
   };
 }

From f1dcd8c11fa3d35606a9025abd26379b1bbd293e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 26 Mar 2013 22:13:16 +0100
Subject: [PATCH 204/394] python-deluge: Fix GUI support.

Actually only pyGtkGlade was missing in propagatedBuildInputs. In addition,
buildInputs is quite redundant in this case, so let's drop it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9c816188b715..ce1bd8f51d3a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -796,14 +796,14 @@ pythonPackages = python.modules // rec {
       md5 = "33557678bf2f320de670ddaefaea009d";
     };
 
-    # TODO: gui, procsettitle
-    buildInputs = [ pkgs.libtorrentRasterbar twisted Mako chardet pyxdg pkgs.pyopenssl ];
-    propagatedBuildInputs = [ pkgs.libtorrentRasterbar twisted Mako chardet pyxdg pkgs.pyopenssl ];
+    propagatedBuildInputs = with pkgs; [
+      pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl
+    ];
 
     meta = {
       homepage = http://deluge-torrent.org;
       description = "Torrent client";
-      license = "GPLv3";
+      license = stdenv.lib.licenses.gpl3Plus;
       maintainers = [ stdenv.lib.maintainers.iElectric ];
       platforms = stdenv.lib.platforms.all;
     };

From c07d0b9b7877c9cf098880adb67f88321d2178f8 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 27 Mar 2013 02:24:55 +0100
Subject: [PATCH 205/394] Add almir and it's dependencies.

---
 pkgs/tools/backup/bacula/default.nix |   5 +
 pkgs/top-level/python-packages.nix   | 571 ++++++++++++++++++++++++++-
 2 files changed, 557 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index ad594c0ea48f..d3acdf747539 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
     "--with-postgresql=${postgresql}"
   ];
 
+  postInstall = ''
+    mkdir -p $out/bin
+    ln -s $out/sbin/* $out/bin
+  '';
+
   meta = {
     description = "Enterprise ready, Network Backup Tool";
     homepage = http://bacula.org/;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ce1bd8f51d3a..6b4118842288 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -123,6 +123,60 @@ pythonPackages = python.modules // rec {
   };
 
 
+  almir = buildPythonPackage rec {
+    name = "almir-0.1.7";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/a/almir/${name}.zip";
+      md5 = "daea15c898487a2bded1ae6ef78633e5";
+    };
+
+    buildInputs = [
+      pkgs.which
+      pkgs.unzip
+      coverage
+      mock
+      tissue
+      unittest2
+      webtest
+    ];
+
+    propagatedBuildInputs = [ 
+      pkgs.makeWrapper
+      pkgs.bacula
+      colander
+      deform
+      deform_bootstrap
+      docutils
+      nose
+      mysql_connector_repackaged
+      pg8000
+      pyramid
+      pyramid_beaker
+      pyramid_exclog
+      pyramid_jinja2
+      pyramid_tm
+      pytz
+      sqlalchemy
+      transaction
+      waitress
+      webhelpers
+      zope_sqlalchemy
+    ];
+
+    postInstall = ''
+      ln -s ${pyramid}/bin/pserve $out/bin
+      wrapProgram "$out/bin/pserve" \
+        --suffix PYTHONPATH : "$out/lib/python2.7/site-packages"
+    '';
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
   alot = buildPythonPackage rec {
     rev = "d3c1880a60ddd8ded397d92cddf310a948b97fdc";
     name = "alot-0.3.4_${rev}";
@@ -574,6 +628,26 @@ pythonPackages = python.modules // rec {
     };
   });
 
+
+  colander = buildPythonPackage rec {
+    name = "colander-0.9.6";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/colander/${name}.tar.gz";
+      md5 = "2d9f65a64cb6b7f35d6a0d7b607ce4c6";
+    };
+
+    propagatedBuildInputs = [ translationstring ];
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
   configobj = buildPythonPackage (rec {
     name = "configobj-4.7.2";
 
@@ -712,6 +786,292 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
+  deform = buildPythonPackage rec {
+    name = "deform-0.9.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz";
+      md5 = "2ed7b69644a6d8f4e1404e1892329240";
+    };
+
+    propagatedBuildInputs = [ beautifulsoup4 peppercorn colander translationstring chameleon ];
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  deform_bootstrap = buildPythonPackage rec {
+    name = "deform_bootstrap-0.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/d/deform_bootstrap/${name}.tar.gz";
+      md5 = "57812251f327367761f32d49a8286aa4";
+    };
+
+    propagatedBuildInputs = [ deform ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  peppercorn = buildPythonPackage rec {
+    name = "peppercorn-0.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/peppercorn/${name}.tar.gz";
+      md5 = "464d6f2342eaf704dfb52046c1f5c320";
+    };
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  pyramid = buildPythonPackage rec {
+    name = "pyramid-1.3.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz";
+      md5 = "967a04fcb2143b31b279c3013a778a2b";
+    };
+
+    buildInputs = [ 
+      docutils 
+      virtualenv 
+      webtest 
+      zope_component 
+      zope_interface 
+    ];
+
+    propagatedBuildInputs = [
+      chameleon
+      Mako
+      paste_deploy
+      repoze_lru
+      repoze_sphinx_autointerface
+      translationstring
+      venusian
+      webob
+      zope_deprecation
+      zope_interface
+    ];
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  pyramid_jinja2 = buildPythonPackage rec {
+    name = "pyramid_jinja2-1.6";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyramid_jinja2/${name}.zip";
+      md5 = "b7df1ab97f90f39529d27ba6da1f6b1c";
+    };
+
+    buildInputs = [ pkgs.unzip webtest ];
+    propagatedBuildInputs = [ jinja2 pyramid ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  pyramid_beaker = buildPythonPackage rec {
+    name = "pyramid_beaker-0.7";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyramid_beaker/${name}.tar.gz";
+      md5 = "acb863517a98b90b5f29648ce55dd563";
+    };
+
+    propagatedBuildInputs = [ beaker pyramid ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  pyramid_tm = buildPythonPackage rec {
+    name = "pyramid_tm-0.7";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyramid_tm/${name}.tar.gz";
+      md5 = "6dc917d262c69366630c542bd21859a3";
+    };
+
+    propagatedBuildInputs = [ transaction pyramid ];
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  pyramid_exclog = buildPythonPackage rec {
+    name = "pyramid_exclog-0.6";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyramid_exclog/${name}.tar.gz";
+      md5 = "5c18706f5500605416afff311120c933";
+    };
+
+    propagatedBuildInputs = [ pyramid ];
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  beaker = buildPythonPackage rec {
+    name = "Beaker-1.6.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/B/Beaker/${name}.tar.gz";
+      md5 = "c2e102870ed4c53104dec48ceadf8e9d";
+    };
+
+    buildInputs = [ sqlalchemy pycryptopp nose mock webtest ];
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  repoze_sphinx_autointerface = buildPythonPackage rec {
+    name = "repoze.sphinx.autointerface-0.7.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/repoze.sphinx.autointerface/${name}.tar.gz";
+      md5 = "f2fee996ae28dc16eb48f1a3e8f64801";
+    };
+
+    propagatedBuildInputs = [ zope_interface sphinx ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  repoze_lru = buildPythonPackage rec {
+    name = "repoze.lru-0.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/repoze.lru/${name}.tar.gz";
+      md5 = "9f6ab7a4ff871ba795cadf56c20fb0f0";
+    };
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  zope_deprecation = buildPythonPackage rec {
+    name = "zope.deprecation-3.5.0";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.deprecation/${name}.tar.gz";
+      md5 = "1e7db82583013127aab3e7e790b1f2b6";
+    };
+
+    buildInputs = [ zope_testing ];
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  venusian = buildPythonPackage rec {
+    name = "venusian-1.0a7";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/v/venusian/${name}.tar.gz";
+      md5 = "6f67506dd3cf77116f1c01682a6c3f27";
+    };
+
+    # TODO: https://github.com/Pylons/venusian/issues/23
+    doCheck = false;
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
+  chameleon = buildPythonPackage rec {
+    name = "Chameleon-2.11";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/C/Chameleon/${name}.tar.gz";
+      md5 = "df72458bf3dd26a744dcff5ad555c34b";
+    };
+
+    # TODO: https://github.com/malthe/chameleon/issues/139
+    doCheck = false;
+
+    meta = {
+       maintainers = [
+         stdenv.lib.maintainers.garbas
+         stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
   distribute = stdenv.mkDerivation rec {
     name = "distribute-0.6.34";
 
@@ -1717,11 +2077,11 @@ pythonPackages = python.modules // rec {
 
 
   mock = buildPythonPackage (rec {
-    name = "mock-0.7.0";
+    name = "mock-1.0.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/m/mock/${name}.tar.gz";
-      md5 = "be029f8c963c55250a452c400e10cf42";
+      md5 = "c3971991738caa55ec7c356bbc154ee2";
     };
 
     buildInputs = [ unittest2 ];
@@ -1850,6 +2210,24 @@ pythonPackages = python.modules // rec {
   };
 
 
+  mysql_connector_repackaged = buildPythonPackage rec {
+    name = "mysql-connector-repackaged-0.3.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/m/mysql-connector-repackaged/${name}.tar.gz";
+      md5 = "0b17ad1cb3fe763fd44487cb97cf45b2";
+    };
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.linux;
+    };
+  };
+
+
   namebench = buildPythonPackage (rec {
     name = "namebench-1.0.5";
 
@@ -2192,21 +2570,20 @@ pythonPackages = python.modules // rec {
 
 
   paste_deploy = buildPythonPackage rec {
-    version = "1.3.4";
+    version = "1.5.0";
     name = "paste-deploy-${version}";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-${version}.tar.gz";
-      md5 = "eb4b3e2543d54401249c2cbd9f2d014f";
+      md5 = "f1a068a0b680493b6eaff3dd7690690f";
     };
 
     buildInputs = [ nose ];
 
-    doCheck = false; # can't find "FakeEgg.app", apparently missing from the tarball
-
     meta = {
       description = "Load, configure, and compose WSGI applications and servers";
       homepage = http://pythonpaste.org/deploy/;
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
@@ -2279,6 +2656,28 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
+  pg8000 = buildPythonPackage rec {
+    name = "pg8000-1.08";
+
+    src = fetchurl {
+      url = "http://pybrary.net/pg8000/dist/${name}.tar.gz";
+      md5 = "2e8317a22d0e09a6f12e98ddf3bb75fd";
+    };
+
+    buildInputs = [ pkgs.unzip ];
+
+    propagatedBuildInputs = [ pytz ];
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.linux;
+    };
+  };
+
   pip = buildPythonPackage {
     name = "pip-1.2.1";
     src = fetchurl {
@@ -2854,11 +3253,13 @@ pythonPackages = python.modules // rec {
 
   pyquery = buildPythonPackage rec {
     name = "pyquery-1.2.4";
+
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.4.tar.gz";
+      url = "http://pypi.python.org/packages/source/p/pyquery/${name}.tar.gz";
       md5 = "268f08258738d21bc1920d7522f2a63b";
     };
-    buildInputs = [ cssselect lxml ];
+
+    propagatedBuildInputs = [ cssselect lxml ];
   };
 
 
@@ -3873,24 +4274,38 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  waitress = buildPythonPackage rec {
+    name = "waitress-0.8.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/w/waitress/${name}.tar.gz";
+      md5 = "aadfc692b780fc42eb05ac819102d336";
+    };
+
+    meta = {
+       maintainers = [
+         stdenv.lib.maintainers.garbas
+         stdenv.lib.maintainers.iElectric
+       ];
+       platforms = stdenv.lib.platforms.all;
+    };
+  };
 
   webob = buildPythonPackage rec {
-    version = "1.0.6";
+    version = "1.2.3";
     name = "webob-${version}";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/W/WebOb/WebOb-${version}.zip";
-      md5 = "8e46dd755f6998d471bfbcb4def897ff";
+      url = "http://pypi.python.org/packages/source/W/WebOb/WebOb-${version}.tar.gz";
+      md5 = "11825b7074ba7043e157805e4e6e0f55";
     };
 
-    buildInputs = [ pkgs.unzip ];
-
-    # The test requires "webtest", which is a cyclic dependency.  (WTF?)
-    doCheck = false;
+    propagatedBuildInputs = [ nose ];
 
     meta = {
       description = "WSGI request and response object";
       homepage = http://pythonpaste.org/webob/;
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
@@ -3914,19 +4329,34 @@ pythonPackages = python.modules // rec {
 
 
   webtest = buildPythonPackage rec {
-    version = "1.2.3";
+    version = "2.0.3";
     name = "webtest-${version}";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.tar.gz";
-      md5 = "585f9331467e6d99acaba4051c1c5878";
+      url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip";
+      md5 = "a1266d4db421963fd3deb172c6689e4b";
     };
 
-    propagatedBuildInputs = [ nose webob dtopt ];
+    buildInputs = [ pkgs.unzip ];
+
+    propagatedBuildInputs = [
+      nose
+      webob
+      six
+      beautifulsoup4
+      waitress
+      unittest2
+      mock
+      pyquery
+      wsgiproxy2
+      paste_deploy
+      coverage
+    ];
 
     meta = {
       description = "Helper to test WSGI applications";
       homepage = http://pythonpaste.org/webtest/;
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
@@ -3965,6 +4395,26 @@ pythonPackages = python.modules // rec {
   });
 
 
+  wsgiproxy2 = buildPythonPackage rec {
+    name = "WSGIProxy2-0.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/W/WSGIProxy2/${name}.tar.gz";
+      md5 = "157049212f1c81a8790efa31146fbabf";
+    };
+
+    propagatedBuildInputs = [ six webob ];
+
+    meta = {
+       maintainers = [
+         stdenv.lib.maintainers.garbas
+         stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
   wxPython = wxPython28;
 
 
@@ -4478,6 +4928,27 @@ pythonPackages = python.modules // rec {
   };
 
 
+  zope_sqlalchemy = buildPythonPackage rec {
+    name = "zope.sqlalchemy-0.7.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.sqlalchemy/${name}.zip";
+      md5 = "b654e5d144ed141e13b42591a21a4868";
+    };
+
+    buildInputs = [ pkgs.unzip sqlalchemy zope_testing zope_interface setuptools ];
+    propagatedBuildInputs = [ sqlalchemy transaction ];
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
   zope_testing = buildPythonPackage rec {
     name = "zope.testing-${version}";
     version = "4.1.1";
@@ -4596,6 +5067,7 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
   tornado = buildPythonPackage rec {
     name = "tornado-2.4";
     src = fetchurl {
@@ -4618,6 +5090,26 @@ pythonPackages = python.modules // rec {
   };
 
 
+  tissue = buildPythonPackage rec {
+    name = "tissue-0.7";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/t/tissue/${name}.tar.gz";
+      md5 = "c9f3772407eb7499a949daaa9b859fdf";
+    };
+
+    buildInputs = [ nose ];
+    propagatedBuildInputs = [ pep8 ];
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
   tracing = buildPythonPackage rec {
     name = "tracing-0.7";
 
@@ -4638,6 +5130,24 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  translationstring = buildPythonPackage rec {
+    name = "translationstring-0.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/t/translationstring/${name}.tar.gz";
+      md5 = "392287923c475b660b7549b2c2f03dbc";
+    };
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
   ttystatus = buildPythonPackage rec {
     name = "ttystatus-0.21";
 
@@ -4680,6 +5190,29 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
+  webhelpers = buildPythonPackage rec {
+    name = "WebHelpers-1.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/W/WebHelpers/${name}.tar.gz";
+      md5 = "32749ffadfc40fea51075a7def32588b";
+    };
+
+    buildInputs = [ routes MarkupSafe webob nose ];
+
+    # TODO: failing tests https://bitbucket.org/bbangert/webhelpers/pull-request/1/fix-error-on-webob-123/diff
+    doCheck = false;
+
+    meta = {
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
   whisper = buildPythonPackage rec {
     name = "whisper-${version}";
     version = "0.9.10";

From f2e4d3a1c1fcb95e6b22b3ec21556ac77e6c6e8b Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 27 Mar 2013 02:36:10 +0100
Subject: [PATCH 206/394] add deluge to top-level packages

---
 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 f7f9aa08b8c5..2087d74f9cf8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -652,6 +652,8 @@ let
 
   ddrescue = callPackage ../tools/system/ddrescue { };
 
+  deluge = pythonPackages.deluge;
+
   desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { };
 
   despotify = callPackage ../development/libraries/despotify { };

From 34841f95271d3defb3865e226f20f57f363dd28a Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 27 Mar 2013 09:21:59 +0100
Subject: [PATCH 207/394] link bconsole to almir bin dir

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6b4118842288..506b15fe3113 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -166,6 +166,7 @@ pythonPackages = python.modules // rec {
 
     postInstall = ''
       ln -s ${pyramid}/bin/pserve $out/bin
+      ln -s ${pkgs.bacula}/bin/bconsole $out/bin
       wrapProgram "$out/bin/pserve" \
         --suffix PYTHONPATH : "$out/lib/python2.7/site-packages"
     '';

From 66014354736ab57abbe3c2b50c3a550c6f3c5271 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 27 Mar 2013 09:22:24 +0100
Subject: [PATCH 208/394] beaker: skip tests as they fail

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 506b15fe3113..2f23071588e6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -966,6 +966,9 @@ pythonPackages = python.modules // rec {
 
     buildInputs = [ sqlalchemy pycryptopp nose mock webtest ];
 
+    # http://hydra.nixos.org/build/4511591/log/raw
+    doCheck = false;
+
     meta = {
       maintainers = [
         stdenv.lib.maintainers.garbas

From 66969547a28202f3e5ddf48de41fa3b06dea7485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 27 Mar 2013 12:09:55 +0100
Subject: [PATCH 209/394] ipython: bump to 0.13.1

IPython 0.13.1: minor bugfix release for 0.13, on October 20, 2012. This
release includes 41 Pull Requests and closing 21 Issues backported from
0.14-dev, including significant fixes for ipcluster and Python 3.3
compatibility.
---
 pkgs/shells/ipython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index 95eaea7390e7..1b3177bd23ae 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, buildPythonPackage, pythonPackages }:
 
 buildPythonPackage rec {
-  name = "ipython-0.13";
+  name = "ipython-0.13.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    sha256 = "1m4m0zf3llnicfgrbnl2h08p3662px7v2pzbhq4fq24vnyz6x5w2";
+    sha256 = "1h7q2zlyfn7si2vf6gnq2d0krkm1f5jy5nbi105by7zxqjai1grv";
   };
 
   propagatedBuildInputs = [ pythonPackages.readline pythonPackages.sqlite3 pythonPackages.tornado pythonPackages.pyzmq ];

From 99c65b6693aadf2299847d48d6cb73ebd548f830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 27 Mar 2013 15:38:09 +0100
Subject: [PATCH 210/394] Making wings work (it works with the old erlang).

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2087d74f9cf8..e72c0fe3d10e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7983,7 +7983,10 @@ let
 
   weechat = callPackage ../applications/networking/irc/weechat { };
 
-  wings = callPackage ../applications/graphics/wings { };
+  wings = callPackage ../applications/graphics/wings {
+    erlang = erlangR14B04;
+    esdl = esdl.override { erlang = erlangR14B04; }; 
+  };
 
   wmname = callPackage ../applications/misc/wmname { };
 

From 25c49767f33d63a018594c6e26536ad4805e08dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 27 Mar 2013 13:35:39 +0100
Subject: [PATCH 211/394] ipython: modularize and enable more features

Add these new attributes (all default to true):

  notebookSupport
  qtconsoleSupport
  pylabSupport
  pylabQtSupport

This adds jinja2, matplotlib, pyqt4 and sip as new dependencies of
ipython.

This commit fixes "ipython --pylab" so that it no more errors out with
"ImportError: No module named matplotlib" (which was my initial goal).
---
 pkgs/shells/ipython/default.nix    | 33 ++++++++++++++++++++++++++++--
 pkgs/top-level/python-packages.nix |  2 +-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index 1b3177bd23ae..82ca13185b3c 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -1,4 +1,16 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonPackages }:
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null, sip ? null
+, notebookSupport ? true   # ipython notebook
+, qtconsoleSupport ? true  # ipython qtconsole
+, pylabSupport ? true      # ipython --pylab    (backend: agg - no gui, just file)
+, pylabQtSupport ? true    # ipython --pylab=qt (backend: Qt4Agg - plot to window)
+}:
+
+# ipython qtconsole works with both pyside and pyqt4. But ipython --pylab=qt
+# only works with pyqt4 (at least this is true for ipython 0.13.1). So just use
+# pyqt4 for both.
+
+assert qtconsoleSupport == true -> pyqt4 != null;
+assert pylabQtSupport == true -> pyqt4 != null && sip != null;
 
 buildPythonPackage rec {
   name = "ipython-0.13.1";
@@ -9,7 +21,24 @@ buildPythonPackage rec {
     sha256 = "1h7q2zlyfn7si2vf6gnq2d0krkm1f5jy5nbi105by7zxqjai1grv";
   };
 
-  propagatedBuildInputs = [ pythonPackages.readline pythonPackages.sqlite3 pythonPackages.tornado pythonPackages.pyzmq ];
+  propagatedBuildInputs = [
+    pythonPackages.readline
+    pythonPackages.sqlite3  # required for history support
+  ] ++ stdenv.lib.optionals notebookSupport [
+    pythonPackages.tornado
+    pythonPackages.pyzmq
+    pythonPackages.jinja2
+  ] ++ stdenv.lib.optionals qtconsoleSupport [
+    pythonPackages.pygments
+    pythonPackages.pyzmq
+    pyqt4
+  ] ++ stdenv.lib.optionals pylabSupport [
+    pythonPackages.matplotlib
+  ] ++ stdenv.lib.optionals pylabQtSupport [
+    pythonPackages.matplotlib
+    pyqt4
+    sip
+  ];
 
   doCheck = false;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9c816188b715..94d6995474d9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -49,7 +49,7 @@ pythonPackages = python.modules // rec {
   # packages defined elsewhere
 
   ipython = import ../shells/ipython {
-    inherit (pkgs) stdenv fetchurl;
+    inherit (pkgs) stdenv fetchurl sip pyqt4;
     inherit buildPythonPackage pythonPackages;
   };
 

From 608fe14130e93bfff28674c58534d83774a491f7 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 27 Mar 2013 16:16:58 +0100
Subject: [PATCH 212/394] darktable: Update to 1.1.4

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

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 9791efe5d822..aa67406d0e79 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -8,12 +8,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.1.2";
+  version = "1.1.4";
   name = "darktable-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
-    sha256 = "225ebf1bd2ca4cf06aa609f2eda55cb0894ae69bdf4db25fd97b2503c28e1765";
+    url = "mirror://sourceforge/darktable/darktable/1.1/darktable-${version}.tar.xz";
+    sha256 = "1bzcxh8zm0xxrpifkkksv9k4xagjrzlam00yja9v9cbjlvawfszv";
   };
 
   buildInputs =

From e70954f8c856c76a25a03c838b182d666ea59374 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 27 Mar 2013 19:51:32 +0100
Subject: [PATCH 213/394] New package: g500-control

g500-control is a small tool to configure internal profiles of a
Logitech G500 mouse.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/tools/misc/g500-control/default.nix | 34 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/misc/g500-control/default.nix

diff --git a/pkgs/tools/misc/g500-control/default.nix b/pkgs/tools/misc/g500-control/default.nix
new file mode 100644
index 000000000000..1055b3c8d5be
--- /dev/null
+++ b/pkgs/tools/misc/g500-control/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl, coreutils}:
+
+stdenv.mkDerivation rec {
+  name = "g500-control-0.0.1";
+
+  src = fetchurl {
+    url = "http://g500-control.googlecode.com/files/g500_control_0.0.1.tar.gz";
+    sha256 = "1xlg9lpxnk3228k81y1i6jjh4df1p4jh64g54w969g6a6v6dazvb";
+  };
+
+  buildInputs = [ coreutils ];
+  
+  unpackPhase = ''
+    mkdir -pv g500-control
+    tar -C g500-control/ -xf $src
+  '';
+
+  buildPhase = ''
+    cd g500-control
+    gcc -o g500-control *.c
+  '';
+
+  installPhase = ''
+    mkdir -pv $out/bin/
+    cp g500-control $out/bin/
+  '';
+  
+  meta = {
+    homepage = http://code.google.com/p/g500-control/;
+    description = "Configure Logitech G500's internal profile under Linux";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e72c0fe3d10e..94f8a018bd0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -811,6 +811,8 @@ let
 
   uni2ascii = callPackage ../tools/text/uni2ascii { };
 
+  g500-control = callPackage ../tools/misc/g500-control { };
+
   gawk = callPackage ../tools/text/gawk { };
 
   gdmap = callPackage ../tools/system/gdmap { };

From ff953e211e9f05a3c03b2c0ab54b5bbfc876678c Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 27 Mar 2013 20:12:49 +0100
Subject: [PATCH 214/394] New package: dropbox-cli

dropbox-cli, part of dropbox-nautilus is a small self-contained python
script to control the dropbox daemon.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 .../networking/dropbox-cli/default.nix        | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/networking/dropbox-cli/default.nix

diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix
new file mode 100644
index 000000000000..37e9e06ec5b2
--- /dev/null
+++ b/pkgs/applications/networking/dropbox-cli/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, coreutils, fetchurl, python }:
+
+stdenv.mkDerivation {
+  name = "dropbox-cli";
+
+  src = fetchurl {
+    url = "https://linux.dropbox.com/packages/dropbox.py";
+    sha256 = "1x46i0aplah4a2nqglb8byl3c60w7h1cjja62myxj2dpxyv7fydy";
+  };
+
+  buildInputs = [ coreutils python ];
+
+  phases = "installPhase fixupPhase";
+  
+  installPhase = ''
+    mkdir -pv $out/bin/
+    cp $src $out/bin/dropbox-cli
+  '';
+
+  fixupPhase = ''
+    substituteInPlace $out/bin/dropbox-cli \
+      --replace "/usr/bin/python" ${python}/bin/python \
+      --replace "use dropbox help" "use dropbox-cli help"
+    
+    chmod +x $out/bin/dropbox-cli
+  '';
+  
+  meta = {
+    homepage = http://dropbox.com;
+    description = "Command line client for the dropbox daemon.";
+    license = stdenv.lib.licenses.gpl3;
+    # NOTE: 'unix' or even 'all' COULD work too, I'm not sure
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e72c0fe3d10e..c51462cf6d25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7750,6 +7750,8 @@ let
 
   dropbox = callPackage ../applications/networking/dropbox { };
 
+  dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
+
   slim = callPackage ../applications/display-managers/slim { };
 
   sndBase = builderDefsPackage (import ../applications/audio/snd) {

From f071e856d3fc6ceba10edd12edf81821f864de4d Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 27 Mar 2013 20:56:46 +0100
Subject: [PATCH 215/394] Fix platform note in dropbox-cli

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/networking/dropbox-cli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix
index 37e9e06ec5b2..b298b3c9df99 100644
--- a/pkgs/applications/networking/dropbox-cli/default.nix
+++ b/pkgs/applications/networking/dropbox-cli/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
     homepage = http://dropbox.com;
     description = "Command line client for the dropbox daemon.";
     license = stdenv.lib.licenses.gpl3;
-    # NOTE: 'unix' or even 'all' COULD work too, I'm not sure
+    # NOTE: Dropbox itself only works on linux, so this is ok.
     platforms = stdenv.lib.platforms.linux;
   };
 }

From da90131e5a8aa45545b4dafa2ce2fa052f2e109a Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 27 Mar 2013 20:59:57 +0100
Subject: [PATCH 216/394] g500-control: Add meta.platforms.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/tools/misc/g500-control/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/g500-control/default.nix b/pkgs/tools/misc/g500-control/default.nix
index 1055b3c8d5be..adccde71c46d 100644
--- a/pkgs/tools/misc/g500-control/default.nix
+++ b/pkgs/tools/misc/g500-control/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
     homepage = http://code.google.com/p/g500-control/;
     description = "Configure Logitech G500's internal profile under Linux";
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 

From f3f3a728f664f86c7664a596c8b1752b70bccdb8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 27 Mar 2013 16:35:42 -0400
Subject: [PATCH 217/394] generate-cpan-package: Don't hard-code Eelco's
 environment

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 maintainers/scripts/generate-cpan-package | 2 --
 1 file changed, 2 deletions(-)

diff --git a/maintainers/scripts/generate-cpan-package b/maintainers/scripts/generate-cpan-package
index f091625b6ce7..2817e23e2fa9 100755
--- a/maintainers/scripts/generate-cpan-package
+++ b/maintainers/scripts/generate-cpan-package
@@ -1,7 +1,5 @@
 #! /bin/sh -e
 
-export PERL5LIB=/nix/var/nix/profiles/per-user/eelco/cpan-generator/lib/perl5/site_perl
-
 name="$1"
 [ -n "$name" ] || { echo "no name"; exit 1; }
 

From 7a69bd708ec6fd0838cf000a5d2ec4a78f933a8c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 27 Mar 2013 16:35:54 -0400
Subject: [PATCH 218/394] Add the DBIxClassHelpers package

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/perl-packages.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7855a1a1eb3d..4291fde5908e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1553,6 +1553,19 @@ rec {
     };
   };
 
+  DBIxClassCandy = buildPerlPackage {
+    name = "DBIx-Class-Candy-0.002103";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Candy-0.002103.tar.gz;
+      sha256 = "1vcaigvzxq9jjkhw2bkayrnsa76sakr3wrv7009f1dxyfa0iyrsk";
+    };
+    propagatedBuildInputs = [ TestDeep TestFatal DBIxClass LinguaENInflect StringCamelCase ];
+    meta = {
+      description = "Sugar for your favorite ORM, DBIx::Class";
+      license = "perl5";
+    };
+  };
+
   DBIxClassCursorCached = buildPerlPackage {
     name = "DBIx-Class-Cursor-Cached-1.001002";
     src = fetchurl {
@@ -1576,6 +1589,19 @@ rec {
     propagatedBuildInputs = [DBIxClass HTMLWidget];
   };
 
+  DBIxClassHelpers = buildPerlPackage {
+    name = "DBIx-Class-Helpers-2.016005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.016005.tar.gz;
+      sha256 = "0nkskc0h284l2q3m33553i8g4pr1kcx7vmwz8bi1kmga16bs7nqk";
+    };
+    propagatedBuildInputs = [ DBIxClassCandy TestDeep CarpClan DBDSQLite ];
+    meta = {
+      description = "Simplify the common case stuff for DBIx::Class.";
+      license = "perl5";
+    };
+  };
+
   DBIxClassIntrospectableM2M = buildPerlPackage {
     name = "DBIx-Class-IntrospectableM2M-0.001001";
     src = fetchurl {

From 64bc336f50a2203f8c8feccd0eef4b5462c6de16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 27 Mar 2013 22:25:33 +0100
Subject: [PATCH 219/394] Blender 2.66 WIP

---
 pkgs/applications/misc/blender/default.nix    | 17 ++--
 .../interpreters/python/3.3/default.nix       | 82 +++++++++++++++++++
 pkgs/development/libraries/oiio/default.nix   | 27 ++++++
 pkgs/top-level/all-packages.nix               |  7 +-
 4 files changed, 124 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/interpreters/python/3.3/default.nix
 create mode 100644 pkgs/development/libraries/oiio/default.nix

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 828d55ad4789..b9c32c982ec4 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,26 +1,29 @@
-{ stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg,
-libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg,
+{ stdenv, fetchurl, SDL, cmake, ffmpeg, gettext, glew, ilmbase, libXi, libjpeg,
+libpng, libsamplerate, libtiff, mesa, oiio, openal, openexr, openjpeg,
 python, zlib, boost }:
 
 stdenv.mkDerivation rec {
-  name = "blender-2.63a";
+  name = "blender-2.66a";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a";
+    sha256 = "0wj8x9xk5irvsjc3rm7wzml1j47xcdpdpy84kidafk02biskcqcb";
   };
 
-  buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal
-    SDL openexr libsamplerate libXi libtiff ilmbase openjpeg boost ];
+  buildInputs = [ cmake mesa ffmpeg gettext python glew libjpeg libpng zlib openal
+    SDL openexr libsamplerate libXi libtiff ilmbase oiio openjpeg boost ];
+
 
   cmakeFlags = [
     "-DOPENEXR_INC=${openexr}/include/OpenEXR"
     "-DWITH_OPENCOLLADA=OFF"
     "-DWITH_INSTALL_PORTABLE=OFF"
+    "-DPYTHON_LIBRARY=python${python.majorVersion}m"    
     "-DPYTHON_LIBPATH=${python}/lib"
+    "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
   ];
 
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
new file mode 100644
index 000000000000..7baecad76c6b
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, fetchurl
+, bzip2
+, db4
+, gdbm
+, libX11, xproto
+, ncurses
+, openssl
+, readline
+, sqlite
+, tcl, tk
+, zlib
+}:
+
+assert readline != null -> ncurses != null;
+
+with stdenv.lib;
+
+let
+  majorVersion = "3.3";
+  version = "${majorVersion}.1rc1";
+
+  buildInputs = filter (p: p != null) [
+    zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
+  ];
+in
+stdenv.mkDerivation {
+  name = "python3-${version}";
+  inherit majorVersion version;
+
+  src = fetchurl {
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
+    sha256 = "1pnsbdzbd3750jcy32sv1760lv7am4x3f33jn1kmdmd82za279gv";
+  };
+
+  preConfigure = ''
+    for i in /usr /sw /opt /pkg; do	# improve purity
+      substituteInPlace ./setup.py --replace $i /no-such-path
+    done
+    ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
+
+    configureFlagsArray=( --enable-shared --with-threads
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+                          LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}"
+                        )
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  postInstall = ''
+    rm -rf "$out/lib/python${majorVersion}/test"
+  '';
+
+  passthru = {
+    zlibSupport = zlib != null;
+    sqliteSupport = sqlite != null;
+    db4Support = db4 != null;
+    readlineSupport = readline != null;
+    opensslSupport = openssl != null;
+    tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
+    libPrefix = "python${majorVersion}";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = "http://python.org";
+    description = "a high-level dynamically-typed programming language";
+    longDescription = ''
+      Python is a remarkably powerful dynamic programming language that
+      is used in a wide variety of application domains. Some of its key
+      distinguishing features include: clear, readable syntax; strong
+      introspection capabilities; intuitive object orientation; natural
+      expression of procedural code; full modularity, supporting
+      hierarchical packages; exception-based error handling; and very
+      high level dynamic data types.
+    '';
+    license = stdenv.lib.licenses.psfl;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
+  };
+}
diff --git a/pkgs/development/libraries/oiio/default.nix b/pkgs/development/libraries/oiio/default.nix
new file mode 100644
index 000000000000..1b6b8be115ff
--- /dev/null
+++ b/pkgs/development/libraries/oiio/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, unzip, boost, libjpeg, libtiff, libpng, openexr, ilmbase }:
+
+stdenv.mkDerivation rec {
+  name = "oiio-${version}";
+  version = "1.1.8";
+
+  src = fetchurl {
+    url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
+    sha256 = "08a6qhplzs8kianqb1gjgrndg81h3il5531jn9g6i4940b1xispg";
+  };
+
+  buildInputs = [ cmake unzip boost libjpeg libtiff libpng openexr ilmbase ];
+
+  configurePhase = "";
+
+  buildPhase = "make ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0 INSTALLDIR=$out dist_dir=";
+
+  installPhase = "echo hallo";
+
+  meta = with stdenv.lib; {
+    homepage = http://www.openimageio.org;
+    description = "A library for reading and writing images";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 354559a1efe2..53c4feb06763 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2876,8 +2876,9 @@ let
 
   pure = callPackage ../development/interpreters/pure {};
 
-  python3 = python32;
+  python3 = python33;
   python32 = callPackage ../development/interpreters/python/3.2 { };
+  python33 = callPackage ../development/interpreters/python/3.3 { };
 
   python = python27;
   python26 = callPackage ../development/interpreters/python/2.6 { };
@@ -4711,6 +4712,8 @@ let
     opensc = opensc_0_11_7;
   };
 
+  oiio = callPackage ../development/libraries/oiio { };
+
   ois = callPackage ../development/libraries/ois {};
 
   opal = callPackage ../development/libraries/opal {};
@@ -6647,7 +6650,7 @@ let
   };
 
   blender = callPackage  ../applications/misc/blender {
-    python = python32;
+    python = python3;
   };
 
   bristol = callPackage ../applications/audio/bristol { };

From 3300479c74c868ad55c391d30e27db55604e6e7a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Mar 2013 13:58:31 +0100
Subject: [PATCH 220/394] systemd: Update to 199

This incorporates some changes from
https://github.com/vcunat/nixpkgs/commit/eb64a2f5620a9ba6ac7f598694d82db0cf83e669.
---
 ...aemon-reexec-do-the-right-thing-on-N.patch | 10 ++---
 ...e-duplicate-paths-in-systemctl-start.patch | 19 ++++-----
 ...ts-for-uninitialised-encrypted-devic.patch |  6 +--
 ...o-configuration-hints-for-some-units.patch | 18 ++++----
 ...rop-the-dependency-on-local-fs.targe.patch |  6 +--
 .../0006-Don-t-call-plymouth-quit.patch       |  6 +--
 ...007-Ignore-IPv6-link-local-addresses.patch |  2 +-
 ...lt-in-nscd-when-using-nss-myhostname.patch | 42 -------------------
 ...andle-missing-etc-sysctl.conf-proper.patch | 28 +++++++++++++
 pkgs/os-specific/linux/systemd/default.nix    | 14 +++----
 10 files changed, 68 insertions(+), 83 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch
 create mode 100644 pkgs/os-specific/linux/systemd/0008-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch

diff --git a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
index 9afa7543e571..27facd4f3cc3 100644
--- a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
+++ b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
@@ -1,7 +1,7 @@
-From 0085f49cd0ba889e3db9102f328f6044ae3a2c18 Mon Sep 17 00:00:00 2001
+From ebbb4bc256e1ed53c594fc54d9e1a9faf5a5f77a Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:44:33 +0100
-Subject: [PATCH 1/6] Make "systemctl daemon-reexec" do the right thing on
+Subject: [PATCH 1/8] Make "systemctl daemon-reexec" do the right thing on
  NixOS
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 1/6] Make "systemctl daemon-reexec" do the right thing on
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/core/main.c b/src/core/main.c
-index 1ee3c9c..1686f60 100644
+index 25f55fc..c2e42b7 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
-@@ -1858,7 +1858,7 @@ finish:
+@@ -1887,7 +1887,7 @@ finish:
                          char_array_0(sfd);
  
                          i = 0;
@@ -22,5 +22,5 @@ index 1ee3c9c..1686f60 100644
                                  args[i++] = "--switched-root";
                          args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user";
 -- 
-1.8.0.1
+1.8.1
 
diff --git a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
index 76160a1f7cc1..c6a648678bec 100644
--- a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
+++ b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
@@ -1,30 +1,29 @@
-From 2b0a9106d3aabb365af0cc34b595a1e697120f37 Mon Sep 17 00:00:00 2001
+From 64c36ac79fca8f0214faed8b7aff19b379b1ac1b Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:45:01 +0100
-Subject: [PATCH 2/6] Ignore duplicate paths in "systemctl start"
+Subject: [PATCH 2/8] Ignore duplicate paths in "systemctl start"
 
 ---
- src/systemctl/systemctl.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
+ src/systemctl/systemctl.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 2ebfff8..9f99df5 100644
+index edd136a..86ce32a 100644
 --- a/src/systemctl/systemctl.c
 +++ b/src/systemctl/systemctl.c
-@@ -1591,8 +1591,11 @@ static int start_unit_one(
- 
+@@ -1510,8 +1510,10 @@ static int start_unit_one(
                  r = set_put(s, p);
                  if (r < 0) {
+                         free(p);
 -                        log_error("Failed to add path to set.");
 -                        return r;
-+                        free(p);
 +                        if (r != -EEXIST) {
 +                                log_error("Failed to add path %s to set.", p);
 +                                return r;
 +                        }
                  }
+         }
  
-                 p = NULL;
 -- 
-1.8.0.1
+1.8.1
 
diff --git a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
index a16a2672feb5..23133547fd01 100644
--- a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
+++ b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -1,7 +1,7 @@
-From a013beb84f135cebf1c8c9363d5676c1c0a6be7a Mon Sep 17 00:00:00 2001
+From 776093e73b86bcddfeb0971cb6267d13d07f0a81 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:46:30 +0100
-Subject: [PATCH 3/6] Start device units for uninitialised encrypted devices
+Subject: [PATCH 3/8] Start device units for uninitialised encrypted devices
 
 This is necessary because the NixOS service that initialises the
 filesystem depends on the appearance of the device unit.  Also, this
@@ -28,5 +28,5 @@ index d17bdd9..040b10e 100644
  SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
  SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
 -- 
-1.8.0.1
+1.8.1
 
diff --git a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
index beab35d63a06..483c1f812870 100644
--- a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
+++ b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
@@ -1,7 +1,7 @@
-From b40d8783f94666035baae567882c0d4be82cda01 Mon Sep 17 00:00:00 2001
+From 0bc7513439a8b77f62bc8ebcf220b77f83321b75 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:48:19 +0100
-Subject: [PATCH 4/6] Set switch-to-configuration hints for some units
+Subject: [PATCH 4/8] Set switch-to-configuration hints for some units
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -24,22 +24,22 @@ to prevent all user sessions from being killed when this unit changes.
  4 files changed, 12 insertions(+)
 
 diff --git a/units/local-fs.target b/units/local-fs.target
-index dd92b17..dfcbc7b 100644
+index ee02e4e..63ae843 100644
 --- a/units/local-fs.target
 +++ b/units/local-fs.target
-@@ -10,3 +10,5 @@ Description=Local File Systems
- Documentation=man:systemd.special(7)
+@@ -11,3 +11,5 @@ Documentation=man:systemd.special(7)
+ After=local-fs-pre.target
  OnFailure=emergency.target
  OnFailureIsolate=yes
 +
 +X-StopOnReconfiguration=yes
 diff --git a/units/remote-fs.target b/units/remote-fs.target
-index 9e68878..85a53d7 100644
+index e867b8d..02462b4 100644
 --- a/units/remote-fs.target
 +++ b/units/remote-fs.target
-@@ -9,5 +9,7 @@
- Description=Remote File Systems
+@@ -10,5 +10,7 @@ Description=Remote File Systems
  Documentation=man:systemd.special(7)
+ After=remote-fs-pre.target remote-fs-setup.target
  
 +X-StopOnReconfiguration=yes
 +
@@ -70,5 +70,5 @@ index 0869e73..b6ed958 100644
 +# Restart kills all active sessions.
 +X-RestartIfChanged=no
 -- 
-1.8.0.1
+1.8.1
 
diff --git a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
index 4403e6f56aaf..9efbba08ab9f 100644
--- a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
+++ b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
@@ -1,7 +1,7 @@
-From c5c8ac3a0420fb42ba2f629368fd5bd6ea1e753b Mon Sep 17 00:00:00 2001
+From 5337d8f5a555f83ba8731472a2f3b0d36ac607d9 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:56:03 +0100
-Subject: [PATCH 5/6] sysinit.target: Drop the dependency on local-fs.target
+Subject: [PATCH 5/8] sysinit.target: Drop the dependency on local-fs.target
  and swap.target
 
 Having all services with DefaultDependencies=yes depend on
@@ -29,5 +29,5 @@ index 8f4fb8f..e0f0147 100644
 +After=emergency.service emergency.target
  RefuseManualStart=yes
 -- 
-1.8.0.1
+1.8.1
 
diff --git a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch
index 250a751fe0c0..f0be5b34f0c8 100644
--- a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch
+++ b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch
@@ -1,7 +1,7 @@
-From d3caa154098e215145679f38fa92a8bd482107be Mon Sep 17 00:00:00 2001
+From b944fede26773167cb6a9f86888a9209dda4c35e Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 18:36:28 +0100
-Subject: [PATCH 6/6] Don't call "plymouth quit"
+Subject: [PATCH 6/8] Don't call "plymouth quit"
 
 NixOS doesn't use Plymouth (yet).
 ---
@@ -34,5 +34,5 @@ index 269797a..2c640f4 100644
  ExecStart=-/sbin/sulogin
  ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
 -- 
-1.8.0.1
+1.8.1
 
diff --git a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch
index 1a8d294fd225..32aca8b10aa0 100644
--- a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch
+++ b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch
@@ -1,4 +1,4 @@
-From ab889004b8972258a87798133451f99dfce21823 Mon Sep 17 00:00:00 2001
+From b9f175c7b3ea6ac34d148f5afba598f985c5b9fe Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Mon, 4 Feb 2013 12:41:14 +0100
 Subject: [PATCH 7/8] Ignore IPv6 link-local addresses
diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch b/pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch
deleted file mode 100644
index 6937c6c594e9..000000000000
--- a/pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ef9b259ae24e7bf4ebec04b0b0a44964bc661bb5 Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Mon, 4 Feb 2013 12:43:08 +0100
-Subject: [PATCH 8/8] Fix a segfault in nscd when using nss-myhostname
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Nscd expects that an NSS module's gethostbyname4_r function returns
-its first result in the pre-allocated gaih_addrtuple denoted by **pat.
-(See nscd/aicache.c in the Glibc sources.)  However, nss-myhostname
-doesn't fill in **pat but allocates the first result in ‘buffer’, then
-sets *pat.  So nscd crashes (e.g. when running ‘getent ahosts
-my-machine’).
-
-Hard to tell if this is a bug in nscd, since there doesn't seem to be
-a proper API spec for gethostbyname4_r.  But in any case, this patch
-fixes the crash by copying the first result to **pat.
----
- src/nss-myhostname/nss-myhostname.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
-index 834a806..b0fb832 100644
---- a/src/nss-myhostname/nss-myhostname.c
-+++ b/src/nss-myhostname/nss-myhostname.c
-@@ -176,7 +176,11 @@ enum nss_status _nss_myhostname_gethostbyname4_r(
-         /* Verify the size matches */
-         assert(idx == ms);
- 
--        *pat = r_tuple_prev;
-+        /* Nscd expects us to store the first record in **pat. */
-+        if (*pat)
-+                **pat = *r_tuple_prev;
-+        else
-+                *pat = r_tuple_prev;
- 
-         if (ttlp)
-                 *ttlp = 0;
--- 
-1.8.1
-
diff --git a/pkgs/os-specific/linux/systemd/0008-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch b/pkgs/os-specific/linux/systemd/0008-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch
new file mode 100644
index 000000000000..92411c16650d
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0008-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch
@@ -0,0 +1,28 @@
+From dcfb048af5face4787ecdf29c00454898c52963d Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra <eelco.dolstra@logicblox.com>
+Date: Wed, 27 Mar 2013 13:33:09 +0100
+Subject: [PATCH 8/8] systemd-sysctl: Handle missing /etc/sysctl.conf properly
+
+Since fabe5c0e5fce730aa66e10a9c4f9fdd443d7aeda, systemd-sysctl returns
+a non-zero exit code if /etc/sysctl.conf does not exist, due to a
+broken ENOENT check.
+---
+ src/sysctl/sysctl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
+index 2d43660..79f3f77 100644
+--- a/src/sysctl/sysctl.c
++++ b/src/sysctl/sysctl.c
+@@ -125,7 +125,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
+ 
+         r = search_and_fopen_nulstr(path, "re", conf_file_dirs, &f);
+         if (r < 0) {
+-                if (ignore_enoent && errno == -ENOENT)
++                if (ignore_enoent && r == -ENOENT)
+                         return 0;
+ 
+                 log_error("Failed to open file '%s', ignoring: %s", path, strerror(-r));
+-- 
+1.8.1
+
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 9e64bb7ed405..b1365a0ac07f 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
 , xz, pam, acl, cryptsetup, libuuid, m4, utillinux
-, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools
+, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl
 }:
 
 assert stdenv.gcc.libc or null != null;
 
 stdenv.mkDerivation rec {
-  name = "systemd-197";
+  name = "systemd-199";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
-    sha256 = "1dbljyyc3w4a1af99f15f3sqnfx7mfmc5x5hwxb70kg23ai7x1g6";
+    sha256 = "1vazjqi95pri5zx21gs4chyd7c8kg5lf1rc26w47zkry9yh64i4c";
   };
 
   patches =
@@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
       ./0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
       ./0006-Don-t-call-plymouth-quit.patch
       ./0007-Ignore-IPv6-link-local-addresses.patch
-      ./0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch
+      ./0008-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch
     ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch;
 
   buildInputs =
     [ pkgconfig intltool gperf libcap dbus kmod xz pam acl
-      /* cryptsetup */ libuuid m4 glib libxslt libgcrypt
+      /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl
     ];
 
   configureFlags =
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE =
     [ # Can't say ${polkit}/bin/pkttyagent here because that would
       # lead to a cyclic dependency.
-      "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
+      "-UPOLKIT_AGENT_BINARY_PATH -DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
       "-fno-stack-protector"
       # Work around our kernel headers being too old.  FIXME: remove
       # this after the next stdenv update.
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
   # 1e1954f53386cb773e2a152748dd31c4d36aa2d8) because using /var is
   # forbidden in early boot, but in NixOS the initrd guarantees that
   # /var is mounted.
-  makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include hwdb_bin=/var/lib/udev/hwdb.bin";
+  makeFlags = "hwdb_bin=/var/lib/udev/hwdb.bin";
 
   installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc sysvinitdir=$(TMPDIR)/etc/init.d";
 

From 916c1adb84691f0b776ae0c363dab5790f93535a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Mar 2013 22:32:19 +0100
Subject: [PATCH 221/394] Delete all kernels older than 2.6.39

Systemd doesn't support those kernels, so there is no point in keeping
them around.
---
 pkgs/os-specific/linux/kernel/aufs2-35.patch  | 351 -----------------
 pkgs/os-specific/linux/kernel/aufs2.patch     | 354 ------------------
 .../linux/kernel/cifs-timeout-2.6.15.patch    |  44 ---
 .../linux/kernel/cifs-timeout-2.6.29.patch    |  47 ---
 .../linux/kernel/cifs-timeout-2.6.35.patch    |  45 ---
 .../linux/kernel/dell-rfkill.patch            |  23 --
 .../os-specific/linux/kernel/linux-2.6.15.nix |  48 ---
 .../os-specific/linux/kernel/linux-2.6.32.nix | 215 -----------
 .../os-specific/linux/kernel/linux-2.6.35.nix | 222 -----------
 pkgs/os-specific/linux/kernel/patches.nix     |  87 -----
 .../kernel/sheevaplug_modules-2.6.35.patch    |  63 ----
 pkgs/top-level/all-packages.nix               |  53 +--
 12 files changed, 3 insertions(+), 1549 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/aufs2-35.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/aufs2.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-2.6.15.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-2.6.29.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-2.6.35.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/dell-rfkill.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.15.nix
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.32.nix
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.35.nix
 delete mode 100644 pkgs/os-specific/linux/kernel/sheevaplug_modules-2.6.35.patch

diff --git a/pkgs/os-specific/linux/kernel/aufs2-35.patch b/pkgs/os-specific/linux/kernel/aufs2-35.patch
deleted file mode 100644
index 30776e641063..000000000000
--- a/pkgs/os-specific/linux/kernel/aufs2-35.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-aufs2 base patch for linux-2.6.35
-
-diff --git a/fs/namei.c b/fs/namei.c
-index 868d0cb..6e92c81 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -1178,7 +1178,7 @@ out:
-  * needs parent already locked. Doesn't follow mounts.
-  * SMP-safe.
-  */
--static struct dentry *lookup_hash(struct nameidata *nd)
-+struct dentry *lookup_hash(struct nameidata *nd)
- {
- 	int err;
- 
-@@ -1190,5 +1190,5 @@
- 
--static int __lookup_one_len(const char *name, struct qstr *this,
-+int __lookup_one_len(const char *name, struct qstr *this,
- 		struct dentry *base, int len)
- {
- 	unsigned long hash;
-diff --git a/fs/splice.c b/fs/splice.c
-index efdbfec..e01a51e 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -1104,8 +1104,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
- /*
-  * Attempt to initiate a splice from pipe to file.
-  */
--static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
--			   loff_t *ppos, size_t len, unsigned int flags)
-+long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+		    loff_t *ppos, size_t len, unsigned int flags)
- {
- 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
- 				loff_t *, size_t, unsigned int);
-@@ -1132,9 +1132,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
- /*
-  * Attempt to initiate a splice from a file to a pipe.
-  */
--static long do_splice_to(struct file *in, loff_t *ppos,
--			 struct pipe_inode_info *pipe, size_t len,
--			 unsigned int flags)
-+long do_splice_to(struct file *in, loff_t *ppos,
-+		  struct pipe_inode_info *pipe, size_t len,
-+		  unsigned int flags)
- {
- 	ssize_t (*splice_read)(struct file *, loff_t *,
- 			       struct pipe_inode_info *, size_t, unsigned int);
-diff --git a/include/linux/namei.h b/include/linux/namei.h
-index 05b441d..91bc74e 100644
---- a/include/linux/namei.h
-+++ b/include/linux/namei.h
-@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
- extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
- 		int (*open)(struct inode *, struct file *));
- 
-+extern struct dentry *lookup_hash(struct nameidata *nd);
-+extern int __lookup_one_len(const char *name, struct qstr *this,
-+			    struct dentry *base, int len);
- extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
- 
- extern int follow_down(struct path *);
-diff --git a/include/linux/splice.h b/include/linux/splice.h
-index 997c3b4..be9a153 100644
---- a/include/linux/splice.h
-+++ b/include/linux/splice.h
-@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
- extern void splice_shrink_spd(struct pipe_inode_info *,
- 				struct splice_pipe_desc *);
- 
-+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+			   loff_t *ppos, size_t len, unsigned int flags);
-+extern long do_splice_to(struct file *in, loff_t *ppos,
-+			 struct pipe_inode_info *pipe, size_t len,
-+			 unsigned int flags);
-+
- #endif
-aufs2 standalone patch for linux-2.6.35
-
-diff --git a/fs/namei.c b/fs/namei.c
-index 6e92c81..334130e 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -348,6 +348,7 @@ int deny_write_access(struct file * file)
- 
- 	return 0;
- }
-+EXPORT_SYMBOL(deny_write_access);
- 
- /**
-  * path_get - get a reference to a path
-@@ -1187,6 +1188,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
- 		return ERR_PTR(err);
- 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
- }
-+EXPORT_SYMBOL(lookup_hash);
- 
- int __lookup_one_len(const char *name, struct qstr *this,
- 		struct dentry *base, int len)
-@@ -1209,6 +1211,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
- 	this->hash = end_name_hash(hash);
- 	return 0;
- }
-+EXPORT_SYMBOL(__lookup_one_len);
- 
- /**
-  * lookup_one_len - filesystem helper to lookup single pathname component
-diff --git a/fs/namespace.c b/fs/namespace.c
-index 88058de..397afcc 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -1279,6 +1279,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
- 	}
- 	return 0;
- }
-+EXPORT_SYMBOL(iterate_mounts);
- 
- static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
- {
-diff --git a/fs/notify/group.c b/fs/notify/group.c
-index 0e16771..3fab10a 100644
---- a/fs/notify/group.c
-+++ b/fs/notify/group.c
-@@ -22,6 +22,7 @@
- #include <linux/srcu.h>
- #include <linux/rculist.h>
- #include <linux/wait.h>
-+#include <linux/module.h>
- 
- #include <linux/fsnotify_backend.h>
- #include "fsnotify.h"
-@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
- 	fsnotify_recalc_global_mask();
- 	fsnotify_destroy_group(group);
- }
-+EXPORT_SYMBOL(fsnotify_put_group);
- 
- /*
-  * Simply run the fsnotify_groups list and find a group which matches
-@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask,
- 
- 	return group;
- }
-+EXPORT_SYMBOL(fsnotify_obtain_group);
-diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c
-index 0399bcb..74cdc13 100644
---- a/fs/notify/inode_mark.c
-+++ b/fs/notify/inode_mark.c
-@@ -105,6 +105,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry)
- 	if (atomic_dec_and_test(&entry->refcnt))
- 		entry->free_mark(entry);
- }
-+EXPORT_SYMBOL(fsnotify_put_mark);
- 
- /*
-  * Recalculate the mask of events relevant to a given inode locked.
-@@ -215,6 +216,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry)
- 	if (unlikely(atomic_dec_and_test(&group->num_marks)))
- 		fsnotify_final_destroy_group(group);
- }
-+EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry);
- 
- /*
-  * Given a group, destroy all of the marks associated with that group.
-@@ -281,6 +283,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou
- 	}
- 	return NULL;
- }
-+EXPORT_SYMBOL(fsnotify_find_mark_entry);
- 
- /*
-  * Nothing fancy, just initialize lists and locks and counters.
-@@ -297,6 +300,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry,
- 	entry->inode = NULL;
- 	entry->free_mark = free_mark;
- }
-+EXPORT_SYMBOL(fsnotify_init_mark);
- 
- /*
-  * Attach an initialized mark entry to a given group and inode.
-@@ -352,6 +356,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
- 
- 	return ret;
- }
-+EXPORT_SYMBOL(fsnotify_add_mark);
- 
- /**
-  * fsnotify_unmount_inodes - an sb is unmounting.  handle any watched inodes.
-diff --git a/fs/open.c b/fs/open.c
-index 5463266..d248ead 100644
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -59,6 +59,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
- 	mutex_unlock(&dentry->d_inode->i_mutex);
- 	return ret;
- }
-+EXPORT_SYMBOL(do_truncate);
- 
- static long do_sys_truncate(const char __user *pathname, loff_t length)
- {
-diff --git a/fs/splice.c b/fs/splice.c
-index e01a51e..4806358 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -1128,6 +1128,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
- 
- 	return splice_write(pipe, out, ppos, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_from);
- 
- /*
-  * Attempt to initiate a splice from a file to a pipe.
-@@ -1154,6 +1155,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
- 
- 	return splice_read(in, ppos, pipe, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_to);
- 
- /**
-  * splice_direct_to_actor - splices data directly between two non-pipes
-diff --git a/security/commoncap.c b/security/commoncap.c
-index 4e01599..3611e1b 100644
---- a/security/commoncap.c
-+++ b/security/commoncap.c
-@@ -951,3 +951,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(cap_file_mmap);
-diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index 8d9c48f..29108aa 100644
---- a/security/device_cgroup.c
-+++ b/security/device_cgroup.c
-@@ -515,6 +515,7 @@ found:
- 
- 	return -EPERM;
- }
-+EXPORT_SYMBOL(devcgroup_inode_permission);
- 
- int devcgroup_inode_mknod(int mode, dev_t dev)
- {
-diff --git a/security/security.c b/security/security.c
-index 351942a..6ba84a8 100644
---- a/security/security.c
-+++ b/security/security.c
-@@ -376,6 +376,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
- 		return 0;
- 	return security_ops->path_mkdir(dir, dentry, mode);
- }
-+EXPORT_SYMBOL(security_path_mkdir);
- 
- int security_path_rmdir(struct path *dir, struct dentry *dentry)
- {
-@@ -383,6 +384,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
- 		return 0;
- 	return security_ops->path_rmdir(dir, dentry);
- }
-+EXPORT_SYMBOL(security_path_rmdir);
- 
- int security_path_unlink(struct path *dir, struct dentry *dentry)
- {
-@@ -390,6 +392,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
- 		return 0;
- 	return security_ops->path_unlink(dir, dentry);
- }
-+EXPORT_SYMBOL(security_path_unlink);
- 
- int security_path_symlink(struct path *dir, struct dentry *dentry,
- 			  const char *old_name)
-@@ -398,6 +401,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
- 		return 0;
- 	return security_ops->path_symlink(dir, dentry, old_name);
- }
-+EXPORT_SYMBOL(security_path_symlink);
- 
- int security_path_link(struct dentry *old_dentry, struct path *new_dir,
- 		       struct dentry *new_dentry)
-@@ -406,6 +410,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
- 		return 0;
- 	return security_ops->path_link(old_dentry, new_dir, new_dentry);
- }
-+EXPORT_SYMBOL(security_path_link);
- 
- int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
- 			 struct path *new_dir, struct dentry *new_dentry)
-@@ -416,6 +421,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
- 	return security_ops->path_rename(old_dir, old_dentry, new_dir,
- 					 new_dentry);
- }
-+EXPORT_SYMBOL(security_path_rename);
- 
- int security_path_truncate(struct path *path, loff_t length,
- 			   unsigned int time_attrs)
-@@ -424,6 +430,7 @@ int security_path_truncate(struct path *path, loff_t length,
- 		return 0;
- 	return security_ops->path_truncate(path, length, time_attrs);
- }
-+EXPORT_SYMBOL(security_path_truncate);
- 
- int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
- 			mode_t mode)
-@@ -432,6 +439,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
- 		return 0;
- 	return security_ops->path_chmod(dentry, mnt, mode);
- }
-+EXPORT_SYMBOL(security_path_chmod);
- 
- int security_path_chown(struct path *path, uid_t uid, gid_t gid)
- {
-@@ -439,6 +447,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
- 		return 0;
- 	return security_ops->path_chown(path, uid, gid);
- }
-+EXPORT_SYMBOL(security_path_chown);
- 
- int security_path_chroot(struct path *path)
- {
-@@ -515,6 +524,7 @@ int security_inode_readlink(struct dentry *dentry)
- 		return 0;
- 	return security_ops->inode_readlink(dentry);
- }
-+EXPORT_SYMBOL(security_inode_readlink);
- 
- int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
- {
-@@ -529,6 +539,7 @@ int security_inode_permission(struct inode *inode, int mask)
- 		return 0;
- 	return security_ops->inode_permission(inode, mask);
- }
-+EXPORT_SYMBOL(security_inode_permission);
- 
- int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
- {
-@@ -622,6 +633,7 @@ int security_file_permission(struct file *file, int mask)
- {
- 	return security_ops->file_permission(file, mask);
- }
-+EXPORT_SYMBOL(security_file_permission);
- 
- int security_file_alloc(struct file *file)
- {
-@@ -649,6 +661,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
- 		return ret;
- 	return ima_file_mmap(file, prot);
- }
-+EXPORT_SYMBOL(security_file_mmap);
- 
- int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
- 			    unsigned long prot)
diff --git a/pkgs/os-specific/linux/kernel/aufs2.patch b/pkgs/os-specific/linux/kernel/aufs2.patch
deleted file mode 100644
index 191972c760c3..000000000000
--- a/pkgs/os-specific/linux/kernel/aufs2.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-From:
-http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=blob;f=aufs2-base.patch;hb=eb0355d5b8ff5b04ad217a86d8c677f265675436
-http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=blob;f=aufs2-standalone.patch;hb=a9c3ab997b526d76bdd23391b3ddc1fdf28edd46
-
-aufs2 base patch for linux-2.6.32
-
-diff --git a/fs/namei.c b/fs/namei.c
-index d11f404..7d28f56 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -1219,7 +1219,7 @@ out:
-  * needs parent already locked. Doesn't follow mounts.
-  * SMP-safe.
-  */
--static struct dentry *lookup_hash(struct nameidata *nd)
-+struct dentry *lookup_hash(struct nameidata *nd)
- {
- 	int err;
- 
-@@ -1229,7 +1229,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
- 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
- }
- 
--static int __lookup_one_len(const char *name, struct qstr *this,
-+int __lookup_one_len(const char *name, struct qstr *this,
- 		struct dentry *base, int len)
- {
- 	unsigned long hash;
-diff --git a/fs/splice.c b/fs/splice.c
-index 7394e9e..77184f0 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -1051,8 +1051,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
- /*
-  * Attempt to initiate a splice from pipe to file.
-  */
--static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
--			   loff_t *ppos, size_t len, unsigned int flags)
-+long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+		    loff_t *ppos, size_t len, unsigned int flags)
- {
- 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
- 				loff_t *, size_t, unsigned int);
-@@ -1078,9 +1078,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
- /*
-  * Attempt to initiate a splice from a file to a pipe.
-  */
--static long do_splice_to(struct file *in, loff_t *ppos,
--			 struct pipe_inode_info *pipe, size_t len,
--			 unsigned int flags)
-+long do_splice_to(struct file *in, loff_t *ppos,
-+		  struct pipe_inode_info *pipe, size_t len,
-+		  unsigned int flags)
- {
- 	ssize_t (*splice_read)(struct file *, loff_t *,
- 			       struct pipe_inode_info *, size_t, unsigned int);
-diff --git a/include/linux/namei.h b/include/linux/namei.h
-index ec0f607..1438153 100644
---- a/include/linux/namei.h
-+++ b/include/linux/namei.h
-@@ -75,6 +75,9 @@ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry
- extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);
- extern void release_open_intent(struct nameidata *);
- 
-+extern struct dentry *lookup_hash(struct nameidata *nd);
-+extern int __lookup_one_len(const char *name, struct qstr *this,
-+			    struct dentry *base, int len);
- extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
- extern struct dentry *lookup_one_noperm(const char *, struct dentry *);
- 
-diff --git a/include/linux/splice.h b/include/linux/splice.h
-index 18e7c7c..8393b5c 100644
---- a/include/linux/splice.h
-+++ b/include/linux/splice.h
-@@ -82,4 +82,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *,
- extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
- 				      splice_direct_actor *);
- 
-+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+			   loff_t *ppos, size_t len, unsigned int flags);
-+extern long do_splice_to(struct file *in, loff_t *ppos,
-+			 struct pipe_inode_info *pipe, size_t len,
-+			 unsigned int flags);
-+
- #endif
-
-aufs2 standalone patch for linux-2.6.32
-
-diff --git a/fs/namei.c b/fs/namei.c
-index 7d28f56..0f6117c 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -350,6 +350,7 @@ int deny_write_access(struct file * file)
- 
- 	return 0;
- }
-+EXPORT_SYMBOL(deny_write_access);
- 
- /**
-  * path_get - get a reference to a path
-@@ -1228,6 +1229,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
- 		return ERR_PTR(err);
- 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
- }
-+EXPORT_SYMBOL(lookup_hash);
- 
- int __lookup_one_len(const char *name, struct qstr *this,
- 		struct dentry *base, int len)
-@@ -1250,6 +1252,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
- 	this->hash = end_name_hash(hash);
- 	return 0;
- }
-+EXPORT_SYMBOL(__lookup_one_len);
- 
- /**
-  * lookup_one_len - filesystem helper to lookup single pathname component
-diff --git a/fs/namespace.c b/fs/namespace.c
-index bdc3cb4..a2cadcf 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -39,6 +39,7 @@
- 
- /* spinlock for vfsmount related operations, inplace of dcache_lock */
- __cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock);
-+EXPORT_SYMBOL(vfsmount_lock);
- 
- static int event;
- static DEFINE_IDA(mnt_id_ida);
-diff --git a/fs/notify/group.c b/fs/notify/group.c
-index 0e16771..3fab10a 100644
---- a/fs/notify/group.c
-+++ b/fs/notify/group.c
-@@ -22,6 +22,7 @@
- #include <linux/srcu.h>
- #include <linux/rculist.h>
- #include <linux/wait.h>
-+#include <linux/module.h>
- 
- #include <linux/fsnotify_backend.h>
- #include "fsnotify.h"
-@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
- 	fsnotify_recalc_global_mask();
- 	fsnotify_destroy_group(group);
- }
-+EXPORT_SYMBOL(fsnotify_put_group);
- 
- /*
-  * Simply run the fsnotify_groups list and find a group which matches
-@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask,
- 
- 	return group;
- }
-+EXPORT_SYMBOL(fsnotify_obtain_group);
-diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c
-index 3165d85..4586162 100644
---- a/fs/notify/inode_mark.c
-+++ b/fs/notify/inode_mark.c
-@@ -106,6 +106,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry)
- 	if (atomic_dec_and_test(&entry->refcnt))
- 		entry->free_mark(entry);
- }
-+EXPORT_SYMBOL(fsnotify_put_mark);
- 
- /*
-  * Recalculate the mask of events relevant to a given inode locked.
-@@ -216,6 +217,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry)
- 	if (unlikely(atomic_dec_and_test(&group->num_marks)))
- 		fsnotify_final_destroy_group(group);
- }
-+EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry);
- 
- /*
-  * Given a group, destroy all of the marks associated with that group.
-@@ -282,6 +284,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou
- 	}
- 	return NULL;
- }
-+EXPORT_SYMBOL(fsnotify_find_mark_entry);
- 
- /*
-  * Nothing fancy, just initialize lists and locks and counters.
-@@ -298,6 +301,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry,
- 	entry->inode = NULL;
- 	entry->free_mark = free_mark;
- }
-+EXPORT_SYMBOL(fsnotify_init_mark);
- 
- /*
-  * Attach an initialized mark entry to a given group and inode.
-@@ -353,6 +357,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
- 
- 	return ret;
- }
-+EXPORT_SYMBOL(fsnotify_add_mark);
- 
- /**
-  * fsnotify_unmount_inodes - an sb is unmounting.  handle any watched inodes.
-diff --git a/fs/open.c b/fs/open.c
-index 4f01e06..ef09031 100644
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -223,6 +223,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
- 	mutex_unlock(&dentry->d_inode->i_mutex);
- 	return ret;
- }
-+EXPORT_SYMBOL(do_truncate);
- 
- static long do_sys_truncate(const char __user *pathname, loff_t length)
- {
-diff --git a/fs/splice.c b/fs/splice.c
-index 77184f0..8479d95 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -1074,6 +1074,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
- 
- 	return splice_write(pipe, out, ppos, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_from);
- 
- /*
-  * Attempt to initiate a splice from a file to a pipe.
-@@ -1099,6 +1100,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
- 
- 	return splice_read(in, ppos, pipe, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_to);
- 
- /**
-  * splice_direct_to_actor - splices data directly between two non-pipes
-diff --git a/security/commoncap.c b/security/commoncap.c
-index fe30751..813108d 100644
---- a/security/commoncap.c
-+++ b/security/commoncap.c
-@@ -1014,3 +1014,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(cap_file_mmap);
-diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index 6cf8fd2..008e0d8 100644
---- a/security/device_cgroup.c
-+++ b/security/device_cgroup.c
-@@ -514,6 +514,7 @@ found:
- 
- 	return -EPERM;
- }
-+EXPORT_SYMBOL(devcgroup_inode_permission);
- 
- int devcgroup_inode_mknod(int mode, dev_t dev)
- {
-diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
-index b85e61b..a23fad4 100644
---- a/security/integrity/ima/ima_main.c
-+++ b/security/integrity/ima/ima_main.c
-@@ -324,6 +324,7 @@ int ima_file_mmap(struct file *file, unsigned long prot)
- 					 MAY_EXEC, FILE_MMAP);
- 	return 0;
- }
-+EXPORT_SYMBOL(ima_file_mmap);
- 
- /**
-  * ima_bprm_check - based on policy, collect/store measurement.
-diff --git a/security/security.c b/security/security.c
-index c4c6732..092cd90 100644
---- a/security/security.c
-+++ b/security/security.c
-@@ -386,6 +386,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode)
- 		return 0;
- 	return security_ops->path_mkdir(path, dentry, mode);
- }
-+EXPORT_SYMBOL(security_path_mkdir);
- 
- int security_path_rmdir(struct path *path, struct dentry *dentry)
- {
-@@ -393,6 +394,7 @@ int security_path_rmdir(struct path *path, struct dentry *dentry)
- 		return 0;
- 	return security_ops->path_rmdir(path, dentry);
- }
-+EXPORT_SYMBOL(security_path_rmdir);
- 
- int security_path_unlink(struct path *path, struct dentry *dentry)
- {
-@@ -400,6 +402,7 @@ int security_path_unlink(struct path *path, struct dentry *dentry)
- 		return 0;
- 	return security_ops->path_unlink(path, dentry);
- }
-+EXPORT_SYMBOL(security_path_unlink);
- 
- int security_path_symlink(struct path *path, struct dentry *dentry,
- 			  const char *old_name)
-@@ -408,6 +411,7 @@ int security_path_symlink(struct path *path, struct dentry *dentry,
- 		return 0;
- 	return security_ops->path_symlink(path, dentry, old_name);
- }
-+EXPORT_SYMBOL(security_path_symlink);
- 
- int security_path_link(struct dentry *old_dentry, struct path *new_dir,
- 		       struct dentry *new_dentry)
-@@ -416,6 +420,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
- 		return 0;
- 	return security_ops->path_link(old_dentry, new_dir, new_dentry);
- }
-+EXPORT_SYMBOL(security_path_link);
- 
- int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
- 			 struct path *new_dir, struct dentry *new_dentry)
-@@ -426,6 +431,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
- 	return security_ops->path_rename(old_dir, old_dentry, new_dir,
- 					 new_dentry);
- }
-+EXPORT_SYMBOL(security_path_rename);
- 
- int security_path_truncate(struct path *path, loff_t length,
- 			   unsigned int time_attrs)
-@@ -434,6 +440,7 @@ int security_path_truncate(struct path *path, loff_t length,
- 		return 0;
- 	return security_ops->path_truncate(path, length, time_attrs);
- }
-+EXPORT_SYMBOL(security_path_truncate);
- #endif
- 
- int security_inode_create(struct inode *dir, struct dentry *dentry, int mode)
-@@ -505,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry)
- 		return 0;
- 	return security_ops->inode_readlink(dentry);
- }
-+EXPORT_SYMBOL(security_inode_readlink);
- 
- int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
- {
-@@ -519,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask)
- 		return 0;
- 	return security_ops->inode_permission(inode, mask);
- }
-+EXPORT_SYMBOL(security_inode_permission);
- 
- int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
- {
-@@ -619,6 +628,7 @@ int security_file_permission(struct file *file, int mask)
- {
- 	return security_ops->file_permission(file, mask);
- }
-+EXPORT_SYMBOL(security_file_permission);
- 
- int security_file_alloc(struct file *file)
- {
-@@ -641,6 +651,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
- {
- 	return security_ops->file_mmap(file, reqprot, prot, flags, addr, addr_only);
- }
-+EXPORT_SYMBOL(security_file_mmap);
- 
- int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
- 			    unsigned long prot)
diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.15.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.15.patch
deleted file mode 100644
index 4e399af8300d..000000000000
--- a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.15.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/fs/cifs/transport.c	2011-04-12 15:16:00.253887813 +0200
-+++ b/fs/cifs/transport.c	2011-04-12 15:17:22.650296413 +0200
-@@ -247,9 +247,9 @@
- 				    n_vec - first_vec, total_len);
- 		if ((rc == -ENOSPC) || (rc == -EAGAIN)) {
- 			i++;
--			if(i >= 14) {
-+			if(i >= 119) {
- 				cERROR(1,
--				   ("sends on sock %p stuck for 15 seconds",
-+				   ("sends on sock %p stuck for 120 seconds",
- 				    ssocket));
- 				rc = -EAGAIN;
- 				break;
-@@ -421,12 +421,12 @@
- 	else if (long_op == 2) /* writes past end of file can take loong time */
- 		timeout = 180 * HZ;
- 	else if (long_op == 1)
--		timeout = 45 * HZ; /* should be greater than 
-+		timeout = 120 * HZ; /* should be greater than 
- 			servers oplock break timeout (about 43 seconds) */
- 	else if (long_op > 2) {
- 		timeout = MAX_SCHEDULE_TIMEOUT;
- 	} else
--		timeout = 15 * HZ;
-+		timeout = 120 * HZ;
- 	/* wait for 15 seconds or until woken up due to response arriving or 
- 	   due to last connection to this server being unmounted */
- 	if (signal_pending(current)) {
-@@ -687,12 +687,12 @@
- 	else if (long_op == 2) /* writes past end of file can take loong time */
- 		timeout = 180 * HZ;
- 	else if (long_op == 1)
--		timeout = 45 * HZ; /* should be greater than 
-+		timeout = 120 * HZ; /* should be greater than 
- 			servers oplock break timeout (about 43 seconds) */
- 	else if (long_op > 2) {
- 		timeout = MAX_SCHEDULE_TIMEOUT;
- 	} else
--		timeout = 15 * HZ;
-+		timeout = 120 * HZ;
- 	/* wait for 15 seconds or until woken up due to response arriving or 
- 	   due to last connection to this server being unmounted */
- 	if (signal_pending(current)) {
diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.29.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.29.patch
deleted file mode 100644
index b2dac3f016c4..000000000000
--- a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.29.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ru -x '*~' /tmp/linux-2.6.32.14/fs/cifs/transport.c linux-2.6.32.14/fs/cifs/transport.c
---- /tmp/linux-2.6.32.14/fs/cifs/transport.c	2010-05-26 23:29:57.000000000 +0200
-+++ linux-2.6.32.14/fs/cifs/transport.c	2010-06-20 22:03:13.000000000 +0200
-@@ -166,9 +166,9 @@
- 			   after the retries we will kill the socket and
- 			   reconnect which may clear the network problem.
- 			*/
--			if ((i >= 14) || (!server->noblocksnd && (i > 2))) {
-+			if ((i >= 119) || (!server->noblocksnd && (i > 2))) {
- 				cERROR(1,
--				   ("sends on sock %p stuck for 15 seconds",
-+				   ("sends on sock %p stuck for 120 seconds",
- 				    ssocket));
- 				rc = -EAGAIN;
- 				break;
-@@ -459,11 +459,11 @@
- 		goto out;
- 
- 	if (long_op == CIFS_STD_OP)
--		timeout = 15 * HZ;
-+		timeout = 120 * HZ;
- 	else if (long_op == CIFS_VLONG_OP) /* e.g. slow writes past EOF */
- 		timeout = 180 * HZ;
- 	else if (long_op == CIFS_LONG_OP)
--		timeout = 45 * HZ; /* should be greater than
-+		timeout = 120 * HZ; /* should be greater than
- 			servers oplock break timeout (about 43 seconds) */
- 	else if (long_op == CIFS_ASYNC_OP)
- 		goto out;
-@@ -651,7 +651,7 @@
- 		goto out;
- 
- 	if (long_op == CIFS_STD_OP)
--		timeout = 15 * HZ;
-+		timeout = 120 * HZ;
- 	/* wait for 15 seconds or until woken up due to response arriving or
- 	   due to last connection to this server being unmounted */
- 	else if (long_op == CIFS_ASYNC_OP)
-@@ -659,7 +659,7 @@
- 	else if (long_op == CIFS_VLONG_OP) /* writes past EOF can be slow */
- 		timeout = 180 * HZ;
- 	else if (long_op == CIFS_LONG_OP)
--		timeout = 45 * HZ; /* should be greater than
-+		timeout = 120 * HZ; /* should be greater than
- 			servers oplock break timeout (about 43 seconds) */
- 	else if (long_op == CIFS_BLOCKING_OP)
- 		timeout = 0x7FFFFFFF; /* large but no so large as to wrap */
diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.35.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.35.patch
deleted file mode 100644
index 8043739ee9a8..000000000000
--- a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.35.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- /tmp/linux-2.6.32.14/fs/cifs/transport.c	2010-11-22 20:01:26.000000000 +0100
-+++ linux-2.6.32.14/fs/cifs/transport.c	2011-03-29 15:31:14.926510480 +0200
-@@ -166,8 +166,8 @@
- 			   after the retries we will kill the socket and
- 			   reconnect which may clear the network problem.
- 			*/
--			if ((i >= 14) || (!server->noblocksnd && (i > 2))) {
--				cERROR(1, "sends on sock %p stuck for 15 seconds",
-+			if ((i >= 119) || (!server->noblocksnd && (i > 2))) {
-+				cERROR(1, "sends on sock %p stuck for 119 seconds",
- 				    ssocket);
- 				rc = -EAGAIN;
- 				break;
-@@ -458,11 +458,11 @@
- 		goto out;
- 
- 	if (long_op == CIFS_STD_OP)
--		timeout = 15 * HZ;
-+		timeout = 120 * HZ;
- 	else if (long_op == CIFS_VLONG_OP) /* e.g. slow writes past EOF */
- 		timeout = 180 * HZ;
- 	else if (long_op == CIFS_LONG_OP)
--		timeout = 45 * HZ; /* should be greater than
-+		timeout = 120 * HZ; /* should be greater than
- 			servers oplock break timeout (about 43 seconds) */
- 	else if (long_op == CIFS_ASYNC_OP)
- 		goto out;
-@@ -650,7 +650,7 @@
- 		goto out;
- 
- 	if (long_op == CIFS_STD_OP)
--		timeout = 15 * HZ;
-+		timeout = 120 * HZ;
- 	/* wait for 15 seconds or until woken up due to response arriving or
- 	   due to last connection to this server being unmounted */
- 	else if (long_op == CIFS_ASYNC_OP)
-@@ -658,7 +658,7 @@
- 	else if (long_op == CIFS_VLONG_OP) /* writes past EOF can be slow */
- 		timeout = 180 * HZ;
- 	else if (long_op == CIFS_LONG_OP)
--		timeout = 45 * HZ; /* should be greater than
-+		timeout = 120 * HZ; /* should be greater than
- 			servers oplock break timeout (about 43 seconds) */
- 	else if (long_op == CIFS_BLOCKING_OP)
- 		timeout = 0x7FFFFFFF; /* large but no so large as to wrap */
diff --git a/pkgs/os-specific/linux/kernel/dell-rfkill.patch b/pkgs/os-specific/linux/kernel/dell-rfkill.patch
deleted file mode 100644
index 32f890c84f66..000000000000
--- a/pkgs/os-specific/linux/kernel/dell-rfkill.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Ensure that the dell-bluetooth device does not stay in the "hard
-blocked" state.
-
-From https://patchwork.kernel.org/patch/37539/
-
-diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
-index 74909c4..cf40c4e 100644
---- a/drivers/platform/x86/dell-laptop.c
-+++ b/drivers/platform/x86/dell-laptop.c
-@@ -197,8 +197,11 @@  static void dell_rfkill_query(struct rfkill *rfkill, void *data)
- 	dell_send_request(&buffer, 17, 11);
- 	status = buffer.output[1];
- 
--	if (status & BIT(bit))
--		rfkill_set_hw_state(rfkill, !!(status & BIT(16)));
-+	/*
-+	 * Don't change state unless the read-only HW rfkill switch is disabled.
-+	 */
-+	if (status & BIT(16))
-+		rfkill_set_hw_state(rfkill, !!(status & BIT(bit)));
- }
- 
- static const struct rfkill_ops dell_rfkill_ops = {
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.15.nix b/pkgs/os-specific/linux/kernel/linux-2.6.15.nix
deleted file mode 100644
index 2dd67f46167c..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-2.6.15.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
-
-let
-  configWithPlatform = kernelPlatform:
-  ''
-    # Don't include any debug features.
-    DEBUG_KERNEL n
-
-    # Support drivers that need external firmware.
-    STANDALONE n
-
-    # Make /proc/config.gz available.
-    IKCONFIG_PROC y
-
-    # Optimize with -O2, not -Os.
-    CC_OPTIMIZE_FOR_SIZE n
-
-    # Enable various subsystems.
-    MTD_COMPLEX_MAPPINGS y # needed for many devices
-
-    # Networking options.
-    IP_PNP n
-    IPV6_PRIVACY y
-
-    # Filesystem options - in particular, enable extended attributes and
-    # ACLs for all filesystems that support them.
-    CIFS_XATTR y
-    CIFS_POSIX y
-
-    ${extraConfig}
-  '';
-in
-
-import ./generic.nix (rec {
-  version = "2.6.15.7";
-  postBuild = "make $makeFlags $kernelTarget";
-
-  src = fetchurl {
-    url = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "43e0c251924324749b06464512532c3002d6294520faabdba5b3aea4e840b48b";
-  };
-
-  config = configWithPlatform stdenv.platform;
-  configCross = configWithPlatform stdenv.cross.platform;
-}
-
-// removeAttrs args ["extraConfig"]
-)
\ No newline at end of file
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
deleted file mode 100644
index 57b16c791cf1..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
+++ /dev/null
@@ -1,215 +0,0 @@
-{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
-
-let
-  configWithPlatform = kernelPlatform:
-    ''
-      # Don't include any debug features.
-      DEBUG_KERNEL n
-
-      # Support drivers that need external firmware.
-      STANDALONE n
-
-      # Make /proc/config.gz available.
-      IKCONFIG_PROC y
-
-      # Optimize with -O2, not -Os.
-      CC_OPTIMIZE_FOR_SIZE n
-
-      # Enable the kernel's built-in memory tester.
-      MEMTEST y
-
-      # Include the CFQ I/O scheduler in the kernel, rather than as a
-      # module, so that the initrd gets a good I/O scheduler.
-      IOSCHED_CFQ y
-
-      # Disable some expensive (?) features.
-      FTRACE n
-      KPROBES n
-      NUMA? n
-      PM_TRACE_RTC n
-
-      # Enable various subsystems.
-      ACCESSIBILITY y # Accessibility support
-      AUXDISPLAY y # Auxiliary Display support
-      DONGLE y # Serial dongle support
-      HIPPI y
-      MTD_COMPLEX_MAPPINGS y # needed for many devices
-      NET_POCKET y # enable pocket and portable adapters
-      SCSI_LOWLEVEL y # enable lots of SCSI devices
-      SCSI_LOWLEVEL_PCMCIA y
-      SPI y # needed for many devices
-      SPI_MASTER y
-      WAN y
-
-      # Networking options.
-      IP_PNP n
-      IPV6_PRIVACY y
-      NETFILTER_ADVANCED y
-      IP_VS_PROTO_TCP y
-      IP_VS_PROTO_UDP y
-      IP_VS_PROTO_ESP y
-      IP_VS_PROTO_AH y
-      IP_DCCP_CCID3 n # experimental
-      CLS_U32_PERF y
-      CLS_U32_MARK y
-
-      # Wireless networking.
-      IPW2100_MONITOR y # support promiscuous mode
-      IPW2200_MONITOR y # support promiscuous mode
-      IWLWIFI_LEDS? y
-      IWLWIFI_SPECTRUM_MEASUREMENT y
-      IWL3945_SPECTRUM_MEASUREMENT y
-      IWL4965 y # Intel Wireless WiFi 4965AGN
-      IWL5000 y # Intel Wireless WiFi 5000AGN
-      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
-      HOSTAP_FIRMWARE_NVRAM y
-
-      # Some settings to make sure that fbcondecor works - in particular,
-      # disable tileblitting and the drivers that need it.
-
-      # Enable various FB devices.
-      FB y
-      FB_EFI y
-      FB_NVIDIA_I2C y # Enable DDC Support
-      FB_RIVA_I2C y
-      FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
-      FB_ATY_GX y # Mach64 GX support
-      FB_SAVAGE_I2C y
-      FB_SAVAGE_ACCEL y
-      FB_SIS_300 y
-      FB_SIS_315 y
-      FB_3DFX_ACCEL y
-      FB_GEODE y
-
-      # Video configuration
-      # The intel drivers already require KMS
-      DRM_I915_KMS y
-
-      # Sound.
-      SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
-      SND_HDA_INPUT_BEEP y # Support digital beep via input layer
-      SND_USB_CAIAQ_INPUT y
-      PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
-
-      # USB serial devices.
-      USB_SERIAL_GENERIC y # USB Generic Serial Driver
-      USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
-      USB_SERIAL_KEYSPAN_USA28 y
-      USB_SERIAL_KEYSPAN_USA28X y
-      USB_SERIAL_KEYSPAN_USA28XA y
-      USB_SERIAL_KEYSPAN_USA28XB y
-      USB_SERIAL_KEYSPAN_USA19 y
-      USB_SERIAL_KEYSPAN_USA18X y
-      USB_SERIAL_KEYSPAN_USA19W y
-      USB_SERIAL_KEYSPAN_USA19QW y
-      USB_SERIAL_KEYSPAN_USA19QI y
-      USB_SERIAL_KEYSPAN_USA49W y
-      USB_SERIAL_KEYSPAN_USA49WLC y
-
-      # Filesystem options - in particular, enable extended attributes and
-      # ACLs for all filesystems that support them.
-      EXT2_FS_XATTR y # Ext2 extended attributes
-      EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
-      EXT2_FS_SECURITY y # Ext2 Security Labels
-      EXT2_FS_XIP y # Ext2 execute in place support
-      EXT4_FS_POSIX_ACL y
-      EXT4_FS_SECURITY y
-      REISERFS_FS_XATTR y
-      REISERFS_FS_POSIX_ACL y
-      REISERFS_FS_SECURITY y
-      JFS_POSIX_ACL y
-      JFS_SECURITY y
-      XFS_QUOTA y
-      XFS_POSIX_ACL y
-      XFS_RT y # XFS Realtime subvolume support
-      OCFS2_DEBUG_MASKLOG n
-      OCFS2_FS_POSIX_ACL y
-      BTRFS_FS_POSIX_ACL y
-      UBIFS_FS_XATTR y
-      UBIFS_FS_ADVANCED_COMPR y
-      NFSD_V2_ACL y
-      NFSD_V3 y
-      NFSD_V3_ACL y
-      NFSD_V4 y
-      CIFS_XATTR y
-      CIFS_POSIX y
-
-      # Security related features.
-      STRICT_DEVMEM y # Filter access to /dev/mem
-      SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
-
-      # Misc. options.
-      8139TOO_8129 y
-      8139TOO_PIO n # PIO is slower
-      AIC79XX_DEBUG_ENABLE n
-      AIC7XXX_DEBUG_ENABLE n
-      AIC94XX_DEBUG n
-      B43_PCMCIA y
-      BLK_DEV_BSG n
-      BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
-      BLK_DEV_IDEACPI y # IDE ACPI support
-      BLK_DEV_INTEGRITY y
-      BSD_PROCESS_ACCT_V3 y
-      BT_HCIUART_BCSP y
-      BT_HCIUART_H4 y # UART (H4) protocol support
-      BT_HCIUART_LL y
-      BT_RFCOMM_TTY y # RFCOMM TTY support
-      CPU_FREQ_DEBUG n
-      CRASH_DUMP n
-      DMAR? n # experimental
-      DVB_DYNAMIC_MINORS y # we use udev
-      FUSION y # Fusion MPT device support
-      IDE_GD_ATAPI y # ATAPI floppy support
-      IRDA_ULTRA y # Ultra (connectionless) protocol
-      JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
-      JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
-      JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
-      JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
-      KALLSYMS_EXTRA_PASS n
-      LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
-      LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
-      LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
-      LOGO n # not needed
-      MEDIA_ATTACH y
-      MEGARAID_NEWGEN y
-      MICROCODE_AMD y
-      MODVERSIONS y
-      MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
-      MTRR_SANITIZER y
-      NET_FC y # Fibre Channel driver support
-      PCI_LEGACY y
-      PPP_MULTILINK y # PPP multilink support
-      REGULATOR y # Voltage and Current Regulator Support
-      SCSI_LOGGING y # SCSI logging facility
-      SERIAL_8250 y # 8250/16550 and compatible serial support
-      SLIP_COMPRESSED y # CSLIP compressed headers
-      SLIP_SMART y
-      THERMAL_HWMON y # Hardware monitoring support
-      USB_DEBUG n
-      USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
-      X86_CHECK_BIOS_CORRUPTION y
-      X86_MCE y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "2.6.32.60";
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-${version}.tar.bz2";
-      sha256 = "0iyg5z76g8wnh73aq6p6j4xb3043skpa14fb3dwgbpdpx710x5nf";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
deleted file mode 100644
index 1b8f9fded70a..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
+++ /dev/null
@@ -1,222 +0,0 @@
-{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
-
-let
-  configWithPlatform = kernelPlatform:
-    ''
-      # Don't include any debug features.
-      DEBUG_KERNEL n
-
-      # Support drivers that need external firmware.
-      STANDALONE n
-
-      # Make /proc/config.gz available.
-      IKCONFIG_PROC y
-
-      # Optimize with -O2, not -Os.
-      CC_OPTIMIZE_FOR_SIZE n
-
-      # Enable the kernel's built-in memory tester.
-      MEMTEST y
-
-      # Include the CFQ I/O scheduler in the kernel, rather than as a
-      # module, so that the initrd gets a good I/O scheduler.
-      IOSCHED_CFQ y
-      BLK_CGROUP y # required by CFQ
-
-      # Disable some expensive (?) features.
-      FTRACE n
-      KPROBES n
-      NUMA? n
-      PM_TRACE_RTC n
-
-      # Enable various subsystems.
-      ACCESSIBILITY y # Accessibility support
-      AUXDISPLAY y # Auxiliary Display support
-      DONGLE y # Serial dongle support
-      HIPPI y
-      MTD_COMPLEX_MAPPINGS y # needed for many devices
-      NET_POCKET y # enable pocket and portable adapters
-      SCSI_LOWLEVEL y # enable lots of SCSI devices
-      SCSI_LOWLEVEL_PCMCIA y
-      SPI y # needed for many devices
-      SPI_MASTER y
-      WAN y
-
-      # Networking options.
-      IP_PNP n
-      IPV6_PRIVACY y
-      NETFILTER_ADVANCED y
-      IP_VS_PROTO_TCP y
-      IP_VS_PROTO_UDP y
-      IP_VS_PROTO_ESP y
-      IP_VS_PROTO_AH y
-      IP_DCCP_CCID3 n # experimental
-      CLS_U32_PERF y
-      CLS_U32_MARK y
-
-      # Wireless networking.
-      IPW2100_MONITOR y # support promiscuous mode
-      IPW2200_MONITOR y # support promiscuous mode
-      IWL4965 y # Intel Wireless WiFi 4965AGN
-      IWL5000 y # Intel Wireless WiFi 5000AGN
-      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
-      HOSTAP_FIRMWARE_NVRAM y
-
-      # Some settings to make sure that fbcondecor works - in particular,
-      # disable tileblitting and the drivers that need it.
-
-      # Enable various FB devices.
-      FB y
-      FB_EFI y
-      FB_NVIDIA_I2C y # Enable DDC Support
-      FB_RIVA_I2C y
-      FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
-      FB_ATY_GX y # Mach64 GX support
-      FB_SAVAGE_I2C y
-      FB_SAVAGE_ACCEL y
-      FB_SIS_300 y
-      FB_SIS_315 y
-      FB_3DFX_ACCEL y
-      FB_GEODE y
-
-      # Video configuration
-      # The intel drivers already require KMS
-      DRM_I915_KMS y
-
-      # Sound.
-      SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
-      SND_HDA_INPUT_BEEP y # Support digital beep via input layer
-      SND_USB_CAIAQ_INPUT y
-      PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
-
-      # USB serial devices.
-      USB_SERIAL_GENERIC y # USB Generic Serial Driver
-      USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
-      USB_SERIAL_KEYSPAN_USA28 y
-      USB_SERIAL_KEYSPAN_USA28X y
-      USB_SERIAL_KEYSPAN_USA28XA y
-      USB_SERIAL_KEYSPAN_USA28XB y
-      USB_SERIAL_KEYSPAN_USA19 y
-      USB_SERIAL_KEYSPAN_USA18X y
-      USB_SERIAL_KEYSPAN_USA19W y
-      USB_SERIAL_KEYSPAN_USA19QW y
-      USB_SERIAL_KEYSPAN_USA19QI y
-      USB_SERIAL_KEYSPAN_USA49W y
-      USB_SERIAL_KEYSPAN_USA49WLC y
-
-      # Filesystem options - in particular, enable extended attributes and
-      # ACLs for all filesystems that support them.
-      EXT2_FS_XATTR y # Ext2 extended attributes
-      EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
-      EXT2_FS_SECURITY y # Ext2 Security Labels
-      EXT2_FS_XIP y # Ext2 execute in place support
-      EXT4_FS_POSIX_ACL y
-      EXT4_FS_SECURITY y
-      REISERFS_FS_XATTR y
-      REISERFS_FS_POSIX_ACL y
-      REISERFS_FS_SECURITY y
-      JFS_POSIX_ACL y
-      JFS_SECURITY y
-      XFS_QUOTA y
-      XFS_POSIX_ACL y
-      XFS_RT y # XFS Realtime subvolume support
-      OCFS2_DEBUG_MASKLOG n
-      BTRFS_FS_POSIX_ACL y
-      UBIFS_FS_XATTR y
-      UBIFS_FS_ADVANCED_COMPR y
-      NFSD_V2_ACL y
-      NFSD_V3 y
-      NFSD_V3_ACL y
-      NFSD_V4 y
-      CIFS_XATTR y
-      CIFS_POSIX y
-
-      # Security related features.
-      STRICT_DEVMEM y # Filter access to /dev/mem
-      SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
-
-      # Misc. options.
-      8139TOO_8129 y
-      8139TOO_PIO n # PIO is slower
-      AIC79XX_DEBUG_ENABLE n
-      AIC7XXX_DEBUG_ENABLE n
-      AIC94XX_DEBUG n
-      B43_PCMCIA y
-      BLK_DEV_BSG n
-      BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
-      BLK_DEV_IDEACPI y # IDE ACPI support
-      BLK_DEV_INTEGRITY y
-      BSD_PROCESS_ACCT_V3 y
-      BT_HCIUART_BCSP y
-      BT_HCIUART_H4 y # UART (H4) protocol support
-      BT_HCIUART_LL y
-      BT_RFCOMM_TTY y # RFCOMM TTY support
-      CPU_FREQ_DEBUG n
-      CRASH_DUMP n
-      DMAR? n # experimental
-      DVB_DYNAMIC_MINORS y # we use udev
-      FUSION y # Fusion MPT device support
-      IDE_GD_ATAPI y # ATAPI floppy support
-      IRDA_ULTRA y # Ultra (connectionless) protocol
-      JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
-      JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
-      JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
-      JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
-      KALLSYMS_EXTRA_PASS n
-      LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
-      LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
-      LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
-      LOGO n # not needed
-      MEDIA_ATTACH y
-      MEGARAID_NEWGEN y
-      MICROCODE_AMD y
-      MODVERSIONS y
-      MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
-      MTRR_SANITIZER y
-      NET_FC y # Fibre Channel driver support
-      PPP_MULTILINK y # PPP multilink support
-      REGULATOR y # Voltage and Current Regulator Support
-      SCSI_LOGGING y # SCSI logging facility
-      SERIAL_8250 y # 8250/16550 and compatible serial support
-      SLIP_COMPRESSED y # CSLIP compressed headers
-      SLIP_SMART y
-      THERMAL_HWMON y # Hardware monitoring support
-      USB_DEBUG n
-      USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
-      X86_CHECK_BIOS_CORRUPTION y
-      X86_MCE y
-
-      # Allow up to 128 GiB of RAM in Xen domains.
-      XEN_MAX_DOMAIN_MEMORY 128
-
-      # PROC_EVENTS requires that the netlink connector is not built
-      # as a module.  This is required by libcgroup's cgrulesengd.
-      CONNECTOR y
-      PROC_EVENTS y
-
-      # Devtmpfs support.
-      DEVTMPFS y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "2.6.35.14";
-  
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.35/linux-${version}.tar.bz2";
-      sha256 = "1wzml7s9karfbk2yi36g1r8fyaq4d4f16yizc68zgchv0xzj39zl";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 5288050d70dc..0c5109c9834a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -2,24 +2,6 @@
 
 let
 
-  fbcondecorConfig =
-    ''
-      FB_CON_DECOR y
-
-      # fbcondecor is picky about some other settings.
-      FB y
-      FB_TILEBLITTING n
-      FB_MATROX n
-      FB_S3 n
-      FB_VT8623 n
-      FB_ARK n
-      FB_CFB_FILLRECT y
-      FB_CFB_COPYAREA y
-      FB_CFB_IMAGEBLIT y
-      FB_VESA y
-      FRAMEBUFFER_CONSOLE y
-    '';
-
   makeTuxonicePatch = { version, kernelVersion, sha256,
     url ? "http://tuxonice.net/files/tuxonice-${version}-for-${kernelVersion}.patch.bz2" }:
     { name = "tuxonice-${kernelVersion}";
@@ -64,47 +46,6 @@ rec {
       features.secPermPatch = true;
     };
 
-  fbcondecor_2_6_31 =
-    { name = "fbcondecor-0.9.6-2.6.31.2";
-      patch = fetchurl {
-        url = http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.6-2.6.31.2.patch;
-        sha256 = "1avk0yn0y2qbpsxf31r6d14y4a1mand01r4k4i71yfxvpqcgxka9";
-      };
-      extraConfig = fbcondecorConfig;
-      features.fbConDecor = true;
-    };
-
-  fbcondecor_2_6_35 =
-    rec {
-      name = "fbcondecor-0.9.6-2.6.35-rc4";
-      patch = fetchurl {
-        url = "http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${name}.patch";
-        sha256 = "0dlks1arr3b3hlmw9k1a1swji2x655why61sa0aahm62faibsg1r";
-      };
-      extraConfig = fbcondecorConfig;
-      features.fbConDecor = true;
-    };
-
-  aufs2_2_6_32 =
-    { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2-32;hb=aufs2-32
-      # Note that this merely the patch needed to build AUFS2 as a
-      # standalone package.
-      name = "aufs2";
-      patch = ./aufs2.patch;
-      features.aufsBase = true;
-      features.aufs2 = true;
-    };
-
-  aufs2_2_6_35 =
-    { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2-35;hb=aufs2-35
-      # Note that this merely the patch needed to build AUFS2 as a
-      # standalone package.
-      name = "aufs2";
-      patch = ./aufs2-35.patch;
-      features.aufsBase = true;
-      features.aufs2 = true;
-    };
-
   aufs3_0 = rec {
     name = "aufs3.0";
     version = "3.0.20121210";
@@ -164,24 +105,6 @@ rec {
 
   # Increase the timeout on CIFS requests from 15 to 120 seconds to
   # make CIFS more resilient to high load on the CIFS server.
-  cifs_timeout_2_6_15 =
-    { name = "cifs-timeout";
-      patch = ./cifs-timeout-2.6.15.patch;
-      features.cifsTimeout = true;
-    };
-
-  cifs_timeout_2_6_29 =
-    { name = "cifs-timeout";
-      patch = ./cifs-timeout-2.6.29.patch;
-      features.cifsTimeout = true;
-    };
-
-  cifs_timeout_2_6_35 =
-    { name = "cifs-timeout";
-      patch = ./cifs-timeout-2.6.35.patch;
-      features.cifsTimeout = true;
-    };
-
   cifs_timeout_2_6_38 =
     { name = "cifs-timeout";
       patch = ./cifs-timeout-2.6.38.patch;
@@ -194,16 +117,6 @@ rec {
       features.noXsave = true;
     };
 
-  dell_rfkill =
-    { name = "dell-rfkill";
-      patch = ./dell-rfkill.patch;
-    };
-
-  sheevaplug_modules_2_6_35 =
-    { name = "sheevaplug_modules-2.6.35";
-      patch = ./sheevaplug_modules-2.6.35.patch;
-    };
-
   mips_fpureg_emu =
     { name = "mips-fpureg-emulation";
       patch = ./mips-fpureg-emulation.patch;
diff --git a/pkgs/os-specific/linux/kernel/sheevaplug_modules-2.6.35.patch b/pkgs/os-specific/linux/kernel/sheevaplug_modules-2.6.35.patch
deleted file mode 100644
index 5b62fb90670c..000000000000
--- a/pkgs/os-specific/linux/kernel/sheevaplug_modules-2.6.35.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-http://www.mail-archive.com/armedslack@lists.armedslack.org/msg00212.html
-
-From d0679c730395d0bde9a46939e7ba255b4ba7dd7c Mon Sep 17 00:00:00 2001
-From: Andi Kleen <andi@firstfloor.org>
-Date: Tue, 2 Feb 2010 14:40:02 -0800
-Subject: [PATCH] kbuild: move -fno-dwarf2-cfi-asm to powerpc only
-
-Better dwarf2 unwind information is a good thing, it allows better
-debugging with kgdb and crash and helps systemtap.
-
-Commit 003086497f07f7f1e67c0c295e261740f822b377 ("Build with
--fno-dwarf2-cfi-asm") disabled some CFI information globally to work
-around a module loader bug on powerpc.
-
-But this disables the better unwind tables for all architectures, not just
-powerpc.  Move the workaround to powerpc and also add a suitable comment
-that's it really a workaround.
-
-This improves dwarf2 unwind tables on x86 at least.
-
-Signed-off-by: Andi Kleen <ak@linux.intel.com>
-Cc: Kyle McMartin <kyle@mcmartin.ca>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-Signed-off-by: Michal Marek <mmarek@suse.cz>
----
- Makefile              |    3 ---
- arch/powerpc/Makefile |    5 +++++
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 03053c6..2e74a68 100644
---- a/Makefile
-+++ b/Makefile
-@@ -579,6 +579,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,)
- # disable invalid "can't wrap" optimizations for signed / pointers
- KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)
- 
-+# revert to pre-gcc-4.4 behaviour of .eh_frame
-+KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)
-+
- # conserve stack if available
- KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)
- 
-diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
-index 1a54a3b..42dcd3f 100644
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -112,11 +112,6 @@ KBUILD_CFLAGS += $(call cc-option,-mspe=no)
- # kernel considerably.
- KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
- 
--# FIXME: the module load should be taught about the additional relocs
--# generated by this.
--# revert to pre-gcc-4.4 behaviour of .eh_frame
--KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)
--
- # Never use string load/store instructions as they are
- # often slow when they are implemented at all
- KBUILD_CFLAGS		+= -mno-string
--- 
-1.7.3.1
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e72c0fe3d10e..09365a80cf1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5834,53 +5834,10 @@ let
 
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 
-  linux_2_6_15 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.15.nix) {
-    inherit fetchurl perl mktemp module_init_tools;
-    stdenv = overrideInStdenv stdenv [ gcc34 gnumake381 ];
-    kernelPatches =
-      [ kernelPatches.cifs_timeout_2_6_15
-      ];
-  };
-
-  linux_2_6_32 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
-    kernelPatches =
-      [ kernelPatches.fbcondecor_2_6_31
-        kernelPatches.sec_perm_2_6_24
-        # kernelPatches.aufs2_2_6_32
-        kernelPatches.cifs_timeout_2_6_29
-        # kernelPatches.no_xsave # doesn't apply anymore
-        kernelPatches.dell_rfkill
-      ];
-  };
-
-  linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
-    kernelPatches =
-      [ kernelPatches.fbcondecor_2_6_35
-        kernelPatches.sec_perm_2_6_24
-        # kernelPatches.aufs2_2_6_35
-        kernelPatches.cifs_timeout_2_6_35
-      ] ++ lib.optional (platform.kernelArch == "arm")
-        kernelPatches.sheevaplug_modules_2_6_35;
-  };
-
-  linux_2_6_35_oldI686 = linux_2_6_35.override {
-    extraConfig = ''
-      HIGHMEM64G? n
-      XEN? n
-    '';
-    extraMeta = {
-      platforms = ["i686-linux"];
-      maintainers = [lib.maintainers.raskin];
-    };
-  };
-
   linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
-      [ #kernelPatches.fbcondecor_2_6_38
-        kernelPatches.sec_perm_2_6_24
+      [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_0
       ];
   };
@@ -5888,8 +5845,7 @@ let
   linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
-      [ #kernelPatches.fbcondecor_2_6_38
-        kernelPatches.sec_perm_2_6_24
+      [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_2
         kernelPatches.cifs_timeout_2_6_38
       ];
@@ -5904,8 +5860,7 @@ let
   linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
-      [ #kernelPatches.fbcondecor_2_6_38
-        kernelPatches.sec_perm_2_6_24
+      [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_4
       ] ++ lib.optionals (platform.kernelArch == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -6066,8 +6021,6 @@ let
   };
 
   # Build the kernel modules for the some of the kernels.
-  linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 linuxPackages_2_6_32);
-  linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 linuxPackages_2_6_35);
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0);
   linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
   linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen);

From f0d45e2e25d7333b67cc1e401469b0de89aee27f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Mar 2013 22:34:55 +0100
Subject: [PATCH 222/394] Linux kernel: Enable CONFIG_FHANDLE

This enables the open_by_handle_at(2) and name_to_handle_at(2)
syscalls.  Systemd kind of requires this.
---
 pkgs/os-specific/linux/kernel/linux-3.0.nix | 1 +
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 1 +
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 1 +
 pkgs/os-specific/linux/kernel/linux-3.7.nix | 1 +
 pkgs/os-specific/linux/kernel/linux-3.8.nix | 1 +
 pkgs/os-specific/linux/kernel/linux-3.9.nix | 1 +
 6 files changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index 0f269a630e9d..4495e8177f48 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -173,6 +173,7 @@ let
       CRASH_DUMP n
       DMAR? n # experimental
       DVB_DYNAMIC_MINORS y # we use udev
+      FHANDLE y # used by systemd
       FUSION y # Fusion MPT device support
       IDE_GD_ATAPI y # ATAPI floppy support
       IRDA_ULTRA y # Ultra (connectionless) protocol
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index dc088d29e112..24609d59132e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -176,6 +176,7 @@ let
       CRASH_DUMP n
       DMAR? n # experimental
       DVB_DYNAMIC_MINORS y # we use udev
+      FHANDLE y # used by systemd
       FUSION y # Fusion MPT device support
       IDE_GD_ATAPI y # ATAPI floppy support
       IRDA_ULTRA y # Ultra (connectionless) protocol
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 0f2caeac4f7b..aef013bf50a8 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -177,6 +177,7 @@ let
       DMAR? n # experimental
       DVB_DYNAMIC_MINORS y # we use udev
       EFI_STUB y # EFI bootloader in the bzImage itself
+      FHANDLE y # used by systemd
       FUSION y # Fusion MPT device support
       IDE_GD_ATAPI y # ATAPI floppy support
       IRDA_ULTRA y # Ultra (connectionless) protocol
diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix
index a522c90a10f9..ac49774b8185 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.7.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix
@@ -178,6 +178,7 @@ let
       DMAR? n # experimental
       DVB_DYNAMIC_MINORS? y # we use udev
       EFI_STUB y # EFI bootloader in the bzImage itself
+      FHANDLE y # used by systemd
       FUSION y # Fusion MPT device support
       IDE_GD_ATAPI y # ATAPI floppy support
       IRDA_ULTRA y # Ultra (connectionless) protocol
diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix
index 174c7553eeab..361d1f83a5c1 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix
@@ -178,6 +178,7 @@ let
       DMAR? n # experimental
       DVB_DYNAMIC_MINORS? y # we use udev
       EFI_STUB y # EFI bootloader in the bzImage itself
+      FHANDLE y # used by systemd
       FUSION y # Fusion MPT device support
       IDE_GD_ATAPI y # ATAPI floppy support
       IRDA_ULTRA y # Ultra (connectionless) protocol
diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix
index 1f0e60ee0d72..6340e71bf8a2 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix
@@ -178,6 +178,7 @@ let
       DMAR? n # experimental
       DVB_DYNAMIC_MINORS? y # we use udev
       EFI_STUB y # EFI bootloader in the bzImage itself
+      FHANDLE y # used by systemd
       FUSION y # Fusion MPT device support
       IDE_GD_ATAPI y # ATAPI floppy support
       IRDA_ULTRA y # Ultra (connectionless) protocol

From 419413ac52d0c212915cf012d96744064c03b811 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Mar 2013 22:48:18 +0100
Subject: [PATCH 223/394] man-pages: Update to 3.50

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

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 032a59e5c500..f1bc98c26cc4 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.48";
+  name = "man-pages-3.50";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "6944cc3ad5131abab01c6703e63672b2e44be52737cdb1144f6ddaebb7f7d682";
+    sha256 = "04fn7zzi75y79rkg57nkync3hf14m8708iw33s03f0x8ays6fajz";
   };
 
   preBuild =

From 2ef559c51361de8e40937f05e670f38fdb2c42cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Mar 2013 22:56:17 +0100
Subject: [PATCH 224/394] systemd: Enable the firmware loader in udev

It's needed in kernels < 3.8.
---
 pkgs/os-specific/linux/systemd/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index b1365a0ac07f..76769d4d3e65 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       "--with-dbuspolicydir=$(out)/etc/dbus-1/system.d"
       "--with-dbussystemservicedir=$(out)/share/dbus-1/system-services"
       "--with-dbussessionservicedir=$(out)/share/dbus-1/services"
-      "--with-firmware-path=/root/test-firmware:/var/run/current-system/firmware"
+      "--with-firmware-path=/root/test-firmware:/run/current-system/firmware"
       "--with-tty-gid=3" # tty in NixOS has gid 3
     ];
 
@@ -74,6 +74,8 @@ stdenv.mkDerivation rec {
       # Work around our kernel headers being too old.  FIXME: remove
       # this after the next stdenv update.
       "-DFS_NOCOW_FL=0x00800000"
+      # Enable udev's firmware builtin for now.
+      "-DENABLE_FIRMWARE=1"
     ];
 
   # Use /var/lib/udev rather than /etc/udev for the generated hardware

From 67a1becfdca20d51cc97d99103e6978b209844d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 27 Mar 2013 23:29:17 +0100
Subject: [PATCH 225/394] OpenImageIO Tidy Up: moved to applications/graphics

oiio includes CLI tools for manipulating graphics
---
 .../graphics/openimageio}/default.nix               | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
 rename pkgs/{development/libraries/oiio => applications/graphics/openimageio}/default.nix (62%)

diff --git a/pkgs/development/libraries/oiio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
similarity index 62%
rename from pkgs/development/libraries/oiio/default.nix
rename to pkgs/applications/graphics/openimageio/default.nix
index 1b6b8be115ff..2a5c66fae183 100644
--- a/pkgs/development/libraries/oiio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, cmake, unzip, boost, libjpeg, libtiff, libpng, openexr, ilmbase }:
+{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff, openexr
+, unzip
+}:
 
 stdenv.mkDerivation rec {
   name = "oiio-${version}";
@@ -9,13 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "08a6qhplzs8kianqb1gjgrndg81h3il5531jn9g6i4940b1xispg";
   };
 
-  buildInputs = [ cmake unzip boost libjpeg libtiff libpng openexr ilmbase ];
+  buildInputs = [ boost cmake ilmbase libjpeg libpng libtiff openexr unzip ];
 
   configurePhase = "";
 
-  buildPhase = "make ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0 INSTALLDIR=$out dist_dir=";
+  buildPhase = ''
+    make ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0 \
+      INSTALLDIR=$out dist_dir=
+  '';
 
-  installPhase = "echo hallo";
+  installPhase = "";
 
   meta = with stdenv.lib; {
     homepage = http://www.openimageio.org;

From 8ef25cf87674239fdef5ddc38acc0d7e5f54be5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 28 Mar 2013 00:45:22 +0100
Subject: [PATCH 226/394] Add OpenColorIO, a color management framework. Used
 by Blender

---
 .../libraries/opencolorio/default.nix         | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/opencolorio/default.nix

diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
new file mode 100644
index 000000000000..513b340e132a
--- /dev/null
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "ocio-${version}";
+  version = "1.0.8";
+
+  src = fetchurl {
+    url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.8.zip";
+    sha256 = "1l70bf40dz2znm9rh3r6xs9d6kp719y1djayb7dc89khfqqbx2di";
+  };
+
+  buildInputs = [ cmake unzip ];
+
+  meta = with stdenv.lib; {
+    homepage = http://opencolorio.org;
+    description = "A color management framework for visual effects and animation";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file

From 043d21b69d85e61229f60f4985525f9f59fb9fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 28 Mar 2013 00:46:23 +0100
Subject: [PATCH 227/394] Add OpenColorIO support to OpenImageIO and tidy up

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

diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index 2a5c66fae183..fa7d16ccf0a7 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff, openexr
-, unzip
+{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff
+, opencolorio, openexr, unzip
 }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "08a6qhplzs8kianqb1gjgrndg81h3il5531jn9g6i4940b1xispg";
   };
 
-  buildInputs = [ boost cmake ilmbase libjpeg libpng libtiff openexr unzip ];
+  buildInputs = [ 
+    boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip
+  ];
 
   configurePhase = "";
 
@@ -20,11 +22,11 @@ stdenv.mkDerivation rec {
       INSTALLDIR=$out dist_dir=
   '';
 
-  installPhase = "";
+  installPhase = ":";
 
   meta = with stdenv.lib; {
     homepage = http://www.openimageio.org;
-    description = "A library for reading and writing images";
+    description = "A library and tools for reading and writing images";
     license = licenses.bsd3;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;

From 5c40e28dfb7a29f30af3489347f845c7ebbefaf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 28 Mar 2013 00:47:47 +0100
Subject: [PATCH 228/394] Rename oiio to openimageio (more explicit) and add
 opencolorio

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53c4feb06763..b6d32e6df391 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4712,7 +4712,7 @@ let
     opensc = opensc_0_11_7;
   };
 
-  oiio = callPackage ../development/libraries/oiio { };
+  opencolorio = callPackage ../development/libraries/opencolorio { };
 
   ois = callPackage ../development/libraries/ois {};
 
@@ -7592,6 +7592,8 @@ let
 
   openbox = callPackage ../applications/window-managers/openbox { };
 
+  openimageio = callPackage ../applications/graphics/openimageio { };
+
   openjump = callPackage ../applications/misc/openjump { };
 
   openscad = callPackage ../applications/graphics/openscad {};

From ca2a39757c7850f2e7ec7a0b8eee6fb5ecc8e100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 28 Mar 2013 00:52:08 +0100
Subject: [PATCH 229/394] Blender: enable extra features in the Video Sequence
 Editor

FFMPEG support allows a greater variety of export and import options.
SNDFILE support allows WAV and other sound file formats to be used.
JACK support allows blender to be used with XJadeo, Ardour or any other JACK away audio editor.
---
 pkgs/applications/misc/blender/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index b9c32c982ec4..763a7c2a6e55 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, SDL, cmake, ffmpeg, gettext, glew, ilmbase, libXi, libjpeg,
-libpng, libsamplerate, libtiff, mesa, oiio, openal, openexr, openjpeg,
+{ stdenv, fetchurl, SDL, cmake, ffmpeg, jackaudio, gettext, glew, ilmbase, libXi, libjpeg,
+libpng, libsamplerate, libsndfile, libtiff, mesa, opencolorio, openimageio, openal, openexr, openjpeg,
 python, zlib, boost }:
 
 stdenv.mkDerivation rec {
@@ -10,13 +10,17 @@ stdenv.mkDerivation rec {
     sha256 = "0wj8x9xk5irvsjc3rm7wzml1j47xcdpdpy84kidafk02biskcqcb";
   };
 
-  buildInputs = [ cmake mesa ffmpeg gettext python glew libjpeg libpng zlib openal
-    SDL openexr libsamplerate libXi libtiff ilmbase oiio openjpeg boost ];
+  buildInputs = [ cmake mesa ffmpeg jackaudio gettext python glew libjpeg libpng zlib openal
+    SDL openexr libsamplerate libsndfile libXi libtiff ilmbase opencolorio openimageio openjpeg boost ];
 
 
   cmakeFlags = [
     "-DOPENEXR_INC=${openexr}/include/OpenEXR"
     "-DWITH_OPENCOLLADA=OFF"
+    "-DWITH_CODEC_FFMPEG=ON"
+    "-DWITH_CODEC_SNDFILE=ON"
+    "-DWITH_SYSTEM_OPENJPEG=ON"
+    "-DWITH_JACK=ON"
     "-DWITH_INSTALL_PORTABLE=OFF"
     "-DPYTHON_LIBRARY=python${python.majorVersion}m"    
     "-DPYTHON_LIBPATH=${python}/lib"

From 49b23b29dd84ff35a4ab1eb5bd9043e21e3f75e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 28 Mar 2013 01:00:22 +0100
Subject: [PATCH 230/394] Blender: Tidy up, sort inputs, remove unused OPENJPEG
 option

---
 pkgs/applications/misc/blender/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 763a7c2a6e55..1ed51a81f5cc 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, SDL, cmake, ffmpeg, jackaudio, gettext, glew, ilmbase, libXi, libjpeg,
-libpng, libsamplerate, libsndfile, libtiff, mesa, opencolorio, openimageio, openal, openexr, openjpeg,
-python, zlib, boost }:
+{ stdenv, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
+, ilmbase, jackaudio, libXi, libjpeg, libpng, libsamplerate, libsndfile
+, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
+, zlib
+}:
 
 stdenv.mkDerivation rec {
   name = "blender-2.66a";
@@ -10,8 +12,11 @@ stdenv.mkDerivation rec {
     sha256 = "0wj8x9xk5irvsjc3rm7wzml1j47xcdpdpy84kidafk02biskcqcb";
   };
 
-  buildInputs = [ cmake mesa ffmpeg jackaudio gettext python glew libjpeg libpng zlib openal
-    SDL openexr libsamplerate libsndfile libXi libtiff ilmbase opencolorio openimageio openjpeg boost ];
+  buildInputs = [
+    SDL boost cmake ffmpeg gettext glew ilmbase jackaudio libXi
+    libjpeg libpng libsamplerate libsndfile libtiff mesa openal
+    opencolorio openexr openimageio openjpeg python zlib
+  ];
 
 
   cmakeFlags = [
@@ -19,7 +24,6 @@ stdenv.mkDerivation rec {
     "-DWITH_OPENCOLLADA=OFF"
     "-DWITH_CODEC_FFMPEG=ON"
     "-DWITH_CODEC_SNDFILE=ON"
-    "-DWITH_SYSTEM_OPENJPEG=ON"
     "-DWITH_JACK=ON"
     "-DWITH_INSTALL_PORTABLE=OFF"
     "-DPYTHON_LIBRARY=python${python.majorVersion}m"    

From 3da635c88a163f418564b9066b8087eb6da23e69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 28 Mar 2013 01:03:30 +0100
Subject: [PATCH 231/394] Python 3.3 add setup-hook

---
 .../interpreters/python/3.3/setup-hook.sh         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/3.3/setup-hook.sh

diff --git a/pkgs/development/interpreters/python/3.3/setup-hook.sh b/pkgs/development/interpreters/python/3.3/setup-hook.sh
new file mode 100644
index 000000000000..e6fa34bf54ba
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.3/setup-hook.sh
@@ -0,0 +1,15 @@
+addPythonPath() {
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages
+}
+
+toPythonPath() {
+    local paths="$1"
+    local result=
+    for i in $paths; do
+        p="$i/lib/python3.2/site-packages"
+        result="${result}${result:+:}$p"
+    done
+    echo $result
+}
+
+envHooks=(${envHooks[@]} addPythonPath)

From a5e48c0f2062da5c5cc00412f0c021172c104aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 28 Mar 2013 01:10:23 +0100
Subject: [PATCH 232/394] Python 3.3 upgrade to 3.3.1rc1 to fix an important
 bug for Nix

http://bugs.python.org/issue15833

When Python 3.3.0 attempts to compile python bytecode in the system
directories it raises and exception and stops. Since Python 3.3 is
only required by the latest Blender, I hope it's OK to use the RC
until the final release.
---
 pkgs/development/interpreters/python/3.3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index dc9f99e9cdcc..7baecad76c6b 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.3";
-  version = "${majorVersion}.0";
+  version = "${majorVersion}.1rc1";
 
   buildInputs = filter (p: p != null) [
     zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    sha256 = "1ybdf7wc8pfw51rf7xcywfw27n6l97qyzd1ibpq151q5dkyi7h8m";
+    sha256 = "1pnsbdzbd3750jcy32sv1760lv7am4x3f33jn1kmdmd82za279gv";
   };
 
   preConfigure = ''

From df92d96871863e7b3ce1e5a3ebfbfc815c1ad288 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Mar 2013 13:08:25 +0100
Subject: [PATCH 233/394] linux: Update to 3.2.42

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 24609d59132e..3280ac7ad244 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -240,7 +240,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.2.41";
+    version = "3.2.42";
 
     modDirVersion = version;
 
@@ -250,7 +250,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.xz";
-      sha256 = "0dwk0pg07kq5s4i8h0mzv4n3dc68hp0ayd1lqis3ix86m8qkhv4j";
+      sha256 = "17cwyv474pnwj7i7i513l6g1iz8sp92gvf0crpmrrvv93064xz08";
     };
 
     config = configWithPlatform stdenv.platform;

From 8a42c8b94e684e95f80e8dfb92c3cc5d3d5c1344 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Mar 2013 13:13:08 +0100
Subject: [PATCH 234/394] httpd: Update to 2.2.24

---
 pkgs/servers/http/apache-httpd/2.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index d4def35c09f1..ba0bde633584 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert mpm == "prefork" || mpm == "worker" || mpm == "event";
 
 stdenv.mkDerivation rec {
-  version = "2.2.23";
+  version = "2.2.24";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "2776145201068045d4ed83157a0e2e1c28c4c453";
+    sha1 = "f73bce14832ec40c1aae68f4f8c367cab2266241";
   };
 
   buildInputs = [perl apr aprutil pcre] ++

From 229616de833d48211d2affb7bcf5b4374ea5ba66 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Thu, 28 Mar 2013 12:47:27 +0100
Subject: [PATCH 235/394] set platforms and correct license to synergy

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

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index a267a29c7e2e..4bb3ef9e64a4 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
   meta = { 
     description = "Tool to share the mouse keyboard and the clipboard between computers";
     homepage = http://synergy-foss.org;
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.all;
   };
 }

From 171425c8a0258e05b8c59965cbfa14ede04cc1f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 13:56:22 +0100
Subject: [PATCH 236/394] mini-httpd: update to version 1.4

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

diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix
index 5cdff23d0a3a..b8848f1e5d80 100644
--- a/pkgs/servers/http/mini-httpd/default.nix
+++ b/pkgs/servers/http/mini-httpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, boostHeaders }:
 
 stdenv.mkDerivation rec {
-  name = "mini-httpd-1.3";
+  name = "mini-httpd-1.4";
 
   src = fetchurl {
     url = "mirror://savannah/mini-httpd/${name}.tar.gz";
-    sha256 = "16n33hyp3fcjvd71yrny3ym3kqvxr1jy2hh9wgf6b7zjri3gfak3";
+    sha256 = "1i46klkx2ca1cgmlilajkx8gf7b7d7c2sj58llxfllh184pb6cpd";
   };
 
   buildInputs = [ boostHeaders ];

From 6cd1dc255ee33df8961a2c55c16844e6562362c6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 28 Mar 2013 09:42:15 -0400
Subject: [PATCH 237/394] Update rubygems

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../interpreters/ruby/generated.nix           | 231 ++++++++++--------
 1 file changed, 127 insertions(+), 104 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 2f276fc163a6..13ee31bf44f3 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -4,12 +4,12 @@ g: # Get dependencies from patched gems
 {
   aliases = {
     ZenTest = g.ZenTest_4_9_0;
-    actionmailer = g.actionmailer_3_2_12;
-    actionpack = g.actionpack_3_2_12;
-    activemodel = g.activemodel_3_2_12;
-    activerecord = g.activerecord_3_2_12;
-    activeresource = g.activeresource_3_2_12;
-    activesupport = g.activesupport_3_2_12;
+    actionmailer = g.actionmailer_3_2_13;
+    actionpack = g.actionpack_3_2_13;
+    activemodel = g.activemodel_3_2_13;
+    activerecord = g.activerecord_3_2_13;
+    activeresource = g.activeresource_3_2_13;
+    activesupport = g.activesupport_3_2_13;
     addressable = g.addressable_2_3_3;
     arel = g.arel_3_0_2;
     atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
@@ -17,7 +17,7 @@ g: # Get dependencies from patched gems
     aws_sdk = g.aws_sdk_1_8_5;
     bitbucket_backup = g.bitbucket_backup_0_2_2;
     builder = g.builder_3_2_0;
-    buildr = g.buildr_1_4_10;
+    buildr = g.buildr_1_4_11;
     bundler = g.bundler_1_3_4;
     childprocess = g.childprocess_0_3_9;
     chronic = g.chronic_0_9_1;
@@ -28,44 +28,45 @@ g: # Get dependencies from patched gems
     erubis = g.erubis_2_7_0;
     eventmachine = g.eventmachine_1_0_3;
     eventmachine_tail = g.eventmachine_tail_0_6_4;
+    execjs = g.execjs_1_4_0;
     fakes3 = g.fakes3_0_1_5;
-    faraday = g.faraday_0_8_6;
+    faraday = g.faraday_0_8_7;
     faraday_middleware = g.faraday_middleware_0_8_8;
-    ffi = g.ffi_1_4_0;
+    ffi = g.ffi_1_6_0;
     file_tail = g.file_tail_1_0_12;
     foreman = g.foreman_0_62_0;
-    highline = g.highline_1_6_15;
+    highline = g.highline_1_6_16;
     hike = g.hike_1_2_1;
     hoe = g.hoe_3_1_0;
     i18n = g.i18n_0_6_4;
     journey = g.journey_1_0_4;
     jruby_pageant = g.jruby_pageant_1_1_1;
-    jsduck = g.jsduck_4_6_2;
+    jsduck = g.jsduck_4_7_1;
     json = g.json_1_7_7;
     json_pure = g.json_pure_1_7_7;
     libv8 = g.libv8_3_3_10_4;
     macaddr = g.macaddr_1_6_1;
-    mail = g.mail_2_4_4;
+    mail = g.mail_2_5_3;
     mime_types = g.mime_types_1_21;
     minitar = g.minitar_0_5_3;
-    multi_json = g.multi_json_1_6_1;
+    multi_json = g.multi_json_1_7_2;
     multipart_post = g.multipart_post_1_2_0;
     net_sftp = g.net_sftp_2_0_5;
     net_ssh = g.net_ssh_2_6_6;
     nix = g.nix_0_1_1;
-    nokogiri = g.nokogiri_1_5_6;
+    nokogiri = g.nokogiri_1_5_9;
     papertrail = g.papertrail_0_9_7;
     papertrail_cli = g.papertrail_cli_0_9_3;
-    parallel = g.parallel_0_6_2;
+    parallel = g.parallel_0_6_3;
     polyglot = g.polyglot_0_3_3;
     rack = g.rack_1_5_2;
     rack_cache = g.rack_cache_1_2;
     rack_protection = g.rack_protection_1_5_0;
     rack_ssl = g.rack_ssl_1_3_3;
     rack_test = g.rack_test_0_6_2;
-    rails = g.rails_3_2_12;
-    railties = g.railties_3_2_12;
-    rake = g.rake_10_0_3;
+    rails = g.rails_3_2_13;
+    railties = g.railties_3_2_13;
+    rake = g.rake_10_0_4;
     rb_fsevent = g.rb_fsevent_0_9_3;
     rdiscount = g.rdiscount_2_0_7_1;
     rdoc = g.rdoc_3_12_2;
@@ -85,9 +86,9 @@ g: # Get dependencies from patched gems
     syslog_protocol = g.syslog_protocol_0_9_2;
     systemu = g.systemu_2_5_2;
     therubyracer = g.therubyracer_0_10_2;
-    thin = g.thin_1_5_0;
-    thor = g.thor_0_17_0;
-    tilt = g.tilt_1_3_5;
+    thin = g.thin_1_5_1;
+    thor = g.thor_0_18_0;
+    tilt = g.tilt_1_3_6;
     tins = g.tins_0_7_2;
     treetop = g.treetop_1_4_12;
     tzinfo = g.tzinfo_0_3_37;
@@ -130,71 +131,71 @@ installed versions.'';
       requiredGems = [  ];
       sha256 = ''16bp7rwl463m0d213rmwp4rjfwiw1bm529c518v91l18h7hcnb96'';
     };
-    actionmailer_3_2_12 = {
+    actionmailer_3_2_13 = {
       basename = ''actionmailer'';
       meta = {
         description = ''Email composition, delivery, and receiving framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         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.12'';
-      requiredGems = [ g.actionpack_3_2_12 g.mail_2_4_4 ];
-      sha256 = ''0rjcyz5p139iv7r9gb9nw6c490mksf6n3rnfxsg6bdaxpabinlc7'';
+      name = ''actionmailer-3.2.13'';
+      requiredGems = [ g.actionpack_3_2_13 g.mail_2_5_3 ];
+      sha256 = ''0ksw1b5rba8l6400qgc6zjdn14q68n6crjmm76ggg32r4wv3xn06'';
     };
-    actionpack_3_2_12 = {
+    actionpack_3_2_13 = {
       basename = ''actionpack'';
       meta = {
         description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
       };
-      name = ''actionpack-3.2.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
-      sha256 = ''19p8slf607ssvhd1xkqmk0ddhxqh99faqbgw9i0gyjh1hxyh4apk'';
+      name = ''actionpack-3.2.13'';
+      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
+      sha256 = ''1m3kd3rwa4z0yik68xi0l9q71lyzq4gdciqaw5w2w9pal1cj8y5w'';
     };
-    activemodel_3_2_12 = {
+    activemodel_3_2_13 = {
       basename = ''activemodel'';
       meta = {
         description = ''A toolkit for building modeling frameworks (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
       };
-      name = ''activemodel-3.2.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.builder_3_0_4 ];
-      sha256 = ''1w43k2yhdybrrhph87zhb9shc1j8z1ryhpqy15y7cj9gc4a1bnqf'';
+      name = ''activemodel-3.2.13'';
+      requiredGems = [ g.activesupport_3_2_13 g.builder_3_0_4 ];
+      sha256 = ''0lpc9ylwm00g66hmgj06iq51m2l234ii7k6qsjiywf9x5fq6khn5'';
     };
-    activerecord_3_2_12 = {
+    activerecord_3_2_13 = {
       basename = ''activerecord'';
       meta = {
         description = ''Object-relational mapper framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
       };
-      name = ''activerecord-3.2.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_37 ];
-      sha256 = ''0fl8iyv3gcy72y79iv4ccyck8ik02rrl3pdy7yxfhlnqgryp8syi'';
+      name = ''activerecord-3.2.13'';
+      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.arel_3_0_2 g.tzinfo_0_3_37 ];
+      sha256 = ''1z5rrjy2v27xldr24sd4sxi6k6f5anyg20kwj3qyc0jjn8c0gv85'';
     };
-    activeresource_3_2_12 = {
+    activeresource_3_2_13 = {
       basename = ''activeresource'';
       meta = {
         description = ''REST modeling framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
       };
-      name = ''activeresource-3.2.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 ];
-      sha256 = ''0dmy7n93ndxfqkccs0mv82dzkr130414djg96qi8njyj07ad84fi'';
+      name = ''activeresource-3.2.13'';
+      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 ];
+      sha256 = ''1r4ph4cqd32d4lq9bfyv1dpfxc4qndcqhqx7h7xg4p0va7dz251l'';
     };
-    activesupport_3_2_12 = {
+    activesupport_3_2_13 = {
       basename = ''activesupport'';
       meta = {
         description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
         homepage = ''http://www.rubyonrails.org'';
         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.12'';
-      requiredGems = [ g.i18n_0_6_4 g.multi_json_1_6_1 ];
-      sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg'';
+      name = ''activesupport-3.2.13'';
+      requiredGems = [ g.i18n_0_6_1 g.multi_json_1_7_2 ];
+      sha256 = ''1vailj8ja9g3s029p5qbvqdpxcis5gcpkl2d6j7a6d36hxlwlf8y'';
     };
     addressable_2_3_3 = {
       basename = ''addressable'';
@@ -270,7 +271,7 @@ rails support and extra plugins for migrations and fixtures.'';
         longDescription = ''AWS SDK for Ruby'';
       };
       name = ''aws-sdk-1.8.5'';
-      requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ];
+      requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_9 g.json_1_7_7 ];
       sha256 = ''0rhkkkfsw0qzckn99mnvpbnl7b1kysma3x8bbqwah2x438kwygpb'';
     };
     bitbucket_backup_0_2_2 = {
@@ -281,7 +282,7 @@ rails support and extra plugins for migrations and fixtures.'';
         longDescription = ''A tool to backup Bitbucket repos.'';
       };
       name = ''bitbucket-backup-0.2.2'';
-      requiredGems = [ g.highline_1_6_15 g.json_1_7_7 ];
+      requiredGems = [ g.highline_1_6_16 g.json_1_7_7 ];
       sha256 = ''1kzg6pkzw04n96i6mhb74gpg4c899wly5fc2m1y6m2xvn71qksys'';
     };
     builder_3_0_4 = {
@@ -332,7 +333,7 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''0f2cpfx6lpazb1wrz3lf06qp6f0qf0gdq5z8xnhkplc3fz3kslb0'';
     };
-    buildr_1_4_10 = {
+    buildr_1_4_11 = {
       basename = ''buildr'';
       meta = {
         description = ''Build like you code'';
@@ -344,9 +345,9 @@ to do, and it takes care of the rest.  But also something we can easily extend
 for those one-off tasks, with a language that's a joy to use.
 '';
       };
-      name = ''buildr-1.4.10'';
+      name = ''buildr-1.4.11'';
       requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_4 ];
-      sha256 = ''1x192r8ab5zr9rlp1i9b3pi3y74f9pj2w491wkgshgwj22akh6vn'';
+      sha256 = ''0bdrwl9jvxc5h2wqsyacr688hxvzcqan1bhqyryb5bg9a5gpscb4'';
     };
     bundler_1_3_4 = {
       basename = ''bundler'';
@@ -367,7 +368,7 @@ for those one-off tasks, with a language that's a joy to use.
         longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
       };
       name = ''childprocess-0.3.9'';
-      requiredGems = [ g.ffi_1_4_0 ];
+      requiredGems = [ g.ffi_1_6_0 ];
       sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d'';
     };
     chronic_0_9_1 = {
@@ -492,6 +493,17 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.eventmachine_1_0_3 ];
       sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
     };
+    execjs_1_4_0 = {
+      basename = ''execjs'';
+      meta = {
+        description = ''Run JavaScript code from Ruby'';
+        homepage = ''https://github.com/sstephenson/execjs'';
+        longDescription = ''ExecJS lets you run JavaScript code from Ruby.'';
+      };
+      name = ''execjs-1.4.0'';
+      requiredGems = [ g.multi_json_1_7_2 ];
+      sha256 = ''0b69ci2afbcdqsri3i89a7s7j7palxsxdb65x6h2wx79kzlc5xcs'';
+    };
     fakes3_0_1_5 = {
       basename = ''fakes3'';
       meta = {
@@ -499,18 +511,18 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3'';
       };
       name = ''fakes3-0.1.5'';
-      requiredGems = [ g.thor_0_17_0 g.builder_3_2_0 ];
+      requiredGems = [ g.thor_0_18_0 g.builder_3_2_0 ];
       sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
     };
-    faraday_0_8_6 = {
+    faraday_0_8_7 = {
       basename = ''faraday'';
       meta = {
         description = ''HTTP/REST API client library.'';
         homepage = ''https://github.com/lostisland/faraday'';
       };
-      name = ''faraday-0.8.6'';
+      name = ''faraday-0.8.7'';
       requiredGems = [ g.multipart_post_1_2_0 ];
-      sha256 = ''16jd0gnqfrh5v4v88nlasyjjm8cmf2w2p6gphxq64mvdxlcdy5jy'';
+      sha256 = ''186a9md3ixanl2crdlw37kspw5wiyw16z9mj3aw8rd1yd5q56ddi'';
     };
     faraday_middleware_0_8_8 = {
       basename = ''faraday_middleware'';
@@ -520,19 +532,19 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Various middleware for Faraday'';
       };
       name = ''faraday_middleware-0.8.8'';
-      requiredGems = [ g.faraday_0_8_6 ];
+      requiredGems = [ g.faraday_0_8_7 ];
       sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz'';
     };
-    ffi_1_4_0 = {
+    ffi_1_6_0 = {
       basename = ''ffi'';
       meta = {
         description = ''Ruby FFI'';
         homepage = ''http://wiki.github.com/ffi/ffi'';
         longDescription = ''Ruby FFI library'';
       };
-      name = ''ffi-1.4.0'';
+      name = ''ffi-1.6.0'';
       requiredGems = [  ];
-      sha256 = ''06a29qvg487yk9pyi7wzyj5700mf7s3mjdqc6dsrh0467mjj9768'';
+      sha256 = ''0jhjzj8gb6cakv32a6czgrx8krb0hx8mmkwh5yv2lhdcv3ak013v'';
     };
     file_tail_1_0_12 = {
       basename = ''file_tail'';
@@ -553,10 +565,10 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Process manager for applications with multiple components'';
       };
       name = ''foreman-0.62.0'';
-      requiredGems = [ g.thor_0_17_0 ];
+      requiredGems = [ g.thor_0_18_0 ];
       sha256 = ''08i34rgs3bydk52zwpps4p0y2fvcnibp9lvfdhr75ppin7wv7lmr'';
     };
-    highline_1_6_15 = {
+    highline_1_6_16 = {
       basename = ''highline'';
       meta = {
         description = ''HighLine is a high-level command-line IO library.'';
@@ -567,9 +579,9 @@ crank out anything from simple list selection to complete shells with just
 minutes of work.
 '';
       };
-      name = ''highline-1.6.15'';
+      name = ''highline-1.6.16'';
       requiredGems = [  ];
-      sha256 = ''1ilwlgylv92md9dnw6hqhrw8hiwk3f4k8qz6airqjp1rq9r594m1'';
+      sha256 = ''1v9dps96hryg7c8hqw41vbm1q02d7wpq7fj1c3bkzsd5518idgzi'';
     };
     highline_1_6_2 = {
       basename = ''highline'';
@@ -617,6 +629,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [ g.rake_0_9_6 ];
       sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp'';
     };
+    i18n_0_6_1 = {
+      basename = ''i18n'';
+      meta = {
+        description = ''New wave Internationalization support for Ruby'';
+        homepage = ''http://github.com/svenfuchs/i18n'';
+        longDescription = ''New wave Internationalization support for Ruby.'';
+      };
+      name = ''i18n-0.6.1'';
+      requiredGems = [  ];
+      sha256 = ''0x3lhp1vl1k4dfqx6k93hhxcpjkz57y8cf007ws7p845ywk6ibfl'';
+    };
     i18n_0_6_4 = {
       basename = ''i18n'';
       meta = {
@@ -650,16 +673,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
     };
-    jsduck_4_6_2 = {
+    jsduck_4_7_1 = {
       basename = ''jsduck'';
       meta = {
         description = ''Simple JavaScript Duckumentation generator'';
         homepage = ''https://github.com/senchalabs/jsduck'';
         longDescription = ''Documentation generator for Sencha JS frameworks'';
       };
-      name = ''jsduck-4.6.2'';
-      requiredGems = [ g.rdiscount_2_0_7_1 g.json_1_7_7 g.parallel_0_6_2 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
-      sha256 = ''035w4igfa6yy6234ff4zbiqfjn0bhwqs6k8kji52l7gzgskwmzln'';
+      name = ''jsduck-4.7.1'';
+      requiredGems = [ g.rdiscount_2_0_7_1 g.json_1_7_7 g.parallel_0_6_3 g.execjs_1_4_0 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
+      sha256 = ''0yn568ix4j4xpyrsk07cp5c3migsl7ymlg07fsyn5a65yrwyaiyv'';
     };
     json_1_7_7 = {
       basename = ''json'';
@@ -716,16 +739,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [ g.systemu_2_5_2 ];
       sha256 = ''1vd9l1d0lc0sq3rn1ya816wrzgxxqdzq6pgq0y0435qm6ikwy7ch'';
     };
-    mail_2_4_4 = {
+    mail_2_5_3 = {
       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.4'';
+      name = ''mail-2.5.3'';
       requiredGems = [ g.mime_types_1_21 g.treetop_1_4_12 g.i18n_0_6_4 ];
-      sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3'';
+      sha256 = ''1afr3acz7vsvr4gp6wnrkw1iwbjhf14mh8g8mlm40r86wcwzr39k'';
     };
     mime_types_1_21 = {
       basename = ''mime_types'';
@@ -770,16 +793,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
     };
-    multi_json_1_6_1 = {
+    multi_json_1_7_2 = {
       basename = ''multi_json'';
       meta = {
         description = ''A gem to provide swappable JSON backends.'';
         homepage = ''http://github.com/intridea/multi_json'';
         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.6.1'';
+      name = ''multi_json-1.7.2'';
       requiredGems = [  ];
-      sha256 = ''0p33swcl9i97wvv0cq9jkdl8q7xbc3j07apy35vsgldnhw99krcg'';
+      sha256 = ''17mfs58bilkn2b9g3ggh6pz1w4c2a72mqsr6zf0qd8vahw5h158q'';
     };
     multipart_post_1_2_0 = {
       basename = ''multipart_post'';
@@ -836,7 +859,7 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k'';
     };
-    nokogiri_1_5_6 = {
+    nokogiri_1_5_9 = {
       basename = ''nokogiri'';
       meta = {
         description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser'';
@@ -847,9 +870,9 @@ many features is the ability to search documents via XPath or CSS3 selectors.
 XML is like violence - if it doesn’t solve your problems, you are not using
 enough of it.'';
       };
-      name = ''nokogiri-1.5.6'';
+      name = ''nokogiri-1.5.9'';
       requiredGems = [  ];
-      sha256 = ''1235h8k242f6yi5qgb8rfcx6gp7g99djwqgrz0vb6w12pbp9kar8'';
+      sha256 = ''08qx4p3p6dd1yh58c4waz5rjmkzv3v315fr0l6n0dgkg71dczbi9'';
     };
     papertrail_0_9_7 = {
       basename = ''papertrail'';
@@ -859,7 +882,7 @@ enough of it.'';
         longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
       };
       name = ''papertrail-0.9.7'';
-      requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_6 g.faraday_middleware_0_8_8 ];
+      requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ];
       sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr'';
     };
     papertrail_cli_0_9_3 = {
@@ -873,15 +896,15 @@ enough of it.'';
       requiredGems = [ g.papertrail_0_9_7 ];
       sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv'';
     };
-    parallel_0_6_2 = {
+    parallel_0_6_3 = {
       basename = ''parallel'';
       meta = {
         description = ''Run any kind of code in parallel processes'';
-        homepage = ''http://github.com/grosser/parallel'';
+        homepage = ''https://github.com/grosser/parallel'';
       };
-      name = ''parallel-0.6.2'';
+      name = ''parallel-0.6.3'';
       requiredGems = [  ];
-      sha256 = ''05rdbb1jqv0179wjfj74a1739rsqv7ijf4jp1i5s6lzh878c6l6p'';
+      sha256 = ''17mg4vfx1c4z7399azf982a3cn522m43kavdqfhfs6i89m7z0l9n'';
     };
     polyglot_0_3_3 = {
       basename = ''polyglot'';
@@ -981,27 +1004,27 @@ request helpers feature.'';
       requiredGems = [ g.rack_1_5_2 ];
       sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky'';
     };
-    rails_3_2_12 = {
+    rails_3_2_13 = {
       basename = ''rails'';
       meta = {
         description = ''Full-stack web application framework.'';
         homepage = ''http://www.rubyonrails.org'';
         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.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_4 ];
-      sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz'';
+      name = ''rails-3.2.13'';
+      requiredGems = [ g.activesupport_3_2_13 g.actionpack_3_2_13 g.activerecord_3_2_13 g.activeresource_3_2_13 g.actionmailer_3_2_13 g.railties_3_2_13 g.bundler_1_3_4 ];
+      sha256 = ''1f5w4ivy0jxpjf1gkav064i0gd5x9xqnznwrkbc3slc9savprifz'';
     };
-    railties_3_2_12 = {
+    railties_3_2_13 = {
       basename = ''railties'';
       meta = {
         description = ''Tools for creating, working with, and running Rails applications.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
       };
-      name = ''railties-3.2.12'';
-      requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_2 g.activesupport_3_2_12 g.actionpack_3_2_12 ];
-      sha256 = ''0d8wy1n591x12bigj3jh8c9djzi8k68vh14342mc22raxwp5rwdw'';
+      name = ''railties-3.2.13'';
+      requiredGems = [ g.rake_10_0_4 g.rack_ssl_1_3_3 g.thor_0_18_0 g.rdoc_3_12_2 g.activesupport_3_2_13 g.actionpack_3_2_13 ];
+      sha256 = ''01wbqfnlrs9nbs0b97dbxh7aap2bma7my530pcggxdf8ckms8kr9'';
     };
     rake_0_9_2_2 = {
       basename = ''rake'';
@@ -1025,16 +1048,16 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc'';
     };
-    rake_10_0_3 = {
+    rake_10_0_4 = {
       basename = ''rake'';
       meta = {
         description = ''Ruby based make-like utility.'';
         homepage = ''http://rake.rubyforge.org'';
         longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.'';
       };
-      name = ''rake-10.0.3'';
+      name = ''rake-10.0.4'';
       requiredGems = [  ];
-      sha256 = ''09vvf3ylhdkr10vz7ajl3c7ql6dsnzkh3qclpafar433bzadfbpf'';
+      sha256 = ''032z0csyi5bjfgzq3winvqvi9fpf3bfx518hzzapkfy90y702ds1'';
     };
     rb_fsevent_0_9_3 = {
       basename = ''rb_fsevent'';
@@ -1202,7 +1225,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
         longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
       };
       name = ''selenium-webdriver-2.31.0'';
-      requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
+      requiredGems = [ g.multi_json_1_7_2 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
       sha256 = ''1nv3ff31g183kdb97jjz0y7ny3vdnccd09pgblpj87bzhrrdfv3r'';
     };
     servolux_0_10_0 = {
@@ -1227,7 +1250,7 @@ interpreters.'';
         longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
       };
       name = ''sinatra-1.3.2'';
-      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_5 ];
+      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_6 ];
       sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc'';
     };
     sprockets_2_2_2 = {
@@ -1238,7 +1261,7 @@ interpreters.'';
         longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
       };
       name = ''sprockets-2.2.2'';
-      requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_5 ];
+      requiredGems = [ g.hike_1_2_1 g.multi_json_1_7_2 g.rack_1_5_2 g.tilt_1_3_6 ];
       sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
     };
     syslog_protocol_0_9_2 = {
@@ -1274,38 +1297,38 @@ interpreters.'';
       requiredGems = [ g.libv8_3_3_10_4 ];
       sha256 = ''111hm2l613v06sy7pzjzmnyi4x11rg3c2syhnpv8fn0wnn9rdiyb'';
     };
-    thin_1_5_0 = {
+    thin_1_5_1 = {
       basename = ''thin'';
       meta = {
         description = ''A thin and fast web server'';
         homepage = ''http://code.macournoyer.com/thin/'';
         longDescription = ''A thin and fast web server'';
       };
-      name = ''thin-1.5.0'';
+      name = ''thin-1.5.1'';
       requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ];
-      sha256 = ''14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1'';
+      sha256 = ''0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga'';
     };
-    thor_0_17_0 = {
+    thor_0_18_0 = {
       basename = ''thor'';
       meta = {
         description = ''A scripting framework that replaces rake, sake and rubigen'';
         homepage = ''http://whatisthor.com/'';
         longDescription = ''A scripting framework that replaces rake, sake and rubigen'';
       };
-      name = ''thor-0.17.0'';
+      name = ''thor-0.18.0'';
       requiredGems = [  ];
-      sha256 = ''0gf46qafcfgmi20a2mnb3wkd9y6spgy2hq22h70377daj4zjxla2'';
+      sha256 = ''0m7pl518j5q1ymgxmsi6xfjp6k40mwbmzk33s760v53azwxkfxan'';
     };
-    tilt_1_3_5 = {
+    tilt_1_3_6 = {
       basename = ''tilt'';
       meta = {
         description = ''Generic interface to multiple Ruby template engines'';
         homepage = ''http://github.com/rtomayko/tilt/'';
         longDescription = ''Generic interface to multiple Ruby template engines'';
       };
-      name = ''tilt-1.3.5'';
+      name = ''tilt-1.3.6'';
       requiredGems = [  ];
-      sha256 = ''081saxdxnal4ky38a904jw3n2837m80g211w0zm5rx6m712mb6qd'';
+      sha256 = ''1yz6zfnwq0qyjn71115vd63ly8zm1jss0b2v7fbcbzzj9lrnq9y6'';
     };
     tins_0_7_2 = {
       basename = ''tins'';

From 0866ec1aa7679d2683469f301d5e6ccbcddd39f2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 28 Mar 2013 09:52:27 -0400
Subject: [PATCH 238/394] Add the nix-build `result' symlink and cpan files to
 gitignore

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4bcac5d261e1..b2d5a9aa5bd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 ,*
 .*.swp
 .*.swo
+cpan-info
+cpan_tmp/
+result

From f39310b525cc48f05eb6f025ec565a4722ed4f57 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 28 Mar 2013 09:59:18 -0400
Subject: [PATCH 239/394] Add right_aws gem

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../interpreters/ruby/generated.nix           | 71 ++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 13ee31bf44f3..d4bb7fa4f2d1 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -71,6 +71,8 @@ g: # Get dependencies from patched gems
     rdiscount = g.rdiscount_2_0_7_1;
     rdoc = g.rdoc_3_12_2;
     remote_syslog = g.remote_syslog_1_6_13;
+    right_aws = g.right_aws_3_0_5;
+    right_http_connection = g.right_http_connection_1_3_0;
     rjb = g.rjb_1_4_6;
     rspec = g.rspec_2_11_0;
     rspec_core = g.rspec_core_2_11_1;
@@ -98,7 +100,7 @@ g: # Get dependencies from patched gems
     xml_simple = g.xml_simple_1_1_1;
     yajl_ruby = g.yajl_ruby_1_1_0;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
   gems = {
     ZenTest_4_9_0 = {
       basename = ''ZenTest'';
@@ -1106,6 +1108,73 @@ See RDoc for a description of RDoc's markup and basic use.'';
       requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
       sha256 = ''0q35j02k2l3fw3fdzq0i3rd6chsqr982gj13f3m3lsxm7kms03nw'';
     };
+    right_aws_3_0_5 = {
+      basename = ''right_aws'';
+      meta = {
+        description = ''The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.'';
+        longDescription = ''== DESCRIPTION:
+
+The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.
+These gems have been used in production by RightScale since late 2006 and are being maintained to track enhancements made by Amazon.
+The RightScale AWS gems comprise:
+
+- RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) and the
+  associated EBS (Elastic Block Store)
+- RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service)
+- RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service) (API version 2007-05-01)
+- RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service) (API version 2008-01-01)
+- RightAws::SdbInterface and RightAws::ActiveSdb -- interface to Amazon SDB (SimpleDB)
+- RightAws::AcfInterface -- interface to Amazon CloudFront, a content distribution service
+
+== FEATURES:
+
+- Full programmmatic access to EC2, EBS, S3, SQS, SDB, and CloudFront.
+- Complete error handling: all operations check for errors and report complete
+  error information by raising an AwsError.
+- Persistent HTTP connections with robust network-level retry layer using
+  RightHttpConnection).  This includes socket timeouts and retries.
+- Robust HTTP-level retry layer.  Certain (user-adjustable) HTTP errors returned
+  by Amazon's services are classified as temporary errors.
+  These errors are automaticallly retried using exponentially increasing intervals.
+  The number of retries is user-configurable.
+- Fast REXML-based parsing of responses (as fast as a pure Ruby solution allows).
+- Uses libxml (if available) for faster response parsing.
+- Support for large S3 list operations.  Buckets and key subfolders containing
+  many (&gt; 1000) keys are listed in entirety.  Operations based on list (like
+  bucket clear) work on arbitrary numbers of keys.
+- Support for streaming GETs from S3, and streaming PUTs to S3 if the data source is a file.
+- Support for single-threaded usage, multithreaded usage, as well as usage with multiple
+  AWS accounts.
+- Support for both first- and second-generation SQS (API versions 2007-05-01
+  and 2008-01-01).  These versions of SQS are not compatible.
+- Support for signature versions 0 and 1 on SQS, SDB, and EC2.
+- Interoperability with any cloud running Eucalyptus (http://eucalyptus.cs.ucsb.edu)
+- Test suite (requires AWS account to do "live" testing).
+'';
+      };
+      name = ''right_aws-3.0.5'';
+      requiredGems = [ g.right_http_connection_1_3_0 ];
+      sha256 = ''0pxdmxmqiidy3dpxsp4l0b1l6nq9b1sh4p1gkzalqm4l24646h4k'';
+    };
+    right_http_connection_1_3_0 = {
+      basename = ''right_http_connection'';
+      meta = {
+        description = ''RightScale's robust HTTP/S connection module'';
+        homepage = ''http://rightscale.rubyforge.org/'';
+        longDescription = ''Rightscale::HttpConnection is a robust HTTP/S library.  It implements a retry
+algorithm for low-level network errors.
+
+== FEATURES:
+
+- provides put/get streaming
+- does configurable retries on connect and read timeouts, DNS failures, etc.
+- HTTPS certificate checking
+'';
+      };
+      name = ''right_http_connection-1.3.0'';
+      requiredGems = [  ];
+      sha256 = ''0900zy2ya57vhxdkdm2gj7xmvzj4gwm5l7ad0lh68ka3vxhdi7ap'';
+    };
     rjb_1_4_2 = {
       basename = ''rjb'';
       meta = {

From cfbdb33197b83c49f87d68a4a9b848afe213bc75 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 28 Mar 2013 10:59:40 -0400
Subject: [PATCH 240/394] Add a latest linuxPackages for living on the edge

Theoretically this could be automatically detected by finding all
packages named 'linux' and choosing the latest, but that's overkill.
Just update it when a new kernel is added.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c75a98a6f24d..adeea8c13381 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6030,6 +6030,8 @@ let
   linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi);
   linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7);
   linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8);
+  # Update this when adding a new version!
+  linuxPackages_latest = pkgs.linuxPackages_3_8;
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;

From 65057975c82608b22aeb8701a151a6b7adf332ef Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Thu, 28 Mar 2013 17:19:04 +0100
Subject: [PATCH 241/394] xbmc: bump to 12.1

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

diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix
index 0588f580cc25..0a09fe30ace0 100644
--- a/pkgs/applications/video/xbmc/default.nix
+++ b/pkgs/applications/video/xbmc/default.nix
@@ -30,11 +30,11 @@ assert sambaSupport -> samba != null;
 assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
 
 stdenv.mkDerivation rec {
-    name = "xbmc-12.0";
+    name = "xbmc-12.1";
 
     src = fetchurl {
       url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz";
-      sha256 = "0vy1a38gfbp9vhbjvwqm11sd76gl3s9q0h7gwpsks85m2k88q0ak";
+      sha256 = "1hqyq1vl34sywcj8zgx7kdpf8ljzj969l5w6yy4314c431pg7qr9";
     };
 
     buildInputs = [

From 4b1042cf02fe4df4c7bc2b97f372d51c3247b209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 27 Mar 2013 20:18:45 +0100
Subject: [PATCH 242/394] pitz: new package

pitz is a distributed bug tracker, inspired by ditz. Homepage:
http://pitz.tplus1.com/

pitz has a command line interface, pitz-<command>, and a webapp,
pitz-webapp.

TODO: pitz has a pitz-shell utility that depends on ipython, but when I
enabled it it raised an exception. I think it depends on an old IPython
version:

  from IPython.Shell import IPShellEmbed
  ImportError: No module named Shell

A broken pitz-shell doesn't affect the rest of the command line
interface nor the webapp, so it is not critical to have it working.

There are not many distributed bug trackers out there, so I hope that
adding pitz to nixpkgs may inspire people to support pitz (or similar
software).
---
 pkgs/applications/misc/pitz/default.nix | 31 +++++++++++++++++++++++++
 pkgs/top-level/python-packages.nix      | 23 ++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/applications/misc/pitz/default.nix

diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix
new file mode 100644
index 000000000000..495583d95d4b
--- /dev/null
+++ b/pkgs/applications/misc/pitz/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, buildPythonPackage, tempita, jinja2, pyyaml, clepy, mock
+, nose, decorator, docutils }:
+
+# TODO: pitz has a pitz-shell utility that depends on ipython, but it just
+# errors out and dies (it probably depends on an old ipython version):
+#
+#   from IPython.Shell import IPShellEmbed
+#   ImportError: No module named Shell
+#
+# pitz-shell is not the primary interface, so it is not critical to have it
+# working. Concider fixing pitz upstream.
+
+buildPythonPackage rec {
+  name = "pitz-1.2.4";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "http://pypi.python.org/packages/source/p/pitz/${name}.tar.gz";
+    sha256 = "1k7f3h4acllzqy3mjqnjd4w5jskp03s79b7dx3c85vlmd7824smr";
+  };
+
+  # propagatedBuildInputs is needed for pitz to find its dependencies at
+  # runtime. If we use buildInputs it would just build, not run.
+  propagatedBuildInputs = [ tempita jinja2 pyyaml clepy mock nose decorator docutils ];
+
+  meta = {
+    description = "Distributed bugtracker";
+    license = stdenv.lib.licenses.bsd3;
+    homepage = http://pitz.tplus1.com/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9c816188b715..cd4ae54f4e0f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -58,6 +58,11 @@ pythonPackages = python.modules // rec {
     inherit python buildPythonPackage;
   };
 
+  pitz = import ../applications/misc/pitz {
+    inherit (pkgs) stdenv fetchurl;
+    inherit buildPythonPackage tempita jinja2 pyyaml clepy mock nose decorator docutils;
+  };
+
   pycairo = import ../development/python-modules/pycairo {
     inherit (pkgs) stdenv fetchurl pkgconfig cairo x11;
     inherit python;
@@ -534,6 +539,24 @@ pythonPackages = python.modules // rec {
     };
   });
 
+
+  clepy = buildPythonPackage rec {
+    name = "clepy-0.3.20";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/c/clepy/${name}.tar.gz";
+      sha256 = "16vibfxms5z4ld8gbkra6dkhqm2cc3jnn0fwp7mw70nlwxnmm51c";
+    };
+
+    buildInputs = [ mock nose decorator ];
+
+    meta = {
+      homepage = http://code.google.com/p/clepy/;
+      description = "Utilities created by the Cleveland Python users group";
+    };
+  };
+
+
   clientform = buildPythonPackage (rec {
     name = "clientform-0.2.10";
 

From c98af108d00d0adbb2ff9549df54149fefd71f5e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Mar 2013 18:04:49 +0100
Subject: [PATCH 243/394] libvirt: Update to 1.0.3

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index ce714fd59ffc..6a6b693cbbe0 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -3,14 +3,14 @@
 , libtasn1, ebtables, libgcrypt, yajl
 }:
 
-let version = "1.0.2"; in
+let version = "1.0.3"; in
 
 stdenv.mkDerivation {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    sha256 = "0yf104r1377pg0kmx6sshmh8v5z0bdvv6266y5gbcn46yx92g34v";
+    sha256 = "0mr727n0ygxk6y69srg3ahmjd7wligamw683x2snmz6wgk6llkzn";
   };
 
   buildInputs =
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 
   postInstall =
     ''
-      substituteInPlace $out/etc/rc.d/init.d/libvirt-guests \
+      substituteInPlace $out/libexec/libvirt-guests.sh \
         --replace "$out/bin" "${gettext}/bin"
     '';
 

From 3abc3f4a6899e5cbb013a18e81ed9360910d0332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 28 Mar 2013 18:12:27 +0100
Subject: [PATCH 244/394] Updating mupen64plus, and adding a GUI for it.

I can't say the GUI works very well... it doesn't find the core properly,
but I couldn't find why.
---
 pkgs/misc/emulators/mupen64plus/default.nix   | 22 ++++-----------
 pkgs/misc/emulators/wxmupen64plus/default.nix | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/misc/emulators/wxmupen64plus/default.nix

diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
index d67121fe430a..0f59da272ff9 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -1,28 +1,16 @@
 {stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}:
 
 stdenv.mkDerivation {
-  name = "mupen64plus-1.5";
+  name = "mupen64plus-1.99.5";
   src = fetchurl {
-    url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz;
-    sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq";
+    url = https://mupen64plus.googlecode.com/files/mupen64plus-bundle-src-1.99.5.tar.gz;
+    sha1 = "ca80ae446c9591e272e3ec93f0a2a8b01cfcd34e";
   };
   
   buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ];
   
-  preConfigure = ''
-    # Some C++ incompatibility fixes
-    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp
-    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp
-
-    # Fix some hardcoded paths
-    sed -i -e "s|/usr/local|$out|g" main/main.c
-
-    # Remove PATH environment variable from install script
-    sed -i -e "s|export PATH=|#export PATH=|" ./install.sh
-  '';
-  
-  buildPhase = "make all";
-  installPhase = "PREFIX=$out make install";
+  buildPhase = "./m64p_build.sh PREFIX=$out COREDIR=$out/lib/ PLUGINDIR=$out/lib/mupen64plus/ SHAREDIR=$out/share/mupen64plus/";
+  installPhase = "./m64p_install.sh PREFIX=$out";
   
   meta = {
     description = "A Nintendo 64 Emulator";
diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix
new file mode 100644
index 000000000000..a85d0fb389e2
--- /dev/null
+++ b/pkgs/misc/emulators/wxmupen64plus/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, mesa}:
+
+stdenv.mkDerivation {
+  name = "wxmupen64plus-0.3";
+  src = fetchurl {
+    url = "https://bitbucket.org/auria/wxmupen64plus/get/0.3.tar.bz2";
+    sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c";
+  };
+  
+  buildInputs = [ python wxGTK29 SDL libX11 mesa ];
+
+  configurePhase = ''
+    tar xf ${mupen64plus.src}
+    APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api)
+    export CXXFLAGS="-I${libX11}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\""
+    export LDFLAGS="-lwx_gtk2u_adv-2.9"
+    python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out
+  '';
+
+  buildPhase = "python waf";
+  installPhase = "python waf install";
+  
+  meta = {
+    description = "GUI for the Mupen64Plus 2.0 emulator";
+    license = "GPLv2+";
+    homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index adeea8c13381..15b1aeb4394e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8876,6 +8876,8 @@ let
 
   mupen64plus = callPackage ../misc/emulators/mupen64plus { };
 
+  wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };
+
   nix = nixStable;
 
   nixStable = callPackage ../tools/package-management/nix {

From 5f677039c77a4d9c6fcbe9b99980eab34fae65f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 28 Mar 2013 18:16:40 +0100
Subject: [PATCH 245/394] Adding back the 1.5 expression of mupen64plus

It has a GUI, for example.
---
 pkgs/misc/emulators/mupen64plus/1.5.nix     | 33 +++++++++++++++++++++
 pkgs/misc/emulators/mupen64plus/default.nix | 22 ++++++++++----
 pkgs/top-level/all-packages.nix             |  4 ++-
 3 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/misc/emulators/mupen64plus/1.5.nix

diff --git a/pkgs/misc/emulators/mupen64plus/1.5.nix b/pkgs/misc/emulators/mupen64plus/1.5.nix
new file mode 100644
index 000000000000..d67121fe430a
--- /dev/null
+++ b/pkgs/misc/emulators/mupen64plus/1.5.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}:
+
+stdenv.mkDerivation {
+  name = "mupen64plus-1.5";
+  src = fetchurl {
+    url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz;
+    sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq";
+  };
+  
+  buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ];
+  
+  preConfigure = ''
+    # Some C++ incompatibility fixes
+    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp
+    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp
+
+    # Fix some hardcoded paths
+    sed -i -e "s|/usr/local|$out|g" main/main.c
+
+    # Remove PATH environment variable from install script
+    sed -i -e "s|export PATH=|#export PATH=|" ./install.sh
+  '';
+  
+  buildPhase = "make all";
+  installPhase = "PREFIX=$out make install";
+  
+  meta = {
+    description = "A Nintendo 64 Emulator";
+    license = "GPLv2+";
+    homepage = http://code.google.com/p/mupen64plus;
+    maintainers = [ stdenv.lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
index 0f59da272ff9..d67121fe430a 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -1,16 +1,28 @@
 {stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}:
 
 stdenv.mkDerivation {
-  name = "mupen64plus-1.99.5";
+  name = "mupen64plus-1.5";
   src = fetchurl {
-    url = https://mupen64plus.googlecode.com/files/mupen64plus-bundle-src-1.99.5.tar.gz;
-    sha1 = "ca80ae446c9591e272e3ec93f0a2a8b01cfcd34e";
+    url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz;
+    sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq";
   };
   
   buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ];
   
-  buildPhase = "./m64p_build.sh PREFIX=$out COREDIR=$out/lib/ PLUGINDIR=$out/lib/mupen64plus/ SHAREDIR=$out/share/mupen64plus/";
-  installPhase = "./m64p_install.sh PREFIX=$out";
+  preConfigure = ''
+    # Some C++ incompatibility fixes
+    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp
+    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp
+
+    # Fix some hardcoded paths
+    sed -i -e "s|/usr/local|$out|g" main/main.c
+
+    # Remove PATH environment variable from install script
+    sed -i -e "s|export PATH=|#export PATH=|" ./install.sh
+  '';
+  
+  buildPhase = "make all";
+  installPhase = "PREFIX=$out make install";
   
   meta = {
     description = "A Nintendo 64 Emulator";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b1aeb4394e..bfb1d8a4e827 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8876,7 +8876,7 @@ let
 
   mupen64plus = callPackage ../misc/emulators/mupen64plus { };
 
-  wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };
+  mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { };
 
   nix = nixStable;
 
@@ -9065,6 +9065,8 @@ let
     inherit (gnome2) zenity;
   };
 
+  wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };
+
   x2x = callPackage ../tools/X11/x2x { };
 
   xosd = callPackage ../misc/xosd { };

From e48bbe4c391f69d3b4fd4773a0aa2a5e42562c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 28 Mar 2013 18:34:36 +0100
Subject: [PATCH 246/394] wpa_supplicant: Making a remote patch local.

upstream is down
---
 pkgs/os-specific/linux/wpa_supplicant/default.nix |  8 +-------
 pkgs/os-specific/linux/wpa_supplicant/libnl.patch | 13 +++++++++++++
 2 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/os-specific/linux/wpa_supplicant/libnl.patch

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index b3d94e26396e..8f441303c255 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -38,13 +38,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  patches =
-    [ (fetchurl {
-        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/hostap_allow-linking-with-libnl-3.2.patch?h=packages/wpa_supplicant";
-        name = "hostap_allow-linking-with-libnl-3.2.patch";
-        sha256 = "0iwvjq0apc6mv1r03k5pnyjgda3q47yx36c4lqvv8i8q1vn7kbf2";
-      })
-    ];
+  patches = [ ./libnl.patch ];
 
   postInstall = ''
     mkdir -p $out/share/man/man5 $out/share/man/man8
diff --git a/pkgs/os-specific/linux/wpa_supplicant/libnl.patch b/pkgs/os-specific/linux/wpa_supplicant/libnl.patch
new file mode 100644
index 000000000000..ede6dad721c5
--- /dev/null
+++ b/pkgs/os-specific/linux/wpa_supplicant/libnl.patch
@@ -0,0 +1,13 @@
+diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak
+--- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo	2012-03-02 16:11:43.176448714 -0600
++++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak	2012-03-02 16:12:29.759866341 -0600
+@@ -48,7 +48,7 @@ NEED_RFKILL=y
+ ifdef CONFIG_LIBNL32
+   DRV_LIBS += -lnl-3
+   DRV_LIBS += -lnl-genl-3
+-  DRV_CFLAGS += -DCONFIG_LIBNL20
++  DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0`
+ else
+   ifdef CONFIG_LIBNL_TINY
+     DRV_LIBS += -lnl-tiny
+

From 0ad1f787601d8861fe56f9b79976f52f8e073305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 28 Mar 2013 22:57:05 +0100
Subject: [PATCH 247/394] Python3: fix the download URL

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

diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 7baecad76c6b..d81033a59139 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
+    url = "http://www.python.org/ftp/python/3.3.1/Python-${version}.tar.bz2";
     sha256 = "1pnsbdzbd3750jcy32sv1760lv7am4x3f33jn1kmdmd82za279gv";
   };
 

From 67ce79f5e42b3dbf5fe3ff6099403e81b3f851df Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 29 Mar 2013 13:27:04 +0100
Subject: [PATCH 248/394] set platforms for i3wm

---
 pkgs/applications/window-managers/i3/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 4173660f542d..9f9aaa5d6653 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     homepage = "http://i3wm.org";
     maintainers = [ stdenv.lib.maintainers.garbas ];
     license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
   };
 
 }

From 4926ad90e7f917514bcd79a2d555721f00b72bec Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 29 Mar 2013 02:06:34 +0100
Subject: [PATCH 249/394] adding lprof

---
 pkgs/tools/graphics/lprof/default.nix     | 46 +++++++++++++++++++++++
 pkgs/tools/graphics/lprof/lcms-1.17.patch | 13 +++++++
 pkgs/top-level/all-packages.nix           |  2 +
 3 files changed, 61 insertions(+)
 create mode 100644 pkgs/tools/graphics/lprof/default.nix
 create mode 100644 pkgs/tools/graphics/lprof/lcms-1.17.patch

diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix
new file mode 100644
index 000000000000..31eaebc0fa1c
--- /dev/null
+++ b/pkgs/tools/graphics/lprof/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, scons, qt3, lcms1, libtiff, vigra }:
+
+/*  how to calibrate your monitor:
+    Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles
+*/
+stdenv.mkDerivation {
+  name = "lprof-1.11.4.1";
+  buildInputs = [ scons qt3 lcms1 libtiff vigra ];
+
+  preConfigure = ''
+    export QTDIR=${qt3}
+    export qt_directory=${qt3}
+  '';
+
+  src = fetchurl {
+    url = mirror://sourceforge/lprof/lprof/lprof-1.11.4/lprof-1.11.4.1.tar.gz;
+    sha256 = "0q8x24fm5yyvm151xrl3l03p7hvvciqnkbviprfnvlr0lyg9wsrn";
+  };
+
+  # The sed commands disable header checks and add LDFLAGS NIX_CFLAGS_COMPILE
+  # to the gcc environment
+  buildPhase = ''
+    mkdir -p $out
+    export CXX=g++
+    sed -i  SConstruct \
+     -e 's/def CheckForQt(context):/def CheckForQt(context):\n  return 1/' \
+     -e "s/not config.CheckHeader('lcms.h')/False/" \
+     -e "s/not config.CheckHeader('tiff.h')/False/" \
+     -e "s/not config.CheckCXXHeader('vigra\/impex.hxx')/False/" \
+     \
+     -e "s/^\(      'LDFLAGS'.*\)/\1\n,'NIX_CFLAGS_COMPILE' : os.environ['NIX_CFLAGS_COMPILE']/" \
+     -e "s/^\(      'LDFLAGS'.*\)/\1\n,'NIX_LDFLAGS' : os.environ['NIX_LDFLAGS']/"
+
+    scons PREFIX=$out SYSLIBS=1 install
+  '';
+
+  installPhase = ":";
+
+  patches = [ ./lcms-1.17.patch ];
+
+  meta = {
+    description = "Little CMS ICC profile construction set";
+    homepage = "http://sourceforge.net/projects/lprof";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/tools/graphics/lprof/lcms-1.17.patch b/pkgs/tools/graphics/lprof/lcms-1.17.patch
new file mode 100644
index 000000000000..a88471e143fd
--- /dev/null
+++ b/pkgs/tools/graphics/lprof/lcms-1.17.patch
@@ -0,0 +1,13 @@
+--- a/src/liblprof/lcmsprf.h	2007-08-31 15:36:20.000000000 -0700
++++ b/src/liblprof/lcmsprf.h	2007-08-31 15:37:39.000000000 -0700
+@@ -67,6 +67,9 @@
+ #define mmax(a,b) ((a) > (b)?(a):(b))
+ #endif
+ 
++#if LCMS_VERSION > 116
++typedef int BOOL;
++#endif
+ 
+ /* Misc operations ------------------------------------------------------------------------ */
+ 
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfb1d8a4e827..9cdb18f83ee5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -770,6 +770,8 @@ let
 
   libbsd = callPackage ../development/libraries/libbsd { };
 
+  lprof = callPackage ../tools/graphics/lprof { };
+
   flvtool2 = callPackage ../tools/video/flvtool2 { };
 
   fontforge = lowPrio (callPackage ../tools/misc/fontforge { });

From 67962402894538a7ae50ee70502461d1a3e9a8d4 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 29 Mar 2013 15:04:02 +0100
Subject: [PATCH 250/394] Add aws-sdk and deps (node library)

---
 pkgs/top-level/node-packages.nix | 126 +++++++++++++++++++++++++++++--
 1 file changed, 121 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index 48a21d04bcf0..06f7ad321bbc 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -43,7 +43,7 @@ let self = {
   amdefine = "amdefine-0.0.4";
 
   "amdefine->=0.0.4" = self."amdefine-0.0.4";
-  
+
   "amdefine-0.0.4" = self.buildNodePackage rec {
     name = "amdefine-0.0.4";
     src = fetchurl {
@@ -94,6 +94,20 @@ let self = {
     ];
   };
 
+  "aws-sdk" = self."aws-sdk-*";
+
+  "aws-sdk-*" = self.buildNodePackage rec {
+    name = "aws-sdk-0.9.7-pre.8";
+    src = self.patchLatest {
+      url = "http://registry.npmjs.org/aws-sdk/-/${name}.tgz";
+      sha256 = "d3854275981fff76153f79c62745d8d6c59018861729766908c920fff95ea422";
+    };
+    deps = [
+      self."xml2js-0.2.4"
+      self."xmlbuilder"
+    ];
+  };
+
   "backbone" = self."backbone-0.9.2";
 
   "backbone-0.9.2" = self.buildNodePackage rec {
@@ -270,6 +284,17 @@ let self = {
 
   "commander" = self."commander-~0.6.1";
 
+  "commander-0.5.1" = self.buildNodePackage rec {
+    name = "commander-0.5.1";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/${name}.tgz";
+      sha256 = "91042851d0731b28a5e7c342e5cbce7723a7243d31ae378fa86c45ca9493a924";
+    };
+    deps = [
+
+    ];
+  };
+
   "commander-~0.6.1" = self.buildNodePackage rec {
     name = "commander-0.6.1";
     src = fetchurl {
@@ -569,6 +594,47 @@ let self = {
     ];
   };
 
+  "htdigest" = self."htdigest-1.0.7";
+
+  "htdigest-1.0.7" = self.buildNodePackage rec {
+    name = "htdigest-1.0.7";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/htdigest/-/${name}.tgz";
+      sha256 = "10fb047addf1c4f1089a26389066d5ff8f5ffa1ccce272a701bb4c2a30d90c58";
+    };
+    deps = [
+      self."commander-0.5.1"
+    ];
+  };
+
+  "htpasswd" = self."htpasswd-1.1.0";
+
+  "htpasswd-1.1.0" = self.buildNodePackage rec {
+    name = "htpasswd-1.1.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/htpasswd/-/${name}.tgz";
+      sha256 = "cee9c0a525e717e3565ba6ffea8a64c480bc8a9e7800cb9bfc385d1a8e713ec9";
+    };
+    deps = [
+      self."commander-0.5.1"
+    ];
+  };
+
+  "http-auth" = self."http-auth-*";
+
+  "http-auth-*" = self.buildNodePackage rec {
+    name = "http-auth-1.2.7";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-auth/-/${name}.tgz";
+      sha256 = "874dbb5907d03602f31eae959a0927a3112da8e868231d9a2119bb50d2fe63d2";
+    };
+    deps = [
+      self."node-uuid-1.2.0"
+      self."htpasswd-1.1.0"
+      self."htdigest-1.0.7"
+    ];
+  };
+
   "http-signature" = self."http-signature-0.9.9";
 
   "http-signature-0.9.9" = self.buildNodePackage rec {
@@ -805,6 +871,17 @@ let self = {
 
   "node-uuid" = self."node-uuid-1.3.3";
 
+  "node-uuid-1.2.0" = self.buildNodePackage rec {
+    name = "node-uuid-1.2.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-uuid/-/${name}.tgz";
+      sha256 = "96d3ce178ea0825d27a855630de74243a577dc988512512eea572829b208a3d2";
+    };
+    deps = [
+
+    ];
+  };
+
   "node-uuid-1.3.3" = self.buildNodePackage rec {
     name = "node-uuid-1.3.3";
     src = fetchurl {
@@ -897,7 +974,7 @@ let self = {
   };
 
   "optparse" = self."optparse-1.0.3";
-  
+
   "optparse-1.0.3" = self.buildNodePackage rec {
     name = "optparse-1.0.3";
     src = fetchurl {
@@ -905,7 +982,7 @@ let self = {
       sha256 = "1cg99i4rq8azxikzqz0ykw4q971azbj49d3m7slj041yscb6m883";
     };
     deps = [
-    
+
     ];
   };
 
@@ -1115,6 +1192,19 @@ let self = {
     ];
   };
 
+  "sax" = self."sax->=0.4.2";
+
+  "sax->=0.4.2" = self.buildNodePackage rec {
+    name = "sax-0.5.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sax/-/${name}.tgz";
+      sha256 = "6bb7cd44e9dfea598997d4ba9d3279dafe75bed7b45904561ca9eb4d85cfd953";
+    };
+    deps = [
+
+    ];
+  };
+
   "semver" = self."semver-1";
 
   "semver-1" = self."semver-1.0.14";
@@ -1261,9 +1351,9 @@ let self = {
       self."requirejs-==0.26.0"
     ];
   };
-  
+
   "swig" = self."swig-0.13.2";
-  
+
   "swig-0.13.2" = self.buildNodePackage rec {
     name = "swig-0.13.2";
     src = fetchurl {
@@ -1448,6 +1538,32 @@ let self = {
     ];
   };
 
+  "xml2js" = self."xml2js-0.2.4";
+
+  "xml2js-0.2.4" = self.buildNodePackage rec {
+    name = "xml2js-0.2.4";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xml2js/-/${name}.tgz";
+      sha256 = "8daebb075fc7c564d84221a0cef7825ac824db8e312f873daee59a6adf38da28";
+    };
+    deps = [
+      self."sax->=0.4.2"
+    ];
+  };
+
+  "xmlbuilder" = self."xmlbuilder-*";
+
+  "xmlbuilder-*" = self.buildNodePackage rec {
+    name = "xmlbuilder-0.4.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmlbuilder/-/${name}.tgz";
+      sha256 = "3137e5bf9db1f114767f8ba56be753f2a9f512e38a2df64d7677ae3c9318a0fe";
+    };
+    deps = [
+
+    ];
+  };
+
   "xmlhttprequest" = self."xmlhttprequest-1.2.2";
 
   "xmlhttprequest-1.2.2" = self.buildNodePackage rec {

From 2fa4e36946d5013663c01f8652be7bfc22efe777 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 29 Mar 2013 15:04:59 +0100
Subject: [PATCH 251/394] Add weighttp 0.3

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

diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix
new file mode 100644
index 000000000000..3bf23275a180
--- /dev/null
+++ b/pkgs/tools/networking/weighttp/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, python, libev}:
+stdenv.mkDerivation {
+  name = "weighttp-0.3";
+  src = fetchurl {
+    url = http://cgit.lighttpd.net/weighttp.git/snapshot/weighttp-0.3.tar.gz;
+    sha256 = "0gl83vnip3nj7fdgbwqkmrx7kxp51sri9jfiwd04q9iz8f9bsmz5";
+  };
+
+  buildInputs = [ python libev ];
+  installPhase = ''
+    python waf configure --prefix=$out
+    python waf build
+    python waf install
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfb1d8a4e827..f671d52e4182 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1806,6 +1806,8 @@ let
       libxml2 geoip;
   };
 
+  weighttp = callPackage ../tools/networking/weighttp { };
+
   wget = callPackage ../tools/networking/wget {
     inherit (perlPackages) LWP;
   };

From 255f402bdd96499f2c40390da482cda897f89858 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 26 Mar 2013 11:42:18 +0100
Subject: [PATCH 252/394] lightdm: Add lightdm and lightdm-gtk-greeter

---
 .../lightdm-gtk-greeter/default.nix           |  23 +++
 .../lightdm-gtk-greeter.patch                 |  13 ++
 .../display-managers/lightdm/default.nix      |  25 +++
 .../display-managers/lightdm/lightdm.patch    | 193 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +
 5 files changed, 258 insertions(+)
 create mode 100644 pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
 create mode 100644 pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
 create mode 100644 pkgs/applications/display-managers/lightdm/default.nix
 create mode 100644 pkgs/applications/display-managers/lightdm/lightdm.patch

diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
new file mode 100644
index 000000000000..501826b82df2
--- /dev/null
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, lightdm, pkgconfig, gtk3, intltool }:
+
+stdenv.mkDerivation {
+  name = "lightdm-gtk-greeter";
+
+  src = fetchurl {
+    url = "https://launchpad.net/lightdm-gtk-greeter/1.6/1.5.1/+download/lightdm-gtk-greeter-1.5.1.tar.gz";
+    sha256 = "ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621";
+  };
+
+  buildInputs = [ pkgconfig gtk3 lightdm intltool ];
+
+  patches =
+    [ ./lightdm-gtk-greeter.patch
+    ];
+
+  patchFlags = "-p0";
+
+  postInstall = ''
+      substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
+        --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
+    '';
+}
diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
new file mode 100644
index 000000000000..5ae5603b4dd6
--- /dev/null
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
@@ -0,0 +1,13 @@
+=== modified file 'src/lightdm-gtk-greeter.c'
+--- src/lightdm-gtk-greeter.c	2013-02-09 23:20:39 +0000
++++ src/lightdm-gtk-greeter.c	2013-03-29 12:21:34 +0000
+@@ -1273,7 +1273,7 @@
+     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (session_combo), renderer, TRUE);
+     gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (session_combo), renderer, "text", 0);
+     model = gtk_combo_box_get_model (session_combo);
+-    items = lightdm_get_sessions ();
++    items = lightdm_get_sessions (greeter);
+     for (item = items; item; item = item->next)
+     {
+         LightDMSession *session = item->data;
+
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
new file mode 100644
index 000000000000..ce1f4400b271
--- /dev/null
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2, intltool, x11, libxklavier, libgcrypt, makeWrapper }:
+
+stdenv.mkDerivation {
+  name = "lightdm-1.5.1";
+
+  src = fetchurl {
+    url = https://launchpad.net/lightdm/1.6/1.5.1/+download/lightdm-1.5.1.tar.xz;
+    sha256 = "645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86";
+  };
+
+  buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt makeWrapper ];
+
+  configureFlags = [ "--enable-liblightdm-gobject" ];
+
+  patches =
+    [ ./lightdm.patch
+    ];
+
+  patchFlags = "-p0";
+
+  meta = {
+    homepage = http://launchpad.net/lightdm;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/display-managers/lightdm/lightdm.patch b/pkgs/applications/display-managers/lightdm/lightdm.patch
new file mode 100644
index 000000000000..a6e53bafcc79
--- /dev/null
+++ b/pkgs/applications/display-managers/lightdm/lightdm.patch
@@ -0,0 +1,193 @@
+=== modified file 'liblightdm-gobject/greeter.c'
+--- liblightdm-gobject/greeter.c	2013-01-31 20:56:09 +0000
++++ liblightdm-gobject/greeter.c	2013-03-29 14:15:58 +0000
+@@ -567,6 +567,21 @@
+ }
+ 
+ /**
++ * lightdm_greeter_get_config_path
++ * @greeter: A #LightDMGreeter
++ *
++ * Get the config path to LightDM.
++ *
++ * Return value: The path to the current LightDM configuration file.
++ **/
++const gchar *
++lightdm_greeter_get_config_path (LightDMGreeter *greeter)
++{
++    g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL);
++    return lightdm_greeter_get_hint (greeter, "config-path");
++}
++
++/**
+  * lightdm_greeter_get_hide_users_hint:
+  * @greeter: A #LightDMGreeter
+  *
+
+=== modified file 'liblightdm-gobject/lightdm/greeter.h'
+--- liblightdm-gobject/lightdm/greeter.h	2013-01-31 20:56:09 +0000
++++ liblightdm-gobject/lightdm/greeter.h	2013-03-29 11:56:11 +0000
+@@ -93,6 +93,8 @@
+ 
+ const gchar *lightdm_greeter_get_autologin_user_hint (LightDMGreeter *greeter);
+ 
++const gchar *lightdm_greeter_get_config_path (LightDMGreeter *greeter);
++
+ gboolean lightdm_greeter_get_autologin_guest_hint (LightDMGreeter *greeter);
+ 
+ gint lightdm_greeter_get_autologin_timeout_hint (LightDMGreeter *greeter);
+
+=== modified file 'liblightdm-gobject/lightdm/session.h'
+--- liblightdm-gobject/lightdm/session.h	2013-01-31 20:56:09 +0000
++++ liblightdm-gobject/lightdm/session.h	2013-03-29 11:59:16 +0000
+@@ -12,6 +12,7 @@
+ #define _LIGHTDM_SESSION_H_
+ 
+ #include <glib-object.h>
++#include "greeter.h"
+ 
+ G_BEGIN_DECLS
+ 
+@@ -42,9 +43,9 @@
+ 
+ GType lightdm_session_get_type (void);
+ 
+-GList *lightdm_get_sessions (void);
++GList *lightdm_get_sessions (LightDMGreeter *greeter);
+ 
+-GList *lightdm_get_remote_sessions (void);
++GList *lightdm_get_remote_sessions (LightDMGreeter *greeter);
+ 
+ const gchar *lightdm_session_get_key (LightDMSession *session);
+ 
+
+=== modified file 'liblightdm-gobject/session.c'
+--- liblightdm-gobject/session.c	2013-01-31 20:56:09 +0000
++++ liblightdm-gobject/session.c	2013-03-29 14:16:48 +0000
+@@ -11,6 +11,7 @@
+ #include <string.h>
+ #include <gio/gdesktopappinfo.h>
+ 
++#include "lightdm/greeter.h"
+ #include "lightdm/session.h"
+ 
+ enum {
+@@ -167,7 +168,7 @@
+ }
+ 
+ static void
+-update_sessions (void)
++update_sessions (LightDMGreeter *greeter)
+ {
+     GKeyFile *config_key_file = NULL;
+     gchar *config_path = NULL;
+@@ -183,8 +184,8 @@
+     remote_sessions_dir = g_strdup (REMOTE_SESSIONS_DIR);
+ 
+     /* Use session directory from configuration */
+-    /* FIXME: This should be sent in the greeter connection */
+-    config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL);
++    config_path = g_strdup (lightdm_greeter_get_config_path (greeter));
++
+     config_key_file = g_key_file_new ();
+     result = g_key_file_load_from_file (config_key_file, config_path, G_KEY_FILE_NONE, &error);
+     if (error)
+@@ -228,9 +229,9 @@
+  * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession
+  **/
+ GList *
+-lightdm_get_sessions (void)
++lightdm_get_sessions (LightDMGreeter *greeter)
+ {
+-    update_sessions ();
++    update_sessions (greeter);
+     return local_sessions;
+ }
+ 
+@@ -242,9 +243,9 @@
+  * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession
+  **/
+ GList *
+-lightdm_get_remote_sessions (void)
++lightdm_get_remote_sessions (LightDMGreeter *greeter)
+ {
+-    update_sessions ();
++    update_sessions (greeter);
+     return remote_sessions;
+ }
+ 
+
+=== modified file 'src/display.c'
+--- src/display.c	2013-03-26 22:22:49 +0000
++++ src/display.c	2013-03-29 12:12:43 +0000
+@@ -62,6 +62,9 @@
+     /* Program to run sessions through */
+     gchar *session_wrapper;
+ 
++    /* Path to the configuration file that lightdm is running under */
++    gchar *config_path;
++
+     /* TRUE if in a user session */
+     gboolean in_user_session;
+ 
+@@ -213,6 +216,14 @@
+ }
+ 
+ void
++display_set_config_path (Display *display, const gchar *config_path)
++{
++    g_return_if_fail (display != NULL);
++    g_free (display->priv->config_path);
++    display->priv->config_path = g_strdup (config_path);
++}
++
++void
+ display_set_show_remote_login_hint (Display *display, gboolean show_remote_login)
+ {
+     g_return_if_fail (display != NULL);
+@@ -436,6 +447,7 @@
+     greeter_set_hint (display->priv->greeter, "show-remote-login", display->priv->greeter_show_remote_login ? "true" : "false");
+     if (display->priv->greeter_is_lock)
+         greeter_set_hint (display->priv->greeter, "lock-screen", "true");
++    greeter_set_hint (display->priv->greeter, "config-path", display->priv->config_path);
+ 
+     /* Run greeter as unprivileged user */
+     if (getuid () != 0)
+
+=== modified file 'src/display.h'
+--- src/display.h	2013-03-26 22:22:49 +0000
++++ src/display.h	2013-03-29 12:12:37 +0000
+@@ -80,6 +80,8 @@
+ 
+ void display_set_user_session (Display *display, SessionType type, const gchar *session_name);
+ 
++void display_set_config_path (Display *display, const gchar *config_path);
++
+ gboolean display_start (Display *display);
+ 
+ gboolean display_get_is_ready (Display *display);
+
+=== modified file 'src/lightdm.c'
+--- src/lightdm.c	2013-03-07 21:40:31 +0000
++++ src/lightdm.c	2013-03-29 11:48:45 +0000
+@@ -1050,6 +1050,7 @@
+     g_debug ("Starting Light Display Manager %s, UID=%i PID=%i", VERSION, getuid (), getpid ());
+ 
+     g_debug ("Loaded configuration from %s", config_path);
++    config_set_string (config_get_instance (), "LightDM", "config-path", config_path);
+     g_free (config_path);
+ 
+     g_debug ("Using D-Bus name %s", LIGHTDM_BUS_NAME);
+
+=== modified file 'src/seat.c'
+--- src/seat.c	2013-03-26 22:22:49 +0000
++++ src/seat.c	2013-03-29 12:13:00 +0000
+@@ -536,6 +536,7 @@
+     if (!session_name)
+         session_name = seat_get_string_property (seat, "user-session");
+     display_set_user_session (display, SESSION_TYPE_LOCAL, session_name);
++    display_set_config_path (display, config_get_string (config_get_instance (), "LightDM", "config-path"));
+ 
+     seat->priv->displays = g_list_append (seat->priv->displays, display);
+     g_signal_emit (seat, signals[DISPLAY_ADDED], 0, display);
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d3e4cca9a24..e8059e4b5017 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7739,6 +7739,10 @@ let
 
   dropbox = callPackage ../applications/networking/dropbox { };
 
+  lightdm = callPackage ../applications/display-managers/lightdm { };
+
+  lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { };
+
   slim = callPackage ../applications/display-managers/slim { };
 
   sndBase = builderDefsPackage (import ../applications/audio/snd) {

From 6026c60388df4350bee39f129e9963b26619d6d6 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 29 Mar 2013 16:43:38 +0100
Subject: [PATCH 253/394] spring: bump and fix build

---
 pkgs/games/spring/default.nix   | 6 +++---
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 3cb79e946311..ba45360ccb6d 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-  version = "0.91.0";
+  version = "94.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/springrts/spring_91.0_src.tar.lzma";
-    sha256 = "0ycn9yxpbw58a8p3j3wf3r0x102k665l27bfp1vxq7kpwlk6314l";
+    url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
+    sha256 = "19myqwpz4mi4zdlcv8318dps0ymmw7qpawhq1rgk73ycmaiyaaka";
   };
 
   buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7146872aa6b..05e57e5cbeec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8305,7 +8305,7 @@ let
   # You still can override by passing more arguments.
   spaceOrbit = callPackage ../games/orbit { };
 
-  spring = callPackage ../games/spring { boost = boost149;};
+  spring = callPackage ../games/spring { };
 
   springLobby = callPackage ../games/spring/springlobby.nix { };
 

From 02384dfc93a1891fedbf7984bc29a61147895e97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 16:46:59 +0100
Subject: [PATCH 254/394] release-haskell.nix: adapt file to the new
 release-lib.nix

---
 pkgs/top-level/release-haskell.nix | 1165 ++++++++++++++--------------
 1 file changed, 581 insertions(+), 584 deletions(-)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index bbc610d7c0c9..8ec797de672a 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -1,609 +1,606 @@
 /* Essential Haskell packages that must build. */
 
-with (import ./release-lib.nix);
+{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } }:
 
-let
+let supportedSystems = [ "x86_64-linux" ]; in
 
-  linux = ["x86_64-linux"];
+with import ./release-lib.nix { inherit supportedSystems; };
 
-in
+mapTestOn {
+  gitAndTools.gitAnnex = supportedSystems;
 
-mapTestOn (rec {
-
-  gitAndTools.gitAnnex = linux;
-
-  jhc = linux;
+  jhc = supportedSystems;
 
   haskellPackages_ghc742 = {
-    abstractPar = linux;
-    ACVector = linux;
-    aeson = linux;
-    AgdaExecutable = linux;
-    alex = linux;
-    alexMeta = linux;
-    alternativeIo = linux;
-    ansiTerminal = linux;
-    ansiWlPprint = linux;
-    asn1Data = linux;
-    AspectAG = linux;
-    async = linux;
-    attempt = linux;
-    attoparsecEnumerator = linux;
-    attoparsec = linux;
-    authenticate = linux;
-    base64Bytestring = linux;
-    baseUnicodeSymbols = linux;
-    benchpress = linux;
-    bimap = linux;
-    binaryShared = linux;
-    bitmap = linux;
-    bktrees = linux;
-    blazeBuilderEnumerator = linux;
-    blazeBuilder = linux;
-    blazeHtml = linux;
-    blazeTextual = linux;
-    bloomfilter = linux;
-    bmp = linux;
-    BNFC = linux;
-    BNFCMeta = linux;
-    Boolean = linux;
-    bytestringMmap = linux;
-    bytestringNums = linux;
-    bytestringTrie = linux;
-    cabal2Ghci = linux;
-    cabal2nix = linux;
-    cabalDev = linux;
-    cabalGhci = linux;
-    cabalInstall = linux;
-    cairo = linux;
-    caseInsensitive = linux;
-    cautiousFile = linux;
-    cereal = linux;
-    certificate = linux;
-    cgi = linux;
-    Chart = linux;
-    citeprocHs = linux;
-    clientsession = linux;
-    cmdargs = linux;
-    cmdlib = linux;
-    colorizeHaskell = linux;
-    colour = linux;
-    comonadsFd = linux;
-    conduit = linux;
-    ConfigFile = linux;
-    continuedFractions = linux;
-    converge = linux;
-    convertible = linux;
-    cookie = linux;
-    cpphs = linux;
-    cprngAes = linux;
-    criterion = linux;
-    cryptoApi = linux;
-    cryptocipher = linux;
-    cryptohash = linux;
-    Crypto = linux;
-    cssText = linux;
-    csv = linux;
-    darcs = linux;
-    dataAccessor = linux;
-    dataAccessorTemplate = linux;
-    dataDefault = linux;
-    dataenc = linux;
-    dataReify = linux;
-    datetime = linux;
-    DAV = linux;
-    dbus = linux;
-    derive = linux;
-    diagrams = linux;
-    Diff = linux;
-    digestiveFunctorsHeist = linux;
-    digestiveFunctorsSnap = linux;
-    digest = linux;
-    dimensional = linux;
-    dimensionalTf = linux;
-    directoryTree = linux;
-    distributedProcess = linux;
-    dlist = linux;
-    dns = linux;
-    doctest = linux;
-    dotgen = linux;
-    doubleConversion = linux;
-    Ebnf2ps = linux;
-    editDistance = linux;
-    editline = linux;
-    emailValidate = linux;
-    entropy = linux;
-    enumerator = linux;
-    epic = linux;
-    erf = linux;
-    failure = linux;
-    fclabels = linux;
-    feed = linux;
-    fgl = linux;
-    fileEmbed = linux;
-    filestore = linux;
-    fingertree = linux;
-    flexibleDefaults = linux;
-    funcmp = linux;
-    gamma = linux;
-    gdiff = linux;
-    ghcEvents = linux;
-    ghc = linux;
-    ghcMtl = linux;
-    ghcPaths = linux;
-    ghcSybUtils = linux;
-    githubBackup = linux;
-    github = linux;
-    gitit = linux;
-    glade = linux;
-    glib = linux;
-    Glob = linux;
-    gloss = linux;
-    GLUT = linux;
-    gnutls = linux;
-    graphviz = linux;
-    gtk = linux;
-    gtksourceview2 = linux;
-    hackageDb = linux;
-    haddock = linux;
-    hakyll = linux;
-    hamlet = linux;
-    happstackHamlet = linux;
-    happstackServer = linux;
-    happstackUtil = linux;
-    happy = linux;
-    hashable = linux;
-    hashedStorage = linux;
-    haskeline = linux;
-    haskellLexer = linux;
-    haskellPlatform = linux;
-    haskellSrcExts = linux;
-    haskellSrc = linux;
-    haskellSrcMeta = linux;
-    HaXml = linux;
-    haxr = linux;
-    HDBC = linux;
-    HDBCPostgresql = linux;
-    HDBCSqlite3 = linux;
-    HFuse = linux;
-    highlightingKate = linux;
-    hinotify = linux;
-    hint = linux;
-    Hipmunk = linux;
-    hledgerInterest = linux;
-    hledgerLib = linux;
-    hledger = linux;
-    hledgerWeb = linux;
-    hlint = linux;
-    HList = linux;
-    hmatrix = linux;
-    hoogle = linux;
-    hopenssl = linux;
-    hostname = linux;
-    hp2anyCore = linux;
-    hp2anyGraph = linux;
-    hS3 = linux;
-    hscolour = linux;
-    hsdns = linux;
-    hsemail = linux;
-    hslogger = linux;
-    hsloggerTemplate = linux;
-    hspec = linux;
-    hspread = linux;
-    HsSyck = linux;
-    HStringTemplate = linux;
-    hsyslog = linux;
-    html = linux;
-    httpConduit = linux;
-    httpDate = linux;
-    httpdShed = linux;
-    HTTP = linux;
-    httpTypes = linux;
-    HUnit = linux;
-    hxt = linux;
-    IfElse = linux;
-    irc = linux;
-    iteratee = linux;
-    jailbreakCabal = linux;
-    json = linux;
-    jsonTypes = linux;
-    lambdabot = linux;
-    languageCQuote = linux;
-    languageJavascript = linux;
-    largeword = linux;
-    lens = linux;
-    libxmlSax = linux;
-    liftedBase = linux;
-    ListLike = linux;
-    logfloat = linux;
-    ltk = linux;
-    mainlandPretty = linux;
-    maude = linux;
-    MaybeT = linux;
-    MemoTrie = linux;
-    mersenneRandomPure64 = linux;
-    mimeMail = linux;
-    MissingH = linux;
-    mmap = linux;
-    MonadCatchIOMtl = linux;
-    MonadCatchIOTransformers = linux;
-    monadControl = linux;
-    monadLoops = linux;
-    monadPar = linux;
-    monadPeel = linux;
-    MonadPrompt = linux;
-    MonadRandom = linux;
-    mpppc = linux;
-    mtl = linux;
-    mtlparse = linux;
-    multiplate = linux;
-    multirec = linux;
-    multiset = linux;
-    murmurHash = linux;
-    mwcRandom = linux;
-    nat = linux;
-    nats = linux;
-    naturals = linux;
-    networkInfo = linux;
-    network = linux;
-    networkMulticast = linux;
-    networkProtocolXmpp = linux;
-    nonNegative = linux;
-    numericPrelude = linux;
-    numtype = linux;
-    numtypeTf = linux;
-    ObjectName = linux;
-    OneTuple = linux;
-    OpenAL = linux;
-    OpenGL = linux;
-    packunused = linux;
-    pandoc = linux;
-    pandocTypes = linux;
-    pango = linux;
-    parallel = linux;
-    parseargs = linux;
-    parsec3 = linux;
-    parsec = linux;
-    parsimony = linux;
-    pathPieces = linux;
-    pathtype = linux;
-    pcreLight = linux;
-    permutation = linux;
-    persistent = linux;
-    persistentPostgresql = linux;
-    persistentSqlite = linux;
-    persistentTemplate = linux;
-    polyparse = linux;
-    ppm = linux;
-    prettyShow = linux;
-    primitive = linux;
-    PSQueue = linux;
-    pureMD5 = linux;
-    pwstoreFast = linux;
-    QuickCheck2 = linux;
-    QuickCheck = linux;
-    randomFu = linux;
-    random = linux;
-    randomShuffle = linux;
-    randomSource = linux;
-    RangedSets = linux;
-    ranges = linux;
-    readline = linux;
-    recaptcha = linux;
-    regexBase = linux;
-    regexCompat = linux;
-    regexPCRE = linux;
-    regexPosix = linux;
-    regexpr = linux;
-    regexTDFA = linux;
-    regular = linux;
-    RSA = linux;
-    rvar = linux;
-    safe = linux;
-    SafeSemaphore = linux;
-    SDLImage = linux;
-    SDL = linux;
-    SDLMixer = linux;
-    SDLTtf = linux;
-    semigroups = linux;
-    sendfile = linux;
-    shake = linux;
-    SHA = linux;
-    Shellac = linux;
-    shelly = linux;
-    simpleSendfile = linux;
-    smallcheck = linux;
-    SMTPClient = linux;
-    snapCore = linux;
-    snap = linux;
-    snapLoaderStatic = linux;
-    snapServer = linux;
-    split = linux;
-    splot = linux;
-    srcloc = linux;
-    stateref = linux;
-    StateVar = linux;
-    statistics = linux;
-    stbImage = linux;
-    stm = linux;
-    storableComplex = linux;
-    storableRecord = linux;
-    streamproc = linux;
-    strictConcurrency = linux;
-    strict = linux;
-    strptime = linux;
-    svgcairo = linux;
-    syb = linux;
-    sybWithClassInstancesText = linux;
-    sybWithClass = linux;
-    tabular = linux;
-    tagged = linux;
-    tagsoup = linux;
-    tar = linux;
-    Tensor = linux;
-    terminfo = linux;
-    testFramework = linux;
-    testpack = linux;
-    texmath = linux;
-    text = linux;
-    thLift = linux;
-    timeplot = linux;
-    tlsExtra = linux;
-    tls = linux;
-    transformersBase = linux;
-    transformersCompat = linux;
-    transformers = linux;
-    tuple = linux;
-    typeLlevelNaturalNumber = linux;
-    uniplate = linux;
-    uniqueid = linux;
-    unixCompat = linux;
-    unorderedContainers = linux;
-    url = linux;
-    utf8Light = linux;
-    utf8String = linux;
-    utilityHt = linux;
-    uuagc = linux;
-    uuid = linux;
-    uulib = linux;
-    vacuumCairo = linux;
-    vacuum = linux;
-    vcsRevision = linux;
-    Vec = linux;
-    vectorAlgorithms = linux;
-    vector = linux;
-    vectorSpace = linux;
-    vty = linux;
-    waiAppStatic = linux;
-    waiExtra = linux;
-    wai = linux;
-    waiLogger = linux;
-    warp = linux;
-    wlPprintExtras = linux;
-    wlPprint = linux;
-    wlPprintTerminfo = linux;
-    wxcore = linux;
-    wxdirect = linux;
-    wx = linux;
-    X11 = linux;
-    xhtml = linux;
-    xmlConduit = linux;
-    xmlHamlet = linux;
-    xml = linux;
-    xmlTypes = linux;
-    xmobar = linux;
-    xmonadContrib = linux;
-    xmonadExtras = linux;
-    xmonad = linux;
-    xssSanitize = linux;
-    yesodAuth = linux;
-    yesodCore = linux;
-    yesodDefault = linux;
-    yesodForm = linux;
-    yesodJson = linux;
-    yesod = linux;
-    yesodPersistent = linux;
-    yesodStatic = linux;
-    zeromq3Haskell = linux;
-    zeromqHaskell = linux;
-    zipArchive = linux;
-    zipper = linux;
-    zlibBindings = linux;
-    zlibEnum = linux;
-    zlib = linux;
+    abstractPar = supportedSystems;
+    ACVector = supportedSystems;
+    aeson = supportedSystems;
+    AgdaExecutable = supportedSystems;
+    alex = supportedSystems;
+    alexMeta = supportedSystems;
+    alternativeIo = supportedSystems;
+    ansiTerminal = supportedSystems;
+    ansiWlPprint = supportedSystems;
+    asn1Data = supportedSystems;
+    AspectAG = supportedSystems;
+    async = supportedSystems;
+    attempt = supportedSystems;
+    attoparsecEnumerator = supportedSystems;
+    attoparsec = supportedSystems;
+    authenticate = supportedSystems;
+    base64Bytestring = supportedSystems;
+    baseUnicodeSymbols = supportedSystems;
+    benchpress = supportedSystems;
+    bimap = supportedSystems;
+    binaryShared = supportedSystems;
+    bitmap = supportedSystems;
+    bktrees = supportedSystems;
+    blazeBuilderEnumerator = supportedSystems;
+    blazeBuilder = supportedSystems;
+    blazeHtml = supportedSystems;
+    blazeTextual = supportedSystems;
+    bloomfilter = supportedSystems;
+    bmp = supportedSystems;
+    BNFC = supportedSystems;
+    BNFCMeta = supportedSystems;
+    Boolean = supportedSystems;
+    bytestringMmap = supportedSystems;
+    bytestringNums = supportedSystems;
+    bytestringTrie = supportedSystems;
+    cabal2Ghci = supportedSystems;
+    cabal2nix = supportedSystems;
+    cabalDev = supportedSystems;
+    cabalGhci = supportedSystems;
+    cabalInstall = supportedSystems;
+    cairo = supportedSystems;
+    caseInsensitive = supportedSystems;
+    cautiousFile = supportedSystems;
+    cereal = supportedSystems;
+    certificate = supportedSystems;
+    cgi = supportedSystems;
+    Chart = supportedSystems;
+    citeprocHs = supportedSystems;
+    clientsession = supportedSystems;
+    cmdargs = supportedSystems;
+    cmdlib = supportedSystems;
+    colorizeHaskell = supportedSystems;
+    colour = supportedSystems;
+    comonadsFd = supportedSystems;
+    conduit = supportedSystems;
+    ConfigFile = supportedSystems;
+    continuedFractions = supportedSystems;
+    converge = supportedSystems;
+    convertible = supportedSystems;
+    cookie = supportedSystems;
+    cpphs = supportedSystems;
+    cprngAes = supportedSystems;
+    criterion = supportedSystems;
+    cryptoApi = supportedSystems;
+    cryptocipher = supportedSystems;
+    cryptohash = supportedSystems;
+    Crypto = supportedSystems;
+    cssText = supportedSystems;
+    csv = supportedSystems;
+    darcs = supportedSystems;
+    dataAccessor = supportedSystems;
+    dataAccessorTemplate = supportedSystems;
+    dataDefault = supportedSystems;
+    dataenc = supportedSystems;
+    dataReify = supportedSystems;
+    datetime = supportedSystems;
+    DAV = supportedSystems;
+    dbus = supportedSystems;
+    derive = supportedSystems;
+    diagrams = supportedSystems;
+    Diff = supportedSystems;
+    digestiveFunctorsHeist = supportedSystems;
+    digestiveFunctorsSnap = supportedSystems;
+    digest = supportedSystems;
+    dimensional = supportedSystems;
+    dimensionalTf = supportedSystems;
+    directoryTree = supportedSystems;
+    distributedProcess = supportedSystems;
+    dlist = supportedSystems;
+    dns = supportedSystems;
+    doctest = supportedSystems;
+    dotgen = supportedSystems;
+    doubleConversion = supportedSystems;
+    Ebnf2ps = supportedSystems;
+    editDistance = supportedSystems;
+    editline = supportedSystems;
+    emailValidate = supportedSystems;
+    entropy = supportedSystems;
+    enumerator = supportedSystems;
+    epic = supportedSystems;
+    erf = supportedSystems;
+    failure = supportedSystems;
+    fclabels = supportedSystems;
+    feed = supportedSystems;
+    fgl = supportedSystems;
+    fileEmbed = supportedSystems;
+    filestore = supportedSystems;
+    fingertree = supportedSystems;
+    flexibleDefaults = supportedSystems;
+    funcmp = supportedSystems;
+    gamma = supportedSystems;
+    gdiff = supportedSystems;
+    ghcEvents = supportedSystems;
+    ghc = supportedSystems;
+    ghcMtl = supportedSystems;
+    ghcPaths = supportedSystems;
+    ghcSybUtils = supportedSystems;
+    githubBackup = supportedSystems;
+    github = supportedSystems;
+    gitit = supportedSystems;
+    glade = supportedSystems;
+    glib = supportedSystems;
+    Glob = supportedSystems;
+    gloss = supportedSystems;
+    GLUT = supportedSystems;
+    gnutls = supportedSystems;
+    graphviz = supportedSystems;
+    gtk = supportedSystems;
+    gtksourceview2 = supportedSystems;
+    hackageDb = supportedSystems;
+    haddock = supportedSystems;
+    hakyll = supportedSystems;
+    hamlet = supportedSystems;
+    happstackHamlet = supportedSystems;
+    happstackServer = supportedSystems;
+    happstackUtil = supportedSystems;
+    happy = supportedSystems;
+    hashable = supportedSystems;
+    hashedStorage = supportedSystems;
+    haskeline = supportedSystems;
+    haskellLexer = supportedSystems;
+    haskellPlatform = supportedSystems;
+    haskellSrcExts = supportedSystems;
+    haskellSrc = supportedSystems;
+    haskellSrcMeta = supportedSystems;
+    HaXml = supportedSystems;
+    haxr = supportedSystems;
+    HDBC = supportedSystems;
+    HDBCPostgresql = supportedSystems;
+    HDBCSqlite3 = supportedSystems;
+    HFuse = supportedSystems;
+    highlightingKate = supportedSystems;
+    hinotify = supportedSystems;
+    hint = supportedSystems;
+    Hipmunk = supportedSystems;
+    hledgerInterest = supportedSystems;
+    hledgerLib = supportedSystems;
+    hledger = supportedSystems;
+    hledgerWeb = supportedSystems;
+    hlint = supportedSystems;
+    HList = supportedSystems;
+    hmatrix = supportedSystems;
+    hoogle = supportedSystems;
+    hopenssl = supportedSystems;
+    hostname = supportedSystems;
+    hp2anyCore = supportedSystems;
+    hp2anyGraph = supportedSystems;
+    hS3 = supportedSystems;
+    hscolour = supportedSystems;
+    hsdns = supportedSystems;
+    hsemail = supportedSystems;
+    hslogger = supportedSystems;
+    hsloggerTemplate = supportedSystems;
+    hspec = supportedSystems;
+    hspread = supportedSystems;
+    HsSyck = supportedSystems;
+    HStringTemplate = supportedSystems;
+    hsyslog = supportedSystems;
+    html = supportedSystems;
+    httpConduit = supportedSystems;
+    httpDate = supportedSystems;
+    httpdShed = supportedSystems;
+    HTTP = supportedSystems;
+    httpTypes = supportedSystems;
+    HUnit = supportedSystems;
+    hxt = supportedSystems;
+    IfElse = supportedSystems;
+    irc = supportedSystems;
+    iteratee = supportedSystems;
+    jailbreakCabal = supportedSystems;
+    json = supportedSystems;
+    jsonTypes = supportedSystems;
+    lambdabot = supportedSystems;
+    languageCQuote = supportedSystems;
+    languageJavascript = supportedSystems;
+    largeword = supportedSystems;
+    lens = supportedSystems;
+    libxmlSax = supportedSystems;
+    liftedBase = supportedSystems;
+    ListLike = supportedSystems;
+    logfloat = supportedSystems;
+    ltk = supportedSystems;
+    mainlandPretty = supportedSystems;
+    maude = supportedSystems;
+    MaybeT = supportedSystems;
+    MemoTrie = supportedSystems;
+    mersenneRandomPure64 = supportedSystems;
+    mimeMail = supportedSystems;
+    MissingH = supportedSystems;
+    mmap = supportedSystems;
+    MonadCatchIOMtl = supportedSystems;
+    MonadCatchIOTransformers = supportedSystems;
+    monadControl = supportedSystems;
+    monadLoops = supportedSystems;
+    monadPar = supportedSystems;
+    monadPeel = supportedSystems;
+    MonadPrompt = supportedSystems;
+    MonadRandom = supportedSystems;
+    mpppc = supportedSystems;
+    mtl = supportedSystems;
+    mtlparse = supportedSystems;
+    multiplate = supportedSystems;
+    multirec = supportedSystems;
+    multiset = supportedSystems;
+    murmurHash = supportedSystems;
+    mwcRandom = supportedSystems;
+    nat = supportedSystems;
+    nats = supportedSystems;
+    naturals = supportedSystems;
+    networkInfo = supportedSystems;
+    network = supportedSystems;
+    networkMulticast = supportedSystems;
+    networkProtocolXmpp = supportedSystems;
+    nonNegative = supportedSystems;
+    numericPrelude = supportedSystems;
+    numtype = supportedSystems;
+    numtypeTf = supportedSystems;
+    ObjectName = supportedSystems;
+    OneTuple = supportedSystems;
+    OpenAL = supportedSystems;
+    OpenGL = supportedSystems;
+    packunused = supportedSystems;
+    pandoc = supportedSystems;
+    pandocTypes = supportedSystems;
+    pango = supportedSystems;
+    parallel = supportedSystems;
+    parseargs = supportedSystems;
+    parsec3 = supportedSystems;
+    parsec = supportedSystems;
+    parsimony = supportedSystems;
+    pathPieces = supportedSystems;
+    pathtype = supportedSystems;
+    pcreLight = supportedSystems;
+    permutation = supportedSystems;
+    persistent = supportedSystems;
+    persistentPostgresql = supportedSystems;
+    persistentSqlite = supportedSystems;
+    persistentTemplate = supportedSystems;
+    polyparse = supportedSystems;
+    ppm = supportedSystems;
+    prettyShow = supportedSystems;
+    primitive = supportedSystems;
+    PSQueue = supportedSystems;
+    pureMD5 = supportedSystems;
+    pwstoreFast = supportedSystems;
+    QuickCheck2 = supportedSystems;
+    QuickCheck = supportedSystems;
+    randomFu = supportedSystems;
+    random = supportedSystems;
+    randomShuffle = supportedSystems;
+    randomSource = supportedSystems;
+    RangedSets = supportedSystems;
+    ranges = supportedSystems;
+    readline = supportedSystems;
+    recaptcha = supportedSystems;
+    regexBase = supportedSystems;
+    regexCompat = supportedSystems;
+    regexPCRE = supportedSystems;
+    regexPosix = supportedSystems;
+    regexpr = supportedSystems;
+    regexTDFA = supportedSystems;
+    regular = supportedSystems;
+    RSA = supportedSystems;
+    rvar = supportedSystems;
+    safe = supportedSystems;
+    SafeSemaphore = supportedSystems;
+    SDLImage = supportedSystems;
+    SDL = supportedSystems;
+    SDLMixer = supportedSystems;
+    SDLTtf = supportedSystems;
+    semigroups = supportedSystems;
+    sendfile = supportedSystems;
+    shake = supportedSystems;
+    SHA = supportedSystems;
+    Shellac = supportedSystems;
+    shelly = supportedSystems;
+    simpleSendfile = supportedSystems;
+    smallcheck = supportedSystems;
+    SMTPClient = supportedSystems;
+    snapCore = supportedSystems;
+    snap = supportedSystems;
+    snapLoaderStatic = supportedSystems;
+    snapServer = supportedSystems;
+    split = supportedSystems;
+    splot = supportedSystems;
+    srcloc = supportedSystems;
+    stateref = supportedSystems;
+    StateVar = supportedSystems;
+    statistics = supportedSystems;
+    stbImage = supportedSystems;
+    stm = supportedSystems;
+    storableComplex = supportedSystems;
+    storableRecord = supportedSystems;
+    streamproc = supportedSystems;
+    strictConcurrency = supportedSystems;
+    strict = supportedSystems;
+    strptime = supportedSystems;
+    svgcairo = supportedSystems;
+    syb = supportedSystems;
+    sybWithClassInstancesText = supportedSystems;
+    sybWithClass = supportedSystems;
+    tabular = supportedSystems;
+    tagged = supportedSystems;
+    tagsoup = supportedSystems;
+    tar = supportedSystems;
+    Tensor = supportedSystems;
+    terminfo = supportedSystems;
+    testFramework = supportedSystems;
+    testpack = supportedSystems;
+    texmath = supportedSystems;
+    text = supportedSystems;
+    thLift = supportedSystems;
+    timeplot = supportedSystems;
+    tlsExtra = supportedSystems;
+    tls = supportedSystems;
+    transformersBase = supportedSystems;
+    transformersCompat = supportedSystems;
+    transformers = supportedSystems;
+    tuple = supportedSystems;
+    typeLlevelNaturalNumber = supportedSystems;
+    uniplate = supportedSystems;
+    uniqueid = supportedSystems;
+    unixCompat = supportedSystems;
+    unorderedContainers = supportedSystems;
+    url = supportedSystems;
+    utf8Light = supportedSystems;
+    utf8String = supportedSystems;
+    utilityHt = supportedSystems;
+    uuagc = supportedSystems;
+    uuid = supportedSystems;
+    uulib = supportedSystems;
+    vacuumCairo = supportedSystems;
+    vacuum = supportedSystems;
+    vcsRevision = supportedSystems;
+    Vec = supportedSystems;
+    vectorAlgorithms = supportedSystems;
+    vector = supportedSystems;
+    vectorSpace = supportedSystems;
+    vty = supportedSystems;
+    waiAppStatic = supportedSystems;
+    waiExtra = supportedSystems;
+    wai = supportedSystems;
+    waiLogger = supportedSystems;
+    warp = supportedSystems;
+    wlPprintExtras = supportedSystems;
+    wlPprint = supportedSystems;
+    wlPprintTerminfo = supportedSystems;
+    wxcore = supportedSystems;
+    wxdirect = supportedSystems;
+    wx = supportedSystems;
+    X11 = supportedSystems;
+    xhtml = supportedSystems;
+    xmlConduit = supportedSystems;
+    xmlHamlet = supportedSystems;
+    xml = supportedSystems;
+    xmlTypes = supportedSystems;
+    xmobar = supportedSystems;
+    xmonadContrib = supportedSystems;
+    xmonadExtras = supportedSystems;
+    xmonad = supportedSystems;
+    xssSanitize = supportedSystems;
+    yesodAuth = supportedSystems;
+    yesodCore = supportedSystems;
+    yesodDefault = supportedSystems;
+    yesodForm = supportedSystems;
+    yesodJson = supportedSystems;
+    yesod = supportedSystems;
+    yesodPersistent = supportedSystems;
+    yesodStatic = supportedSystems;
+    zeromq3Haskell = supportedSystems;
+    zeromqHaskell = supportedSystems;
+    zipArchive = supportedSystems;
+    zipper = supportedSystems;
+    zlibBindings = supportedSystems;
+    zlibEnum = supportedSystems;
+    zlib = supportedSystems;
   };
 
   haskellPackages_ghc762 = {
-    alex = linux;
-    async = linux;
-    BNFC = linux;
-    cabal2nix = linux;
-    cabalDev = linux;
-    cabalGhci = linux;
-    cabalInstall = linux;
-    cgi = linux;
-    cmdlib = linux;
-    criterion = linux;
-    dimensional = linux;
-    dimensionalTf = linux;
-    doctest = linux;
-    fgl = linux;
-    funcmp = linux;
-    ghcMod = linux;
-    GLUT = linux;
-    graphviz = linux;
-    hackageDb = linux;
-    haddock = linux;
-    happy = linux;
-    haskellSrc = linux;
-    hledgerInterest = linux;
-    hledgerLib = linux;
-    hledger = linux;
-    hlint = linux;
-    HList = linux;
-    hoogle = linux;
-    hopenssl = linux;
-    hsdns = linux;
-    hsemail = linux;
-    hspec = linux;
-    HStringTemplate = linux;
-    hsyslog = linux;
-    html = linux;
-    HTTP = linux;
-    HUnit = linux;
-    jailbreakCabal = linux;
-    monadPar = linux;
-    mtl = linux;
-    network = linux;
-    OpenGL = linux;
-    pandoc = linux;
-    parallel = linux;
-    parsec = linux;
-    permutation = linux;
-    primitive = linux;
-    QuickCheck = linux;
-    random = linux;
-    regexBase = linux;
-    regexCompat = linux;
-    regexPosix = linux;
-    smallcheck = linux;
-    split = linux;
-    stm = linux;
-    streamproc = linux;
-    syb = linux;
-    tar = linux;
-    testFrameworkHunit = linux;
-    testFramework = linux;
-    text = linux;
-    transformers = linux;
-    uulib = linux;
-    vector = linux;
-    wlPprint = linux;
-    xhtml = linux;
-    xmobar = linux;
-    xmonadContrib = linux;
-    xmonadExtras = linux;
-    xmonad = linux;
-    zlib = linux;
+    alex = supportedSystems;
+    async = supportedSystems;
+    BNFC = supportedSystems;
+    cabal2nix = supportedSystems;
+    cabalDev = supportedSystems;
+    cabalGhci = supportedSystems;
+    cabalInstall = supportedSystems;
+    cgi = supportedSystems;
+    cmdlib = supportedSystems;
+    criterion = supportedSystems;
+    dimensional = supportedSystems;
+    dimensionalTf = supportedSystems;
+    doctest = supportedSystems;
+    fgl = supportedSystems;
+    funcmp = supportedSystems;
+    ghcMod = supportedSystems;
+    GLUT = supportedSystems;
+    graphviz = supportedSystems;
+    hackageDb = supportedSystems;
+    haddock = supportedSystems;
+    happy = supportedSystems;
+    haskellSrc = supportedSystems;
+    hledgerInterest = supportedSystems;
+    hledgerLib = supportedSystems;
+    hledger = supportedSystems;
+    hlint = supportedSystems;
+    HList = supportedSystems;
+    hoogle = supportedSystems;
+    hopenssl = supportedSystems;
+    hsdns = supportedSystems;
+    hsemail = supportedSystems;
+    hspec = supportedSystems;
+    HStringTemplate = supportedSystems;
+    hsyslog = supportedSystems;
+    html = supportedSystems;
+    HTTP = supportedSystems;
+    HUnit = supportedSystems;
+    jailbreakCabal = supportedSystems;
+    monadPar = supportedSystems;
+    mtl = supportedSystems;
+    network = supportedSystems;
+    OpenGL = supportedSystems;
+    pandoc = supportedSystems;
+    parallel = supportedSystems;
+    parsec = supportedSystems;
+    permutation = supportedSystems;
+    primitive = supportedSystems;
+    QuickCheck = supportedSystems;
+    random = supportedSystems;
+    regexBase = supportedSystems;
+    regexCompat = supportedSystems;
+    regexPosix = supportedSystems;
+    smallcheck = supportedSystems;
+    split = supportedSystems;
+    stm = supportedSystems;
+    streamproc = supportedSystems;
+    syb = supportedSystems;
+    tar = supportedSystems;
+    testFrameworkHunit = supportedSystems;
+    testFramework = supportedSystems;
+    text = supportedSystems;
+    transformers = supportedSystems;
+    uulib = supportedSystems;
+    vector = supportedSystems;
+    wlPprint = supportedSystems;
+    xhtml = supportedSystems;
+    xmobar = supportedSystems;
+    xmonadContrib = supportedSystems;
+    xmonadExtras = supportedSystems;
+    xmonad = supportedSystems;
+    zlib = supportedSystems;
   };
 
   haskellPackages_ghc704 = {
-    alex = linux;
-    cabal2nix = linux;
-    cabalInstall = linux;
-    cgi = linux;
-    fgl = linux;
-    funcmp = linux;
-    GLUT = linux;
-    haddock = linux;
-    happy = linux;
-    haskellPlatform = linux;
-    haskellSrc = linux;
-    hopenssl = linux;
-    hsdns = linux;
-    hsemail = linux;
-    hsyslog = linux;
-    html = linux;
-    HTTP = linux;
-    HUnit = linux;
+    alex = supportedSystems;
+    cabal2nix = supportedSystems;
+    cabalInstall = supportedSystems;
+    cgi = supportedSystems;
+    fgl = supportedSystems;
+    funcmp = supportedSystems;
+    GLUT = supportedSystems;
+    haddock = supportedSystems;
+    happy = supportedSystems;
+    haskellPlatform = supportedSystems;
+    haskellSrc = supportedSystems;
+    hopenssl = supportedSystems;
+    hsdns = supportedSystems;
+    hsemail = supportedSystems;
+    hsyslog = supportedSystems;
+    html = supportedSystems;
+    HTTP = supportedSystems;
+    HUnit = supportedSystems;
     # This attribute causes an infinite recursion in Hydra!
-    # jailbreakCabal = linux;
-    mtl = linux;
-    network = linux;
-    OpenGL = linux;
-    parallel = linux;
-    parsec = linux;
-    primitive = linux;
-    QuickCheck = linux;
-    regexBase = linux;
-    regexCompat = linux;
-    regexPosix = linux;
-    stm = linux;
-    streamproc = linux;
-    syb = linux;
-    text = linux;
-    transformers = linux;
-    vector = linux;
-    xhtml = linux;
-    zlib = linux;
+    # jailbreakCabal = supportedSystems;
+    mtl = supportedSystems;
+    network = supportedSystems;
+    OpenGL = supportedSystems;
+    parallel = supportedSystems;
+    parsec = supportedSystems;
+    primitive = supportedSystems;
+    QuickCheck = supportedSystems;
+    regexBase = supportedSystems;
+    regexCompat = supportedSystems;
+    regexPosix = supportedSystems;
+    stm = supportedSystems;
+    streamproc = supportedSystems;
+    syb = supportedSystems;
+    text = supportedSystems;
+    transformers = supportedSystems;
+    vector = supportedSystems;
+    xhtml = supportedSystems;
+    zlib = supportedSystems;
   };
 
   haskellPackages_ghc6123 = {
-    alex = linux;
-    cabal2nix = linux;
-    cabalInstall = linux;
-    cgi = linux;
-    fgl = linux;
-    funcmp = linux;
-    GLUT = linux;
-    haddock = linux;
-    happy = linux;
-    haskellPlatform = linux;
-    haskellSrc = linux;
-    hopenssl = linux;
-    hsdns = linux;
-    hsemail = linux;
-    hsyslog = linux;
-    html = linux;
-    HTTP = linux;
-    HUnit = linux;
+    alex = supportedSystems;
+    cabal2nix = supportedSystems;
+    cabalInstall = supportedSystems;
+    cgi = supportedSystems;
+    fgl = supportedSystems;
+    funcmp = supportedSystems;
+    GLUT = supportedSystems;
+    haddock = supportedSystems;
+    happy = supportedSystems;
+    haskellPlatform = supportedSystems;
+    haskellSrc = supportedSystems;
+    hopenssl = supportedSystems;
+    hsdns = supportedSystems;
+    hsemail = supportedSystems;
+    hsyslog = supportedSystems;
+    html = supportedSystems;
+    HTTP = supportedSystems;
+    HUnit = supportedSystems;
     # This attribute causes an infinite recursion in Hydra!
-    # jailbreakCabal = linux;
-    mtl = linux;
-    network = linux;
-    OpenGL = linux;
-    parallel = linux;
-    parsec = linux;
-    primitive = linux;
-    QuickCheck = linux;
-    regexBase = linux;
-    regexCompat = linux;
-    regexPosix = linux;
-    stm = linux;
-    streamproc = linux;
-    text = linux;
-    transformers = linux;
-    vector = linux;
-    xhtml = linux;
-    zlib = linux;
+    # jailbreakCabal = supportedSystems;
+    mtl = supportedSystems;
+    network = supportedSystems;
+    OpenGL = supportedSystems;
+    parallel = supportedSystems;
+    parsec = supportedSystems;
+    primitive = supportedSystems;
+    QuickCheck = supportedSystems;
+    regexBase = supportedSystems;
+    regexCompat = supportedSystems;
+    regexPosix = supportedSystems;
+    stm = supportedSystems;
+    streamproc = supportedSystems;
+    text = supportedSystems;
+    transformers = supportedSystems;
+    vector = supportedSystems;
+    xhtml = supportedSystems;
+    zlib = supportedSystems;
   };
 
   haskellPackages_ghc6104 = {
-    alex = linux;
-    cabalInstall = linux;
-    cgi = linux;
-    fgl = linux;
-    funcmp = linux;
-    GLUT = linux;
-    haddock = linux;
-    happy = linux;
-    haskellPlatform = linux;
-    haskellSrc = linux;
-    hopenssl = linux;
-    hsdns = linux;
-    hsyslog = linux;
-    html = linux;
-    HTTP = linux;
-    HUnit = linux;
+    alex = supportedSystems;
+    cabalInstall = supportedSystems;
+    cgi = supportedSystems;
+    fgl = supportedSystems;
+    funcmp = supportedSystems;
+    GLUT = supportedSystems;
+    haddock = supportedSystems;
+    happy = supportedSystems;
+    haskellPlatform = supportedSystems;
+    haskellSrc = supportedSystems;
+    hopenssl = supportedSystems;
+    hsdns = supportedSystems;
+    hsyslog = supportedSystems;
+    html = supportedSystems;
+    HTTP = supportedSystems;
+    HUnit = supportedSystems;
     # This attribute causes an infinite recursion in Hydra!
-    # jailbreakCabal = linux;
-    mtl = linux;
-    network = linux;
-    OpenGL = linux;
-    parallel = linux;
-    parsec = linux;
-    primitive = linux;
-    QuickCheck = linux;
-    regexBase = linux;
-    regexCompat = linux;
-    regexPosix = linux;
-    stm = linux;
-    streamproc = linux;
-    text = linux;
-    transformers = linux;
-    vector = linux;
-    xhtml = linux;
-    zlib = linux;
+    # jailbreakCabal = supportedSystems;
+    mtl = supportedSystems;
+    network = supportedSystems;
+    OpenGL = supportedSystems;
+    parallel = supportedSystems;
+    parsec = supportedSystems;
+    primitive = supportedSystems;
+    QuickCheck = supportedSystems;
+    regexBase = supportedSystems;
+    regexCompat = supportedSystems;
+    regexPosix = supportedSystems;
+    stm = supportedSystems;
+    streamproc = supportedSystems;
+    text = supportedSystems;
+    transformers = supportedSystems;
+    vector = supportedSystems;
+    xhtml = supportedSystems;
+    zlib = supportedSystems;
   };
 
-})
+}

From a9c7252a3ed7848f5692f262566b98751365e8ae Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 29 Mar 2013 17:38:59 +0100
Subject: [PATCH 255/394] i3status and i3lock should have same platform as i3wm

---
 pkgs/applications/window-managers/i3/lock.nix   | 2 +-
 pkgs/applications/window-managers/i3/status.nix | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 12e4c91e24d0..2fa43d2730c1 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = http://i3wm.org;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     license = stdenv.lib.licenses.bsd3;
-  };
+    platforms = stdenv.lib.plaforms.all; };
 
 }
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 76fc487ba4ab..752f90a1bfd2 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     homepage = http://i3wm.org;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.plaforms.all;
   };
 
 }

From 34e0c33d6fefef056509b564bd5317c06011569f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 29 Mar 2013 12:41:38 -0400
Subject: [PATCH 256/394] Allow overriding perlPackages

__overrides is the worst.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/all-packages.nix  | 1 +
 pkgs/top-level/perl-packages.nix | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05e57e5cbeec..31251ccddeef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5252,6 +5252,7 @@ let
 
   perlPackages = recurseIntoAttrs (import ./perl-packages.nix {
     inherit pkgs;
+    __overrides = (config.perlPackageOverrides or (p: {})) pkgs;
   });
 
   perl510Packages = import ./perl-packages.nix {
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4291fde5908e..2856ae88e374 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5,12 +5,14 @@
    for each package in a separate file: the call to the function would
    be almost as must code as the function itself. */
 
-{pkgs}:
+{pkgs, __overrides}:
 
 rec {
 
   inherit (pkgs) buildPerlPackage fetchurl stdenv perl fetchsvn;
 
+  inherit __overrides;
+
   # Helper functions for packages that use Module::Build to build.
   buildPerlModule = { buildInputs ? [], ... } @ args:
     buildPerlPackage (args // {

From 2670f68f54789dcfd368602882aadc82ac33d412 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 00:29:08 +0100
Subject: [PATCH 257/394] haskell-conduit: update to version 1.0.4.2

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 4d0650747d13..1a5ef7b4f702 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.4.1";
-  sha256 = "1fihn6ixs6cmim5y605w2mzjrcwplr58r835wq9k3arb25d5wnys";
+  version = "1.0.4.2";
+  sha256 = "11xrqn7jc4vccfwds6hy0d3jpm0d0ycwaszv18xk237zwl63w159";
   buildDepends = [
     liftedBase mmorph monadControl resourcet text transformers
     transformersBase void

From 8c8b243570615c6eda6c9fba4b22d0ba7b6c2ad4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 00:29:08 +0100
Subject: [PATCH 258/394] haskell-fclabels: update to version 1.1.5

---
 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 9ab8c6a0a3ea..7c64e9a2511b 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.4.3";
-  sha256 = "10qr0ncsqxg0dg2f73ip873gr342saxhidaf3c6g5vr03cvmmkap";
+  version = "1.1.5";
+  sha256 = "0g9h1mayzf8v9dg84b54cqjbz9m9hdmj9a2zh0lg2kbc1v7iwlx1";
   buildDepends = [ mtl transformers ];
   meta = {
     description = "First class accessor labels";

From 484b5c34d3f7362e8468455523ed6a5cdf17e1ba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 00:29:08 +0100
Subject: [PATCH 259/394] haskell-generic-deriving: update to version 1.5.0

---
 .../libraries/haskell/generic-deriving/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
index 8082201e71ce..c5a62b967aa0 100644
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "generic-deriving";
-  version = "1.4.0";
-  sha256 = "15av3l4m4qn5by41rkpdvp1kyp3fi9ixvy76wmyj20c46kjbmra7";
+  version = "1.5.0";
+  sha256 = "1m3hckwpzmarlvm2xq22za3386ady6p89kg7nd8cnjkifnnbz20r";
   meta = {
     description = "Generic programming library for generalised deriving";
     license = self.stdenv.lib.licenses.bsd3;

From 9f260baa506058fed3dea3753b2fed2e4b36c612 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 00:29:09 +0100
Subject: [PATCH 260/394] haskell-lens: update to version 3.9.0.2

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

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 1dfd50f69e14..ef0b46b236d9 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "3.8.7.3";
-  sha256 = "0z28vv3k6zg2zsd3pb1vlhv75q0zjlh4zf1md77cviyyljwc0j09";
+  version = "3.9.0.2";
+  sha256 = "0ch38z33zgdyzjmc7jqwabwq68iidicpzhbwzpd4fvcqdp27apl2";
   buildDepends = [
     bifunctors comonad comonadsFd comonadTransformers contravariant
     distributive filepath genericDeriving hashable

From 44cf7ed71c907af437a4fd526d43e51f293648af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 00:29:09 +0100
Subject: [PATCH 261/394] haskell-liblastfm: update to version 0.1.1.1

---
 .../libraries/haskell/liblastfm/default.nix          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
index 323f1797fef0..096a39b9a3b3 100644
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@@ -1,14 +1,18 @@
-{ cabal, aeson, cereal, cryptoApi, httpConduit, httpTypes, network
-, pureMD5, text
+{ cabal, aeson, attoparsec, cereal, cryptoApi, httpConduit
+, httpTypes, HUnit, network, pureMD5, testFramework
+, testFrameworkHunit, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "liblastfm";
-  version = "0.1.1.0";
-  sha256 = "1yrgyb0m1gdhsrkv3b8a5a0qii67v9gx1kbv79ixlac60bsm4q95";
+  version = "0.1.1.1";
+  sha256 = "1svqxi85n18r9szmlcny51j71zzkki9pnfxnxim78y5vh0nf82qv";
   buildDepends = [
     aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
   ];
+  testDepends = [
+    aeson attoparsec HUnit testFramework testFrameworkHunit text
+  ];
   meta = {
     description = "Lastfm API interface";
     license = self.stdenv.lib.licenses.mit;

From 4ad1be1b3e4828c002bc57f56a8073387160d4fd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 00:29:09 +0100
Subject: [PATCH 262/394] haskell-multiarg: update to version 0.12.0.0

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

diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index 9af9210d74cb..c8a7b479c54f 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.10.0.0";
-  sha256 = "09clgin66i2m0b3ws7di9p15cy9bd144as832xpx4li6cfbg16ip";
+  version = "0.12.0.0";
+  sha256 = "1v2bfqbjk4wxn5dzd7asqcfidlr9bmwc5yy7awp86ch669kjnbzd";
   buildDepends = [ explicitException utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";

From 71b00ef300e62d8ab41d764ed7eed5d116bb0afe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 00:29:09 +0100
Subject: [PATCH 263/394] haskell-unix-compat: update to version 0.4.1.1

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

diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix
index d65a440bb22f..35097601783a 100644
--- a/pkgs/development/libraries/haskell/unix-compat/default.nix
+++ b/pkgs/development/libraries/haskell/unix-compat/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-compat";
-  version = "0.4.1.0";
-  sha256 = "155m3zg692zbfyck4njx1vzvb5vgs0dkzyzlqf2x78ds6j9bzjzi";
+  version = "0.4.1.1";
+  sha256 = "1cjny6zca5wdj7d56kjkaxlad85kknn91pisrizjy6wngszyaigf";
   meta = {
     homepage = "http://github.com/jystic/unix-compat";
     description = "Portable POSIX-compatibility layer";

From 7d64583919ccdb0eabc53f576b06f9821aeef65b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 01:44:30 +0100
Subject: [PATCH 264/394] haskell-persistent-postgresql: jailbreak to fix build
 with latest version of postgres-simple

---
 .../libraries/haskell/persistent-postgresql/default.nix          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index 0ee5e625db4f..885ad70f63fa 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     aeson conduit monadControl persistent postgresqlLibpq
     postgresqlSimple text time transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
     description = "Backend for the persistent library using postgresql";

From 8f2c094801747344346172fa11aa35acd4729b44 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 14:40:12 +0100
Subject: [PATCH 265/394] haskell-dual-tree: update to version 0.1.0.2

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

diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix
index a37b86521502..54f1da653161 100644
--- a/pkgs/development/libraries/haskell/dual-tree/default.nix
+++ b/pkgs/development/libraries/haskell/dual-tree/default.nix
@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "dual-tree";
-  version = "0.1.0.1";
-  sha256 = "09bdid65frccpbh1bs01f7vprq0vfgqsb5bfa4j8yi3q773mycb2";
+  version = "0.1.0.2";
+  sha256 = "0ys50m8yjksxi33qyk6ql4ldpdzb0fvxqvywi3y46xi16w5yrkb0";
   buildDepends = [ monoidExtras newtype semigroups ];
-  jailbreak = true;
   meta = {
     description = "Rose trees with cached and accumulating monoidal annotations";
     license = self.stdenv.lib.licenses.bsd3;

From b5bda573d5fd9fde2c657624d6ce5e9100a35af2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 14:40:12 +0100
Subject: [PATCH 266/394] haskell-monoid-extras: update to version 0.2.2.3

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

diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index 1161fe817b5a..96f254d077e3 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "monoid-extras";
-  version = "0.2.2.2";
-  sha256 = "1fz93hm0sswisvwvbygxvbwmmnzqcxmz9h82i4361wzychf2si22";
+  version = "0.2.2.3";
+  sha256 = "00yj7wdyznsis82fb7i07s0vz8vsn2mpqk7jkgl9xxa57gk1rsax";
   buildDepends = [ semigroups ];
-  jailbreak = true;
   meta = {
     description = "Various extra monoid-related definitions and utilities";
     license = self.stdenv.lib.licenses.bsd3;

From 0e32b1462bf0806f00f315c30eb9a7edec2c5da9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 14:40:12 +0100
Subject: [PATCH 267/394] haskell-vector-space-points: update to version
 0.1.2.1

---
 .../libraries/haskell/vector-space-points/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix
index 264391de95f5..37a131a32443 100644
--- a/pkgs/development/libraries/haskell/vector-space-points/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vector-space-points";
-  version = "0.1.2.0";
-  sha256 = "19azl6g14rsxs0qbik6x637qw9jv4xl01w65xd0xh7833mypmj6d";
+  version = "0.1.2.1";
+  sha256 = "0prbmk48xdr2gbxqpv0g89xz5v3k9wps9v2gymkh32jag2lgzi66";
   buildDepends = [ newtype vectorSpace ];
   meta = {
     description = "A type for points, as distinct from vectors";

From 504d9563a4558d3b6de6999eb2de0da002ae96fe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 13:30:50 +0100
Subject: [PATCH 268/394] haskell-case-insensitive: update to version 1.0.0.1

---
 .../libraries/haskell/case-insensitive/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix
index c43ea95322d4..06a75132869d 100644
--- a/pkgs/development/libraries/haskell/case-insensitive/default.nix
+++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "case-insensitive";
-  version = "1.0";
-  sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk";
+  version = "1.0.0.1";
+  sha256 = "1yp8895qvxcmai0hvxdq77qss9cia2f9fyn6rm0hln3rcx8n53xm";
   buildDepends = [ deepseq hashable text ];
   testDepends = [ HUnit testFramework testFrameworkHunit text ];
   meta = {

From c24df87bfeb4a5c7f3467858dd0eb0acb1ba3002 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 13:30:50 +0100
Subject: [PATCH 269/394] haskell-certificate: update to version 1.3.6

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

diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
index ac792514386a..0adaabb4753d 100644
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ b/pkgs/development/libraries/haskell/certificate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "certificate";
-  version = "1.3.5";
-  sha256 = "17g2alyib89y2k8jjg4b6jskz0ndpr92yi8hzra7vw7ygfi5mi4j";
+  version = "1.3.6";
+  sha256 = "1w7xndslapy4ycgf2xshgx90i3v04nsck9l2mzc74nrnwm817b2m";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From deeb058dfbdf83299448af479fb8286f3d213363 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 13:30:50 +0100
Subject: [PATCH 270/394] haskell-diagrams-lib: update to version 0.6.0.2

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

diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index d83a43bbadbb..ae466ad26234 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -4,13 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "0.6.0.1";
-  sha256 = "00ysdppl2jv0kspj0pjy8qj8shc9gg6g10lkq62vlvr39wnxx6yj";
+  version = "0.6.0.2";
+  sha256 = "0jxpbggwgbjnl2yx7y0zcjs2fls7y1wm33wllq5j9snkiz1n81hb";
   buildDepends = [
     active colour dataDefault diagramsCore monoidExtras newtype
     NumInstances semigroups vectorSpace
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Embedded domain-specific language for declarative graphics";

From eb665f3b3dd9ccd370a5070c062c56d5c9f66556 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 13:30:50 +0100
Subject: [PATCH 271/394] haskell-lifted-base: update to version 0.2.0.3

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

diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index 2eaf950023a6..bd3dd5032453 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.2.0.2";
-  sha256 = "19xzparj0k5h4wx71gvbd7l653fak1p57za236sncmar8cps5pdx";
+  version = "0.2.0.3";
+  sha256 = "1sfrak4jf3mvns9y6iadyhj8zvy4wyrqiaxihrxv2qby14c45psx";
   buildDepends = [
     baseUnicodeSymbols monadControl transformersBase
   ];

From 717d894f8389742fffcf9abbddb36c5da5b2ff8b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 13:30:50 +0100
Subject: [PATCH 272/394] haskell-profunctors: update to version 3.3.0.1

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

diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix
index 936230131e7e..f141959dcf1a 100644
--- a/pkgs/development/libraries/haskell/profunctors/default.nix
+++ b/pkgs/development/libraries/haskell/profunctors/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "profunctors";
-  version = "3.3";
-  sha256 = "0cvar0qr2yf0lmqwhiy2ibajiq9cmqy2ikwn8l5mdxxh5q5rwgjj";
+  version = "3.3.0.1";
+  sha256 = "16d7xg929r4smmmcgi54bz7rsjxs6psksrdvzl4336sjpp3dw5h2";
   buildDepends = [ comonad tagged ];
   meta = {
     homepage = "http://github.com/ekmett/profunctors/";

From 78b8be47e2980d40b29955f394350c64d2fdcbcf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 13:30:50 +0100
Subject: [PATCH 273/394] haskell-reflection: update to version 1.2.0.1

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

diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix
index 9d3acb72d6b9..d18f711cab32 100644
--- a/pkgs/development/libraries/haskell/reflection/default.nix
+++ b/pkgs/development/libraries/haskell/reflection/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reflection";
-  version = "1.1.7";
-  sha256 = "073v9y09fvh7nsfqp1jp2ncrq0xkcv5fvikl769ghv2ycgkfxl4z";
+  version = "1.2.0.1";
+  sha256 = "17pzw45yr13nq9y9nb3siypj5amkixy82xm8bpy0nzs1cdfyawx6";
   buildDepends = [ tagged ];
   meta = {
     homepage = "http://github.com/ekmett/reflection";

From a1d4a00dcdcbe8bae546f055b1c5fa21ea87bce4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 16:35:50 +0100
Subject: [PATCH 274/394] haskell-snap: jailbreak to support building with lens
 3.9.0.2

---
 pkgs/development/libraries/haskell/snap/snap.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index f5da92f6c8e3..8462b85caf99 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     unorderedContainers vector vectorAlgorithms xmlhtml
   ];
   jailbreak = true;
+  patchPhase = ''
+    sed -i -e 's|lens .*>= 3.7.6.*$|lens|' snap.cabal
+  '';
   meta = {
     homepage = "http://snapframework.com/";
     description = "Top-level package for the Snap Web Framework";

From 8a134745de8e81282c6aaedb33940244246df1b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 16:41:26 +0100
Subject: [PATCH 275/394] haskell-hspec-expectations: add version 0.3.2

---
 .../{default.nix => 0.3.0.3.nix}                |  0
 .../haskell/hspec-expectations/0.3.2.nix        | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  4 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/hspec-expectations/{default.nix => 0.3.0.3.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/hspec-expectations/0.3.2.nix

diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/0.3.0.3.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/hspec-expectations/default.nix
rename to pkgs/development/libraries/haskell/hspec-expectations/0.3.0.3.nix
diff --git a/pkgs/development/libraries/haskell/hspec-expectations/0.3.2.nix b/pkgs/development/libraries/haskell/hspec-expectations/0.3.2.nix
new file mode 100644
index 000000000000..52defb43e4cb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hspec-expectations/0.3.2.nix
@@ -0,0 +1,17 @@
+{ cabal, hspec, HUnit, markdownUnlit, silently }:
+
+cabal.mkDerivation (self: {
+  pname = "hspec-expectations";
+  version = "0.3.2";
+  sha256 = "0962wlngqck0wc7mcby9bzci1s8d9a91vsm39rnab5wifhc2c6xi";
+  buildDepends = [ HUnit ];
+  testDepends = [ hspec HUnit markdownUnlit silently ];
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/sol/hspec-expectations#readme";
+    description = "Catchy combinators for HUnit";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 37fe7cbe281c..70f6aac74301 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1109,7 +1109,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hspec = callPackage ../development/libraries/haskell/hspec {};
 
-  hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {};
+  hspecExpectations_0_3_0_3 = callPackage ../development/libraries/haskell/hspec-expectations/0.3.0.3.nix {};
+  hspecExpectations_0_3_2 = callPackage ../development/libraries/haskell/hspec-expectations/0.3.2.nix {};
+  hspecExpectations = self.hspecExpectations_0_3_0_3;
 
   hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {};
 

From 82030c4ba21d8c202372e78962f7340ef768fb11 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 16:43:26 +0100
Subject: [PATCH 276/394] haskell-split: add version 0.2.1.3

---
 .../libraries/haskell/split/{0.2.1.2.nix => 0.2.1.3.nix}    | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/split/{0.2.1.2.nix => 0.2.1.3.nix} (81%)

diff --git a/pkgs/development/libraries/haskell/split/0.2.1.2.nix b/pkgs/development/libraries/haskell/split/0.2.1.3.nix
similarity index 81%
rename from pkgs/development/libraries/haskell/split/0.2.1.2.nix
rename to pkgs/development/libraries/haskell/split/0.2.1.3.nix
index 0482fb243a51..ebadd0f9ba30 100644
--- a/pkgs/development/libraries/haskell/split/0.2.1.2.nix
+++ b/pkgs/development/libraries/haskell/split/0.2.1.3.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "split";
-  version = "0.2.1.2";
-  sha256 = "0wjw4j9wgk66h7filzfh0py9b0wwmaynvwqvd6kinxgms86fpvyi";
+  version = "0.2.1.3";
+  sha256 = "1s3aga7asxz495bx7i72a6fkdlz1zv20rrrqg1avj7b1sjn3gy9w";
   testDepends = [ QuickCheck ];
   meta = {
     description = "Combinator library for splitting lists";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 70f6aac74301..17a43606a4e8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -150,7 +150,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     regexBase    = self.regexBase_0_93_2;       # 7.6 ok
     regexCompat  = self.regexCompat_0_95_1;     # 7.6 ok
     regexPosix   = self.regexPosix_0_95_2;      # 7.6 ok
-    split        = self.split_0_2_1_2;          # 7.6 ok
+    split        = self.split_0_2_1_3;          # 7.6 ok
     stm          = self.stm_2_4_2;              # 7.6 ok
     syb          = self.syb_0_4_0;              # 7.6 ok
     text         = self.text_0_11_2_3;          # 7.6 ok
@@ -1697,8 +1697,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
 
   split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {};
-  split_0_2_1_2 = callPackage ../development/libraries/haskell/split/0.2.1.2.nix {};
-  split = self.split_0_2_1_2;
+  split_0_2_1_3 = callPackage ../development/libraries/haskell/split/0.2.1.3.nix {};
+  split = self.split_0_2_1_3;
 
   stbImage = callPackage ../development/libraries/haskell/stb-image {};
 

From e83c6b27495fee55e83618e61883692be8ba83b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 17:05:40 +0100
Subject: [PATCH 277/394] haskell-language-c-quote: add version 0.7.1

---
 .../{default.nix => 0.4.4.nix}                |  0
 .../haskell/language-c-quote/0.7.1.nix        | 28 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++-
 3 files changed, 31 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/language-c-quote/{default.nix => 0.4.4.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix

diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/0.4.4.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/language-c-quote/default.nix
rename to pkgs/development/libraries/haskell/language-c-quote/0.4.4.nix
diff --git a/pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix b/pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix
new file mode 100644
index 000000000000..1ce3ceaac825
--- /dev/null
+++ b/pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix
@@ -0,0 +1,28 @@
+{ cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy
+, haskellSrcMeta, HUnit, mainlandPretty, mtl, srcloc, syb, symbol
+, testFramework, testFrameworkHunit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "language-c-quote";
+  version = "0.7.1";
+  sha256 = "14gh944wpwg4csxwswr9jlll4p5wc3x1fhbqsfh9lqf98ys7ij3z";
+  buildDepends = [
+    exceptionMtl exceptionTransformers filepath haskellSrcMeta
+    mainlandPretty mtl srcloc syb symbol
+  ];
+  testDepends = [
+    HUnit srcloc symbol testFramework testFrameworkHunit
+  ];
+  buildTools = [ alex happy ];
+  meta = {
+    homepage = "http://www.eecs.harvard.edu/~mainland/";
+    description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
+    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 17a43606a4e8..479c140900a4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1191,7 +1191,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   languageC_0_3_2_1 = callPackage ../development/libraries/haskell/language-c/0.3.2.1.nix {};
   languageC = self.languageC_0_4_2;
 
-  languageCQuote = callPackage ../development/libraries/haskell/language-c-quote/default.nix {};
+  languageCQuote_0_4_4 = callPackage ../development/libraries/haskell/language-c-quote/0.4.4.nix {};
+  languageCQuote_0_7_1 = callPackage ../development/libraries/haskell/language-c-quote/0.7.1.nix {};
+  languageCQuote = self.languageCQuote_0_7_1;
 
   languageJavascript = callPackage ../development/libraries/haskell/language-javascript {};
 

From 905c058b6d20109bb91cde6da709bbbefdfa961c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 17:18:31 +0100
Subject: [PATCH 278/394] haskell-accelerate-cuda needs old version of
 language-c-quote.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 479c140900a4..9b3c33c41981 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -444,7 +444,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   accelerate = callPackage ../development/libraries/haskell/accelerate {};
 
-  accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {};
+  accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {
+    languageCQuote = self.languageCQuote_0_4_4;
+  };
 
   accelerateExamples = callPackage ../development/libraries/haskell/accelerate-examples {};
 

From eb2e3f648aa78f9fa8395eefcbb37974b4f14366 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 29 Mar 2013 13:07:26 -0400
Subject: [PATCH 279/394] Pass overrides for perl510Packages too

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31251ccddeef..f94765a2cbcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5260,6 +5260,7 @@ let
       perl = perl510;
       buildPerlPackage = import ../development/perl-modules/generic perl510;
     };
+    __overrides = (config.perl510PackageOverrides or (p: {})) pkgs;
   };
 
   perlXMLParser = perlPackages.XMLParser;

From 6c890824bddecb77b7450e168d75fad963183451 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 29 Mar 2013 18:24:24 +0100
Subject: [PATCH 280/394] fixed typo from previous commit

---
 pkgs/applications/window-managers/i3/lock.nix   | 3 ++-
 pkgs/applications/window-managers/i3/status.nix | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 2fa43d2730c1..2331b1eaf815 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     homepage = http://i3wm.org;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.plaforms.all; };
+    platforms = stdenv.lib.platforms.all;
+  };
 
 }
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 752f90a1bfd2..7317f17bb8b2 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     homepage = http://i3wm.org;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.plaforms.all;
+    platforms = stdenv.lib.platforms.all;
   };
 
 }

From 92f72cb80fbcadbcf41797add1004cd344fc6d87 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 29 Mar 2013 18:32:32 +0100
Subject: [PATCH 281/394] pwgen, wgetpaste: set platforms

---
 pkgs/tools/security/pwgen/default.nix | 1 +
 pkgs/tools/text/wgetpaste/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix
index 72ca4c987c59..ecbc95362e61 100644
--- a/pkgs/tools/security/pwgen/default.nix
+++ b/pkgs/tools/security/pwgen/default.nix
@@ -8,5 +8,6 @@ stdenv.mkDerivation {
   };
   meta = {
 	description = "Small, GPL'ed password generator which creates passwords which can be easily memorized by a human.";
+        platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index 63313872ede9..04102093aae4 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -23,5 +23,6 @@
       homepage = http://wgetpaste.zlin.dk/;
       license = "publicDomain";
       maintainers = with stdenv.lib.maintainers; [qknight];
+      platforms = stdenv.lib.platforms.all;
     };
   }

From 7405ddee2f3f33a6ebc1a1055a4a1190193e5952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 29 Mar 2013 18:33:28 +0100
Subject: [PATCH 282/394] gcc47: fixing the arm eabi hf build

Picking an upstream gcc patch.
---
 .../compilers/gcc/4.7/arm-eabi.patch          | 230 ++++++++++++++++++
 .../development/compilers/gcc/4.7/default.nix |   2 +-
 2 files changed, 231 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/4.7/arm-eabi.patch

diff --git a/pkgs/development/compilers/gcc/4.7/arm-eabi.patch b/pkgs/development/compilers/gcc/4.7/arm-eabi.patch
new file mode 100644
index 000000000000..63b017062b5b
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.7/arm-eabi.patch
@@ -0,0 +1,230 @@
+Index: gcc-4_7-branch/libstdc++-v3/configure.host
+===================================================================
+--- gcc-4_7-branch/libstdc++-v3/configure.host	(revision 194579)
++++ gcc-4_7-branch/libstdc++-v3/configure.host	(revision 194580)
+@@ -340,7 +340,7 @@
+         fi
+     esac
+     case "${host}" in
+-      arm*-*-linux-*eabi)
++      arm*-*-linux-*eabi*)
+ 	port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
+ 	;;
+     esac
+Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
+===================================================================
+--- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	(revision 194579)
++++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	(revision 194580)
+@@ -1,5 +1,5 @@
+ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
+-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
+ //
+Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
+===================================================================
+--- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	(revision 194579)
++++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	(revision 194580)
+@@ -1,5 +1,5 @@
+ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
+-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
+ //
+Index: gcc-4_7-branch/libjava/configure.ac
+===================================================================
+--- gcc-4_7-branch/libjava/configure.ac	(revision 194579)
++++ gcc-4_7-branch/libjava/configure.ac	(revision 194580)
+@@ -931,7 +931,7 @@
+     # on Darwin -single_module speeds up loading of the dynamic libraries.
+     extra_ldflags_libjava=-Wl,-single_module
+     ;;
+-arm*linux*eabi)
++arm*-*-linux*eabi*)
+     # Some of the ARM unwinder code is actually in libstdc++.  We
+     # could in principle replicate it in libgcj, but it's better to
+     # have a dependency on libstdc++.
+Index: gcc-4_7-branch/libjava/configure
+===================================================================
+--- gcc-4_7-branch/libjava/configure	(revision 194579)
++++ gcc-4_7-branch/libjava/configure	(revision 194580)
+@@ -20542,7 +20542,7 @@
+     # on Darwin -single_module speeds up loading of the dynamic libraries.
+     extra_ldflags_libjava=-Wl,-single_module
+     ;;
+-arm*linux*eabi)
++arm*-*-linux*eabi*)
+     # Some of the ARM unwinder code is actually in libstdc++.  We
+     # could in principle replicate it in libgcj, but it's better to
+     # have a dependency on libstdc++.
+Index: gcc-4_7-branch/libgcc/config.host
+===================================================================
+--- gcc-4_7-branch/libgcc/config.host	(revision 194579)
++++ gcc-4_7-branch/libgcc/config.host	(revision 194580)
+@@ -327,7 +327,7 @@
+ arm*-*-linux*)			# ARM GNU/Linux with ELF
+ 	tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix"
+ 	case ${host} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	  tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
+ 	  tm_file="$tm_file arm/bpabi-lib.h"
+ 	  unwind_header=config/arm/unwind-arm.h
+Index: gcc-4_7-branch/gcc/doc/install.texi
+===================================================================
+--- gcc-4_7-branch/gcc/doc/install.texi	(revision 194579)
++++ gcc-4_7-branch/gcc/doc/install.texi	(revision 194580)
+@@ -3222,7 +3222,7 @@
+ @heading @anchor{arm-x-eabi}arm-*-eabi
+ ARM-family processors.  Subtargets that use the ELF object format
+ require GNU binutils 2.13 or newer.  Such subtargets include:
+-@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi}
++@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi*}
+ and @code{arm-*-rtemseabi}.
+ 
+ @html
+Index: gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c	(revision 194580)
+@@ -1,4 +1,4 @@
+-/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi } } } */
++/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi* } } } */
+ 
+ void *foo (void)
+ {
+Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C	(revision 194580)
+@@ -7,10 +7,10 @@
+ // enum-size attributes should only be emitted if there are values of
+ // enum type that can escape the compilation unit, gcc cannot currently
+ // detect this; if this facility is added then this linker option should
+-// not be needed.  arm-*-linux*eabi should be a good approximation to
++// not be needed.  arm-*-linux*eabi* should be a good approximation to
+ // those platforms where the EABI supplement defines enum values to be
+ // 32 bits wide.
+-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ #include <limits.h>
+ 
+Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C	(revision 194580)
+@@ -9,10 +9,10 @@
+ // enum-size attributes should only be emitted if there are values of
+ // enum type that can escape the compilation unit, gcc cannot currently
+ // detect this; if this facility is added then this linker option should
+-// not be needed.  arm-*-linux*eabi should be a good approximation to
++// not be needed.  arm-*-linux*eabi* should be a good approximation to
+ // those platforms where the EABI supplement defines enum values to be
+ // 32 bits wide.
+-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ enum E { 
+   a = -312
+Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C	(revision 194580)
+@@ -7,10 +7,10 @@
+ // enum-size attributes should only be emitted if there are values of
+ // enum type that can escape the compilation unit, gcc cannot currently
+ // detect this; if this facility is added then this linker option should
+-// not be needed.  arm-*-linux*eabi should be a good approximation to
++// not be needed.  arm-*-linux*eabi* should be a good approximation to
+ // those platforms where the EABI supplement defines enum values to be
+ // 32 bits wide.
+-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ // GROUPS passed enums
+   extern "C" int printf (const char *, ...);
+Index: gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp	(revision 194580)
+@@ -3818,7 +3818,7 @@
+ 		}
+ 	    } ""
+ 	}]
+-    } elseif { [istarget arm*-*-linux-gnueabi] } {
++    } elseif { [istarget arm*-*-linux-gnueabi*] } {
+ 	return [check_runtime sync_longlong_runtime {
+ 	    #include <stdlib.h>
+ 	    int main ()
+@@ -3860,7 +3860,7 @@
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-gnueabi*] 
+ 	     || [istarget bfin*-*linux*]
+ 	     || [istarget hppa*-*linux*]
+ 	     || [istarget s390*-*-*] 
+@@ -3890,7 +3890,7 @@
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-gnueabi*] 
+ 	     || [istarget hppa*-*linux*]
+ 	     || [istarget s390*-*-*] 
+ 	     || [istarget powerpc*-*-*]
+Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90	(revision 194580)
+@@ -1,6 +1,6 @@
+ ! { dg-do run }
+ ! { dg-options "-fshort-enums" }
+-! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ ! Program to test enumerations when option -fshort-enums is given
+ 
+ program main
+Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90	(revision 194580)
+@@ -1,7 +1,7 @@
+ ! { dg-do run }
+ ! { dg-additional-sources enum_10.c }
+ ! { dg-options "-fshort-enums -w" }
+-! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ ! Make sure short enums are indeed interoperable with the
+ ! corresponding C type.
+ 
+Index: gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in
+===================================================================
+--- gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in	(revision 194579)
++++ gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in	(revision 194580)
+@@ -1866,7 +1866,7 @@
+   LIBRARY_VERSION := $(LIB_VERSION)
+ endif
+ 
+-ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
++ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),)
+   LIBGNAT_TARGET_PAIRS = \
+   a-intnam.ads<a-intnam-linux.ads \
+   s-inmaop.adb<s-inmaop-posix.adb \
+Index: gcc-4_7-branch/gcc/config.gcc
+===================================================================
+--- gcc-4_7-branch/gcc/config.gcc	(revision 194579)
++++ gcc-4_7-branch/gcc/config.gcc	(revision 194580)
+@@ -855,7 +855,7 @@
+ 	esac
+ 	tmake_file="${tmake_file} arm/t-arm"
+ 	case ${target} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+ 	    # Define multilib configuration for arm-linux-androideabi.
diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix
index 62a86751a712..3925ce1f7fa5 100644
--- a/pkgs/development/compilers/gcc/4.7/default.nix
+++ b/pkgs/development/compilers/gcc/4.7/default.nix
@@ -54,7 +54,7 @@ let version = "4.7.2";
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
 
-    patches = [ ]
+    patches = [ ./arm-eabi.patch ]
       ++ optional (cross != null) ./libstdc++-target.patch
       # ++ optional noSysDirs ./no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

From eff57f3b9e22cd880a66a151d802f2d1f217ae6a Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 29 Mar 2013 18:35:50 +0100
Subject: [PATCH 283/394] ncmpcpp: set platforms

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

diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index a7fca8cabf1b..b6ac7f26d601 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
     homepage = http://unkart.ovh.org/ncmpcpp/;
     license = "GPLv2+";
     maintainers = [ stdenv.lib.maintainers.mornfall ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
 

From 9a31d2ef0d09291c71e12a23f2fe10dc85c950b6 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 29 Mar 2013 19:02:51 +0100
Subject: [PATCH 284/394] aircrack-ng: bump

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

diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index c616ba9ee160..be4bfb20dfa0 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchsvn, libpcap, openssl, zlib, wirelesstools}:
 
 let
-  rev = "2212";
+  rev = "2268";
 in
 stdenv.mkDerivation rec {
   name = "aircrack-ng-1.1-${rev}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   src = fetchsvn {
     url = "http://trac.aircrack-ng.org/svn/trunk";
     inherit rev;
-    sha256 = "80e567b4e4bc501721cd58f7efadcd13fc3b235a41486174826694a6e701ce09";
+    sha256 = "0zjkk3s65v9w92fhzhyknhjcsx6whcm0an0qcawn2ggs0n0ss9ij";
   };
 
   buildInputs = [libpcap openssl zlib];

From 694ecd473742e15da227c3cd86c926855cf99f79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 19:04:00 +0100
Subject: [PATCH 285/394] libtirpc: update to version 0.2.3

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

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index e3fd2bc34ff4..431b87739783 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-0.2.2";
+  name = "libtirpc-0.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705";
+    sha256 = "0g4jd8da0kfxz5lv1x5v7f3mfxw53cck8g2zz4llrjmlj42flaag";
   };
 
   # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf

From bd1c8a50489b72f7c55cacb50bed29e2de5be6c8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Mar 2013 20:08:34 +0100
Subject: [PATCH 286/394] prettytable: Update to 0.7.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11890bf0b3c4..993dbd3291ba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2776,11 +2776,11 @@ pythonPackages = python.modules // rec {
 
 
   prettytable = buildPythonPackage rec {
-    name = "prettytable-0.5";
+    name = "prettytable-0.7.1";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.gz";
-      md5 = "13a6930d775395f393afd86948afa4fa";
+      url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.bz2";
+      sha1 = "ad346a18d92c1d95f2295397c7a8a4f489e48851";
     };
 
     meta = {

From 4576896ef55e57e914f97a6599ed4b74e4bd4641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 29 Mar 2013 21:34:53 +0100
Subject: [PATCH 287/394] pthread-win32: use `mingw_headers3', for consistency
 with `gccCrossStageFinal'

---
 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 f94765a2cbcb..c9037e91b18b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6329,7 +6329,7 @@ let
     };
 
     pthreads = callPackage ../os-specific/windows/pthread-w32 {
-      mingw_headers = mingw_headers2;
+      mingw_headers = mingw_headers3;
     };
 
     wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { };

From ea304762fee1f13ad220c784299261d048761929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 29 Mar 2013 21:35:11 +0100
Subject: [PATCH 288/394] pthread-win32: don't propagate `mingw_headers'

---
 pkgs/os-specific/windows/pthread-w32/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix
index 39afd119643b..cd417eb9ad09 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/pkgs/os-specific/windows/pthread-w32/default.nix
@@ -28,6 +28,14 @@ stdenv.mkDerivation {
        cp -v pthread.h semaphore.h sched.h "$out/include"
     '';
 
+  postFixup =
+    # By default `mingw_headers' is propagated.  Prevent that, because
+    # otherwise MinGW headers appear twice in `-I', and thus the
+    # "#include_next <float.h>" in MinGW's <float.h> picks up itself instead
+    # of picking up GCC's (hence, FLT_RADIX is left undefined, for instance.)
+    '' rm -f "$out/nix-support/propagated-build-inputs"
+    '';
+
   meta = {
     description = "POSIX threads for Woe32";
 

From e80ec28da17783cfe016f10f90ae53ca14907c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 29 Mar 2013 21:46:00 +0100
Subject: [PATCH 289/394] libiconv: disable stripping when cross-compiling

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

diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index bffc72e005cb..c13af5354299 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
   # will actually use.
   configureFlags = stdenv.lib.optional stdenv.isCygwin [ "--enable-static" ];
 
+  crossAttrs = {
+    # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW).
+    dontStrip = true;
+    dontCrossStrip = true;
+  };
+
   meta = {
     description = "GNU libiconv, an iconv(3) implementation";
 

From 64e4027d91fa0b21ed08a338fd258d2d2858f677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 29 Mar 2013 21:49:31 +0100
Subject: [PATCH 290/394] Making omxplayer build with gcc47

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9037e91b18b..01793ade525d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7547,6 +7547,10 @@ let
 
   ogmtools = callPackage ../applications/video/ogmtools { };
 
+  omxplayer = callPackage ../applications/video/omxplayer {
+    stdenv = overrideGCC stdenv gcc47;
+  };
+
   oneteam = callPackage ../applications/networking/instant-messengers/oneteam {};
 
   openbox = callPackage ../applications/window-managers/openbox { };

From a76a9f783e53591372698f5bd09cb4ca3dc18699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 29 Mar 2013 21:53:44 +0100
Subject: [PATCH 291/394] Adding omxplayer, for the raspberrypi.

---
 pkgs/applications/video/omxplayer/default.nix | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 pkgs/applications/video/omxplayer/default.nix

diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix
new file mode 100644
index 000000000000..b3880067cac4
--- /dev/null
+++ b/pkgs/applications/video/omxplayer/default.nix
@@ -0,0 +1,84 @@
+{ stdenv, fetchurl, raspberrypifw, pcre, boostHeaders, freetype, zlib }:
+
+let
+  ffmpeg = stdenv.mkDerivation rec {
+    name = "ffmpeg-1.1.3";
+    
+    src = fetchurl {
+      url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
+      sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j";
+    };
+    
+    configureFlags = [
+      "--arch=arm"
+      "--cpu=arm1176jzf-s"
+      "--disable-muxers"
+      "--enable-muxer=spdif"
+      "--enable-muxer=adts"
+      "--disable-encoders"
+      "--enable-encoder=ac3"
+      "--enable-encoder=aac"
+      "--disable-decoder=mpeg_xvmc"
+      "--disable-devices"
+      "--disable-ffprobe"
+      "--disable-ffplay"
+      "--disable-ffserver"
+      "--disable-ffmpeg"
+      "--enable-shared"
+      "--disable-doc"
+      "--enable-postproc"
+      "--enable-gpl"
+      "--enable-protocol=http"
+      "--enable-pthreads"
+      "--disable-runtime-cpudetect"
+      "--enable-pic"
+      "--disable-armv5te"
+      "--disable-neon"
+      "--enable-armv6t2"
+      "--enable-armv6"
+      "--enable-hardcoded-tables"
+      "--disable-runtime-cpudetect"
+      "--disable-debug"
+    ];
+
+    enableParallelBuilding = true;
+      
+    crossAttrs = {
+      dontSetConfigureCross = true;
+      configureFlags = configureFlags ++ [
+        "--cross-prefix=${stdenv.cross.config}-"
+        "--enable-cross-compile"
+        "--target_os=linux"
+        "--arch=${stdenv.cross.arch}"
+        ];
+    };
+
+    meta = {
+      homepage = http://www.ffmpeg.org/;
+      description = "A complete, cross-platform solution to record, convert and stream audio and video";
+    };
+  };
+in
+stdenv.mkDerivation rec {
+  name = "omxplayer-20130328-fbee325dc2";
+  src = fetchurl {
+    url = https://github.com/huceke/omxplayer/tarball/fbee325dc2;
+    name = "${name}.tar.gz";
+    sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg";
+  };
+  patchPhase = ''
+    sed -i 1d Makefile
+    export INCLUDES="-I${raspberrypifw}/include/interface/vcos/pthreads -I${raspberrypifw}/include/interface/vmcs_host/linux/"
+  '';
+  installPhase = ''
+    ensureDir $out/bin
+    cp omxplayer.bin $out/bin
+  '';
+  buildInputs = [ raspberrypifw ffmpeg pcre boostHeaders freetype zlib ];
+
+  meta = {
+    homepage = https://github.com/huceke/omxplayer;
+    description = "Commandline OMX player for the Raspberry Pi";
+    license = "GPLv2+";
+  };
+}

From c7307122bf76b6c69fe3249080b590d39245827c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 29 Mar 2013 21:56:01 +0100
Subject: [PATCH 292/394] gcc47: Making the arm patch only for arm.

I don't know how, but it seems to break mips (noticed by ludo):
http://hydra.nixos.org/build/4530024
---
 pkgs/development/compilers/gcc/4.7/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix
index 3925ce1f7fa5..92411e6687e2 100644
--- a/pkgs/development/compilers/gcc/4.7/default.nix
+++ b/pkgs/development/compilers/gcc/4.7/default.nix
@@ -54,7 +54,8 @@ let version = "4.7.2";
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
 
-    patches = [ ./arm-eabi.patch ]
+    patches = []
+      ++ optional stdenv.isArm [ ./arm-eabi.patch ]
       ++ optional (cross != null) ./libstdc++-target.patch
       # ++ optional noSysDirs ./no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

From 4d8cd0aa241c0949edf3b574b6509732249ed76a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 29 Mar 2013 22:04:25 +0100
Subject: [PATCH 293/394] glibc: hurd: Use the old `rpcgen-path.patch'.

---
 pkgs/development/libraries/glibc/2.17/common.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix
index fb4083066de5..9c1a43a97d7c 100644
--- a/pkgs/development/libraries/glibc/2.17/common.nix
+++ b/pkgs/development/libraries/glibc/2.17/common.nix
@@ -32,14 +32,17 @@ stdenv.mkDerivation ({
   enableParallelBuilding = true;
 
   patches =
-    [ /* Have rpcgen(1) look for cpp(1) in $PATH.  */
-      ./rpcgen-path.patch
+    [ /* Have rpcgen(1) look for cpp(1) in $PATH.
+         On GNU/Hurd, use the old version of the patch since the new one
+         doesn't apply.  */
+      (if hurdHeaders != null
+       then ../2.13/rpcgen-path.patch
+       else ./rpcgen-path.patch)
 
       /* Allow NixOS and Nix to handle the locale-archive. */
       ./nix-locale-archive.patch
 
-      /* Don't use /etc/ld.so.cache, for non-NixOS systems.  Currently
-         disabled on GNU/Hurd, which uses a more recent libc snapshot. */
+      /* Don't use /etc/ld.so.cache, for non-NixOS systems.  */
       ./dont-use-system-ld-so-cache.patch
 
       /* Without this patch many KDE binaries crash. */

From 9c92db9e52ee901ef9e15a9f687ba28b48867798 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Mar 2013 23:55:13 +0100
Subject: [PATCH 294/394] haskell-hackage-db: update to version 1.5

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

diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix
index 82175abb17e1..f3d029a5ea72 100644
--- a/pkgs/development/libraries/haskell/hackage-db/default.nix
+++ b/pkgs/development/libraries/haskell/hackage-db/default.nix
@@ -1,10 +1,10 @@
-{ cabal, Cabal, filepath, tar }:
+{ cabal, Cabal, filepath, tar, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "hackage-db";
-  version = "1.4";
-  sha256 = "12z1ak21xc9v373j956gz8l4ryj0582lgbl9ykp8q46n9b8sxfph";
-  buildDepends = [ Cabal filepath tar ];
+  version = "1.5";
+  sha256 = "1m7f6vwgjzibk8rd14y6m62xv5969ns94a57sansi9d83q6rj9iv";
+  buildDepends = [ Cabal filepath tar utf8String ];
   meta = {
     homepage = "http://github.com/peti/hackage-db";
     description = "provide access to the Hackage database via Data.Map";

From 6692fbd0aea90f736f6cbe77d7bb636c7d73786c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 30 Mar 2013 00:12:36 +0100
Subject: [PATCH 295/394] haskell-defaults.nix: remove useless for cabal2nix on
 GHC 6.10.4

We cannot build 'tar' on that platform, which is a dependency of cabal2nix.
---
 pkgs/top-level/haskell-defaults.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index e7e206e22666..aa71d75f12e3 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -111,7 +111,6 @@
       monadPar = self.monadPar_0_1_0_3;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
       jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
     };
 
   # Abstraction for Haskell packages collections

From 83afbf45caa4f6f06556a867b3e48218fb9ea2e1 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 30 Mar 2013 11:52:44 +0100
Subject: [PATCH 296/394] Add xf86videodummy and xf86inputvoid to xorg
 overrides (pixman fix)

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

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index cba6a6d0cf4b..e9c310b84f17 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -153,6 +153,11 @@ in
     installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg";
   };
 
+  xf86inputvoid = attrs: attrs // {
+    NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+    buildInputs = attrs.buildInputs ++ [xorg.pixman];
+  };
+
   xf86videointel = attrs: attrs // {
     buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
   };
@@ -172,6 +177,11 @@ in
     buildInputs = attrs.buildInputs ++ [xorg.pixman];
   };
 
+  xf86videodummy = attrs: attrs // {
+    NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+    buildInputs = attrs.buildInputs ++ [xorg.pixman];
+  };
+
   xf86videofbdev = attrs: attrs // {
     NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
     buildInputs = attrs.buildInputs ++ [xorg.pixman];

From 06425fca373a4091ba1a93ce6513604a8dc3624a Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 29 Mar 2013 02:30:18 +0100
Subject: [PATCH 297/394] Upgrading xpra to 0.8.8

---
 pkgs/tools/X11/xpra/default.nix | 60 +++++++++++++++------------------
 pkgs/top-level/all-packages.nix |  4 +--
 2 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 929332275fc1..8427386fe860 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,44 +1,40 @@
-{ stdenv, fetchurl, pkgconfig, python, cython
-, pygtk, pygobject, pycairo, notify, xlibs, gtk
-, ffmpeg, x264, libvpx, makeWrapper}:
+{ stdenv, fetchurl, buildPythonPackage
+, python, cython, pkgconfig
+, xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo
+, ffmpeg_1_1, x264, libvpx, pil, libwebp }:
 
-stdenv.mkDerivation rec {
-  name = "xpra-0.3.2";
+buildPythonPackage rec {
+  name = "xpra-0.8.8";
   
   src = fetchurl {
-    url = http://xpra.org/src/xpra-0.3.2.tar.bz2;
-    sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y";
+    url = "http://xpra.org/src/${name}.tar.bz2";
+    sha256 = "248bac50c78eccfbc7f728667f9d0ef26b101b288193fa286881cda452e63683";
   };
 
-  nativeBuildInputs = [ cython ];
+  buildInputs = [ 
+    python cython pkgconfig 
 
-  buildInputs = [
-    pkgconfig python pygtk gtk ffmpeg x264 libvpx makeWrapper
-    xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst
+    xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
+    xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
+    xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage
+    xorg.libXrandr
+
+    pango cairo gdk_pixbuf atk gtk glib
+
+    ffmpeg_1_1 libvpx x264 libwebp
   ];
 
+  propagatedBuildInputs = [ 
+    pil pygtk pygobject
+  ];
+
+  # Even after i tried monkey patching, their tests just fail, looks like
+  # they don't have automated testing out of the box? http://xpra.org/trac/ticket/177
+  doCheck = false;
+
   buildPhase = ''
-    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0)"
-    NIX_LDFLAGS="$NIX_LDFLAGS -lXcomposite -lXdamage"
-    ./do-build
-  '';
-
-  pythonPaths = [
-    "$out/lib/python"
-    "$(toPythonPath ${pygtk})/gtk-2.0"
-  ] ++ map (i: "$(toPythonPath ${i})") [
-    pygobject pycairo notify
-  ];
-
-  installPhase = ''
-    mkdir -p $out
-    cp -r install/* $out
-
-    for i in $(cd $out/bin && ls); do
-        wrapProgram $out/bin/$i \
-            --set PYTHONPATH "${stdenv.lib.concatStringsSep ":" pythonPaths}" \
-            --prefix PATH : "${xlibs.xauth}/bin:${xlibs.xorgserver}/bin:${xlibs.xmodmap}/bin"
-    done
+    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
+    python ./setup.py build --enable-Xdummy
   '';
   
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfb1d8a4e827..7f0ffb9ebbcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8066,9 +8066,7 @@ let
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
-  xpra = callPackage ../tools/X11/xpra {
-    inherit (pythonPackages) notify;
-  };
+  xpra = callPackage ../tools/X11/xpra { };
 
   xscreensaver = callPackage ../misc/screensavers/xscreensaver {
     inherit (gnome) libglade;

From 55f14cc7f300bd9e72b903e8a70de0257d803fb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 30 Mar 2013 18:10:15 +0100
Subject: [PATCH 298/394] lame: update from 3.98.4 to 3.99.5

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

diff --git a/pkgs/applications/audio/lame/default.nix b/pkgs/applications/audio/lame/default.nix
index 46bbf10f357a..09b553a099c6 100644
--- a/pkgs/applications/audio/lame/default.nix
+++ b/pkgs/applications/audio/lame/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, nasm}:
 
 stdenv.mkDerivation rec {
-  name = "lame-3.98.4";
+  name = "lame-3.99.5";
   src = fetchurl {
     url = "mirror://sourceforge/lame/${name}.tar.gz";
-    sha256 = "1j3jywv6ic2cy0x0q1a1h6rcl6xmcs5f58xawjdkl8hpcv3l8cdc";
+    sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14";
   };
 
   buildInputs = [ nasm ];

From 51229692ca23e4e94697ede1148483e9e6356ece Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 30 Mar 2013 20:00:05 +0100
Subject: [PATCH 299/394] Add sha256 hash to winetricks.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/misc/emulators/wine/winetricks.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix
index 8a0901ddb803..71cc2767f698 100644
--- a/pkgs/misc/emulators/wine/winetricks.nix
+++ b/pkgs/misc/emulators/wine/winetricks.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchsvn {
     url = "http://winetricks.googlecode.com/svn/trunk";
     inherit rev;
+    sha256 = "01v13qw4sxmfm09g9amqycnzy743gdrhvv23rjr9255dzlrj1s8f";
   };
 
   buildInputs = [ perl which ];

From c72ac21c55edbe4e7f8fb69a62dd747231e276e0 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 30 Mar 2013 20:04:31 +0100
Subject: [PATCH 300/394] springlobby: bump to 0.169

---
 pkgs/games/spring/springlobby.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 4e06c31442a6..e6051a12a267 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar
+{ stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar, libpng, libX11
 , gettext, bash, gawk, boost}:
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
-  version = "0.146";
+  version = "0.169";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "55899baf6732e48bfaa36d80974aa135c051d2cbb6fe92fbcffd80440639eedf";
+    sha256 = "1wr8q2ha3wh718rr5rg7l6v404nf1rgkg4wkja77rfqy7r18zn7g";
   };
 
-  buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost];
+  buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11 ];
 
   prePatch = ''
     substituteInPlace tools/regen_config_header.sh --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"

From d2cb352ad9888db896976569e5d7d5bc98c0d82d Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 30 Mar 2013 20:09:39 +0100
Subject: [PATCH 301/394] leiningen: Update to 2.1.2

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 .../tools/build-managers/leiningen/default.nix         | 10 +++++-----
 .../leiningen/{lein_2.0.0.patch => lein_2.1.2.patch}   |  0
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/tools/build-managers/leiningen/{lein_2.0.0.patch => lein_2.1.2.patch} (100%)

diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 35c340ae0f95..f0b45ca680ba 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -2,20 +2,20 @@
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.0.0";
+  version = "2.1.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "0malymlswxwgh8amkw37qjb8n34ylw3chgbdxgxkq34rkvhv60hb";
+    sha256 = "10s4xpwrhd8wz3h2vj8ay4rf2hw8vzswfkr8ckckk3fhjcn130dy";
   };
 
   jarsrc = fetchurl {
-    url = "https://leiningen.s3.amazonaws.com/downloads/leiningen-2.0.0-standalone.jar";
-    sha256 = "10jvk19mr5dcl5a9kzna9zslh77v3ixi8awhrhxi30dn1yj3r7ck";
+    url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
+    sha256 = "08jq21zpsgwsmsz7lpfxidj2s3mv8i23fjwyl9qc6dngskkx45sa";
   };
 
-  patches = ./lein_2.0.0.patch;
+  patches = ./lein_2.1.2.patch;
 
   inherit rlwrap clojure;
 
diff --git a/pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch b/pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch
rename to pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch

From 05f2ea2d1253a5c1952805dfb8da94c04c3f6863 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 30 Mar 2013 21:05:15 +0100
Subject: [PATCH 302/394] Add myself (the-kenny) to the maintainer list.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/development/tools/build-managers/leiningen/default.nix | 1 +
 pkgs/lib/maintainers.nix                                    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index f0b45ca680ba..bf1a275046ec 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     description = "Project automation for Clojure";
     license = "EPL";
     platforms = stdenv.lib.platforms.unix;
+    maintainer = with stdenv.lib.maintainers; [the-kenny];
   };
 }
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index a2e8b50c10ec..4c47ee85f474 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -26,6 +26,7 @@
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
+  the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
   neznalek = "Vladimír Čunát <vcunat@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
   page = "Carles Pagès <page@cubata.homelinux.net>";

From c7cf2b16908778f7318297e051999d2a2ef79e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 30 Mar 2013 20:01:05 +0100
Subject: [PATCH 303/394] Adding otpw (a one-time password system)

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

diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix
new file mode 100644
index 000000000000..97b601be24cf
--- /dev/null
+++ b/pkgs/os-specific/linux/otpw/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pam }:
+
+stdenv.mkDerivation {
+  name = "otpw-1.3";
+
+  src = fetchurl {
+    url = ttp://www.cl.cam.ac.uk/~mgk25/download/otpw-1.3.tar.gz;
+    sha256 = "1k3hc7xbxz6hkc55kvddi3cibafwf93ivn58sy1l888d3l5dwmrk";
+  };
+
+  patchPhase = ''
+    sed -i 's/^CFLAGS.*/CFLAGS=-O2 -fPIC/' Makefile
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin $out/lib/security $out/share/man/man{1,8}
+    cp pam_*.so $out/lib/security
+    cp otpw-gen $out/bin
+    cp *.1 $out/share/man/man1
+    cp *.8 $out/share/man/man8
+  '';
+
+  buildInputs = [ pam ];
+
+  meta = {
+    homepage = http://www.cl.cam.ac.uk/~mgk25/otpw.html;
+    description = "A one-time password login package";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78e33bd5527f..d75c44d4827f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1317,6 +1317,8 @@ let
 
   ossec = callPackage ../tools/security/ossec {};
 
+  otpw = callPackage ../os-specific/linux/otpw { };
+
   p7zip = callPackage ../tools/archivers/p7zip { };
 
   pal = callPackage ../tools/misc/pal { };

From 690d5a346dea4b726a75092b0dd9f725c1c3ad1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 30 Mar 2013 20:35:32 +0100
Subject: [PATCH 304/394] otpw: fixing typo in url

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

diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix
index 97b601be24cf..423950be5392 100644
--- a/pkgs/os-specific/linux/otpw/default.nix
+++ b/pkgs/os-specific/linux/otpw/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "otpw-1.3";
 
   src = fetchurl {
-    url = ttp://www.cl.cam.ac.uk/~mgk25/download/otpw-1.3.tar.gz;
+    url = http://www.cl.cam.ac.uk/~mgk25/download/otpw-1.3.tar.gz;
     sha256 = "1k3hc7xbxz6hkc55kvddi3cibafwf93ivn58sy1l888d3l5dwmrk";
   };
 

From c908d2130fe07c1b0a418513af1ed152a6934c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 30 Mar 2013 20:45:38 +0100
Subject: [PATCH 305/394] Adding 'google-authenticator'

---
 .../linux/google-authenticator/default.nix    | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/os-specific/linux/google-authenticator/default.nix

diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
new file mode 100644
index 000000000000..d7acc6778b4d
--- /dev/null
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pam }:
+
+stdenv.mkDerivation rec {
+  name = "google-authenticator-1.0";
+
+  src = fetchurl {
+    url = "https://google-authenticator.googlecode.com/files/libpam-${name}-source.tar.bz2";
+    sha1 = "017b7d89989f1624e360abe02d6b27a6298d285d";
+  };
+
+  buildInputs = [ pam ];
+
+  installPhase = ''
+    ensureDir $out/bin $out/lib/security
+    cp pam_google_authenticator.so $out/lib/security
+    cp google-authenticator $out/bin
+  '';
+
+  meta = {
+    homepage = https://code.google.com/p/google-authenticator/;
+    description = "Two-step verification, with pam module";
+    license = "ASL2.0";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d75c44d4827f..14ab58f03bbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -879,6 +879,8 @@ let
 
   gnuvd = callPackage ../tools/misc/gnuvd { };
 
+  googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
+
   gource = callPackage ../applications/version-management/gource {};
 
   gptfdisk = callPackage ../tools/system/gptfdisk { };

From 13d40ae54db8cf5f39c350d14e2a6a013a9ec34b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 30 Mar 2013 21:05:29 +0100
Subject: [PATCH 306/394] otpw: fixing the entropy source (PATH variables)

I don't know why it set some hardcoded PATH.
---
 pkgs/os-specific/linux/otpw/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix
index 423950be5392..fe5f938b75b3 100644
--- a/pkgs/os-specific/linux/otpw/default.nix
+++ b/pkgs/os-specific/linux/otpw/default.nix
@@ -1,15 +1,17 @@
 { stdenv, fetchurl, pam }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "otpw-1.3";
 
   src = fetchurl {
-    url = http://www.cl.cam.ac.uk/~mgk25/download/otpw-1.3.tar.gz;
+    url = "http://www.cl.cam.ac.uk/~mgk25/download/${name}.tar.gz";
     sha256 = "1k3hc7xbxz6hkc55kvddi3cibafwf93ivn58sy1l888d3l5dwmrk";
   };
 
   patchPhase = ''
     sed -i 's/^CFLAGS.*/CFLAGS=-O2 -fPIC/' Makefile
+    sed -i -e 's,PATH=.*;,,' conf.h
+    sed -i -e '/ENTROPY_ENV/d' otpw-gen.c
   '';
 
   installPhase = ''

From fead3aed65a46e5d262d4303965eb2c27908f7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 30 Mar 2013 22:45:45 +0100
Subject: [PATCH 307/394] prayer: update to 1.3.5

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

diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix
index f105920ab81e..8a23e480e1f7 100644
--- a/pkgs/servers/prayer/default.nix
+++ b/pkgs/servers/prayer/default.nix
@@ -5,11 +5,11 @@ let
     "-e 's/CCLIENT_SSL_ENABLE.*= false/CCLIENT_SSL_ENABLE=true/'";
 in
 stdenv.mkDerivation rec {
-  name = "prayer-1.3.4";
+  name = "prayer-1.3.5";
   
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${name}.tar.gz";
-    sha256 = "0a2nmrlwdq4n5019j3mw2xbbc61s7sssjih5ql6r5rvyrrr48szc";
+    sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda";
   };
 
   buildInputs = [ openssl db4 zlib uwimap htmlTidy pam ];

From 2ba0d9d3ae9da72620a40d38935201ea3df949a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 30 Mar 2013 18:12:06 +0100
Subject: [PATCH 308/394] fuloong linux: add CGROUPS and disable FTRACE

FTRACE was making linux not load at all. And systemd
wants cgroups.
---
 pkgs/top-level/platforms.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index b1406c615bd9..3c53be875e36 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -105,7 +105,7 @@ rec {
 
         FUSE_FS m
 
-        # nixos mounts some cgroup
+        # systemd uses cgroups
         CGROUPS y
 
         # Latencytop 
@@ -307,6 +307,12 @@ rec {
     kernelAutoModules = false;
     kernelExtraConfig =
       ''
+        MIGRATION n
+        COMPACTION n
+
+        # nixos mounts some cgroup
+        CGROUPS y
+
         BLK_DEV_RAM y
         BLK_DEV_INITRD y
         BLK_DEV_CRYPTOLOOP m
@@ -360,6 +366,9 @@ rec {
         EXT3_FS y
         REISERFS_FS y
         MAGIC_SYSRQ y
+
+        # The kernel doesn't boot at all, with FTRACE
+        FTRACE n
       '';
     kernelTarget = "vmlinux";
     uboot = null;

From 6281042defb4a113f71e6a66dcce7ffc631a9e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 31 Mar 2013 00:07:35 +0100
Subject: [PATCH 309/394] Adding oath-toolkit and xmlsec

I added xmlsec to make it work with oath-toolkit (to build one extra tool
there, that I don't need), but I couldn't make it work together.
---
 pkgs/development/libraries/xmlsec/default.nix | 24 +++++++++++++++++++
 pkgs/tools/security/oath-toolkit/default.nix  | 18 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/libraries/xmlsec/default.nix
 create mode 100644 pkgs/tools/security/oath-toolkit/default.nix

diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
new file mode 100644
index 000000000000..afb23e4de354
--- /dev/null
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool }:
+
+let
+  version = "1.2.19";
+in
+stdenv.mkDerivation rec {
+  name = "xmlsec-${version}";
+
+  src = fetchurl {
+    url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
+    sha256 = "1h5ar0h8n0l8isgic82w00cwfpw7i9wxw17kbdb6q3yvzb4zgj1g";
+  };
+
+  buildInputs = [ libxml2 gnutls libxslt pkgconfig libgcrypt libtool ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://www.aleksey.com/xmlsec;
+    description = "XML Security Library in C based on libxml2";
+    license = "MIT";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix
new file mode 100644
index 000000000000..58786f1bd61e
--- /dev/null
+++ b/pkgs/tools/security/oath-toolkit/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pam }:
+
+stdenv.mkDerivation rec {
+  name = "oath-toolkit-2.0.2";
+
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/oath-toolkit/${name}.tar.gz";
+    sha256 = "0i2rf5j83kb8h3sd9lsm0a46zq805kzagvccc4rk7879lg1fnl99";
+  };
+
+  buildInputs = [ pam ];
+
+  meta = {
+    homepage = http://www.nongnu.org/oath-toolkit/;
+    description = "Components for building one-time password authentication systems";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14ab58f03bbe..5e5b2fae1840 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1271,6 +1271,8 @@ let
 
   nzbget = callPackage ../tools/networking/nzbget { };
 
+  oathToolkit = callPackage ../tools/security/oath-toolkit { };
+
   obex_data_server = callPackage ../tools/bluetooth/obex-data-server { };
 
   obexd = callPackage ../tools/bluetooth/obexd { };
@@ -5242,6 +5244,8 @@ let
     jvm    = gcj;
     xerces = xercesJava;  };
 
+  xmlsec = callPackage ../development/libraries/xmlsec { };
+
   zziplib = callPackage ../development/libraries/zziplib { };
 
 

From 86e5e52d993ad751d61243c2e8645f6f6950f3aa Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 31 Mar 2013 08:52:20 +0200
Subject: [PATCH 310/394] plone: upgrading to 4.3rc1

---
 pkgs/development/web/plone/default.nix | 14922 ++++++++---------------
 pkgs/top-level/all-packages.nix        |     5 +-
 2 files changed, 5239 insertions(+), 9688 deletions(-)

diff --git a/pkgs/development/web/plone/default.nix b/pkgs/development/web/plone/default.nix
index b53254d29686..bd2b8063ea87 100644
--- a/pkgs/development/web/plone/default.nix
+++ b/pkgs/development/web/plone/default.nix
@@ -1,10151 +1,5701 @@
+# DO NOT EDIT THIS FILE!
+#
+# Nix expressions autogenerated with:
+#   bin/pypi2nix-nplone43rc1Packages-dPlone-dmailinglogger-dzc.recipe.egg-dplone.recipe.zope2instance-dPillow-isetuptools-eplone/43rc1.json-pplone/43rc1.txt-oplone/43rc1.nix
 
-{ pkgs, python, buildPythonPackage }:
+{ pkgs, python, pythonPackages }:
 
-let plone42Packages = python.modules // rec {
+let plone43rc1Packages = python.modules // rec {
   inherit python;
+  inherit (pythonPackages) setuptools buildPythonPackage;
   inherit (pkgs) fetchurl stdenv;
 
-
-
-  accesscontrol = buildPythonPackage rec {
-    name = "AccessControl-2.13.11";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/A/AccessControl/${name}.zip";
-      md5 = "7e622d99fb17914b4708d26f245cb696";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  acquisition = buildPythonPackage rec {
-    name = "Acquisition-2.13.8";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/A/Acquisition/${name}.zip";
-      md5 = "8c33160c157b50649e2b2b3224622579";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  archetypes_kss = buildPythonPackage rec {
-    name = "archetypes.kss-1.7.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.kss/${name}.zip";
-      md5 = "a8502140123b74f1b7ed4f36d3e56ff3";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  archetypes_querywidget = buildPythonPackage rec {
-    name = "archetypes.querywidget-1.0.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.querywidget/${name}.zip";
-      md5 = "cbe134f2806191fd35066bbb7c85bfcc";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  archetypes_referencebrowserwidget = buildPythonPackage rec {
-    name = "archetypes.referencebrowserwidget-2.4.16";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/${name}.zip";
-      md5 = "7dd3b0d4e188828701a291449c7495f4";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  archetypes_schemaextender = buildPythonPackage rec {
-    name = "archetypes.schemaextender-2.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/${name}.zip";
-      md5 = "865aa5b4b6b26e3bb650d89ddfe77c87";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  argparse = buildPythonPackage rec {
-    name = "argparse-1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/argparse/${name}.zip";
-      md5 = "087399b73047fa5a6482037411ddc968";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  borg_localrole = buildPythonPackage rec {
-    name = "borg.localrole-3.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/b/borg.localrole/${name}.zip";
-      md5 = "04082694dfda9ae5cda62747b8ac7ccf";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  buildout_dumppickedversions = buildPythonPackage rec {
-    name = "buildout.dumppickedversions-0.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/b/buildout.dumppickedversions/${name}.tar.gz";
-      md5 = "e81cffff329aaaaf8dd0d1c6bd63c8b0";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  clientform = buildPythonPackage rec {
-    name = "ClientForm-0.2.10";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/C/ClientForm/${name}.zip";
-      md5 = "33826886848f89c67a5c8a30b931bd97";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  collective_monkeypatcher = buildPythonPackage rec {
-    name = "collective.monkeypatcher-1.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/${name}.zip";
-      md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  collective_recipe_omelette = buildPythonPackage rec {
-    name = "collective.recipe.omelette-0.15";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.recipe.omelette/${name}.zip";
-      md5 = "088bcf60754bead215573ce114207939";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  collective_testcaselayer = buildPythonPackage rec {
-    name = "collective.testcaselayer-1.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.testcaselayer/${name}.zip";
-      md5 = "fd8387d6b6ebd8645ec92f5f1e512450";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  collective_xmltestreport = buildPythonPackage rec {
-    name = "collective.xmltestreport-1.2.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.xmltestreport/${name}.tar.gz";
-      md5 = "f247d47a019b44694660d785f70c05b3";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  collective_z3cform_datagridfield = buildPythonPackage rec {
-    name = "collective.z3cform.datagridfield-0.11";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.z3cform.datagridfield/${name}.zip";
-      md5 = "c9210337b91305314864da42c12d04c2";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  collective_z3cform_datagridfield_demo = buildPythonPackage rec {
-    name = "collective.z3cform.datagridfield-demo-0.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.z3cform.datagridfield/collective.z3cform.datagridfield-0.11.zip";
-      md5 = "c9210337b91305314864da42c12d04c2";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  collective_z3cform_datetimewidget = buildPythonPackage rec {
-    name = "collective.z3cform.datetimewidget-1.2.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/${name}.zip";
-      md5 = "89daf27c7f0f235f9c001f0ee50d76e5";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  coverage = buildPythonPackage rec {
-    name = "coverage-3.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz";
-      md5 = "28c43d41b13f8987ea14d7b1d4a4e3ec";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  datetime = buildPythonPackage rec {
-    name = "DateTime-2.12.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/D/DateTime/${name}.zip";
-      md5 = "72a8bcf80b52211ae7fdfe36c693d70c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  diazo = buildPythonPackage rec {
-    name = "diazo-1.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/d/diazo/${name}.zip";
-      md5 = "d3c2b017af521db4c86fb360c86e0bc8";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  documenttemplate = buildPythonPackage rec {
-    name = "DocumentTemplate-2.13.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/D/DocumentTemplate/${name}.zip";
-      md5 = "07bb086c77c1dfe94125ad2efbba94b7";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  docutils = buildPythonPackage rec {
-    name = "docutils-0.9";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/d/docutils/${name}.1.tar.gz";
-      md5 = "b0d5cd5298fedf9c62f5fd364a274d56";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  elementtree = buildPythonPackage rec {
-    name = "elementtree-1.2.7-20070827-preview";
-
-    src = fetchurl {
-      url = "http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip";
-      md5 = "30e2fe5edd143f347e03a8baf5d60f8a";
-    };
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  experimental_cssselect = buildPythonPackage rec {
-    name = "experimental.cssselect-0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/e/experimental.cssselect/${name}.zip";
-      md5 = "3fecdcf1fbc3ea6025e115a56a262957";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  extensionclass = buildPythonPackage rec {
-    name = "ExtensionClass-2.13.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/E/ExtensionClass/${name}.zip";
-      md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  feedparser = buildPythonPackage rec {
-    name = "feedparser-5.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/feedparser/${name}.tar.bz2";
-      md5 = "702835de74bd4a578524f311e62c2877";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  five_customerize = buildPythonPackage rec {
-    name = "five.customerize-1.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.customerize/${name}.zip";
-      md5 = "32f597c2fa961f7dcc84b23e655d928e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  five_formlib = buildPythonPackage rec {
-    name = "five.formlib-1.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.formlib/${name}.zip";
-      md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  five_globalrequest = buildPythonPackage rec {
-    name = "five.globalrequest-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.globalrequest/${name}.tar.gz";
-      md5 = "87f8996bd21d4aa156aa26e7d21b8744";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  five_grok = buildPythonPackage rec {
-    name = "five.grok-1.2.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.grok/${name}.zip";
-      md5 = "b99c3017f3a487dc2a8b7b0b310ee8cf";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  five_intid = buildPythonPackage rec {
-    name = "five.intid-1.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.intid/${name}.zip";
-      md5 = "60c6726c07a1c1bf557aeec0ddcee369";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  five_localsitemanager = buildPythonPackage rec {
-    name = "five.localsitemanager-2.0.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.localsitemanager/${name}.zip";
-      md5 = "5e3a658e6068832bd802018ebc83f2d4";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  grokcore_annotation = buildPythonPackage rec {
-    name = "grokcore.annotation-1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.annotation/${name}.tar.gz";
-      md5 = "a28ccb4b7c86198923d9cce40953314f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  grokcore_component = buildPythonPackage rec {
-    name = "grokcore.component-1.9";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.component/${name}.tar.gz";
-      md5 = "24b05b6b132787dbca18acd244c23ffb";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  grokcore_formlib = buildPythonPackage rec {
-    name = "grokcore.formlib-1.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.formlib/${name}.tar.gz";
-      md5 = "dced4aba77053ed78a358a1f5e85d9c4";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  grokcore_security = buildPythonPackage rec {
-    name = "grokcore.security-1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.security/${name}.tar.gz";
-      md5 = "1e668b7e423814fa069c69f2a4014876";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  grokcore_site = buildPythonPackage rec {
-    name = "grokcore.site-1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.site/${name}.tar.gz";
-      md5 = "bd16753e6d4f1c0ff38266d2ae79633d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  grokcore_view = buildPythonPackage rec {
-    name = "grokcore.view-1.13.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.view/${name}.tar.gz";
-      md5 = "304363398aa752d5e1479bab39b93e4e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  grokcore_viewlet = buildPythonPackage rec {
-    name = "grokcore.viewlet-1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.viewlet/${name}.tar.gz";
-      md5 = "5e53b3c77941f9ad0ff2aeb7c1b6dd7d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  initgroups = buildPythonPackage rec {
-    name = "initgroups-2.13.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/i/initgroups/${name}.zip";
-      md5 = "38e842dcab8445f65e701fec75213acd";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  jinja2 = buildPythonPackage rec {
-    name = "Jinja2-2.5.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/J/Jinja2/${name}.tar.gz";
-      md5 = "83b20c1eeb31f49d8e6392efae91b7d5";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  kss_core = buildPythonPackage rec {
-    name = "kss.core-1.6.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/k/kss.core/${name}.zip";
-      md5 = "87e66e78c3bbd7af3ecce5b2fef935ae";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  mailinglogger = buildPythonPackage rec {
-    name = "mailinglogger-3.7.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mailinglogger/${name}.tar.gz";
-      md5 = "f865f0df6059ce23062b7457d01dbac5";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  manuel = buildPythonPackage rec {
-    name = "manuel-1.1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz";
-      md5 = "8cd560cf6e8720ecb129c4e5be605fbb";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  markdown = buildPythonPackage rec {
-    name = "Markdown-2.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Markdown/${name}.zip";
-      md5 = "122418893e21e91109edbf6e082f830d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  martian = buildPythonPackage rec {
-    name = "martian-0.11.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/martian/${name}.tar.gz";
-      md5 = "865646fcd9dd31613204d5f4c2db943b";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  mechanize = buildPythonPackage rec {
-    name = "mechanize-0.2.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mechanize/${name}.zip";
-      md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  missing = buildPythonPackage rec {
-    name = "Missing-2.13.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Missing/${name}.zip";
-      md5 = "9823cff54444cbbcaef8fc45d8e42572";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  mocker = buildPythonPackage rec {
-    name = "mocker-1.1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mocker/${name}.tar.bz2";
-      md5 = "0bd9f83268e16aef2130fa89e2a4839f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  mr_developer = buildPythonPackage rec {
-    name = "mr.developer-1.21";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mr.developer/${name}.zip";
-      md5 = "5f832f1709714b09cd7490603afd2365";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  multimapping = buildPythonPackage rec {
-    name = "MultiMapping-2.13.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/MultiMapping/${name}.zip";
-      md5 = "d69c5904c105b9f2f085d4103e0f0586";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  nose = buildPythonPackage rec {
-    name = "nose-1.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz";
-      md5 = "144f237b615e23f21f6a50b2183aa817";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  nt_svcutils = buildPythonPackage rec {
-    name = "nt-svcutils-2.13.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/n/nose/nose-1.1.2.tar.gz";
-      md5 = "144f237b615e23f21f6a50b2183aa817";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  ordereddict = buildPythonPackage rec {
-    name = "ordereddict-1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/o/ordereddict/${name}.tar.gz";
-      md5 = "a0ed854ee442051b249bfad0f638bbec";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  paste = buildPythonPackage rec {
-    name = "Paste-1.7.5.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Paste/${name}.tar.gz";
-      md5 = "7ea5fabed7dca48eb46dc613c4b6c4ed";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  pastedeploy = buildPythonPackage rec {
-    name = "PasteDeploy-1.3.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/PasteDeploy/${name}.tar.gz";
-      md5 = "eb4b3e2543d54401249c2cbd9f2d014f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  pastescript = buildPythonPackage rec {
-    name = "PasteScript-1.7.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/PasteScript/${name}.tar.gz";
-      md5 = "4c72d78dcb6bb993f30536842c16af4d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    propagatedBuildInputs = [ paste pastedeploy ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  persistence = buildPythonPackage rec {
-    name = "Persistence-2.13.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Persistence/${name}.zip";
-      md5 = "92693648ccdc59c8fc71f7f06b1d228c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  pil = buildPythonPackage rec {
-    name = "PIL-1.1.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
-      md5 = "92693648ccdc59c8fc71f7f06b1d228c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone = buildPythonPackage rec {
-    name = "Plone-4.2.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Plone/${name}.zip";
-      md5 = "688438bd541e7cb2ab650c8c59282b85";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_alterego = buildPythonPackage rec {
-    name = "plone.alterego-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.alterego/${name}.zip";
-      md5 = "b7b6dbcbba00505d98d5aba83e016408";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_blob = buildPythonPackage rec {
-    name = "plone.app.blob-1.5.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.blob/${name}.zip";
-      md5 = "8d6ba6f360b6bfd40f87914132339660";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_caching = buildPythonPackage rec {
-    name = "plone.app.caching-1.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.caching/${name}.zip";
-      md5 = "83a52efeb7604d4c5b4afbc6c1365c6f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_collection = buildPythonPackage rec {
-    name = "plone.app.collection-1.0.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.collection/${name}.zip";
-      md5 = "40c9035472e386fc9d0ec1b9a9a3d4f6";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_content = buildPythonPackage rec {
-    name = "plone.app.content-2.0.12";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.content/${name}.zip";
-      md5 = "2f14a85fb66d73e0b699b839caaaad26";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_contentlisting = buildPythonPackage rec {
-    name = "plone.app.contentlisting-1.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentlisting/${name}.zip";
-      md5 = "fa6eb45c4ffd0eb3817ad4813ca24916";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_contentmenu = buildPythonPackage rec {
-    name = "plone.app.contentmenu-2.0.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/${name}.zip";
-      md5 = "b1c7e5a37c659ba30b3a077e149b1752";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_contentrules = buildPythonPackage rec {
-    name = "plone.app.contentrules-2.1.9";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/${name}.zip";
-      md5 = "74d2fed9095a7c5f890b6f27de78dafc";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_controlpanel = buildPythonPackage rec {
-    name = "plone.app.controlpanel-2.2.11";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/${name}.zip";
-      md5 = "401c8880865f398c281953f5837108b9";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_customerize = buildPythonPackage rec {
-    name = "plone.app.customerize-1.2.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.customerize/${name}.zip";
-      md5 = "6a3802c4e8fbd955597adc6a8298febf";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_dexterity = buildPythonPackage rec {
-    name = "plone.app.dexterity-1.2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.dexterity/${name}.zip";
-      md5 = "25ccd382f9e08cfdfe4a9b7e455030bc";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_discussion = buildPythonPackage rec {
-    name = "plone.app.discussion-2.1.8";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.discussion/${name}.zip";
-      md5 = "b0cb1fbdf8a7a238cf5a58fb10c24731";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_folder = buildPythonPackage rec {
-    name = "plone.app.folder-1.0.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.folder/${name}.zip";
-      md5 = "8ea860daddb4c93c0b7f2b5f7106fef0";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_form = buildPythonPackage rec {
-    name = "plone.app.form-2.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.form/${name}.zip";
-      md5 = "8017f8f782d992825ed71d16b126c4e7";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_i18n = buildPythonPackage rec {
-    name = "plone.app.i18n-2.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.i18n/${name}.zip";
-      md5 = "a10026573463dfc1899bf4062cebdbf2";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_imaging = buildPythonPackage rec {
-    name = "plone.app.imaging-1.0.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.imaging/${name}.zip";
-      md5 = "8d494cd69b3f6be7fcb9e21c20277765";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_intid = buildPythonPackage rec {
-    name = "plone.app.intid-1.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.intid/${name}.tar.gz";
-      md5 = "863077002bd272ff11c47de0f7f9db1a";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_iterate = buildPythonPackage rec {
-    name = "plone.app.iterate-2.1.9";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.iterate/${name}.zip";
-      md5 = "db598cfc0986737145ddc7e6b70a1794";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_jquery = buildPythonPackage rec {
-    name = "plone.app.jquery-1.4.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.jquery/${name}.zip";
-      md5 = "a12d56f3dfd2ba6840bf21a6bd860b90";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_jquerytools = buildPythonPackage rec {
-    name = "plone.app.jquerytools-1.3.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/${name}.zip";
-      md5 = "326470a34e07aa98c40d75ec22484572";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_kss = buildPythonPackage rec {
-    name = "plone.app.kss-1.7.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.kss/${name}.zip";
-      md5 = "97a35086fecfe25e55b65042eb35e796";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_layout = buildPythonPackage rec {
-    name = "plone.app.layout-2.2.8";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.layout/${name}.zip";
-      md5 = "90ea408f5e01aeb01517d55eb6b6063a";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_linkintegrity = buildPythonPackage rec {
-    name = "plone.app.linkintegrity-1.5.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/${name}.zip";
-      md5 = "41810cc85ca05921a329aac5bc4cf403";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_locales = buildPythonPackage rec {
-    name = "plone.app.locales-4.2.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.locales/${name}.zip";
-      md5 = "baf48a0a5278a18fa1c2848d3470464f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_lockingbehavior = buildPythonPackage rec {
-    name = "plone.app.lockingbehavior-1.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.lockingbehavior/${name}.tar.gz";
-      md5 = "a25745f1f40c6298da1b228ccd95ee27";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_openid = buildPythonPackage rec {
-    name = "plone.app.openid-2.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.openid/${name}.tar.gz";
-      md5 = "ae0748f91cab0612a498926d405d8edd";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
   plone_app_portlets = buildPythonPackage rec {
-    name = "plone.app.portlets-2.3.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.portlets/${name}.zip";
-      md5 = "534be67a7a17a71ca1e76f6f149ff2ac";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_querystring = buildPythonPackage rec {
-    name = "plone.app.querystring-1.0.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.querystring/${name}.zip";
-      md5 = "b501910b23def9b58e8309d1e469eb6f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_redirector = buildPythonPackage rec {
-    name = "plone.app.redirector-1.1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.redirector/${name}.zip";
-      md5 = "7d441340a83b8ed72a03bc16148a5f21";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_referenceablebehavior = buildPythonPackage rec {
-    name = "plone.app.referenceablebehavior-0.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.referenceablebehavior/${name}.zip";
-      md5 = "2359140966f753204d5091bb49fce85c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_registry = buildPythonPackage rec {
-    name = "plone.app.registry-1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.registry/${name}.zip";
-      md5 = "0fdbb01e9ff71108f1be262c39b41b81";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_relationfield = buildPythonPackage rec {
-    name = "plone.app.relationfield-1.2.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.relationfield/${name}.zip";
-      md5 = "d19888741677cd457ac7f22dde97ded0";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_search = buildPythonPackage rec {
-    name = "plone.app.search-1.0.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.search/${name}.zip";
-      md5 = "bd5a1f4b5016a6d0a8697e7a9cc04833";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_stagingbehavior = buildPythonPackage rec {
-    name = "plone.app.stagingbehavior-0.1b4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.stagingbehavior/${name}.zip";
-      md5 = "0f9589ec056c303ea0c81a804dd411eb";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_testing = buildPythonPackage rec {
-    name = "plone.app.testing-4.2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.testing/${name}.zip";
-      md5 = "1a40df72c8beda9520b83dc449a97a3c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_textfield = buildPythonPackage rec {
-    name = "plone.app.textfield-1.2.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.textfield/${name}.zip";
-      md5 = "f832887a40826d6f68c48b48f071fb9c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_theming = buildPythonPackage rec {
-    name = "plone.app.theming-1.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.theming/${name}.zip";
-      md5 = "2da6d810e0d5f295dd0daa2b60731a1b";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_upgrade = buildPythonPackage rec {
-    name = "plone.app.upgrade-1.2.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/${name}.zip";
-      md5 = "2798dd50863d8c25624400b988a0acdd";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_users = buildPythonPackage rec {
-    name = "plone.app.users-1.1.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.users/${name}.zip";
-      md5 = "97895d8dbdf885784be1afbf5b8b364c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_uuid = buildPythonPackage rec {
-    name = "plone.app.uuid-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.uuid/${name}.zip";
-      md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_versioningbehavior = buildPythonPackage rec {
-    name = "plone.app.versioningbehavior-1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.versioningbehavior/${name}.zip";
-      md5 = "6c153e3fa10b9ffea9742d0dad7b3b85";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_viewletmanager = buildPythonPackage rec {
-    name = "plone.app.viewletmanager-2.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/${name}.zip";
-      md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_vocabularies = buildPythonPackage rec {
-    name = "plone.app.vocabularies-2.1.9";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/${name}.zip";
-      md5 = "34d4eb9c95879811fec0875aa3235ed3";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_workflow = buildPythonPackage rec {
-    name = "plone.app.workflow-2.0.10";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.workflow/${name}.zip";
-      md5 = "350ea680ccf7eb9b1598927cafad4f38";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_z3cform = buildPythonPackage rec {
-    name = "plone.app.z3cform-0.6.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/${name}.zip";
-      md5 = "2e77f5e03d48a6fb2eb9994edb871917";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_autoform = buildPythonPackage rec {
-    name = "plone.autoform-1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.autoform/${name}.zip";
-      md5 = "4cb2935ba9cda3eb3ee801ad8cda7c60";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_behavior = buildPythonPackage rec {
-    name = "plone.behavior-1.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.behavior/${name}.zip";
-      md5 = "a18feb9ec744b2a64028c366a8835d59";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_browserlayer = buildPythonPackage rec {
-    name = "plone.browserlayer-2.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.browserlayer/${name}.zip";
-      md5 = "bce02f4907a4f29314090c525e5fc28e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_cachepurging = buildPythonPackage rec {
-    name = "plone.cachepurging-1.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.cachepurging/${name}.zip";
-      md5 = "886814ac4deef0f1ed99a2eb60864264";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_caching = buildPythonPackage rec {
-    name = "plone.caching-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.caching/${name}.zip";
-      md5 = "2c2e3b27d13b9101c92dfed222fde36c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_contentrules = buildPythonPackage rec {
-    name = "plone.contentrules-2.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.contentrules/${name}.zip";
-      md5 = "a32370656c4fd58652fcd8a234db69c5";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_dexterity = buildPythonPackage rec {
-    name = "plone.dexterity-1.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.dexterity/${name}.zip";
-      md5 = "c8f495e368ada3a4566d99995d09e64c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_directives_dexterity = buildPythonPackage rec {
-    name = "plone.directives.dexterity-1.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.directives.dexterity/${name}.zip";
-      md5 = "713b87644e3591b60b4a8ebd52987477";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_directives_form = buildPythonPackage rec {
-    name = "plone.directives.form-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.directives.form/${name}.zip";
-      md5 = "e40a4b3fdde3768a137a450374934565";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_fieldsets = buildPythonPackage rec {
-    name = "plone.fieldsets-2.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.fieldsets/${name}.zip";
-      md5 = "4158c8a1f784fcb5cecbd63deda7222f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_folder = buildPythonPackage rec {
-    name = "plone.folder-1.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.folder/${name}.zip";
-      md5 = "1674ff18b7a9452d0c2063cf11c679b7";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_formwidget_autocomplete = buildPythonPackage rec {
-    name = "plone.formwidget.autocomplete-1.2.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.formwidget.autocomplete/${name}.zip";
-      md5 = "06b3bfed9ea51fe2e93827f539fc7f07";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_formwidget_contenttree = buildPythonPackage rec {
-    name = "plone.formwidget.contenttree-1.0.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.formwidget.contenttree/${name}.zip";
-      md5 = "2ea222d53ca856de7c6df831707f4ac1";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_formwidget_namedfile = buildPythonPackage rec {
-    name = "plone.formwidget.namedfile-1.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.formwidget.namedfile/${name}.zip";
-      md5 = "9274db2f5d7b4d07748fabfd125e49d0";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_i18n = buildPythonPackage rec {
-    name = "plone.i18n-2.0.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.i18n/${name}.zip";
-      md5 = "ef36aa9a294d507abb37787f9f7700bd";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_indexer = buildPythonPackage rec {
-    name = "plone.indexer-1.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.indexer/${name}.zip";
-      md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_intelligenttext = buildPythonPackage rec {
-    name = "plone.intelligenttext-2.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/${name}.zip";
-      md5 = "51688fa0815b49e00334e3ef948328ba";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_keyring = buildPythonPackage rec {
-    name = "plone.keyring-2.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.keyring/${name}.zip";
-      md5 = "f3970e9bddb2cc65e461a2c62879233f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_locking = buildPythonPackage rec {
-    name = "plone.locking-2.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.locking/${name}.zip";
-      md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_memoize = buildPythonPackage rec {
-    name = "plone.memoize-1.1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.memoize/${name}.zip";
-      md5 = "d07cd14b976160e1f26a859e3370147e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_mocktestcase = buildPythonPackage rec {
-    name = "plone.mocktestcase-1.0b3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.mocktestcase/${name}.tar.gz";
-      md5 = "6de66da6d610537d1f5c31e2ab0f36ee";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_namedfile = buildPythonPackage rec {
-    name = "plone.namedfile-1.0.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.namedfile/${name}.zip";
-      md5 = "06f5bfa7079f889307ac5760e4cb4a7b";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_openid = buildPythonPackage rec {
-    name = "plone.openid-2.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.openid/${name}.zip";
-      md5 = "d4c36926a6dbefed035ed92c29329ce1";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_outputfilters = buildPythonPackage rec {
-    name = "plone.outputfilters-1.8";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.outputfilters/${name}.zip";
-      md5 = "a5ef28580f7fa7f2dc1768893995b0f7";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_portlet_collection = buildPythonPackage rec {
-    name = "plone.portlet.collection-2.1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/${name}.zip";
-      md5 = "5f0006dbb3e0b56870383dfdedc49228";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_portlet_static = buildPythonPackage rec {
-    name = "plone.portlet.static-2.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlet.static/${name}.zip";
-      md5 = "ec0dc691b4191a41ff97779b117f9985";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_portlets = buildPythonPackage rec {
-    name = "plone.portlets-2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlets/${name}.zip";
-      md5 = "12b9a33f787756a48617c2d2dd63c538";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_protect = buildPythonPackage rec {
-    name = "plone.protect-2.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.protect/${name}.zip";
-      md5 = "74925ffb08782e72f9b1e850fa78fffa";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_recipe_alltests = buildPythonPackage rec {
-    name = "plone.recipe.alltests-1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.recipe.alltests/${name}.zip";
-      md5 = "c4ba0f67a2fdd259bd0e7d946bd35674";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_recipe_zeoserver = buildPythonPackage rec {
-    name = "plone.recipe.zeoserver-1.2.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.recipe.zeoserver/${name}.zip";
-      md5 = "cd58899a7d534fe2d0ef42990a07c499";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_registry = buildPythonPackage rec {
-    name = "plone.registry-1.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.registry/${name}.zip";
-      md5 = "6be3d2ec7e2d170e29b8c0bc65049aff";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_reload = buildPythonPackage rec {
-    name = "plone.reload-2.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.reload/${name}.zip";
-      md5 = "49eab593c81b78a9b80d54786aa4ad72";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_resource = buildPythonPackage rec {
-    name = "plone.resource-1.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.resource/${name}.zip";
-      md5 = "594d41e3acd913ae92f2e9ef96503b9f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_rfc822 = buildPythonPackage rec {
-    name = "plone.rfc822-1.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.rfc822/${name}.zip";
-      md5 = "b5b79bb5a9181da624a7e88940a45424";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_scale = buildPythonPackage rec {
-    name = "plone.scale-1.2.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.scale/${name}.zip";
-      md5 = "7c59522b4806ee24f5e0a5fa69c523a5";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_schemaeditor = buildPythonPackage rec {
-    name = "plone.schemaeditor-1.2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.schemaeditor/${name}.zip";
-      md5 = "0b0fb4b20d9463b3fef82c2079a897d7";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_session = buildPythonPackage rec {
-    name = "plone.session-3.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.session/${name}.zip";
-      md5 = "2f9d3b88e813a47135af56a4da8bbde1";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_stringinterp = buildPythonPackage rec {
-    name = "plone.stringinterp-1.0.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.stringinterp/${name}.zip";
-      md5 = "81909716210c6ac3fd0ee87f45ea523d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_subrequest = buildPythonPackage rec {
-    name = "plone.subrequest-1.6.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.subrequest/${name}.zip";
-      md5 = "cc12f68a22565415b10dbeef0020baa4";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_supermodel = buildPythonPackage rec {
-    name = "plone.supermodel-1.1.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.supermodel/${name}.zip";
-      md5 = "00b3d723bb1a48116fe3bf8754f17085";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_synchronize = buildPythonPackage rec {
-    name = "plone.synchronize-1.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.synchronize/${name}.zip";
-      md5 = "d25e86ace8daa0816861296c3288c4fb";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_testing = buildPythonPackage rec {
-    name = "plone.testing-4.0.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.testing/${name}.zip";
-      md5 = "fa40f6d3e3e254409c486c1c2c3e8804";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_theme = buildPythonPackage rec {
-    name = "plone.theme-2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.theme/${name}.zip";
-      md5 = "c592d0d095e9fc76cc81597cdf6d0c37";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_transformchain = buildPythonPackage rec {
-    name = "plone.transformchain-1.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.transformchain/${name}.zip";
-      md5 = "f5fb7ca894249e3e666501c4fae52a6c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_uuid = buildPythonPackage rec {
-    name = "plone.uuid-1.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.uuid/${name}.zip";
-      md5 = "183fe2911a7d6c9f6b3103855e98ad8a";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_z3cform = buildPythonPackage rec {
-    name = "plone.z3cform-0.7.8";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.z3cform/${name}.zip";
-      md5 = "da891365156a5d5824d4e504465886a2";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plonetheme_classic = buildPythonPackage rec {
-    name = "plonetheme.classic-1.2.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plonetheme.classic/${name}.zip";
-      md5 = "9dc15871937f9cdf94cdfdb9be77a221";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plonetheme_sunburst = buildPythonPackage rec {
-    name = "plonetheme.sunburst-1.2.8";
-
+    name = "plone.app.portlets-2.4.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/${name}.zip";
-      md5 = "be02660c869e04ac8cf6ade3559f2516";
+      url = "http://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.2.zip";
+      md5 = "712f14bb916d63e53fc06c76c02986dc";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface zope_traversing plone_app_form datetime zope_container zope_lifecycleevent zope_annotation five_customerize zope_i18nmessageid zope_publisher products_genericsetup plone_i18n feedparser zope_event zope_browser zope_contentprovider plone_memoize zope2 zope_schema acquisition transaction products_pluggableauthservice zope_site zope_component plone_app_vocabularies plone_portlets plone_app_i18n zope_configuration zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_archetypes = buildPythonPackage rec {
-    name = "Products.Archetypes-1.8.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.Archetypes/${name}.zip";
-      md5 = "74be68879b27228c084a9be869132a98";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_atcontenttypes = buildPythonPackage rec {
-    name = "Products.ATContentTypes-2.1.11";
-
+  zope2 = buildPythonPackage rec {
+    name = "Zope2-2.13.19";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/${name}.zip";
-      md5 = "abfb5209ffa11dc2c1a15c488e75d89c";
+      url = "http://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.19.zip";
+      md5 = "26fee311aace7c12e406543ea91eb42a";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_testing zope_interface zope_traversing multimapping zope_size zope_contenttype zope_browserpage datetime zope_component zope_sendmail zope_lifecycleevent products_zctextindex products_standardcachemanagers persistence products_mimetools zope_i18nmessageid zope_publisher missing zope_viewlet zope_sequencesort zope_testbrowser docutils zope_event products_pythonscripts zope_browser zope_structuredtext zope_contentprovider zope_browsermenu zope_tal zope_exceptions products_mailhost products_btreefolder2 zopeundo zconfig record accesscontrol pytz products_ofsp zope_schema zexceptions zope_processlifetime acquisition extensionclass zope_proxy zope_site zope_container zope_pagetemplate zdaemon zope_browserresource zope_deferredimport initgroups zope_security zope_configuration zope_i18n products_zcatalog restrictedpython zodb3 documenttemplate setuptools zope_ptresource zlog tempstorage transaction zope_tales zope_location products_externalmethod ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_atreferencebrowserwidget = buildPythonPackage rec {
-    name = "Products.ATReferenceBrowserWidget-3.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/${name}.zip";
-      md5 = "157bdd32155c8353450c17c649aad042";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
   products_btreefolder2 = buildPythonPackage rec {
     name = "Products.BTreeFolder2-2.13.3";
-
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/${name}.tar.gz";
+      url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz";
       md5 = "f57c85673036af7ccd34c3fa251f6bb2";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ accesscontrol zope_container zodb3 zope_event persistence setuptools zope_lifecycleevent acquisition ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_cmfactionicons = buildPythonPackage rec {
-    name = "Products.CMFActionIcons-2.1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/${name}.tar.gz";
-      md5 = "ab1dc62404ed11aea84dc0d782b2235e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    propagatedBuildInputs = [ eggtestinfo ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfcalendar = buildPythonPackage rec {
-    name = "Products.CMFCalendar-2.2.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/${name}.tar.gz";
-      md5 = "49458e68dc3b6826ea9a3576ac014419";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    propagatedBuildInputs = [ eggtestinfo ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfcore = buildPythonPackage rec {
-    name = "Products.CMFCore-2.2.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFCore/${name}.tar.gz";
-      md5 = "9320a4023b8575097feacfd4a400e930";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfdefault = buildPythonPackage rec {
-    name = "Products.CMFDefault-2.2.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/${name}.tar.gz";
-      md5 = "fe7d2d3906ee0e3b484e4a02401576ab";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    propagatedBuildInputs = [ eggtestinfo ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfdifftool = buildPythonPackage rec {
-    name = "Products.CMFDiffTool-2.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/${name}.zip";
-      md5 = "7b7ed9b8f7b4f438e92e299823f92c86";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfdynamicviewfti = buildPythonPackage rec {
-    name = "Products.CMFDynamicViewFTI-4.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/${name}.zip";
-      md5 = "7d39d416b41b2d93954bc73d9d0e077f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfeditions = buildPythonPackage rec {
-    name = "Products.CMFEditions-2.2.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/${name}.zip";
-      md5 = "7dc744b3b896c1b212d9ba37b1752b65";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfformcontroller = buildPythonPackage rec {
-    name = "Products.CMFFormController-3.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/${name}.zip";
-      md5 = "6573df7dcb39e3b63ba22abe2acd639e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfplacefulworkflow = buildPythonPackage rec {
-    name = "Products.CMFPlacefulWorkflow-1.5.9";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/${name}.zip";
-      md5 = "9041e1f52eab5b348c0dfa85be438722";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfplone = buildPythonPackage rec {
-    name = "Products.CMFPlone-4.2.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/${name}.zip";
-      md5 = "9c9663cb2b68c07e3d9a2fceaa97eaa1";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfquickinstallertool = buildPythonPackage rec {
-    name = "Products.CMFQuickInstallerTool-3.0.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/${name}.tar.gz";
-      md5 = "af34adb87ddf2b6da48eff8b70ca2989";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmftestcase = buildPythonPackage rec {
-    name = "Products.CMFTestCase-0.9.12";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFTestCase/${name}.zip";
-      md5 = "fbfdfe7bdb2158419d9899b4ab8c43eb";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmftopic = buildPythonPackage rec {
-    name = "Products.CMFTopic-2.2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFTopic/${name}.tar.gz";
-      md5 = "4abeeaafe6b6b1d2f2936bf5431cccba";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    propagatedBuildInputs = [ eggtestinfo ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfuid = buildPythonPackage rec {
-    name = "Products.CMFUid-2.2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFUid/${name}.tar.gz";
-      md5 = "e20727959351dffbf0bac80613eee110";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    propagatedBuildInputs = [ eggtestinfo ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_contentmigration = buildPythonPackage rec {
-    name = "Products.contentmigration-2.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.contentmigration/${name}.zip";
-      md5 = "1cef33faec03e655b7c52c317db50ed2";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_dcworkflow = buildPythonPackage rec {
-    name = "Products.DCWorkflow-2.2.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/${name}.tar.gz";
-      md5 = "c90a16c4f3611015592ba8173a5f1863";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    propagatedBuildInputs = [ eggtestinfo ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_extendedpathindex = buildPythonPackage rec {
-    name = "Products.ExtendedPathIndex-3.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/${name}.zip";
-      md5 = "00c048a4b103200bdcbda61fa22c66df";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_externaleditor = buildPythonPackage rec {
-    name = "Products.ExternalEditor-1.1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/${name}.zip";
-      md5 = "475fea6e0b958c0c51cfdbfef2f4e623";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_externalmethod = buildPythonPackage rec {
-    name = "Products.ExternalMethod-2.13.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/${name}.zip";
-      md5 = "15ba953ef6cb632eb571977651252ea6";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_genericsetup = buildPythonPackage rec {
-    name = "Products.GenericSetup-1.7.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/${name}.tar.gz";
-      md5 = "c48967c81c880ed33ee16a14caab3b11";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_i18ntestcase = buildPythonPackage rec {
-    name = "Products.i18ntestcase-1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.i18ntestcase/${name}.zip";
-      md5 = "f72f72e573975f15adfabfeef34fd721";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_kupu = buildPythonPackage rec {
-    name = "Products.kupu-1.5.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.kupu/${name}.zip";
-      md5 = "b884fcc7f510426974d8d3c4333da4f4";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_mailhost = buildPythonPackage rec {
-    name = "Products.MailHost-2.13.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MailHost/${name}.zip";
-      md5 = "1102e523435d8bf78a15b9ddb57478e1";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_marshall = buildPythonPackage rec {
-    name = "Products.Marshall-2.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.Marshall/${name}.zip";
-      md5 = "bde4d7f75195c1ded8371554b04d2541";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_mimetools = buildPythonPackage rec {
-    name = "Products.MIMETools-2.13.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MIMETools/${name}.zip";
-      md5 = "ad5372fc1190599a19493db0864448ec";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_mimetypesregistry = buildPythonPackage rec {
-    name = "Products.MimetypesRegistry-2.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/${name}.zip";
-      md5 = "898166bb2aaececc8238ad4ee4826793";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_ofsp = buildPythonPackage rec {
-    name = "Products.OFSP-2.13.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.OFSP/${name}.zip";
-      md5 = "c76d40928753c2ee56db873304e65bd5";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_passwordresettool = buildPythonPackage rec {
-    name = "Products.PasswordResetTool-2.0.11";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/${name}.zip";
-      md5 = "8dfd65f06c3f4a4b0742d1b44b65f014";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_placelesstranslationservice = buildPythonPackage rec {
-    name = "Products.PlacelessTranslationService-2.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/${name}.zip";
-      md5 = "a94635eb712563c5a002520713f5d6dc";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_plonelanguagetool = buildPythonPackage rec {
-    name = "Products.PloneLanguageTool-3.2.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/${name}.zip";
-      md5 = "bd9eb6278bf76e8cbce99437ca362164";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_plonepas = buildPythonPackage rec {
-    name = "Products.PlonePAS-4.0.15";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/${name}.zip";
-      md5 = "c19241b558c994ff280a2e1f50aa1f19";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_plonetestcase = buildPythonPackage rec {
-    name = "Products.PloneTestCase-0.9.15";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/${name}.zip";
-      md5 = "ddd5810937919ab5233ebd64893c8bae";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_pluggableauthservice = buildPythonPackage rec {
-    name = "Products.PluggableAuthService-1.9.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/${name}.tar.gz";
-      md5 = "f78f16e46d016c2848bc84254fa66596";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_pluginregistry = buildPythonPackage rec {
-    name = "Products.PluginRegistry-1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/${name}.tar.gz";
-      md5 = "5b166193ca1eb84dfb402051f779ebab";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_portaltransforms = buildPythonPackage rec {
-    name = "Products.PortalTransforms-2.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/${name}.zip";
-      md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
   products_pythonscripts = buildPythonPackage rec {
     name = "Products.PythonScripts-2.13.2";
-
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/${name}.zip";
+      url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip";
       md5 = "04c86f2c45a29a162297a80dac61d14f";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ accesscontrol datetime restrictedpython documenttemplate setuptools zexceptions acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_resourceregistries = buildPythonPackage rec {
-    name = "Products.ResourceRegistries-2.2.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/${name}.zip";
-      md5 = "9cf6efbcf2a6510033c06e1d3af94080";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  zopeundo = buildPythonPackage rec {
+    name = "ZopeUndo-2.12.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip";
+      md5 = "2b8da09d1b98d5558f62e12f6e52c401";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_securemailhost = buildPythonPackage rec {
-    name = "Products.SecureMailHost-1.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/${name}.zip";
-      md5 = "7db0f1fa867bd0df972082f502a7a707";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  datetime = buildPythonPackage rec {
+    name = "DateTime-3.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/D/DateTime/DateTime-3.0.2.zip";
+      md5 = "d2dce6ce3b8d93bc65713e40b5d89ae0";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface pytz ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_standardcachemanagers = buildPythonPackage rec {
-    name = "Products.StandardCacheManagers-2.13.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/${name}.zip";
-      md5 = "c5088b2b62bd26d63d9579a04369cb73";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  plone_session = buildPythonPackage rec {
+    name = "plone.session-3.5.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip";
+      md5 = "f95872454735abc8f27c3dcbc9434c11";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope2 products_pluggableauthservice plone_keyring zope_interface setuptools zope_component plone_protect ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_statusmessages = buildPythonPackage rec {
-    name = "Products.statusmessages-4.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.statusmessages/${name}.zip";
-      md5 = "265324b0a58a032dd0ed038103ed0473";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  zope_container = buildPythonPackage rec {
+    name = "zope.container-3.11.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz";
+      md5 = "fc66d85a17b8ffb701091c9328983dcc";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_filerepresentation zope_i18nmessageid zope_publisher zope_broken zope_interface zope_size zope_dottedname zope_security zope_location zope_lifecycleevent zope_component zodb3 zope_event setuptools zope_schema zope_traversing ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_folder = buildPythonPackage rec {
+    name = "plone.folder-1.0.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.4.zip";
+      md5 = "1674ff18b7a9452d0c2063cf11c679b7";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_component zope_interface plone_memoize zope_container setuptools zope_annotation ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_tinymce = buildPythonPackage rec {
-    name = "Products.TinyMCE-1.2.15";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/${name}.zip";
-      md5 = "108b919bfcff711d2116e41eccbede58";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  products_plonepas = buildPythonPackage rec {
+    name = "Products.PlonePAS-4.1.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.1.zip";
+      md5 = "32db1808c3ad42e82542b65eb95c3c71";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_genericsetup plone_memoize plone_i18n plone_session zope2 setuptools products_cmfcore products_pluggableauthservice ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_validation = buildPythonPackage rec {
-    name = "Products.validation-2.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.validation/${name}.zip";
-      md5 = "afa217e2306637d1dccbebf337caa8bf";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  plone_app_locales = buildPythonPackage rec {
+    name = "plone.app.locales-4.2.5";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.2.5.zip";
+      md5 = "baf48a0a5278a18fa1c2848d3470464f";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_zcatalog = buildPythonPackage rec {
-    name = "Products.ZCatalog-2.13.23";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/${name}.zip";
-      md5 = "d425171516dfc70e543a4e2b852301cb";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  zope_sequencesort = buildPythonPackage rec {
+    name = "zope.sequencesort-3.4.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz";
+      md5 = "cfc35fc426a47f5c0ee43c416224b864";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_genericsetup = buildPythonPackage rec {
+    name = "Products.GenericSetup-1.7.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.3.tar.gz";
+      md5 = "c48967c81c880ed33ee16a14caab3b11";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_formlib five_localsitemanager zope2 setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_theme = buildPythonPackage rec {
+    name = "plone.theme-2.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.zip";
+      md5 = "c592d0d095e9fc76cc81597cdf6d0c37";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope2 zope_publisher zope_interface zope_traversing zope_component products_cmfdefault setuptools products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_zctextindex = buildPythonPackage rec {
-    name = "Products.ZCTextIndex-2.13.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/${name}.zip";
-      md5 = "8bbfa5fcd3609246990a9314d6f826b4";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  zope_tal = buildPythonPackage rec {
+    name = "zope.tal-3.5.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip";
+      md5 = "13869f292ba36b294736b7330b1396fd";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_zopeversioncontrol = buildPythonPackage rec {
-    name = "Products.ZopeVersionControl-1.1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/${name}.zip";
-      md5 = "238239102f3ac798ee4f4c53343a561f";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  plone_cachepurging = buildPythonPackage rec {
+    name = "plone.cachepurging-1.0.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.4.zip";
+      md5 = "886814ac4deef0f1ed99a2eb60864264";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 five_globalrequest zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_annotation plone_registry ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_zsqlmethods = buildPythonPackage rec {
-    name = "Products.ZSQLMethods-2.13.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/${name}.zip";
-      md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  plone_protect = buildPythonPackage rec {
+    name = "plone.protect-2.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip";
+      md5 = "74925ffb08782e72f9b1e850fa78fffa";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_component plone_keyring zope2 setuptools zope_interface ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  py = buildPythonPackage rec {
-    name = "py-1.3.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/py/${name}.tar.gz";
-      md5 = "b64d73a04121c1c4e27c7ec335ef87c8";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  pygments = buildPythonPackage rec {
-    name = "Pygments-1.3.1";
-
+  products_portaltransforms = buildPythonPackage rec {
+    name = "Products.PortalTransforms-2.1.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz";
-      md5 = "54be67c04834f13d7e255e1797d629a5";
+      url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip";
+      md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  python_dateutil = buildPythonPackage rec {
-    name = "python-dateutil-1.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-dateutil/${name}.tar.gz";
-      md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  python_gettext = buildPythonPackage rec {
-    name = "python-gettext-1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-gettext/${name}.zip";
-      md5 = "cd4201d440126d1296d1d2bc2b4795f3";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope2 zope_interface zope_structuredtext products_mimetypesregistry zodb3 products_cmfdefault plone_intelligenttext setuptools markdown products_cmfcore acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  python_openid = buildPythonPackage rec {
-    name = "python-openid-2.2.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-openid/${name}.zip";
-      md5 = "f89d9d4f4dccfd33b5ce34eb4725f751";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  plone_memoize = buildPythonPackage rec {
+    name = "plone.memoize-1.1.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip";
+      md5 = "d07cd14b976160e1f26a859e3370147e";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_component zope_annotation zope_ramcache setuptools zope_interface ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  pytz = buildPythonPackage rec {
-    name = "pytz-2012c";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012c.tar.gz";
-      md5 = "1aa85f072e3d34ae310665967a0ce053";
-    };
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  record = buildPythonPackage rec {
-    name = "Record-2.13.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/R/Record/${name}.zip";
-      md5 = "cfed6a89d4fb2c9cb995e9084c3071b7";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  docutils = buildPythonPackage rec {
+    name = "docutils-0.9.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz";
+      md5 = "b0d5cd5298fedf9c62f5fd364a274d56";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  five_formlib = buildPythonPackage rec {
+    name = "five.formlib-1.0.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip";
+      md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid transaction zope_app_form zope_formlib zope_interface zope_location zope_publisher zope_component extensionclass zope_event setuptools zope_schema zope_lifecycleevent zope_browser zope2 ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  repoze_retry = buildPythonPackage rec {
-    name = "repoze.retry-1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.retry/${name}.tar.gz";
-      md5 = "55f9dbde5d7f939d93c352fef0f2ce8b";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  repoze_tm2 = buildPythonPackage rec {
-    name = "repoze.tm2-1.0";
-
+  zexceptions = buildPythonPackage rec {
+    name = "zExceptions-2.13.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.tm2/${name}.tar.gz";
-      md5 = "c645a878874c8876c9c6b3467246afbc";
+      url = "http://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip";
+      md5 = "4c679696c959040d8e656ef85ae40136";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  repoze_who = buildPythonPackage rec {
-    name = "repoze.who-2.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.who/${name}.tar.gz";
-      md5 = "eab01991b6a2979678ce6015815262e2";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  repoze_xmliter = buildPythonPackage rec {
-    name = "repoze.xmliter-0.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.xmliter/${name}.zip";
-      md5 = "99da76bcbad6fbaced4a273bde29b10e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface zope_publisher zope_security setuptools ];
     doCheck = false;
-
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
+  products_cmfuid = buildPythonPackage rec {
+    name = "Products.CMFUid-2.2.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz";
+      md5 = "e20727959351dffbf0bac80613eee110";
+    };
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
   restrictedpython = buildPythonPackage rec {
     name = "RestrictedPython-3.6.0";
-
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/R/RestrictedPython/${name}.zip";
+      url = "http://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip";
       md5 = "aa75a7dcc7fbc966357837cc66cacec6";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  roman = buildPythonPackage rec {
-    name = "roman-1.4.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/roman/${name}.tar.gz";
-      md5 = "4f8832ed4108174b159c2afb4bd1d1dd";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  rwproperty = buildPythonPackage rec {
-    name = "rwproperty-1.0";
-
+  plone_app_theming = buildPythonPackage rec {
+    name = "plone.app.theming-1.1b2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/rwproperty/${name}.tar.gz";
-      md5 = "050bdf066492b3cd82a3399f8efea6b1";
+      url = "http://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1b2.zip";
+      md5 = "0cefd88b1c810833c03762cba7bd194d";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  simplejson = buildPythonPackage rec {
-    name = "simplejson-2.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz";
-      md5 = "d7a7acf0bd7681bd116b5c981d2f7959";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  sphinx = buildPythonPackage rec {
-    name = "Sphinx-1.1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz";
-      md5 = "8f55a6d4f87fc6d528120c5d1f983e98";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  tempstorage = buildPythonPackage rec {
-    name = "tempstorage-2.12.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/tempstorage/${name}.zip";
-      md5 = "7a2b76b39839e229249b1bb175604480";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_cmfplone plone_subrequest repoze_xmliter plone_app_registry plone_transformchain zope_traversing lxml docutils roman plone_resource setuptools five_globalrequest diazo plone_resourceeditor ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  tl_eggdeps = buildPythonPackage rec {
-    name = "tl.eggdeps-0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/tl.eggdeps/${name}.tar.gz";
-      md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  transaction = buildPythonPackage rec {
-    name = "transaction-1.1.1";
-
+  feedparser = buildPythonPackage rec {
+    name = "feedparser-5.0.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz";
-      md5 = "30b062baa34fe1521ad979fb088c8c55";
+      url = "http://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.zip";
+      md5 = "cefffeba66b658d3cc7c1d66b92c6a1a";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
+  zope_browser = buildPythonPackage rec {
+    name = "zope.browser-1.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip";
+      md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_cmfdefault = buildPythonPackage rec {
+    name = "Products.CMFDefault-2.2.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.3.tar.gz";
+      md5 = "fe7d2d3906ee0e3b484e4a02401576ab";
+    };
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ products_genericsetup products_cmfcore five_formlib setuptools zope2 eggtestinfo ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  python_dateutil = buildPythonPackage rec {
+    name = "python-dateutil-1.5";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz";
+      md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_error = buildPythonPackage rec {
+    name = "zope.error-3.7.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz";
+      md5 = "281445a906458ff5f18f56923699a127";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_location zope_exceptions setuptools zodb3 ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_mimetools = buildPythonPackage rec {
+    name = "Products.MIMETools-2.13.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip";
+      md5 = "ad5372fc1190599a19493db0864448ec";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ documenttemplate setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_deprecation = buildPythonPackage rec {
+    name = "zope.deprecation-3.4.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz";
+      md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_cmfplacefulworkflow = buildPythonPackage rec {
+    name = "Products.CMFPlacefulWorkflow-1.5.9";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip";
+      md5 = "9041e1f52eab5b348c0dfa85be438722";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfplone zope_i18nmessageid products_plonetestcase products_genericsetup zope_interface zope_testing zope_component setuptools products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
   unidecode = buildPythonPackage rec {
     name = "Unidecode-0.04.1";
-
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/U/Unidecode/${name}2.tar.gz";
-      md5 = "351dc98f4512bdd2e93f7a6c498730eb";
+      url = "http://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz";
+      md5 = "c4c9ed8d40cff25c390ff5d5112b9308";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  unittest2 = buildPythonPackage rec {
-    name = "unittest2-0.5.1";
-
+  products_cmfcore = buildPythonPackage rec {
+    name = "Products.CMFCore-2.2.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/u/unittest2/${name}.tar.gz";
-      md5 = "a0af5cac92bbbfa0c3b0e99571390e0f";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz";
+      md5 = "9320a4023b8575097feacfd4a400e930";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ products_genericsetup zope_app_publication products_zsqlmethods zope2 setuptools five_localsitemanager ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  webob = buildPythonPackage rec {
-    name = "WebOb-1.0.8";
-
+  five_localsitemanager = buildPythonPackage rec {
+    name = "five.localsitemanager-2.0.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/W/WebOb/${name}.zip";
-      md5 = "9809f9fb64fca8690a7da533fa29a272";
+      url = "http://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip";
+      md5 = "5e3a658e6068832bd802018ebc83f2d4";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_testing zope_site zope_interface zope_location zope_component zodb3 zope_event setuptools zope_lifecycleevent zope2 acquisition ];
     doCheck = false;
-
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
+  zope_configuration = buildPythonPackage rec {
+    name = "zope.configuration-3.7.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip";
+      md5 = "5b0271908ef26c05059eda76928896ea";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_schema zope_interface zope_i18nmessageid setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_cmfcalendar = buildPythonPackage rec {
+    name = "Products.CMFCalendar-2.2.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz";
+      md5 = "49458e68dc3b6826ea9a3576ac014419";
+    };
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ products_cmfdefault zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_extendedpathindex = buildPythonPackage rec {
+    name = "Products.ExtendedPathIndex-3.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-3.1.zip";
+      md5 = "00c048a4b103200bdcbda61fa22c66df";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ accesscontrol transaction zope2 setuptools zodb3 ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  archetypes_schemaextender = buildPythonPackage rec {
+    name = "archetypes.schemaextender-2.1.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.2.zip";
+      md5 = "865aa5b4b6b26e3bb650d89ddfe77c87";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_uuid setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zconfig = buildPythonPackage rec {
+    name = "ZConfig-2.9.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.0.zip";
+      md5 = "5c932690a70c8907efd240cdd76a7bc4";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_contentmenu = buildPythonPackage rec {
+    name = "plone.app.contentmenu-2.0.8";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.8.zip";
+      md5 = "8ba463f1a164c454c70d26507e5bd22a";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher products_cmfdynamicviewfti zope_browsermenu zope_interface plone_memoize plone_app_content zope_component acquisition setuptools zope_i18n plone_locking products_cmfcore zope_contentprovider ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_pluginregistry = buildPythonPackage rec {
+    name = "Products.PluginRegistry-1.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz";
+      md5 = "5b166193ca1eb84dfb402051f779ebab";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope2 products_genericsetup setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_alterego = buildPythonPackage rec {
+    name = "plone.alterego-1.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip";
+      md5 = "b7b6dbcbba00505d98d5aba83e016408";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_outputfilters = buildPythonPackage rec {
+    name = "plone.outputfilters-1.8";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.8.zip";
+      md5 = "a5ef28580f7fa7f2dc1768893995b0f7";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_portaltransforms products_mimetypesregistry products_cmfcore setuptools products_genericsetup ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_publisher = buildPythonPackage rec {
+    name = "zope.publisher-3.12.6";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz";
+      md5 = "495131970cc7cb14de8e517fb3857ade";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_contenttype zope_proxy zope_interface zope_location zope_exceptions zope_security zope_configuration zope_component zope_event setuptools zope_browser zope_i18n ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_security = buildPythonPackage rec {
+    name = "zope.security-3.7.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz";
+      md5 = "072ab8d11adc083eace11262da08630c";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_interface zope_location zope_configuration zope_component setuptools zope_proxy ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zdaemon = buildPythonPackage rec {
+    name = "zdaemon-2.0.7";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz";
+      md5 = "291a875f82e812110557eb6704af8afe";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zconfig ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_annotation = buildPythonPackage rec {
+    name = "zope.annotation-3.5.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz";
+      md5 = "4238153279d3f30ab5613438c8e76380";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_proxy zope_interface zope_location zope_component zodb3 setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  repoze_xmliter = buildPythonPackage rec {
+    name = "repoze.xmliter-0.5";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/repoze.xmliter/repoze.xmliter-0.5.zip";
+      md5 = "99da76bcbad6fbaced4a273bde29b10e";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ lxml setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_form = buildPythonPackage rec {
+    name = "plone.app.form-2.2.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.2.zip";
+      md5 = "6101e6a5bd4de6cc8cdef09ced2743eb";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_site plone_app_vocabularies zope2 datetime zope_component zope_event five_formlib setuptools zope_interface zope_lifecycleevent zope_formlib zope_browser zope_i18n plone_locking products_cmfcore acquisition products_cmfdefault ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_structuredtext = buildPythonPackage rec {
+    name = "zope.structuredtext-3.5.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz";
+      md5 = "eabbfb983485d0879322bc878d2478a0";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zodb3 = buildPythonPackage rec {
+    name = "ZODB3-3.10.5";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz";
+      md5 = "6f180c6897a1820948fee2a6290503cd";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface transaction zconfig zope_event zdaemon zc_lockfile ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_batching = buildPythonPackage rec {
+    name = "plone.batching-1.0b1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0b1.zip";
+      md5 = "813a7d2d89fedf4f8e90e0c8da949c48";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  documenttemplate = buildPythonPackage rec {
+    name = "DocumentTemplate-2.13.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip";
+      md5 = "07bb086c77c1dfe94125ad2efbba94b7";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ accesscontrol extensionclass zope_sequencesort zexceptions restrictedpython zope_structuredtext acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_search = buildPythonPackage rec {
+    name = "plone.app.search-1.1.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.3.zip";
+      md5 = "396677c3fba762077360ed97b14071e6";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_app_contentlisting setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  diazo = buildPythonPackage rec {
+    name = "diazo-1.0.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/d/diazo/diazo-1.0.3.zip";
+      md5 = "d3c2b017af521db4c86fb360c86e0bc8";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ lxml experimental_cssselect setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_globalrequest = buildPythonPackage rec {
+    name = "zope.globalrequest-1.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip";
+      md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_customerize = buildPythonPackage rec {
+    name = "plone.app.customerize-1.2.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip";
+      md5 = "6a3802c4e8fbd955597adc6a8298febf";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_viewlet zope2 zope_publisher zope_interface plone_browserlayer plone_portlets zope_component setuptools five_customerize products_cmfcore acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_cmfdifftool = buildPythonPackage rec {
+    name = "Products.CMFDiffTool-2.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.0.2.zip";
+      md5 = "c12ba4fb9912a9a5a046b07b5b1cf69d";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 products_genericsetup zope_interface setuptools products_cmfcore acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_testbrowser = buildPythonPackage rec {
+    name = "zope.testbrowser-3.11.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz";
+      md5 = "64abbee892121e7f1a91aed12cfc155a";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_schema zope_interface mechanize pytz setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_contentmigration = buildPythonPackage rec {
+    name = "Products.contentmigration-2.1.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.3.zip";
+      md5 = "e15b9777593157f060b50638b0253be1";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_intelligenttext = buildPythonPackage rec {
+    name = "plone.intelligenttext-2.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip";
+      md5 = "51688fa0815b49e00334e3ef948328ba";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plonetheme_classic = buildPythonPackage rec {
+    name = "plonetheme.classic-1.3.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.1.zip";
+      md5 = "8f78a3e79dce692a568c5fbc58ba742a";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_authentication = buildPythonPackage rec {
+    name = "zope.authentication-3.7.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip";
+      md5 = "7d6bb340610518f2fc71213cfeccda68";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema zope_browser ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_i18n = buildPythonPackage rec {
+    name = "zope.i18n-3.7.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz";
+      md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_schema zope_component zope_i18nmessageid pytz setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_componentvocabulary = buildPythonPackage rec {
+    name = "zope.componentvocabulary-1.0.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz";
+      md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_ofsp = buildPythonPackage rec {
+    name = "Products.OFSP-2.13.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip";
+      md5 = "c76d40928753c2ee56db873304e65bd5";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ accesscontrol persistence setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_datetime = buildPythonPackage rec {
+    name = "zope.datetime-3.4.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz";
+      md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  experimental_cssselect = buildPythonPackage rec {
+    name = "experimental.cssselect-0.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/e/experimental.cssselect/experimental.cssselect-0.3.zip";
+      md5 = "3fecdcf1fbc3ea6025e115a56a262957";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ lxml setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_passwordresettool = buildPythonPackage rec {
+    name = "Products.PasswordResetTool-2.0.12";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.12.zip";
+      md5 = "db87c166732a5800f25e33f27a23b7b4";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface plone_memoize datetime zope_component setuptools zope_i18n products_cmfcore acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_jquerytools = buildPythonPackage rec {
+    name = "plone.app.jquerytools-1.5.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.4.zip";
+      md5 = "fcc0c48d49deb211d5aadf4e12d3c1a0";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_component zope2 products_cmfcore setuptools products_genericsetup ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_validation = buildPythonPackage rec {
+    name = "Products.validation-2.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip";
+      md5 = "afa217e2306637d1dccbebf337caa8bf";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime setuptools zope_i18n acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_registry = buildPythonPackage rec {
+    name = "plone.registry-1.0.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip";
+      md5 = "6be3d2ec7e2d170e29b8c0bc65049aff";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_testing zope_interface zope_dottedname zope_component zodb3 zope_event setuptools zope_schema ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_portlet_static = buildPythonPackage rec {
+    name = "plone.portlet.static-2.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip";
+      md5 = "ec0dc691b4191a41ff97779b117f9985";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 plone_app_portlets zope_formlib zope_interface setuptools plone_i18n plone_portlets zope_component plone_app_form zope_schema ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_viewlet = buildPythonPackage rec {
+    name = "zope.viewlet-3.7.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz";
+      md5 = "367e03096df57e2f9b74fff43f7901f9";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_browserpage zope_i18nmessageid zope_publisher zope_interface zope_location zope_security zope_configuration zope_component zope_event setuptools zope_schema zope_traversing zope_contentprovider ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_portlet_collection = buildPythonPackage rec {
+    name = "plone.portlet.collection-2.1.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.3.zip";
+      md5 = "5f0006dbb3e0b56870383dfdedc49228";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_memoize setuptools plone_app_vocabularies plone_app_form plone_portlets plone_app_portlets ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_users = buildPythonPackage rec {
+    name = "plone.app.users-1.2a2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2a2.zip";
+      md5 = "a96e42e34d97162363cb3bbc8483d2ba";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid setuptools zope_site zope_formlib zope_interface plone_app_controlpanel plone_app_layout zope2 zope_component products_statusmessages products_cmfdefault five_formlib plone_protect zodb3 zope_schema products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_querystring = buildPythonPackage rec {
+    name = "plone.app.querystring-1.0.7";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.0.7.zip";
+      md5 = "b501910b23def9b58e8309d1e469eb6f";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_i18n zope_publisher setuptools zope_globalrequest plone_app_vocabularies zope_dottedname plone_app_layout datetime plone_registry zope_component plone_app_contentlisting zope_interface zope_schema plone_app_registry products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_i18nmessageid = buildPythonPackage rec {
+    name = "zope.i18nmessageid-3.5.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz";
+      md5 = "cb84bf61c2b7353e3b7578057fbaa264";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_folder = buildPythonPackage rec {
+    name = "plone.app.folder-1.0.5";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.5.zip";
+      md5 = "8ea860daddb4c93c0b7f2b5f7106fef0";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_folder setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_zcatalog = buildPythonPackage rec {
+    name = "Products.ZCatalog-2.13.23";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.23.zip";
+      md5 = "d425171516dfc70e543a4e2b852301cb";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ accesscontrol zope_testing extensionclass missing zope_dottedname restrictedpython datetime record persistence zodb3 documenttemplate setuptools zope_interface zope_schema products_zctextindex zexceptions acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  python_openid = buildPythonPackage rec {
+    name = "python-openid-2.2.5";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.zip";
+      md5 = "f89d9d4f4dccfd33b5ce34eb4725f751";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  z3c_autoinclude = buildPythonPackage rec {
+    name = "z3c.autoinclude-0.3.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.4.zip";
+      md5 = "6a615ae18c12b459bceb3ae28e8e7709";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface zope_dottedname zope_configuration zc_buildout setuptools zope_schema ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_processlifetime = buildPythonPackage rec {
+    name = "zope.processlifetime-1.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz";
+      md5 = "69604bfd668a01ebebdd616a8f26ccfe";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_uuid = buildPythonPackage rec {
+    name = "plone.uuid-1.0.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip";
+      md5 = "183fe2911a7d6c9f6b3103855e98ad8a";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface zope_browserpage zope_publisher setuptools zope_lifecycleevent ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_dexterity = buildPythonPackage rec {
+    name = "plone.dexterity-2.1.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.2.zip";
+      md5 = "3404947376be89f18e54bbfb5c0d3595";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize zope_dottedname zope_container zope_lifecycleevent plone_synchronize zope_annotation plone_autoform plone_behavior plone_folder zope_publisher products_cmfdefault zope_filerepresentation zope_browser plone_rfc822 zope_size plone_alterego products_statusmessages zope_schema zope2 zope_component zope_location zope_security plone_z3cform zodb3 plone_supermodel plone_uuid setuptools products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_synchronize = buildPythonPackage rec {
+    name = "plone.synchronize-1.0.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.synchronize/plone.synchronize-1.0.1.zip";
+      md5 = "d25e86ace8daa0816861296c3288c4fb";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_traversing = buildPythonPackage rec {
+    name = "zope.traversing-3.13.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip";
+      md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_proxy zope_location zope_interface zope_security zope_component setuptools zope_publisher zope_i18n ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  python_gettext = buildPythonPackage rec {
+    name = "python-gettext-1.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip";
+      md5 = "cd4201d440126d1296d1d2bc2b4795f3";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ unittest2 ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_securemailhost = buildPythonPackage rec {
+    name = "Products.SecureMailHost-1.1.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip";
+      md5 = "7db0f1fa867bd0df972082f502a7a707";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_plonelanguagetool = buildPythonPackage rec {
+    name = "Products.PloneLanguageTool-3.2.7";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip";
+      md5 = "bd9eb6278bf76e8cbce99437ca362164";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  eggtestinfo = buildPythonPackage rec {
+    name = "eggtestinfo-0.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz";
+      md5 = "6f0507aee05f00c640c0d64b5073f840";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  mailinglogger = buildPythonPackage rec {
+    name = "mailinglogger-3.7.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/m/mailinglogger/mailinglogger-3.7.0.tar.gz";
+      md5 = "f865f0df6059ce23062b7457d01dbac5";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  missing = buildPythonPackage rec {
+    name = "Missing-2.13.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip";
+      md5 = "9823cff54444cbbcaef8fc45d8e42572";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ extensionclass ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_deferredimport = buildPythonPackage rec {
+    name = "zope.deferredimport-3.5.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz";
+      md5 = "68fce3bf4f011d4a840902fd763884ee";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_proxy setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_tales = buildPythonPackage rec {
+    name = "zope.tales-3.5.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.2.tar.gz";
+      md5 = "1c5060bd766a0a18632b7879fc9e4e1e";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface setuptools zope_tal ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_zsqlmethods = buildPythonPackage rec {
+    name = "Products.ZSQLMethods-2.13.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip";
+      md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ extensionclass missing zope_interface datetime zope2 record transaction acquisition setuptools zodb3 persistence ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_statusmessages = buildPythonPackage rec {
+    name = "Products.statusmessages-4.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip";
+      md5 = "265324b0a58a032dd0ed038103ed0473";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface zope_annotation zope_i18n setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_i18n = buildPythonPackage rec {
+    name = "plone.i18n-2.0.5";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.5.zip";
+      md5 = "ef36aa9a294d507abb37787f9f7700bd";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ unidecode zope_publisher zope_interface zope_component setuptools zope_i18n ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  archetypes_querywidget = buildPythonPackage rec {
+    name = "archetypes.querywidget-1.0.8";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.8.zip";
+      md5 = "3416b6b4948c624e1b5b8dd8d7e33f59";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_app_jquerytools plone_app_querystring setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_transformchain = buildPythonPackage rec {
+    name = "plone.transformchain-1.0.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.3.zip";
+      md5 = "f5fb7ca894249e3e666501c4fae52a6c";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_schema zope_interface setuptools zope_component ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_pluggableauthservice = buildPythonPackage rec {
+    name = "Products.PluggableAuthService-1.10.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz";
+      md5 = "1a1db6b1d9dd34f8b93a8a3104385a37";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ products_pluginregistry zope2 products_genericsetup setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  borg_localrole = buildPythonPackage rec {
+    name = "borg.localrole-3.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip";
+      md5 = "04082694dfda9ae5cda62747b8ac7ccf";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 products_genericsetup zope_deferredimport zope_interface plone_memoize zope_component setuptools products_pluggableauthservice zope_annotation products_cmfcore acquisition products_plonepas ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  archetypes_referencebrowserwidget = buildPythonPackage rec {
+    name = "archetypes.referencebrowserwidget-2.4.17";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.17.zip";
+      md5 = "bb7552f5ccfddcd068649d7b8162020c";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_app_jquerytools zope_component zope_interface plone_app_form zope_formlib setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  five_globalrequest = buildPythonPackage rec {
+    name = "five.globalrequest-1.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz";
+      md5 = "87f8996bd21d4aa156aa26e7d21b8744";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_globalrequest zope2 setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_rfc822 = buildPythonPackage rec {
+    name = "plone.rfc822-1.0.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.rfc822/plone.rfc822-1.0.1.zip";
+      md5 = "b5b79bb5a9181da624a7e88940a45424";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_schema zope_component python_dateutil setuptools zope_interface ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plonetheme_sunburst = buildPythonPackage rec {
+    name = "plonetheme.sunburst-1.4.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.1.zip";
+      md5 = "e2008dae3dad458dd7bf3be10e95160b";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_portlets = buildPythonPackage rec {
+    name = "plone.portlets-2.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.2.zip";
+      md5 = "5b7e06bee6e40af83694b82e1fee8c2d";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_publisher zope_site zope_container zope_interface plone_memoize zope_component zodb3 setuptools zope_schema zope_annotation zope_contentprovider ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_proxy = buildPythonPackage rec {
+    name = "zope.proxy-3.6.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip";
+      md5 = "a400b0a26624b17fa889dbcaa989d440";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_archetypes = buildPythonPackage rec {
+    name = "Products.Archetypes-1.8.6";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.8.6.zip";
+      md5 = "74be68879b27228c084a9be869132a98";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfformcontroller zope_interface zope_contenttype datetime zope_component products_mimetypesregistry plone_app_folder zope2 zope_lifecycleevent zope_i18nmessageid zope_publisher products_genericsetup products_validation products_portaltransforms products_cmfquickinstallertool products_placelesstranslationservice zope_event acquisition products_dcworkflow products_cmfdefault zope_tal plone_folder products_zsqlmethods products_statusmessages zope_schema zope_viewlet products_cmfcalendar extensionclass zope_datetime products_marshall zope_site zope_deferredimport zodb3 plone_uuid setuptools transaction zope_i18n products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  initgroups = buildPythonPackage rec {
+    name = "initgroups-2.13.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip";
+      md5 = "38e842dcab8445f65e701fec75213acd";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_schema = buildPythonPackage rec {
+    name = "zope.schema-4.2.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
+      md5 = "e7e581af8193551831560a736a53cf58";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_event setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_scale = buildPythonPackage rec {
+    name = "plone.scale-1.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.zip";
+      md5 = "2de525b3f436c851bce6e03f639d2d35";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_copy = buildPythonPackage rec {
+    name = "zope.copy-3.5.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz";
+      md5 = "a9836a5d36cd548be45210eb00407337";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  roman = buildPythonPackage rec {
+    name = "roman-1.4.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz";
+      md5 = "4f8832ed4108174b159c2afb4bd1d1dd";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_event = buildPythonPackage rec {
+    name = "zope.event-3.5.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz";
+      md5 = "6e8af2a16157a74885d4f0d88137cefb";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  acquisition = buildPythonPackage rec {
+    name = "Acquisition-2.13.8";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip";
+      md5 = "8c33160c157b50649e2b2b3224622579";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface extensionclass ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_resource = buildPythonPackage rec {
+    name = "plone.resource-1.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.resource/plone.resource-1.0.2.zip";
+      md5 = "594d41e3acd913ae92f2e9ef96503b9f";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ python_dateutil zope_filerepresentation zope2 zope_publisher z3c_caching zope_interface zope_traversing zope_configuration zope_component plone_caching setuptools zope_schema ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_linkintegrity = buildPythonPackage rec {
+    name = "plone.app.linkintegrity-1.5.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.1.zip";
+      md5 = "89701634d59c3b1a6fc61e5a21c4de52";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_resourceregistries = buildPythonPackage rec {
+    name = "Products.ResourceRegistries-2.2.7";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.7.zip";
+      md5 = "954e31a168a1eb3153e2fd4e590bb9ba";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 products_genericsetup zope_interface datetime plone_app_registry zope_component zodb3 setuptools zope_viewlet products_cmfcore acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_browserlayer = buildPythonPackage rec {
+    name = "plone.browserlayer-2.1.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.2.zip";
+      md5 = "bce02f4907a4f29314090c525e5fc28e";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 zope_interface zope_traversing zope_component setuptools products_genericsetup products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  markdown = buildPythonPackage rec {
+    name = "Markdown-2.0.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.zip";
+      md5 = "122418893e21e91109edbf6e082f830d";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  z3c_formwidget_query = buildPythonPackage rec {
+    name = "z3c.formwidget.query-0.9";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.9.zip";
+      md5 = "d9f7960b1a5a81d8ba5241530f496522";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid z3c_form zope_interface zope_component setuptools zope_schema ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_z3cform = buildPythonPackage rec {
+    name = "plone.app.z3cform-0.7.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.2.zip";
+      md5 = "aa8d1d45f8072ccfbfe0a608cd7144b6";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 setuptools plone_z3cform zope_interface z3c_formwidget_query collective_z3cform_datetimewidget zope_component zope_browserpage plone_protect zope_traversing ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_viewletmanager = buildPythonPackage rec {
+    name = "plone.app.viewletmanager-2.0.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.3.zip";
+      md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 products_genericsetup zope_site zope_interface zope_component zodb3 acquisition setuptools plone_app_vocabularies zope_viewlet zope_contentprovider ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_contentlisting = buildPythonPackage rec {
+    name = "plone.app.contentlisting-1.0.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.4.zip";
+      md5 = "fa6eb45c4ffd0eb3817ad4813ca24916";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_uuid setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_ramcache = buildPythonPackage rec {
+    name = "zope.ramcache-1.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip";
+      md5 = "87289e15f0e51f50704adda1557c02a7";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface zope_location zodb3 zope_testing setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_vocabularies = buildPythonPackage rec {
+    name = "plone.app.vocabularies-2.1.10";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.10.tar.gz";
+      md5 = "166a0d6f9a3e3cd753efa56aaef585be";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_site zope_formlib zope_interface zope_component setuptools zope_schema zope_browser zope_i18n products_cmfcore acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_discussion = buildPythonPackage rec {
+    name = "plone.app.discussion-2.2.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.4.zip";
+      md5 = "e40ef3d26f024fc1555b30b52489b445";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_app_uuid zope_site plone_indexer collective_monkeypatcher zope_interface plone_app_z3cform zope_container plone_app_layout plone_z3cform plone_app_registry zope_component zodb3 zope_event setuptools z3c_form zope_lifecycleevent zope_annotation plone_registry ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zlog = buildPythonPackage rec {
+    name = "zLOG-2.11.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz";
+      md5 = "68073679aaa79ac5a7b6a5c025467147";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zconfig ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zc_recipe_egg = buildPythonPackage rec {
+    name = "zc.recipe.egg-1.3.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-1.3.2.tar.gz";
+      md5 = "1cb6af73f527490dde461d3614a36475";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zc_buildout setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone = buildPythonPackage rec {
+    name = "Plone-4.3rc1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Plone/Plone-4.3rc1.zip";
+      md5 = "21e4fafe5d608f44e759a1a0544aed72";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfplone plone_app_caching plone_app_dexterity plone_app_theming setuptools products_cmfplacefulworkflow plone_app_openid plone_app_iterate wicked ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_standardcachemanagers = buildPythonPackage rec {
+    name = "Products.StandardCacheManagers-2.13.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip";
+      md5 = "c5088b2b62bd26d63d9579a04369cb73";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ accesscontrol zope_component transaction setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_fieldsets = buildPythonPackage rec {
+    name = "plone.fieldsets-2.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.2.zip";
+      md5 = "4158c8a1f784fcb5cecbd63deda7222f";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_formlib zope_interface zope_component five_formlib setuptools zope_schema ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  collective_monkeypatcher = buildPythonPackage rec {
+    name = "collective.monkeypatcher-1.0.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip";
+      md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  z3c_zcmlhook = buildPythonPackage rec {
+    name = "z3c.zcmlhook-1.0b1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz";
+      md5 = "7b6c80146f5930409eb0b355ddf3daeb";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_schema zope_component zope_configuration setuptools zope_interface ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_recipe_zope2instance = buildPythonPackage rec {
+    name = "plone.recipe.zope2instance-4.2.10";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.10.zip";
+      md5 = "787fad7fa44757de74a50a91e9bcfcb5";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zodb3 mailinglogger zc_buildout setuptools zope2 zc_recipe_egg ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_supermodel = buildPythonPackage rec {
+    name = "plone.supermodel-1.2.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.1.zip";
+      md5 = "b60d1553b297d41d9e2181afe15da4f4";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ lxml zope_deferredimport zope_interface zope_dottedname zope_component z3c_zcmlhook setuptools zope_schema ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_registry = buildPythonPackage rec {
+    name = "plone.app.registry-1.2.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.2.zip";
+      md5 = "d4659a2c4cfb3a66cd6c7ff1ca17be7f";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid lxml plone_registry products_genericsetup plone_supermodel plone_app_z3cform zope_dottedname zope_component zope2 setuptools zope_interface products_statusmessages plone_autoform products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_pagetemplate = buildPythonPackage rec {
+    name = "zope.pagetemplate-3.6.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.6.3.zip";
+      md5 = "834a4bf702c05fba1e669677b4dc871f";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_traversing zope_tales zope_security zope_component setuptools zope_tal zope_i18n ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_cmfformcontroller = buildPythonPackage rec {
+    name = "Products.CMFFormController-3.0.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.3.zip";
+      md5 = "6573df7dcb39e3b63ba22abe2acd639e";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_tales products_cmfcore zope2 setuptools zope_structuredtext acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_openid = buildPythonPackage rec {
+    name = "plone.openid-2.0.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.1.zip";
+      md5 = "d4c36926a6dbefed035ed92c29329ce1";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ transaction products_pluggableauthservice python_openid zodb3 setuptools zope2 acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_app_content = buildPythonPackage rec {
+    name = "zope.app.content-3.5.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz";
+      md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_schema zope_interface zope_componentvocabulary zope_security setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_size = buildPythonPackage rec {
+    name = "zope.size-3.4.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz";
+      md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_mimetypesregistry = buildPythonPackage rec {
+    name = "Products.MimetypesRegistry-2.0.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.4.zip";
+      md5 = "898166bb2aaececc8238ad4ee4826793";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 zope_interface zope_contenttype zodb3 setuptools products_cmfcore acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_imaging = buildPythonPackage rec {
+    name = "plone.app.imaging-1.0.7";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.7.zip";
+      md5 = "27c24477bdcbcebeba6cd83419a57aa6";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_scale setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_marshall = buildPythonPackage rec {
+    name = "Products.Marshall-2.1.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.2.zip";
+      md5 = "bde4d7f75195c1ded8371554b04d2541";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_contenttype datetime extensionclass plone_uuid setuptools zope2 products_cmfcore acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_ptresource = buildPythonPackage rec {
+    name = "zope.ptresource-3.9.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz";
+      md5 = "f4645e51c15289d3fdfb4139039e18e9";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_publisher zope_pagetemplate zope_interface zope_browserresource zope_security setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  pillow = buildPythonPackage rec {
+    name = "Pillow-1.7.7";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Pillow/Pillow-1.7.7.zip";
+      md5 = "0617fae88d62422b878906a3c394c687";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    configurePhase = '' sed -i "setup.py" -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ;s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;' '';
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  multimapping = buildPythonPackage rec {
+    name = "MultiMapping-2.13.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip";
+      md5 = "d69c5904c105b9f2f085d4103e0f0586";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ extensionclass ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_mailhost = buildPythonPackage rec {
+    name = "Products.MailHost-2.13.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip";
+      md5 = "1102e523435d8bf78a15b9ddb57478e1";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  pytz = buildPythonPackage rec {
+    name = "pytz-2012g";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012g.zip";
+      md5 = "1a9b24da1ab6328074b48fc3d4525078";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_i18n = buildPythonPackage rec {
+    name = "plone.app.i18n-2.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.2.zip";
+      md5 = "a10026573463dfc1899bf4062cebdbf2";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_indexer = buildPythonPackage rec {
+    name = "plone.indexer-1.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
+      md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface products_cmfcore setuptools zope_component ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_externalmethod = buildPythonPackage rec {
+    name = "Products.ExternalMethod-2.13.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip";
+      md5 = "15ba953ef6cb632eb571977651252ea6";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ accesscontrol extensionclass zodb3 persistence setuptools acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_upgrade = buildPythonPackage rec {
+    name = "plone.app.upgrade-1.3rc1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3rc1.zip";
+      md5 = "5132e3a77cc0288068106430136f2a49";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfformcontroller zope_interface products_cmfactionicons products_cmfeditions products_archetypes products_mimetypesregistry plone_app_folder products_cmfuid products_securemailhost zope_ramcache products_genericsetup products_cmfdifftool five_localsitemanager products_cmfquickinstallertool products_portaltransforms products_cmfdefault acquisition products_dcworkflow products_zcatalog borg_localrole products_contentmigration products_resourceregistries plone_portlets zope2 plone_app_portlets products_cmfcalendar products_plonepas transaction products_pluggableauthservice zope_site zope_component zope_location products_plonelanguagetool plone_session setuptools products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_browserpage = buildPythonPackage rec {
+    name = "zope.browserpage-3.12.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz";
+      md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_pagetemplate zope_interface zope_traversing zope_component zope_security zope_configuration zope_publisher setuptools zope_schema ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_resourceeditor = buildPythonPackage rec {
+    name = "plone.resourceeditor-1.0b4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0b4.zip";
+      md5 = "6e419868c2ea94a322dd631a1b0b753c";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_resource zope2 zope_publisher zope_interface zope_component setuptools zope_schema ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_atcontenttypes = buildPythonPackage rec {
+    name = "Products.ATContentTypes-2.1.12";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.12.zip";
+      md5 = "ef38ce0769a5f44e272623f8f118a669";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize datetime products_archetypes products_mimetypesregistry plone_app_folder zope2 zope_i18nmessageid zope_publisher products_genericsetup plone_i18n products_portaltransforms products_cmfdefault products_atreferencebrowserwidget zope_tal zconfig archetypes_referencebrowserwidget transaction products_validation acquisition extensionclass zope_component plone_app_layout zodb3 setuptools zope_i18n products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_cmfeditions = buildPythonPackage rec {
+    name = "Products.CMFEditions-2.2.8";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip";
+      md5 = "1806f2e17e2527fad9364670b343bd11";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid transaction products_cmfdifftool zope_copy zope_interface products_genericsetup zope_dottedname products_zopeversioncontrol datetime products_cmfuid zodb3 products_cmfcore setuptools zope2 acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_interface = buildPythonPackage rec {
+    name = "zope.interface-3.6.7";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip";
+      md5 = "9df962180fbbb54eb1875cff9fe436e5";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_content = buildPythonPackage rec {
+    name = "plone.app.content-2.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.zip";
+      md5 = "8c8f0d5cc235fe7cb5ef9fe02b7e1c09";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher zope_container plone_batching zope_interface plone_memoize plone_i18n zope_component zope_event products_cmfcore setuptools zope_schema zope_lifecycleevent zope_i18n zope_viewlet acquisition products_cmfdefault ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_cmfquickinstallertool = buildPythonPackage rec {
+    name = "Products.CMFQuickInstallerTool-3.0.6";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz";
+      md5 = "af34adb87ddf2b6da48eff8b70ca2989";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 products_genericsetup zope_interface datetime zope_component setuptools zope_annotation products_cmfcore acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_autoform = buildPythonPackage rec {
+    name = "plone.autoform-1.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.3.zip";
+      md5 = "4cb2935ba9cda3eb3ee801ad8cda7c60";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ z3c_form zope_interface zope_dottedname zope_security setuptools plone_supermodel zope_schema plone_z3cform ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_contentrules = buildPythonPackage rec {
+    name = "plone.app.contentrules-3.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.zip";
+      md5 = "bd60122bf527ed90e9d6fbc6a7fb3625";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface zope_traversing plone_app_form zope_component zope_lifecycleevent zope_annotation zope_i18nmessageid products_genericsetup zope_event products_cmfdefault zope_browser plone_uuid plone_memoize zope2 plone_stringinterp products_statusmessages plone_contentrules zope_schema acquisition transaction zope_site zope_container plone_app_vocabularies zope_publisher zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  record = buildPythonPackage rec {
+    name = "Record-2.13.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip";
+      md5 = "cfed6a89d4fb2c9cb995e9084c3071b7";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ extensionclass ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_behavior = buildPythonPackage rec {
+    name = "plone.behavior-1.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.behavior/plone.behavior-1.0.2.zip";
+      md5 = "4459b91287ebc2f2cf4fa38728b2a739";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface zope_configuration zope_component setuptools zope_schema zope_annotation ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_plonetestcase = buildPythonPackage rec {
+    name = "Products.PloneTestCase-0.9.15";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.15.zip";
+      md5 = "ddd5810937919ab5233ebd64893c8bae";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfplone zope_testing zope2 products_genericsetup zope_site zope_interface products_atcontenttypes zope_component zodb3 setuptools products_cmfcore acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_stringinterp = buildPythonPackage rec {
+    name = "plone.stringinterp-1.0.7";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.7.zip";
+      md5 = "81909716210c6ac3fd0ee87f45ea523d";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18n products_cmfcore setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_formwidget_namedfile = buildPythonPackage rec {
+    name = "plone.formwidget.namedfile-1.0.5";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.5.zip";
+      md5 = "7d39a5760d679c89d8e41abbc295240f";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ z3c_form plone_z3cform plone_namedfile setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_blob = buildPythonPackage rec {
+    name = "plone.app.blob-1.5.7";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.7.zip";
+      md5 = "135bc404212981c445d5bbb6a749b155";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_scale plone_app_imaging zodb3 setuptools archetypes_schemaextender zope_proxy ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_cmfdynamicviewfti = buildPythonPackage rec {
+    name = "Products.CMFDynamicViewFTI-4.0.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.3.zip";
+      md5 = "7d39d416b41b2d93954bc73d9d0e077f";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ extensionclass products_genericsetup zope_browsermenu zope_interface zope_component zope2 setuptools products_cmfcore acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_keyring = buildPythonPackage rec {
+    name = "plone.keyring-2.0.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip";
+      md5 = "f3970e9bddb2cc65e461a2c62879233f";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_container zope_location zodb3 setuptools zope_interface ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_contentprovider = buildPythonPackage rec {
+    name = "zope.contentprovider-3.7.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz";
+      md5 = "1bb2132551175c0123f17939a793f812";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_publisher zope_interface zope_location zope_tales zope_component zope_event setuptools zope_schema ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_jquery = buildPythonPackage rec {
+    name = "plone.app.jquery-1.7.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz";
+      md5 = "e204cf45456d26217263531832b5bdac";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_atreferencebrowserwidget = buildPythonPackage rec {
+    name = "Products.ATReferenceBrowserWidget-3.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip";
+      md5 = "157bdd32155c8353450c17c649aad042";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_deprecation archetypes_referencebrowserwidget setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_browserresource = buildPythonPackage rec {
+    name = "zope.browserresource-3.10.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip";
+      md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface zope_location zope_traversing zope_contenttype zope_configuration zope_publisher setuptools zope_schema zope_i18n zope_component ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_caching = buildPythonPackage rec {
+    name = "plone.caching-1.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip";
+      md5 = "2c2e3b27d13b9101c92dfed222fde36c";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid five_globalrequest z3c_caching zope_interface zope2 zope_component setuptools plone_transformchain zope_schema plone_registry ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_app_locales = buildPythonPackage rec {
+    name = "zope.app.locales-3.6.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz";
+      md5 = "bd2b4c6040e768f33004b1210d3207fa";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_placelesstranslationservice = buildPythonPackage rec {
+    name = "Products.PlacelessTranslationService-2.0.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.3.zip";
+      md5 = "a94635eb712563c5a002520713f5d6dc";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ extensionclass zope_publisher zope_deferredimport zope_deprecation zope_interface python_gettext datetime zope_component zodb3 setuptools zope_annotation zope_i18n zope2 acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_z3cform = buildPythonPackage rec {
+    name = "plone.z3cform-0.8.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip";
+      md5 = "bdb23dd162544964d2f8f8f5f002e874";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 zope_component plone_batching zope_i18n z3c_form zope_browserpage setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_lifecycleevent = buildPythonPackage rec {
+    name = "zope.lifecycleevent-3.6.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz";
+      md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_event setuptools zope_component ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_app_form = buildPythonPackage rec {
+    name = "zope.app.form-4.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz";
+      md5 = "3d2b164d9d37a71490a024aaeb412e91";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_browserpage zope_schema transaction zope_datetime zope_browsermenu zope_interface zope_exceptions zope_security zope_configuration zope_publisher zope_component zope_formlib zope_browser setuptools zope_proxy zope_i18n ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_tinymce = buildPythonPackage rec {
+    name = "Products.TinyMCE-1.3-1.3.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.zip";
+      md5 = "02bec5bac10a3fe5fff3d04beb46ac53";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_archetypes plone_app_imaging plone_namedfile plone_app_layout zope_schema products_resourceregistries zope_app_content plone_caching setuptools plone_outputfilters ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  collective_z3cform_datetimewidget = buildPythonPackage rec {
+    name = "collective.z3cform.datetimewidget-1.2.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.3.zip";
+      md5 = "439117021c93f26c677510504ee245d3";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ z3c_form zope_deprecation zope_i18n setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  z3c_form = buildPythonPackage rec {
+    name = "z3c.form-3.0.0a2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.0a2.zip";
+      md5 = "c4468ed0273901fb887cca9cfd1bb2cb";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_site zope_pagetemplate zope_interface zope_browserresource six zope_security zope_configuration zope_component zope_event zope_traversing setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_location zope_contentprovider ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_dcworkflow = buildPythonPackage rec {
+    name = "Products.DCWorkflow-2.2.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz";
+      md5 = "c90a16c4f3611015592ba8173a5f1863";
+    };
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  mechanize = buildPythonPackage rec {
+    name = "mechanize-0.2.5";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.zip";
+      md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_iterate = buildPythonPackage rec {
+    name = "plone.app.iterate-2.1.10";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.10.zip";
+      md5 = "8bd270d8a3c9509e524a06e092a9b4c4";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_viewlet zope_i18nmessageid zodb3 products_archetypes zope_interface plone_memoize products_cmfeditions datetime zope_component products_dcworkflow products_statusmessages zope_event setuptools products_cmfplacefulworkflow zope_schema zope_lifecycleevent zope_annotation zope2 plone_locking products_cmfcore acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  accesscontrol = buildPythonPackage rec {
+    name = "AccessControl-3.0.6";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.6.zip";
+      md5 = "a8ce472482adabf9ec969f3971a39a19";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_security zope_testing extensionclass zope_publisher restrictedpython zope_interface zope_deferredimport zope_schema zope_configuration datetime record transaction acquisition zodb3 zope_component zexceptions persistence ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_testing = buildPythonPackage rec {
+    name = "zope.testing-3.9.7";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz";
+      md5 = "8999f3d143d416dc3c8b2a5bd6f33e28";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_exceptions setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_externaleditor = buildPythonPackage rec {
+    name = "Products.ExternalEditor-1.1.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip";
+      md5 = "475fea6e0b958c0c51cfdbfef2f4e623";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_app_publication = buildPythonPackage rec {
+    name = "zope.app.publication-3.12.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip";
+      md5 = "d8c521287f52fb9f40fa9b8c2acb4675";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_authentication zope_publisher zope_interface zope_location zope_traversing zope_component zope_error zodb3 setuptools zope_browser ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_filerepresentation = buildPythonPackage rec {
+    name = "zope.filerepresentation-3.6.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz";
+      md5 = "4a7a434094f4bfa99a7f22e75966c359";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_schema zope_interface setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  six = buildPythonPackage rec {
+    name = "six-1.2.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/s/six/six-1.2.0.tar.gz";
+      md5 = "2a5d1afc79912832ac78fd38e3d75d7e";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_dexterity = buildPythonPackage rec {
+    name = "plone.app.dexterity-2.0.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.4.zip";
+      md5 = "3fabdb2ec9fa0cfee0ffd4b7e9f05f5b";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ collective_z3cform_datetimewidget zope_interface zope_component plone_dexterity plone_autoform plone_behavior lxml zope_publisher products_genericsetup plone_supermodel plone_namedfile plone_app_content plone_app_textfield plone_app_z3cform plone_rfc822 plone_formwidget_namedfile z3c_form plone_portlets plone_app_uuid zope_browserpage plone_contentrules products_cmfplone zope_schema zope2 plone_app_layout plone_schemaeditor plone_z3cform setuptools products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_exceptions = buildPythonPackage rec {
+    name = "zope.exceptions-3.6.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz";
+      md5 = "d7234d99d728abe3d9275346e8d24fd9";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_layout = buildPythonPackage rec {
+    name = "plone.app.layout-2.3.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.4.zip";
+      md5 = "817819f27ad46fcb8a9d66e988fa08f2";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_deprecation zope_interface plone_memoize zope_dottedname datetime zope_component zope_annotation zope_publisher plone_i18n products_cmfdefault plone_app_viewletmanager plone_portlets plone_app_portlets zope_schema zope_viewlet acquisition zope2 setuptools zope_i18n plone_locking products_cmfcore products_cmfeditions ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_contenttype = buildPythonPackage rec {
+    name = "zope.contenttype-3.5.5";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip";
+      md5 = "c6ac80e6887de4108a383f349fbdf332";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  five_customerize = buildPythonPackage rec {
+    name = "five.customerize-1.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.1.zip";
+      md5 = "80772212a2d55150a6c070fc4638b0c7";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_testing transaction zope_publisher zope_site zope_pagetemplate zope_interface zope_traversing zope_dottedname plone_portlets zope_component zope_componentvocabulary setuptools zope_schema zope_lifecycleevent zope2 zope_viewlet acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_subrequest = buildPythonPackage rec {
+    name = "plone.subrequest-1.6.7";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.7.zip";
+      md5 = "cc12f68a22565415b10dbeef0020baa4";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_globalrequest five_globalrequest setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_site = buildPythonPackage rec {
+    name = "zope.site-3.9.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz";
+      md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_location zope_interface zope_security zope_container zope_event setuptools zope_lifecycleevent zope_annotation zope_component ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
   wicked = buildPythonPackage rec {
     name = "wicked-1.1.10";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/w/wicked/${name}.zip";
-      md5 = "f65611f11d547d7dc8e623bf87d3929d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  wsgi_intercept = buildPythonPackage rec {
-    name = "wsgi-intercept-0.4";
-
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip";
       md5 = "f65611f11d547d7dc8e623bf87d3929d";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_schema zope_container zope_traversing setuptools zope_lifecycleevent ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_autoinclude = buildPythonPackage rec {
-    name = "z3c.autoinclude-0.3.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/${name}.zip";
-      md5 = "6a615ae18c12b459bceb3ae28e8e7709";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
+  plone_schemaeditor = buildPythonPackage rec {
+    name = "plone.schemaeditor-1.3.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.1.zip";
+      md5 = "81a5a66cc07b20c554c68ad2ae831b2f";
+    };
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope2 zope_publisher zope_container z3c_form zope_interface zope_component setuptools zope_schema zope_lifecycleevent plone_autoform plone_z3cform ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_batching = buildPythonPackage rec {
-    name = "z3c.batching-1.1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.batching/${name}.tar.gz";
-      md5 = "d1dc834781d228127ca6d15301757863";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  z3c_blobfile = buildPythonPackage rec {
-    name = "z3c.blobfile-0.1.5";
-
+  plone_app_uuid = buildPythonPackage rec {
+    name = "plone.app.uuid-1.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.blobfile/${name}.zip";
-      md5 = "2e806640aa2f3b51e4578f35c44f567a";
+      url = "http://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.0.zip";
+      md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ plone_indexer zope_interface zope_publisher plone_uuid setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_caching = buildPythonPackage rec {
-    name = "z3c.caching-2.0a1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.caching/${name}.tar.gz";
-      md5 = "17f250b5084c2324a7d15c6810ee628e";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  z3c_checkversions = buildPythonPackage rec {
-    name = "z3c.checkversions-0.4.1";
-
+  unittest2 = buildPythonPackage rec {
+    name = "unittest2-0.5.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.checkversions/${name}.tar.gz";
-      md5 = "907f3a28aac04ad98fb3c4c5879a1eaf";
+      url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.zip";
+      md5 = "1527fb89e38343945af1166342d851ee";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_coverage = buildPythonPackage rec {
-    name = "z3c.coverage-1.2.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.coverage/${name}.tar.gz";
-      md5 = "d7f323a6c89f848fab38209f2162294d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_form = buildPythonPackage rec {
-    name = "z3c.form-2.5.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.form/${name}.tar.gz";
-      md5 = "f029f83dd226f695f55049ed1ecee95e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_formwidget_query = buildPythonPackage rec {
-    name = "z3c.formwidget.query-0.9";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/${name}.zip";
-      md5 = "d9f7960b1a5a81d8ba5241530f496522";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_objpath = buildPythonPackage rec {
-    name = "z3c.objpath-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.objpath/${name}.tar.gz";
-      md5 = "63641934441b255ebeeaeabc618f01ed";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  z3c_ptcompat = buildPythonPackage rec {
-    name = "z3c.ptcompat-1.0.1";
-
+  persistence = buildPythonPackage rec {
+    name = "Persistence-2.13.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.ptcompat/${name}.tar.gz";
-      md5 = "bfe1ba6f9a38679705bd3eb5a5a2d7c4";
+      url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
+      md5 = "92693648ccdc59c8fc71f7f06b1d228c";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_recipe_compattest = buildPythonPackage rec {
-    name = "z3c.recipe.compattest-0.12.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.recipe.compattest/${name}.tar.gz";
-      md5 = "ed5a1bde7ce384154721913846c736c7";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_recipe_depgraph = buildPythonPackage rec {
-    name = "z3c.recipe.depgraph-0.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.recipe.depgraph/${name}.zip";
-      md5 = "eb734419815146eb5b7080b5e17346dc";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ extensionclass zodb3 ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_recipe_sphinxdoc = buildPythonPackage rec {
-    name = "z3c.recipe.sphinxdoc-0.0.8";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.recipe.sphinxdoc/${name}.tar.gz";
-      md5 = "86e6965c919b43fa1de07588580f8790";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  z3c_relationfield = buildPythonPackage rec {
-    name = "z3c.relationfield-0.6.2";
-
+  products_zopeversioncontrol = buildPythonPackage rec {
+    name = "Products.ZopeVersionControl-1.1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.relationfield/${name}.zip";
-      md5 = "e34a6230cdfbd4a0bc1c90a77600e0e7";
+      url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip";
+      md5 = "238239102f3ac798ee4f4c53343a561f";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ transaction zope_interface datetime zodb3 setuptools zope2 acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_template = buildPythonPackage rec {
-    name = "z3c.template-1.4.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.template/${name}.tar.gz";
-      md5 = "330e2dba8cd064d5790392afd9f460dd";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_zcmlhook = buildPythonPackage rec {
-    name = "z3c.zcmlhook-1.0b1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/${name}.tar.gz";
-      md5 = "7b6c80146f5930409eb0b355ddf3daeb";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zc_lockfile = buildPythonPackage rec {
-    name = "zc.lockfile-1.0.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.lockfile/${name}.tar.gz";
-      md5 = "6cf83766ef9935c33e240b0904c7a45e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zc_recipe_egg = buildPythonPackage rec {
-    name = "zc.recipe.egg-1.3.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/${name}.tar.gz";
-      md5 = "1cb6af73f527490dde461d3614a36475";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zc_recipe_testrunner = buildPythonPackage rec {
-    name = "zc.recipe.testrunner-1.2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.recipe.testrunner/${name}.tar.gz";
-      md5 = "1be4a1518e5b94890634468118242850";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zc_relation = buildPythonPackage rec {
-    name = "zc.relation-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.relation/${name}.tar.gz";
-      md5 = "7e479095954fc6d8f648951434695837";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zc_resourcelibrary = buildPythonPackage rec {
-    name = "zc.resourcelibrary-1.3.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.resourcelibrary/${name}.tar.gz";
-      md5 = "bebe49f3e930f896a8ea75531bf3fae8";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zc_sourcefactory = buildPythonPackage rec {
-    name = "zc.sourcefactory-0.7.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.sourcefactory/${name}.tar.gz";
-      md5 = "532dfd0a72489023268c19e3788b105d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zconfig = buildPythonPackage rec {
-    name = "ZConfig-2.9.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZConfig/${name}.zip";
-      md5 = "5c932690a70c8907efd240cdd76a7bc4";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zdaemon = buildPythonPackage rec {
-    name = "zdaemon-2.0.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz";
-      md5 = "291a875f82e812110557eb6704af8afe";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zexceptions = buildPythonPackage rec {
-    name = "zExceptions-2.13.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zExceptions/${name}.zip";
-      md5 = "4c679696c959040d8e656ef85ae40136";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zlog = buildPythonPackage rec {
-    name = "zLOG-2.11.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zLOG/${name}.tar.gz";
-      md5 = "68073679aaa79ac5a7b6a5c025467147";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zodb3 = buildPythonPackage rec {
-    name = "ZODB3-3.10.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZODB3/${name}.tar.gz";
-      md5 = "6f180c6897a1820948fee2a6290503cd";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zodbcode = buildPythonPackage rec {
-    name = "zodbcode-3.4.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zodbcode/${name}.tar.gz";
-      md5 = "9b128f89aa2a2117fae4f74757eefeff";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope2 = buildPythonPackage rec {
-    name = "Zope2-2.13.19";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/Zope2/${name}.zip";
-      md5 = "26fee311aace7c12e406543ea91eb42a";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_annotation = buildPythonPackage rec {
-    name = "zope.annotation-3.5.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.annotation/${name}.tar.gz";
-      md5 = "4238153279d3f30ab5613438c8e76380";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_apidoc = buildPythonPackage rec {
-    name = "zope.app.apidoc-3.7.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.apidoc/${name}.zip";
-      md5 = "91e969b2d1089bb0a6a303990d269f0a";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_applicationcontrol = buildPythonPackage rec {
-    name = "zope.app.applicationcontrol-3.5.10";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.applicationcontrol/${name}.tar.gz";
-      md5 = "f785c13698192c83024fda75f1f3d822";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_appsetup = buildPythonPackage rec {
-    name = "zope.app.appsetup-3.14.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.appsetup/${name}.tar.gz";
-      md5 = "2c3da1f514e6793e2bf612cb06ad9076";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_authentication = buildPythonPackage rec {
-    name = "zope.app.authentication-3.8.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.authentication/${name}.tar.gz";
-      md5 = "f8eb74fbdeebfd32c5e15c0f03aa3623";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_basicskin = buildPythonPackage rec {
-    name = "zope.app.basicskin-3.5.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.basicskin/${name}.tar.gz";
-      md5 = "75915a315f336a5b614db67df1093eb3";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_broken = buildPythonPackage rec {
-    name = "zope.app.broken-3.6.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.broken/${name}.tar.gz";
-      md5 = "e6a7efdd1ea1facfd8c5ba4b25d395cb";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_cache = buildPythonPackage rec {
-    name = "zope.app.cache-3.7.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.cache/${name}.zip";
-      md5 = "8dd74574e869ce236ced0de7e349bb5c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_catalog = buildPythonPackage rec {
-    name = "zope.app.catalog-3.8.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.catalog/${name}.tar.gz";
-      md5 = "1ce21dee4e8256cfe254f8ee24c6ecef";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_component = buildPythonPackage rec {
-    name = "zope.app.component-3.9.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.component/${name}.tar.gz";
-      md5 = "bc2dce245d2afe462529c350956711e0";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_container = buildPythonPackage rec {
-    name = "zope.app.container-3.9.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.container/${name}.tar.gz";
-      md5 = "1e286c59f0166e517d67ddd723641c84";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_content = buildPythonPackage rec {
-    name = "zope.app.content-3.5.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.content/${name}.tar.gz";
-      md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_dav = buildPythonPackage rec {
-    name = "zope.app.dav-3.5.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.dav/${name}.tar.gz";
-      md5 = "19ec8dc5f7ad21468dea1c46e86d95dd";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_debug = buildPythonPackage rec {
-    name = "zope.app.debug-3.4.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.debug/${name}.tar.gz";
-      md5 = "1a9d349b14d91137b57da52a2b9d185f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_debugskin = buildPythonPackage rec {
-    name = "zope.app.debugskin-3.4.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.debugskin/${name}.tar.gz";
-      md5 = "bd95d2848aa3108e53717d13b3c0924d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_dependable = buildPythonPackage rec {
-    name = "zope.app.dependable-3.5.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.dependable/${name}.zip";
-      md5 = "5f180620a880e6ec754e3a34bd110891";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_error = buildPythonPackage rec {
-    name = "zope.app.error-3.5.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.error/${name}.tar.gz";
-      md5 = "bab82dd06233e9b5e34e9709e8993ace";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_exception = buildPythonPackage rec {
-    name = "zope.app.exception-3.6.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.exception/${name}.tar.gz";
-      md5 = "af161d3e7c17db7f56f7816a6f2d980c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_file = buildPythonPackage rec {
-    name = "zope.app.file-3.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.file/${name}.tar.gz";
-      md5 = "fff140c36a2872c85b55433835ac3b98";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_folder = buildPythonPackage rec {
-    name = "zope.app.folder-3.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.folder/${name}.tar.gz";
-      md5 = "5ba3a2a7ec527a7eb0cc3c2eb7bb75e9";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_form = buildPythonPackage rec {
-    name = "zope.app.form-4.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.form/${name}.tar.gz";
-      md5 = "3d2b164d9d37a71490a024aaeb412e91";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_ftp = buildPythonPackage rec {
-    name = "zope.app.ftp-3.5.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.ftp/${name}.tar.gz";
-      md5 = "b0769f90023156a86cb3f46040e6b5b0";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_generations = buildPythonPackage rec {
-    name = "zope.app.generations-3.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.generations/${name}.tar.gz";
-      md5 = "ca74e0f4a01ad8767e1bba6332c39aa2";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_http = buildPythonPackage rec {
-    name = "zope.app.http-3.9.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.http/${name}.tar.gz";
-      md5 = "26f73a3affecefc3aff960cd8b088681";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_i18n = buildPythonPackage rec {
-    name = "zope.app.i18n-3.6.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.i18n/${name}.tar.gz";
-      md5 = "c8573307ba08926214b7944a05e43632";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_interface = buildPythonPackage rec {
-    name = "zope.app.interface-3.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.interface/${name}.tar.gz";
-      md5 = "b15522275a435c609bd44f2f019bd13c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_interpreter = buildPythonPackage rec {
-    name = "zope.app.interpreter-3.4.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.interpreter/${name}.tar.gz";
-      md5 = "fb8a2aa57dcfa3af2f30801dfafc78c4";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_intid = buildPythonPackage rec {
-    name = "zope.app.intid-3.7.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.intid/${name}.tar.gz";
-      md5 = "0d2c1daf5d1d6fd09351b652042a2dac";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_keyreference = buildPythonPackage rec {
-    name = "zope.app.keyreference-3.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.keyreference/${name}.tar.gz";
-      md5 = "78539e472016a8ca57b34b6ea0ab7d9d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_locales = buildPythonPackage rec {
-    name = "zope.app.locales-3.6.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.locales/${name}.tar.gz";
-      md5 = "bd2b4c6040e768f33004b1210d3207fa";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_localpermission = buildPythonPackage rec {
-    name = "zope.app.localpermission-3.7.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.localpermission/${name}.tar.gz";
-      md5 = "121509781b19ce55ebe890fa408702fc";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_locking = buildPythonPackage rec {
-    name = "zope.app.locking-3.5.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.locking/${name}.tar.gz";
-      md5 = "4edce1ba26f6c56b0eb79f703d8a80fe";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_onlinehelp = buildPythonPackage rec {
-    name = "zope.app.onlinehelp-3.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.onlinehelp/${name}.tar.gz";
-      md5 = "67d0be66965e34b24ef18c269da62e4c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_pagetemplate = buildPythonPackage rec {
-    name = "zope.app.pagetemplate-3.11.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.pagetemplate/${name}.tar.gz";
-      md5 = "2d304729c0d6a9ab67dd5ea852f19476";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_preference = buildPythonPackage rec {
-    name = "zope.app.preference-3.8.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.preference/${name}.tar.gz";
-      md5 = "ab6906261854c61ff9f0a13c7612d3e8";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_preview = buildPythonPackage rec {
-    name = "zope.app.preview-3.4.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.preview/${name}.tar.gz";
-      md5 = "e698c10b043fb944150a825af9af536e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_principalannotation = buildPythonPackage rec {
-    name = "zope.app.principalannotation-3.7.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.principalannotation/${name}.tar.gz";
-      md5 = "29c6bf8e817330b0d29de253686a68f2";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_publication = buildPythonPackage rec {
-    name = "zope.app.publication-3.12.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.publication/${name}.zip";
-      md5 = "d8c521287f52fb9f40fa9b8c2acb4675";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_publisher = buildPythonPackage rec {
-    name = "zope.app.publisher-3.10.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.publisher/${name}.zip";
-      md5 = "66e9110e2967d8d204a65a98e2227404";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_renderer = buildPythonPackage rec {
-    name = "zope.app.renderer-3.5.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.renderer/${name}.tar.gz";
-      md5 = "1cc605baf5dab7db50b0a0fd218566f3";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_rotterdam = buildPythonPackage rec {
-    name = "zope.app.rotterdam-3.5.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.rotterdam/${name}.tar.gz";
-      md5 = "4cb3c53844bc7481f9b7d60f3c5e3a85";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_schema = buildPythonPackage rec {
-    name = "zope.app.schema-3.5.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.schema/${name}.tar.gz";
-      md5 = "92b7c3f4512f3433acc931ecb6ffc936";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_security = buildPythonPackage rec {
-    name = "zope.app.security-3.7.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.security/${name}.tar.gz";
-      md5 = "c7cec00f6d8379b93180faf6ffaa89ea";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_securitypolicy = buildPythonPackage rec {
-    name = "zope.app.securitypolicy-3.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.securitypolicy/${name}.tar.gz";
-      md5 = "e3c6ef1db3228dbbb60a452c1a2a8f27";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_server = buildPythonPackage rec {
-    name = "zope.app.server-3.6.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.server/${name}.tar.gz";
-      md5 = "d3a75eaf2a3f4759352dd3243dfb1d50";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_session = buildPythonPackage rec {
-    name = "zope.app.session-3.6.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.session/${name}.tar.gz";
-      md5 = "93467bf6854d714b53e71f36a9d770f3";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_skins = buildPythonPackage rec {
-    name = "zope.app.skins-3.4.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.skins/${name}.tar.gz";
-      md5 = "a0bc210720ee50e40adb93e9c685e884";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_testing = buildPythonPackage rec {
-    name = "zope.app.testing-3.7.8";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.testing/${name}.tar.gz";
-      md5 = "6fd3eb11e24973a3dbdf5f1ab655c0d4";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_tree = buildPythonPackage rec {
-    name = "zope.app.tree-3.6.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.tree/${name}.tar.gz";
-      md5 = "fbde3403c682bc7cf7b73d43cd2eed3a";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_twisted = buildPythonPackage rec {
-    name = "zope.app.twisted-3.5.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.twisted/${name}.tar.gz";
-      md5 = "9e98868b8be8a0c4f720036366364a67";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_undo = buildPythonPackage rec {
-    name = "zope.app.undo-3.5.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.undo/${name}.tar.gz";
-      md5 = "7a40060aa0451a635a31d6e12d17a82e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_wsgi = buildPythonPackage rec {
-    name = "zope.app.wsgi-3.9.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.wsgi/${name}.tar.gz";
-      md5 = "9c766908b720d777e02e0b0a9ac8a8a1";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_zcmlfiles = buildPythonPackage rec {
-    name = "zope.app.zcmlfiles-3.7.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.zcmlfiles/${name}.tar.gz";
-      md5 = "0e8991d2bed71ee6b98a2c48d21e1126";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_zopeappgenerations = buildPythonPackage rec {
-    name = "zope.app.zopeappgenerations-3.5.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.zopeappgenerations/${name}.tar.gz";
-      md5 = "4c8a0bc409677f8b17dc57737d41f919";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_zptpage = buildPythonPackage rec {
-    name = "zope.app.zptpage-3.5.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.zptpage/${name}.tar.gz";
-      md5 = "aed8ec49e10911bd1e9d2c9d467fd098";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_applicationcontrol = buildPythonPackage rec {
-    name = "zope.applicationcontrol-3.5.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.applicationcontrol/${name}.tar.gz";
-      md5 = "5e4bb54afe55185e15bd9d1ba3750857";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_authentication = buildPythonPackage rec {
-    name = "zope.authentication-3.7.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.authentication/${name}.zip";
-      md5 = "7d6bb340610518f2fc71213cfeccda68";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_broken = buildPythonPackage rec {
-    name = "zope.broken-3.6.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.broken/${name}.zip";
-      md5 = "eff24d7918099a3e899ee63a9c31bee6";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_browser = buildPythonPackage rec {
-    name = "zope.browser-1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browser/${name}.zip";
-      md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_browsermenu = buildPythonPackage rec {
-    name = "zope.browsermenu-3.9.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browsermenu/${name}.zip";
-      md5 = "a47c7b1e786661c912a1150bf8d1f83f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_browserpage = buildPythonPackage rec {
-    name = "zope.browserpage-3.12.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browserpage/${name}.tar.gz";
-      md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_browserresource = buildPythonPackage rec {
-    name = "zope.browserresource-3.10.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browserresource/${name}.zip";
-      md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_cachedescriptors = buildPythonPackage rec {
-    name = "zope.cachedescriptors-3.5.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/${name}.zip";
-      md5 = "263459a95238fd61d17e815d97ca49ce";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_catalog = buildPythonPackage rec {
-    name = "zope.catalog-3.8.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.catalog/${name}.tar.gz";
-      md5 = "f9baff3997e337f0a23ac158258c8842";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_component = buildPythonPackage rec {
-    name = "zope.component-3.9.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.component/${name}.tar.gz";
-      md5 = "22780b445b1b479701c05978055d1c82";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_componentvocabulary = buildPythonPackage rec {
-    name = "zope.componentvocabulary-1.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/${name}.tar.gz";
-      md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_configuration = buildPythonPackage rec {
-    name = "zope.configuration-3.7.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.configuration/${name}.zip";
-      md5 = "5b0271908ef26c05059eda76928896ea";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_container = buildPythonPackage rec {
-    name = "zope.container-3.11.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.container/${name}.tar.gz";
-      md5 = "fc66d85a17b8ffb701091c9328983dcc";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_contentprovider = buildPythonPackage rec {
-    name = "zope.contentprovider-3.7.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.contentprovider/${name}.tar.gz";
-      md5 = "1bb2132551175c0123f17939a793f812";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_contenttype = buildPythonPackage rec {
-    name = "zope.contenttype-3.5.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.zip";
-      md5 = "c6ac80e6887de4108a383f349fbdf332";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_copy = buildPythonPackage rec {
-    name = "zope.copy-3.5.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.tar.gz";
-      md5 = "a9836a5d36cd548be45210eb00407337";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_copypastemove = buildPythonPackage rec {
-    name = "zope.copypastemove-3.7.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.copypastemove/${name}.tar.gz";
-      md5 = "f335940686d15cfc5520c42f2494a924";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_datetime = buildPythonPackage rec {
-    name = "zope.datetime-3.4.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.datetime/${name}.tar.gz";
-      md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_deferredimport = buildPythonPackage rec {
-    name = "zope.deferredimport-3.5.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.deferredimport/${name}.tar.gz";
-      md5 = "68fce3bf4f011d4a840902fd763884ee";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_deprecation = buildPythonPackage rec {
-    name = "zope.deprecation-3.4.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.deprecation/${name}.tar.gz";
-      md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_documenttemplate = buildPythonPackage rec {
-    name = "zope.documenttemplate-3.4.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.documenttemplate/${name}.tar.gz";
-      md5 = "d5c302534ee0913c39bdc227e1592cb7";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_dottedname = buildPythonPackage rec {
-    name = "zope.dottedname-3.4.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.dottedname/${name}.tar.gz";
-      md5 = "62d639f75b31d2d864fe5982cb23959c";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_dublincore = buildPythonPackage rec {
-    name = "zope.dublincore-3.7.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.dublincore/${name}.tar.gz";
-      md5 = "2e34e42e454d896feb101ac74af62ded";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_error = buildPythonPackage rec {
-    name = "zope.error-3.7.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.error/${name}.tar.gz";
-      md5 = "281445a906458ff5f18f56923699a127";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_event = buildPythonPackage rec {
-    name = "zope.event-3.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.event/${name}.tar.gz";
-      md5 = "6e8af2a16157a74885d4f0d88137cefb";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_exceptions = buildPythonPackage rec {
-    name = "zope.exceptions-3.6.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.exceptions/${name}.tar.gz";
-      md5 = "d7234d99d728abe3d9275346e8d24fd9";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_file = buildPythonPackage rec {
-    name = "zope.file-0.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.file/${name}.tar.gz";
-      md5 = "5df3b63c678f4b445be345f1dff1bc9b";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_filerepresentation = buildPythonPackage rec {
-    name = "zope.filerepresentation-3.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/${name}.tar.gz";
-      md5 = "4a7a434094f4bfa99a7f22e75966c359";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_formlib = buildPythonPackage rec {
-    name = "zope.formlib-4.0.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.formlib/${name}.zip";
-      md5 = "eed9c94382d11a4dececd0a48ac1d3f2";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_globalrequest = buildPythonPackage rec {
-    name = "zope.globalrequest-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.globalrequest/${name}.zip";
-      md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_hookable = buildPythonPackage rec {
-    name = "zope.hookable-3.4.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.hookable/${name}.tar.gz";
-      md5 = "fe6713aef5b6c0f4963fb984bf326da0";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_html = buildPythonPackage rec {
-    name = "zope.html-2.1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.html/${name}.tar.gz";
-      md5 = "868cb987e400b9a290355a1207d47143";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_i18n = buildPythonPackage rec {
-    name = "zope.i18n-3.7.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18n/${name}.tar.gz";
-      md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_i18nmessageid = buildPythonPackage rec {
-    name = "zope.i18nmessageid-3.5.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/${name}.tar.gz";
-      md5 = "cb84bf61c2b7353e3b7578057fbaa264";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_index = buildPythonPackage rec {
-    name = "zope.index-3.6.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.index/${name}.tar.gz";
-      md5 = "65c34f446f54ffd711e34ede9eb89dad";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_interface = buildPythonPackage rec {
-    name = "zope.interface-3.6.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.zip";
-      md5 = "9df962180fbbb54eb1875cff9fe436e5";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_intid = buildPythonPackage rec {
-    name = "zope.intid-3.7.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.intid/${name}.zip";
-      md5 = "241f2fe62fb60f6319d9902b12bc333d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_keyreference = buildPythonPackage rec {
-    name = "zope.keyreference-3.6.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.keyreference/${name}.tar.gz";
-      md5 = "3774c90f236f880547f4c042ee0997e9";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_kgs = buildPythonPackage rec {
-    name = "zope.kgs-1.2.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.kgs/${name}.tar.gz";
-      md5 = "15ed01a270bddcf253b1c08479549692";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_lifecycleevent = buildPythonPackage rec {
-    name = "zope.lifecycleevent-3.6.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/${name}.tar.gz";
-      md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
   zope_location = buildPythonPackage rec {
     name = "zope.location-3.9.1";
-
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.location/${name}.tar.gz";
+      url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz";
       md5 = "1684a8f986099d15296f670c58e713d8";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_schema zope_component setuptools zope_proxy ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_login = buildPythonPackage rec {
-    name = "zope.login-1.0.0";
-
+  zope_browsermenu = buildPythonPackage rec {
+    name = "zope.browsermenu-3.9.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.login/${name}.zip";
-      md5 = "4eceb766329125a80aee1b4b4809869a";
+      url = "http://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip";
+      md5 = "a47c7b1e786661c912a1150bf8d1f83f";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_interface zope_traversing zope_component zope_security zope_configuration zope_pagetemplate setuptools zope_schema zope_browser ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_mimetype = buildPythonPackage rec {
-    name = "zope.mimetype-1.3.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.mimetype/${name}.tar.gz";
-      md5 = "c865758c896707287f86ba603f06a84b";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_minmax = buildPythonPackage rec {
-    name = "zope.minmax-1.1.2";
-
+  plone_app_workflow = buildPythonPackage rec {
+    name = "plone.app.workflow-2.1.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.minmax/${name}.tar.gz";
-      md5 = "0c3fbac9623f402ed758dace80080d55";
+      url = "http://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.2.zip";
+      md5 = "8da95b396f3a9ec54895085ef12202a7";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_mkzeoinstance = buildPythonPackage rec {
-    name = "zope.mkzeoinstance-3.9.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.mkzeoinstance/${name}.tar.gz";
-      md5 = "2c2dcf7cc7de58f7d009ca3294f54377";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_modulealias = buildPythonPackage rec {
-    name = "zope.modulealias-3.4.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.modulealias/${name}.tar.gz";
-      md5 = "77f4603524b578a5c6b4b4fdde58a484";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_pagetemplate = buildPythonPackage rec {
-    name = "zope.pagetemplate-3.6.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/${name}.zip";
-      md5 = "834a4bf702c05fba1e669677b4dc871f";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid transaction products_genericsetup zope_site zope_interface plone_memoize zope_testing datetime zope_component products_statusmessages zope2 setuptools products_dcworkflow zope_schema zope_i18n products_cmfcore acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_password = buildPythonPackage rec {
-    name = "zope.password-3.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.password/${name}.tar.gz";
-      md5 = "230f93a79020c8a3dc01d79832546e3c";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_pluggableauth = buildPythonPackage rec {
-    name = "zope.pluggableauth-1.0.3";
-
+  plone_locking = buildPythonPackage rec {
+    name = "plone.locking-2.0.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.pluggableauth/${name}.tar.gz";
-      md5 = "85d16cb2e5b41bf2a438828857719566";
+      url = "http://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip";
+      md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_preference = buildPythonPackage rec {
-    name = "zope.preference-3.8.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.preference/${name}.tar.gz";
-      md5 = "bb8b1c9f65387a51be429407528cc453";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_principalannotation = buildPythonPackage rec {
-    name = "zope.principalannotation-3.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.principalannotation/${name}.tar.gz";
-      md5 = "652685ca13cefaad78dbc5c6507fc9ab";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_principalregistry = buildPythonPackage rec {
-    name = "zope.principalregistry-3.7.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.principalregistry/${name}.tar.gz";
-      md5 = "9b90adc7915d9bbed4237db432fc70c2";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_processlifetime = buildPythonPackage rec {
-    name = "zope.processlifetime-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.processlifetime/${name}.tar.gz";
-      md5 = "69604bfd668a01ebebdd616a8f26ccfe";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_proxy = buildPythonPackage rec {
-    name = "zope.proxy-3.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.proxy/${name}.zip";
-      md5 = "a400b0a26624b17fa889dbcaa989d440";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime zope_component zodb3 setuptools zope_schema zope_annotation zope_viewlet products_cmfcore acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_ptresource = buildPythonPackage rec {
-    name = "zope.ptresource-3.9.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.ptresource/${name}.tar.gz";
-      md5 = "f4645e51c15289d3fdfb4139039e18e9";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_publisher = buildPythonPackage rec {
-    name = "zope.publisher-3.12.6";
-
+  zope_dottedname = buildPythonPackage rec {
+    name = "zope.dottedname-3.4.6";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.publisher/${name}.tar.gz";
-      md5 = "495131970cc7cb14de8e517fb3857ade";
+      url = "http://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz";
+      md5 = "62d639f75b31d2d864fe5982cb23959c";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_ramcache = buildPythonPackage rec {
-    name = "zope.ramcache-1.0";
-
+  zope_cachedescriptors = buildPythonPackage rec {
+    name = "zope.cachedescriptors-3.5.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.ramcache/${name}.zip";
-      md5 = "87289e15f0e51f50704adda1557c02a7";
+      url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip";
+      md5 = "263459a95238fd61d17e815d97ca49ce";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_rdb = buildPythonPackage rec {
-    name = "zope.rdb-3.5.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.rdb/${name}.tar.gz";
-      md5 = "2068b469c07c9c0b41392cd9839e3728";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_schema = buildPythonPackage rec {
-    name = "zope.schema-4.2.1";
-
+  plone_app_collection = buildPythonPackage rec {
+    name = "plone.app.collection-1.0.8";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.zip";
-      md5 = "bfa0460b68df0dbbf7a5dc793b0eecc6";
+      url = "http://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.8.zip";
+      md5 = "8bbd299daa04b35ecfad3c13afa7aba0";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ plone_portlet_collection zope_i18nmessageid transaction plone_app_contentlisting zope_component plone_app_vocabularies plone_app_form products_validation zope_configuration plone_portlets setuptools products_archetypes zope2 plone_app_portlets zope_interface zope_schema products_cmfquickinstallertool archetypes_querywidget products_cmfcore zope_formlib ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_security = buildPythonPackage rec {
-    name = "zope.security-3.7.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.security/${name}.tar.gz";
-      md5 = "072ab8d11adc083eace11262da08630c";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_securitypolicy = buildPythonPackage rec {
-    name = "zope.securitypolicy-3.7.0";
-
+  zc_lockfile = buildPythonPackage rec {
+    name = "zc.lockfile-1.0.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.securitypolicy/${name}.tar.gz";
-      md5 = "fe9ba029384c0640b2ba175ba1805cd8";
+      url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.0.tar.gz";
+      md5 = "6cf83766ef9935c33e240b0904c7a45e";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
+  lxml = buildPythonPackage rec {
+    name = "lxml-2.3.6";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/l/lxml/lxml-2.3.6.tar.gz";
+      md5 = "d5d886088e78b1bdbfd66d328fc2d0bc";
+    };
+    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_contentrules = buildPythonPackage rec {
+    name = "plone.contentrules-2.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.2.zip";
+      md5 = "a32370656c4fd58652fcd8a234db69c5";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_container zope_interface zope_testing zope_configuration zope_component zope_componentvocabulary setuptools zodb3 zope_schema zope_lifecycleevent zope_annotation ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
   zope_sendmail = buildPythonPackage rec {
     name = "zope.sendmail-3.7.5";
-
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.sendmail/${name}.tar.gz";
+      url = "http://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz";
       md5 = "8a513ecf2b41cad849f6607bf16d6818";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_i18nmessageid transaction zope_interface zope_configuration setuptools zope_schema zope_component ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_sequencesort = buildPythonPackage rec {
-    name = "zope.sequencesort-3.4.0";
-
+  zope_formlib = buildPythonPackage rec {
+    name = "zope.formlib-4.0.6";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.sequencesort/${name}.tar.gz";
-      md5 = "cfc35fc426a47f5c0ee43c416224b864";
+      url = "http://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip";
+      md5 = "eed9c94382d11a4dececd0a48ac1d3f2";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_server = buildPythonPackage rec {
-    name = "zope.server-3.6.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.server/${name}.tar.gz";
-      md5 = "2a758720fd6d9bdfb1cea8d644c27923";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_session = buildPythonPackage rec {
-    name = "zope.session-3.9.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.session/${name}.tar.gz";
-      md5 = "2934e9f2daa01555e9a7a1f9945c3493";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_site = buildPythonPackage rec {
-    name = "zope.site-3.9.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.site/${name}.tar.gz";
-      md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_size = buildPythonPackage rec {
-    name = "zope.size-3.4.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.size/${name}.tar.gz";
-      md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_structuredtext = buildPythonPackage rec {
-    name = "zope.structuredtext-3.5.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.structuredtext/${name}.tar.gz";
-      md5 = "eabbfb983485d0879322bc878d2478a0";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_tal = buildPythonPackage rec {
-    name = "zope.tal-3.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.tal/${name}.zip";
-      md5 = "13869f292ba36b294736b7330b1396fd";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_schema zope_datetime zope_interface zope_traversing zope_security zope_component pytz zope_event zope_browser setuptools zope_lifecycleevent zope_i18n zope_browserpage ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_tales = buildPythonPackage rec {
-    name = "zope.tales-3.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.tales/${name}.tar.gz";
-      md5 = "1c5060bd766a0a18632b7879fc9e4e1e";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_testbrowser = buildPythonPackage rec {
-    name = "zope.testbrowser-3.11.1";
-
+  plone_app_caching = buildPythonPackage rec {
+    name = "plone.app.caching-1.1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testbrowser/${name}.tar.gz";
-      md5 = "64abbee892121e7f1a91aed12cfc155a";
+      url = "http://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.3.zip";
+      md5 = "1975506ecf8d42944946dbb2b8f8dc01";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_testing = buildPythonPackage rec {
-    name = "zope.testing-3.9.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz";
-      md5 = "8999f3d143d416dc3c8b2a5bd6f33e28";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_thread = buildPythonPackage rec {
-    name = "zope.thread-3.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.thread/${name}.tar.gz";
-      md5 = "3567037865b746c933d4af86e5aefa35";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_traversing = buildPythonPackage rec {
-    name = "zope.traversing-3.13.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.traversing/${name}.zip";
-      md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_cmfdynamicviewfti z3c_form zope_interface plone_memoize zope_component plone_caching zope_publisher products_genericsetup plone_app_registry z3c_zcmlhook setuptools plone_app_z3cform products_statusmessages python_dateutil plone_cachepurging acquisition zope2 zope_pagetemplate zope_browserresource plone_protect plone_registry products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_viewlet = buildPythonPackage rec {
-    name = "zope.viewlet-3.7.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.viewlet/${name}.tar.gz";
-      md5 = "367e03096df57e2f9b74fff43f7901f9";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_xmlpickle = buildPythonPackage rec {
-    name = "zope.xmlpickle-3.4.0";
-
+  products_cmfplone = buildPythonPackage rec {
+    name = "Products.CMFPlone-4.3rc1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.xmlpickle/${name}.tar.gz";
-      md5 = "b579f35546b095aec2c890d3f8a46911";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3rc1.zip";
+      md5 = "cc861f8fa93f50a531cb850ea5a9fa37";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zopeundo = buildPythonPackage rec {
-    name = "ZopeUndo-2.12.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZopeUndo/${name}.zip";
-      md5 = "2b8da09d1b98d5558f62e12f6e52c401";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_cmfdynamicviewfti plone_app_blob products_dcworkflow products_extendedpathindex zope_dottedname datetime zope_traversing products_tinymce zope_publisher plonetheme_classic plone_batching plone_fieldsets products_cmfdefault acquisition plone_app_contentlisting products_externaleditor products_pluginregistry products_cmfeditions products_resourceregistries zope_tal plone_app_jquerytools products_genericsetup pillow five_localsitemanager plone_app_vocabularies zope_location zope_deferredimport products_plonelanguagetool borg_localrole zope_i18n plone_browserlayer plone_theme plone_memoize plone_app_contentmenu plone_app_i18n zope_component products_mimetypesregistry plone_app_customerize plone_app_folder plone_registry zope_i18nmessageid plone_app_upgrade products_cmfdifftool five_customerize plone_app_search products_portaltransforms plone_app_controlpanel plone_app_locales plone_app_linkintegrity zope2 plone_contentrules plone_app_portlets products_plonepas zope_pagetemplate zodb3 plone_locking products_cmfformcontroller zope_deprecation plone_app_form plone_app_layout products_cmfquickinstallertool archetypes_querywidget plone_app_redirector plone_i18n plone_app_registry products_placelesstranslationservice plone_app_users zope_interface zope_event plone_app_viewletmanager zope_structuredtext z3c_autoinclude zope_app_locales plone_portlets products_statusmessages products_cmfcalendar extensionclass products_pluggableauthservice plone_indexer products_cmfuid zope_container plone_app_workflow setuptools plone_portlet_collection plone_app_contentrules products_cmfactionicons products_archetypes plone_intelligenttext plone_app_collection products_passwordresettool plone_app_content plonetheme_sunburst plone_protect zope_tales plone_app_uuid archetypes_referencebrowserwidget products_atcontenttypes plone_app_jquery transaction zope_site plone_app_discussion plone_portlet_static plone_session products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  eggtestinfo = buildPythonPackage rec {
-    name = "eggtestinfo-0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/e/eggtestinfo/${name}.tar.gz";
-      md5 = "6f0507aee05f00c640c0d64b5073f840";
-    };
-
-    # circular dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-}; in plone42Packages
+  transaction = buildPythonPackage rec {
+    name = "transaction-1.1.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz";
+      md5 = "30b062baa34fe1521ad979fb088c8c55";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
 
-# Not Found: ['nt-svcutils', 'PIL', 'wsgi-intercept']
-# Version Error: ['collective.z3cform.datagridfield-demo']
+  plone_app_controlpanel = buildPythonPackage rec {
+    name = "plone.app.controlpanel-2.3.4";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.4.zip";
+      md5 = "d01b8c188498080a52275de2a50b25eb";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_testing zope_interface plone_memoize zope_component plone_app_workflow zope_annotation zope_ramcache zope_publisher products_portaltransforms plone_fieldsets zope_event products_cmfdefault zope_cachedescriptors plone_app_form setuptools products_statusmessages zope_schema zope2 acquisition products_plonepas zope_site plone_app_vocabularies zope_formlib zodb3 plone_protect zope_i18n plone_locking products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_redirector = buildPythonPackage rec {
+    name = "plone.app.redirector-1.2a1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2a1.zip";
+      md5 = "b63b6443b4bbc5562bddcb43600349f7";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_memoize setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_component = buildPythonPackage rec {
+    name = "zope.component-3.9.5";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz";
+      md5 = "22780b445b1b479701c05978055d1c82";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_event setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zope_broken = buildPythonPackage rec {
+    name = "zope.broken-3.6.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip";
+      md5 = "eff24d7918099a3e899ee63a9c31bee6";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_namedfile = buildPythonPackage rec {
+    name = "plone.namedfile-2.0.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.1.zip";
+      md5 = "9739c2fe25977d7e050a85eaed9e776a";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_traversing zope_security zope_component zope_browserpage setuptools plone_rfc822 ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_openid = buildPythonPackage rec {
+    name = "plone.app.openid-2.0.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz";
+      md5 = "ae0748f91cab0612a498926d405d8edd";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ products_plonepas zope_i18nmessageid zope2 setuptools plone_openid zope_interface plone_portlets zope_component plone_app_portlets products_cmfcore products_pluggableauthservice ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  z3c_caching = buildPythonPackage rec {
+    name = "z3c.caching-2.0a1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz";
+      md5 = "17f250b5084c2324a7d15c6810ee628e";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_browser ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  plone_app_textfield = buildPythonPackage rec {
+    name = "plone.app.textfield-1.2.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip";
+      md5 = "f832887a40826d6f68c48b48f071fb9c";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_schema zope_interface zodb3 setuptools zope_component ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  tempstorage = buildPythonPackage rec {
+    name = "tempstorage-2.12.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip";
+      md5 = "7a2b76b39839e229249b1bb175604480";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_testing zodb3 setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  zc_buildout = buildPythonPackage rec {
+    name = "zc.buildout-1.7.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-1.7.0.tar.gz";
+      md5 = "4e3b521600e475c56a0a66459a5fc7bb";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_cmfactionicons = buildPythonPackage rec {
+    name = "Products.CMFActionIcons-2.1.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz";
+      md5 = "ab1dc62404ed11aea84dc0d782b2235e";
+    };
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup eggtestinfo ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  products_zctextindex = buildPythonPackage rec {
+    name = "Products.ZCTextIndex-2.13.3";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.3.zip";
+      md5 = "bf95ea9fa2831237fa3c3d38fafdec96";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ accesscontrol transaction zope_interface zexceptions zodb3 persistence setuptools acquisition ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+  extensionclass = buildPythonPackage rec {
+    name = "ExtensionClass-2.13.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip";
+      md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+}; in plone43rc1Packages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9281aba13e9..c1d8e39597c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5300,9 +5300,10 @@ let
     python = python27;
   });
 
-  plone42Packages = recurseIntoAttrs (import ../development/web/plone {
-    inherit pkgs buildPythonPackage;
+  plone43Packages = recurseIntoAttrs (import ../development/web/plone {
+    inherit pkgs;
     python = python27;
+    pythonPackages = python27Packages;
   });
 
   foursuite = callPackage ../development/python-modules/4suite { };

From bee99995d99d0706d67a2e0fa41bceba88100b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 31 Mar 2013 09:27:25 +0200
Subject: [PATCH 311/394] linux: update to 3.8.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix
index 361d1f83a5c1..54550885fa65 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix
@@ -252,7 +252,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.8.4";
+    version = "3.8.5";
     testing = false;
 
     preConfigure = ''
@@ -261,7 +261,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "0sxh4nwmj49n9l0rnfpgvgvgxx47mdfmpg5syvn854zfb5sv0fvy";
+      sha256 = "1f1b6e09cb6ba656b28a41eb9e16e11576879f14574c0cb861b24734f3c5899f";
     };
 
     config = configWithPlatform stdenv.platform;

From e657e1b57e8c6f84fc398ce58f3582c188c9465d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 31 Mar 2013 16:16:07 +0200
Subject: [PATCH 312/394] systemd: Update to 200

---
 ...aemon-reexec-do-the-right-thing-on-N.patch |  4 +--
 ...e-duplicate-paths-in-systemctl-start.patch |  6 ++--
 ...ts-for-uninitialised-encrypted-devic.patch |  4 +--
 ...o-configuration-hints-for-some-units.patch |  4 +--
 ...rop-the-dependency-on-local-fs.targe.patch |  4 +--
 .../0006-Don-t-call-plymouth-quit.patch       |  4 +--
 ...007-Ignore-IPv6-link-local-addresses.patch |  4 +--
 ...andle-missing-etc-sysctl.conf-proper.patch | 28 -------------------
 pkgs/os-specific/linux/systemd/default.nix    |  7 ++---
 9 files changed, 17 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/systemd/0008-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch

diff --git a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
index 27facd4f3cc3..568ad3780126 100644
--- a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
+++ b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
@@ -1,7 +1,7 @@
-From ebbb4bc256e1ed53c594fc54d9e1a9faf5a5f77a Mon Sep 17 00:00:00 2001
+From 75bc507c854a8fe1f819a6b04ebe9e05cd9c425c Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:44:33 +0100
-Subject: [PATCH 1/8] Make "systemctl daemon-reexec" do the right thing on
+Subject: [PATCH 1/7] Make "systemctl daemon-reexec" do the right thing on
  NixOS
 
 ---
diff --git a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
index c6a648678bec..c9e9d806eb9e 100644
--- a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
+++ b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
@@ -1,14 +1,14 @@
-From 64c36ac79fca8f0214faed8b7aff19b379b1ac1b Mon Sep 17 00:00:00 2001
+From b8acf19dbd37f801d5eeb76170f84bc8d75e464c Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:45:01 +0100
-Subject: [PATCH 2/8] Ignore duplicate paths in "systemctl start"
+Subject: [PATCH 2/7] Ignore duplicate paths in "systemctl start"
 
 ---
  src/systemctl/systemctl.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index edd136a..86ce32a 100644
+index 1191c7a..4cd64f5 100644
 --- a/src/systemctl/systemctl.c
 +++ b/src/systemctl/systemctl.c
 @@ -1510,8 +1510,10 @@ static int start_unit_one(
diff --git a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
index 23133547fd01..70eba00d22fa 100644
--- a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
+++ b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -1,7 +1,7 @@
-From 776093e73b86bcddfeb0971cb6267d13d07f0a81 Mon Sep 17 00:00:00 2001
+From 7e7d0ebc8617dfdae4ece9f5b66dc63031bb3fbc Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:46:30 +0100
-Subject: [PATCH 3/8] Start device units for uninitialised encrypted devices
+Subject: [PATCH 3/7] Start device units for uninitialised encrypted devices
 
 This is necessary because the NixOS service that initialises the
 filesystem depends on the appearance of the device unit.  Also, this
diff --git a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
index 483c1f812870..b25f65187d79 100644
--- a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
+++ b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
@@ -1,7 +1,7 @@
-From 0bc7513439a8b77f62bc8ebcf220b77f83321b75 Mon Sep 17 00:00:00 2001
+From fa5fabd0123f2d5be7efa877f8dbbf0ae7b929da Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:48:19 +0100
-Subject: [PATCH 4/8] Set switch-to-configuration hints for some units
+Subject: [PATCH 4/7] Set switch-to-configuration hints for some units
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
index 9efbba08ab9f..d94890dccc18 100644
--- a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
+++ b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
@@ -1,7 +1,7 @@
-From 5337d8f5a555f83ba8731472a2f3b0d36ac607d9 Mon Sep 17 00:00:00 2001
+From c2dce9a0088f7d155659bcbf1e9e69467e679244 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:56:03 +0100
-Subject: [PATCH 5/8] sysinit.target: Drop the dependency on local-fs.target
+Subject: [PATCH 5/7] sysinit.target: Drop the dependency on local-fs.target
  and swap.target
 
 Having all services with DefaultDependencies=yes depend on
diff --git a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch
index f0be5b34f0c8..9e4995dfc1fc 100644
--- a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch
+++ b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch
@@ -1,7 +1,7 @@
-From b944fede26773167cb6a9f86888a9209dda4c35e Mon Sep 17 00:00:00 2001
+From f1b273a7203da1dd3ef51529b5b2e481c7a8d999 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 18:36:28 +0100
-Subject: [PATCH 6/8] Don't call "plymouth quit"
+Subject: [PATCH 6/7] Don't call "plymouth quit"
 
 NixOS doesn't use Plymouth (yet).
 ---
diff --git a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch
index 32aca8b10aa0..fb59b676e516 100644
--- a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch
+++ b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch
@@ -1,7 +1,7 @@
-From b9f175c7b3ea6ac34d148f5afba598f985c5b9fe Mon Sep 17 00:00:00 2001
+From 61fa587560634d5c71a62a4a2fc2a37eb043e9a4 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Mon, 4 Feb 2013 12:41:14 +0100
-Subject: [PATCH 7/8] Ignore IPv6 link-local addresses
+Subject: [PATCH 7/7] Ignore IPv6 link-local addresses
 
 Returning IPv6 link-local addresses is a bad idea, because they only
 work if an application connects specifically over the corresponding
diff --git a/pkgs/os-specific/linux/systemd/0008-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch b/pkgs/os-specific/linux/systemd/0008-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch
deleted file mode 100644
index 92411c16650d..000000000000
--- a/pkgs/os-specific/linux/systemd/0008-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From dcfb048af5face4787ecdf29c00454898c52963d Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Wed, 27 Mar 2013 13:33:09 +0100
-Subject: [PATCH 8/8] systemd-sysctl: Handle missing /etc/sysctl.conf properly
-
-Since fabe5c0e5fce730aa66e10a9c4f9fdd443d7aeda, systemd-sysctl returns
-a non-zero exit code if /etc/sysctl.conf does not exist, due to a
-broken ENOENT check.
----
- src/sysctl/sysctl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index 2d43660..79f3f77 100644
---- a/src/sysctl/sysctl.c
-+++ b/src/sysctl/sysctl.c
-@@ -125,7 +125,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
- 
-         r = search_and_fopen_nulstr(path, "re", conf_file_dirs, &f);
-         if (r < 0) {
--                if (ignore_enoent && errno == -ENOENT)
-+                if (ignore_enoent && r == -ENOENT)
-                         return 0;
- 
-                 log_error("Failed to open file '%s', ignoring: %s", path, strerror(-r));
--- 
-1.8.1
-
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 76769d4d3e65..dfa99959b30c 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -6,11 +6,11 @@
 assert stdenv.gcc.libc or null != null;
 
 stdenv.mkDerivation rec {
-  name = "systemd-199";
+  name = "systemd-200";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
-    sha256 = "1vazjqi95pri5zx21gs4chyd7c8kg5lf1rc26w47zkry9yh64i4c";
+    sha256 = "05y2r25441nznif5xi5gab4c6xdywiqzgcl3nsmg0j2wzalbl24s";
   };
 
   patches =
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
       ./0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
       ./0006-Don-t-call-plymouth-quit.patch
       ./0007-Ignore-IPv6-link-local-addresses.patch
-      ./0008-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch
     ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch;
 
   buildInputs =
@@ -74,8 +73,6 @@ stdenv.mkDerivation rec {
       # Work around our kernel headers being too old.  FIXME: remove
       # this after the next stdenv update.
       "-DFS_NOCOW_FL=0x00800000"
-      # Enable udev's firmware builtin for now.
-      "-DENABLE_FIRMWARE=1"
     ];
 
   # Use /var/lib/udev rather than /etc/udev for the generated hardware

From d819ee8b7ee4e35bebc769813e6f8a4fa72145c2 Mon Sep 17 00:00:00 2001
From: Malcolm Matalka <mmatalka@gmail.com>
Date: Sun, 31 Mar 2013 19:40:11 +0200
Subject: [PATCH 313/394] Add multitail

---
 pkgs/tools/misc/multitail/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/misc/multitail/default.nix

diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix
new file mode 100644
index 000000000000..19bebcf2823c
--- /dev/null
+++ b/pkgs/tools/misc/multitail/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation {
+  name = "multitail-5.2.12";
+
+  src = fetchurl {
+    url = http://www.vanheusden.com/multitail/multitail-5.2.12.tgz;
+    sha256 = "681d87cd49e11aab1d82ad7818ee639c88a3d305db8accf0859977beda6c493c";
+  };
+
+  buildInputs = [ ncurses ];
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp multitail $out/bin
+  '';
+
+  meta = {
+    homepage = http://www.vanheusden.com/multitail/;
+    description = "tail on Steroids";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1d8e39597c0..d046a16fa5a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1054,6 +1054,8 @@ let
 
   most = callPackage ../tools/misc/most { };
 
+  multitail = callPackage ../tools/misc/multitail { };
+
   netperf = callPackage ../applications/networking/netperf { };
 
   ninka = callPackage ../development/tools/misc/ninka { };

From ea4b0c33d8ecf6380caeaec3e94c3dec6371ff23 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 31 Mar 2013 20:06:13 +0200
Subject: [PATCH 314/394] Set correct paths when using nm-applet without
 desktop

---
 .../networking/network-manager-applet/default.nix   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index d38bbcae014d..8f6058d20783 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf
 , libnotify, libgnome_keyring, dbus_glib, polkit, isocodes
-, mobile_broadband_provider_info }:
+, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
+, makeWrapper }:
 
 let
   pn = "network-manager-applet";
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk libglade networkmanager GConf libnotify libgnome_keyring dbus_glib
-    polkit isocodes 
+    polkit isocodes makeWrapper
   ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
@@ -27,6 +28,14 @@ stdenv.mkDerivation rec {
     ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
   ];
 
+  postInstall = ''
+    wrapProgram "$out/bin/nm-applet" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \
+      --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
+      --prefix PATH ":" "${GConf}/bin"
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://projects.gnome.org/NetworkManager/;
     description = "NetworkManager control applet for GNOME";

From e58521d5dce234d7e5d4eb5ae594bcf47de67edd Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 31 Mar 2013 20:56:18 +0200
Subject: [PATCH 315/394] anki: set platforms

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

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index d2e438dfa7b1..41d70533437c 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -63,5 +63,6 @@ stdenv.mkDerivation rec {
         * even practicing guitar chords!
       '';
       license = "GPLv3";
+      platforms = stdenv.lib.platforms.all;
     };
 }

From 1e071cd3b21f4de86a6a2a3c358e6f980ed5fd8f Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 31 Mar 2013 22:58:48 +0200
Subject: [PATCH 316/394] Add smartdc, http_signature python packages

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 993dbd3291ba..29f2e181f3d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1708,6 +1708,23 @@ pythonPackages = python.modules // rec {
     };
   });
 
+  http_signature = buildPythonPackage (rec {
+    name = "http_signature-0.1.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/h/http_signature/${name}.tar.gz";
+      md5 = "015061846254bd5d8c5dbc2913985153";
+    };
+
+    propagatedBuildInputs = [pycrypto];
+
+    meta = {
+      homepage = https://github.com/atl/py-http-signature;
+      description = "";
+      license = stdenv.lib.licenses.mit;
+    };
+  });
+
   httplib2 = buildPythonPackage rec {
     name = "httplib2-0.8";
 
@@ -3890,6 +3907,23 @@ pythonPackages = python.modules // rec {
     };
   });
 
+  smartdc = buildPythonPackage rec {
+    name = "smartdc-0.1.12";
+
+    src = fetchurl {
+      url = https://pypi.python.org/packages/source/s/smartdc/smartdc-0.1.12.tar.gz;
+      md5 = "b960f61facafc879142b699050f6d8b4";
+    };
+
+    propagatedBuildInputs = [ requests http_signature ];
+
+    meta = {
+      description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests";
+      homepage = https://github.com/atl/py-smartdc;
+      license = pkgs.lib.licenses.mit;
+    };
+  };
+
   sphinx = buildPythonPackage (rec {
     name = "Sphinx-1.1.3";
 

From 98ba667094f3395cd0e4999693541285ed5e0478 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 1 Apr 2013 01:24:56 +0200
Subject: [PATCH 317/394] adding varnish

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

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
new file mode 100644
index 000000000000..528c03e3aa38
--- /dev/null
+++ b/pkgs/servers/varnish/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "3.0.3";
+  name = "varnish-${version}";
+
+  src = fetchurl {
+    url = "http://repo.varnish-cache.org/source/${name}.tar.gz";
+    sha256 = "1cla2igwfwcm07srvk0z9cqdxh74sga0c1rsmh4b4n1gjn6x2drd";
+  };
+
+  buildInputs = [ pcre libxslt groff ncurses pkgconfig ];
+
+  meta = {
+    description = "Varnish Cache is a web application accelerator also known as a caching HTTP reverse proxy.";
+    homepage = "https://www.varnish-cache.org";
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1d8e39597c0..c4afbe4b9e29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1791,6 +1791,8 @@ let
 
   uptimed = callPackage ../tools/system/uptimed { };
 
+  varnish = callPackage ../servers/varnish { };
+
   vlan = callPackage ../tools/networking/vlan { };
 
   wakelan = callPackage ../tools/networking/wakelan { };

From 8c63762d643e371d892fbd6a264e8057c880e60d Mon Sep 17 00:00:00 2001
From: Michael Ashton <data@gtf.org>
Date: Sun, 31 Mar 2013 19:00:50 -0700
Subject: [PATCH 318/394] - fetchbzr and nix-prefetch-bzr now only export,
 instead of cloning - The option for cloning in nix-prefetch-bzr is removed -
 ssl certificates are now ignored by fetchbzr

This means that no .bzr directory is downloaded.  Without this change, the
hash of the result is unpredictable, probably because of timestamping in the
.bzr directory.

Currently, the only package using fetchbzr is kicad.
---
 pkgs/build-support/fetchbzr/builder.sh       | 2 +-
 pkgs/build-support/fetchbzr/nix-prefetch-bzr | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh
index 88aab7891b48..17567fdadd23 100644
--- a/pkgs/build-support/fetchbzr/builder.sh
+++ b/pkgs/build-support/fetchbzr/builder.sh
@@ -4,6 +4,6 @@ header "exporting \`$url' (revision $revision) into \`$out'"
 
 # Perform a lightweight checkout so that we don't end up importing
 # all the repository's history.
-bzr checkout --lightweight "$url" -r "$revision" "$out"
+bzr -Ossl.cert_reqs=none export -r "$revision" --format=dir "$out" "$url"
 
 stopNest
diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr
index 167892fbb794..9ff86c20ae3f 100755
--- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr
+++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr
@@ -50,12 +50,7 @@ if test -z "$finalPath"; then
     trap "rm -rf $tmpPath" EXIT
 
     # Perform the checkout.
-    if test "$NIX_PREFETCH_BZR_LEAVE_DOT_BZR" != 1
-    then
-        bzr export $revarg "$tmpFile" "$url" >&2
-    else
-        bzr checkout --lightweight $revarg "$url" "$tmpFile" >&2
-    fi
+    bzr -Ossl.cert_reqs=none export $revarg --format=dir "$tmpFile" "$url"
 
     # Compute the hash.
     hash=$(nix-hash --type $hashType $hashFormat $tmpFile)

From 7b01680d87272bd4edcdeaa8095983e020bd3b3a Mon Sep 17 00:00:00 2001
From: Michael Ashton <data@gtf.org>
Date: Sun, 31 Mar 2013 19:11:21 -0700
Subject: [PATCH 319/394] kicad: upgrade to stable version 20130325, libraries
 to r220

- changed to require wxWidgets 2.9 -- seems to satisfy requirement for
libgtkprint, even with gtk2
---
 .../science/electronics/kicad/default.nix          | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  4 +++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index d90c66329162..cc53611493d0 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,18 +1,18 @@
-{stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, wxGTK, zlib, libX11,
-gettext}:
+{ stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, gtk, wxGTK, zlib, libX11, 
+gettext, cups } : 
 
 stdenv.mkDerivation rec {
-  name = "kicad-20110708";
+  name = "kicad-20130325";
 
   src = fetchurl {
-    url = ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad_sources-2011-07-08-BZR3044.zip;
-    sha256 = "1gr75zcf55p3xpbg1gdkdpbh5x11bawc9rcff4fskwjyc3vfiv6a";
+    url = "http://iut-tice.ujf-grenoble.fr/cao/kicad-sources-stable_2013-03-25_BZR4005.zip";
+    sha256 = "0hg2aiis14am7mmpimcxnxvhy7c7fr5rgzlk6rjv44d9m0f9957m";
   };
 
   srcLibrary = fetchbzr {
     url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library";
-    revision = 112;
-    sha256 = "49fa9ad90759cfaf522c2a62665f033688b9d84d02f31c6b2505c08a217ad312";
+    revision = 220;
+    sha256 = "0l2lblgnm51n2w1p4ifpwdvq04rxgq73zrfxlhqa9zdlyh4rcddb";
   };
 
   cmakeFlags = "-DKICAD_TESTING_VERSION=ON";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4afbe4b9e29..986bfed5b232 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8758,7 +8758,9 @@ let
 
   gtkwave = callPackage ../applications/science/electronics/gtkwave { };
 
-  kicad = callPackage ../applications/science/electronics/kicad { };
+  kicad = callPackage ../applications/science/electronics/kicad {
+    wxGTK = wxGTK29;
+  };
 
   ngspice = callPackage ../applications/science/electronics/ngspice { };
 

From 437419a12485adf2a07e2185bc2845dad31a6099 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Sun, 31 Mar 2013 21:33:21 -0700
Subject: [PATCH 320/394] rawtherapee-4.0.10 . Add a 'float' option to fftw, as
 this version of rawtherapee requires it.

---
 pkgs/applications/graphics/rawtherapee/default.nix | 14 +++++++-------
 pkgs/development/libraries/fftw/default.nix        |  3 ++-
 pkgs/top-level/all-packages.nix                    |  4 +++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 328181790ac1..bf7e2d304202 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
-, libXdmcp, lcms2, libiptcdata
+, libXdmcp, lcms2, libiptcdata, libcanberra, fftw
 , mercurial  # Not really needed for anything, but it fails if it does not find 'hg'
 }:
 
 stdenv.mkDerivation rec {
-  name = "rawtherapee-4.0.9";
+  name = "rawtherapee-4.0.10";
   
   src = fetchurl {
-    url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz;
-    sha256 = "1ll7n7gzxs00jpw3gp9xfr90lbwqafkgqpps3j5ig6mf79frpm2a";
+    url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.10.tar.xz;
+    sha256 = "1ibsdm2kqpw796rcdihnnp67vx0wm1d1bnlzq269r9p01w5s102g";
   };
   
   buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
-    lcms2 libiptcdata mercurial ];
+    lcms2 libiptcdata mercurial libcanberra fftw ];
 
   # Disable the use of the RAWZOR propietary libraries
   cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "RAW converter and digital photo processing software";
     homepage = http://www.rawtherapee.com/;
-    license = "GPLv3+";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [viric jcumming];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 6b4fbe7df6ce..e096c5fa94f3 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false}:
+{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false, float ? false}:
 let
   version = "3.3.2";
   localDefs = builderDefs.passthru.function { 
@@ -12,6 +12,7 @@ let
                         # some distros seem to be shipping both versions within the same package?
                         # why does --enable-float still result in ..3f.so instead of ..3.so?
                    ++ (if singlePrecision then [ "--enable-single" ] else [ ])
+                   ++ (if float then [ "--enable-float" ] else [ ])
 		   ++ (stdenv.lib.optional (!pthreads) "--enable-openmp")
 		   ++ (stdenv.lib.optional pthreads "--enable-threads")
                         # I think all i686 has sse
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4afbe4b9e29..c77296bec2ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7676,7 +7676,9 @@ let
 
   ratpoison = callPackage ../applications/window-managers/ratpoison { };
 
-  rawtherapee = callPackage ../applications/graphics/rawtherapee { };
+  rawtherapee = callPackage ../applications/graphics/rawtherapee {
+    fftw = fftw.override {float = true;}; 
+  };
 
   rcs = callPackage ../applications/version-management/rcs { };
 

From 4527d677cc1430ff1cfef6e01459d8f2a2873cc3 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Sun, 31 Mar 2013 21:43:53 -0700
Subject: [PATCH 321/394] cuetools metadata: license, maintainer, platforms

---
 pkgs/tools/cd-dvd/cuetools/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix
index fd58e3ea6e27..7de503adc074 100644
--- a/pkgs/tools/cd-dvd/cuetools/default.nix
+++ b/pkgs/tools/cd-dvd/cuetools/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation {
   buildInputs = [ automake autoconf flex bison ]; 
 
   meta = {
-    description = "cue and toc file parsers and utilities";
+    description = "cd/dvd cue and toc file parsers and utilities";
     homepage = https://github.com/svend/cuetools;
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ jcumming ];
   };
 }

From 4a9c724377cf5ea5fc8dab9af351cc2def02aa1a Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Sun, 31 Mar 2013 21:45:40 -0700
Subject: [PATCH 322/394] shntool metadata: license, maintainer, platform

---
 pkgs/applications/audio/shntool/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix
index 68fb8bfb1423..476f1a3bd637 100644
--- a/pkgs/applications/audio/shntool/default.nix
+++ b/pkgs/applications/audio/shntool/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "multi-purpose WAVE data processing and reporting utility";
     homepage = http://www.etree.org/shnutils/shntool/;
-    license = "GPLv2+";
-    platforms = with stdenv.lib.platforms; linux;
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.all
+    maintainers = with stdenv.lib.maintainers; [ jcumming ];
   };
 }

From 1993c185465c91cb84039a2752394a7895dd66ec Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Sun, 31 Mar 2013 22:09:17 -0700
Subject: [PATCH 323/394] missing semicolon.

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

diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix
index 476f1a3bd637..12ef79d746ec 100644
--- a/pkgs/applications/audio/shntool/default.nix
+++ b/pkgs/applications/audio/shntool/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     description = "multi-purpose WAVE data processing and reporting utility";
     homepage = http://www.etree.org/shnutils/shntool/;
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.all
+    platforms = stdenv.lib.platforms.all;
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
   };
 }

From 8a8d3993ee1f51064096738864c53be7caa3b7cb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 10:00:40 +0200
Subject: [PATCH 324/394] haskell-cryptohash: update to version 0.8.4

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

diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 521a950e581c..77a1ecd9ff4e 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.8.3";
-  sha256 = "1fcqbbclii2hmbhi7h64v0nnbc34zzs107m3lqq38iiyy5fvqqv2";
+  version = "0.8.4";
+  sha256 = "0h58apxcrvpkyj3s2c7l68g7biv80snkn53g6jya1s687xff8fmn";
   buildDepends = [ cereal cryptoApi tagged ];
   testDepends = [
     HUnit QuickCheck testFramework testFrameworkHunit

From 561c830920ebcb13527186cd7e2e15eb13505e06 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 10:00:40 +0200
Subject: [PATCH 325/394] haskell-hspec-meta: update to version 1.5.1

---
 .../libraries/haskell/hspec-meta/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index 85547842dc86..261e9577bbbe 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -1,16 +1,16 @@
 { cabal, ansiTerminal, filepath, hspecExpectations, HUnit
-, QuickCheck, setenv, silently, time, transformers
+, QuickCheck, quickcheckIo, setenv, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.4.5";
-  sha256 = "0k50vwzg3ka4727bj63y4gsvw4g80gnalj31rsbvj3afl9gikkk7";
+  version = "1.5.1";
+  sha256 = "1js62n2mxv4mj4w89ymz5cn3d2qznjndzk3c78gmy6chvig23zlf";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv
-    silently time transformers
+    ansiTerminal filepath hspecExpectations HUnit QuickCheck
+    quickcheckIo setenv time transformers
   ];
   doCheck = false;
   meta = {

From 5e5b50c8174b0c72d3bbd356ba78d020e59c7019 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 10:00:40 +0200
Subject: [PATCH 326/394] haskell-hspec: update to version 1.5.1

---
 .../libraries/haskell/hspec/default.nix            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 4856c1eb72a5..2fde2e8d9cf9 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -1,21 +1,21 @@
 { cabal, ansiTerminal, doctest, filepath, ghcPaths
-, hspecExpectations, hspecMeta, HUnit, QuickCheck, setenv, silently
-, time, transformers
+, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
+, setenv, silently, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.4.5";
-  sha256 = "1dfwc1gjsawafi6k19hsw4kd5ahp8a9hdkyrm7nhjp4kjzgd2ymf";
+  version = "1.5.1";
+  sha256 = "0iz34hgwir07g2qv3zdkg5k5wrv68qd0c77xkpfcs653fi28i91a";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv
-    silently time transformers
+    ansiTerminal filepath hspecExpectations HUnit QuickCheck
+    quickcheckIo setenv time transformers
   ];
   testDepends = [
     ansiTerminal doctest filepath ghcPaths hspecExpectations hspecMeta
-    HUnit QuickCheck setenv silently time transformers
+    HUnit QuickCheck quickcheckIo setenv silently time transformers
   ];
   meta = {
     homepage = "http://hspec.github.com/";

From 5529ad42d2aa6a37cb3b36d36af1657de3fdd790 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 10:00:40 +0200
Subject: [PATCH 327/394] haskell-liblastfm: update to version 0.1.1.2

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

diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
index 096a39b9a3b3..0ecf0e37ca2c 100644
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "liblastfm";
-  version = "0.1.1.1";
-  sha256 = "1svqxi85n18r9szmlcny51j71zzkki9pnfxnxim78y5vh0nf82qv";
+  version = "0.1.1.2";
+  sha256 = "1zckgjc0r2s1s6s9s309dr2ri8bzj1fi8gcbhm3hifczq1v149w9";
   buildDepends = [
     aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
   ];

From 8692618980c94395f52a93d3943513debb794bb0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 10:00:40 +0200
Subject: [PATCH 328/394] haskell-multiarg: update to version 0.12.0.2

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

diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index c8a7b479c54f..72936e1873c3 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.12.0.0";
-  sha256 = "1v2bfqbjk4wxn5dzd7asqcfidlr9bmwc5yy7awp86ch669kjnbzd";
+  version = "0.12.0.2";
+  sha256 = "0f90dsa5ya55lrc0x0ziz01fjvaq85q4f8zsfci1w1rgxa9m7naa";
   buildDepends = [ explicitException utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";

From 78af53bb05e5d653fcdbe13a705c645882116739 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 10:00:40 +0200
Subject: [PATCH 329/394] haskell-shake: update to version 0.10.2

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

diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index f3a23533865c..e2b46cfcbc52 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.10.1";
-  sha256 = "0k8hk5aw5xk4aq7g8yjlkn1rjhcdy3jd5mna9phjs23kmfsmayk6";
+  version = "0.10.2";
+  sha256 = "0045dz46iacrihqlsdg00zmnkrma5swnmy2bp4h91fx0829lki9n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From d95c79bad713cda3fa24dd71fcb40e639d8f12e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 10:15:46 +0200
Subject: [PATCH 330/394] bind: update to version 9.9.2-P2 to fix CVE 2010-4051
 /2010-4052

---
 pkgs/servers/dns/bind/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 54fa398a8e9a..1d9192a1c61d 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
 
-let version = "9.9.2"; in
+let version = "9.9.2-P2"; in
 
 stdenv.mkDerivation rec {
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0j4v01ch4xkgnsnngmh6bpapzi53n4k79gbbhmxf44nmk2qk0rby";
+    sha256 = "1lk5npyr6bkm4gs2m90k4s8lmlcpfdphzqhi2hjnj2amwcs2g0pz";
   };
 
   patchPhase = ''
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var" ];
 
   meta = {
-    homepage = http://www.isc.org/software/bind;
+    homepage = "http://www.isc.org/software/bind";
     description = "ISC BIND: a domain name server";
-    maintainers = with stdenv.lib.maintainers; [viric];
+
+    maintainers = with stdenv.lib.maintainers; [viric simons];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

From e655ac24d20e44664745f777c833ff55c01e7438 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 10:18:44 +0200
Subject: [PATCH 331/394] bind: add meta.license attribute

---
 pkgs/servers/dns/bind/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 1d9192a1c61d..d9a9b6b24322 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.isc.org/software/bind";
     description = "ISC BIND: a domain name server";
+    license = stdenv.lib.licenses.isc;
 
     maintainers = with stdenv.lib.maintainers; [viric simons];
     platforms = with stdenv.lib.platforms; linux;

From 3c28408f84e762008db426ec9f6a5f0bc47b18a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 10:34:20 +0200
Subject: [PATCH 332/394] haskell-quickcheck-io: add version 0.1.0

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

diff --git a/pkgs/development/libraries/haskell/quickcheck-io/default.nix b/pkgs/development/libraries/haskell/quickcheck-io/default.nix
new file mode 100644
index 000000000000..b7c33b6d1a0a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/quickcheck-io/default.nix
@@ -0,0 +1,13 @@
+{ cabal, HUnit, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "quickcheck-io";
+  version = "0.1.0";
+  sha256 = "167ds7c7p1lcfsylxhq2sr0jxbviyim1n42dhyr0s0b6hazw8cjs";
+  buildDepends = [ HUnit QuickCheck ];
+  meta = {
+    description = "Use HUnit assertions as QuickCheck properties";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9b3c33c41981..5a96e995c738 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1514,6 +1514,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   QuickCheck2 = self.QuickCheck_2_6;
   QuickCheck  = self.QuickCheck2;
 
+  quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
+
   RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
 
   random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {};

From 00346f1bbb6dab60fb7f8b6147a5f2edfa28b96c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 10:34:50 +0200
Subject: [PATCH 333/394] haskell-hspec-expectations: switch default to version
 0.3.2

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5a96e995c738..4534adee337f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1113,7 +1113,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hspecExpectations_0_3_0_3 = callPackage ../development/libraries/haskell/hspec-expectations/0.3.0.3.nix {};
   hspecExpectations_0_3_2 = callPackage ../development/libraries/haskell/hspec-expectations/0.3.2.nix {};
-  hspecExpectations = self.hspecExpectations_0_3_0_3;
+  hspecExpectations = self.hspecExpectations_0_3_2;
 
   hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {};
 

From a83f32b335d312c69923af45be8c0997e996d4d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 11:29:20 +0200
Subject: [PATCH 334/394] haskell-hspec-expectations: drop obsolete version
 0.3.0.3

---
 .../haskell/hspec-expectations/0.3.0.3.nix      | 17 -----------------
 .../{0.3.2.nix => default.nix}                  |  0
 pkgs/top-level/haskell-packages.nix             |  4 +---
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/hspec-expectations/0.3.0.3.nix
 rename pkgs/development/libraries/haskell/hspec-expectations/{0.3.2.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/hspec-expectations/0.3.0.3.nix b/pkgs/development/libraries/haskell/hspec-expectations/0.3.0.3.nix
deleted file mode 100644
index 41019c9caa3e..000000000000
--- a/pkgs/development/libraries/haskell/hspec-expectations/0.3.0.3.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, hspec, HUnit, markdownUnlit, silently }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-expectations";
-  version = "0.3.0.3";
-  sha256 = "1ppcbfmcgrd1lwswa293fxwny6khhg4blygfbcsawrvgc5ji0q74";
-  buildDepends = [ HUnit ];
-  testDepends = [ hspec HUnit markdownUnlit silently ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/sol/hspec-expectations#readme";
-    description = "Catchy combinators for HUnit";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-expectations/0.3.2.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/hspec-expectations/0.3.2.nix
rename to pkgs/development/libraries/haskell/hspec-expectations/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4534adee337f..610f26d5541a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1111,9 +1111,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hspec = callPackage ../development/libraries/haskell/hspec {};
 
-  hspecExpectations_0_3_0_3 = callPackage ../development/libraries/haskell/hspec-expectations/0.3.0.3.nix {};
-  hspecExpectations_0_3_2 = callPackage ../development/libraries/haskell/hspec-expectations/0.3.2.nix {};
-  hspecExpectations = self.hspecExpectations_0_3_2;
+  hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {};
 
   hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {};
 

From 72a724c0d2e99d4ba1f8a98270dd1ce295f44690 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 1 Apr 2013 12:13:01 +0200
Subject: [PATCH 335/394] New: yeganesh, a small wrapper around dmenu.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/misc/yeganesh/default.nix | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix         |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/misc/yeganesh/default.nix

diff --git a/pkgs/applications/misc/yeganesh/default.nix b/pkgs/applications/misc/yeganesh/default.nix
new file mode 100644
index 000000000000..36a5817772d5
--- /dev/null
+++ b/pkgs/applications/misc/yeganesh/default.nix
@@ -0,0 +1,16 @@
+{ cabal, filepath, strict, time, xdgBasedir }:
+
+cabal.mkDerivation (self: {
+  pname = "yeganesh";
+  version = "2.5";
+  sha256 = "1bgw5v1g5n06jj0lyxpf48mdpaa2s49g0lbagf3jf9q01rb92bvf";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ filepath strict time xdgBasedir ];
+  meta = {
+    homepage = "http://dmwit.com/yeganesh";
+    description = "small dmenu wrapper";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 610f26d5541a..d8d574acdce7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1966,6 +1966,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yap = callPackage ../development/libraries/haskell/yap {};
 
+  yeganesh = callPackage ../applications/misc/yeganesh {};
+
   yesod = callPackage ../development/libraries/haskell/yesod {};
 
   yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {};

From b10ab7a19aa3f4cdcb9c10f5ceec7ff66272bb0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 1 Apr 2013 12:50:15 +0200
Subject: [PATCH 336/394] tinycc: updating it to 0.9.26

I simplified the expression a bit. And I renamed it to 'tcc'.
I think everyone calls it tcc.
---
 pkgs/development/compilers/tinycc/default.nix | 123 +++++++-----------
 pkgs/top-level/release-small.nix              |   2 +-
 pkgs/top-level/release.nix                    |   2 +-
 3 files changed, 47 insertions(+), 80 deletions(-)

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index f607edd0f024..11b0b2ea7b27 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -2,95 +2,62 @@
 
 assert stdenv ? glibc;
 
-let version = "0.9.25"; in
-  stdenv.mkDerivation {
-    name = "tinycc-${version}";
+stdenv.mkDerivation rec {
+  name = "tcc-0.9.26";
 
-    src = fetchurl {
-      url = "mirror://savannah/tinycc/tcc-${version}.tar.bz2";
-      sha256 = "0dfycf80x73dz67c97j1ry29wrv35393ai5ry46i1x1fzfq6rv8v";
-    };
+  src = fetchurl {
+    url = "mirror://savannah/tinycc/${name}.tar.bz2";
+    sha256 = "0wbdbdq6090ayw8bxnbikiv989kykff3m5rzbia05hrnwhd707jj";
+  };
 
-    nativeBuildInputs = [ perl texinfo ];
+  nativeBuildInputs = [ perl texinfo ];
 
-    patches =
-      [ (fetchurl {
-           # Add support for `alloca' on x86-64.
-           url = "http://repo.or.cz/w/tinycc.git/patch/8ea8305199496ba29b6d0da2de07aea4441844aa";
-           sha256 = "0dz1cm9zihk533hszqql4gxpzbp8c4g9dnvkkh9vs4js6fnz1fl2";
-           name = "x86-64-alloca.patch";
-         })
+  postPatch = ''
+    substituteInPlace "texi2pod.pl" \
+      --replace "/usr/bin/perl" "${perl}/bin/perl"
+  '';
 
-        (fetchurl {
-           # Fix alignment of the return value of `alloca'.
-           url = "http://repo.or.cz/w/tinycc.git/patch/dca2b15df42c1341794dd412917708416da25594";
-           sha256 = "0617a69gnfdmv8pr6dj3szv97v3zh57439dsbklxrnipx2jv6pq7";
-           name = "x86-64-alloca-align.patch";
-         })
-      ];
+  preConfigure = ''
+    configureFlagsArray+=("--elfinterp=$(cat $NIX_GCC/nix-support/dynamic-linker)")
+    configureFlagsArray+=("--crtprefix=${stdenv.glibc}/lib")
+    configureFlagsArray+=("--sysincludepaths=${stdenv.glibc}/include:{B}/include")
+    configureFlagsArray+=("--libpaths=${stdenv.glibc}/lib")
+  '';
 
-    postPatch = ''
-      substituteInPlace "texi2pod.pl" \
-        --replace "/usr/bin/perl" "${perl}/bin/perl"
+  doCheck = true;
+  checkTarget = "test";
 
-      # To produce executables, `tcc' needs to know where `crt*.o' are.
-      sed -i "tcc.h" \
-        -e's|define CONFIG_TCC_CRT_PREFIX.*$|define CONFIG_TCC_CRT_PREFIX "${stdenv.glibc}/lib"|g'
+  meta = {
+    description = "TinyCC, a small, fast, and embeddable C compiler and interpreter";
 
-      sed -i "libtcc.c" \
-        -e's|tcc_add_library_path(s, CONFIG_SYSROOT "/lib");|tcc_add_library_path(s, "${stdenv.glibc}/lib");|g;
-           s|tcc_add_sysinclude_path(s, CONFIG_SYSROOT "/usr/include");|tcc_add_library_path(s, "${stdenv.glibc}/include");|g ;
-           s|tcc_add_sysinclude_path(s, buf);|tcc_add_sysinclude_path(s, buf); tcc_add_sysinclude_path(s, "${stdenv.glibc}/include");|g'
+    longDescription =
+      '' TinyCC (aka TCC) is a small but hyper fast C compiler.  Unlike
+         other C compilers, it is meant to be self-sufficient: you do not
+         need an external assembler or linker because TCC does that for
+         you.
 
-      # Tell it about the loader's location.
-      sed -i "tccelf.c" \
-        -e's|".*/ld-linux\([^"]\+\)"|"${stdenv.glibc}/lib/ld-linux\1"|g'
-    ''; # "
+         TCC compiles so fast that even for big projects Makefiles may not
+         be necessary.
 
-    postInstall = ''
-      makeinfo --force tcc-doc.texi || true
+         TCC not only supports ANSI C, but also most of the new ISO C99
+         standard and many GNU C extensions.
 
-      mkdir -p "$out/share/info"
-      mv tcc-doc.info* "$out/share/info"
+         TCC can also be used to make C scripts, i.e. pieces of C source
+         that you run as a Perl or Python script.  Compilation is so fast
+         that your script will be as fast as if it was an executable.
 
-      echo 'int main () { printf ("it works!\n"); exit(0); }' | \
-         "$out/bin/tcc" -run -
-    '';
+         TCC can also automatically generate memory and bound checks while
+         allowing all C pointers operations.  TCC can do these checks even
+         if non patched libraries are used.
 
-    doCheck = true;
-    checkTarget = "test";
+         With libtcc, you can use TCC as a backend for dynamic code
+         generation.
+      '';
 
-    meta = {
-      description = "TinyCC, a small, fast, and embeddable C compiler and interpreter";
+    homepage = http://www.tinycc.org/;
+    license = "LGPLv2+";
 
-      longDescription =
-        '' TinyCC (aka TCC) is a small but hyper fast C compiler.  Unlike
-           other C compilers, it is meant to be self-sufficient: you do not
-           need an external assembler or linker because TCC does that for
-           you.
-
-           TCC compiles so fast that even for big projects Makefiles may not
-           be necessary.
-
-           TCC not only supports ANSI C, but also most of the new ISO C99
-           standard and many GNU C extensions.
-
-           TCC can also be used to make C scripts, i.e. pieces of C source
-           that you run as a Perl or Python script.  Compilation is so fast
-           that your script will be as fast as if it was an executable.
-
-           TCC can also automatically generate memory and bound checks while
-           allowing all C pointers operations.  TCC can do these checks even
-           if non patched libraries are used.
-
-           With libtcc, you can use TCC as a backend for dynamic code
-           generation.
-        '';
-
-      homepage = http://www.tinycc.org/;
-      license = "LGPLv2+";
-
-      platforms = stdenv.lib.platforms.unix;
-      maintainers = [ stdenv.lib.maintainers.ludo ];
-    };
-  }
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index faefdc5a0c3a..af886c18dce7 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -177,7 +177,7 @@ with (import ./release-lib.nix);
   texLiveExtra = linux;
   texinfo = all;
   time = linux;
-  tinycc = ["i686-linux"];
+  tinycc = linux;
   udev = linux;
   unrar = linux;
   unzip = all;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index a3902b8daa8c..cca7dd5defdc 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -304,7 +304,7 @@ let
       texinfo = all;
       tightvnc = linux;
       time = linux;
-      tinycc = ["i686-linux"];
+      tinycc = linux;
       uae = linux;
       udev = linux;
       unrar = linux;

From c3190ef1d89bafac275153804f5acb39977a3e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 1 Apr 2013 10:14:31 +0200
Subject: [PATCH 337/394] lighttpd: bump to version 1.4.32

One important denial of service (in 1.4.31) fix: CVE-2012-5533[1].

NOTE: There are some errors about missing commands during the build, but
I'm pretty sure they were there before. And the result seems to be
working anyway...

 * /usr/bin/file: No such file or directory
 * /bin/sh: line 2: which: command not found
 * /tmp/nix-build-lighttpd-1.4.32.drv-0/lighttpd-1.4.32/libtool: line 1085: ldconfig: command not found

[1] http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5533
---
 pkgs/servers/http/lighttpd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 11df6e74bd69..8a3c26f63307 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2 }:
 
 stdenv.mkDerivation {
-  name = "lighttpd-1.4.30";
+  name = "lighttpd-1.4.32";
 
   src = fetchurl {
-    url = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.30.tar.xz;
-    sha256 = "c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b";
+    url = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.32.tar.xz;
+    sha256 = "1hgd9bi4mrak732h57na89lqg58b1kkchnddij9gawffd40ghs0k";
   };
 
   buildInputs = [ pcre libxml2 zlib attr bzip2 ];

From 238c26cea9a4e74949eccb43f4ac538a0ab150a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 1 Apr 2013 15:28:05 +0200
Subject: [PATCH 338/394] lighttpd: fix build warnings

The build complains about missing "file" and "which" commands, so add them as
build inputs.

"file" is used by the autotools configure script to tweak what -m flag
(if any) to pass to the linker when it asks it for shared library
support.

Here is an example of -m values for GNU ld:
  Supported emulations:
   elf_x86_64
   elf32_x86_64
   elf_i386
   i386linux
   elf_l1om
   elf_k1om

"which" is used in the build phase to look for svnversion and git, to build a
version stamp. Since we build from a release tarball (and don't pass svn or git
as inputs either), this check fails and falls back to the version number in the
tarball.

There is one build warning left, but I think this is normal on NixOS:

  /tmp/nix-build-lighttpd-1.4.32.drv-0/lighttpd-1.4.32/libtool: line 1085: ldconfig: command not found
---
 pkgs/servers/http/lighttpd/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 8a3c26f63307..66bc45de9423 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2 }:
+{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2, which, file }:
 
 stdenv.mkDerivation {
   name = "lighttpd-1.4.32";
@@ -8,7 +8,11 @@ stdenv.mkDerivation {
     sha256 = "1hgd9bi4mrak732h57na89lqg58b1kkchnddij9gawffd40ghs0k";
   };
 
-  buildInputs = [ pcre libxml2 zlib attr bzip2 ];
+  buildInputs = [ pcre libxml2 zlib attr bzip2 which file ];
+
+  preConfigure = ''
+    sed -i "s:/usr/bin/file:${file}/bin/file:g" configure
+  '';
 
   meta = {
     description = "Lightweight high-performance web server";

From cf019ab91e2551aaa7946d3eebe15b8d044d5613 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Apr 2013 10:51:22 -0400
Subject: [PATCH 339/394] Add git prerelease of aws-sdk nodePackage

Required modifying patchLatest to handle tarballs that don't create a 'package' directory

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index 06f7ad321bbc..f84464c05f70 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -9,9 +9,12 @@ let self = {
   patchLatest = srcAttrs:
                   let src = fetchurl srcAttrs; in
                   pkgs.runCommand src.name {} ''
+                    mkdir unpack
+                    cd unpack
                     tar xf ${src}
+                    mv */ package
                     sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json
-                    tar cf $out package
+                    tar cf $out *
                   '';
 
   "abbrev" = self."abbrev-1";
@@ -96,6 +99,19 @@ let self = {
 
   "aws-sdk" = self."aws-sdk-*";
 
+  "aws-sdk-git" = self.buildNodePackage rec {
+    name = "aws-sdk-0.9.8-pre7b687a0c262ac129fd6eaffeb02de09ee7e6a87c";
+    src = self.patchLatest {
+      url = "https://github.com/aws/aws-sdk-js/archive/7b687a0c262ac129fd6eaffeb02de09ee7e6a87c.tar.gz";
+      sha256 = "1pn43wxi3xz4kjyxf8j7zil5frhd1zpqja8szamgll2pxxnpnr3i";
+      name = "${name}.tgz";
+    };
+    deps = [
+      self."xml2js-0.2.4"
+      self."xmlbuilder"
+    ];
+  };
+
   "aws-sdk-*" = self.buildNodePackage rec {
     name = "aws-sdk-0.9.7-pre.8";
     src = self.patchLatest {

From 16672fc8b1156b3ef7d128b5f4dd21a23b8b9769 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 1 Apr 2013 17:13:00 +0200
Subject: [PATCH 340/394] xbmc: add pulse support, lame, avahi, libdvdcss

---
 pkgs/applications/video/xbmc/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix
index 0a09fe30ace0..e5deba4f97f9 100644
--- a/pkgs/applications/video/xbmc/default.nix
+++ b/pkgs/applications/video/xbmc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeWrapper
 , pkgconfig, cmake, gnumake, yasm, python
-, boost
+, boost, avahi, libdvdcss, lame
 , gettext, pcre, yajl, fribidi
 , openssl, gperf, tinyxml2, taglib, libssh, swig, jre
 , libX11, xproto, inputproto
@@ -20,7 +20,9 @@
 , libusb ? null, usbSupport ? false
 , samba ? null, sambaSupport ? true
 # TODO: would be nice to have nfsSupport (needs libnfs library)
+# TODO: librtmp
 , libvdpau ? null, vdpauSupport ? true
+, pulseaudio ? null, pulseSupport ? false
 }:
 
 assert dbusSupport  -> dbus_libs != null;
@@ -28,6 +30,7 @@ assert udevSupport  -> udev != null;
 assert usbSupport   -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable
 assert sambaSupport -> samba != null;
 assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
+assert pulseSupport -> pulseaudio != null;
 
 stdenv.mkDerivation rec {
     name = "xbmc-12.1";
@@ -53,14 +56,15 @@ stdenv.mkDerivation rec {
       ffmpeg libmpeg2 libsamplerate libmad
       libogg libvorbis flac
       lzo libcdio libmodplug libass
-      sqlite mysql nasm
+      sqlite mysql nasm avahi libdvdcss lame
       curl bzip2 zip unzip glxinfo xdpyinfo
     ]
     ++ lib.optional dbusSupport dbus_libs
     ++ lib.optional udevSupport udev
     ++ lib.optional usbSupport libusb
     ++ lib.optional sambaSupport samba
-    ++ lib.optional vdpauSupport libvdpau;
+    ++ lib.optional vdpauSupport libvdpau
+    ++ lib.optional pulseSupport pulseaudio;
 
     dontUseCmakeConfigure = true;
 
@@ -69,7 +73,8 @@ stdenv.mkDerivation rec {
       "--disable-webserver"
     ]
     ++ lib.optional (! sambaSupport) "--disable-samba"
-    ++ lib.optional vdpauSupport "--enable-vdpau";
+    ++ lib.optional vdpauSupport "--enable-vdpau"
+    ++ lib.optional pulseSupport "--enable-pulse";
 
     postInstall = ''
       for p in $(ls $out/bin/) ; do

From 2fe5c12d35b21188e47c2abf9f7449eed750a848 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 1 Apr 2013 17:45:18 +0200
Subject: [PATCH 341/394] Add s3http node package

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

diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index f84464c05f70..c4905cf17a11 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -1208,6 +1208,21 @@ let self = {
     ];
   };
 
+  "s3http" = self."s3http-*";
+
+  "s3http-*" = self.buildNodePackage rec {
+    name = "s3http-0.0.1";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/s3http/-/${name}.tgz";
+      sha256 = "7140a0ee6df9fb90fd74aa0b68b73f899c6d8e2eaa2de89fde3f634e9bf10dba";
+    };
+    deps = [
+      self."aws-sdk-git"
+      self."commander-0.5.1"
+      self."http-auth-*"
+    ];
+  };
+
   "sax" = self."sax->=0.4.2";
 
   "sax->=0.4.2" = self.buildNodePackage rec {

From e21c53c21130d245812e267b3c3dee0d8e43f663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 1 Apr 2013 18:37:52 +0200
Subject: [PATCH 342/394] tig: enable bash completion

Copy the bash completion script that comes with tig to
$out/etc/bash_completion.d/.

Note: to enable bash completion in NixOS, set
environment.enableBashCompletion = true;
---
 .../version-management/git-and-tools/tig/default.nix            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 8d5c2baa7a50..ea9ce97be161 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
   installPhase = ''
     make install
     make install-doc
+    mkdir -p $out/etc/bash_completion.d/
+    cp contrib/tig-completion.bash $out/etc/bash_completion.d/
   '';
   meta = {
     homepage = "http://jonas.nitro.dk/tig/";

From f3a16d0dd53134f29636210e3587695c586f92bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 17:18:37 +0200
Subject: [PATCH 343/394] update meta.maintainers section

---
 pkgs/applications/misc/yeganesh/default.nix                  | 1 +
 pkgs/development/libraries/haskell/quickcheck-io/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/yeganesh/default.nix b/pkgs/applications/misc/yeganesh/default.nix
index 36a5817772d5..14f0fdb53846 100644
--- a/pkgs/applications/misc/yeganesh/default.nix
+++ b/pkgs/applications/misc/yeganesh/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "small dmenu wrapper";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/quickcheck-io/default.nix b/pkgs/development/libraries/haskell/quickcheck-io/default.nix
index b7c33b6d1a0a..985223678cbc 100644
--- a/pkgs/development/libraries/haskell/quickcheck-io/default.nix
+++ b/pkgs/development/libraries/haskell/quickcheck-io/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Use HUnit assertions as QuickCheck properties";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })

From 6d4558aceecd06161d801abb0ddd896461ca7098 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 17:18:47 +0200
Subject: [PATCH 344/394] haskell-clientsession: update to version 0.9

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

diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index fd0ebd2065a7..83cf8e57a682 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.8.1";
-  sha256 = "1x4qfm4hkvm3xmn7hnvcx1j900g97qhks66xzik1wvsjy3piwpgd";
+  version = "0.9";
+  sha256 = "0cyw34vzvv1j7w094cjcf97g8bki7l9x82s8csaf96y6d9qws308";
   buildDepends = [
     base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein
     tagged

From 6a0bf5ba6cf2ab7ffa26050a60653ddb305a7d2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 17:18:47 +0200
Subject: [PATCH 345/394] haskell-doctest: update to version 0.9.6

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

diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index 499163a11017..d83fa8729c1c 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "doctest";
-  version = "0.9.5.1";
-  sha256 = "0phakf605pdwp89y522wm17n1bflxlgqkgahklnf10wnywxwm7cs";
+  version = "0.9.6";
+  sha256 = "0gw13pm4hg69v60swsv6w4iwzgdj5f4pkcyfmgzfp1dx399p6hyl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ deepseq filepath ghcPaths syb transformers ];

From 5d01b76912ce188d4af07e039dbe4a343cdcb5f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 17:18:47 +0200
Subject: [PATCH 346/394] haskell-hspec-meta: update to version 1.5.2

---
 .../libraries/haskell/hspec-meta/default.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index 261e9577bbbe..706bba15def7 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -1,16 +1,16 @@
-{ cabal, ansiTerminal, filepath, hspecExpectations, HUnit
-, QuickCheck, quickcheckIo, setenv, time, transformers
+{ cabal, ansiTerminal, deepseq, filepath, hspecExpectations, HUnit
+, QuickCheck, quickcheckIo, random, setenv, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.5.1";
-  sha256 = "1js62n2mxv4mj4w89ymz5cn3d2qznjndzk3c78gmy6chvig23zlf";
+  version = "1.5.2";
+  sha256 = "1kzlppbp8ralkpi89qrfdm5yrr72b9iq4nrvmblyjrb67h9412q0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal filepath hspecExpectations HUnit QuickCheck
-    quickcheckIo setenv time transformers
+    ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck
+    quickcheckIo random setenv time transformers
   ];
   doCheck = false;
   meta = {

From fe1dde269c35d9ba8696a8d7904cd79c9af6ef2b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 17:18:47 +0200
Subject: [PATCH 347/394] haskell-hspec: update to version 1.5.2

---
 .../libraries/haskell/hspec/default.nix         | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 2fde2e8d9cf9..2de17a479ad7 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -1,21 +1,22 @@
-{ cabal, ansiTerminal, doctest, filepath, ghcPaths
+{ cabal, ansiTerminal, deepseq, doctest, filepath, ghcPaths
 , hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
-, setenv, silently, time, transformers
+, random, setenv, silently, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.5.1";
-  sha256 = "0iz34hgwir07g2qv3zdkg5k5wrv68qd0c77xkpfcs653fi28i91a";
+  version = "1.5.2";
+  sha256 = "1bndznbq7qyqr4j4mnsxf3dabmjyzah0bsiyynrc00ay1pf033l8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal filepath hspecExpectations HUnit QuickCheck
-    quickcheckIo setenv time transformers
+    ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck
+    quickcheckIo random setenv time transformers
   ];
   testDepends = [
-    ansiTerminal doctest filepath ghcPaths hspecExpectations hspecMeta
-    HUnit QuickCheck quickcheckIo setenv silently time transformers
+    ansiTerminal deepseq doctest filepath ghcPaths hspecExpectations
+    hspecMeta HUnit QuickCheck quickcheckIo random setenv silently time
+    transformers
   ];
   meta = {
     homepage = "http://hspec.github.com/";

From c7ac797b5c5ecd4685b4804ad88d4dac2a4998dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 17:18:48 +0200
Subject: [PATCH 348/394] haskell-skein: update to version 1.0.0

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

diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 9f085cce70d9..ec71d27db02c 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "0.1.0.12";
-  sha256 = "1nx0ad0y7zmljc7phwin2aph6frs70hvz3di8q52kzpi5m1h3g3a";
+  version = "1.0.0";
+  sha256 = "03r9kqbvv6z1d8ivdwrxvac5bnd29w116pbixyrcrbx0sg1wwpfa";
   buildDepends = [ cereal cryptoApi tagged ];
   testDepends = [ cereal cryptoApi filepath hspec tagged ];
   meta = {

From 05467aef298575875a532b058bc9ae91ee1eb2b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 18:26:12 +0200
Subject: [PATCH 349/394] haskell-yesod-core: jailbreak to support new versions
 of clientsession

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

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index a1c7cf79f3ad..813c524ca357 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -23,6 +23,7 @@ cabal.mkDerivation (self: {
     blazeBuilder conduit hamlet hspec httpTypes HUnit QuickCheck random
     shakespeareCss shakespeareJs text transformers wai waiTest
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Creation of type-safe, RESTful web applications";

From cb4ae7759ec3e3d93b59cec88f9f74fdce27f79c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 18:47:19 +0200
Subject: [PATCH 350/394] haskell-xml: update to version 1.3.13

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

diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix
index 8a8e6e3e2ad0..126ab9b1f087 100644
--- a/pkgs/development/libraries/haskell/xml/default.nix
+++ b/pkgs/development/libraries/haskell/xml/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml";
-  version = "1.3.12";
-  sha256 = "1lmqnzna0zy297y4q6qviv7a4966zz9mhfhk6anrp66cz890whai";
+  version = "1.3.13";
+  sha256 = "04xq2ma2if5gqz16bjrxwigh4vzw6m8i2zk11s5qg3d4z370fdn3";
   buildDepends = [ text ];
   meta = {
     homepage = "http://code.galois.com";

From 62d7abf42ab21aed07e30a1833ef32be6c2d57a0 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 1 Apr 2013 22:55:16 +0200
Subject: [PATCH 351/394] flexget: run time dependency on deluge (plugin)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 29f2e181f3d3..6dc8d0298217 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1485,7 +1485,7 @@ pythonPackages = python.modules // rec {
     };
 
     buildInputs = [ nose ];
-    propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar ];
+    propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar deluge ];
 
     meta = {
       homepage = http://flexget.com/;

From 934bfc618a379aaad5d24fdb3bc46358ff832a2a Mon Sep 17 00:00:00 2001
From: Cameron Matheson <cam@cammunism.org>
Date: Mon, 1 Apr 2013 16:24:08 -0600
Subject: [PATCH 352/394] tmux: update to version 1.8

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

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 435b9cdcee90..272656349f6c 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -2,21 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "tmux";
-  version = "1.7";
+  version = "1.8";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "0ywy1x2g905hmhkdz418ik42lcvnhnwr8fv63rcqczfg27d6nd38";
+    sha256 = "f265401ca890f8223e09149fcea5abcd6dfe75d597ab106e172b01e9d0c9cd44";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
-  # There's a bug in tmux's configure script, --disable-static actually enables it
-  # Fixed upstream in revision ThomasAdam/tmux@e964ff70e696f30f0301d11deb45c8ada54e0c55
-  # Remove on next update
-  dontDisableStatic = true;
-
   buildInputs = [ ncurses libevent ];
 
   meta = {

From 7bc828366f14c1d7bcbc3a471541e01e082cffe4 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Mon, 1 Apr 2013 15:42:41 -0700
Subject: [PATCH 353/394] recoll-1.18.1

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

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
new file mode 100644
index 000000000000..7d68a12ba8f7
--- /dev/null
+++ b/pkgs/applications/search/recoll/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, qt4, zlib, xapian, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx, ghostscript, wv2, file, python}:
+
+stdenv.mkDerivation rec {
+  ver = "1.18.1";
+  name = "recoll-${ver}";
+
+  src = fetchurl {
+    url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
+    sha256 = "0cyrkx5aza3485avb2kxc6cbsqqrb32l1kq8ravr9d828331v84f";
+  };
+
+  buildInputs = [ qt4 zlib xapian groff libxslt unzip xpdf antiword catdoc lyx ghostscript wv2 file python ];
+
+  meta = {
+    description = "finds keywords inside documents as well as file names";
+    longDescription = ''
+      Xapian frontend that can search through files, archive members, email attachments. 
+      '';
+    homepage = http://www.lesbonscomptes.com/recoll/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e299133f134..791f54b715e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1474,6 +1474,8 @@ let
 
   recutils = callPackage ../tools/misc/recutils { };
 
+  recoll = callPackage ../applications/search/recoll { };
+
   refind = callPackage ../tools/misc/refind { };
 
   reiser4progs = callPackage ../tools/filesystems/reiser4progs { };

From e77b526e0cfbdf6d150e052a6ae15ee946395d6f Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <rmm@meta.ph>
Date: Tue, 2 Apr 2013 11:39:36 +0800
Subject: [PATCH 354/394] racket: enable HTML docs

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

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 4a6713580da7..d0e4fee33595 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cairo, file, pango, glib, gtk
 , which, libtool, makeWrapper, libjpeg, libpng
-, fontconfig, liberation_ttf } :
+, fontconfig, liberation_ttf, sqlite } :
 
 stdenv.mkDerivation rec {
   pname = "racket";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
   };
 
   # Various racket executables do run-time searches for these.
-  ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib";
+  ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib";
 
-  buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf ];
+  buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf sqlite ];
 
   preConfigure = ''
     export LD_LIBRARY_PATH=${ffiSharedLibs}:$LD_LIBRARY_PATH

From ed6ae95e1af6335c91f292dd19e24d18d1093653 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Mon, 1 Apr 2013 22:59:22 -0700
Subject: [PATCH 355/394] fix recoll filters, enable inotify support.

---
 pkgs/applications/search/recoll/default.nix | 43 +++++++++++++++++++--
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 7d68a12ba8f7..966d41315a1c 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, qt4, zlib, xapian, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx, ghostscript, wv2, file, python}:
+{ stdenv, fetchurl
+, qt4, xapian, file, python
+, djvulibre, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx
+, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconvOrLibc }:
 
 stdenv.mkDerivation rec {
   ver = "1.18.1";
@@ -9,13 +12,45 @@ stdenv.mkDerivation rec {
     sha256 = "0cyrkx5aza3485avb2kxc6cbsqqrb32l1kq8ravr9d828331v84f";
   };
 
-  buildInputs = [ qt4 zlib xapian groff libxslt unzip xpdf antiword catdoc lyx ghostscript wv2 file python ];
+  configureFlags = [ "--with-inotify" ];
+
+  buildInputs = [ qt4 xapian file python ];
+
+  # the filters search through ${PATH} using a sh proc 'checkcmds' for the
+  # filtering utils. Short circuit this by replacing the filtering command with
+  # the absolute path to the filtering command. 
+  postInstall = ''
+    for f in $out/share/recoll/filters/* ; do
+      substituteInPlace  $f --replace antiword      ${antiword}/bin/antiword
+      substituteInPlace  $f --replace awk           ${gawk}/bin/awk
+      substituteInPlace  $f --replace catppt        ${catdoc}/bin/catppt
+      substituteInPlace  $f --replace djvused       ${djvulibre}/bin/djvused
+      substituteInPlace  $f --replace djvutxt       ${djvulibre}/bin/djvutxt
+      substituteInPlace  $f --replace grep          ${gnugrep}/bin/grep
+      substituteInPlace  $f --replace groff         ${groff}/bin/groff
+      substituteInPlace  $f --replace gunzip        ${gzip}/bin/gunzip
+      substituteInPlace  $f --replace iconv         ${libiconvOrLibc}/bin/iconv
+      substituteInPlace  $f --replace lyx           ${lyx}/bin/lyx
+      substituteInPlace  $f --replace pdftotext     ${xpdf}/bin/pdftotext
+      substituteInPlace  $f --replace pstotext      ${ghostscript}/bin/ps2ascii 
+      substituteInPlace  $f --replace sed           ${gnused}/bin/sed
+      substituteInPlace  $f --replace tar           ${gnutar}/bin/tar
+      substituteInPlace  $f --replace unzip         ${unzip}/bin/unzip
+      substituteInPlace  $f --replace xls2csv       ${catdoc}/bin/xls2csv
+      substituteInPlace  $f --replace xsltproc      ${libxslt}/bin/xsltproc
+    done
+  '';
+    # TODO:
+    #substituteInPlace  $f --replace unrtf         ${unrtf}/bin/unrtf 
+    #substituteInPlace  $f --replace untex         ${untex}/bin/untex
+    #substituteInPlace  $f --replace wpd2html      ${wpd2html}/bin/wpd2html
 
   meta = {
     description = "finds keywords inside documents as well as file names";
     longDescription = ''
-      Xapian frontend that can search through files, archive members, email attachments. 
-      '';
+      Recoll is an Xapian frontend that can search through files, archive
+      members, email attachments. 
+    '';
     homepage = http://www.lesbonscomptes.com/recoll/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;

From dfb5cf5cc07abb475d29f252463e914760de0154 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Apr 2013 11:15:53 +0200
Subject: [PATCH 356/394] hspec 1.5.2 fails its test suite on i686-linux.

The issue is under investigation and it's probably harmless.
---
 pkgs/development/libraries/haskell/hspec/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 2de17a479ad7..bd517ababa67 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
     hspecMeta HUnit QuickCheck quickcheckIo random setenv silently time
     transformers
   ];
+  doCheck = self.stdenv.system == "x86_64-linux";
   meta = {
     homepage = "http://hspec.github.com/";
     description = "Behavior-Driven Development for Haskell";

From 51fadefc47b894c85f5d0d0caf08baf6480a724f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Apr 2013 11:19:31 +0200
Subject: [PATCH 357/394] haskell-HUnit: add version 1.2.5.2

---
 .../libraries/haskell/HUnit/1.2.5.2.nix        | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  5 +++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix

diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix
new file mode 100644
index 000000000000..cbebb60b1748
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix
@@ -0,0 +1,18 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "HUnit";
+  version = "1.2.5.2";
+  sha256 = "0hcs6qh8bqhip1kkjjnw7ccgcsmawdz5yvffjj5y8zd2vcsavx8a";
+  buildDepends = [ deepseq ];
+  meta = {
+    homepage = "http://hunit.sourceforge.net/";
+    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
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d8d574acdce7..a70d41b9b5ab 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     haskellSrc   = self.haskellSrc_1_0_1_5;     # 7.6 ok
     html         = self.html_1_0_1_2;           # 7.6 ok
     HTTP         = self.HTTP_4000_2_8;          # 7.6 ok
-    HUnit        = self.HUnit_1_2_5_1;          # 7.6 ok
+    HUnit        = self.HUnit_1_2_5_2;          # 7.6 ok
     mtl          = self.mtl_2_1_2;              # 7.6 ok
     network      = self.network_2_4_1_2;        # 7.6 ok
     OpenGL       = self.OpenGL_2_8_0_0;         # 7.6 ok
@@ -1136,7 +1136,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {};
   HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.3.nix {};
   HUnit_1_2_5_1 = callPackage ../development/libraries/haskell/HUnit/1.2.5.1.nix {};
-  HUnit = self.HUnit_1_2_5_1;
+  HUnit_1_2_5_2 = callPackage ../development/libraries/haskell/HUnit/1.2.5.2.nix {};
+  HUnit = self.HUnit_1_2_5_2;
 
   hxt = callPackage ../development/libraries/haskell/hxt {};
 

From 2522d5c8f59c06b3e8e023bcfaee53e5fb8a61ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Apr 2013 11:19:59 +0200
Subject: [PATCH 358/394] haskell-ghc-mod: update to version 1.12.4

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

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index f12f789ea991..31edc7635cf8 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.12.3";
-  sha256 = "1dc919xbq7aqvpayqh9czvpzz4w4j082d1fjv0n9b7i4a780xghv";
+  version = "1.12.4";
+  sha256 = "1f4pdwimzc2i7bb7ccpbl8pn18ygnqd65xw1z5cmhlswasbdab14";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 5384018fbd5e2fb5463564708be02cde439e39a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Apr 2013 11:19:59 +0200
Subject: [PATCH 359/394] haskell-unix-time: update to version 0.1.6

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

diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
index 9e1614117932..3d3fbdeca45c 100644
--- a/pkgs/development/libraries/haskell/unix-time/default.nix
+++ b/pkgs/development/libraries/haskell/unix-time/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-time";
-  version = "0.1.5";
-  sha256 = "13xks5kshr51mbs112j8vvhirzhbi3fq6zjw7l4z2iwn8chh4hwg";
+  version = "0.1.6";
+  sha256 = "0l8k42n67qwc1ljxw2ksmdnj630q1ql0im0j1z7yv9kak9pmqfy6";
   testDepends = [ doctest hspec QuickCheck time ];
   meta = {
     description = "Unix time parser/formatter and utilities";

From 01ba4463c030fc009cb046a9aba13d1e35ceb15c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Apr 2013 11:19:59 +0200
Subject: [PATCH 360/394] haskell-yesod-auth: update to version 1.1.6

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

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 6f9fe09de4f1..61fa603530f6 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.1.5.3";
-  sha256 = "07srz4zpkn8w382xwi8ri6mh9kgplf0m51819zw1hympphmd9z82";
+  version = "1.1.6";
+  sha256 = "0g6ik3qvjnpyfbr2fciz53l62q44zi7ipil8v7hy56808n5y6i4i";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet
     httpConduit httpTypes liftedBase mimeMail network persistent

From c6637b1f30c55c412d8e92b5341726c3e41742a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Apr 2013 11:19:59 +0200
Subject: [PATCH 361/394] haskell-yesod-core: update to version 1.1.8.3

---
 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 813c524ca357..8f9a9ed1a71a 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.1.8.2";
-  sha256 = "0brrvij1vldb5zr3vnynikaf1x479qrgf7k3162nhrmwl57lm9sz";
+  version = "1.1.8.3";
+  sha256 = "116vglpqh2561g0gzhm4ijwx829c50ai1hh715vwi5j5i01y2rkr";
   buildDepends = [
     aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
     clientsession conduit cookie failure fastLogger hamlet httpTypes

From eeeef91f7337ba631266bbc6f2499b26a76717de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Apr 2013 12:53:17 +0200
Subject: [PATCH 362/394] haskell-ghc-mod: disable test suite to fix the build

The test suite depends on the ghc-path module, which doesn't work with
ghc-wrapper. Eventually, we'll need a solution for this problem in our Cabal
builds.
---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 31edc7635cf8..a8224a85745e 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -25,6 +25,7 @@ cabal.mkDerivation (self: {
       ensureDir "$out/share/emacs"
       mv $pname-$version emacs/site-lisp
     '';
+  doCheck = false;
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
     description = "Happy Haskell programming on Emacs/Vim";

From 3bdb2ecea41ef4452a843948cd675b87313beb02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 2 Apr 2013 10:21:31 +0200
Subject: [PATCH 363/394] cinepaint: making it run (missing rpath)

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

diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix
index 7b1a7f26239f..8d88e570f272 100644
--- a/pkgs/applications/graphics/cinepaint/default.nix
+++ b/pkgs/applications/graphics/cinepaint/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  NIX_LDFLAGS = "-llcms -ljpeg";
+  NIX_LDFLAGS = "-llcms -ljpeg -lX11";
 
   # NIX_CFLAGS_COMPILE = "-I.";
 

From 19deeadae022eeae985c052569ad6e05cc26d62f Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 2 Apr 2013 15:52:57 +0200
Subject: [PATCH 364/394] mopidy: Update to 0.12.0

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

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index d285c4b0e237..d4777dcc53a8 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -5,12 +5,12 @@
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-${version}";
 
-  version = "0.11.1";
+  version = "0.12.0";
 
   src = fetchgit {
     url = "https://github.com/mopidy/mopidy.git";
     rev = "refs/tags/v${version}";
-    sha256 = "123p9hsnlgwvrw4vzlxjf5f43rqzqa3ynbqha8pyi6r0q3ln7qjn";
+    sha256 = "18b1gsyq1ph1a8gl6m4jmhkvq1gyyhbkbb6rrr3qr4rb5prl1fyi";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From c544639554f7c4f3a43dbee9c3b9192a66146fbd Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 2 Apr 2013 15:53:38 +0200
Subject: [PATCH 365/394] darktable: Add 1.2-RC1 as darktable12

---
 .../graphics/darktable/1.2rc1.nix             | 53 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/applications/graphics/darktable/1.2rc1.nix

diff --git a/pkgs/applications/graphics/darktable/1.2rc1.nix b/pkgs/applications/graphics/darktable/1.2rc1.nix
new file mode 100644
index 000000000000..906240d864f6
--- /dev/null
+++ b/pkgs/applications/graphics/darktable/1.2rc1.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl
+, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
+, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
+, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
+, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
+, openexr, pixman, pkgconfig, sqlite, bash, libxslt }:
+
+assert stdenv ? glibc;
+
+stdenv.mkDerivation rec {
+  version = "1.2rc1";
+  name = "darktable-${version}";
+
+  src = fetchurl {
+    url = "http://tinyurl.com/bmwdztq";
+    name = "${name}-${version}.tar.xz";
+    sha256 = "0l3gl49bmaljrrl4zfaivvj7apxa2jm934ylq24gcms3b2whv70m";
+  };
+
+  buildInputs =
+    [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
+      ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
+      libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
+      librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
+    ];
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
+
+    substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
+  '';
+
+  cmakeFlags = [
+    "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include"
+    "-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Virtual lighttable and darkroom for photographers";
+    homepage = http://darktable.sourceforge.net;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e299133f134..32646212ad77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6735,6 +6735,10 @@ let
     inherit (gnome) GConf libglade;
   };
 
+  darktable12 = callPackage ../applications/graphics/darktable/1.2rc1.nix {
+    inherit (gnome) GConf libglade;
+  };
+
   "dd-agent" = callPackage ../tools/networking/dd-agent { };
 
   dia = callPackage ../applications/graphics/dia {

From 1aef67362fc72f394c679e9131a484071393f548 Mon Sep 17 00:00:00 2001
From: Lluis Batlle <viriketo@gmail.com>
Date: Tue, 2 Apr 2013 18:02:03 +0200
Subject: [PATCH 366/394] guile: adding a patch to allow guile builds without
 chroots

Otherwise, the NSS troubles may make a test fail.

Patch suggested by ludo.
---
 .../interpreters/guile/default.nix            |  2 +-
 .../interpreters/guile/eai_system.patch       | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/guile/eai_system.patch

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index d09e995e95c0..45793b25d25b 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -29,7 +29,7 @@
 
   enableParallelBuilding = true;
 
-  patches = [ ./disable-gc-sensitive-tests.patch ] ++
+  patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ] ++
     (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
 
   # Explicitly link against libgcc_s, to work around the infamous
diff --git a/pkgs/development/interpreters/guile/eai_system.patch b/pkgs/development/interpreters/guile/eai_system.patch
new file mode 100644
index 000000000000..b0eb7ac44dae
--- /dev/null
+++ b/pkgs/development/interpreters/guile/eai_system.patch
@@ -0,0 +1,24 @@
+Building nixpkgs in non-chroot, NSS modules may fail
+and that will report EAI_SYSTEM in getaddrinfo.
+https://bugzilla.novell.com/show_bug.cgi?id=794696
+
+Index: guile-2.0.7/test-suite/tests/net-db.test
+===================================================================
+--- guile-2.0.7.orig/test-suite/tests/net-db.test
++++ guile-2.0.7/test-suite/tests/net-db.test
+@@ -79,6 +79,7 @@
+                      (and (defined? 'EAI_NODATA)  ; GNU extension
+                           (= errcode EAI_NODATA))
+                      (= errcode EAI_AGAIN)
++                     (= errcode EAI_SYSTEM)
+                      (begin
+                        (format #t "unexpected error code: ~a ~s~%"
+                                errcode (gai-strerror errcode))
+@@ -105,6 +106,7 @@
+             ;; `EAI_NONAME'.)
+             (and (or (= errcode EAI_SERVICE)
+                      (= errcode EAI_NONAME)
++                     (= errcode EAI_SYSTEM)
+                      (and (defined? 'EAI_NODATA)
+                           (= errcode EAI_NODATA)))
+                  (string? (gai-strerror errcode))))))))

From a4130abcbf5968539009edb0621135ec56745ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 3 Apr 2013 10:39:17 +0200
Subject: [PATCH 367/394] libffi: upgrade to 3.0.13

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

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 83f88e1819f9..27c3e9f66f33 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation (rec {
-  name = "libffi-3.0.9";
+  name = "libffi-3.0.13";
 
   src = fetchurl {
     url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
-    sha256 = "0ln4jbpb6clcsdpb9niqk0frgx4k0xki96wiv067ig0q4cajb7aq";
+    sha256 = "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x";
   };
 
   doCheck = true;

From 8ad8eb6ee013f4729feb62c6da39b0ba0f0aafd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 3 Apr 2013 11:27:12 +0200
Subject: [PATCH 368/394] glibc: hurd: apply none of the patches

---
 pkgs/development/libraries/glibc/2.17/common.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix
index 9c1a43a97d7c..413a0d7aae82 100644
--- a/pkgs/development/libraries/glibc/2.17/common.nix
+++ b/pkgs/development/libraries/glibc/2.17/common.nix
@@ -31,13 +31,11 @@ stdenv.mkDerivation ({
 
   enableParallelBuilding = true;
 
-  patches =
-    [ /* Have rpcgen(1) look for cpp(1) in $PATH.
-         On GNU/Hurd, use the old version of the patch since the new one
-         doesn't apply.  */
-      (if hurdHeaders != null
-       then ../2.13/rpcgen-path.patch
-       else ./rpcgen-path.patch)
+  /* Don't try to apply these patches to the Hurd's snapshot, which is
+     older.  */
+  patches = stdenv.lib.optionals (hurdHeaders == null)
+    [ /* Have rpcgen(1) look for cpp(1) in $PATH.  */
+      ./rpcgen-path.patch
 
       /* Allow NixOS and Nix to handle the locale-archive. */
       ./nix-locale-archive.patch

From 91ff5e33cc046494f983ae301b5d24ca5c9632ce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Apr 2013 13:10:53 +0200
Subject: [PATCH 369/394] sudo: Update to 1.8.7p7

Ouch, our sudo was criminally outdated.

CVE-2013-1775, CVE-2013-1776, CVE-2012-2337, CVE-2011-0010.
---
 pkgs/tools/security/sudo/default.nix | 50 +++++++++++++++++-----------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index e84fb50b3599..9206a5e44520 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -1,37 +1,45 @@
-{stdenv, fetchurl, coreutils, pam, groff}:
+{ stdenv, fetchurl, coreutils, pam, groff }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.7.2";
+  name = "sudo-1.8.6p7";
 
   src = fetchurl {
-    urls = 
+    urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "02hhvwxj7gnsvmq3cjh592g2xdjpkfcp1jjvwb64nxsz2kbccwy1";
+    sha256 = "0djh2b14d1b1knah46v971x940rz63hvnskz16fzami3nbnqj41h";
   };
 
-  # `--with-stow' allows /etc/sudoers to be a symlink.  Only it
-  # doesn't really help because the target still has to have mode 0440,
-  # while files in the Nix store all have mode 0444.
-  #configureFlags = "--with-stow";
+  postConfigure = ''
+    cat >> pathnames.h <<EOF
+    #undef  _PATH_SUDO_LOGFILE
+    #define _PATH_SUDO_LOGFILE "/var/log/sudo.log"
+    #undef  _PATH_SUDO_TIMEDIR
+    #define _PATH_SUDO_TIMEDIR "/run/sudo"
+    #undef  _PATH_VI
+    #define _PATH_VI "/run/current-system/sw/bin/nano"
+    #undef  _PATH_MV
+    #define _PATH_MV "${coreutils}/bin/mv"
+    EOF
 
-  postConfigure = "
-    sed -e '/_PATH_MV/d; /_PATH_VI/d' -i config.h
-    echo '#define _PATH_SUDO_LOGFILE \"/var/log/sudo.log\"' >> config.h
-    echo '#define _PATH_SUDO_TIMEDIR \"/var/run/sudo\"' >> config.h
-    echo '#define _PATH_MV \"/var/run/current-system/sw/bin/mv\"' >> config.h
-    echo '#define _PATH_VI \"/var/run/current-system/sw/bin/nano\"' >> config.h
-    echo '#define EDITOR _PATH_VI' >>config.h
+    makeFlags="install_uid=$(id -u) install_gid=$(id -g)"
+    installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc"
+  '';
 
-    makeFlags=\"install_uid=$(id -u) install_gid=$(id -g)\"
-    installFlags=\"sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc\"
-  ";
+  buildInputs = [ coreutils pam groff ];
 
-  buildInputs = [coreutils pam groff];
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    # ‘visudo’ does not make sense on NixOS.
+    rm $out/sbin/visudo $out/share/man/man8/visudo.8
+
+    rm $out/share/doc/sudo/ChangeLog
+  '';
 
   meta = {
-    description = "sudo, a command to run commands as root";
+    description = "A command to run commands as root";
 
     longDescription = ''
       Sudo (su "do") allows a system administrator to delegate
@@ -43,5 +51,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.sudo.ws/;
 
     license = http://www.sudo.ws/sudo/license.html;
+
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }

From 48a4e919894013d146659638de45dc358410f700 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 3 Apr 2013 07:41:02 -0400
Subject: [PATCH 370/394] nodePackages.patchLatest: Handle tarballs whose root
 directories are already named 'package'

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index c4905cf17a11..93085491b516 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -12,7 +12,7 @@ let self = {
                     mkdir unpack
                     cd unpack
                     tar xf ${src}
-                    mv */ package
+                    mv */ package 2>/dev/null || true
                     sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json
                     tar cf $out *
                   '';

From 93e8920ebf4e6f0ccdf6384281165e54fbb0ac4a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Apr 2013 12:06:22 +0200
Subject: [PATCH 371/394] haskell-data-default: update to version 0.5.2

---
 .../libraries/haskell/data-default/default.nix    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix
index 2945f7c5a8f2..9a73f6d74ec0 100644
--- a/pkgs/development/libraries/haskell/data-default/default.nix
+++ b/pkgs/development/libraries/haskell/data-default/default.nix
@@ -1,10 +1,17 @@
-{ cabal, dlist }:
+{ cabal, dataDefaultClass, dataDefaultInstancesBase
+, dataDefaultInstancesContainers, dataDefaultInstancesDlist
+, dataDefaultInstancesOldLocale
+}:
 
 cabal.mkDerivation (self: {
   pname = "data-default";
-  version = "0.5.1";
-  sha256 = "05zp9bcxm4lcdqniwckq0zi014iqcnqbrk5wh54dyy83h97z6mpv";
-  buildDepends = [ dlist ];
+  version = "0.5.2";
+  sha256 = "1w9wqv3k579zp5w11v06fak0lr9zzads49b1c9rb1vkz1d8bvf82";
+  buildDepends = [
+    dataDefaultClass dataDefaultInstancesBase
+    dataDefaultInstancesContainers dataDefaultInstancesDlist
+    dataDefaultInstancesOldLocale
+  ];
   meta = {
     description = "A class for types with a default value";
     license = self.stdenv.lib.licenses.bsd3;

From e16d9dc8adcdef0d6b57c477058d2231526cb57a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Apr 2013 12:06:22 +0200
Subject: [PATCH 372/394] haskell-http-reverse-proxy: update to version 0.1.1.4

---
 .../libraries/haskell/http-reverse-proxy/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index ce10da775b0a..8378a3dd9216 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.1.1.3";
-  sha256 = "0z2h2xbvg034snfh3hzc0v2zp5j57lcak2h4vz10lwaqr3jxqnpn";
+  version = "0.1.1.4";
+  sha256 = "0j77hp1ddbxrsv65xf6kqbl8jnvl6qzx98p0lg73j7s76j7vg9cd";
   buildDepends = [
     blazeBuilder caseInsensitive classyPrelude conduit dataDefault
     httpConduit httpTypes liftedBase monadControl network

From bffcad37021db9b5a0c774282588ea0f5c69890c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Apr 2013 12:06:22 +0200
Subject: [PATCH 373/394] haskell-warp: update to version 1.3.8

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

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 2fe4dd8d5649..043a9a925bf0 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.7.5";
-  sha256 = "1y6xnlrqfd763s5r79f53vlbk4iirnci6wpaicrm14f791w2mppc";
+  version = "1.3.8";
+  sha256 = "0lpyrdwgsaxzds6qrh0drp0r90x1va4d7z2n65xb0rhkslr3sk3l";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpTypes liftedBase network networkConduit simpleSendfile

From 0baa128ebabed893d5112e8f10e9211d4fbdc048 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Apr 2013 13:10:18 +0200
Subject: [PATCH 374/394] haskell-data-default-class: add version 0.0.1

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

diff --git a/pkgs/development/libraries/haskell/data-default-class/default.nix b/pkgs/development/libraries/haskell/data-default-class/default.nix
new file mode 100644
index 000000000000..8f99c0143cd5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-default-class/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "data-default-class";
+  version = "0.0.1";
+  sha256 = "0ccgr3jllinchqhw3lsn73ic6axk4196if5274rr1rghls0fxj5d";
+  meta = {
+    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.simons ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a70d41b9b5ab..40701673295d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -703,6 +703,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataDefault = callPackage ../development/libraries/haskell/data-default {};
 
+  dataDefaultClass = callPackage ../development/libraries/haskell/data-default-class {};
+
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
   dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};

From 41281b762ac2df75f3c1c63646fed7390a55951f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Apr 2013 13:24:54 +0200
Subject: [PATCH 375/394] Add various data-default instances.

---
 .../data-default-instances-base/default.nix        | 14 ++++++++++++++
 .../data-default-instances-containers/default.nix  | 14 ++++++++++++++
 .../data-default-instances-dlist/default.nix       | 14 ++++++++++++++
 .../data-default-instances-old-locale/default.nix  | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  4 ++++
 5 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/data-default-instances-base/default.nix
 create mode 100644 pkgs/development/libraries/haskell/data-default-instances-containers/default.nix
 create mode 100644 pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix
 create mode 100644 pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix

diff --git a/pkgs/development/libraries/haskell/data-default-instances-base/default.nix b/pkgs/development/libraries/haskell/data-default-instances-base/default.nix
new file mode 100644
index 000000000000..b8b8494550c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-default-instances-base/default.nix
@@ -0,0 +1,14 @@
+{ cabal, dataDefaultClass }:
+
+cabal.mkDerivation (self: {
+  pname = "data-default-instances-base";
+  version = "0.0.1";
+  sha256 = "1832nq6by91f1iw73ycvkbgn8kpra83pvf2q61hy47xffh0zy4pb";
+  buildDepends = [ dataDefaultClass ];
+  meta = {
+    description = "Default instances for types in base";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix b/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix
new file mode 100644
index 000000000000..98590fa795b0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix
@@ -0,0 +1,14 @@
+{ cabal, dataDefaultClass }:
+
+cabal.mkDerivation (self: {
+  pname = "data-default-instances-containers";
+  version = "0.0.1";
+  sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
+  buildDepends = [ dataDefaultClass ];
+  meta = {
+    description = "Default instances for types in containers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix b/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix
new file mode 100644
index 000000000000..1fa64003f954
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix
@@ -0,0 +1,14 @@
+{ cabal, dataDefaultClass, dlist }:
+
+cabal.mkDerivation (self: {
+  pname = "data-default-instances-dlist";
+  version = "0.0.1";
+  sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
+  buildDepends = [ dataDefaultClass dlist ];
+  meta = {
+    description = "Default instances for types in dlist";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix b/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix
new file mode 100644
index 000000000000..e8647898d9dd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix
@@ -0,0 +1,14 @@
+{ cabal, dataDefaultClass }:
+
+cabal.mkDerivation (self: {
+  pname = "data-default-instances-old-locale";
+  version = "0.0.1";
+  sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
+  buildDepends = [ dataDefaultClass ];
+  meta = {
+    description = "Default instances for types in old-locale";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 40701673295d..712b5a62f9c9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -704,6 +704,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   dataDefault = callPackage ../development/libraries/haskell/data-default {};
 
   dataDefaultClass = callPackage ../development/libraries/haskell/data-default-class {};
+  dataDefaultInstancesBase = callPackage ../development/libraries/haskell/data-default-instances-containers {};
+  dataDefaultInstancesContainers = callPackage ../development/libraries/haskell/data-default-instances-base {};
+  dataDefaultInstancesDlist = callPackage ../development/libraries/haskell/data-default-instances-dlist {};
+  dataDefaultInstancesOldLocale = callPackage ../development/libraries/haskell/data-default-instances-old-locale {};
 
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 

From e42014eb5ab85ae99a679772021d14b76a34d45c Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Wed, 3 Apr 2013 22:47:42 +0400
Subject: [PATCH 376/394] conkeror: Update to 1.0pre-20130401.

---
 .../networking/browsers/conkeror/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index 0a370701109c..b50266e27619 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "conkeror-1.0pre-20120316";
+  name = "conkeror-1.0pre-20130401";
   
   src = fetchurl {
-    url = http://repo.or.cz/w/conkeror.git/snapshot/1264c0dbbefb6d671504a072d4ddb48d62ccead2.zip;
-    sha256 = "1vdxnhqjjvg9cry70byv6d3wib2p4rxhkmv7hs10pq39km1kpj7f";
+    url = http://repo.or.cz/w/conkeror.git/snapshot/0341e791c78653a2f5bbbff9a1dac04bf898dd65.zip;
+    sha256 = "11v7p40lcz6r5z0w54f8pk6hyn9mqjcw44fqszjyz25rkhx951ry";
   };
   
   buildInputs = [ unzip makeWrapper ];
   
-  buildCommand = ''
+  installPhase = ''
     mkdir -p $out/libexec/conkeror
-    unzip $src -d $out/libexec
+    cp -r * $out/libexec/conkeror
 
     makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \
       --add-flags $out/libexec/conkeror/application.ini

From 69ad5c5c04f253bed29750636f1bd3a099575200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 3 Apr 2013 23:34:02 +0200
Subject: [PATCH 377/394] Fix the path to `ping`

iputils-20101006/sbin/ping has moved to iputils-20121221/bin/ping
Wicd uses ping to test the connection and produced and error message.
---
 pkgs/tools/networking/wicd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 6cacfc14ffc8..ded85cd80fb9 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     
     substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
 
-    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/sbin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in
+    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in
     sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
     sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in
     sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in

From 310b1221e1cf1c0d8182de01f4c11b58c1184888 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 3 Apr 2013 23:50:40 +0200
Subject: [PATCH 378/394] New: keter, Yesod deployment manager.

Including the dependencies: unix-process-conduit and networkConduitTls.
---
 .../haskell/network-conduit-tls/default.nix   | 21 +++++++++++++++
 .../haskell/unix-process-conduit/default.nix  | 15 +++++++++++
 .../tools/haskell/keter/default.nix           | 26 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  5 ++++
 4 files changed, 67 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/network-conduit-tls/default.nix
 create mode 100644 pkgs/development/libraries/haskell/unix-process-conduit/default.nix
 create mode 100644 pkgs/development/tools/haskell/keter/default.nix

diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
new file mode 100644
index 000000000000..a847c1b8289f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -0,0 +1,21 @@
+{ cabal, aeson, certificate, conduit, cryptoApi, cryptoRandomApi
+, network, networkConduit, pem, systemFileio, systemFilepath, tls
+, tlsExtra, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "network-conduit-tls";
+  version = "1.0.0.1";
+  sha256 = "1bfb888j7raan764sgq50xxmckgqg3cnz3fcmvpqdjp7lclh313z";
+  buildDepends = [
+    aeson certificate conduit cryptoApi cryptoRandomApi network
+    networkConduit pem systemFileio systemFilepath tls tlsExtra
+    transformers
+  ];
+  meta = {
+    homepage = "https://github.com/snoyberg/conduit";
+    description = "Create TLS-aware network code with conduits";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
new file mode 100644
index 000000000000..6ee4304ac174
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
@@ -0,0 +1,15 @@
+{ cabal, conduit, hspec, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "unix-process-conduit";
+  version = "0.2.0.2";
+  sha256 = "1n9ja7dlxhsxyglfzk397xdgvdny766y1isrb5d065srxprsj2g6";
+  buildDepends = [ conduit transformers ];
+  testDepends = [ conduit hspec transformers ];
+  meta = {
+    homepage = "https://github.com/snoyberg/conduit";
+    description = "Run processes on Unix systems, with a conduit interface";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
new file mode 100644
index 000000000000..b7febdd8c618
--- /dev/null
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -0,0 +1,26 @@
+{ cabal, blazeBuilder, conduit, dataDefault, filepath, hinotify
+, httpReverseProxy, httpTypes, network, networkConduit
+, networkConduitTls, random, systemFileio, systemFilepath, tar
+, text, time, transformers, unixCompat, unixProcessConduit, wai
+, waiAppStatic, yaml, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "keter";
+  version = "0.3.5.4";
+  sha256 = "0dqlfb5cydqk33zp6wf18wr3idpn3bbb8im3rcrg4r9ny7sqfmp7";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    blazeBuilder conduit dataDefault filepath hinotify httpReverseProxy
+    httpTypes network networkConduit networkConduitTls random
+    systemFileio systemFilepath tar text time transformers unixCompat
+    unixProcessConduit wai waiAppStatic yaml zlib
+  ];
+  meta = {
+    homepage = "http://www.yesodweb.com/";
+    description = "Web application deployment manager, focusing on Haskell web frameworks";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 712b5a62f9c9..32a58f718ff2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1359,6 +1359,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   network = self.network_2_4_1_2;
 
   networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
+  networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {};
 
   networkInfo = callPackage ../development/libraries/haskell/network-info {};
 
@@ -1837,6 +1838,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
 
+  unixProcessConduit = callPackage ../development/libraries/haskell/unix-process-conduit {};
+
   unixTime = callPackage ../development/libraries/haskell/unix-time {};
 
   unlambda = callPackage ../development/libraries/haskell/unlambda {};
@@ -2148,6 +2151,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {};
 
+  keter = callPackage ../development/tools/haskell/keter {};
+
   lhs2tex = callPackage ../tools/typesetting/lhs2tex {};
 
   myhasktags = callPackage ../tools/misc/myhasktags {};

From c8d9a9f79b2b3afb4358502b7bf58f8192655224 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 4 Apr 2013 09:22:43 +0200
Subject: [PATCH 379/394] haskell-scotty 0.4.6: New package, a simple web
 framework

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

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
new file mode 100644
index 000000000000..e07c4491dbe8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -0,0 +1,32 @@
+{ cabal, aeson, blazeBuilder, caseInsensitive, conduit
+, dataDefault, httpTypes, mtl, regexCompat, resourcet
+, text, wai, waiExtra, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "scotty";
+  version = "0.4.6";
+  sha256 = "0g83kgqr1p03z7dks6x00id2gz95kkw00wmwp5vyz4zvx1mmmvk8";
+  buildDepends = [
+    aeson
+    blazeBuilder
+    caseInsensitive
+    conduit
+    dataDefault
+    httpTypes
+    mtl
+    regexCompat
+    resourcet
+    text
+    wai
+    waiExtra
+    warp
+  ];
+  meta = {
+    homepage = "https://github.com/xich/scotty";
+    description =
+      "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
+    license = self.stdenv.lib.licenses.bsd;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 712b5a62f9c9..63cb7f88d8b1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1603,6 +1603,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   SafeSemaphore = callPackage ../development/libraries/haskell/SafeSemaphore {};
 
+  scotty = callPackage ../development/libraries/haskell/scotty {};
+
   sendfile = callPackage ../development/libraries/haskell/sendfile {};
 
   semigroups = callPackage ../development/libraries/haskell/semigroups {};

From 07bee4ac0a518b6be037667e59444fde1c469d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 3 Apr 2013 23:31:31 +0200
Subject: [PATCH 380/394] nvidia_x11: update to short-lived, with security
 update

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 08d55fc6ec61..660676865b07 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 
-let versionNumber = "310.32"; in
+let versionNumber = "313.30"; in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
@@ -21,12 +21,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "13dc2s312h4k4bp7qb2ymdafr739jxbh0f3h1ilrkyjkd945cgnl";
+        sha256 = "1ba9mphvynni44dv3mwx9a9819drmrc4n82f4i58xjhvkfbi03qa";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "1wk0lcm712glffdmwpk4drrwb0fjva7qhpxylnqs7fl7d3acnsvq";
+        sha256 = "1ggd3raxax99xnbphf945f0ggj5kq30jnknhyqy2fha9is1jbnjp";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From 071987601a3a3d640b59d8e84958c10dc5c88a9d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Apr 2013 15:43:08 +0200
Subject: [PATCH 381/394] postgresql: Update to latest versions

CVE-2013-1899, CVE-2013-1900, CVE-2013-1901.
---
 pkgs/servers/sql/postgresql/8.4.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.2.x.nix | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 37713d87fd57..c8597def61e9 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.4.16"; in
+let version = "8.4.17"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0bv10jh9pg523rzgbqjq4lzq4ai3275pqhkg0qkr40ap756xj0wd";
+    sha256 = "0dh4rn4q2amqjwmjjiya99bz1ph3lx45j5brnpwdjd9mxhs4r26w";
   };
 
   buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index c0766ba2813b..ea25cf0d476c 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.0.12"; in
+let version = "9.0.13"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "090m5cxw7jv9q2jgwbs3qm57z6ldf0mcavc0wsmqk1ywrdrniw40";
+    sha256 = "0xwrmwrx0pm21w3ifrqcmb8k2sa46w491ff3gqqfxynyk78a9bji";
   };
 
   buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 18716707fd9b..b9436cb4b083 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.1.8"; in
+let version = "9.1.9"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0vacnhqs9mrjrx9vh4r66a9smwl1d4qrmjlsq3ydnqj0lbfzk20x";
+    sha256 = "1n1dc1kqc487dylc22iq1j8sn93jxbqm2g4b5rr0i4q0h7hk7998";
   };
 
   buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 45173ad6511a..89de740b3032 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.2.3"; in
+let version = "9.2.4"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0zszqgp64pn7z9ab36bi989apj6hi20yxvcrk26jvhy0j0radxf4";
+    sha256 = "14xfzw3hb2fn60c438v3j7wa65jjm2pnmx4qb4i4ji4am0cdjzfr";
   };
 
   buildInputs = [ zlib readline ];

From f47659a1babd6890a0b7439a1f3d462bda356d85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 11:04:20 +0200
Subject: [PATCH 382/394] haskell-cipher-aes: update to version 0.1.8

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

diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix
index e32929fb4eef..53aa634aa72e 100644
--- a/pkgs/development/libraries/haskell/cipher-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-aes";
-  version = "0.1.7";
-  sha256 = "1iai9c4rvxframylvc0xwx2nk6s0rsj4dc42wi334xyinilvfyng";
+  version = "0.1.8";
+  sha256 = "171mj9abm0x9bg6mf225mhb25i7xh4v5la5866llb1qrrpvsk1xf";
   testDepends = [
     QuickCheck testFramework testFrameworkQuickcheck2
   ];

From 13fd60eabb15af73b204e0fb53ea05fa1e39cb3e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 11:04:20 +0200
Subject: [PATCH 383/394] haskell-data-default: update to version 0.5.3

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

diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix
index 9a73f6d74ec0..31e3f7423103 100644
--- a/pkgs/development/libraries/haskell/data-default/default.nix
+++ b/pkgs/development/libraries/haskell/data-default/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-default";
-  version = "0.5.2";
-  sha256 = "1w9wqv3k579zp5w11v06fak0lr9zzads49b1c9rb1vkz1d8bvf82";
+  version = "0.5.3";
+  sha256 = "0d1hm0l9kim3kszshr4msmgzizrzha48gz2kb7b61p7n3gs70m7c";
   buildDepends = [
     dataDefaultClass dataDefaultInstancesBase
     dataDefaultInstancesContainers dataDefaultInstancesDlist

From c3cad285f50f050f1a1f496ed0f4c27ff5238e6d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 11:04:20 +0200
Subject: [PATCH 384/394] haskell-scotty: update to version 0.4.6

---
 .../libraries/haskell/scotty/default.nix      | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index e07c4491dbe8..7de31bcf6567 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -1,6 +1,5 @@
-{ cabal, aeson, blazeBuilder, caseInsensitive, conduit
-, dataDefault, httpTypes, mtl, regexCompat, resourcet
-, text, wai, waiExtra, warp
+{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault
+, httpTypes, mtl, regexCompat, resourcet, text, wai, waiExtra, warp
 }:
 
 cabal.mkDerivation (self: {
@@ -8,25 +7,14 @@ cabal.mkDerivation (self: {
   version = "0.4.6";
   sha256 = "0g83kgqr1p03z7dks6x00id2gz95kkw00wmwp5vyz4zvx1mmmvk8";
   buildDepends = [
-    aeson
-    blazeBuilder
-    caseInsensitive
-    conduit
-    dataDefault
-    httpTypes
-    mtl
-    regexCompat
-    resourcet
-    text
-    wai
-    waiExtra
-    warp
+    aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
+    mtl regexCompat resourcet text wai waiExtra warp
   ];
   meta = {
-    homepage = "https://github.com/xich/scotty";
-    description =
-      "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
-    license = self.stdenv.lib.licenses.bsd;
+    homepage = "https://github.com/ku-fpg/scotty";
+    description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
+    license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })

From e0e3a3827008d8bbfffb4e795002882239227b9f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 11:04:20 +0200
Subject: [PATCH 385/394] haskell-uuid: update to version 1.2.10

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

diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix
index e119b2ab737e..b8c72a4251e9 100644
--- a/pkgs/development/libraries/haskell/uuid/default.nix
+++ b/pkgs/development/libraries/haskell/uuid/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuid";
-  version = "1.2.9";
-  sha256 = "088wbhf21w91774icddbm3a8p8jikwjqgg8zdad0pdv8zbi7flsi";
+  version = "1.2.10";
+  sha256 = "17njmmh190pg9bpb8iaw2kniyn7z7j70mzdmxr9h29kydl1xmky6";
   buildDepends = [ binary cryptohash maccatcher random time ];
   testDepends = [
     criterion deepseq HUnit mersenneRandomPure64 QuickCheck random

From 3c6673630451563d903b5d8b67fbc91fbc039f5f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 11:04:21 +0200
Subject: [PATCH 386/394] haskell-uuagc: update to version 0.9.42.3

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

diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index dfb20e0ac76c..0cf3904f6d4f 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuagc";
-  version = "0.9.42.2";
-  sha256 = "1l7w3gimcx079giw5ri4qfr1xfi1wfj93v29r8hvs8q8a6ffjifn";
+  version = "0.9.42.3";
+  sha256 = "0rn0wqccg2v4akh3wj16s5y60fscdfjpvrpsmvbc2vfq2v33y53n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ];

From 10fee86597a5cbe32c62461fad7c654c9bf4bfe0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 15:35:49 +0200
Subject: [PATCH 387/394] pkgs/top-level/release-haskell.nix: build 'keter' in
 the default haskellPackages set

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

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 8ec797de672a..4db75c1368b6 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -204,6 +204,7 @@ mapTestOn {
     jailbreakCabal = supportedSystems;
     json = supportedSystems;
     jsonTypes = supportedSystems;
+    keter = supportedSystems;
     lambdabot = supportedSystems;
     languageCQuote = supportedSystems;
     languageJavascript = supportedSystems;

From b331fb0ad2ec2ccff4953a723f0e445c5c1149ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 15:37:14 +0200
Subject: [PATCH 388/394] pkgs/top-level/release-haskell.nix: sort attributes
 alphabetically

---
 pkgs/top-level/release-haskell.nix | 34 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 4db75c1368b6..1081a2896117 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -16,8 +16,8 @@ mapTestOn {
     ACVector = supportedSystems;
     aeson = supportedSystems;
     AgdaExecutable = supportedSystems;
-    alex = supportedSystems;
     alexMeta = supportedSystems;
+    alex = supportedSystems;
     alternativeIo = supportedSystems;
     ansiTerminal = supportedSystems;
     ansiWlPprint = supportedSystems;
@@ -41,8 +41,8 @@ mapTestOn {
     blazeTextual = supportedSystems;
     bloomfilter = supportedSystems;
     bmp = supportedSystems;
-    BNFC = supportedSystems;
     BNFCMeta = supportedSystems;
+    BNFC = supportedSystems;
     Boolean = supportedSystems;
     bytestringMmap = supportedSystems;
     bytestringNums = supportedSystems;
@@ -125,9 +125,9 @@ mapTestOn {
     gamma = supportedSystems;
     gdiff = supportedSystems;
     ghcEvents = supportedSystems;
-    ghc = supportedSystems;
     ghcMtl = supportedSystems;
     ghcPaths = supportedSystems;
+    ghc = supportedSystems;
     ghcSybUtils = supportedSystems;
     githubBackup = supportedSystems;
     github = supportedSystems;
@@ -139,8 +139,8 @@ mapTestOn {
     GLUT = supportedSystems;
     gnutls = supportedSystems;
     graphviz = supportedSystems;
-    gtk = supportedSystems;
     gtksourceview2 = supportedSystems;
+    gtk = supportedSystems;
     hackageDb = supportedSystems;
     haddock = supportedSystems;
     hakyll = supportedSystems;
@@ -155,13 +155,13 @@ mapTestOn {
     haskellLexer = supportedSystems;
     haskellPlatform = supportedSystems;
     haskellSrcExts = supportedSystems;
-    haskellSrc = supportedSystems;
     haskellSrcMeta = supportedSystems;
+    haskellSrc = supportedSystems;
     HaXml = supportedSystems;
     haxr = supportedSystems;
-    HDBC = supportedSystems;
     HDBCPostgresql = supportedSystems;
     HDBCSqlite3 = supportedSystems;
+    HDBC = supportedSystems;
     HFuse = supportedSystems;
     highlightingKate = supportedSystems;
     hinotify = supportedSystems;
@@ -232,20 +232,20 @@ mapTestOn {
     MonadPrompt = supportedSystems;
     MonadRandom = supportedSystems;
     mpppc = supportedSystems;
-    mtl = supportedSystems;
     mtlparse = supportedSystems;
+    mtl = supportedSystems;
     multiplate = supportedSystems;
     multirec = supportedSystems;
     multiset = supportedSystems;
     murmurHash = supportedSystems;
     mwcRandom = supportedSystems;
-    nat = supportedSystems;
     nats = supportedSystems;
+    nat = supportedSystems;
     naturals = supportedSystems;
     networkInfo = supportedSystems;
-    network = supportedSystems;
     networkMulticast = supportedSystems;
     networkProtocolXmpp = supportedSystems;
+    network = supportedSystems;
     nonNegative = supportedSystems;
     numericPrelude = supportedSystems;
     numtype = supportedSystems;
@@ -267,9 +267,9 @@ mapTestOn {
     pathtype = supportedSystems;
     pcreLight = supportedSystems;
     permutation = supportedSystems;
-    persistent = supportedSystems;
     persistentPostgresql = supportedSystems;
     persistentSqlite = supportedSystems;
+    persistent = supportedSystems;
     persistentTemplate = supportedSystems;
     polyparse = supportedSystems;
     ppm = supportedSystems;
@@ -281,9 +281,9 @@ mapTestOn {
     QuickCheck2 = supportedSystems;
     QuickCheck = supportedSystems;
     randomFu = supportedSystems;
-    random = supportedSystems;
     randomShuffle = supportedSystems;
     randomSource = supportedSystems;
+    random = supportedSystems;
     RangedSets = supportedSystems;
     ranges = supportedSystems;
     readline = supportedSystems;
@@ -297,11 +297,11 @@ mapTestOn {
     regular = supportedSystems;
     RSA = supportedSystems;
     rvar = supportedSystems;
-    safe = supportedSystems;
     SafeSemaphore = supportedSystems;
+    safe = supportedSystems;
     SDLImage = supportedSystems;
-    SDL = supportedSystems;
     SDLMixer = supportedSystems;
+    SDL = supportedSystems;
     SDLTtf = supportedSystems;
     semigroups = supportedSystems;
     sendfile = supportedSystems;
@@ -313,9 +313,9 @@ mapTestOn {
     smallcheck = supportedSystems;
     SMTPClient = supportedSystems;
     snapCore = supportedSystems;
-    snap = supportedSystems;
     snapLoaderStatic = supportedSystems;
     snapServer = supportedSystems;
+    snap = supportedSystems;
     split = supportedSystems;
     splot = supportedSystems;
     srcloc = supportedSystems;
@@ -369,13 +369,13 @@ mapTestOn {
     vcsRevision = supportedSystems;
     Vec = supportedSystems;
     vectorAlgorithms = supportedSystems;
-    vector = supportedSystems;
     vectorSpace = supportedSystems;
+    vector = supportedSystems;
     vty = supportedSystems;
     waiAppStatic = supportedSystems;
     waiExtra = supportedSystems;
-    wai = supportedSystems;
     waiLogger = supportedSystems;
+    wai = supportedSystems;
     warp = supportedSystems;
     wlPprintExtras = supportedSystems;
     wlPprint = supportedSystems;
@@ -399,9 +399,9 @@ mapTestOn {
     yesodDefault = supportedSystems;
     yesodForm = supportedSystems;
     yesodJson = supportedSystems;
-    yesod = supportedSystems;
     yesodPersistent = supportedSystems;
     yesodStatic = supportedSystems;
+    yesod = supportedSystems;
     zeromq3Haskell = supportedSystems;
     zeromqHaskell = supportedSystems;
     zipArchive = supportedSystems;

From fbe9c7138b41b8845fc2c7ee2cc775c7c671c354 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 16:22:47 +0200
Subject: [PATCH 389/394] haskell-network-conduit-tls: update to version
 1.0.0.2

---
 .../libraries/haskell/network-conduit-tls/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
index a847c1b8289f..483271fe9598 100644
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit-tls";
-  version = "1.0.0.1";
-  sha256 = "1bfb888j7raan764sgq50xxmckgqg3cnz3fcmvpqdjp7lclh313z";
+  version = "1.0.0.2";
+  sha256 = "1vzhalz6hxal73rxm6f2l9m7j34mldamz16wrb6ay67wg6giq55z";
   buildDepends = [
     aeson certificate conduit cryptoApi cryptoRandomApi network
     networkConduit pem systemFileio systemFilepath tls tlsExtra

From e71abf64c8e4a62ba3383c150fa9f54d6bdfd708 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 16:22:47 +0200
Subject: [PATCH 390/394] haskell-keter: update to version 0.3.6.1

---
 .../tools/haskell/keter/default.nix           | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
index b7febdd8c618..f9d09abcc3fe 100644
--- a/pkgs/development/tools/haskell/keter/default.nix
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -1,19 +1,21 @@
-{ cabal, blazeBuilder, conduit, dataDefault, filepath, hinotify
-, httpReverseProxy, httpTypes, network, networkConduit
-, networkConduitTls, random, systemFileio, systemFilepath, tar
-, text, time, transformers, unixCompat, unixProcessConduit, wai
-, waiAppStatic, yaml, zlib
+{ cabal, attoparsec, blazeBuilder, caseInsensitive, conduit
+, dataDefault, filepath, hinotify, httpConduit, httpReverseProxy
+, httpTypes, mtl, network, networkConduit, networkConduitTls
+, random, regexTdfa, systemFileio, systemFilepath, tar, text, time
+, transformers, unixCompat, unixProcessConduit, wai, waiAppStatic
+, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "0.3.5.4";
-  sha256 = "0dqlfb5cydqk33zp6wf18wr3idpn3bbb8im3rcrg4r9ny7sqfmp7";
+  version = "0.3.6.1";
+  sha256 = "0jww64q74kx5h69mnv9wgc4kx0nlb06r7lf651gjkai8mf9dkqf2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeBuilder conduit dataDefault filepath hinotify httpReverseProxy
-    httpTypes network networkConduit networkConduitTls random
+    attoparsec blazeBuilder caseInsensitive conduit dataDefault
+    filepath hinotify httpConduit httpReverseProxy httpTypes mtl
+    network networkConduit networkConduitTls random regexTdfa
     systemFileio systemFilepath tar text time transformers unixCompat
     unixProcessConduit wai waiAppStatic yaml zlib
   ];

From e1b932689ffb3eac787c24d090da069a29edc77f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 16:27:57 +0200
Subject: [PATCH 391/394] haskell-cabal2nix: update to version 1.48

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

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 22dde229a2b9..31cbb94c7292 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.47";
-  sha256 = "1ba0ny610ibynwvzqnk5h2461sdkmza5jqrizqxvhp9wknn50fc6";
+  version = "1.48";
+  sha256 = "0175bprjisjzs0y1xga1xqcy5jx6xlbrvsw6095j12xvyrvzrggr";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

From 7dbec8267cc985620a4149bdbd5a4d09aa6239c5 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 4 Apr 2013 17:06:49 +0200
Subject: [PATCH 392/394] normalize 0.7.7: New package, an audio file
 normalizer

---
 pkgs/applications/audio/normalize/default.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/audio/normalize/default.nix

diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix
new file mode 100644
index 000000000000..e422eee363c4
--- /dev/null
+++ b/pkgs/applications/audio/normalize/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "normalize-${version}";
+  version = "0.7.7";
+
+  src = fetchurl {
+    url = "http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.gz";
+    sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://normalize.nongnu.org/;
+    description = "Audio file normalizer";
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28ba9230058b..c7a4f922e335 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7495,6 +7495,8 @@ let
 
   ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
 
+  normalize = callPackage ../applications/audio/normalize { };
+
   mplayer = callPackage ../applications/video/mplayer {
     pulseSupport = config.pulseaudio or false;
   };

From e31ffe6fb0927dea46659177651c9b3d88a1da07 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 4 Apr 2013 17:42:17 +0200
Subject: [PATCH 393/394] gmpc 11.8.16: New package, a GTK MPD (Music Player
 Daemon) client

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

diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
new file mode 100644
index 000000000000..cc80a96306f3
--- /dev/null
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, libtool, intltool, pkgconfig, glib
+, gtk, curl, mpd_clientlib, libsoup, gob2, vala
+}:
+
+stdenv.mkDerivation rec {
+  name = "gmpc-${version}";
+  version = "11.8.16";
+
+  libmpd = stdenv.mkDerivation {
+    name = "libmpd-11.8.17";
+    src = fetchurl {
+      url = http://download.sarine.nl/Programs/gmpc/11.8/libmpd-11.8.17.tar.gz;
+      sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y";
+    };
+    buildInputs = [ pkgconfig glib ];
+  };
+
+  libunique = stdenv.mkDerivation {
+    name = "libunique-1.1.6";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/sources/libunique/1.1/libunique-1.1.6.tar.gz;
+      sha256 = "2cb918dde3554228a211925ba6165a661fd782394bd74dfe15e3853dc9c573ea";
+    };
+    buildInputs = [ pkgconfig glib gtk ];
+
+    patches = [
+      (fetchurl {
+        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/remove_G_CONST_RETURN.patch?h=packages/libunique";
+        sha256 = "0da2qi7cyyax4rr1p25drlhk360h8d3lapgypi5w95wj9k6bykhr";
+      })
+    ];
+  };
+
+  src = fetchurl {
+    url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz";
+    sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
+  };
+
+  buildInputs = [
+    libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup
+    libunique libmpd gob2 vala
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://gmpclient.org;
+    description = "A GTK2 frontend for Music Player Daemon";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.rickynils ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7a4f922e335..f0e30163ce0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7183,6 +7183,8 @@ let
 
   gqview = callPackage ../applications/graphics/gqview { };
 
+  gmpc = callPackage ../applications/audio/gmpc { };
+
   gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk {
     inherit (gnome) GConf;
   };

From 22d4472d2744639ccd880f015bb3147cf5222f07 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Apr 2013 18:07:49 +0200
Subject: [PATCH 394/394] postgresql: Make 9.2 the default

PostgreSQL 8.3 is end-of-life so it shouldn't be our default anymore.

The problem with changing the default PostgreSQL is that it breaks
NixOS installations that have PostgreSQL enabled without specifying an
explicit PostgreSQL version, because PostgreSQL does not do automatic
schema migration if the major version changes.

Thus, it's always a good idea to specify the desired major version
explicitly:

  services.postgresql.package = pkgs.postgresql92;

(In fact, maybe we should remove the default value for
services.postgresql.package.)
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0e30163ce0f..cd3316821c36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5537,7 +5537,7 @@ let
 
   OVMF = callPackage ../applications/virtualization/OVMF { };
 
-  postgresql = postgresql83;
+  postgresql = postgresql92;
 
   postgresql83 = callPackage ../servers/sql/postgresql/8.3.x.nix { };