From ca8b45d441e16bed191e8141de6569776dbdd7b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 18 Apr 2009 16:21:59 +0000
Subject: [PATCH 01/58] * Cabal builder: put the GHC version in the default
 name attribute  to   disambiguate between package instances built with
 different GHCs.

svn path=/nixpkgs/trunk/; revision=15132
---
 pkgs/development/compilers/ghc/6.8.3.nix           | 7 ++++---
 pkgs/development/libraries/haskell/cabal/cabal.nix | 2 +-
 pkgs/top-level/all-packages.nix                    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ghc/6.8.3.nix b/pkgs/development/compilers/ghc/6.8.3.nix
index 972ded49dc5..e3c12cce8c7 100644
--- a/pkgs/development/compilers/ghc/6.8.3.nix
+++ b/pkgs/development/compilers/ghc/6.8.3.nix
@@ -1,14 +1,15 @@
 {stdenv, fetchurl, readline, ghc, perl, m4, gmp, ncurses, haddock}:
 
 stdenv.mkDerivation rec {
-  name = "ghc-6.8.3";
+  version = "6.8.3";
+  name = "ghc-${version}";
   homepage = "http://www.haskell.org/ghc";
 
   src = map fetchurl [
-    { url    = "${homepage}/dist/6.8.3/${name}-src.tar.bz2";
+    { url    = "${homepage}/dist/${version}/${name}-src.tar.bz2";
       sha256 = "1fc1ff82a555532f1c9d2dc628fd9de5e6ebab2ce6ee9490a34174ceb6f76e6b";
     }
-    { url    = "${homepage}/dist/6.8.3/${name}-src-extralibs.tar.bz2";
+    { url    = "${homepage}/dist/${version}/${name}-src-extralibs.tar.bz2";
       sha256 = "ee2f5ba6a46157fc53eae515cb6fa1ed3c5023e7eac15981d92af0af00ee2ba2";
     }
   ];
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index d46787b8630..d76916963ba 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -17,7 +17,7 @@ attrs :
 	    # all packages with haskell- to avoid name clashes for libraries;
 	    # if that is not desired (for applications), name can be set to
 	    # fname.
-            name = "haskell-${self.fname}"; 
+            name = "haskell-${self.pname}-ghc${attrs.ghc.ghc.version}-${self.version}"; 
 
             # the default download location for Cabal packages is Hackage,
             # you still have to specify the checksum
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8783db0b82a..69e545b3455 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1868,7 +1868,7 @@ let
     inherit fetchurl stdenv perl ncurses gmp libedit;
   });
 
-  haskellPackages = haskellPackages_ghc6102;
+  haskellPackages = recurseIntoAttrs haskellPackages_ghc6102;
 
   haskellPackages_ghc6102 = import ./haskell-packages.nix {
     inherit pkgs;

From 4ce5419f172688f2292dca9466bfda84d3181bc2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 18 Apr 2009 20:22:47 +0000
Subject: [PATCH 02/58] * Remove bad backslashes.

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

diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix
index 0c288f22fea..720580c49c5 100644
--- a/pkgs/development/compilers/ghc/6.10.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix
@@ -81,8 +81,8 @@ stdenv.mkDerivation rec {
         mv $out/bin $out/bin-orig
         mkdir $out/bin
         for i in $(cd $out/bin-orig && ls); do
-            echo \"#! $SHELL -e\" >> $out/bin/$i
-            echo \"DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \\\"\\$@\\\"\" >> $out/bin/$i
+            echo "#! $SHELL -e" >> $out/bin/$i
+            echo "DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \"\$@\"" >> $out/bin/$i
             chmod +x $out/bin/$i
         done
       '' else "")

From ffcd38403e8d20745d6fefd9e044bcc4a200e342 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 18 Apr 2009 20:24:36 +0000
Subject: [PATCH 03/58] * Install the package config files under  
 $out/lib/ghc-pkgs/ghc-<version>/<package>.conf instead of under  
 $out/nix-support/ghc-package.conf.  This makes them visible in the   user's
 profile when installed with nix-env.

svn path=/nixpkgs/trunk/; revision=15135
---
 pkgs/development/compilers/ghc/setup-hook.sh       |  9 +++++----
 pkgs/development/compilers/ghc/wrapper.nix         |  1 +
 pkgs/development/libraries/haskell/cabal/cabal.nix |  5 +++--
 pkgs/top-level/haskell-packages.nix                | 10 ++++++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/ghc/setup-hook.sh b/pkgs/development/compilers/ghc/setup-hook.sh
index dc7066f31b6..5027d6536f1 100644
--- a/pkgs/development/compilers/ghc/setup-hook.sh
+++ b/pkgs/development/compilers/ghc/setup-hook.sh
@@ -7,10 +7,11 @@ export GHC_PACKAGE_PATH=$packages_db
 
 # Env hook to add packages to the package config
 addLibToPackageConf () {
-    local confFile=$1/nix-support/ghc-package.conf
-    if test -f $confFile; then
-        @ghc@/bin/ghc-pkg register $confFile
-    fi
+    local fn
+    shopt -s nullglob
+    for fn in $1/lib/ghc-pkgs/ghc-@ghcVersion@/*.conf; do
+        @ghc@/bin/ghc-pkg register $fn
+    done
 }
 
 envHooks=(${envHooks[@]} addLibToPackageConf)
diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix
index 020363d20a9..e0b70526501 100644
--- a/pkgs/development/compilers/ghc/wrapper.nix
+++ b/pkgs/development/compilers/ghc/wrapper.nix
@@ -11,4 +11,5 @@ stdenv.mkDerivation {
   setupHook = ./setup-hook.sh;
 
   inherit ghc;
+  ghcVersion = ghc.version;
 }
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index d76916963ba..c3b8037cd3b 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -79,8 +79,9 @@ attrs :
 
               ./Setup copy
 
-              ensureDir $out/nix-support              
-              ./Setup register --gen-pkg-config=$out/nix-support/ghc-package.conf
+              local confDir=$out/lib/ghc-pkgs/ghc-${attrs.ghc.ghc.version}
+              ensureDir $confDir
+              ./Setup register --gen-pkg-config=$confDir/${self.fname}.conf
               
               eval "$postInstall"
             '';
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5bb225e52ef..5619be1a6b7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1,12 +1,18 @@
 {pkgs, ghc}:
 
-let ghcOrig = ghc; in
+let ghcReal = ghc; in
 
 rec {
 
+  inherit ghcReal;
+
+  # In the remainder, `ghc' refers to the wrapper.  This is because
+  # it's never useful to use the wrapped GHC (`ghcReal'), as the
+  # wrapper provides essential functionality: the ability to find
+  # Haskell packages in the buildInputs automatically.
   ghc = import ../development/compilers/ghc/wrapper.nix {
     inherit (pkgs) stdenv;
-    ghc = ghcOrig;
+    ghc = ghcReal;
   };
 
   cabal = import ../development/libraries/haskell/cabal/cabal.nix {

From 306b6e87a5a0e772ad34749ce8744e1bd05b79cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 18 Apr 2009 23:31:45 +0000
Subject: [PATCH 04/58] Updating tcsh, so its url even works.

svn path=/nixpkgs/trunk/; revision=15137
---
 pkgs/shells/tcsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix
index f0ef071bb56..56f446c2e51 100644
--- a/pkgs/shells/tcsh/default.nix
+++ b/pkgs/shells/tcsh/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation {
-  name = "tcsh-6.15.00";
+  name = "tcsh-6.16.00";
   src = fetchurl {
-    url = ftp://ftp.funet.fi/pub/unix/shells/tcsh/tcsh-6.15.00.tar.gz;
-    sha256 = "1p5chgvj87m2dv4ci9qf4i81gav0lzr7rkcm320sj62z09ckxa6w";
+    url = ftp://ftp.funet.fi/pub/unix/shells/tcsh/tcsh-6.16.00.tar.gz;
+    sha256 = "1m0p8lqqna3vpf2k4x3hia3rlrz38av67x7hb4qsiq2kfpbbh0vn";
   };
   buildInputs = [ncurses];
 }

From 1643888f806976a1a0be791ece1e96497283753f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 19 Apr 2009 10:07:41 +0000
Subject: [PATCH 05/58] Added cabalized darcs-2 and associated Haskell libs.

svn path=/nixpkgs/trunk/; revision=15141
---
 .../version-management/darcs/darcs-2.nix      |  4 +-
 pkgs/development/compilers/ghc/setup-hook.sh  |  2 +-
 .../libraries/haskell/html/default.nix        | 11 ++++++
 .../libraries/haskell/mtl/default.nix         | 11 ++++++
 .../libraries/haskell/parsec/default.nix      | 11 ++++++
 .../libraries/haskell/regex-base/default.nix  | 12 ++++++
 .../haskell/regex-compat/default.nix          | 12 ++++++
 .../libraries/haskell/regex-posix/default.nix | 12 ++++++
 pkgs/top-level/haskell-packages.nix           | 37 +++++++++++++++++--
 9 files changed, 106 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/html/default.nix
 create mode 100644 pkgs/development/libraries/haskell/mtl/default.nix
 create mode 100644 pkgs/development/libraries/haskell/parsec/default.nix
 create mode 100644 pkgs/development/libraries/haskell/regex-base/default.nix
 create mode 100644 pkgs/development/libraries/haskell/regex-compat/default.nix
 create mode 100644 pkgs/development/libraries/haskell/regex-posix/default.nix

diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix
index 3de6bbfeea7..216f2c83580 100644
--- a/pkgs/applications/version-management/darcs/darcs-2.nix
+++ b/pkgs/applications/version-management/darcs/darcs-2.nix
@@ -1,10 +1,12 @@
-{cabal /* , ghc, zlib, ncurses, curl, perl */}:
+{cabal, html, mtl, parsec, regexCompat, zlib, curl} : /* , ghc, zlib, ncurses, curl, perl */
 
 cabal.mkDerivation (self : {
   pname = "darcs";
+  name = self.fname;
   version = "2.2.1";
   sha256 = "0iy4d4qls6yhwmgv87pz4kmr5jh4bwigz1wfwzns71b68csynnsp";
 
+  extraBuildInputs = [html mtl parsec regexCompat zlib curl];
   #buildInputs = [ghc zlib ncurses curl perl];
 
   #NIX_LDFLAGS = "-lz";
diff --git a/pkgs/development/compilers/ghc/setup-hook.sh b/pkgs/development/compilers/ghc/setup-hook.sh
index 5027d6536f1..11ad50a0c79 100644
--- a/pkgs/development/compilers/ghc/setup-hook.sh
+++ b/pkgs/development/compilers/ghc/setup-hook.sh
@@ -10,7 +10,7 @@ addLibToPackageConf () {
     local fn
     shopt -s nullglob
     for fn in $1/lib/ghc-pkgs/ghc-@ghcVersion@/*.conf; do
-        @ghc@/bin/ghc-pkg register $fn
+        @ghc@/bin/ghc-pkg register --force $fn
     done
 }
 
diff --git a/pkgs/development/libraries/haskell/html/default.nix b/pkgs/development/libraries/haskell/html/default.nix
new file mode 100644
index 00000000000..52c29e74e0b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/html/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "html";
+  version = "1.0.1.2";
+  sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061";
+  meta = {
+    description = "HTML combinator library";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/mtl/default.nix b/pkgs/development/libraries/haskell/mtl/default.nix
new file mode 100644
index 00000000000..c195d5cd7c3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mtl/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "mtl";
+  version = "1.1.0.2";
+  sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36";
+  meta = {
+    description = "Monad transformer library";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/parsec/default.nix b/pkgs/development/libraries/haskell/parsec/default.nix
new file mode 100644
index 00000000000..6b1d9ef2e3b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/parsec/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "parsec";
+  version = "2.1.0.1";
+  sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df";
+  meta = {
+    description = "Monadic parser combinators";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/regex-base/default.nix b/pkgs/development/libraries/haskell/regex-base/default.nix
new file mode 100644
index 00000000000..b82729057e7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-base/default.nix
@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-base";
+  version = "0.93.1";
+  sha256 = "24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Replaces/Ehances Text.Regex";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/regex-compat/default.nix b/pkgs/development/libraries/haskell/regex-compat/default.nix
new file mode 100644
index 00000000000..43c715d9185
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-compat/default.nix
@@ -0,0 +1,12 @@
+{cabal, regexBase, regexPosix}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-compat";
+  version = "0.92";
+  sha256 = "430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936";
+  propagatedBuildInputs = [regexBase regexPosix];
+  meta = {
+    description = "Replaces/Ehances Text.Regex";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/regex-posix/default.nix b/pkgs/development/libraries/haskell/regex-posix/default.nix
new file mode 100644
index 00000000000..3ee1f48d25a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-posix/default.nix
@@ -0,0 +1,12 @@
+{cabal, regexBase}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-posix";
+  version = "0.94.1";
+  sha256 = "63e76de0610d35f1b576ae65a25a38e04e758ed64b9b3512de95bdffd649485c";
+  extraBuildInputs = [regexBase];
+  meta = {
+    description = "Replaces/Ehances Text.Regex";
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5619be1a6b7..dded9bf3bec 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -79,15 +79,39 @@ rec {
     inherit (pkgs) sqlite;
   };
 
+  html = import ../development/libraries/haskell/html {
+    inherit cabal;
+  };
+
   monadlab = import ../development/libraries/haskell/monadlab {
     inherit cabal;
   };
 
+  mtl = import ../development/libraries/haskell/mtl {
+    inherit cabal;
+  };
+
+  parsec = import ../development/libraries/haskell/parsec {
+    inherit cabal;
+  };
+
   pcreLight = import ../development/libraries/haskell/pcre-light {
     inherit cabal;
     inherit (pkgs) pcre;
   };
 
+  regexBase = import ../development/libraries/haskell/regex-base {
+    inherit cabal mtl;
+  };
+
+  regexCompat = import ../development/libraries/haskell/regex-compat {
+    inherit cabal regexBase regexPosix;
+  };
+
+  regexPosix = import ../development/libraries/haskell/regex-posix {
+    inherit cabal regexBase;
+  };
+
   uuagc = import ../development/tools/haskell/uuagc {
     inherit cabal uulib;
   };
@@ -101,16 +125,20 @@ rec {
     inherit (pkgs) stdenv fetchurl unzip wxGTK;
   };
 
-  X11 = import ../development/libraries/haskell/X11 {
+  unix = import ../development/libraries/haskell/unix {
     inherit cabal;
-    inherit (pkgs.xlibs) libX11 libXinerama libXext;
-    xineramaSupport = true;
   };
 
   vty = import ../development/libraries/haskell/vty {
     inherit cabal;
   };
 
+  X11 = import ../development/libraries/haskell/X11 {
+    inherit cabal;
+    inherit (pkgs.xlibs) libX11 libXinerama libXext;
+    xineramaSupport = true;
+  };
+
   zlib = import ../development/libraries/haskell/zlib {
     inherit cabal zlib;
   };
@@ -150,7 +178,8 @@ rec {
   # Applications.
 
   darcs = import ../applications/version-management/darcs/darcs-2.nix {
-    inherit cabal;
+    inherit cabal html mtl parsec regexCompat;
+    inherit (pkgs) zlib curl;
   };
 
   xmobar = import ../applications/misc/xmobar {

From 80214b7be0e941bb966a2ff667300d08ee7ffc8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 19 Apr 2009 10:13:31 +0000
Subject: [PATCH 06/58] Removed unix package.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index dded9bf3bec..8a50ce73c27 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -125,10 +125,6 @@ rec {
     inherit (pkgs) stdenv fetchurl unzip wxGTK;
   };
 
-  unix = import ../development/libraries/haskell/unix {
-    inherit cabal;
-  };
-
   vty = import ../development/libraries/haskell/vty {
     inherit cabal;
   };

From 1c1967a9a13c262007def728b0699b27df7f8984 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Apr 2009 10:26:45 +0000
Subject: [PATCH 07/58] * Call the wrapper "ghc-wrapper".

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

diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix
index e0b70526501..932cf634301 100644
--- a/pkgs/development/compilers/ghc/wrapper.nix
+++ b/pkgs/development/compilers/ghc/wrapper.nix
@@ -1,7 +1,7 @@
 {stdenv, ghc}:
 
 stdenv.mkDerivation {
-  name = "${ghc.name}-wrapper";
+  name = "ghc-wrapper-${ghc.version}";
 
   propagatedBuildInputs = [ghc];
 

From c9a740bc265aca74d403f91296e3de230acfbd0d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Apr 2009 10:27:22 +0000
Subject: [PATCH 08/58] * Move the remaining GHC-dependent packages to
 haskell-packages.nix.

svn path=/nixpkgs/trunk/; revision=15144
---
 pkgs/top-level/all-packages.nix     | 101 +++++++++++++---------------
 pkgs/top-level/haskell-packages.nix |  18 +++++
 2 files changed, 65 insertions(+), 54 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69e545b3455..e955bbe0ee4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -886,10 +886,6 @@ let
     inherit fetchurl stdenv readline;
   };
 
-  lhs2tex = import ../tools/typesetting/lhs2tex {
-    inherit fetchurl stdenv ghc tetex polytable;
-  };
-
   libtorrent = import ../tools/networking/p2p/libtorrent {
     inherit fetchurl stdenv pkgconfig openssl libsigcxx;
   };
@@ -1692,7 +1688,7 @@ let
 
   ghcsAndLibs =
     assert builtins ? listToAttrs;
-    recurseIntoAttrs (import ../development/compilers/ghcs {
+    import ../development/compilers/ghcs {
       ghcboot = ghc642Binary;
       inherit fetchurl stdenv recurseIntoAttrs perl gnum4 gmp readline lib;
       inherit ghcPkgUtil ctags autoconf automake getConfig;
@@ -1702,7 +1698,7 @@ let
       # needed for install darcs ghc version
       happy = ghc68executables.happy;
       alex = ghc68executables.alex;
-    });
+    };
 
   # creates ghc-X-wl wich adds the passed libraries to the env var GHC_PACKAGE_PATH
   ghcWrapper = { ghcPackagedLibs ? false, ghc, libraries, name, suffix ? "ghc_wrapper_${ghc.name}" } :
@@ -1790,12 +1786,12 @@ let
 
 
   # Executables compiled by this ghc68 - I'm too lazy to add them all as additional file in here
-  ghc68executables = recurseIntoAttrs (import ../misc/ghc68executables {
+  ghc68executables = import ../misc/ghc68executables {
     inherit ghcCabalExecutableFun fetchurl lib bleedingEdgeRepos autoconf zlib getConfig;
     #inherit X11;
     inherit (xlibs) xmessage;
     inherit pkgs; # passing pkgs to add the possibility for the user to add his own executables. pkgs is passed.
-  });
+  };
 
   # the wrappers basically does one thing: It defines GHC_PACKAGE_PATH before calling ghc{i,-pkg}
   # So you can have different wrappers with different library combinations
@@ -1820,12 +1816,7 @@ let
       inherit ghc;
   };
 
-  ghc = ghc6102;
-
-  ghc642 = import ../development/compilers/ghc/6.4.2.nix {
-    inherit fetchurl stdenv perl ncurses readline m4 gmp;
-    ghc = ghc642Binary;
-  };
+  #ghc = haskellPackages.ghc;
 
   ghc642Binary = lowPrio (import ../development/compilers/ghc/6.4.2-binary.nix {
     inherit fetchurl stdenv ncurses gmp;
@@ -1833,53 +1824,63 @@ let
     perl = perl58;
   });
 
-  ghc661 = import ../development/compilers/ghc/6.6.1.nix {
-    inherit fetchurl stdenv readline perl58 gmp ncurses m4;
-    ghc = ghc642Binary;
-  };
-
-  ghc682 = import ../development/compilers/ghc/6.8.2.nix {
-    inherit fetchurl stdenv readline perl gmp ncurses m4;
-    ghc = ghc642Binary;
-  };
-
-  ghc683 = import ../development/compilers/ghc/6.8.3.nix {
-    inherit fetchurl stdenv readline perl gmp ncurses m4;
-    ghc = ghc642Binary;
-    haddock = import ../development/tools/documentation/haddock/boot.nix {
-      inherit gmp;
-      cabal = import ../development/libraries/haskell/cabal/cabal.nix {
-        inherit stdenv fetchurl;
-        ghc = ghc642Binary;
-      };
-    };
-  };
-
   ghc6101Binary = lowPrio (import ../development/compilers/ghc/6.10.1-binary.nix {
     inherit fetchurl stdenv perl ncurses gmp libedit;
   });
 
-  ghc6102 = import ../development/compilers/ghc/6.10.2.nix {
-    inherit fetchurl stdenv perl ncurses gmp libedit;
-    ghc = ghc6101Binary;
-  };
-
   ghc6102Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix {
     inherit fetchurl stdenv perl ncurses gmp libedit;
   });
 
-  haskellPackages = recurseIntoAttrs haskellPackages_ghc6102;
+  haskellPackages = haskellPackages_ghc6102;
 
-  haskellPackages_ghc6102 = import ./haskell-packages.nix {
+  haskellPackages_ghc642 = import ./haskell-packages.nix {
     inherit pkgs;
-    ghc = ghc6102;
+    ghc = import ../development/compilers/ghc/6.4.2.nix {
+      inherit fetchurl stdenv perl ncurses readline m4 gmp;
+      ghc = ghc642Binary;
+    };
   };
 
-  haskellPackages_ghc683 = import ./haskell-packages.nix {
+  haskellPackages_ghc661 = import ./haskell-packages.nix {
     inherit pkgs;
-    ghc = ghc683;
+    ghc = import ../development/compilers/ghc/6.6.1.nix {
+      inherit fetchurl stdenv readline perl58 gmp ncurses m4;
+      ghc = ghc642Binary;
+    };
   };
 
+  haskellPackages_ghc682 = import ./haskell-packages.nix {
+    inherit pkgs;
+    ghc = import ../development/compilers/ghc/6.8.2.nix {
+      inherit fetchurl stdenv readline perl gmp ncurses m4;
+      ghc = ghc642Binary;
+    };
+  };
+  
+  haskellPackages_ghc683 = recurseIntoAttrs (import ./haskell-packages.nix {
+    inherit pkgs;
+    ghc = import ../development/compilers/ghc/6.8.3.nix {
+      inherit fetchurl stdenv readline perl gmp ncurses m4;
+      ghc = ghc642Binary;
+      haddock = import ../development/tools/documentation/haddock/boot.nix {
+        inherit gmp;
+        cabal = import ../development/libraries/haskell/cabal/cabal.nix {
+          inherit stdenv fetchurl;
+          ghc = ghc642Binary;
+        };
+      };
+    };
+  });
+
+  haskellPackages_ghc6102 = recurseIntoAttrs (import ./haskell-packages.nix {
+    inherit pkgs;
+    ghc = import ../development/compilers/ghc/6.10.2.nix {
+      inherit fetchurl stdenv perl ncurses gmp libedit;
+      ghc = ghc6101Binary;
+    };
+  });
+
   gprolog = import ../development/compilers/gprolog {
     inherit fetchurl stdenv;
   };
@@ -1891,10 +1892,6 @@ let
     libstdcpp5 = gcc33.gcc;
   };
 
-  helium = import ../development/compilers/helium {
-    inherit fetchurl stdenv ghc;
-  };
-
   ikarus = builderDefsPackage (selectVersion ../development/compilers/ikarus "0.0.3") {
     inherit gmp;
   };
@@ -2476,10 +2473,6 @@ let
     inherit fetchurl stdenv yacc;
   };
 
-  frown = import ../development/tools/parsing/frown {
-    inherit fetchurl stdenv ghc;
-  };
-
   m4 = gnum4;
 
   gnum4 = import ../development/tools/misc/gnum4 {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8a50ce73c27..3c6049bd3c4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -147,6 +147,11 @@ rec {
     inherit (pkgs) fetchsvn stdenv coreutils m4 libtool llvm;
   };
 
+  helium = import ../development/compilers/helium {
+    inherit ghc;
+    inherit (pkgs) fetchurl stdenv;
+  };
+
 
   # Development tools.
 
@@ -155,6 +160,11 @@ rec {
     inherit (pkgs) perl;
   };
 
+  frown = import ../development/tools/parsing/frown {
+    inherit ghc;
+    inherit (pkgs) fetchurl stdenv;
+  };
+
   # old version of haddock, still more stable than 2.0
   haddock09 = import ../development/tools/documentation/haddock/haddock-0.9.nix {
     inherit cabal;
@@ -192,4 +202,12 @@ rec {
     inherit cabal xmonad X11;
   };
 
+
+  # Tools.
+
+  lhs2tex = import ../tools/typesetting/lhs2tex {
+    inherit ghc;
+    inherit (pkgs) fetchurl stdenv tetex polytable;
+  };
+
 }

From e0b8a630a8a682fd7903990bf4b3292beb67b1cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 19 Apr 2009 11:20:51 +0000
Subject: [PATCH 09/58] Fixing boost for a problem related to a "class R
 shadowing template...". Taken from:
 http://wiki.freebsd.org/BoostPortingProject

svn path=/nixpkgs/trunk/; revision=15146
---
 pkgs/development/libraries/boost/1.38.0.nix   |  2 ++
 pkgs/development/libraries/boost/classr.patch | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/boost/classr.patch

diff --git a/pkgs/development/libraries/boost/1.38.0.nix b/pkgs/development/libraries/boost/1.38.0.nix
index 0a01ca80e78..739291a0574 100644
--- a/pkgs/development/libraries/boost/1.38.0.nix
+++ b/pkgs/development/libraries/boost/1.38.0.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation {
     url = "mirror://sourceforge/boost/boost_1_38_0.tar.bz2";
     sha256 = "0rk044s4m7l4sma6anml34vxcd9w0fzcy1cy7csbzynjyida9qry";
   };
+
+  patches = [ ./classr.patch ];
   
   buildInputs = [icu expat zlib bzip2 python];
 
diff --git a/pkgs/development/libraries/boost/classr.patch b/pkgs/development/libraries/boost/classr.patch
new file mode 100644
index 00000000000..fbe38308696
--- /dev/null
+++ b/pkgs/development/libraries/boost/classr.patch
@@ -0,0 +1,15 @@
+Taken from http://wiki.freebsd.org/BoostPortingProject
+--- boost1.38/boost/function/function_template.hpp.orig   2008-10-16 17:21:50.000000000 +0400
++++ boost1.38_2/boost/function/function_template.hpp        2009-03-25 04:12:15.000000000 +0300
+@@ -950,10 +950,10 @@
+           f.vtable->manager(f.functor, this->functor,
+                             boost::detail::function::move_functor_tag);
+ 		  f.vtable = 0;
+-#if !defined(BOOST_NO_EXCEPTIONS)      
+         } else {
+           clear();
+         }
++#if !defined(BOOST_NO_EXCEPTIONS)      
+       } catch (...) {
+         vtable = 0;
+         throw;

From 5cfba3ac68fbe20c795554bce08fd1cfdc482c8b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Apr 2009 11:43:38 +0000
Subject: [PATCH 10/58] * Added GHC 6.10.1.

svn path=/nixpkgs/trunk/; revision=15147
---
 pkgs/development/compilers/ghc/6.10.1.nix | 27 +++++++++++++++++++++++
 pkgs/development/compilers/ghc/6.10.2.nix |  1 -
 pkgs/top-level/all-packages.nix           |  8 +++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/ghc/6.10.1.nix

diff --git a/pkgs/development/compilers/ghc/6.10.1.nix b/pkgs/development/compilers/ghc/6.10.1.nix
new file mode 100644
index 00000000000..deca9d19f1d
--- /dev/null
+++ b/pkgs/development/compilers/ghc/6.10.1.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, libedit, ghc, perl, gmp, ncurses}:
+
+stdenv.mkDerivation rec {
+  version = "6.10.1";
+  
+  name = "ghc-${version}";
+  
+  homepage = "http://haskell.org/ghc";
+
+  src = fetchurl {
+    url = "${homepage}/dist/${version}/${name}-src.tar.bz2";
+    sha256 = "16q08cxxsmh4hgjhvkl739pc1hh81gljycfq1d2z6m1ld3jpbi22";
+  };
+
+  buildInputs = [ghc libedit perl gmp];
+
+  configureFlags=[
+    "--with-gmp-libraries=${gmp}/lib"
+    "--with-gmp-includes=${gmp}/include"
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  meta = {
+    inherit homepage;
+    description = "The Glasgow Haskell Compiler";
+  };
+}
diff --git a/pkgs/development/compilers/ghc/6.10.2.nix b/pkgs/development/compilers/ghc/6.10.2.nix
index 9420e9fea4a..8568c566145 100644
--- a/pkgs/development/compilers/ghc/6.10.2.nix
+++ b/pkgs/development/compilers/ghc/6.10.2.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
   configureFlags=[
     "--with-gmp-libraries=${gmp}/lib"
     "--with-gmp-includes=${gmp}/include"
-    #"--with-readline-libraries=${readline}/lib"
     "--with-gcc=${stdenv.gcc}/bin/gcc"
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e955bbe0ee4..97ac20c2b05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1873,6 +1873,14 @@ let
     };
   });
 
+  haskellPackages_ghc6101 = recurseIntoAttrs (import ./haskell-packages.nix {
+    inherit pkgs;
+    ghc = import ../development/compilers/ghc/6.10.1.nix {
+      inherit fetchurl stdenv perl ncurses gmp libedit;
+      ghc = ghc6101Binary;
+    };
+  });
+
   haskellPackages_ghc6102 = recurseIntoAttrs (import ./haskell-packages.nix {
     inherit pkgs;
     ghc = import ../development/compilers/ghc/6.10.2.nix {

From b148543c3e1eb59995034b881be638744acc43e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 19 Apr 2009 11:44:37 +0000
Subject: [PATCH 11/58] Towards Haskell Platform support.

svn path=/nixpkgs/trunk/; revision=15148
---
 .../libraries/haskell/HUnit/default.nix       | 11 ++++
 .../libraries/haskell/QuickCheck/default.nix  | 11 ++++
 .../libraries/haskell/cabal/cabal.nix         |  2 +-
 .../libraries/haskell/haskell-src/default.nix | 12 +++++
 .../libraries/haskell/html/default.nix        |  2 +-
 .../libraries/haskell/mtl/default.nix         |  2 +-
 .../libraries/haskell/network/default.nix     | 12 +++++
 .../libraries/haskell/parallel/default.nix    | 11 ++++
 .../libraries/haskell/parsec/default.nix      |  2 +-
 .../libraries/haskell/regex-base/default.nix  |  4 +-
 .../haskell/regex-compat/default.nix          |  6 +--
 .../libraries/haskell/regex-posix/default.nix |  6 +--
 .../libraries/haskell/xhtml/default.nix       | 11 ++++
 .../tools/parsing/happy/happy-1.18.2.nix      | 13 +++++
 pkgs/top-level/haskell-packages.nix           | 52 +++++++++++++++++--
 15 files changed, 140 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/HUnit/default.nix
 create mode 100644 pkgs/development/libraries/haskell/QuickCheck/default.nix
 create mode 100644 pkgs/development/libraries/haskell/haskell-src/default.nix
 create mode 100644 pkgs/development/libraries/haskell/network/default.nix
 create mode 100644 pkgs/development/libraries/haskell/parallel/default.nix
 create mode 100644 pkgs/development/libraries/haskell/xhtml/default.nix
 create mode 100644 pkgs/development/tools/parsing/happy/happy-1.18.2.nix

diff --git a/pkgs/development/libraries/haskell/HUnit/default.nix b/pkgs/development/libraries/haskell/HUnit/default.nix
new file mode 100644
index 00000000000..a6f66eefad6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HUnit/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "HUnit";
+  version = "1.2.0.3"; # Haskell Platform 2009.0.0
+  sha256 = "954f584f7c096c3ddef677e70b3811195bb4fd18dfdb4727a260ca7d7465de12";
+  meta = {
+    description = "A unit testing framework for Haskell";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/QuickCheck/default.nix b/pkgs/development/libraries/haskell/QuickCheck/default.nix
new file mode 100644
index 00000000000..5405e50aa6b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/QuickCheck/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "QuickCheck";
+  version = "1.2.0.0"; # Haskell Platform 2009.0.0
+  sha256 = "21672d817913ac7ab6d3fd7f102dd5d0f115a0826c95b9604c8c0b0171e8d4ed";
+  meta = {
+    description = "Automatic testing of Haskell programs";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index c3b8037cd3b..0c976ca2322 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -49,7 +49,7 @@ attrs :
 
               for i in ${toString self.patchLibFiles}; do
                 echo "patching $i"
-                test -f $i && sed -i '/[eE]xtra-[lL]ibraries/ { s|\( *\)[eE]xtra-[lL]ibraries.*|&\n\1extra-lib-dirs: ${toString self.extraLibDirs}| }' $i
+                test -f $i && sed -i '/[eE]xtra-[lL]ibraries/ { s|^\( *\)[eE]xtra-[lL]ibraries.*|&\n\1extra-lib-dirs: ${toString self.extraLibDirs}| }' $i
               done
               for i in Setup.hs Setup.lhs; do
                 test -f $i && ghc --make $i
diff --git a/pkgs/development/libraries/haskell/haskell-src/default.nix b/pkgs/development/libraries/haskell/haskell-src/default.nix
new file mode 100644
index 00000000000..365138b28a7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-src/default.nix
@@ -0,0 +1,12 @@
+{cabal, happy}:
+
+cabal.mkDerivation (self : {
+  pname = "haskell-src";
+  version = "1.0.1.3"; # Haskell Platform 2009.0.0
+  sha256 = "a7872900acd2293775a6bdc6dc8f70438ccd80e62d2d1e2394ddff15b1883e89";
+  extraBuildInputs = [happy];
+  meta = {
+    description = "Manipulating Haskell source code";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/html/default.nix b/pkgs/development/libraries/haskell/html/default.nix
index 52c29e74e0b..024985c8269 100644
--- a/pkgs/development/libraries/haskell/html/default.nix
+++ b/pkgs/development/libraries/haskell/html/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "html";
-  version = "1.0.1.2";
+  version = "1.0.1.2"; # Haskell Platform 2009.0.0
   sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061";
   meta = {
     description = "HTML combinator library";
diff --git a/pkgs/development/libraries/haskell/mtl/default.nix b/pkgs/development/libraries/haskell/mtl/default.nix
index c195d5cd7c3..5881a2cd3df 100644
--- a/pkgs/development/libraries/haskell/mtl/default.nix
+++ b/pkgs/development/libraries/haskell/mtl/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "mtl";
-  version = "1.1.0.2";
+  version = "1.1.0.2"; # Haskell Platform 2009.0.0
   sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36";
   meta = {
     description = "Monad transformer library";
diff --git a/pkgs/development/libraries/haskell/network/default.nix b/pkgs/development/libraries/haskell/network/default.nix
new file mode 100644
index 00000000000..16f4ce12d7a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network/default.nix
@@ -0,0 +1,12 @@
+{cabal, parsec}:
+
+cabal.mkDerivation (self : {
+  pname = "network";
+  version = "2.2.1"; # Haskell Platform 2009.0.0
+  sha256 = "111e4963a0a979570993e79511a778b267ef58df35320d1ddda61a869259b63c";
+  propagatedBuildInputs = [parsec];
+  meta = {
+    description = "Networking-related facilities";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/parallel/default.nix b/pkgs/development/libraries/haskell/parallel/default.nix
new file mode 100644
index 00000000000..065344d75fa
--- /dev/null
+++ b/pkgs/development/libraries/haskell/parallel/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "parallel";
+  version = "1.1.0.1"; # Haskell Platform 2009.0.0
+  sha256 = "0885086660268f3626effacb29a02b5c81f3e5a8dfa99dabe0981ddbc407999f";
+  meta = {
+    description = "parallel programming library";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/parsec/default.nix b/pkgs/development/libraries/haskell/parsec/default.nix
index 6b1d9ef2e3b..e0564d5720d 100644
--- a/pkgs/development/libraries/haskell/parsec/default.nix
+++ b/pkgs/development/libraries/haskell/parsec/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "parsec";
-  version = "2.1.0.1";
+  version = "2.1.0.1"; # Haskell Platform 2009.0.0
   sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df";
   meta = {
     description = "Monadic parser combinators";
diff --git a/pkgs/development/libraries/haskell/regex-base/default.nix b/pkgs/development/libraries/haskell/regex-base/default.nix
index b82729057e7..afb08ebee0d 100644
--- a/pkgs/development/libraries/haskell/regex-base/default.nix
+++ b/pkgs/development/libraries/haskell/regex-base/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "regex-base";
-  version = "0.93.1";
-  sha256 = "24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef";
+  version = "0.72.0.2"; # Haskell Platform 2009.0.0
+  sha256 = "38a4901b942fea646a422d52c52ef14eec4d6561c258b3c54cd96a8a354141ee";
   propagatedBuildInputs = [mtl];
   meta = {
     description = "Replaces/Ehances Text.Regex";
diff --git a/pkgs/development/libraries/haskell/regex-compat/default.nix b/pkgs/development/libraries/haskell/regex-compat/default.nix
index 43c715d9185..85a725264f8 100644
--- a/pkgs/development/libraries/haskell/regex-compat/default.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self : {
   pname = "regex-compat";
-  version = "0.92";
-  sha256 = "430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936";
+  version = "0.71.0.1"; # Haskell Platform 2009.0.0
+  sha256 = "904552f7d690686b2602f37494827d09b09fc0a8a2565522b61847bec8d1de8d";
   propagatedBuildInputs = [regexBase regexPosix];
   meta = {
-    description = "Replaces/Ehances Text.Regex";
+    description = "Replaces/Enhances Text.Regex";
   };
 })  
 
diff --git a/pkgs/development/libraries/haskell/regex-posix/default.nix b/pkgs/development/libraries/haskell/regex-posix/default.nix
index 3ee1f48d25a..07980b1a1e1 100644
--- a/pkgs/development/libraries/haskell/regex-posix/default.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self : {
   pname = "regex-posix";
-  version = "0.94.1";
-  sha256 = "63e76de0610d35f1b576ae65a25a38e04e758ed64b9b3512de95bdffd649485c";
+  version = "0.72.0.3"; # Haskell Platform 2009.0.0
+  sha256 = "327ab87f3d4f5315a9414331eb382b8b997de8836d577c3f7d232c574606feb1";
   extraBuildInputs = [regexBase];
   meta = {
-    description = "Replaces/Ehances Text.Regex";
+    description = "Replaces/Enhances Text.Regex";
   };
 })  
 
diff --git a/pkgs/development/libraries/haskell/xhtml/default.nix b/pkgs/development/libraries/haskell/xhtml/default.nix
new file mode 100644
index 00000000000..916b57e3263
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xhtml/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "xhtml";
+  version = "3000.2.0.1"; # Haskell Platform 2009.0.0
+  sha256 = "60d7a44ae6d607475e2d60c5bf9909b8a3bd88850d52b08ff1532aa6d58bec96";
+  meta = {
+    description = "An XHTML combinator library";
+  };
+})  
+
diff --git a/pkgs/development/tools/parsing/happy/happy-1.18.2.nix b/pkgs/development/tools/parsing/happy/happy-1.18.2.nix
new file mode 100644
index 00000000000..889630a5e9b
--- /dev/null
+++ b/pkgs/development/tools/parsing/happy/happy-1.18.2.nix
@@ -0,0 +1,13 @@
+{cabal, mtl, perl}:
+
+cabal.mkDerivation (self : {
+  pname = "happy";
+  version = "1.18.2"; # Haskell Platform 2009.0.0
+  name = self.fname;
+  sha256 = "7515922f3cfd32cd844a0abfefe0b4871f403f0d869b8644bf9cbfc0b67996ae";
+  extraBuildInputs = [perl];
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Happy is a parser generator for Haskell";
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3c6049bd3c4..448b5e0c890 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -27,14 +27,14 @@ rec {
     inherit cabal;
   };
 
-  maybench = import ../development/libraries/haskell/maybench {
-    inherit cabal benchpress;
-  };
-
   binary = import ../development/libraries/haskell/binary {
     inherit cabal;
   };
 
+  cgi = import ../development/libraries/haskell/cgi {
+    inherit cabal mtl network parsec xhtml;
+  };
+
   Crypto = import ../development/libraries/haskell/Crypto {
     inherit cabal;
   };
@@ -43,11 +43,19 @@ rec {
     inherit (pkgs) libedit;
     inherit cabal;
   };
+
+  fgl = import ../development/libraries/haskell/fgl {
+    inherit cabal mtl;
+  };
   
   gtk2hs = import ../development/libraries/haskell/gtk2hs {
     inherit (pkgs) pkgconfig stdenv fetchurl cairo ghc;
     inherit (pkgs.gnome) gtk glib GConf libglade libgtkhtml gtkhtml;
   };
+
+  haskellSrc = import ../development/libraries/haskell/haskell-src {
+    inherit cabal happy;
+  };
   
   HTTP = import ../development/libraries/haskell/HTTP {
     inherit cabal;
@@ -83,6 +91,14 @@ rec {
     inherit cabal;
   };
 
+  HUnit = import ../development/libraries/haskell/HUnit {
+    inherit cabal;
+  };
+
+  maybench = import ../development/libraries/haskell/maybench {
+    inherit cabal benchpress;
+  };
+
   monadlab = import ../development/libraries/haskell/monadlab {
     inherit cabal;
   };
@@ -91,6 +107,14 @@ rec {
     inherit cabal;
   };
 
+  network = import ../development/libraries/haskell/network {
+    inherit cabal parsec;
+  };
+
+  parallel = import ../development/libraries/haskell/parallel {
+    inherit cabal;
+  };
+
   parsec = import ../development/libraries/haskell/parsec {
     inherit cabal;
   };
@@ -100,6 +124,10 @@ rec {
     inherit (pkgs) pcre;
   };
 
+  QuickCheck = import ../development/libraries/haskell/QuickCheck {
+    inherit cabal;
+  };
+
   regexBase = import ../development/libraries/haskell/regex-base {
     inherit cabal mtl;
   };
@@ -112,6 +140,10 @@ rec {
     inherit cabal regexBase;
   };
 
+  stm = import ../development/libraries/haskell/stm {
+    inherit cabal;
+  };
+
   uuagc = import ../development/tools/haskell/uuagc {
     inherit cabal uulib;
   };
@@ -135,6 +167,10 @@ rec {
     xineramaSupport = true;
   };
 
+  xhtml = import ../development/libraries/haskell/xhtml {
+    inherit cabal;
+  };
+
   zlib = import ../development/libraries/haskell/zlib {
     inherit cabal zlib;
   };
@@ -175,11 +211,17 @@ rec {
     inherit cabal;
   });
 
-  happy = import ../development/tools/parsing/happy/happy-1.17.nix {
+  happy = happy1182;
+
+  happy117 = import ../development/tools/parsing/happy/happy-1.17.nix {
     inherit cabal;
     inherit (pkgs) perl;
   };
 
+  happy1182 = import ../development/tools/parsing/happy/happy-1.18.2.nix {
+    inherit cabal mtl;
+    inherit (pkgs) perl;
+  };
 
   # Applications.
 

From ffbb7c03d587eef63df0d6426199cb89a2671bd5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Apr 2009 11:47:01 +0000
Subject: [PATCH 12/58] * Removed applications/msic, a rather obvious typo.

svn path=/nixpkgs/trunk/; revision=15149
---
 .../{applications/msic => tools/misc}/ttf2pt1/default.nix | 0
 .../msic => tools/misc}/ttf2pt1/gentoo-makefile.patch     | 0
 pkgs/top-level/all-packages.nix                           | 8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/{applications/msic => tools/misc}/ttf2pt1/default.nix (100%)
 rename pkgs/{applications/msic => tools/misc}/ttf2pt1/gentoo-makefile.patch (100%)

diff --git a/pkgs/applications/msic/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix
similarity index 100%
rename from pkgs/applications/msic/ttf2pt1/default.nix
rename to pkgs/tools/misc/ttf2pt1/default.nix
diff --git a/pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch b/pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch
similarity index 100%
rename from pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch
rename to pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97ac20c2b05..5c48c02f0e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1326,6 +1326,10 @@ let
     inherit fetchurl stdenv ncurses;
   };
 
+  ttf2pt1 = import ../tools/misc/ttf2pt1 {
+    inherit fetchurl stdenv perl freetype;
+  };
+
   ucl = import ../development/libraries/ucl {
     inherit fetchurl stdenv;
   };
@@ -1374,10 +1378,6 @@ let
     wxGTK = wxGTK28;
   };
 
-  ttf2pt1 = import ../applications/msic/ttf2pt1 {
-    inherit fetchurl stdenv perl freetype;
-  };
-
   ttmkfdir = import ../tools/misc/ttmkfdir {
     inherit debPackage freetype fontconfig libunwind libtool bison;
     flex = flex2534;

From 35ac4163280c684e9a1bdc820ab9c629a1d8fa32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 19 Apr 2009 13:21:40 +0000
Subject: [PATCH 13/58] More Haskell platform packages.

svn path=/nixpkgs/trunk/; revision=15151
---
 .../version-management/darcs/darcs-2.nix            |  5 +----
 pkgs/development/libraries/haskell/HTTP/default.nix |  7 ++++---
 pkgs/development/libraries/haskell/cgi/default.nix  | 12 ++++++++++++
 pkgs/development/libraries/haskell/fgl/default.nix  | 12 ++++++++++++
 pkgs/development/libraries/haskell/stm/default.nix  | 11 +++++++++++
 pkgs/development/libraries/haskell/time/default.nix | 11 +++++++++++
 pkgs/development/libraries/haskell/zlib/default.nix |  6 ++++--
 .../package-management/cabal-install/default.nix    | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 | 13 +++++++++++--
 9 files changed, 79 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/cgi/default.nix
 create mode 100644 pkgs/development/libraries/haskell/fgl/default.nix
 create mode 100644 pkgs/development/libraries/haskell/stm/default.nix
 create mode 100644 pkgs/development/libraries/haskell/time/default.nix
 create mode 100644 pkgs/tools/package-management/cabal-install/default.nix

diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix
index 216f2c83580..c0efa78553b 100644
--- a/pkgs/applications/version-management/darcs/darcs-2.nix
+++ b/pkgs/applications/version-management/darcs/darcs-2.nix
@@ -1,4 +1,4 @@
-{cabal, html, mtl, parsec, regexCompat, zlib, curl} : /* , ghc, zlib, ncurses, curl, perl */
+{cabal, html, mtl, parsec, regexCompat, zlib, curl} :
 
 cabal.mkDerivation (self : {
   pname = "darcs";
@@ -7,9 +7,6 @@ cabal.mkDerivation (self : {
   sha256 = "0iy4d4qls6yhwmgv87pz4kmr5jh4bwigz1wfwzns71b68csynnsp";
 
   extraBuildInputs = [html mtl parsec regexCompat zlib curl];
-  #buildInputs = [ghc zlib ncurses curl perl];
-
-  #NIX_LDFLAGS = "-lz";
 
   meta = {
     homepage = http://darcs.net/;
diff --git a/pkgs/development/libraries/haskell/HTTP/default.nix b/pkgs/development/libraries/haskell/HTTP/default.nix
index 1d3f0f1a9bc..e630a3c72de 100644
--- a/pkgs/development/libraries/haskell/HTTP/default.nix
+++ b/pkgs/development/libraries/haskell/HTTP/default.nix
@@ -1,9 +1,10 @@
-{cabal}:
+{cabal, mtl, network, parsec}:
 
 cabal.mkDerivation (self : {
   pname = "HTTP";
-  version = "3001.0.0";
-  sha256 = "0d1ixrylb7vl5q963r31jc8gsqm24bkjas4dyi6ks8kbhzrgrw17";
+  version = "4000.0.5"; # Haskell Platform 2009.0.0
+  sha256 = "54cbb211e73f183aa91780afd6cc7c830edef1b2eb5ce8dc05e5fa539bb685d8";
+  propagatedBuildInputs = [mtl network parsec];
   meta = {
     description = "a Haskell library for client-side HTTP";
   };
diff --git a/pkgs/development/libraries/haskell/cgi/default.nix b/pkgs/development/libraries/haskell/cgi/default.nix
new file mode 100644
index 00000000000..e6e5bd91df6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cgi/default.nix
@@ -0,0 +1,12 @@
+{cabal, mtl, network, parsec, xhtml}:
+
+cabal.mkDerivation (self : {
+  pname = "cgi";
+  version = "3001.1.7.1"; # Haskell Platform 2009.0.0
+  sha256 = "7d1d710871fffbbec2a33d7288b2959ddbcfd794d47f0122127576c02550b339";
+  propagatedBuildInputs = [mtl network parsec xhtml];
+  meta = {
+    description = "A library for writing CGI programs";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/fgl/default.nix b/pkgs/development/libraries/haskell/fgl/default.nix
new file mode 100644
index 00000000000..062e0a5ac59
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fgl/default.nix
@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "fgl";
+  version = "5.4.2.2";
+  sha256 = "8232c337f0792854bf2a12a5fd1bc46726fff05d2f599053286ff873364cd7d2";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Martin Erwig's Functional Graph Library";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/stm/default.nix b/pkgs/development/libraries/haskell/stm/default.nix
new file mode 100644
index 00000000000..707fd980cbf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "stm";
+  version = "2.1.1.2"; # Haskell Platform 2009.0.0
+  sha256 = "68d550067ae180373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d";
+  meta = {
+    description = "Software Transactional Memory";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/time/default.nix b/pkgs/development/libraries/haskell/time/default.nix
new file mode 100644
index 00000000000..24b78a54ed8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/time/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "time";
+  version = "1.1.2.4"; # Haskell Platform 2009.0.0
+  sha256 = "11dfcb9b5ca76428a7a31019928c3c1898320f774e5d3df8e4407580d074fad3";
+  meta = {
+    description = "A time library";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/zlib/default.nix b/pkgs/development/libraries/haskell/zlib/default.nix
index 268a43b5ea3..f034e43160a 100644
--- a/pkgs/development/libraries/haskell/zlib/default.nix
+++ b/pkgs/development/libraries/haskell/zlib/default.nix
@@ -2,8 +2,10 @@
 
 cabal.mkDerivation (self : {
   pname = "zlib";
-  version = "0.4.0.2";
-  sha256 = "e6e9e51ca5b7f1685eb031f826f7865acc10cc2c8d0dfad975e0e81fd17f17ed";
+  version = "0.5.0.0"; # Haskell Platform 2009.0.0
+  sha256 = "20e067cfbec87ec062ac144875a60e158ea6cf7836aac031ec367fcdd5446891";
+  # TODO: find out exactly why propagated is needed here (to build other
+  # packages depending on zlib):
   propagatedBuildInputs = [zlib];
   meta = {
     description = "Compression and decompression in the gzip and zlib formats";
diff --git a/pkgs/tools/package-management/cabal-install/default.nix b/pkgs/tools/package-management/cabal-install/default.nix
new file mode 100644
index 00000000000..aafafab453d
--- /dev/null
+++ b/pkgs/tools/package-management/cabal-install/default.nix
@@ -0,0 +1,13 @@
+{cabal, HTTP, network, zlib} :
+
+cabal.mkDerivation (self : {
+  pname = "cabal-install";
+  name = self.fname;
+  version = "0.6.2"; # Haskell Platform 2009.0.0
+  sha256 = "d8ea91bd0a2a624ab1cf52ddfe48cef02b532bb5e2fcda3fd72ca51efc04b41a";
+  extraBuildInputs = [HTTP network zlib];
+
+  meta = {
+    description = "The command-line interface for Cabal and Hackage";
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 448b5e0c890..08e850c5d79 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -58,7 +58,7 @@ rec {
   };
   
   HTTP = import ../development/libraries/haskell/HTTP {
-    inherit cabal;
+    inherit cabal mtl network parsec;
   };
 
   haxr = import ../development/libraries/haskell/haxr {
@@ -144,6 +144,10 @@ rec {
     inherit cabal;
   };
 
+  time = import ../development/libraries/haskell/time {
+    inherit cabal;
+  };
+
   uuagc = import ../development/tools/haskell/uuagc {
     inherit cabal uulib;
   };
@@ -172,7 +176,8 @@ rec {
   };
 
   zlib = import ../development/libraries/haskell/zlib {
-    inherit cabal zlib;
+    inherit cabal;
+    inherit (pkgs) zlib;
   };
 
 
@@ -247,6 +252,10 @@ rec {
 
   # Tools.
 
+  cabalInstall = import ../tools/package-management/cabal-install {
+    inherit cabal HTTP network zlib;
+  };
+
   lhs2tex = import ../tools/typesetting/lhs2tex {
     inherit ghc;
     inherit (pkgs) fetchurl stdenv tetex polytable;

From 0348315adde4abcd83dfaf2c7f0aaf2f68e2dcc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 19 Apr 2009 13:33:13 +0000
Subject: [PATCH 14/58] Updating cromfs.

svn path=/nixpkgs/trunk/; revision=15152
---
 pkgs/tools/archivers/cromfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix
index f243bd89d7c..4d09d9aace3 100644
--- a/pkgs/tools/archivers/cromfs/default.nix
+++ b/pkgs/tools/archivers/cromfs/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, fuse, perl}:
 
 stdenv.mkDerivation {
-  name = "cromfs-1.5.7";
+  name = "cromfs-1.5.8.6";
   src = fetchurl {
-    url = http://bisqwit.iki.fi/src/arch/cromfs-1.5.7.tar.bz2;
-    sha256 = "7df900cd5d2656e0d2a9cdfb6da7dd194eef2e2a34537f7f69a56dc08a0c0deb";
+    url = http://bisqwit.iki.fi/src/arch/cromfs-1.5.8.6.tar.bz2;
+    sha256 = "00m362q0b7z1688pjhvnbr14y3p1lgaymq5k9r42z3blzw8mgmay";
   };
 
   patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure; set -x'';

From 12a05f16380e0c2a48c7dd3196dcbdb218ca52e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 19 Apr 2009 13:38:34 +0000
Subject: [PATCH 15/58] More Haskell Platform.

svn path=/nixpkgs/trunk/; revision=15153
---
 .../libraries/haskell/ghc-paths/default.nix          | 11 +++++++++++
 .../tools/documentation/haddock/haddock-2.4.2.nix    | 12 ++++++++++++
 pkgs/development/tools/parsing/alex/default.nix      |  4 ++--
 pkgs/top-level/haskell-packages.nix                  |  8 ++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/ghc-paths/default.nix
 create mode 100644 pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix

diff --git a/pkgs/development/libraries/haskell/ghc-paths/default.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix
new file mode 100644
index 00000000000..dadd195acfe
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghc-paths/default.nix
@@ -0,0 +1,11 @@
+{ cabal } :
+
+cabal.mkDerivation (self : {
+  pname = "ghc-paths";
+  version = "0.1.0.5";
+  sha256 = "ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10";
+  meta = {
+    description = "Knowledge of GHC's installations directories";
+  };
+})  
+
diff --git a/pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix b/pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix
new file mode 100644
index 00000000000..f3290d15fd6
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix
@@ -0,0 +1,12 @@
+{cabal, ghcPaths}:
+
+cabal.mkDerivation (self : {
+  pname = "haddock";
+  version = "2.4.2"; # Haskell Platform 2009.0.0
+  name = self.fname;
+  sha256 = "dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547";
+  propagatedBuildInputs = [ghcPaths];
+  meta = {
+    description = "a tool for automatically generating documentation from annotated Haskell source code";
+  };
+})
diff --git a/pkgs/development/tools/parsing/alex/default.nix b/pkgs/development/tools/parsing/alex/default.nix
index 273a25753e8..aab99629b31 100644
--- a/pkgs/development/tools/parsing/alex/default.nix
+++ b/pkgs/development/tools/parsing/alex/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self : {
   pname = "alex";
-  version = "2.2";
+  version = "2.3.1"; # Haskell Platform 2009.0.0
   name = self.fname;
-  sha256 = "e958d4fc6cfdb1d351dc39a45ea882f23b1b1773a736d43814a52d4939a41ffe";
+  sha256 = "cdd42fd992a72fedeff1f38debc21aa315d90dc070f0945d7819c0bccd549a44";
   extraBuildInputs = [perl];
   meta = {
     description = "A lexical analyser generator for Haskell";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 08e850c5d79..8e266f4ba99 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -47,6 +47,10 @@ rec {
   fgl = import ../development/libraries/haskell/fgl {
     inherit cabal mtl;
   };
+
+  ghcPaths = import ../development/libraries/haskell/ghc-paths {
+    inherit cabal;
+  };
   
   gtk2hs = import ../development/libraries/haskell/gtk2hs {
     inherit (pkgs) pkgconfig stdenv fetchurl cairo ghc;
@@ -216,6 +220,10 @@ rec {
     inherit cabal;
   });
 
+  haddock242 = import ../development/tools/documentation/haddock/haddock-2.4.2.nix {
+    inherit cabal ghcPaths;
+  };
+
   happy = happy1182;
 
   happy117 = import ../development/tools/parsing/happy/happy-1.17.nix {

From 6e789bc2c8220975a25e71e93673548b5bb0e074 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Apr 2009 13:58:13 +0000
Subject: [PATCH 16/58] * Added Leksah, an IDE for Haskell.  It requires a
 newer version of   gtksourceview than the one provided in gnome/default.nix. 
 The   stdenv branch already has this. * Updated gtk2hs to 0.10.1.

svn path=/nixpkgs/trunk/; revision=15154
---
 pkgs/desktops/gnome/default.nix               | 15 ++++++++++
 .../libraries/haskell/binary/default.nix      |  5 ++--
 .../libraries/haskell/gtk2hs/default.nix      | 30 ++++++++++++-------
 .../libraries/haskell/regex-posix/default.nix |  2 +-
 .../libraries/haskell/utf8-string/default.nix | 10 +++++++
 pkgs/top-level/haskell-packages.nix           | 14 +++++++--
 pkgs/top-level/release.nix                    | 19 ++++++++++--
 7 files changed, 77 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/utf8-string/default.nix

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 6af4fd032d8..3b59476ac6c 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -172,6 +172,21 @@ rec {
     input = desktop.gtksourceview;
   };
 
+  gtksourceview_24 = stdenv.mkDerivation {
+    name = "gtksourceview-2.4.2";
+
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.4/gtksourceview-2.4.2.tar.bz2;
+      sha256 = "1grc2y817c0xd225l0m92ja35x2bgld5npa4w3g21amkqhdnpka9";
+    };
+    
+    buildInputs = [
+      perl perlXMLParser pkgconfig gnomevfs libbonobo GConf
+      libgnomeprintui libgnomecanvas gettext intltool
+    ];
+    propagatedBuildInputs = [gtk libxml2 libgnomeprint];
+  };
+
   scrollkeeper = import ./scrollkeeper.nix {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser
             libxml2 libxslt docbook_xml_dtd_42;
diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix
index 081779fd312..53aee9ca5b9 100644
--- a/pkgs/development/libraries/haskell/binary/default.nix
+++ b/pkgs/development/libraries/haskell/binary/default.nix
@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self : {
   pname = "binary";
-  version = "0.4.1";
-  sha256 = "bb74824306843da25f6d97c271e2a06ee3a7e05fc529156fb81d7c576688e549";
+  version = "0.5.0.1";
+  sha256 = "1j5injgrwkjwl7lv6sqx4m033s3rrkspq690cb0ckfh267vsyig1";
   meta = {
     description = "Efficient, pure binary serialisation using lazy ByteStrings";
   };
 })  
-
diff --git a/pkgs/development/libraries/haskell/gtk2hs/default.nix b/pkgs/development/libraries/haskell/gtk2hs/default.nix
index e49f4d7113e..3c10861d624 100644
--- a/pkgs/development/libraries/haskell/gtk2hs/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs/default.nix
@@ -1,20 +1,30 @@
-{stdenv, fetchurl, pkgconfig, ghc, gtk, cairo, GConf, libglade
-, glib, libgtkhtml, gtkhtml}:
+{ stdenv, fetchurl, pkgconfig, gnome, cairo
+, ghc, mtl
+}:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   pname = "gtk2hs";
-  version = "0.9.12.1";
+  version = "0.10.0";
   fname = "${pname}-${version}";
-  name = "haskell-${fname}";
+  name = "haskell-${pname}-ghc${ghc.ghc.version}-${version}";
+  
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${fname}.tar.gz";
-    sha256 = "110z6v9gzhg6nzlz5gs8aafmipbva6rc50b8z1jgq0k2g25hfy22";
+    sha256 = "03ii8j13cphjpw23nnyp0idxqgd2r8m4f2jpb251g7vxrb56dw0v";
   };
 
-  buildInputs = [pkgconfig ghc gtk glib cairo GConf libglade libgtkhtml gtkhtml];
+  propagatedBuildInputs = [mtl];
 
-  configureFlags = [
-    "--enable-cairo"
+  buildInputs = [
+    pkgconfig cairo gnome.glib gnome.gtk gnome.libglade gnome.GConf
+    gnome.gtksourceview_24 gnome.librsvg
+    ghc
   ];
 
-})
+  postInstall =
+    ''
+      local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version}
+      ensureDir $confDir
+      cp $out/lib/gtk2hs/*.conf $confDir/
+    ''; # */
+}
diff --git a/pkgs/development/libraries/haskell/regex-posix/default.nix b/pkgs/development/libraries/haskell/regex-posix/default.nix
index 07980b1a1e1..fbaf5938b04 100644
--- a/pkgs/development/libraries/haskell/regex-posix/default.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/default.nix
@@ -4,7 +4,7 @@ cabal.mkDerivation (self : {
   pname = "regex-posix";
   version = "0.72.0.3"; # Haskell Platform 2009.0.0
   sha256 = "327ab87f3d4f5315a9414331eb382b8b997de8836d577c3f7d232c574606feb1";
-  extraBuildInputs = [regexBase];
+  propagatedBuildInputs = [regexBase];
   meta = {
     description = "Replaces/Enhances Text.Regex";
   };
diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix
new file mode 100644
index 00000000000..2f2fd5ac2c9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/utf8-string/default.nix
@@ -0,0 +1,10 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "utf8-string";
+  version = "0.3.4";
+  sha256 = "1gd5b5q5jw70mg0z8jjgqigc0wmvnc7fx2k3yfdsz20b9wsjfw7r";
+  meta = {
+    description = "A UTF8 layer for IO and Strings";
+  };
+})  
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8e266f4ba99..a949f8480dd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -53,8 +53,8 @@ rec {
   };
   
   gtk2hs = import ../development/libraries/haskell/gtk2hs {
-    inherit (pkgs) pkgconfig stdenv fetchurl cairo ghc;
-    inherit (pkgs.gnome) gtk glib GConf libglade libgtkhtml gtkhtml;
+    inherit ghc mtl;
+    inherit (pkgs) stdenv fetchurl pkgconfig gnome cairo;
   };
 
   haskellSrc = import ../development/libraries/haskell/haskell-src {
@@ -152,6 +152,10 @@ rec {
     inherit cabal;
   };
 
+  utf8_string = import ../development/libraries/haskell/utf8-string {
+    inherit cabal;
+  };
+
   uuagc = import ../development/tools/haskell/uuagc {
     inherit cabal uulib;
   };
@@ -236,6 +240,7 @@ rec {
     inherit (pkgs) perl;
   };
 
+  
   # Applications.
 
   darcs = import ../applications/version-management/darcs/darcs-2.nix {
@@ -243,6 +248,11 @@ rec {
     inherit (pkgs) zlib curl;
   };
 
+  leksah = import ../applications/editors/leksah {
+    inherit cabal gtk2hs binary parsec regexPosix utf8_string;
+    inherit (pkgs) libedit;
+  };
+  
   xmobar = import ../applications/misc/xmobar {
     inherit cabal;
     inherit (pkgs) X11;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index a2601c14ce0..78c02c778d4 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -121,8 +121,6 @@ in {
   gcc34 = linux;
   gcc43multi = ["x86_64-linux"];
   gdb = all;
-  ghc683 = ghcSupported;
-  ghc6102 = ghcSupported;
   ghostscript = linux;
   ghostscriptX = linux;
   gimp = linux;
@@ -329,6 +327,23 @@ in {
     gtk = linux;
   };
 
+  haskellPackages_ghc683 = {
+    ghc = ghcSupported;
+  };
+
+  haskellPackages_ghc6101 = {
+    ghc = ghcSupported;
+    leksah = ghcSupported;
+  };
+
+  haskellPackages_ghc6102 = {
+    darcs = ghcSupported;
+    ghc = ghcSupported;
+    gtk2hs = ghcSupported;
+    lhs2tex = ghcSupported;
+    xmonad = ghcSupported;
+  };
+
   kde3 = {
     kdebase = linux;
     kdelibs = linux;

From 6aa0719e53420df0e336c961ffc40d2d27b8420c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 19 Apr 2009 15:56:45 +0000
Subject: [PATCH 17/58] OpenGL package

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

diff --git a/pkgs/development/libraries/haskell/OpenGL/default.nix b/pkgs/development/libraries/haskell/OpenGL/default.nix
new file mode 100644
index 00000000000..dc16fb9cf17
--- /dev/null
+++ b/pkgs/development/libraries/haskell/OpenGL/default.nix
@@ -0,0 +1,12 @@
+{cabal, mesa, libX11}:
+
+cabal.mkDerivation (self : {
+  pname = "OpenGL";
+  version = "2.2.1.1"; # Haskell Platform 2009.0.0
+  sha256 = "926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792";
+  propagatedBuildInputs = [mesa libX11];
+  meta = {
+    description = "A binding for the OpenGL graphics system";
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a949f8480dd..1df06af4f0e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -115,6 +115,12 @@ rec {
     inherit cabal parsec;
   };
 
+  OpenGL = import ../development/libraries/haskell/OpenGL {
+    inherit cabal;
+    inherit (pkgs) mesa;
+    inherit (pkgs.xlibs) libX11;
+  };
+
   parallel = import ../development/libraries/haskell/parallel {
     inherit cabal;
   };

From 8b678d5308a74cc85b402dfdc5a412ee18aa8088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 19 Apr 2009 16:26:27 +0000
Subject: [PATCH 18/58] Added final(?) set of Haskell Platform packages.

svn path=/nixpkgs/trunk/; revision=15160
---
 pkgs/development/libraries/haskell/GLUT/default.nix  | 12 ++++++++++++
 .../development/libraries/haskell/OpenAL/default.nix | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  | 10 ++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/GLUT/default.nix
 create mode 100644 pkgs/development/libraries/haskell/OpenAL/default.nix

diff --git a/pkgs/development/libraries/haskell/GLUT/default.nix b/pkgs/development/libraries/haskell/GLUT/default.nix
new file mode 100644
index 00000000000..0ddbb73f9ff
--- /dev/null
+++ b/pkgs/development/libraries/haskell/GLUT/default.nix
@@ -0,0 +1,12 @@
+{cabal, OpenGL, glut}:
+
+cabal.mkDerivation (self : {
+  pname = "GLUT";
+  version = "2.1.1.2"; # Haskell Platform 2009.0.0
+  sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb";
+  propagatedBuildInputs = [OpenGL glut];
+  meta = {
+    description = "A binding for the OpenGL Utility Toolkit";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix
new file mode 100644
index 00000000000..45d2394960d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/OpenAL/default.nix
@@ -0,0 +1,12 @@
+{cabal, OpenGL, openal}:
+
+cabal.mkDerivation (self : {
+  pname = "OpenAL";
+  version = "1.3.1.1"; # Haskell Platform 2009.0.0
+  sha256 = "4875e015770feb93d5127d4b6f2338eb3957a0c36f64ccb8b3846010619f89b0";
+  propagatedBuildInputs = [OpenGL openal];
+  meta = {
+    description = "A binding to the OpenAL cross-platform 3D audio API";
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1df06af4f0e..404a85507ef 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -51,6 +51,11 @@ rec {
   ghcPaths = import ../development/libraries/haskell/ghc-paths {
     inherit cabal;
   };
+
+  GLUT = import ../development/libraries/haskell/GLUT {
+    inherit cabal OpenGL;
+    glut = pkgs.freeglut;
+  };
   
   gtk2hs = import ../development/libraries/haskell/gtk2hs {
     inherit ghc mtl;
@@ -115,6 +120,11 @@ rec {
     inherit cabal parsec;
   };
 
+  OpenAL = import ../development/libraries/haskell/OpenAL {
+    inherit cabal OpenGL;
+    inherit (pkgs) openal;
+  };
+
   OpenGL = import ../development/libraries/haskell/OpenGL {
     inherit cabal;
     inherit (pkgs) mesa;

From 6462b56834d86c94d13c4db5e89cae1de134fefc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Apr 2009 18:50:58 +0000
Subject: [PATCH 19/58] svn path=/nixpkgs/trunk/; revision=15161

---
 pkgs/top-level/build-for-release.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index e0d56172d99..0312b70e925 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -66,7 +66,6 @@ let
       gcc34
       gcc43
       gdb
-      ghc
       ghostscript
       gimp
       git
@@ -106,7 +105,6 @@ let
       kvm
       less
       lftp
-      lhs2tex
       libtool
       libxml2
       libxslt
@@ -202,7 +200,6 @@ let
       w3m
       wget
       wirelesstools
-      wxHaskell
       x11_ssh_askpass
       xchm
       xfig
@@ -385,7 +382,6 @@ let
       autoconf
       automake110x
       automake19x
-      ghc
       libtool
       libxml2
       libxslt

From e72b00b2d74795f19dd645f030ec2049adcb78eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Apr 2009 19:06:34 +0000
Subject: [PATCH 20/58] * Leksah: forgot to commit.  Also, use makeWrapper to
 set   XDG_DATA_DIRS to gtksourceview; otherwise, gtksourceview can't find  
 its syntax highlighting files. * Updated gtk2hs to the latest version from
 Darcs.  Otherwise Leksah   crashes on GHC 6.10.2.

svn path=/nixpkgs/trunk/; revision=15162
---
 pkgs/applications/editors/leksah/default.nix  | 26 +++++++++++++++++++
 .../libraries/haskell/gtk2hs/default.nix      | 19 +++++++-------
 pkgs/top-level/haskell-packages.nix           |  2 +-
 3 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/applications/editors/leksah/default.nix

diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix
new file mode 100644
index 00000000000..9943ce39ba8
--- /dev/null
+++ b/pkgs/applications/editors/leksah/default.nix
@@ -0,0 +1,26 @@
+{cabal, gtk2hs, binary, parsec, regexPosix, utf8_string, libedit, makeWrapper}:
+
+cabal.mkDerivation (self : {
+  pname = "leksah";
+  version = "0.4.4.1";
+  sha256 = "092a8gi73jhalgs4ppg8ki761vwk3gdnjwlyd4chnahbv5i1wrjw";
+
+  # !!! The explicit libedit dependency shouldn't be necessary.
+  extraBuildInputs = [gtk2hs binary parsec regexPosix utf8_string libedit makeWrapper];
+
+  preConfigure =
+    ''
+      substituteInPlace leksah.cabal --replace 'Cabal ==1.6.0.1' 'Cabal >=1.6.0.1' 
+    '';
+
+  postInstall =
+    ''
+      wrapProgram $out/bin/leksah --prefix XDG_DATA_DIRS : ${gtk2hs.gtksourceview}/share
+    '';
+  
+  meta = {
+    homepage = http://leksah.org/;
+    description = "An Integrated Development Environment for Haskell written in Haskell";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/gtk2hs/default.nix b/pkgs/development/libraries/haskell/gtk2hs/default.nix
index 3c10861d624..394151c6cca 100644
--- a/pkgs/development/libraries/haskell/gtk2hs/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, gnome, cairo
-, ghc, mtl
-}:
+{ stdenv, fetchurl, pkgconfig, gnome, cairo, ghc, mtl }:
+
+let gtksourceview = gnome.gtksourceview_24; in
 
 stdenv.mkDerivation rec {
   pname = "gtk2hs";
@@ -9,16 +9,15 @@ stdenv.mkDerivation rec {
   name = "haskell-${pname}-ghc${ghc.ghc.version}-${version}";
   
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${fname}.tar.gz";
-    sha256 = "03ii8j13cphjpw23nnyp0idxqgd2r8m4f2jpb251g7vxrb56dw0v";
+    url = http://nixos.org/tarballs/gtk2hs-0.10.0-20090419.tar.gz;
+    sha256 = "18a7cfph83yvv91ks37nrgqrn21fvww8bhb8nd8xy1mgb8lnfds1";
   };
-
+  
   propagatedBuildInputs = [mtl];
 
   buildInputs = [
-    pkgconfig cairo gnome.glib gnome.gtk gnome.libglade gnome.GConf
-    gnome.gtksourceview_24 gnome.librsvg
-    ghc
+    pkgconfig cairo ghc gnome.glib gnome.gtk gnome.libglade
+    gnome.GConf gtksourceview gnome.librsvg
   ];
 
   postInstall =
@@ -27,4 +26,6 @@ stdenv.mkDerivation rec {
       ensureDir $confDir
       cp $out/lib/gtk2hs/*.conf $confDir/
     ''; # */
+
+  passthru = { inherit gtksourceview; };
 }
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 404a85507ef..2a2f3f096db 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -266,7 +266,7 @@ rec {
 
   leksah = import ../applications/editors/leksah {
     inherit cabal gtk2hs binary parsec regexPosix utf8_string;
-    inherit (pkgs) libedit;
+    inherit (pkgs) libedit makeWrapper;
   };
   
   xmobar = import ../applications/misc/xmobar {

From e42598c74b9db741a71ade15914e77d9ecca6fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 19 Apr 2009 19:18:07 +0000
Subject: [PATCH 21/58] Added Haskell platform meta package. (Doesn't quite
 work nicely yet.)

svn path=/nixpkgs/trunk/; revision=15163
---
 .../haskell/haskell-platform/default.nix      | 34 +++++++++++++++++++
 .../documentation/haddock/haddock-2.4.2.nix   |  5 +--
 pkgs/top-level/haskell-packages.nix           | 10 ++++++
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/haskell-platform/default.nix

diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/default.nix
new file mode 100644
index 00000000000..88aea6e1d39
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-platform/default.nix
@@ -0,0 +1,34 @@
+{cabal, fetchurl, GLUT, HTTP, HUnit, OpenAL, OpenGL, QuickCheck, cgi, fgl,
+ haskellSrc, html, parallel, regexBase, regexCompat, regexPosix,
+ stm, time, xhtml, zlib, cabalInstall, alex, happy, haddock}:
+
+cabal.mkDerivation (self : {
+  pname = "haskell-platform";
+  version = "2009.0.0";
+  src = fetchurl {
+    url = http://code.haskell.org/haskell-platform/haskell-platform.cabal;
+    sha256 = "cefe19076bed6450d3d8611ff1b29fd0966106787003abedec90544968f30d9c";
+  };
+  unpackPhase = ''
+    cp $src haskell-platform.cabal
+  '';
+  preConfigure = ''
+    sed -i 's/^.*cabal-install ==.*$//' haskell-platform.cabal
+    echo 'import Distribution.Simple; main = defaultMain' > Setup.hs
+    touch LICENSE
+  '';
+  propagatedBuildInputs = [
+    GLUT HTTP HUnit OpenAL OpenGL QuickCheck cgi fgl
+    haskellSrc html parallel regexBase regexCompat regexPosix
+    stm time xhtml zlib cabalInstall alex happy
+  ];
+  /*
+  postFixup = ''
+    ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
+  '';
+  */
+  meta = {
+    description = "Haskell Platform meta package";
+  };
+})  
+
diff --git a/pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix b/pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix
index f3290d15fd6..ff7c982267e 100644
--- a/pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix
+++ b/pkgs/development/tools/documentation/haddock/haddock-2.4.2.nix
@@ -1,11 +1,12 @@
-{cabal, ghcPaths}:
+{cabal, ghcPaths, libedit}:
 
 cabal.mkDerivation (self : {
   pname = "haddock";
   version = "2.4.2"; # Haskell Platform 2009.0.0
   name = self.fname;
   sha256 = "dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547";
-  propagatedBuildInputs = [ghcPaths];
+  # TODO: adding libedit here is a hack
+  propagatedBuildInputs = [ghcPaths libedit];
   meta = {
     description = "a tool for automatically generating documentation from annotated Haskell source code";
   };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2a2f3f096db..54767b4787d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -66,6 +66,13 @@ rec {
     inherit cabal happy;
   };
   
+  haskellPlatform = import ../development/libraries/haskell/haskell-platform {
+    inherit cabal GLUT HTTP HUnit OpenAL OpenGL QuickCheck cgi fgl
+      haskellSrc html parallel regexBase regexCompat regexPosix
+      stm time xhtml zlib cabalInstall alex happy haddock;
+    inherit (pkgs) fetchurl;
+  };
+
   HTTP = import ../development/libraries/haskell/HTTP {
     inherit cabal mtl network parsec;
   };
@@ -230,6 +237,8 @@ rec {
     inherit (pkgs) fetchurl stdenv;
   };
 
+  haddock = haddock242;
+
   # old version of haddock, still more stable than 2.0
   haddock09 = import ../development/tools/documentation/haddock/haddock-0.9.nix {
     inherit cabal;
@@ -242,6 +251,7 @@ rec {
 
   haddock242 = import ../development/tools/documentation/haddock/haddock-2.4.2.nix {
     inherit cabal ghcPaths;
+    inherit (pkgs) libedit;
   };
 
   happy = happy1182;

From 24f5e84ebbef98ff673070f170a9419305b8a04b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 19 Apr 2009 21:46:07 +0000
Subject: [PATCH 22/58] LE/GE symbols

svn path=/nixpkgs/trunk/; revision=15164
---
 pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl
index 3867d5b171c..3a80b3be0ae 100644
--- a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl
+++ b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl
@@ -62,8 +62,8 @@ xkb_symbols "altgr-intl" {
     key <AD08> { [	  i,	I,		iacute,		Iacute		] };
     key <AD09> { [	  o,	O,		oacute,		Oacute		] };
     key <AD10> { [	  p,	P,		odiaeresis,	Odiaeresis	] };
-    key <AD11> { [ bracketleft,	braceleft,		guillemotleft		] };
-    key <AD12> { [ bracketright,braceright,		guillemotright		] };
+    key <AD11> { [ bracketleft,	braceleft,	guillemotleft,	lessthanequal	] };
+    key <AD12> { [ bracketright,braceright,	guillemotright,	greaterthanequal] };
 
     key <AC01> { [	  a,	A,		aacute,		Aacute		] };
     key <AC02> { [	  s,	S,		ssharp,		section		] };

From 035c84d06fad391c50854e821c964b14640bdfd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 19 Apr 2009 23:25:58 +0000
Subject: [PATCH 23/58] Haskell package updates.

svn path=/nixpkgs/trunk/; revision=15165
---
 .../libraries/haskell/multirec/default.nix           | 11 +++++++++++
 pkgs/development/libraries/haskell/uulib/default.nix |  6 +++---
 pkgs/development/tools/haskell/uuagc/default.nix     |  4 ++--
 pkgs/top-level/haskell-packages.nix                  | 12 ++++++++----
 4 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/multirec/default.nix

diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
new file mode 100644
index 00000000000..6fbfe6d0fbd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/multirec/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "multirec";
+  version = "0.2";
+  sha256 = "66f748245020437ad30dbc25e2decae7d49c6d968c014b316c0961539892083c";
+  meta = {
+    description = "Generic programming with systems of recursive datatypes";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix
index 0e5e517d7c5..b715b0ca743 100644
--- a/pkgs/development/libraries/haskell/uulib/default.nix
+++ b/pkgs/development/libraries/haskell/uulib/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self : {
   pname = "uulib";
-  version = "0.9.5";
-  sha256 = "38415725133af464de582dadc7d7e60b1aeb96344b18b239d176bf2181f98563";
+  version = "0.9.10";
+  sha256 = "1df7336ed76c278323c2e25ab53ec1afc9eba6a7c918c826e9f783e84479e08f";
   meta = {
-    description = "Fast Parser Combinators and Pretty Printing Combinators";
+    description = "Haskell Utecht Tools Library";
   };
 })
diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index f9fe0d3a687..d4c3de9026e 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self : {
   pname = "uuagc";
-  version = "0.9.7";
+  version = "0.9.10";
   name = self.fname;
-  sha256 = "7479ddbc8dc4b04cae278a942a50d7d76f06011aca06c56bcd26bdeba6eeb2d6";
+  sha256 = "cdbe78b6138a67bbc612f0f667f70ba483ebbdaa4d0c87c5508cfb5e68a49dcb";
   extraBuildInputs = [uulib];
   meta = {
     description = "Attribute Grammar System of Universiteit Utrecht";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 54767b4787d..e7386ffbbae 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -123,6 +123,10 @@ rec {
     inherit cabal;
   };
 
+  multirec = import ../development/libraries/haskell/multirec {
+    inherit cabal;
+  };
+
   network = import ../development/libraries/haskell/network {
     inherit cabal parsec;
   };
@@ -179,10 +183,6 @@ rec {
     inherit cabal;
   };
 
-  uuagc = import ../development/tools/haskell/uuagc {
-    inherit cabal uulib;
-  };
-
   uulib = import ../development/libraries/haskell/uulib {
     inherit cabal;
   };
@@ -266,6 +266,10 @@ rec {
     inherit (pkgs) perl;
   };
 
+  uuagc = import ../development/tools/haskell/uuagc {
+    inherit cabal uulib;
+  };
+
   
   # Applications.
 

From 0fc7bf4f000c82962e0d4f2706898f77261514b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 20 Apr 2009 00:18:51 +0000
Subject: [PATCH 24/58] Added vacuum plus deps.

svn path=/nixpkgs/trunk/; revision=15166
---
 .../haskell/haskell-src-exts/default.nix          | 13 +++++++++++++
 .../haskell/haskell-src-meta/default.nix          | 12 ++++++++++++
 .../libraries/haskell/vacuum/default.nix          | 12 ++++++++++++
 pkgs/development/tools/misc/cpphs/default.nix     | 10 ++++++++++
 pkgs/top-level/haskell-packages.nix               | 15 +++++++++++++++
 5 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/haskell-src-exts/default.nix
 create mode 100644 pkgs/development/libraries/haskell/haskell-src-meta/default.nix
 create mode 100644 pkgs/development/libraries/haskell/vacuum/default.nix
 create mode 100644 pkgs/development/tools/misc/cpphs/default.nix

diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
new file mode 100644
index 00000000000..ad372e6ef7c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
@@ -0,0 +1,13 @@
+{cabal, cpphs, happy}:
+
+cabal.mkDerivation (self : {
+  pname = "haskell-src-exts";
+  version = "0.4.8";
+  sha256 = "f059f698681b262b2a4725735b99ecbafec721ccadab65fcf075c2fc5d346dec";
+  extraBuildInputs = [happy];
+  propagatedBuildInputs = [cpphs];
+  meta = {
+    description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
new file mode 100644
index 00000000000..b6cb87155cc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -0,0 +1,12 @@
+{cabal, haskellSrcExts}:
+
+cabal.mkDerivation (self : {
+  pname = "haskell-src-meta";
+  version = "0.0.3.1";
+  sha256 = "74d450fd9d50edfd3cdad5c2860da2af3454b280bd37b401e16e2f492bfb5e15";
+  propagatedBuildInputs = [haskellSrcExts];
+  meta = {
+    description = "Parse source to template-haskell abstract syntax";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
new file mode 100644
index 00000000000..75ac4778ed0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vacuum/default.nix
@@ -0,0 +1,12 @@
+{cabal, ghcPaths, haskellSrcMeta}:
+
+cabal.mkDerivation (self : {
+  pname = "vacuum";
+  version = "0.0.91";
+  sha256 = "9240ec35b39d60928a73469893adf1d2aa742b9a781dbc6dcdaa54e96d9bf1af";
+  propagatedBuildInputs = [ghcPaths haskellSrcMeta];
+  meta = {
+    description = "Generic programming with systems of recursive datatypes";
+  };
+})  
+
diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
new file mode 100644
index 00000000000..9b806ff474f
--- /dev/null
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -0,0 +1,10 @@
+{cabal} :
+
+cabal.mkDerivation (self : {
+  pname = "cpphs";
+  version = "1.6";
+  sha256 = "2e7c430fde17adbb3905e6d2a3c3845a40349c61a53fcfa40c733e8b43e73295";
+  meta = {
+    description = "A liberalised re-implementation of cpp, the C pre-processor";
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e7386ffbbae..179c84ac2a5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -65,6 +65,14 @@ rec {
   haskellSrc = import ../development/libraries/haskell/haskell-src {
     inherit cabal happy;
   };
+
+  haskellSrcExts = import ../development/libraries/haskell/haskell-src-exts {
+    inherit cabal cpphs happy;
+  };
+
+  haskellSrcMeta = import ../development/libraries/haskell/haskell-src-meta {
+    inherit cabal haskellSrcExts;
+  };
   
   haskellPlatform = import ../development/libraries/haskell/haskell-platform {
     inherit cabal GLUT HTTP HUnit OpenAL OpenGL QuickCheck cgi fgl
@@ -232,6 +240,10 @@ rec {
     inherit (pkgs) perl;
   };
 
+  cpphs = import ../development/tools/misc/cpphs {
+    inherit cabal;
+  };
+
   frown = import ../development/tools/parsing/frown {
     inherit ghc;
     inherit (pkgs) fetchurl stdenv;
@@ -270,6 +282,9 @@ rec {
     inherit cabal uulib;
   };
 
+  vacuum = import ../development/libraries/haskell/vacuum {
+    inherit cabal ghcPaths haskellSrcMeta;
+  };
   
   # Applications.
 

From 8de3404fe7576031601c3d443b316bfc87e62f2e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 08:49:50 +0000
Subject: [PATCH 25/58] svn path=/nixpkgs/trunk/; revision=15167

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 78c02c778d4..368e396ba79 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -333,13 +333,13 @@ in {
 
   haskellPackages_ghc6101 = {
     ghc = ghcSupported;
-    leksah = ghcSupported;
   };
 
   haskellPackages_ghc6102 = {
     darcs = ghcSupported;
     ghc = ghcSupported;
     gtk2hs = ghcSupported;
+    leksah = ghcSupported;
     lhs2tex = ghcSupported;
     xmonad = ghcSupported;
   };

From c531caffe57764562c9efd7ab16bff905f3473a4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 11:48:40 +0000
Subject: [PATCH 26/58] * Evaluation fixes (but xmobar is still broken, it
 can't find   Data.Generics).

svn path=/nixpkgs/trunk/; revision=15169
---
 pkgs/top-level/haskell-packages.nix | 3 +--
 pkgs/top-level/release.nix          | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 179c84ac2a5..22d8d3ade30 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -299,8 +299,7 @@ rec {
   };
   
   xmobar = import ../applications/misc/xmobar {
-    inherit cabal;
-    inherit (pkgs) X11;
+    inherit cabal X11;
   };
 
   xmonad = import ../applications/window-managers/xmonad {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 368e396ba79..601d18ed614 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -171,7 +171,6 @@ in {
   kvm = linux;
   less = all;
   lftp = all;
-  lhs2tex = ghcSupported;
   libsmbios = linux;
   libtool = all;
   libtool2 = all;

From ac24816344ba729b421aeaecc0de961ba8043e92 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 12:08:09 +0000
Subject: [PATCH 27/58] * Move all the Perl packages out of all-packages.nix
 into a separate   file, perl-packages.nix.

svn path=/nixpkgs/trunk/; revision=15171
---
 .../git-and-tools/default.nix                 |    4 +-
 pkgs/build-support/vm/default.nix             |    2 +-
 .../perl-modules/DB_File/default.nix          |    6 +-
 pkgs/top-level/all-packages.nix               | 2111 +----------------
 pkgs/top-level/build-for-release.nix          |    4 +-
 pkgs/top-level/perl-packages.nix              | 2108 ++++++++++++++++
 pkgs/top-level/release.nix                    |    4 +
 7 files changed, 2140 insertions(+), 2099 deletions(-)
 create mode 100644 pkgs/top-level/perl-packages.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index d16b166416f..5245c8e10e6 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -15,7 +15,7 @@ rec {
       cpio tcl tk makeWrapper subversion;
     svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
     guiSupport = getConfig ["git" "guiSupport"] false;
-    perlLibs = [perlLWP perlURI perlTermReadKey subversion];
+    perlLibs = [perlPackages.perlLWP perlPackages.perlURI perlPackages.perlTermReadKey subversion];
   };
 
   gitGit = import ./git/git-git.nix {
@@ -26,7 +26,7 @@ rec {
     inherit (bleedingEdgeRepos) sourceByName;
     svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
     guiSupport = getConfig ["git" "guiSupport"] false;
-    perlLibs = [perlLWP perlURI perlTermReadKey subversion];
+    perlLibs = [perlPackages.perlLWP perlPackages.perlURI perlPackages.perlTermReadKey subversion];
   };
 
   qgit = import ./qgit {
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 53cd5b3172e..8549ac7c813 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -582,7 +582,7 @@ rec {
   rpmClosureGenerator =
     {name, packagesList, urlPrefix, packages, archs ? []}:
     
-    runCommand "${name}.nix" {buildInputs = [perl perlXMLSimple]; inherit archs;} ''
+    runCommand "${name}.nix" {buildInputs = [perl perlPackages.perlXMLSimple]; inherit archs;} ''
       gunzip < ${packagesList} > ./packages.xml
       perl -w ${rpm/rpm-closure.pl} \
         ./packages.xml ${urlPrefix} ${toString packages} > $out
diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix
index f9074335004..2a344e392fe 100644
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@@ -1,6 +1,6 @@
-{fetchurl, perl, db4}:
+{fetchurl, buildPerlPackage, db4}:
 
-import ../generic perl {
+buildPerlPackage {
   name = "DB_File-1.816";
   
   src = fetchurl {
@@ -16,6 +16,4 @@ import ../generic perl {
     INCLUDE = ${db4}/include
     EOF
   '';
-  
-  inherit db4;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c48c02f0e9..1de7294c22e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -587,8 +587,8 @@ let
 
   docbook2x = import ../tools/typesetting/docbook2x {
     inherit fetchurl stdenv texinfo perl
-            perlXMLSAX perlXMLParser perlXMLNamespaceSupport
             gnused groff libxml2 libxslt makeWrapper;
+    inherit (perlPackages) perlXMLSAX perlXMLParser perlXMLNamespaceSupport;
   };
 
   dosfstools = composedArgsAndFun (import ../tools/misc/dosfstools) {
@@ -1442,9 +1442,10 @@ let
   };
 
   xmltv = import ../tools/misc/xmltv {
-    inherit fetchurl perl perlTermReadKey perlXMLTwig perlXMLWriter
-      perlDateManip perlHTMLTree perlHTMLParser perlHTMLTagset
-      perlURI perlLWP;
+    inherit fetchurl perl;
+    inherit (perlPackages)
+      perlTermReadKey perlXMLTwig perlXMLWriter perlDateManip
+      perlHTMLTree perlHTMLParser perlHTMLTagset perlURI perlLWP;
   };
 
   xmpppy = builderDefsPackage (import ../development/python-modules/xmpppy) {
@@ -2522,11 +2523,13 @@ let
   };
 
   help2man = import ../development/tools/misc/help2man {
-    inherit fetchurl stdenv perl gettext perlLocaleGettext;
+    inherit fetchurl stdenv perl gettext;
+    inherit (perlPackages) perlLocaleGettext;
   };
 
   iconnamingutils = import ../development/tools/misc/icon-naming-utils {
-    inherit fetchurl stdenv perl perlXMLSimple;
+    inherit fetchurl stdenv perl;
+    inherit (perlPackages) perlXMLSimple;
   };
 
   indent = composedArgsAndFun (selectVersion ../development/tools/misc/indent "2.2.9") {
@@ -4156,2084 +4159,11 @@ let
 
   buildPerlPackage = import ../development/perl-modules/generic perl;
 
-  perlAlgorithmAnnotate = buildPerlPackage {
-    name = "Algorithm-Annotate-0.10";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz;
-      sha256 = "1y92k4nqkscfwpriv8q7c90rjfj85lvwq1k96niv2glk8d37dcf9";
-    };
-    propagatedBuildInputs = [perlAlgorithmDiff];
+  perlPackages = import ./perl-packages.nix {
+    inherit pkgs;
   };
 
-  perlAlgorithmDiff = buildPerlPackage rec {
-    name = "Algorithm-Diff-1.1901";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/T/TY/TYEMQ/${name}.zip";
-      sha256 = "0qk60fi49mpyvnfpjd2dzcmya8x3g5zfgb2hrnl7a5krn045g6i2";
-    };
-    buildInputs = [unzip];
-  };
-
-  perlAppCLI = buildPerlPackage {
-    name = "App-CLI-0.07";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/App-CLI-0.07.tar.gz;
-      sha256 = "000866qsm7jck3ini69b02sgbjwp6s297lsds002r7xk2wb6fqcz";
-    };
-    propagatedBuildInputs = [perlLocaleMaketextSimple];
-  };
-
-  perlAppConfig = buildPerlPackage {
-    name = "AppConfig-1.66";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz;
-      sha256 = "1p1vs9px20lrq9mdwpzp309a8r6rchibsdmxang4krk90pi2sh4b";
-    };
-  };
-
-  perlArrayCompare = buildPerlPackage {
-    name = "Array-Compare-1.16";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-1.16.tar.gz;
-      sha256 = "1iwkn7d07a7vgl3jrv4f0glwapxcbdwwsy3aa6apgwam9119hl7q";
-    };
-  };
-
-  perlArchiveZip = buildPerlPackage {
-    name = "Archive-Zip-1.16";
-    src = fetchurl {
-      url = http://nixos.org/tarballs/Archive-Zip-1.16.tar.gz;
-      md5 = "e28dff400d07b1659d659d8dde7071f1";
-    };
-  };
-
-  perlBerkeleyDB = import ../development/perl-modules/BerkeleyDB {
-    inherit buildPerlPackage fetchurl db4;
-  };
-
-  perlBitVector = buildPerlPackage {
-    name = "Bit-Vector-6.4";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-6.4.tar.gz;
-      sha256 = "146vr78r6w3cxrm0ji491ylaa1abqh7fs81qhg15g3gzzxfg33bp";
-    };
-    propagatedBuildInputs = [perlCarpClan];
-  };
-
-  perlBoolean = buildPerlPackage rec {
-    name = "boolean-0.20";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
-      sha256 = "1xqhzy3m2r08my13alff9bzl8b6xgd68312834x0hf33yir3l1yn";
-    };
-  };
-
-  perlCacheFastMmap = buildPerlPackage {
-    name = "Cache-FastMmap-1.28";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.28.tar.gz;
-      sha256 = "1m851bz5025wy24mzsi1i8hdyg8bm7lszx9rnn47llsv6hb9v0da";
-    };
-  };
-
-  perlCaptchaReCAPTCHA = buildPerlPackage rec {
-    name = "Captcha-reCAPTCHA-0.92";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz";
-      sha256 = "1fm0fvdy9b7z8k1cyah2qbj0gqlv01chxmqmashwj16198yr7vrc";
-    };
-    propagatedBuildInputs = [perlHTMLTiny perlLWP];
-    buildInputs = [perlTestPod];
-  };
-
-  perlCarpAssert = buildPerlPackage rec {
-    name = "Carp-Assert-0.20";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz";
-      sha256 = "1wzy4lswvwi45ybsm65zlq17rrqx84lsd7rajvd0jvd5af5lmlqd";
-    };
-  };
-
-  perlCarpAssertMore = buildPerlPackage rec {
-    name = "Carp-Assert-More-1.12";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
-      sha256 = "1m9k6z0m10s03x2hnc9mh5d4r8lnczm9bqd54jmnw0wzm4m33lyr";
-    };
-    propagatedBuildInputs = [perlTestException perlCarpAssert];
-  };
-
-  perlCarpClan = buildPerlPackage {
-    name = "Carp-Clan-6.00";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/J/JJ/JJORE/Carp-Clan-6.00.tar.gz;
-      sha256 = "0lbin4i0vzagcwkywpd5x4gz3a4ira4yn5g5v1ip0pbpyqnjk15h";
-    };
-    propagatedBuildInputs = [perlTestException];
-  };
-
-  perlCatalystActionRenderView = buildPerlPackage rec {
-    name = "Catalyst-Action-RenderView-0.09";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
-      sha256 = "06bxbdfjgnwp8zz4mqq2x7n5ng02h94m27l610icsps7r9iwi8f9";
-    };
-    propagatedBuildInputs = [perlCatalystRuntime perlHTTPRequestAsCGI perlDataVisitor];
-  };
-
-  perlCatalystAuthenticationStoreDBIxClass = buildPerlPackage rec {
-    name = "Catalyst-Authentication-Store-DBIx-Class-0.1082";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JA/JAYK/${name}.tar.gz";
-      sha256 = "1rh5jwqw3fb16ll5id8z0igpqdwr0czi0xbaa2igalxr53hh2cni";
-    };
-    propagatedBuildInputs = [
-      perlCatalystRuntime perlCatalystPluginAuthentication perlCatalystModelDBICSchema
-    ];
-  };
-
-  perlCatalystComponentInstancePerContext = buildPerlPackage rec {
-    name = "Catalyst-Component-InstancePerContext-0.001001";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/G/GR/GRODITI/${name}.tar.gz";
-      sha256 = "0wfj4vnn2cvk6jh62amwlg050p37fcwdgrn9amcz24z6w4qgjqvz";
-    };
-    propagatedBuildInputs = [perlCatalystRuntime perlMoose];
-  };
-
-  perlCatalystControllerHTMLFormFu = buildPerlPackage rec {
-    name = "Catalyst-Controller-HTML-FormFu-0.03007";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz";
-      sha256 = "1vrd79d0nbqkana5q483fgsr41idlfgjhf7fpd3hc056z5nq8iyn";
-    };
-    propagatedBuildInputs = [
-      perlCatalystRuntime perlCatalystActionRenderView perlCatalystViewTT
-      perlCatalystPluginConfigLoader perlConfigGeneral
-      perlCatalystComponentInstancePerContext perlMoose
-      perlRegexpAssemble perlTestWWWMechanize
-      perlTestWWWMechanizeCatalyst perlHTMLFormFu
-    ];
-  };
-
-  perlCatalystDevel = buildPerlPackage rec {
-    name = "Catalyst-Devel-1.10";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
-      sha256 = "19ylkx55gaq9xxxcl4a55284in7hdrr2sb6lqz64daq3xp29n73h";
-    };
-    propagatedBuildInputs = [
-      perlCatalystRuntime perlCatalystActionRenderView
-      perlCatalystPluginStaticSimple perlCatalystPluginConfigLoader
-      perlPathClass perlTemplateToolkit perlClassAccessor
-      perlConfigGeneral perlFileCopyRecursive perlParent
-    ];
-  };
-
-  perlCatalystEngineHTTPPrefork = buildPerlPackage rec {
-    name = "Catalyst-Engine-HTTP-Prefork-0.50";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz";
-      sha256 = "1p8mnxqaxd6sxyy9q4f0h5gy4mcnvb3y93y49ziq6kmcvy6yw2p7";
-    };
-    propagatedBuildInputs = [
-      perlCatalystRuntime perlHTTPBody perlNetServer
-      perlCookieXS perlHTTPHeaderParserXS
-    ];
-    buildInputs = [perlTestPod perlTestPodCoverage];
-    patches = [
-      # Fix chunked transfers (they were missing the final CR/LF at
-      # the end, which makes curl barf).
-      ../development/perl-modules/catalyst-fix-chunked-encoding.patch
-    ];
-  };
-
-  perlCatalystManual = buildPerlPackage rec {
-    name = "Catalyst-Manual-5.7016";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/H/HK/HKCLARK/${name}.tar.gz";
-      sha256 = "0axin80dca3xb0n7frn9w8lj43l7dykpwrf7jj44n1v1kyzw813f";
-    };
-    buildInputs = [perlTestPod perlTestPodCoverage];
-  };
-
-  perlCatalystModelDBICSchema = buildPerlPackage {
-    name = "Catalyst-Model-DBIC-Schema-0.23";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Model-DBIC-Schema-0.23.tar.gz;
-      sha256 = "1rzs4czrwr8pnrj0mvfpzc8i2cbw95rx2xirw9bhqs77z2722ym4";
-    };
-    propagatedBuildInputs = [
-      perlCatalystRuntime perlCatalystDevel perlDBIxClass
-      perlUNIVERSALrequire perlClassDataAccessor
-      perlDBIxClassSchemaLoader
-    ];
-  };
-
-  perlCatalystRuntime = buildPerlPackage rec{
-    name = "Catalyst-Runtime-5.71001";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
-      sha256 = "1j3xsh7zi5xd8zdc63r83mwzhjfj30vhd39kgir53mq47v0y07jr";
-    };
-    propagatedBuildInputs = [
-      perlLWP perlClassAccessor perlClassDataInheritable perlClassInspector
-      perlCGISimple perlDataDump perlFileModified perlHTTPBody perlHTTPRequestAsCGI
-      perlPathClass perlTextSimpleTable perlTreeSimple perlTreeSimpleVisitorFactory
-      perlSubExporter perlMROCompat perlTestMockObject perlClassMOP perlMoose
-      perlNamespaceClean perlScopeUpper perlMooseXEmulateClassAccessorFast
-      perlClassC3 perlClassC3AdoptNEXT
-    ];
-  };
-
-  perlCatalystPluginAuthentication = buildPerlPackage rec {
-    name = "Catalyst-Plugin-Authentication-0.10010";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
-      sha256 = "1jjdmyccsq0k8ysl9ppm7rddf6w4l2yhwjr60c0x4lp5iafzmf4z";
-    };
-    propagatedBuildInputs = [perlCatalystRuntime perlCatalystPluginSession];
-  };
-
-  perlCatalystPluginAuthorizationACL = buildPerlPackage {
-    name = "Catalyst-Plugin-Authorization-ACL-0.10";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-Authorization-ACL-0.10.tar.gz;
-      sha256 = "1y9pj0scpc4nd7m1xqy7yvjsffhfadzl0z5r4jjv2srndcv4xj1p";
-    };
-    propagatedBuildInputs = [perlCatalystRuntime perlClassThrowable];
-  };
-
-  perlCatalystPluginAuthorizationRoles = buildPerlPackage {
-    name = "Catalyst-Plugin-Authorization-Roles-0.07";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/B/BR/BRICAS/Catalyst-Plugin-Authorization-Roles-0.07.tar.gz;
-      sha256 = "07b8zc7b06p0fprjj68fk7rgh781r9s3q8dx045sk03w0fnk3b4b";
-    };
-    propagatedBuildInputs = [
-      perlCatalystRuntime perlCatalystPluginAuthentication
-      perlTestException perlSetObject perlUNIVERSALisa
-    ];
-  };
-
-  perlCatalystPluginConfigLoader = buildPerlPackage rec {
-    name = "Catalyst-Plugin-ConfigLoader-0.22";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/B/BR/BRICAS/${name}.tar.gz";
-      sha256 = "13ir2l0pvjn4myp7wfh2bxcdd4hp0b3ln28mz1kvlshhxl032lqn";
-    };
-    propagatedBuildInputs = [perlCatalystRuntime perlDataVisitor perlConfigAny perlMROCompat];
-  };
-
-  perlCatalystPluginHTMLWidget = buildPerlPackage {
-    name = "Catalyst-Plugin-HTML-Widget-1.1";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SR/SRI/Catalyst-Plugin-HTML-Widget-1.1.tar.gz;
-      sha256 = "1zzyfhmzlqvbwk2w930k3mqk8z1lzhrja9ynx9yfq5gmc8qqg95l";
-    };
-    propagatedBuildInputs = [perlCatalystRuntime perlHTMLWidget];
-  };
-
-  perlCatalystPluginSession = buildPerlPackage rec {
-    name = "Catalyst-Plugin-Session-0.20";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
-      sha256 = "1p72hf68qi038gayhsxbbx3l3hg7b1njjii510alxqyw3a10y9sj";
-    };
-    propagatedBuildInputs = [
-      perlCatalystRuntime perlTestMockObject perlObjectSignature
-      perlTestDeep perlMROCompat
-    ];
-  };
-
-  perlCatalystPluginSessionStateCookie = buildPerlPackage rec {
-    name = "Catalyst-Plugin-Session-State-Cookie-0.10";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
-      sha256 = "1630shg23cpk6v26fwf7xr53ml1s6l2mgirxw524nmciliczgldj";
-    };
-    propagatedBuildInputs = [
-      perlCatalystRuntime perlCatalystPluginSession perlTestMockObject
-    ];
-  };
-
-  perlCatalystPluginSessionStoreFastMmap = buildPerlPackage rec {
-    name = "Catalyst-Plugin-Session-Store-FastMmap-0.06";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/K/KA/KARMAN/${name}.tar.gz";
-      sha256 = "0by8w1zbp2802f9n3sqp0cmm2q0pwnycf0jgzvvv75riicq1m9pn";
-    };
-    propagatedBuildInputs = [
-      perlPathClass perlCatalystPluginSession perlCacheFastMmap
-    ];
-  };
-
-  perlCatalystPluginStackTrace = buildPerlPackage {
-    name = "Catalyst-Plugin-StackTrace-0.09";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-StackTrace-0.09.tar.gz;
-      sha256 = "1pywxjhvn5zmcpnxj9ba77pz1jxq4d037yd43y0ks9sc31p01ydh";
-    };
-    propagatedBuildInputs = [perlCatalystRuntime perlDevelStackTrace];
-  };
-
-  perlCatalystPluginStaticSimple = buildPerlPackage {
-    name = "Catalyst-Plugin-Static-Simple-0.20";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AG/AGRUNDMA/Catalyst-Plugin-Static-Simple-0.20.tar.gz;
-      sha256 = "1qpicgfha81ykxzg4kjll2qw8b1rwzdgvj4s3q9s20zl86gmfr3p";
-    };
-    propagatedBuildInputs = [perlCatalystRuntime perlMIMETypes];
-  };
-
-  perlCatalystViewDownload = buildPerlPackage rec {
-    name = "Catalyst-View-Download-0.04";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/G/GA/GAUDEON/${name}.tar.gz";
-      sha256 = "1d5ck28db6vbks7cwkj1qh0glhxskl3vymksv3izfzbk6xnjrabi";
-    };
-    propagatedBuildInputs = [
-      perlCatalystRuntime perlTestWWWMechanizeCatalyst perlTestUseOk
-      perlTextCSV
-    ];
-  };
-
-  perlCatalystViewTT = buildPerlPackage rec {
-    name = "Catalyst-View-TT-0.28";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
-      sha256 = "18chdzgv0fvq65kfp8am2f5cayxpzg355q7jin4xlzygbgh2a5vg";
-    };
-    propagatedBuildInputs = [
-      perlCatalystRuntime perlTemplateToolkit perlClassAccessor
-      perlPathClass perlTemplateTimer
-    ];
-  };
-
-  perlCGICookieXS = buildPerlPackage rec {
-    name = "CGI-Cookie-XS-0.16";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AG/AGENT/${name}.tar.gz";
-      sha256 = "1jrd3f11sz17117nvssrrf6r80fr412615n5ffspbsap4n816bnn";
-    };
-  };
-
-  perlCGISession = buildPerlPackage {
-    name = "CGI-Session-3.95";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHERZODR/CGI-Session-3.95.tar.gz;
-      md5 = "fe9e46496c7c711c54ca13209ded500b";
-    };
-  };
-
-  perlCGISimple = buildPerlPackage {
-    name = "CGI-Simple-1.106";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AN/ANDYA/CGI-Simple-1.106.tar.gz;
-      sha256 = "0r0wc2260jnnch7dv7f6ailjf5w8hpqm2w146flfcchcryfxjlpg";
-    };
-  };
-
-  perlClassAccessor = buildPerlPackage {
-    name = "Class-Accessor-0.31";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.31.tar.gz;
-      sha256 = "1a4v5qqdf9bipd6ba5n47mag0cmgwp97cid67i510aw96bcjrsiy";
-    };
-  };
-
-  perlClassAccessorChained = buildPerlPackage {
-    name = "Class-Accessor-Chained-0.01";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz;
-      sha256 = "1lilrjy1s0q5hyr0888kf0ifxjyl2iyk4vxil4jsv0sgh39lkgx5";
-    };
-    propagatedBuildInputs = [perlClassAccessor];
-  };
-
-  perlClassAccessorGrouped = buildPerlPackage rec {
-    name = "Class-Accessor-Grouped-0.08003";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/C/CL/CLACO/${name}.tar.gz";
-      sha256 = "0lvxj8fp79338p52ich0p7hi4gvvf572ks76g9kgkgfyqvmp732k";
-    };
-    propagatedBuildInputs = [perlClassInspector perlMROCompat];
-  };
-
-  perlClassAutouse = buildPerlPackage {
-    name = "Class-Autouse-1.99_02";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-1.99_02.tar.gz;
-      sha256 = "1jkhczx2flxrz154ps90fj9wcchkpmnp5sapwc0l92rpn7jpsf08";
-    };
-  };
-
-  perlClassC3 = buildPerlPackage rec {
-    name = "Class-C3-0.21";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
-      sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz";
-    };
-  };
-
-  perlClassC3AdoptNEXT = buildPerlPackage rec {
-    name = "Class-C3-Adopt-NEXT-0.07";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
-      sha256 = "1kxbdq10vicrbz3i6hvml3mma5x0r523gfdd649f9bvrsizb0jxj";
-    };
-    propagatedBuildInputs = [perlMROCompat perlTestException perlListMoreUtils];
-  };
-
-  perlClassC3Componentised = buildPerlPackage rec {
-    name = "Class-C3-Componentised-1.0004";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz";
-      sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1";
-    };
-    propagatedBuildInputs = [
-      perlClassC3 perlClassInspector perlTestException perlMROCompat
-    ];
-  };
-
-  perlClassDataAccessor = buildPerlPackage {
-    name = "Class-Data-Accessor-0.04004";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz;
-      sha256 = "0578m3rplk41059rkkjy1009xrmrdivjnv8yxadwwdk1vzidc8n1";
-    };
-  };
-
-  perlClassDataInheritable = buildPerlPackage {
-    name = "Class-Data-Inheritable-0.08";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz;
-      sha256 = "0jpi38wy5xh6p1mg2cbyjjw76vgbccqp46685r27w8hmxb7gwrwr";
-    };
-  };
-
-  perlClassFactoryUtil = buildPerlPackage rec {
-    name = "Class-Factory-Util-1.7";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "09ifd6v0c94vr20n9yr1dxgcp7hyscqq851szdip7y24bd26nlbc";
-    };
-  };
-
-  perlClassInspector = buildPerlPackage {
-    name = "Class-Inspector-1.23";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Inspector-1.23.tar.gz;
-      sha256 = "0d15b5wls14gqcd6v2k4kbc0v0a1qfb794h49wfc4vwjk5gnpbw1";
-    };
-  };
-
-  perlClassMOP = buildPerlPackage rec {
-    name = "Class-MOP-0.80";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "1fmimzzbfkw7vrr57p8xa3y9v55i72bknix2qk3cdrn0jmg6h648";
-    };
-    propagatedBuildInputs = [
-      perlMROCompat perlTaskWeaken perlTestException perlSubName perlSubIdentify
-      perlDevelGlobalDestruction
-    ];
-  };
-
-  perlClassSingleton = buildPerlPackage rec {
-    name = "Class-Singleton-1.4";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AB/ABW/${name}.tar.gz";
-      sha256 = "0l4iwwk91wm2mrrh4irrn6ham9k12iah1ry33k0lzq22r3kwdbyg";
-    };
-  };
-
-  perlClassThrowable = buildPerlPackage {
-    name = "Class-Throwable-0.10";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/ST/STEVAN/Class-Throwable-0.10.tar.gz;
-      sha256 = "01hjrfb951c9j83ncg5drnam8vsfdgkjjv0kjshxhkl93sgnlvdl";
-    };
-  };
-
-  perlClassUnload = buildPerlPackage {
-    name = "Class-Unload-0.05";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/I/IL/ILMARI/Class-Unload-0.05.tar.gz;
-      sha256 = "01b0j10nxbz37xnnzw3hgmpfgq09mc489kq2d8f5nswsrlk75001";
-    };
-    propagatedBuildInputs = [perlClassInspector];
-  };
-
-  perlCompressRawBzip2 = import ../development/perl-modules/Compress-Raw-Bzip2 {
-    inherit fetchurl buildPerlPackage bzip2;
-  };
-
-  perlCompressRawZlib = import ../development/perl-modules/Compress-Raw-Zlib {
-    inherit fetchurl buildPerlPackage zlib;
-  };
-
-  perlCompressZlib = buildPerlPackage rec {
-    name = "Compress-Zlib-2.015";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-      sha256 = "1k1i539fszhxay8yllh687sw06i68g8ikw51pvy1c84p3kg6yk4v";
-    };
-    propagatedBuildInputs = [
-      perlCompressRawZlib perlIOCompressBase perlIOCompressGzip
-    ];
-  };
-
-  perlConfigAny = buildPerlPackage {
-    name = "Config-Any-0.14";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/B/BR/BRICAS/Config-Any-0.14.tar.gz;
-      sha256 = "1vlr4w2m88figac5pblg6ppzrm11x2pm7r05n48s84cp4mizhim1";
-    };
-  };
-
-  perlConfigGeneral = buildPerlPackage {
-    name = "Config-General-2.40";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.40.tar.gz;
-      sha256 = "0wf6dpaanaiy0490dlgs3pi3xvvijs237x9izb00cnzggxcfmsnz";
-    };
-  };
-
-  perlconstant = buildPerlPackage {
-    name = "constant-1.15";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SA/SAPER/constant-1.15.tar.gz;
-      sha256 = "1ygz0hd1fd3q88r6dlw14kpyh06zjprksdci7qva6skxz3261636";
-    };
-  };
-
-  perlCookieXS = buildPerlPackage rec {
-    name = "Cookie-XS-0.11";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AG/AGENT/${name}.tar.gz";
-      sha256 = "1616rcn2qn1cwiv3rxb8mq5fmwxpj4gya1lxxxq2w952h03p3fd3";
-    };
-    propagatedBuildInputs = [
-      perlTestMore perlCGICookieXS
-    ];
-  };
-
-  perlCryptCBC = buildPerlPackage rec {
-    name = "Crypt-CBC-2.30";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz";
-      sha256 = "0cvigpxvwn18kb5i40jlp5fgijbhncvlh23xdgs1cnhxa17yrgwx";
-    };
-  };
-
-  perlCryptDES = buildPerlPackage rec {
-    name = "Crypt-DES-2.05";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DP/DPARIS/${name}.tar.gz";
-      sha256 = "1w12k1b7868v3ql0yprswlz2qri6ja576k9wlda7b8zf2d0rxgmp";
-    };
-    buildInputs = [perlCryptCBC];
-  };
-
-  perlCryptPasswordMD5 = buildPerlPackage {
-    name = "Crypt-PasswdMD5-1.3";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/L/LU/LUISMUNOZ/Crypt-PasswdMD5-1.3.tar.gz;
-      sha256 = "13j0v6ihgx80q8jhyas4k48b64gnzf202qajyn097vj8v48khk54";
-    };
-  };
-
-  perlCryptSSLeay = buildPerlPackage rec {
-    name = "Crypt-SSLeay-0.57";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DL/DLAND/${name}.tar.gz";
-      sha256 = "1f0i5y99ly39vf86jpzwqz8mkz1460vryv85jgqmfx007p781s0l";
-    };
-    makeMakerFlags = "--lib=${openssl}/lib";
-  };
-
-  perlDataDump = buildPerlPackage {
-    name = "Data-Dump-1.11";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.11.tar.gz;
-      sha256 = "0h5y40b6drgsf87nhwhqx1dprq70f98ibm03l9al4ndq7mrx97dd";
-    };
-  };
-
-  perlDataHierarchy = buildPerlPackage {
-    name = "Data-Hierarchy-0.34";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz;
-      sha256 = "1vfrkygdaq0k7006i83jwavg9wgszfcyzbl9b7fp37z2acmyda5k";
-    };
-    propagatedBuildInputs = [perlTestException];
-  };
-
-  perlDataOptList = buildPerlPackage rec {
-    name = "Data-OptList-0.104";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "1k1qvf3ik2rn9mg65ginv3lyy6dlg1z08yddcnzbnizs8vbqqaxd";
-    };
-    propagatedBuildInputs = [perlSubInstall perlParamsUtil];
-  };
-
-  perlDataPage = buildPerlPackage {
-    name = "Data-Page-2.01";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.01.tar.gz;
-      sha256 = "0mvhlid9qx9yd94rgr4lfz9kvflimc1dzcah0x7q5disw39aqrzr";
-    };
-    propagatedBuildInputs = [perlTestException perlClassAccessorChained];
-  };
-
-  perlDataVisitor = buildPerlPackage {
-    name = "Data-Visitor-0.21";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/N/NU/NUFFIN/Data-Visitor-0.21.tar.gz;
-      sha256 = "10cjh3rrqi4gwrmkpzilzmaqdrh71wr59035s6b4p2dzd117p931";
-    };
-    propagatedBuildInputs = [
-      perlTestMockObject perlMouse perlTaskWeaken perlTestUseOk perlTieToObject
-      perlNamespaceClean
-    ];
-  };
-
-  perlDateCalc = buildPerlPackage {
-    name = "Date-Calc-5.4";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-5.4.tar.gz;
-      sha256 = "1q7d1sy9ka1akpbysgwj673i7wiwb48yjv6wx1v5dhxllyxlxqc8";
-    };
-    propagatedBuildInputs = [perlCarpClan perlBitVector];
-  };
-
-  perlDateManip = buildPerlPackage {
-    name = "DateManip-5.54";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-5.54.tar.gz;
-      sha256 = "0ap2jgqx7yvjsyph9zsvadsih41cj991j3jwgz5261sq7q74y7xn";
-    };
-  };
-
-  perlDateTime = buildPerlPackage rec {
-    name = "DateTime-0.4501";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "1hqhc4xfjgcc1r488gjbi498ws3pxiayabl46607lq02qddcv57s";
-    };
-    propagatedBuildInputs = [perlDateTimeLocale perlDateTimeTimeZone];
-  };
-
-  perlDateTimeFormatBuilder = buildPerlPackage rec {
-    name = "DateTime-Format-Builder-0.7901";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "08zl89gh5lkff8736fkdnrf6dgppsjbmymnysbc06s7igd4ig8zf";
-    };
-    propagatedBuildInputs = [
-      perlDateTime perlParamsValidate perlTaskWeaken perlDateTimeFormatStrptime
-      perlClassFactoryUtil
-    ];
-    buildInputs = [perlTestPod];
-  };
-
-  perlDateTimeFormatNatural = buildPerlPackage rec {
-    name = "DateTime-Format-Natural-0.74";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/${name}.tar.gz";
-      sha256 = "0hq33s5frfa8cpj2al7qi0sbmimm5sdlxf0h3b57fjm9x5arlkcn";
-    };
-    propagatedBuildInputs = [
-      perlDateTime perlListMoreUtils perlParamsValidate perlDateCalc
-      perlTestMockTime perlBoolean
-    ];
-  };
-
-  perlDateTimeFormatStrptime = buildPerlPackage rec {
-    name = "DateTime-Format-Strptime-1.0800";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RI/RICKM/${name}.tgz";
-      sha256 = "10vsmwlhnc62krsh5fm2i0ya7bgjgjsm6nmj56f0bfifjh57ya1j";
-    };
-    propagatedBuildInputs = [
-      perlDateTime perlDateTimeLocale perlDateTimeTimeZone perlParamsValidate
-    ];
-  };
-
-  perlDateTimeLocale = buildPerlPackage rec {
-    name = "DateTime-Locale-0.42";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "1cvp9a4j6vy3xpbv6ipzcz1paw7gzal7lkrbm5ipiilji47d5gaw";
-    };
-    propagatedBuildInputs = [perlListMoreUtils perlParamsValidate];
-  };
-
-  perlDateTimeTimeZone = buildPerlPackage rec {
-    name = "DateTime-TimeZone-0.84";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "0jwbldr3x1cl2ibd9dcshdmpg6s5ddc4qiaxcxyqc82cq09ah2vs";
-    };
-    propagatedBuildInputs = [perlClassSingleton perlParamsValidate];
-  };
-
-  perlDBDSQLite = import ../development/perl-modules/DBD-SQLite {
-    inherit fetchurl buildPerlPackage perlDBI sqlite;
-  };
-
-  perlDBFile = import ../development/perl-modules/DB_File {
-    inherit fetchurl perl db4;
-  };
-
-  perlDBI = buildPerlPackage {
-    name = "DBI-1.607";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.607.tar.gz;
-      sha256 = "053ysk2a4njhzq5p59v5s6jzyi0yqr8l6wkswbvy4fyil3ka343h";
-    };
-  };
-
-  perlDBIxClass = buildPerlPackage rec {
-    name = "DBIx-Class-0.08099_08";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz";
-      sha256 = "12kn3jylxi7n2c6ccqyrjaxxmk3lajvjv19j6rlifp4crn24cbpy";
-    };
-    propagatedBuildInputs = [
-      perlTestNoWarnings perlTestException perlDBI perlScopeGuard
-      perlPathClass perlClassInspector perlClassAccessorGrouped
-      perlCarpClan perlTestWarn perlDataPage perlSQLAbstract
-      perlSQLAbstractLimit perlClassC3 perlClassC3Componentised
-      perlModuleFind perlDBDSQLite perlJSONAny perlSubName
-    ];
-    buildInputs = [perlTestPod perlTestPodCoverage];
-  };
-
-  perlDBIxClassHTMLWidget = buildPerlPackage rec {
-    name = "DBIx-Class-HTMLWidget-0.16";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AN/ANDREMAR/${name}.tar.gz";
-      sha256 = "05zhniyzl31nq410ywhxm0vmvac53h7ax42hjs9mmpvf45ipahj1";
-    };
-    propagatedBuildInputs = [perlDBIxClass perlHTMLWidget];
-  };
-
-  perlDBIxClassSchemaLoader = buildPerlPackage rec {
-    name = "DBIx-Class-Schema-Loader-0.04999_06";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz";
-      sha256 = "169ydwjarq6qk48jdxcn5ks8rx9aksk9fnx07gl5mz7banw5cs6y";
-    };
-    propagatedBuildInputs = [
-      perlDBI perlDBDSQLite perlDataDump perlUNIVERSALrequire
-      perlClassAccessor perlClassDataAccessor perlClassC3 perlCarpClan
-      perlClassInspector perlDBIxClass perlLinguaENInflectNumber
-      perlClassUnload
-    ];
-    doCheck = false; # disabled for now, since some tests fail
-  };
-
-  perlDevelGlobalDestruction = buildPerlPackage rec {
-    name = "Devel-GlobalDestruction-0.02";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/N/NU/NUFFIN/${name}.tar.gz";
-      sha256 = "174m5dx2z89h4308gx6s6vmg93qzaq0bh9m91hp2vqbyialnarhw";
-    };
-    propagatedBuildInputs = [perlSubExporter perlScopeGuard];
-  };
-
-  perlDevelStackTrace = buildPerlPackage rec {
-    name = "Devel-StackTrace-1.20";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "15zh9gzhw6gv7l6sklp02pfmiiv8kwmmjsyvirppsca6aagy4603";
-    };
-  };
-
-  perlDevelSymdump = buildPerlPackage rec {
-    name = "Devel-Symdump-2.08";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz";
-      sha256 = "0qzj68zw1yypk8jw77h0w5sdpdcrp4xcmgfghcfyddjr2aim60x5";
-    };
-    propagatedBuildInputs = [
-      perlTestPod /* cyclic dependency: perlTestPodCoverage */
-    ];
-  };
-
-  perlDigestHMAC = buildPerlPackage {
-    name = "Digest-HMAC-1.01";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.01.tar.gz;
-      sha256 = "042d6nknc5icxqsy5asrh8v2shmvg7b3vbj95jyk4sbqlqpacwz3";
-    };
-    propagatedBuildInputs = [perlDigestSHA1];
-  };
-
-  perlDigestSHA1 = buildPerlPackage {
-    name = "Digest-SHA1-2.11";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz;
-      md5 = "2449bfe21d6589c96eebf94dae24df6b";
-    };
-  };
-
-  perlEmailAddress = buildPerlPackage {
-    name = "Email-Address-1.888";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.888.tar.gz;
-      sha256 = "0c6b8djnmiy0niskrvywd6867xd1qmn241ffdwj957dkqdakq9yx";
-    };
-  };
-
-  perlEmailSend = buildPerlPackage {
-    name = "Email-Send-2.185";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.185.tar.gz;
-      sha256 = "0pbgnnbmv6z3zzqaiq1sdcv5d26ijhw4p8k8kp6ac7arvldblamz";
-    };
-    propagatedBuildInputs = [perlEmailSimple perlEmailAddress perlModulePluggable perlReturnValue];
-  };
-
-  perlEmailSimple = buildPerlPackage {
-    name = "Email-Simple-2.003";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.003.tar.gz;
-      sha256 = "0h8873pidhkqy7415s5sx8z614d0haxiknbjwrn65icrr2m0b8g6";
-    };
-  };
-
-  perlEmailValid = buildPerlPackage {
-    name = "Email-Valid-0.179";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-0.179.tar.gz;
-      sha256 = "13yfjll63cp1y4xqzdcr1mjhfncn48v6hckk5mvwi47w3ccj934a";
-    };
-    propagatedBuildInputs = [perlMailTools perlNetDNS];
-    doCheck = false;
-  };
-
-  perlEncode = buildPerlPackage {
-    name = "Encode-2.25";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.25.tar.gz;
-      sha256 = "0prwmbg3xh1lqskianwrfrgasdfmz4kjm3qpdm27ay110jkk25ak";
-    };
-  };
-
-  perlExtUtilsInstall = buildPerlPackage {
-    name = "ExtUtils-Install-1.50";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/Y/YV/YVES/ExtUtils-Install-1.50.tar.gz;
-      sha256 = "18fr056fwnnhvgc646crx2p9mybf69mh5rkcphc7bbvahw9i61jy";
-    };
-    propagatedBuildInputs = [perlExtUtilsMakeMaker];
-  };
-
-  perlExtUtilsMakeMaker = buildPerlPackage {
-    name = "ExtUtils-MakeMaker-6.44";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-6.44.tar.gz;
-      sha256 = "0zyypnlmmyp06qbfdpc14rp5rj63066mjammn6rlcqz2iil9mpcj";
-    };
-  };
-
-  perlExtUtilsManifest = buildPerlPackage {
-    name = "ExtUtils-Manifest-1.53";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RK/RKOBES/ExtUtils-Manifest-1.53.tar.gz;
-      sha256 = "0xgfzivw0dfy29ydfjkg0c9mvlhjvlhc54s0yvbb4sxb2mdvrfkp";
-    };
-  };
-
-  perlFilechdir = buildPerlPackage {
-    name = "File-chdir-0.1002";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1002.tar.gz;
-      sha256 = "1fc2l754bxsizli3injm4wqf8dn03iq16rmfn62l99nxpibl5k6p";
-    };
-  };
-
-  perlFileCopyRecursive = buildPerlPackage {
-    name = "File-Copy-Recursive-0.37";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.37.tar.gz;
-      sha256 = "12j0s01zwm67g4bcgbs0k61jwz59q1lndrnxyywxsz3xd30ki8rr";
-    };
-  };
-
-  perlFileModified = buildPerlPackage {
-    name = "File-Modified-0.07";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CO/CORION/File-Modified-0.07.tar.gz;
-      sha256 = "11zkg171fa5vdbyrbfcay134hhgyf4yaincjxwspwznrfmkpi49h";
-    };
-  };
-
-  perlFileShareDir = buildPerlPackage rec {
-    name = "File-ShareDir-1.00";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
-      sha256 = "1afr1r1ys2ij8i4r0i85hfrgrbvcha8c7cgkhcrdya1f0lnpw59z";
-    };
-    propagatedBuildInputs = [perlClassInspector perlParamsUtil];
-  };
-
-  perlFileTemp = buildPerlPackage {
-    name = "File-Temp-0.20";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/T/TJ/TJENNESS/File-Temp-0.20.tar.gz;
-      sha256 = "0n7lr7mpdvwgznw469qdpdmac627a26wp615dkpzanc452skad4v";
-    };
-  };
-
-  perlFreezeThaw = buildPerlPackage {
-    name = "FreezeThaw-0.43";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.43.tar.gz;
-      sha256 = "1qamc5aggp35xk590a4hy660f2rhc2l7j65hbyxdya9yvg7z437l";
-    };
-  };
-
-  perlHTMLFormFu = buildPerlPackage rec {
-    name = "HTML-FormFu-0.03007";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz";
-      sha256 = "03lc4pvygp4wn9rsgdkbwk8zkh8x2z5vp8613c6q74imwrfmmfqy";
-    };
-    propagatedBuildInputs = [
-      perlClassAccessorChained perlClassC3 perlConfigAny
-      perlDateCalc perlListMoreUtils perlLWP perlEmailValid
-      perlDataVisitor perlDateTime perlDateTimeFormatBuilder
-      perlDateTimeFormatStrptime perlDateTimeFormatNatural
-      perlReadonly perlYAMLSyck perlRegexpCopy
-      perlHTMLTokeParserSimple perlTestNoWarnings perlRegexpCommon
-      perlCaptchaReCAPTCHA perlHTMLScrubber perlFileShareDir
-      perlTemplateToolkit perlCryptCBC perlCryptDES
-    ];
-  };
-
-  perlHTMLParser = buildPerlPackage {
-    name = "HTML-Parser-3.56";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.56.tar.gz;
-      sha256 = "0x1h42r54aq4yqpwi7mla4jzia9c5ysyqh8ir2nav833f9jm6g2h";
-    };
-    propagatedBuildInputs = [perlHTMLTagset];
-  };
-
-  perlHTMLScrubber = buildPerlPackage {
-    name = "HTML-Scrubber-0.08";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/P/PO/PODMASTER/HTML-Scrubber-0.08.tar.gz;
-      sha256 = "0xb5zj67y2sjid9bs3yfm81rgi91fmn38wy1ryngssw6vd92ijh2";
-    };
-    propagatedBuildInputs = [perlHTMLParser];
-  };
-
-  perlHTMLTagset = buildPerlPackage {
-    name = "HTML-Tagset-3.10";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.10.tar.gz;
-      sha256 = "05k292qy7jzjlmmybis8nncpnwwa4jfkm7q3gq6866ydxrzds9xh";
-    };
-  };
-
-  perlHTMLTiny = buildPerlPackage rec {
-    name = "HTML-Tiny-1.03";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz";
-      sha256 = "1nc9vr0z699jwv8jaxxpkfhspiv7glhdp500hqyzdm2jxfw8azrg";
-    };
-  };
-
-  perlHTMLTokeParserSimple = buildPerlPackage rec {
-    name = "HTML-TokeParser-Simple-3.15";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz";
-      sha256 = "0ii1ww17h7wps1lcj7bxrjbisa37f6cvlm0xxpgfq1s6iy06q05b";
-    };
-    propagatedBuildInputs = [perlHTMLParser perlSubOverride];
-    buildInputs = [perlTestPod];
-  };
-
-  perlHTMLTree = buildPerlPackage {
-    name = "HTML-Tree-3.23";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/P/PE/PETEK/HTML-Tree-3.23.tar.gz;
-      sha256 = "1pn80f4g1wixs030f40b80wrj12kwfinwycrx3f10drg4v7ml5zm";
-    };
-    propagatedBuildInputs = [perlHTMLParser];
-  };
-
-  perlHTMLWidget = buildPerlPackage {
-    name = "HTML-Widget-1.11";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-Widget-1.11.tar.gz;
-      sha256 = "02w21rd30cza094m5xs9clzw8ayigbhg2ddzl6jycp4jam0dyhmy";
-    };
-    propagatedBuildInputs = [
-      perlTestNoWarnings perlClassAccessor perlClassAccessorChained
-      perlClassDataAccessor perlModulePluggableFast perlHTMLTree
-      perlHTMLScrubber perlEmailValid perlDateCalc
-    ];
-  };
-
-  perlHTTPBody = buildPerlPackage rec {
-    name = "HTTP-Body-1.05";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz";
-      sha256 = "0s0496sb9l8jfkdx86vahwgdaaxrqb0j6acyww6nk0ajh82qrzfv";
-    };
-    propagatedBuildInputs = [perlLWP perlYAML];
-  };
-
-  perlHTTPHeaderParserXS = buildPerlPackage rec {
-    name = "HTTP-HeaderParser-XS-0.20";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MA/MARKSMITH/${name}.tar.gz";
-      sha256 = "1vs6sw431nnlnbdy6jii9vqlz30ndlfwdpdgm8a1m6fqngzhzq59";
-    };
-  };
-
-  perlHTTPRequestAsCGI = buildPerlPackage {
-    name = "HTTP-Request-AsCGI-0.5";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-Request-AsCGI-0.5.tar.gz;
-      sha256 = "164159iiyk0waqayplchkisxg2ldamx8iifrccx32p344714qcrh";
-    };
-    propagatedBuildInputs = [perlClassAccessor perlLWP];
-  };
-
-  perlHTTPResponseEncoding = buildPerlPackage rec {
-    name = "HTTP-Response-Encoding-0.05";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz";
-      sha256 = "04gdl633g0s2ckn7zixcma2krbpfcd46jngg155qpdx5sdwfkm16";
-    };
-    propagatedBuildInputs = [perlLWP];
-  };
-
-  perlHTTPServerSimple = buildPerlPackage rec {
-    name = "HTTP-Server-Simple-0.38";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JE/JESSE/${name}.tar.gz";
-      sha256 = "1m1lmpbg0zhiv2vyc3fyyqfsv3jhhb2mbdl5624fqb0va2pnla6n";
-    };
-    propagatedBuildInputs = [perlURI];
-    doCheck = false;
-  };
-
-  perlI18NLangTags = buildPerlPackage {
-    name = "I18N-LangTags-0.35";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SB/SBURKE/I18N-LangTags-0.35.tar.gz;
-      sha256 = "0idwfi7k8l44d9akpdj6ygdz3q8zxr690m18s7w23ms9d55bh3jy";
-    };
-  };
-
-  perlIOCompressBase = buildPerlPackage rec {
-    name = "IO-Compress-Base-2.015";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-      sha256 = "10njlwa50mhs5nqws5yidfmmb7hwmwc6x06gk2vnpyn82g3szgqd";
-    };
-  };
-
-  perlIOCompressBzip2 = buildPerlPackage rec {
-    name = "IO-Compress-Bzip2-2.015";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-      sha256 = "1kfksf2bslfkviry228p07m1ksnf06mh8gkmdpbrmlmxlbs2idnc";
-    };
-    propagatedBuildInputs = [perlIOCompressBase perlCompressRawBzip2];
-  };
-
-  perlIOCompressGzip = buildPerlPackage rec {
-    name = "IO-Compress-Zlib-2.015";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-      sha256 = "0sbnx6xdryaajwpssrfgm5b2zasa4ri8pihqwsx3rm5kmkgzy9cx";
-    };
-    propagatedBuildInputs = [perlIOCompressBase perlCompressRawZlib];
-  };
-
-  perlIODigest = buildPerlPackage {
-    name = "IO-Digest-0.10";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.10.tar.gz;
-      sha256 = "1g6ilxqv2a7spf273v7k0721c6am7pwpjrin3h5zaqxfmd312nav";
-    };
-    propagatedBuildInputs = [perlPerlIOviadynamic];
-  };
-
-  perlIOPager = buildPerlPackage {
-    name = "IO-Pager-0.06.tgz";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.06.tgz;
-      sha256 = "0r3af4gyjpy0f7bhs7hy5s7900w0yhbckb2dl3a1x5wpv7hcbkjb";
-    };
-  };
-
-  perlIPCRun = buildPerlPackage rec {
-    name = "IPC-Run-0.82";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
-      sha256 = "1v5yfavvhxscqkdl68xs7i7vcp9drl3y1iawppzwqcl1fprd58ip";
-    };
-    doCheck = false; /* attempts a network connection to localhost */
-  };
-
-  perlJSON = buildPerlPackage {
-    name = "JSON-2.12";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.12.tar.gz;
-      sha256 = "0qbxfwvfsx8s50h2dzpb0z7qi22k9ghygfzbfk8v08kkpmrkls47";
-    };
-    propagatedBuildInputs = [perlJSONXS];
-  };
-
-  perlJSONAny = buildPerlPackage {
-    name = "JSON-Any-1.17";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RB/RBERJON/JSON-Any-1.17.tar.gz;
-      sha256 = "07y6zb0vzb4c87k2lflxafb69zc4a29bxhzh6xdcpjhplf4vbifb";
-    };
-    propagatedBuildInputs = [perlJSON];
-  };
-
-  perlJSONXS = buildPerlPackage {
-    name = "JSON-XS-2.23";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-2.23.tar.gz;
-      sha256 = "0yd1j5d9b0ymfzfaxyi9zgca3vqwjb3dl8pg14m1qwsx3pidd5j7";
-    };
-  };
-
-  perlLinguaENInflect = buildPerlPackage {
-    name = "Lingua-EN-Inflect-1.89";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.89.tar.gz;
-      sha256 = "1jvj67mvvfqxgxspmblay1c844vvhfwrviiarglkaw6phpg74rby";
-    };
-  };
-
-  perlLinguaENInflectNumber = buildPerlPackage {
-    name = "Lingua-EN-Inflect-Number-1.1";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-1.1.tar.gz;
-      sha256 = "13hlr1srp9cd9mcc78snkng9il8iavvylfyh81iadvn2y7wikwfy";
-    };
-    propagatedBuildInputs = [perlLinguaENInflect];
-  };
-
-  perlListMoreUtils = buildPerlPackage {
-    name = "List-MoreUtils-0.22";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/V/VP/VPARSEVAL/List-MoreUtils-0.22.tar.gz;
-      sha256 = "1dv21xclh6r1cyy19r34xv2w6pc1jb5pwj7b2739m78xhlk8p55l";
-    };
-  };
-
-  perlLocaleGettext = buildPerlPackage {
-    name = "LocaleGettext-1.05";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz;
-      sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7";
-    };
-  };
-
-  perlLocaleMaketext = buildPerlPackage {
-    name = "Locale-Maketext-1.13";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/F/FE/FERREIRA/Locale-Maketext-1.13.tar.gz;
-      sha256 = "0qvrhcs1f28ix3v8hcd5xr4z9s7plz4g5a4q1cjp7bs0c3w2yl6z";
-    };
-    propagatedBuildInputs = [perlI18NLangTags];
-  };
-
-  perlLocaleMaketextLexicon = buildPerlPackage {
-    name = "Locale-Maketext-Lexicon-0.66";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Lexicon-0.66.tar.gz;
-      sha256 = "1cd2kbcrlyjcmlr7m8kf94mm1hlr7hpv1r80a596f4ljk81f2nvd";
-    };
-    propagatedBuildInputs = [perlLocaleMaketext];
-  };
-
-  perlLocaleMaketextSimple = buildPerlPackage {
-    name = "Locale-Maketext-Simple-0.18";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Simple-0.18.tar.gz;
-      sha256 = "14kx7vkxyfqndy90rzavrjp2346aidyc7x5dzzdj293qf8s4q6ig";
-    };
-  };
-
-  perlLWP = buildPerlPackage rec {
-    name = "libwww-perl-5.825";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
-      sha256 = "1wb7br1n86571xz19l20cc5ysy1lx3rhvlk02g5517919z3jxvhw";
-    };
-    propagatedBuildInputs = [perlURI perlHTMLParser perlHTMLTagset];
-  };
-
-  perlMailTools = buildPerlPackage {
-    name = "MailTools-2.04";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.04.tar.gz;
-      sha256 = "0w91rcrz4v0pjdnnv2mvlbrm9ww32f7ajhr7xkjdhhr3455p7adx";
-    };
-    propagatedBuildInputs = [perlTimeDate perlTestPod];
-  };
-
-  perlMIMETypes = buildPerlPackage {
-    name = "MIME-Types-1.24";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-1.24.tar.gz;
-      sha256 = "1j89kjv9lipv6r3bq6dp0k9b8y1f8z9vrmhi7b8h7cs1yc8g7qz9";
-    };
-    propagatedBuildInputs = [perlTestPod];
-  };
-
-  perlModuleBuild = buildPerlPackage {
-    name = "Module-Build-0.2808";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Module-Build-0.2808.tar.gz;
-      sha256 = "1h8zpf4g2n8v47l9apmdqbdgcg039g70w75hpn84m37pmqkbnj8v";
-    };
-    propagatedBuildInputs = [perlExtUtilsInstall perlExtUtilsManifest perlTestHarness];
-  };
-
-  perlModuleFind = buildPerlPackage {
-    name = "Module-Find-0.06";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.06.tar.gz;
-      sha256 = "1394jk0rn2zmchpl11kim69xh5h5yzg96jdlf76fqrk3dcn0y2ip";
-    };
-  };
-
-  perlMoose = buildPerlPackage rec {
-    name = "Moose-0.73";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "1h1d551fbrsbr0knvcah4jyg999667ykhgbldl5rv4h7kdzsqsvz";
-    };
-    propagatedBuildInputs = [
-      perlTestMore perlTestException perlTaskWeaken perlListMoreUtils
-      perlClassMOP perlSubExporter
-    ];
-  };
-
-  perlMooseXEmulateClassAccessorFast = buildPerlPackage rec {
-    name = "MooseX-Emulate-Class-Accessor-Fast-0.00800";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/G/GR/GRODITI/${name}.tar.gz";
-      sha256 = "1z2sld2sw1mlwxwzxxanik3086cw14rdsx2wwnzrfy7prsnigcl2";
-    };
-    propagatedBuildInputs = [perlMoose perlNamespaceClean];
-  };
-
-  perlMouse = buildPerlPackage {
-    name = "Mouse-0.09";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SA/SARTAK/Mouse-0.09.tar.gz;
-      sha256 = "1akymbjim6w6i1q8h97izah26ndmcbnl1lwdsw9fa22hnhm0axg0";
-    };
-  };
-
-  perlMROCompat = buildPerlPackage {
-    name = "MRO-Compat-0.09";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/B/BL/BLBLACK/MRO-Compat-0.09.tar.gz;
-      sha256 = "16l37bxd5apax4kyvnadiplz8xmmx76y9pyq9iksqrv0d5rl5vl8";
-    };
-  };
-
-  perlNamespaceClean = buildPerlPackage {
-    name = "namespace-clean-0.08";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/P/PH/PHAYLON/namespace-clean-0.08.tar.gz;
-      sha256 = "1jwc15zz1j6indqgz64l09ayg0db4gfaasq74x0vyi1yx3d9x2yx";
-    };
-    propagatedBuildInputs = [perlScopeGuard];
-  };
-
-  perlNetDNS = buildPerlPackage {
-    name = "Net-DNS-0.63";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/O/OL/OLAF/Net-DNS-0.63.tar.gz;
-      sha256 = "1pswrwhkav051xahm3k4cbyhi8kqpfmaz85lw44kwi2wc7mz4prk";
-    };
-    propagatedBuildInputs = [perlNetIP perlDigestHMAC];
-    doCheck = false;
-  };
-
-  perlNetIP = buildPerlPackage {
-    name = "Net-IP-1.25";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz;
-      sha256 = "1iv0ka6d8kp9iana6zn51sxbcmz2h3mbn6cd8pald36q5whf5mjc";
-    };
-  };
-
-  perlNetServer = buildPerlPackage rec {
-    name = "Net-Server-0.97";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RH/RHANDOM/${name}.tar.gz";
-      sha256 = "13vhv13w06g6h6iqx440q1h6hwj0kpjdxcc3fl9crkwg5glygg2f";
-    };
-    doCheck = false; # seems to hang waiting for connections
-  };
-
-  perlObjectSignature = buildPerlPackage {
-    name = "Object-Signature-1.05";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AD/ADAMK/Object-Signature-1.05.tar.gz;
-      sha256 = "10k9j18jpb16brv0hs7592r7hx877290pafb8gnk6ydy7hcq9r2j";
-    };
-  };
-
-  perlParamsUtil = buildPerlPackage rec {
-    name = "Params-Util-0.37";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
-      sha256 = "1n36vhahbs2mfck5x6g8ab9280zji9zwc5092jiq78s791227cb6";
-    };
-  };
-
-  perlParamsValidate = buildPerlPackage rec {
-    name = "Params-Validate-0.91";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "1j0hx3pbfdyggbhrawa9k0wdm6lln3zdkrhjrdg1hzzf6csrlc1v";
-    };
-  };
-
-  perlParent = buildPerlPackage {
-    name = "parent-0.221";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CO/CORION/parent-0.221.tar.gz;
-      sha256 = "17jhscpa5p5szh1173pd6wvh2m05an1l941zqq9jkw9bzgk12hm0";
-    };
-  };
-
-  perlPathClass = buildPerlPackage {
-    name = "Path-Class-0.16";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.16.tar.gz;
-      sha256 = "0zisxkj58jm84fwcssmdq8g6n37s33v5h7j28m12sbkqib0h76gc";
-    };
-  };
-
-  perlPerl5lib = buildPerlPackage rec {
-    name = "perl5lib-1.02";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/N/NO/NOBULL/${name}.tar.gz";
-      sha256 = "1b6fgs8wy2a7ff8rr1qdvdghhvlpr1pv760k4i2c8lq1hhjnkf94";
-    };
-  };
-
-  perlPerlIOeol = buildPerlPackage {
-    name = "PerlIO-eol-0.14";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AU/AUDREYT/PerlIO-eol-0.14.tar.gz;
-      sha256 = "1rwj0r075jfvvd0fnzgdqldc7qdb94wwsi21rs2l6yhcv0380fs2";
-    };
-  };
-
-  perlPerlIOviadynamic = buildPerlPackage {
-    name = "PerlIO-via-dynamic-0.12";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-dynamic-0.12.tar.gz;
-      sha256 = "140hay9q8q9sz1fa2s57ijp5l2448fkcg7indgn6k4vc7yshmqz2";
-    };
-  };
-
-  perlPerlIOviasymlink = buildPerlPackage {
-    name = "PerlIO-via-symlink-0.05";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-symlink-0.05.tar.gz;
-      sha256 = "0lidddcaz9anddqrpqk4zwm550igv6amdhj86i2jjdka9b1x81s1";
-    };
-  };
-
-  perlModulePluggable = buildPerlPackage {
-    name = "Module-Pluggable-3.5";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-3.5.tar.gz;
-      sha256 = "08rywi79pqn2c8zr17fmd18lpj5hm8lxd1j4v2k002ni8vhl43nv";
-    };
-    patches = [
-      # !!! merge this patch into Perl itself (which contains Module::Pluggable as well)
-      ../development/perl-modules/module-pluggable.patch
-    ];
-  };
-
-  perlModulePluggableFast = buildPerlPackage {
-    name = "Module-Pluggable-Fast-0.18";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SR/SRI/Module-Pluggable-Fast-0.18.tar.gz;
-      sha256 = "140c311x2darrc2p1drbkafv7qwhzdcff4ad300n6whsx4dfp6wr";
-    };
-    propagatedBuildInputs = [perlUNIVERSALrequire];
-  };
-
-  perlPodCoverage = buildPerlPackage rec {
-    name = "Pod-Coverage-0.19";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz";
-      sha256 = "1krsz4zwmnmq3z29p5vmyr5fdzrn8v0sg6rf3qxk7xpxw4z5np84";
-    };
-    propagatedBuildInputs = [perlDevelSymdump];
-  };
-
-  perlPodEscapes = buildPerlPackage {
-    name = "Pod-Escapes-1.04";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SB/SBURKE/Pod-Escapes-1.04.tar.gz;
-      sha256 = "1wrg5dnsl785ygga7bp6qmakhjgh9n4g3jp2l85ab02r502cagig";
-    };
-  };
-
-  perlPodSimple = buildPerlPackage {
-    name = "Pod-Simple-3.05";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AR/ARANDAL/Pod-Simple-3.05.tar.gz;
-      sha256 = "1j0kqcvr9ykcqlkr797j1npkbggykb3p4w5ri73s8mi163lzxkqb";
-    };
-    propagatedBuildInputs = [perlconstant perlPodEscapes];
-  };
-
-  perlReadonly = buildPerlPackage rec {
-    name = "Readonly-1.03";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz";
-      sha256 = "1shkyxajh6l87nif47ygnfxjwvqf3d3kjpdvxaff4957vqanii2k";
-    };
-  };
-
-  perlRegexpAssemble = buildPerlPackage rec {
-    name = "Regexp-Assemble-0.34";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DL/DLAND/${name}.tar.gz";
-      sha256 = "173dnzi3dag88afr4xf5v0hki15cfaffyjimjfmvzv6gbx6fp96f";
-    };
-  };
-
-  perlRegexpCommon = buildPerlPackage rec {
-    name = "Regexp-Common-2.122";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AB/ABIGAIL/${name}.tar.gz";
-      sha256 = "1mi411nfsx58nfsgjsbyck50x9d0yfvwqpw63iavajlpx1z38n8r";
-    };
-  };
-
-  perlRegexpCopy = buildPerlPackage rec {
-    name = "Regexp-Copy-0.06";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JD/JDUNCAN/${name}.tar.gz";
-      sha256 = "09c8xb43p1s6ala6g4274az51mf33phyjkp66dpvgkgbi1xfnawp";
-    };
-  };
-
-  perlReturnValue = buildPerlPackage {
-    name = "Return-Value-1.302";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.302.tar.gz;
-      sha256 = "0hf5rmfap49jh8dnggdpvapy5r4awgx5hdc3acc9ff0vfqav8azm";
-    };
-  };
-
-  perlScopeGuard = buildPerlPackage {
-    name = "Scope-Guard-0.03";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.03.tar.gz;
-      sha256 = "07x966fkqxlwnngxs7a2jrhabh8gzhjfpqq56n9gkwy7f340sayb";
-    };
-  };
-
-  perlScopeUpper = buildPerlPackage rec {
-    name = "Scope-Upper-0.06";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz";
-      sha256 = "1qaf310wbfpjb0lmg3fpmhbfnjxqw3j47rj0w0f0cy4bgihi8l43";
-    };
-  };
-
-  perlSetObject = buildPerlPackage {
-    name = "Set-Object-1.26";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SA/SAMV/Set-Object-1.26.tar.gz;
-      sha256 = "1hx3wrw8xkvaggacc8zyn86hfi3079ahmia1n8vsw7dglp1bbhmj";
-    };
-  };
-
-  perlSQLAbstract = buildPerlPackage rec {
-    name = "SQL-Abstract-1.51";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz";
-      sha256 = "1q77yfdrkadf738zvdgarkv0136zs2shz3fdmwaaf03bhvhcbap2";
-    };
-    propagatedBuildInputs = [
-      perlTestDeep perlTestException perlTestWarn
-    ];
-  };
-
-  perlSQLAbstractLimit = buildPerlPackage rec {
-    name = "SQL-Abstract-Limit-0.141";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DA/DAVEBAIRD/${name}.tar.gz";
-      sha256 = "1qqh89kz065mkgyg5pjcgbf8qcpzfk8vf1lgkbwynknadmv87zqg";
-    };
-    propagatedBuildInputs = [
-      perlSQLAbstract perlTestException perlDBI perlTestDeep
-    ];
-    buildInputs = [perlTestPod perlTestPodCoverage];
-  };
-
-  perlStringMkPasswd = buildPerlPackage {
-    name = "String-MkPasswd-0.02";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CG/CGRAU/String-MkPasswd-0.02.tar.gz;
-      sha256 = "0si4xfgf8c2pfag1cqbr9jbyvg3hak6wkmny56kn2qwa4ljp9bk6";
-    };
-  };
-
-  perlSubExporter = buildPerlPackage rec {
-    name = "Sub-Exporter-0.982";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "0xf8q05k5xs3bw6qy3pnnl5d670njxsxbw2dprl7n50hf488cbvj";
-    };
-    propagatedBuildInputs = [perlSubInstall perlDataOptList perlParamsUtil];
-  };
-
-  perlSubIdentify = buildPerlPackage rec {
-    name = "Sub-Identify-0.04";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz";
-      sha256 = "16g4dkmb4h5hh15jsq0kvsf3irrlrlqdv7qk6605wh5gjjwbcjxy";
-    };
-  };
-
-  perlSubInstall = buildPerlPackage rec {
-    name = "Sub-Install-0.925";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "1sccc4nwp9y24zkr42ww2gwg6zwax4madi9spsdym1pqna3nwnm6";
-    };
-  };
-
-  perlSubName = buildPerlPackage {
-    name = "Sub-Name-0.04";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/X/XM/XMATH/Sub-Name-0.04.tar.gz;
-      sha256 = "1nlin0ag2krpmiyapp3lzb6qw2yfqvqmx57iz5zwbhr4pyi46bhb";
-    };
-  };
-
-  perlSubOverride = buildPerlPackage rec {
-    name = "Sub-Override-0.08";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz";
-      sha256 = "13s5zi6qz02q50vv4bmwdmhn9gvg0988fydjlrrv500g6hnyzlkj";
-    };
-    propagatedBuildInputs = [perlSubUplevel perlTestException];
-  };
-
-  perlSubUplevel = buildPerlPackage {
-    name = "Sub-Uplevel-0.2002";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2002.tar.gz;
-      sha256 = "19b2b9xsw7lvvkcmmnhhv8ybxdkbnrky9nnqgjridr108ww9m5rh";
-    };
-  };
-
-  perlSVK = buildPerlPackage {
-    name = "SVK-v2.0.2";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/SVK-v2.0.2.tar.gz;
-      sha256 = "0c4m2q7cvzwh9kk1nc1vd8lkxx2kss5nd4k20dpkal4c7735jns0";
-    };
-    propagatedBuildInputs = [perlAlgorithmDiff perlAlgorithmAnnotate perlAppCLI perlClassDataInheritable perlDataHierarchy perlEncode perlFileTemp perlIODigest perlListMoreUtils perlPathClass perlPerlIOeol perlPerlIOviadynamic perlPerlIOviasymlink perlPodEscapes perlPodSimple perlSVNMirror perlTimeHiRes perlUNIVERSALrequire perlURI perlYAMLSyck perlClassAutouse perlIOPager perlLocaleMaketextLexicon perlFreezeThaw];
-  };
-
-  perlSVNMirror = buildPerlPackage {
-    name = "SVN-Mirror-0.73";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Mirror-0.73.tar.gz;
-      sha256 = "1scjaq7qjz6jlsk1c2l5q15yxf0sqbydvf22mb2xzy1bzaln0x2c";
-    };
-    propagatedBuildInputs = [perlClassAccessor perlFilechdir subversion perlURI perlTermReadKey perlTimeDate perlSVNSimple];
-  };
-
-  perlSVNSimple = buildPerlPackage {
-    name = "SVN-Simple-0.27";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Simple-0.27.tar.gz;
-      sha256 = "0p7p52ja6sf4j0w3b05i0bbqi5wiambckw2m5dsr63bbmlhv4a71";
-    };
-    propagatedBuildInputs = [subversion];
-  };
-
-  perlTaskCatalystTutorial = buildPerlPackage rec {
-    name = "Task-Catalyst-Tutorial-0.06";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
-      sha256 = "07nn8a30n3qylpnf7s4ma6w462g31pywwikib117hr2mc7cv5cbm";
-    };
-    propagatedBuildInputs = [
-      perlCatalystManual perlCatalystRuntime perlCatalystDevel
-      perlCatalystPluginSession perlCatalystPluginAuthentication
-      perlCatalystAuthenticationStoreDBIxClass
-      perlCatalystPluginAuthorizationRoles
-      perlCatalystPluginAuthorizationACL
-      perlCatalystPluginHTMLWidget
-      perlCatalystPluginSessionStoreFastMmap
-      perlCatalystPluginStackTrace
-      perlCatalystViewTT
-      perlDBIxClass perlDBIxClassHTMLWidget
-      perlCatalystControllerHTMLFormFu
-    ];
-    buildInputs = [perlTestPodCoverage];
-  };
-
-  perlTaskWeaken = buildPerlPackage {
-    name = "Task-Weaken-1.02";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AD/ADAMK/Task-Weaken-1.02.tar.gz;
-      sha256 = "10f9kd1lwbscmmjwgbfwa4kkp723mb463lkbmh29rlhbsl7kb5wz";
-    };
-  };
-
-  perlTemplateTimer = buildPerlPackage {
-    name = "Template-Timer-0.04";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/P/PE/PETDANCE/Template-Timer-0.04.tar.gz;
-      sha256 = "0j0gmxbq1svp0rb4kprwj2fk2mhl07yah08bksfz0a0pfz6lsam4";
-    };
-    propagatedBuildInputs = [perlTemplateToolkit];
-  };
-
-  perlTemplateToolkit = buildPerlPackage {
-    name = "Template-Toolkit-2.20";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.20.tar.gz;
-      sha256 = "13wbh06a76k4ag14lhszmpwv4hb8hlj1d9glizhp8izazl3xf1zg";
-    };
-    propagatedBuildInputs = [perlAppConfig];
-    patches = [
-      # Needed to make TT works properly on templates in the Nix store.
-      ../development/perl-modules/template-toolkit-nix-store.patch
-    ];
-  };
-
-  perlTermReadKey = buildPerlPackage {
-    name = "TermReadKey-2.30";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.30.tar.gz;
-      md5 = "f0ef2cea8acfbcc58d865c05b0c7e1ff";
-    };
-  };
-
-  perlTestDeep = buildPerlPackage {
-    name = "Test-Deep-0.103";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/F/FD/FDALY/Test-Deep-0.103.tar.gz;
-      sha256 = "0cdl08k5v0wc9w20va5qw98ynlbs9ifwndgsix8qhi7h15sj8a5j";
-    };
-    propagatedBuildInputs = [perlTestTester perlTestNoWarnings];
-  };
-
-  perlTestException = buildPerlPackage {
-    name = "Test-Exception-0.27";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AD/ADIE/Test-Exception-0.27.tar.gz;
-      sha256 = "1s921j7yv2szywd1ffi6yz3ngrbq97f9dh38bvvajqnm29g1xb9j";
-    };
-    propagatedBuildInputs = [perlTestHarness perlTestSimple perlSubUplevel];
-  };
-
-  perlTestHarness = buildPerlPackage {
-    name = "Test-Harness-3.10";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AN/ANDYA/Test-Harness-3.10.tar.gz;
-      sha256 = "1qd217yzppj1vbjhny06v8niqhz85pam996ry6bzi08z0jidr2wh";
-    };
-  };
-
-  perlTestLongString = buildPerlPackage rec {
-    name = "Test-LongString-0.11";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz";
-      sha256 = "0ln3117nfxzq7yxmfk77nnr7116inbjq4bf5v2p0hqlj4damx03d";
-    };
-  };
-
-  perlTestMockObject = buildPerlPackage {
-    name = "Test-MockObject-1.09";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.09.tar.gz;
-      sha256 = "1cz385x0jrkj84nmfs6qyzwwvv8m9v8r2isagfj1zxvhdw49wdyy";
-    };
-    propagatedBuildInputs = [perlTestException perlUNIVERSALisa perlUNIVERSALcan];
-  };
-
-  perlTestMockTime = buildPerlPackage rec {
-    name = "Test-MockTime-0.09";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DD/DDICK/${name}.tar.gz";
-      sha256 = "1j2riyikzyfkxsgkfdqirs7xa8q5d06b9klpk7l9sgydwqdvxdv3";
-    };
-  };
-
-  perlTestMore = perlTestSimple;
-
-  perlTestNoWarnings = buildPerlPackage {
-    name = "Test-NoWarnings-0.084";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/F/FD/FDALY/Test-NoWarnings-0.084.tar.gz;
-      sha256 = "19g47pa3brr9px3jnwziapvxcnghqqjjwxz1jfch4asawpdx2s8b";
-    };
-    propagatedBuildInputs = [perlTestTester];
-  };
-
-  perlTestPod = buildPerlPackage {
-    name = "Test-Pod-1.26";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Pod-1.26.tar.gz;
-      sha256 = "025rviipiaa1rf0bp040jlwaxwvx48kdcjriaysvkjpyvilwvqd4";
-    };
-  };
-
-  perlTestPodCoverage = buildPerlPackage rec {
-    name = "Test-Pod-Coverage-1.08";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
-      sha256 = "0y2md932zhbxdjwzskx0vmw2qy7jxkn87f9lb5h3f3vxxg1kcqz0";
-    };
-    propagatedBuildInputs = [perlPodCoverage];
-  };
-
-  perlTestSimple = buildPerlPackage {
-    name = "Test-Simple-0.84";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Simple-0.84.tar.gz;
-      sha256 = "030j47q3p46jfk60dsh2d5m7ip4nqz0fl4inqr8hx8b8q0f00r4l";
-    };
-    propagatedBuildInputs = [perlTestHarness];
-  };
-
-  perlTestTester = buildPerlPackage {
-    name = "Test-Tester-0.107";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.107.tar.gz;
-      sha256 = "0qgmsl6s6xm39211lywyzwrlz0gcmax7fb8zipybs9yxfmwcvyx2";
-    };
-  };
-
-  perlTestUseOk = buildPerlPackage rec {
-    name = "Test-use-ok-0.02";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AU/AUDREYT/${name}.tar.gz";
-      sha256 = "11inaxiavb35k8zwxwbfbp9wcffvfqas7k9idy822grn2sz5gyig";
-    };
-  };
-
-  perlTestWarn = buildPerlPackage {
-    name = "Test-Warn-0.11";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CH/CHORNY/Test-Warn-0.11.tar.gz;
-      sha256 = "1y9g13bzvjsmg5v555zrl7w085jq40a47hfs4gc3k78s0bkwxbyi";
-    };
-    propagatedBuildInputs = [perlTestSimple perlTestException perlArrayCompare perlTreeDAGNode];
-    buildInputs = [perlTestPod];
-  };
-
-  perlTestWWWMechanize = buildPerlPackage rec {
-    name = "Test-WWW-Mechanize-1.24";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
-      sha256 = "11knym5ppish78rk8r1hymvq1py43h7z8d6nk8p4ig3p246xx5qa";
-    };
-    propagatedBuildInputs = [
-      perlCarpAssertMore perlURI perlTestLongString perlWWWMechanize
-    ];
-    doCheck = false;
-  };
-
-  perlTestWWWMechanizeCatalyst = buildPerlPackage rec {
-    name = "Test-WWW-Mechanize-Catalyst-0.45";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/L/LB/LBROCARD/${name}.tar.gz";
-      sha256 = "0hixz0hibv2z87kdqvrphzgww0xibgg56w7bh299dgw2739hy4yf";
-    };
-    propagatedBuildInputs = [
-      perlCatalystRuntime perlTestWWWMechanize perlWWWMechanize
-      perlCatalystPluginSessionStateCookie
-    ];
-    buildInputs = [perlTestPod];
-    doCheck = false;
-  };
-
-  perlTextCSV = buildPerlPackage rec {
-    name = "Text-CSV-1.10";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/${name}.tar.gz";
-      sha256 = "0vb0093v3kk7iczb46zzdg7myfyjldwrk8wbk7ibk56gvj350f7c";
-    };
-  };
-
-  perlTextSimpleTable = buildPerlPackage {
-    name = "Text-SimpleTable-0.05";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SR/SRI/Text-SimpleTable-0.05.tar.gz;
-      sha256 = "028pdfmr2gnaq8w3iar8kqvrpxcghnag8ls7h4227l9zbxd1k9p9";
-    };
-  };
-
-  perlTieToObject = buildPerlPackage {
-    name = "Tie-ToObject-0.03";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz;
-      sha256 = "1x1smn1kw383xc5h9wajxk9dlx92bgrbf7gk4abga57y6120s6m3";
-    };
-    propagatedBuildInputs = [perlTestUseOk];
-  };
-
-  perlTimeDate = buildPerlPackage {
-    name = "TimeDate-1.16";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GB/GBARR/TimeDate-1.16.tar.gz;
-      sha256 = "1cvcpaghn7dc14m9871sfw103g3m3a00m2mrl5iqb0mmh40yyhkr";
-    };
-  };
-
-  perlTimeHiRes = buildPerlPackage {
-    name = "Time-HiRes-1.9715";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9715.tar.gz;
-      sha256 = "0pgqrfkysy3mdcx5nd0x8c80lgqb7rkb3nrkii3vc576dcbpvw0i";
-    };
-  };
-
-  perlTreeDAGNode = buildPerlPackage {
-    name = "Tree-DAG_Node-1.06";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CO/COGENT/Tree-DAG_Node-1.06.tar.gz;
-      sha256 = "0anvwfh4vqj41ipq52p65sqlvw3rvm6cla5hbws13gyk9mvp09ah";
-    };
-  };
-
-  perlTreeSimple = buildPerlPackage {
-    name = "Tree-Simple-1.18";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/ST/STEVAN/Tree-Simple-1.18.tar.gz;
-      sha256 = "0bb2hc8q5rwvz8a9n6f49kzx992cxczmrvq82d71757v087dzg6g";
-    };
-    propagatedBuildInputs = [perlTestException];
-  };
-
-  perlTreeSimpleVisitorFactory = buildPerlPackage {
-    name = "Tree-Simple-VisitorFactory-0.10";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/ST/STEVAN/Tree-Simple-VisitorFactory-0.10.tar.gz;
-      sha256 = "1ghcgnb3xvqjyh4h4aa37x98613aldnpj738z9b80p33bbfxq158";
-    };
-    propagatedBuildInputs = [perlTreeSimple];
-    buildInputs = [perlTestException];
-  };
-
-  perlFontTTF = buildPerlPackage {
-    name = "perl-Font-TTF-0.43";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.43.tar.gz;
-      sha256 = "0782mj5n5a2qbghvvr20x51llizly6q5smak98kzhgq9a7q3fg89";
-    };
-  };
-
-  perlUNIVERSALcan = buildPerlPackage {
-    name = "UNIVERSAL-can-1.12";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.12.tar.gz;
-      sha256 = "1abadbgcy11cmlmj9qf1v73ycic1qhysxv5xx81h8s4p81alialr";
-    };
-  };
-
-  perlUNIVERSALisa = stdenv.mkDerivation rec {
-    name = "UNIVERSAL-isa-1.01";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz";
-      sha256 = "0iksklmfhiaxg2rsw827n97k1mris6dg596rdwk2gmrwl0rsk0wz";
-    };
-    # Urgh, this package doesn't have a Makefile.PL.
-    buildInputs = [perl];
-    configurePhase = "perl Build.PL --prefix=$out";
-    buildPhase = "perl ./Build";
-    doCheck = true;
-    checkPhase = "perl ./Build test";
-    installPhase = "perl ./Build install";
-  };
-
-  perlUNIVERSALrequire = buildPerlPackage {
-    name = "UNIVERSAL-require-0.11";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSCHWERN/UNIVERSAL-require-0.11.tar.gz;
-      sha256 = "1rh7i3gva4m96m31g6yfhlqcabszhghbb3k3qwxbgx3mkf5s6x6i";
-    };
-  };
-
-  perlURI = buildPerlPackage rec {
-    name = "URI-1.37";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
-      sha256 = "0amwbss2gz00fkdfnfixf1afmqal1246xhmj27g5c0ny7ahcid0j";
-    };
-  };
-
-  perlW3CLinkChecker = buildPerlPackage rec {
-    name = "W3C-LinkChecker-4.5";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SC/SCOP/${name}.tar.gz";
-      sha256 = "0j2zlg57g0y9hqy8n35x5rfkpm7rnfjlwny5g0zaxwrl62ndkbm9";
-    };
-    propagatedBuildInputs = [
-      perlLWP perlConfigGeneral perlNetIP perlTermReadKey perlPerl5lib
-      perlCryptSSLeay
-    ];
-    meta = {
-      homepage = http://validator.w3.org/checklink;
-      description = "A tool to check links and anchors in Web pages or full Web sites";
-    };
-  };
-
-  perlWWWMechanize = buildPerlPackage rec {
-    name = "WWW-Mechanize-1.54";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
-      sha256 = "1yxvw5xfng5fj4422869p5dwvmrkmqph9gdm2nl12wngydk93lnh";
-    };
-    propagatedBuildInputs = [perlLWP perlHTTPResponseEncoding perlHTTPServerSimple];
-    doCheck = false;
-  };
-
-  perlXMLDOM = buildPerlPackage {
-    name = "XML-DOM-1.44";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.44.tar.gz;
-      sha256 = "1r0ampc88ni3sjpzr583k86076qg399arfm9xirv3cw49k3k5bzn";
-    };
-    #buildInputs = [libxml2];
-    propagatedBuildInputs = [perlXMLRegExp perlXMLParser perlLWP];
-  };
-
-  perlXMLLibXML = buildPerlPackage {
-    name = "XML-LibXML-1.66";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/P/PA/PAJAS/XML-LibXML-1.66.tar.gz;
-      sha256 = "1a0bdiv3px6igxnbbjq10064iahm8f5i310p4y05w6zn5d51awyl";
-    };
-    buildInputs = [libxml2];
-    propagatedBuildInputs = [perlXMLLibXMLCommon perlXMLSAX];
-  };
-
-  perlXMLLibXMLCommon = buildPerlPackage {
-    name = "XML-LibXML-Common-0.13";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/P/PH/PHISH/XML-LibXML-Common-0.13.tar.gz;
-      md5 = "13b6d93f53375d15fd11922216249659";
-    };
-    buildInputs = [libxml2];
-  };
-
-  perlXMLNamespaceSupport = buildPerlPackage {
-    name = "XML-NamespaceSupport-1.09";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RB/RBERJON/XML-NamespaceSupport-1.09.tar.gz;
-      sha256 = "0ny2i4pf6j8ggfj1x02rm5zm9a37hfalgx9w9kxnk69xsixfwb51";
-    };
-    buildInputs = [];
-  };
-
-  perlXMLParser = buildPerlPackage {
-    name = "XML-Parser-2.36";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz;
-      sha256 = "0gyp5qfbflhkin1zv8l6wlkjwfjvsf45a3py4vc6ni82fj32kmcz";
-    };
-    makeMakerFlags = "EXPATLIBPATH=${expat}/lib EXPATINCPATH=${expat}/include";
-  };
-
-  perlXMLRegExp = buildPerlPackage {
-    name = "XML-RegExp-0.03";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.03.tar.gz;
-      sha256 = "1gkarylvdk3mddmchcwvzq09gpvx5z26nybp38dg7mjixm5bs226";
-    };
-  };
-
-  perlXMLSAX = buildPerlPackage {
-    name = "XML-SAX-0.96";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-0.96.tar.gz;
-      sha256 = "024fbjgg6s87j0y3yik55plzf7d6qpn7slwd03glcb54mw9zdglv";
-    };
-    propagatedBuildInputs = [perlXMLNamespaceSupport];
-  };
-
-  perlXMLSimple = buildPerlPackage {
-    name = "XML-Simple-2.18";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.18.tar.gz;
-      sha256 = "09k8fvc9m5nd5rqq00rwm3m0wx7iwd6vx0vc947y58ydi30nfjd5";
-    };
-    propagatedBuildInputs = [perlXMLParser];
-  };
-
-  perlXMLTwig = buildPerlPackage {
-    name = "XML-Twig-3.32";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.32.tar.gz;
-      sha256 = "07zdsfzw9dlrx6ril9clf1jfif09vpf27rz66laja7mvih9izd1v";
-    };
-    propagatedBuildInputs = [perlXMLParser];
-  };
-
-  perlXMLWriter = buildPerlPackage {
-    name = "XML-Writer-0.602";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.602.tar.gz;
-      sha256 = "0kdi022jcn9mwqsxy2fiwl2cjlid4x13r038jvi426fhjknl11nl";
-    };
-  };
-
-  perlXSLoader = buildPerlPackage {
-    name = "XSLoader-0.08";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.08.tar.gz;
-      sha256 = "0mr4l3givrpyvz1kg0kap2ds8g0rza2cim9kbnjy8hi64igkixi5";
-    };
-  };
-
-  perlYAML = buildPerlPackage rec {
-    name = "YAML-0.68";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
-      sha256 = "0yg0pgsjkfczsblx03rxlw4ib92k0gwdyb1a258xb9wdg0w61h34";
-    };
-  };
-
-  perlYAMLSyck = buildPerlPackage rec {
-    name = "YAML-Syck-1.05";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AU/AUDREYT/${name}.tar.gz";
-      sha256 = "15acwp2qdxfmhfqj4c1s57xyy48hcfc87lblww3lbvihqbysyzss";
-    };
-  };
+  perlXMLParser = perlPackages.perlXMLParser;
 
 
   ### DEVELOPMENT / PYTHON MODULES
@@ -7486,8 +5416,8 @@ let
   };
 
   dejavu_fonts = import ../data/fonts/dejavu-fonts {
-    inherit fetchurl stdenv fontforge perl perlFontTTF
-      fontconfig;
+    inherit fetchurl stdenv fontforge perl fontconfig;
+    inherit (perlPackages) perlFontTTF;
   };
 
   docbook5 = import ../data/sgml+xml/schemas/docbook-5.0 {
@@ -8556,15 +6486,14 @@ let
   };
 
   openoffice = import ../applications/office/openoffice {
-    inherit fetchurl stdenv pam python tcsh libxslt
-      perl perlArchiveZip perlCompressZlib zlib libjpeg
-      expat pkgconfig freetype fontconfig libwpd libxml2
-      db4 sablotron curl libsndfile flex zip unzip libmspack
-      getopt file neon cairo which icu jdk ant hsqldb
-      cups openssl bison;
+    inherit fetchurl stdenv pam python tcsh libxslt perl zlib libjpeg
+      expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron
+      curl libsndfile flex zip unzip libmspack getopt file neon cairo
+      which icu jdk ant hsqldb cups openssl bison;
     boost = boost_1_36_0;
     inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
     inherit (gtkLibs) gtk;
+    inherit (perlPackages) perlArchiveZip perlCompressZlib;
   };
 
   opera = import ../applications/networking/browsers/opera {
@@ -8811,7 +6740,7 @@ let
     static = true;
   }));
 
-  svk = perlSVK;
+  svk = perlPackages.perlSVK;
 
   sylpheed = import ../applications/networking/mailreaders/sylpheed {
     inherit fetchurl stdenv pkgconfig openssl gpgme;
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 0312b70e925..a76d5c29a48 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -142,7 +142,6 @@ let
       par2cmdline
       pciutils
       perl
-      perlTaskCatalystTutorial
       php
       pinentry
       pkgconfig
@@ -215,6 +214,9 @@ let
       zile
       zip
       ;
+    inherit (pkgs.perlPackages)
+      perlTaskCatalystTutorial
+      ;    
     inherit (pkgs.xorg)
       fontbh100dpi
       fontbhlucidatypewriter100dpi
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
new file mode 100644
index 00000000000..008c25a5fb6
--- /dev/null
+++ b/pkgs/top-level/perl-packages.nix
@@ -0,0 +1,2108 @@
+/* This file defines the composition for CPAN (Perl) packages.  It has
+   been factored out of all-packages.nix because there are so many of
+   them.  Also, because most Nix expressions for CPAN packages are
+   trivial, most are actually defined here.  I.e. there's no function
+   for each package in a separate file: the call to the function would
+   be almost as must code as the function itself. */
+
+{pkgs}:
+
+rec {
+
+  inherit (pkgs) buildPerlPackage fetchurl stdenv perl;
+
+  perlAlgorithmAnnotate = buildPerlPackage {
+    name = "Algorithm-Annotate-0.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz;
+      sha256 = "1y92k4nqkscfwpriv8q7c90rjfj85lvwq1k96niv2glk8d37dcf9";
+    };
+    propagatedBuildInputs = [perlAlgorithmDiff];
+  };
+
+  perlAlgorithmDiff = buildPerlPackage rec {
+    name = "Algorithm-Diff-1.1901";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/T/TY/TYEMQ/${name}.zip";
+      sha256 = "0qk60fi49mpyvnfpjd2dzcmya8x3g5zfgb2hrnl7a5krn045g6i2";
+    };
+    buildInputs = [pkgs.unzip];
+  };
+
+  perlAppCLI = buildPerlPackage {
+    name = "App-CLI-0.07";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CL/CLKAO/App-CLI-0.07.tar.gz;
+      sha256 = "000866qsm7jck3ini69b02sgbjwp6s297lsds002r7xk2wb6fqcz";
+    };
+    propagatedBuildInputs = [perlLocaleMaketextSimple];
+  };
+
+  perlAppConfig = buildPerlPackage {
+    name = "AppConfig-1.66";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz;
+      sha256 = "1p1vs9px20lrq9mdwpzp309a8r6rchibsdmxang4krk90pi2sh4b";
+    };
+  };
+
+  perlArrayCompare = buildPerlPackage {
+    name = "Array-Compare-1.16";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-1.16.tar.gz;
+      sha256 = "1iwkn7d07a7vgl3jrv4f0glwapxcbdwwsy3aa6apgwam9119hl7q";
+    };
+  };
+
+  perlArchiveZip = buildPerlPackage {
+    name = "Archive-Zip-1.16";
+    src = fetchurl {
+      url = http://nixos.org/tarballs/Archive-Zip-1.16.tar.gz;
+      md5 = "e28dff400d07b1659d659d8dde7071f1";
+    };
+  };
+
+  perlBerkeleyDB = import ../development/perl-modules/BerkeleyDB {
+    inherit buildPerlPackage fetchurl;
+    inherit (pkgs) db4;
+  };
+
+  perlBitVector = buildPerlPackage {
+    name = "Bit-Vector-6.4";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-6.4.tar.gz;
+      sha256 = "146vr78r6w3cxrm0ji491ylaa1abqh7fs81qhg15g3gzzxfg33bp";
+    };
+    propagatedBuildInputs = [perlCarpClan];
+  };
+
+  perlBoolean = buildPerlPackage rec {
+    name = "boolean-0.20";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
+      sha256 = "1xqhzy3m2r08my13alff9bzl8b6xgd68312834x0hf33yir3l1yn";
+    };
+  };
+
+  perlCacheFastMmap = buildPerlPackage {
+    name = "Cache-FastMmap-1.28";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.28.tar.gz;
+      sha256 = "1m851bz5025wy24mzsi1i8hdyg8bm7lszx9rnn47llsv6hb9v0da";
+    };
+  };
+
+  perlCaptchaReCAPTCHA = buildPerlPackage rec {
+    name = "Captcha-reCAPTCHA-0.92";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz";
+      sha256 = "1fm0fvdy9b7z8k1cyah2qbj0gqlv01chxmqmashwj16198yr7vrc";
+    };
+    propagatedBuildInputs = [perlHTMLTiny perlLWP];
+    buildInputs = [perlTestPod];
+  };
+
+  perlCarpAssert = buildPerlPackage rec {
+    name = "Carp-Assert-0.20";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz";
+      sha256 = "1wzy4lswvwi45ybsm65zlq17rrqx84lsd7rajvd0jvd5af5lmlqd";
+    };
+  };
+
+  perlCarpAssertMore = buildPerlPackage rec {
+    name = "Carp-Assert-More-1.12";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
+      sha256 = "1m9k6z0m10s03x2hnc9mh5d4r8lnczm9bqd54jmnw0wzm4m33lyr";
+    };
+    propagatedBuildInputs = [perlTestException perlCarpAssert];
+  };
+
+  perlCarpClan = buildPerlPackage {
+    name = "Carp-Clan-6.00";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JJ/JJORE/Carp-Clan-6.00.tar.gz;
+      sha256 = "0lbin4i0vzagcwkywpd5x4gz3a4ira4yn5g5v1ip0pbpyqnjk15h";
+    };
+    propagatedBuildInputs = [perlTestException];
+  };
+
+  perlCatalystActionRenderView = buildPerlPackage rec {
+    name = "Catalyst-Action-RenderView-0.09";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
+      sha256 = "06bxbdfjgnwp8zz4mqq2x7n5ng02h94m27l610icsps7r9iwi8f9";
+    };
+    propagatedBuildInputs = [perlCatalystRuntime perlHTTPRequestAsCGI perlDataVisitor];
+  };
+
+  perlCatalystAuthenticationStoreDBIxClass = buildPerlPackage rec {
+    name = "Catalyst-Authentication-Store-DBIx-Class-0.1082";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JA/JAYK/${name}.tar.gz";
+      sha256 = "1rh5jwqw3fb16ll5id8z0igpqdwr0czi0xbaa2igalxr53hh2cni";
+    };
+    propagatedBuildInputs = [
+      perlCatalystRuntime perlCatalystPluginAuthentication perlCatalystModelDBICSchema
+    ];
+  };
+
+  perlCatalystComponentInstancePerContext = buildPerlPackage rec {
+    name = "Catalyst-Component-InstancePerContext-0.001001";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GR/GRODITI/${name}.tar.gz";
+      sha256 = "0wfj4vnn2cvk6jh62amwlg050p37fcwdgrn9amcz24z6w4qgjqvz";
+    };
+    propagatedBuildInputs = [perlCatalystRuntime perlMoose];
+  };
+
+  perlCatalystControllerHTMLFormFu = buildPerlPackage rec {
+    name = "Catalyst-Controller-HTML-FormFu-0.03007";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz";
+      sha256 = "1vrd79d0nbqkana5q483fgsr41idlfgjhf7fpd3hc056z5nq8iyn";
+    };
+    propagatedBuildInputs = [
+      perlCatalystRuntime perlCatalystActionRenderView perlCatalystViewTT
+      perlCatalystPluginConfigLoader perlConfigGeneral
+      perlCatalystComponentInstancePerContext perlMoose
+      perlRegexpAssemble perlTestWWWMechanize
+      perlTestWWWMechanizeCatalyst perlHTMLFormFu
+    ];
+  };
+
+  perlCatalystDevel = buildPerlPackage rec {
+    name = "Catalyst-Devel-1.10";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
+      sha256 = "19ylkx55gaq9xxxcl4a55284in7hdrr2sb6lqz64daq3xp29n73h";
+    };
+    propagatedBuildInputs = [
+      perlCatalystRuntime perlCatalystActionRenderView
+      perlCatalystPluginStaticSimple perlCatalystPluginConfigLoader
+      perlPathClass perlTemplateToolkit perlClassAccessor
+      perlConfigGeneral perlFileCopyRecursive perlParent
+    ];
+  };
+
+  perlCatalystEngineHTTPPrefork = buildPerlPackage rec {
+    name = "Catalyst-Engine-HTTP-Prefork-0.50";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz";
+      sha256 = "1p8mnxqaxd6sxyy9q4f0h5gy4mcnvb3y93y49ziq6kmcvy6yw2p7";
+    };
+    propagatedBuildInputs = [
+      perlCatalystRuntime perlHTTPBody perlNetServer
+      perlCookieXS perlHTTPHeaderParserXS
+    ];
+    buildInputs = [perlTestPod perlTestPodCoverage];
+    patches = [
+      # Fix chunked transfers (they were missing the final CR/LF at
+      # the end, which makes curl barf).
+      ../development/perl-modules/catalyst-fix-chunked-encoding.patch
+    ];
+  };
+
+  perlCatalystManual = buildPerlPackage rec {
+    name = "Catalyst-Manual-5.7016";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/H/HK/HKCLARK/${name}.tar.gz";
+      sha256 = "0axin80dca3xb0n7frn9w8lj43l7dykpwrf7jj44n1v1kyzw813f";
+    };
+    buildInputs = [perlTestPod perlTestPodCoverage];
+  };
+
+  perlCatalystModelDBICSchema = buildPerlPackage {
+    name = "Catalyst-Model-DBIC-Schema-0.23";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Model-DBIC-Schema-0.23.tar.gz;
+      sha256 = "1rzs4czrwr8pnrj0mvfpzc8i2cbw95rx2xirw9bhqs77z2722ym4";
+    };
+    propagatedBuildInputs = [
+      perlCatalystRuntime perlCatalystDevel perlDBIxClass
+      perlUNIVERSALrequire perlClassDataAccessor
+      perlDBIxClassSchemaLoader
+    ];
+  };
+
+  perlCatalystRuntime = buildPerlPackage rec{
+    name = "Catalyst-Runtime-5.71001";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
+      sha256 = "1j3xsh7zi5xd8zdc63r83mwzhjfj30vhd39kgir53mq47v0y07jr";
+    };
+    propagatedBuildInputs = [
+      perlLWP perlClassAccessor perlClassDataInheritable perlClassInspector
+      perlCGISimple perlDataDump perlFileModified perlHTTPBody perlHTTPRequestAsCGI
+      perlPathClass perlTextSimpleTable perlTreeSimple perlTreeSimpleVisitorFactory
+      perlSubExporter perlMROCompat perlTestMockObject perlClassMOP perlMoose
+      perlNamespaceClean perlScopeUpper perlMooseXEmulateClassAccessorFast
+      perlClassC3 perlClassC3AdoptNEXT
+    ];
+  };
+
+  perlCatalystPluginAuthentication = buildPerlPackage rec {
+    name = "Catalyst-Plugin-Authentication-0.10010";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
+      sha256 = "1jjdmyccsq0k8ysl9ppm7rddf6w4l2yhwjr60c0x4lp5iafzmf4z";
+    };
+    propagatedBuildInputs = [perlCatalystRuntime perlCatalystPluginSession];
+  };
+
+  perlCatalystPluginAuthorizationACL = buildPerlPackage {
+    name = "Catalyst-Plugin-Authorization-ACL-0.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-Authorization-ACL-0.10.tar.gz;
+      sha256 = "1y9pj0scpc4nd7m1xqy7yvjsffhfadzl0z5r4jjv2srndcv4xj1p";
+    };
+    propagatedBuildInputs = [perlCatalystRuntime perlClassThrowable];
+  };
+
+  perlCatalystPluginAuthorizationRoles = buildPerlPackage {
+    name = "Catalyst-Plugin-Authorization-Roles-0.07";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BR/BRICAS/Catalyst-Plugin-Authorization-Roles-0.07.tar.gz;
+      sha256 = "07b8zc7b06p0fprjj68fk7rgh781r9s3q8dx045sk03w0fnk3b4b";
+    };
+    propagatedBuildInputs = [
+      perlCatalystRuntime perlCatalystPluginAuthentication
+      perlTestException perlSetObject perlUNIVERSALisa
+    ];
+  };
+
+  perlCatalystPluginConfigLoader = buildPerlPackage rec {
+    name = "Catalyst-Plugin-ConfigLoader-0.22";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/B/BR/BRICAS/${name}.tar.gz";
+      sha256 = "13ir2l0pvjn4myp7wfh2bxcdd4hp0b3ln28mz1kvlshhxl032lqn";
+    };
+    propagatedBuildInputs = [perlCatalystRuntime perlDataVisitor perlConfigAny perlMROCompat];
+  };
+
+  perlCatalystPluginHTMLWidget = buildPerlPackage {
+    name = "Catalyst-Plugin-HTML-Widget-1.1";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SR/SRI/Catalyst-Plugin-HTML-Widget-1.1.tar.gz;
+      sha256 = "1zzyfhmzlqvbwk2w930k3mqk8z1lzhrja9ynx9yfq5gmc8qqg95l";
+    };
+    propagatedBuildInputs = [perlCatalystRuntime perlHTMLWidget];
+  };
+
+  perlCatalystPluginSession = buildPerlPackage rec {
+    name = "Catalyst-Plugin-Session-0.20";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
+      sha256 = "1p72hf68qi038gayhsxbbx3l3hg7b1njjii510alxqyw3a10y9sj";
+    };
+    propagatedBuildInputs = [
+      perlCatalystRuntime perlTestMockObject perlObjectSignature
+      perlTestDeep perlMROCompat
+    ];
+  };
+
+  perlCatalystPluginSessionStateCookie = buildPerlPackage rec {
+    name = "Catalyst-Plugin-Session-State-Cookie-0.10";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
+      sha256 = "1630shg23cpk6v26fwf7xr53ml1s6l2mgirxw524nmciliczgldj";
+    };
+    propagatedBuildInputs = [
+      perlCatalystRuntime perlCatalystPluginSession perlTestMockObject
+    ];
+  };
+
+  perlCatalystPluginSessionStoreFastMmap = buildPerlPackage rec {
+    name = "Catalyst-Plugin-Session-Store-FastMmap-0.06";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/K/KA/KARMAN/${name}.tar.gz";
+      sha256 = "0by8w1zbp2802f9n3sqp0cmm2q0pwnycf0jgzvvv75riicq1m9pn";
+    };
+    propagatedBuildInputs = [
+      perlPathClass perlCatalystPluginSession perlCacheFastMmap
+    ];
+  };
+
+  perlCatalystPluginStackTrace = buildPerlPackage {
+    name = "Catalyst-Plugin-StackTrace-0.09";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-StackTrace-0.09.tar.gz;
+      sha256 = "1pywxjhvn5zmcpnxj9ba77pz1jxq4d037yd43y0ks9sc31p01ydh";
+    };
+    propagatedBuildInputs = [perlCatalystRuntime perlDevelStackTrace];
+  };
+
+  perlCatalystPluginStaticSimple = buildPerlPackage {
+    name = "Catalyst-Plugin-Static-Simple-0.20";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AG/AGRUNDMA/Catalyst-Plugin-Static-Simple-0.20.tar.gz;
+      sha256 = "1qpicgfha81ykxzg4kjll2qw8b1rwzdgvj4s3q9s20zl86gmfr3p";
+    };
+    propagatedBuildInputs = [perlCatalystRuntime perlMIMETypes];
+  };
+
+  perlCatalystViewDownload = buildPerlPackage rec {
+    name = "Catalyst-View-Download-0.04";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GA/GAUDEON/${name}.tar.gz";
+      sha256 = "1d5ck28db6vbks7cwkj1qh0glhxskl3vymksv3izfzbk6xnjrabi";
+    };
+    propagatedBuildInputs = [
+      perlCatalystRuntime perlTestWWWMechanizeCatalyst perlTestUseOk
+      perlTextCSV
+    ];
+  };
+
+  perlCatalystViewTT = buildPerlPackage rec {
+    name = "Catalyst-View-TT-0.28";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
+      sha256 = "18chdzgv0fvq65kfp8am2f5cayxpzg355q7jin4xlzygbgh2a5vg";
+    };
+    propagatedBuildInputs = [
+      perlCatalystRuntime perlTemplateToolkit perlClassAccessor
+      perlPathClass perlTemplateTimer
+    ];
+  };
+
+  perlCGICookieXS = buildPerlPackage rec {
+    name = "CGI-Cookie-XS-0.16";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AG/AGENT/${name}.tar.gz";
+      sha256 = "1jrd3f11sz17117nvssrrf6r80fr412615n5ffspbsap4n816bnn";
+    };
+  };
+
+  perlCGISession = buildPerlPackage {
+    name = "CGI-Session-3.95";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SH/SHERZODR/CGI-Session-3.95.tar.gz;
+      md5 = "fe9e46496c7c711c54ca13209ded500b";
+    };
+  };
+
+  perlCGISimple = buildPerlPackage {
+    name = "CGI-Simple-1.106";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AN/ANDYA/CGI-Simple-1.106.tar.gz;
+      sha256 = "0r0wc2260jnnch7dv7f6ailjf5w8hpqm2w146flfcchcryfxjlpg";
+    };
+  };
+
+  perlClassAccessor = buildPerlPackage {
+    name = "Class-Accessor-0.31";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.31.tar.gz;
+      sha256 = "1a4v5qqdf9bipd6ba5n47mag0cmgwp97cid67i510aw96bcjrsiy";
+    };
+  };
+
+  perlClassAccessorChained = buildPerlPackage {
+    name = "Class-Accessor-Chained-0.01";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz;
+      sha256 = "1lilrjy1s0q5hyr0888kf0ifxjyl2iyk4vxil4jsv0sgh39lkgx5";
+    };
+    propagatedBuildInputs = [perlClassAccessor];
+  };
+
+  perlClassAccessorGrouped = buildPerlPackage rec {
+    name = "Class-Accessor-Grouped-0.08003";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CL/CLACO/${name}.tar.gz";
+      sha256 = "0lvxj8fp79338p52ich0p7hi4gvvf572ks76g9kgkgfyqvmp732k";
+    };
+    propagatedBuildInputs = [perlClassInspector perlMROCompat];
+  };
+
+  perlClassAutouse = buildPerlPackage {
+    name = "Class-Autouse-1.99_02";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-1.99_02.tar.gz;
+      sha256 = "1jkhczx2flxrz154ps90fj9wcchkpmnp5sapwc0l92rpn7jpsf08";
+    };
+  };
+
+  perlClassC3 = buildPerlPackage rec {
+    name = "Class-C3-0.21";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
+      sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz";
+    };
+  };
+
+  perlClassC3AdoptNEXT = buildPerlPackage rec {
+    name = "Class-C3-Adopt-NEXT-0.07";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
+      sha256 = "1kxbdq10vicrbz3i6hvml3mma5x0r523gfdd649f9bvrsizb0jxj";
+    };
+    propagatedBuildInputs = [perlMROCompat perlTestException perlListMoreUtils];
+  };
+
+  perlClassC3Componentised = buildPerlPackage rec {
+    name = "Class-C3-Componentised-1.0004";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz";
+      sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1";
+    };
+    propagatedBuildInputs = [
+      perlClassC3 perlClassInspector perlTestException perlMROCompat
+    ];
+  };
+
+  perlClassDataAccessor = buildPerlPackage {
+    name = "Class-Data-Accessor-0.04004";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz;
+      sha256 = "0578m3rplk41059rkkjy1009xrmrdivjnv8yxadwwdk1vzidc8n1";
+    };
+  };
+
+  perlClassDataInheritable = buildPerlPackage {
+    name = "Class-Data-Inheritable-0.08";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz;
+      sha256 = "0jpi38wy5xh6p1mg2cbyjjw76vgbccqp46685r27w8hmxb7gwrwr";
+    };
+  };
+
+  perlClassFactoryUtil = buildPerlPackage rec {
+    name = "Class-Factory-Util-1.7";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
+      sha256 = "09ifd6v0c94vr20n9yr1dxgcp7hyscqq851szdip7y24bd26nlbc";
+    };
+  };
+
+  perlClassInspector = buildPerlPackage {
+    name = "Class-Inspector-1.23";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Inspector-1.23.tar.gz;
+      sha256 = "0d15b5wls14gqcd6v2k4kbc0v0a1qfb794h49wfc4vwjk5gnpbw1";
+    };
+  };
+
+  perlClassMOP = buildPerlPackage rec {
+    name = "Class-MOP-0.80";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
+      sha256 = "1fmimzzbfkw7vrr57p8xa3y9v55i72bknix2qk3cdrn0jmg6h648";
+    };
+    propagatedBuildInputs = [
+      perlMROCompat perlTaskWeaken perlTestException perlSubName perlSubIdentify
+      perlDevelGlobalDestruction
+    ];
+  };
+
+  perlClassSingleton = buildPerlPackage rec {
+    name = "Class-Singleton-1.4";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AB/ABW/${name}.tar.gz";
+      sha256 = "0l4iwwk91wm2mrrh4irrn6ham9k12iah1ry33k0lzq22r3kwdbyg";
+    };
+  };
+
+  perlClassThrowable = buildPerlPackage {
+    name = "Class-Throwable-0.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/ST/STEVAN/Class-Throwable-0.10.tar.gz;
+      sha256 = "01hjrfb951c9j83ncg5drnam8vsfdgkjjv0kjshxhkl93sgnlvdl";
+    };
+  };
+
+  perlClassUnload = buildPerlPackage {
+    name = "Class-Unload-0.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/I/IL/ILMARI/Class-Unload-0.05.tar.gz;
+      sha256 = "01b0j10nxbz37xnnzw3hgmpfgq09mc489kq2d8f5nswsrlk75001";
+    };
+    propagatedBuildInputs = [perlClassInspector];
+  };
+
+  perlCompressRawBzip2 = import ../development/perl-modules/Compress-Raw-Bzip2 {
+    inherit fetchurl buildPerlPackage;
+    inherit (pkgs) bzip2;
+  };
+
+  perlCompressRawZlib = import ../development/perl-modules/Compress-Raw-Zlib {
+    inherit fetchurl buildPerlPackage;
+    inherit (pkgs) zlib;
+  };
+
+  perlCompressZlib = buildPerlPackage rec {
+    name = "Compress-Zlib-2.015";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+      sha256 = "1k1i539fszhxay8yllh687sw06i68g8ikw51pvy1c84p3kg6yk4v";
+    };
+    propagatedBuildInputs = [
+      perlCompressRawZlib perlIOCompressBase perlIOCompressGzip
+    ];
+  };
+
+  perlConfigAny = buildPerlPackage {
+    name = "Config-Any-0.14";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BR/BRICAS/Config-Any-0.14.tar.gz;
+      sha256 = "1vlr4w2m88figac5pblg6ppzrm11x2pm7r05n48s84cp4mizhim1";
+    };
+  };
+
+  perlConfigGeneral = buildPerlPackage {
+    name = "Config-General-2.40";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.40.tar.gz;
+      sha256 = "0wf6dpaanaiy0490dlgs3pi3xvvijs237x9izb00cnzggxcfmsnz";
+    };
+  };
+
+  perlconstant = buildPerlPackage {
+    name = "constant-1.15";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SA/SAPER/constant-1.15.tar.gz;
+      sha256 = "1ygz0hd1fd3q88r6dlw14kpyh06zjprksdci7qva6skxz3261636";
+    };
+  };
+
+  perlCookieXS = buildPerlPackage rec {
+    name = "Cookie-XS-0.11";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AG/AGENT/${name}.tar.gz";
+      sha256 = "1616rcn2qn1cwiv3rxb8mq5fmwxpj4gya1lxxxq2w952h03p3fd3";
+    };
+    propagatedBuildInputs = [
+      perlTestMore perlCGICookieXS
+    ];
+  };
+
+  perlCryptCBC = buildPerlPackage rec {
+    name = "Crypt-CBC-2.30";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz";
+      sha256 = "0cvigpxvwn18kb5i40jlp5fgijbhncvlh23xdgs1cnhxa17yrgwx";
+    };
+  };
+
+  perlCryptDES = buildPerlPackage rec {
+    name = "Crypt-DES-2.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DP/DPARIS/${name}.tar.gz";
+      sha256 = "1w12k1b7868v3ql0yprswlz2qri6ja576k9wlda7b8zf2d0rxgmp";
+    };
+    buildInputs = [perlCryptCBC];
+  };
+
+  perlCryptPasswordMD5 = buildPerlPackage {
+    name = "Crypt-PasswdMD5-1.3";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/L/LU/LUISMUNOZ/Crypt-PasswdMD5-1.3.tar.gz;
+      sha256 = "13j0v6ihgx80q8jhyas4k48b64gnzf202qajyn097vj8v48khk54";
+    };
+  };
+
+  perlCryptSSLeay = buildPerlPackage rec {
+    name = "Crypt-SSLeay-0.57";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DL/DLAND/${name}.tar.gz";
+      sha256 = "1f0i5y99ly39vf86jpzwqz8mkz1460vryv85jgqmfx007p781s0l";
+    };
+    makeMakerFlags = "--lib=${pkgs.openssl}/lib";
+  };
+
+  perlDataDump = buildPerlPackage {
+    name = "Data-Dump-1.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.11.tar.gz;
+      sha256 = "0h5y40b6drgsf87nhwhqx1dprq70f98ibm03l9al4ndq7mrx97dd";
+    };
+  };
+
+  perlDataHierarchy = buildPerlPackage {
+    name = "Data-Hierarchy-0.34";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz;
+      sha256 = "1vfrkygdaq0k7006i83jwavg9wgszfcyzbl9b7fp37z2acmyda5k";
+    };
+    propagatedBuildInputs = [perlTestException];
+  };
+
+  perlDataOptList = buildPerlPackage rec {
+    name = "Data-OptList-0.104";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "1k1qvf3ik2rn9mg65ginv3lyy6dlg1z08yddcnzbnizs8vbqqaxd";
+    };
+    propagatedBuildInputs = [perlSubInstall perlParamsUtil];
+  };
+
+  perlDataPage = buildPerlPackage {
+    name = "Data-Page-2.01";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.01.tar.gz;
+      sha256 = "0mvhlid9qx9yd94rgr4lfz9kvflimc1dzcah0x7q5disw39aqrzr";
+    };
+    propagatedBuildInputs = [perlTestException perlClassAccessorChained];
+  };
+
+  perlDataVisitor = buildPerlPackage {
+    name = "Data-Visitor-0.21";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NU/NUFFIN/Data-Visitor-0.21.tar.gz;
+      sha256 = "10cjh3rrqi4gwrmkpzilzmaqdrh71wr59035s6b4p2dzd117p931";
+    };
+    propagatedBuildInputs = [
+      perlTestMockObject perlMouse perlTaskWeaken perlTestUseOk perlTieToObject
+      perlNamespaceClean
+    ];
+  };
+
+  perlDateCalc = buildPerlPackage {
+    name = "Date-Calc-5.4";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-5.4.tar.gz;
+      sha256 = "1q7d1sy9ka1akpbysgwj673i7wiwb48yjv6wx1v5dhxllyxlxqc8";
+    };
+    propagatedBuildInputs = [perlCarpClan perlBitVector];
+  };
+
+  perlDateManip = buildPerlPackage {
+    name = "DateManip-5.54";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-5.54.tar.gz;
+      sha256 = "0ap2jgqx7yvjsyph9zsvadsih41cj991j3jwgz5261sq7q74y7xn";
+    };
+  };
+
+  perlDateTime = buildPerlPackage rec {
+    name = "DateTime-0.4501";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
+      sha256 = "1hqhc4xfjgcc1r488gjbi498ws3pxiayabl46607lq02qddcv57s";
+    };
+    propagatedBuildInputs = [perlDateTimeLocale perlDateTimeTimeZone];
+  };
+
+  perlDateTimeFormatBuilder = buildPerlPackage rec {
+    name = "DateTime-Format-Builder-0.7901";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
+      sha256 = "08zl89gh5lkff8736fkdnrf6dgppsjbmymnysbc06s7igd4ig8zf";
+    };
+    propagatedBuildInputs = [
+      perlDateTime perlParamsValidate perlTaskWeaken perlDateTimeFormatStrptime
+      perlClassFactoryUtil
+    ];
+    buildInputs = [perlTestPod];
+  };
+
+  perlDateTimeFormatNatural = buildPerlPackage rec {
+    name = "DateTime-Format-Natural-0.74";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/${name}.tar.gz";
+      sha256 = "0hq33s5frfa8cpj2al7qi0sbmimm5sdlxf0h3b57fjm9x5arlkcn";
+    };
+    propagatedBuildInputs = [
+      perlDateTime perlListMoreUtils perlParamsValidate perlDateCalc
+      perlTestMockTime perlBoolean
+    ];
+  };
+
+  perlDateTimeFormatStrptime = buildPerlPackage rec {
+    name = "DateTime-Format-Strptime-1.0800";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RI/RICKM/${name}.tgz";
+      sha256 = "10vsmwlhnc62krsh5fm2i0ya7bgjgjsm6nmj56f0bfifjh57ya1j";
+    };
+    propagatedBuildInputs = [
+      perlDateTime perlDateTimeLocale perlDateTimeTimeZone perlParamsValidate
+    ];
+  };
+
+  perlDateTimeLocale = buildPerlPackage rec {
+    name = "DateTime-Locale-0.42";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
+      sha256 = "1cvp9a4j6vy3xpbv6ipzcz1paw7gzal7lkrbm5ipiilji47d5gaw";
+    };
+    propagatedBuildInputs = [perlListMoreUtils perlParamsValidate];
+  };
+
+  perlDateTimeTimeZone = buildPerlPackage rec {
+    name = "DateTime-TimeZone-0.84";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
+      sha256 = "0jwbldr3x1cl2ibd9dcshdmpg6s5ddc4qiaxcxyqc82cq09ah2vs";
+    };
+    propagatedBuildInputs = [perlClassSingleton perlParamsValidate];
+  };
+
+  perlDBDSQLite = import ../development/perl-modules/DBD-SQLite {
+    inherit fetchurl buildPerlPackage perlDBI;
+    inherit (pkgs) sqlite;
+  };
+
+  perlDBFile = import ../development/perl-modules/DB_File {
+    inherit fetchurl buildPerlPackage;
+    inherit (pkgs) db4;
+  };
+
+  perlDBI = buildPerlPackage {
+    name = "DBI-1.607";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.607.tar.gz;
+      sha256 = "053ysk2a4njhzq5p59v5s6jzyi0yqr8l6wkswbvy4fyil3ka343h";
+    };
+  };
+
+  perlDBIxClass = buildPerlPackage rec {
+    name = "DBIx-Class-0.08099_08";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz";
+      sha256 = "12kn3jylxi7n2c6ccqyrjaxxmk3lajvjv19j6rlifp4crn24cbpy";
+    };
+    propagatedBuildInputs = [
+      perlTestNoWarnings perlTestException perlDBI perlScopeGuard
+      perlPathClass perlClassInspector perlClassAccessorGrouped
+      perlCarpClan perlTestWarn perlDataPage perlSQLAbstract
+      perlSQLAbstractLimit perlClassC3 perlClassC3Componentised
+      perlModuleFind perlDBDSQLite perlJSONAny perlSubName
+    ];
+    buildInputs = [perlTestPod perlTestPodCoverage];
+  };
+
+  perlDBIxClassHTMLWidget = buildPerlPackage rec {
+    name = "DBIx-Class-HTMLWidget-0.16";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AN/ANDREMAR/${name}.tar.gz";
+      sha256 = "05zhniyzl31nq410ywhxm0vmvac53h7ax42hjs9mmpvf45ipahj1";
+    };
+    propagatedBuildInputs = [perlDBIxClass perlHTMLWidget];
+  };
+
+  perlDBIxClassSchemaLoader = buildPerlPackage rec {
+    name = "DBIx-Class-Schema-Loader-0.04999_06";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz";
+      sha256 = "169ydwjarq6qk48jdxcn5ks8rx9aksk9fnx07gl5mz7banw5cs6y";
+    };
+    propagatedBuildInputs = [
+      perlDBI perlDBDSQLite perlDataDump perlUNIVERSALrequire
+      perlClassAccessor perlClassDataAccessor perlClassC3 perlCarpClan
+      perlClassInspector perlDBIxClass perlLinguaENInflectNumber
+      perlClassUnload
+    ];
+    doCheck = false; # disabled for now, since some tests fail
+  };
+
+  perlDevelGlobalDestruction = buildPerlPackage rec {
+    name = "Devel-GlobalDestruction-0.02";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/N/NU/NUFFIN/${name}.tar.gz";
+      sha256 = "174m5dx2z89h4308gx6s6vmg93qzaq0bh9m91hp2vqbyialnarhw";
+    };
+    propagatedBuildInputs = [perlSubExporter perlScopeGuard];
+  };
+
+  perlDevelStackTrace = buildPerlPackage rec {
+    name = "Devel-StackTrace-1.20";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
+      sha256 = "15zh9gzhw6gv7l6sklp02pfmiiv8kwmmjsyvirppsca6aagy4603";
+    };
+  };
+
+  perlDevelSymdump = buildPerlPackage rec {
+    name = "Devel-Symdump-2.08";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz";
+      sha256 = "0qzj68zw1yypk8jw77h0w5sdpdcrp4xcmgfghcfyddjr2aim60x5";
+    };
+    propagatedBuildInputs = [
+      perlTestPod /* cyclic dependency: perlTestPodCoverage */
+    ];
+  };
+
+  perlDigestHMAC = buildPerlPackage {
+    name = "Digest-HMAC-1.01";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.01.tar.gz;
+      sha256 = "042d6nknc5icxqsy5asrh8v2shmvg7b3vbj95jyk4sbqlqpacwz3";
+    };
+    propagatedBuildInputs = [perlDigestSHA1];
+  };
+
+  perlDigestSHA1 = buildPerlPackage {
+    name = "Digest-SHA1-2.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz;
+      md5 = "2449bfe21d6589c96eebf94dae24df6b";
+    };
+  };
+
+  perlEmailAddress = buildPerlPackage {
+    name = "Email-Address-1.888";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.888.tar.gz;
+      sha256 = "0c6b8djnmiy0niskrvywd6867xd1qmn241ffdwj957dkqdakq9yx";
+    };
+  };
+
+  perlEmailSend = buildPerlPackage {
+    name = "Email-Send-2.185";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.185.tar.gz;
+      sha256 = "0pbgnnbmv6z3zzqaiq1sdcv5d26ijhw4p8k8kp6ac7arvldblamz";
+    };
+    propagatedBuildInputs = [perlEmailSimple perlEmailAddress perlModulePluggable perlReturnValue];
+  };
+
+  perlEmailSimple = buildPerlPackage {
+    name = "Email-Simple-2.003";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.003.tar.gz;
+      sha256 = "0h8873pidhkqy7415s5sx8z614d0haxiknbjwrn65icrr2m0b8g6";
+    };
+  };
+
+  perlEmailValid = buildPerlPackage {
+    name = "Email-Valid-0.179";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-0.179.tar.gz;
+      sha256 = "13yfjll63cp1y4xqzdcr1mjhfncn48v6hckk5mvwi47w3ccj934a";
+    };
+    propagatedBuildInputs = [perlMailTools perlNetDNS];
+    doCheck = false;
+  };
+
+  perlEncode = buildPerlPackage {
+    name = "Encode-2.25";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.25.tar.gz;
+      sha256 = "0prwmbg3xh1lqskianwrfrgasdfmz4kjm3qpdm27ay110jkk25ak";
+    };
+  };
+
+  perlExtUtilsInstall = buildPerlPackage {
+    name = "ExtUtils-Install-1.50";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/Y/YV/YVES/ExtUtils-Install-1.50.tar.gz;
+      sha256 = "18fr056fwnnhvgc646crx2p9mybf69mh5rkcphc7bbvahw9i61jy";
+    };
+    propagatedBuildInputs = [perlExtUtilsMakeMaker];
+  };
+
+  perlExtUtilsMakeMaker = buildPerlPackage {
+    name = "ExtUtils-MakeMaker-6.44";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-6.44.tar.gz;
+      sha256 = "0zyypnlmmyp06qbfdpc14rp5rj63066mjammn6rlcqz2iil9mpcj";
+    };
+  };
+
+  perlExtUtilsManifest = buildPerlPackage {
+    name = "ExtUtils-Manifest-1.53";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RK/RKOBES/ExtUtils-Manifest-1.53.tar.gz;
+      sha256 = "0xgfzivw0dfy29ydfjkg0c9mvlhjvlhc54s0yvbb4sxb2mdvrfkp";
+    };
+  };
+
+  perlFilechdir = buildPerlPackage {
+    name = "File-chdir-0.1002";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1002.tar.gz;
+      sha256 = "1fc2l754bxsizli3injm4wqf8dn03iq16rmfn62l99nxpibl5k6p";
+    };
+  };
+
+  perlFileCopyRecursive = buildPerlPackage {
+    name = "File-Copy-Recursive-0.37";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.37.tar.gz;
+      sha256 = "12j0s01zwm67g4bcgbs0k61jwz59q1lndrnxyywxsz3xd30ki8rr";
+    };
+  };
+
+  perlFileModified = buildPerlPackage {
+    name = "File-Modified-0.07";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CO/CORION/File-Modified-0.07.tar.gz;
+      sha256 = "11zkg171fa5vdbyrbfcay134hhgyf4yaincjxwspwznrfmkpi49h";
+    };
+  };
+
+  perlFileShareDir = buildPerlPackage rec {
+    name = "File-ShareDir-1.00";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
+      sha256 = "1afr1r1ys2ij8i4r0i85hfrgrbvcha8c7cgkhcrdya1f0lnpw59z";
+    };
+    propagatedBuildInputs = [perlClassInspector perlParamsUtil];
+  };
+
+  perlFileTemp = buildPerlPackage {
+    name = "File-Temp-0.20";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TJ/TJENNESS/File-Temp-0.20.tar.gz;
+      sha256 = "0n7lr7mpdvwgznw469qdpdmac627a26wp615dkpzanc452skad4v";
+    };
+  };
+
+  perlFreezeThaw = buildPerlPackage {
+    name = "FreezeThaw-0.43";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.43.tar.gz;
+      sha256 = "1qamc5aggp35xk590a4hy660f2rhc2l7j65hbyxdya9yvg7z437l";
+    };
+  };
+
+  perlHTMLFormFu = buildPerlPackage rec {
+    name = "HTML-FormFu-0.03007";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz";
+      sha256 = "03lc4pvygp4wn9rsgdkbwk8zkh8x2z5vp8613c6q74imwrfmmfqy";
+    };
+    propagatedBuildInputs = [
+      perlClassAccessorChained perlClassC3 perlConfigAny
+      perlDateCalc perlListMoreUtils perlLWP perlEmailValid
+      perlDataVisitor perlDateTime perlDateTimeFormatBuilder
+      perlDateTimeFormatStrptime perlDateTimeFormatNatural
+      perlReadonly perlYAMLSyck perlRegexpCopy
+      perlHTMLTokeParserSimple perlTestNoWarnings perlRegexpCommon
+      perlCaptchaReCAPTCHA perlHTMLScrubber perlFileShareDir
+      perlTemplateToolkit perlCryptCBC perlCryptDES
+    ];
+  };
+
+  perlHTMLParser = buildPerlPackage {
+    name = "HTML-Parser-3.56";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.56.tar.gz;
+      sha256 = "0x1h42r54aq4yqpwi7mla4jzia9c5ysyqh8ir2nav833f9jm6g2h";
+    };
+    propagatedBuildInputs = [perlHTMLTagset];
+  };
+
+  perlHTMLScrubber = buildPerlPackage {
+    name = "HTML-Scrubber-0.08";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PO/PODMASTER/HTML-Scrubber-0.08.tar.gz;
+      sha256 = "0xb5zj67y2sjid9bs3yfm81rgi91fmn38wy1ryngssw6vd92ijh2";
+    };
+    propagatedBuildInputs = [perlHTMLParser];
+  };
+
+  perlHTMLTagset = buildPerlPackage {
+    name = "HTML-Tagset-3.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.10.tar.gz;
+      sha256 = "05k292qy7jzjlmmybis8nncpnwwa4jfkm7q3gq6866ydxrzds9xh";
+    };
+  };
+
+  perlHTMLTiny = buildPerlPackage rec {
+    name = "HTML-Tiny-1.03";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz";
+      sha256 = "1nc9vr0z699jwv8jaxxpkfhspiv7glhdp500hqyzdm2jxfw8azrg";
+    };
+  };
+
+  perlHTMLTokeParserSimple = buildPerlPackage rec {
+    name = "HTML-TokeParser-Simple-3.15";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz";
+      sha256 = "0ii1ww17h7wps1lcj7bxrjbisa37f6cvlm0xxpgfq1s6iy06q05b";
+    };
+    propagatedBuildInputs = [perlHTMLParser perlSubOverride];
+    buildInputs = [perlTestPod];
+  };
+
+  perlHTMLTree = buildPerlPackage {
+    name = "HTML-Tree-3.23";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PE/PETEK/HTML-Tree-3.23.tar.gz;
+      sha256 = "1pn80f4g1wixs030f40b80wrj12kwfinwycrx3f10drg4v7ml5zm";
+    };
+    propagatedBuildInputs = [perlHTMLParser];
+  };
+
+  perlHTMLWidget = buildPerlPackage {
+    name = "HTML-Widget-1.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-Widget-1.11.tar.gz;
+      sha256 = "02w21rd30cza094m5xs9clzw8ayigbhg2ddzl6jycp4jam0dyhmy";
+    };
+    propagatedBuildInputs = [
+      perlTestNoWarnings perlClassAccessor perlClassAccessorChained
+      perlClassDataAccessor perlModulePluggableFast perlHTMLTree
+      perlHTMLScrubber perlEmailValid perlDateCalc
+    ];
+  };
+
+  perlHTTPBody = buildPerlPackage rec {
+    name = "HTTP-Body-1.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz";
+      sha256 = "0s0496sb9l8jfkdx86vahwgdaaxrqb0j6acyww6nk0ajh82qrzfv";
+    };
+    propagatedBuildInputs = [perlLWP perlYAML];
+  };
+
+  perlHTTPHeaderParserXS = buildPerlPackage rec {
+    name = "HTTP-HeaderParser-XS-0.20";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MA/MARKSMITH/${name}.tar.gz";
+      sha256 = "1vs6sw431nnlnbdy6jii9vqlz30ndlfwdpdgm8a1m6fqngzhzq59";
+    };
+  };
+
+  perlHTTPRequestAsCGI = buildPerlPackage {
+    name = "HTTP-Request-AsCGI-0.5";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-Request-AsCGI-0.5.tar.gz;
+      sha256 = "164159iiyk0waqayplchkisxg2ldamx8iifrccx32p344714qcrh";
+    };
+    propagatedBuildInputs = [perlClassAccessor perlLWP];
+  };
+
+  perlHTTPResponseEncoding = buildPerlPackage rec {
+    name = "HTTP-Response-Encoding-0.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz";
+      sha256 = "04gdl633g0s2ckn7zixcma2krbpfcd46jngg155qpdx5sdwfkm16";
+    };
+    propagatedBuildInputs = [perlLWP];
+  };
+
+  perlHTTPServerSimple = buildPerlPackage rec {
+    name = "HTTP-Server-Simple-0.38";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JE/JESSE/${name}.tar.gz";
+      sha256 = "1m1lmpbg0zhiv2vyc3fyyqfsv3jhhb2mbdl5624fqb0va2pnla6n";
+    };
+    propagatedBuildInputs = [perlURI];
+    doCheck = false;
+  };
+
+  perlI18NLangTags = buildPerlPackage {
+    name = "I18N-LangTags-0.35";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SB/SBURKE/I18N-LangTags-0.35.tar.gz;
+      sha256 = "0idwfi7k8l44d9akpdj6ygdz3q8zxr690m18s7w23ms9d55bh3jy";
+    };
+  };
+
+  perlIOCompressBase = buildPerlPackage rec {
+    name = "IO-Compress-Base-2.015";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+      sha256 = "10njlwa50mhs5nqws5yidfmmb7hwmwc6x06gk2vnpyn82g3szgqd";
+    };
+  };
+
+  perlIOCompressBzip2 = buildPerlPackage rec {
+    name = "IO-Compress-Bzip2-2.015";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+      sha256 = "1kfksf2bslfkviry228p07m1ksnf06mh8gkmdpbrmlmxlbs2idnc";
+    };
+    propagatedBuildInputs = [perlIOCompressBase perlCompressRawBzip2];
+  };
+
+  perlIOCompressGzip = buildPerlPackage rec {
+    name = "IO-Compress-Zlib-2.015";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+      sha256 = "0sbnx6xdryaajwpssrfgm5b2zasa4ri8pihqwsx3rm5kmkgzy9cx";
+    };
+    propagatedBuildInputs = [perlIOCompressBase perlCompressRawZlib];
+  };
+
+  perlIODigest = buildPerlPackage {
+    name = "IO-Digest-0.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.10.tar.gz;
+      sha256 = "1g6ilxqv2a7spf273v7k0721c6am7pwpjrin3h5zaqxfmd312nav";
+    };
+    propagatedBuildInputs = [perlPerlIOviadynamic];
+  };
+
+  perlIOPager = buildPerlPackage {
+    name = "IO-Pager-0.06.tgz";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.06.tgz;
+      sha256 = "0r3af4gyjpy0f7bhs7hy5s7900w0yhbckb2dl3a1x5wpv7hcbkjb";
+    };
+  };
+
+  perlIPCRun = buildPerlPackage rec {
+    name = "IPC-Run-0.82";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
+      sha256 = "1v5yfavvhxscqkdl68xs7i7vcp9drl3y1iawppzwqcl1fprd58ip";
+    };
+    doCheck = false; /* attempts a network connection to localhost */
+  };
+
+  perlJSON = buildPerlPackage {
+    name = "JSON-2.12";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.12.tar.gz;
+      sha256 = "0qbxfwvfsx8s50h2dzpb0z7qi22k9ghygfzbfk8v08kkpmrkls47";
+    };
+    propagatedBuildInputs = [perlJSONXS];
+  };
+
+  perlJSONAny = buildPerlPackage {
+    name = "JSON-Any-1.17";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RB/RBERJON/JSON-Any-1.17.tar.gz;
+      sha256 = "07y6zb0vzb4c87k2lflxafb69zc4a29bxhzh6xdcpjhplf4vbifb";
+    };
+    propagatedBuildInputs = [perlJSON];
+  };
+
+  perlJSONXS = buildPerlPackage {
+    name = "JSON-XS-2.23";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-2.23.tar.gz;
+      sha256 = "0yd1j5d9b0ymfzfaxyi9zgca3vqwjb3dl8pg14m1qwsx3pidd5j7";
+    };
+  };
+
+  perlLinguaENInflect = buildPerlPackage {
+    name = "Lingua-EN-Inflect-1.89";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.89.tar.gz;
+      sha256 = "1jvj67mvvfqxgxspmblay1c844vvhfwrviiarglkaw6phpg74rby";
+    };
+  };
+
+  perlLinguaENInflectNumber = buildPerlPackage {
+    name = "Lingua-EN-Inflect-Number-1.1";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-1.1.tar.gz;
+      sha256 = "13hlr1srp9cd9mcc78snkng9il8iavvylfyh81iadvn2y7wikwfy";
+    };
+    propagatedBuildInputs = [perlLinguaENInflect];
+  };
+
+  perlListMoreUtils = buildPerlPackage {
+    name = "List-MoreUtils-0.22";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/V/VP/VPARSEVAL/List-MoreUtils-0.22.tar.gz;
+      sha256 = "1dv21xclh6r1cyy19r34xv2w6pc1jb5pwj7b2739m78xhlk8p55l";
+    };
+  };
+
+  perlLocaleGettext = buildPerlPackage {
+    name = "LocaleGettext-1.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz;
+      sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7";
+    };
+  };
+
+  perlLocaleMaketext = buildPerlPackage {
+    name = "Locale-Maketext-1.13";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FE/FERREIRA/Locale-Maketext-1.13.tar.gz;
+      sha256 = "0qvrhcs1f28ix3v8hcd5xr4z9s7plz4g5a4q1cjp7bs0c3w2yl6z";
+    };
+    propagatedBuildInputs = [perlI18NLangTags];
+  };
+
+  perlLocaleMaketextLexicon = buildPerlPackage {
+    name = "Locale-Maketext-Lexicon-0.66";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Lexicon-0.66.tar.gz;
+      sha256 = "1cd2kbcrlyjcmlr7m8kf94mm1hlr7hpv1r80a596f4ljk81f2nvd";
+    };
+    propagatedBuildInputs = [perlLocaleMaketext];
+  };
+
+  perlLocaleMaketextSimple = buildPerlPackage {
+    name = "Locale-Maketext-Simple-0.18";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Simple-0.18.tar.gz;
+      sha256 = "14kx7vkxyfqndy90rzavrjp2346aidyc7x5dzzdj293qf8s4q6ig";
+    };
+  };
+
+  perlLWP = buildPerlPackage rec {
+    name = "libwww-perl-5.825";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
+      sha256 = "1wb7br1n86571xz19l20cc5ysy1lx3rhvlk02g5517919z3jxvhw";
+    };
+    propagatedBuildInputs = [perlURI perlHTMLParser perlHTMLTagset];
+  };
+
+  perlMailTools = buildPerlPackage {
+    name = "MailTools-2.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.04.tar.gz;
+      sha256 = "0w91rcrz4v0pjdnnv2mvlbrm9ww32f7ajhr7xkjdhhr3455p7adx";
+    };
+    propagatedBuildInputs = [perlTimeDate perlTestPod];
+  };
+
+  perlMIMETypes = buildPerlPackage {
+    name = "MIME-Types-1.24";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-1.24.tar.gz;
+      sha256 = "1j89kjv9lipv6r3bq6dp0k9b8y1f8z9vrmhi7b8h7cs1yc8g7qz9";
+    };
+    propagatedBuildInputs = [perlTestPod];
+  };
+
+  perlModuleBuild = buildPerlPackage {
+    name = "Module-Build-0.2808";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Module-Build-0.2808.tar.gz;
+      sha256 = "1h8zpf4g2n8v47l9apmdqbdgcg039g70w75hpn84m37pmqkbnj8v";
+    };
+    propagatedBuildInputs = [perlExtUtilsInstall perlExtUtilsManifest perlTestHarness];
+  };
+
+  perlModuleFind = buildPerlPackage {
+    name = "Module-Find-0.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.06.tar.gz;
+      sha256 = "1394jk0rn2zmchpl11kim69xh5h5yzg96jdlf76fqrk3dcn0y2ip";
+    };
+  };
+
+  perlMoose = buildPerlPackage rec {
+    name = "Moose-0.73";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
+      sha256 = "1h1d551fbrsbr0knvcah4jyg999667ykhgbldl5rv4h7kdzsqsvz";
+    };
+    propagatedBuildInputs = [
+      perlTestMore perlTestException perlTaskWeaken perlListMoreUtils
+      perlClassMOP perlSubExporter
+    ];
+  };
+
+  perlMooseXEmulateClassAccessorFast = buildPerlPackage rec {
+    name = "MooseX-Emulate-Class-Accessor-Fast-0.00800";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GR/GRODITI/${name}.tar.gz";
+      sha256 = "1z2sld2sw1mlwxwzxxanik3086cw14rdsx2wwnzrfy7prsnigcl2";
+    };
+    propagatedBuildInputs = [perlMoose perlNamespaceClean];
+  };
+
+  perlMouse = buildPerlPackage {
+    name = "Mouse-0.09";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SA/SARTAK/Mouse-0.09.tar.gz;
+      sha256 = "1akymbjim6w6i1q8h97izah26ndmcbnl1lwdsw9fa22hnhm0axg0";
+    };
+  };
+
+  perlMROCompat = buildPerlPackage {
+    name = "MRO-Compat-0.09";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BL/BLBLACK/MRO-Compat-0.09.tar.gz;
+      sha256 = "16l37bxd5apax4kyvnadiplz8xmmx76y9pyq9iksqrv0d5rl5vl8";
+    };
+  };
+
+  perlNamespaceClean = buildPerlPackage {
+    name = "namespace-clean-0.08";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PH/PHAYLON/namespace-clean-0.08.tar.gz;
+      sha256 = "1jwc15zz1j6indqgz64l09ayg0db4gfaasq74x0vyi1yx3d9x2yx";
+    };
+    propagatedBuildInputs = [perlScopeGuard];
+  };
+
+  perlNetDNS = buildPerlPackage {
+    name = "Net-DNS-0.63";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/O/OL/OLAF/Net-DNS-0.63.tar.gz;
+      sha256 = "1pswrwhkav051xahm3k4cbyhi8kqpfmaz85lw44kwi2wc7mz4prk";
+    };
+    propagatedBuildInputs = [perlNetIP perlDigestHMAC];
+    doCheck = false;
+  };
+
+  perlNetIP = buildPerlPackage {
+    name = "Net-IP-1.25";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz;
+      sha256 = "1iv0ka6d8kp9iana6zn51sxbcmz2h3mbn6cd8pald36q5whf5mjc";
+    };
+  };
+
+  perlNetServer = buildPerlPackage rec {
+    name = "Net-Server-0.97";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RH/RHANDOM/${name}.tar.gz";
+      sha256 = "13vhv13w06g6h6iqx440q1h6hwj0kpjdxcc3fl9crkwg5glygg2f";
+    };
+    doCheck = false; # seems to hang waiting for connections
+  };
+
+  perlObjectSignature = buildPerlPackage {
+    name = "Object-Signature-1.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AD/ADAMK/Object-Signature-1.05.tar.gz;
+      sha256 = "10k9j18jpb16brv0hs7592r7hx877290pafb8gnk6ydy7hcq9r2j";
+    };
+  };
+
+  perlParamsUtil = buildPerlPackage rec {
+    name = "Params-Util-0.37";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
+      sha256 = "1n36vhahbs2mfck5x6g8ab9280zji9zwc5092jiq78s791227cb6";
+    };
+  };
+
+  perlParamsValidate = buildPerlPackage rec {
+    name = "Params-Validate-0.91";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
+      sha256 = "1j0hx3pbfdyggbhrawa9k0wdm6lln3zdkrhjrdg1hzzf6csrlc1v";
+    };
+  };
+
+  perlParent = buildPerlPackage {
+    name = "parent-0.221";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CO/CORION/parent-0.221.tar.gz;
+      sha256 = "17jhscpa5p5szh1173pd6wvh2m05an1l941zqq9jkw9bzgk12hm0";
+    };
+  };
+
+  perlPathClass = buildPerlPackage {
+    name = "Path-Class-0.16";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.16.tar.gz;
+      sha256 = "0zisxkj58jm84fwcssmdq8g6n37s33v5h7j28m12sbkqib0h76gc";
+    };
+  };
+
+  perlPerl5lib = buildPerlPackage rec {
+    name = "perl5lib-1.02";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/N/NO/NOBULL/${name}.tar.gz";
+      sha256 = "1b6fgs8wy2a7ff8rr1qdvdghhvlpr1pv760k4i2c8lq1hhjnkf94";
+    };
+  };
+
+  perlPerlIOeol = buildPerlPackage {
+    name = "PerlIO-eol-0.14";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AU/AUDREYT/PerlIO-eol-0.14.tar.gz;
+      sha256 = "1rwj0r075jfvvd0fnzgdqldc7qdb94wwsi21rs2l6yhcv0380fs2";
+    };
+  };
+
+  perlPerlIOviadynamic = buildPerlPackage {
+    name = "PerlIO-via-dynamic-0.12";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-dynamic-0.12.tar.gz;
+      sha256 = "140hay9q8q9sz1fa2s57ijp5l2448fkcg7indgn6k4vc7yshmqz2";
+    };
+  };
+
+  perlPerlIOviasymlink = buildPerlPackage {
+    name = "PerlIO-via-symlink-0.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-symlink-0.05.tar.gz;
+      sha256 = "0lidddcaz9anddqrpqk4zwm550igv6amdhj86i2jjdka9b1x81s1";
+    };
+  };
+
+  perlModulePluggable = buildPerlPackage {
+    name = "Module-Pluggable-3.5";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-3.5.tar.gz;
+      sha256 = "08rywi79pqn2c8zr17fmd18lpj5hm8lxd1j4v2k002ni8vhl43nv";
+    };
+    patches = [
+      # !!! merge this patch into Perl itself (which contains Module::Pluggable as well)
+      ../development/perl-modules/module-pluggable.patch
+    ];
+  };
+
+  perlModulePluggableFast = buildPerlPackage {
+    name = "Module-Pluggable-Fast-0.18";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SR/SRI/Module-Pluggable-Fast-0.18.tar.gz;
+      sha256 = "140c311x2darrc2p1drbkafv7qwhzdcff4ad300n6whsx4dfp6wr";
+    };
+    propagatedBuildInputs = [perlUNIVERSALrequire];
+  };
+
+  perlPodCoverage = buildPerlPackage rec {
+    name = "Pod-Coverage-0.19";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz";
+      sha256 = "1krsz4zwmnmq3z29p5vmyr5fdzrn8v0sg6rf3qxk7xpxw4z5np84";
+    };
+    propagatedBuildInputs = [perlDevelSymdump];
+  };
+
+  perlPodEscapes = buildPerlPackage {
+    name = "Pod-Escapes-1.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SB/SBURKE/Pod-Escapes-1.04.tar.gz;
+      sha256 = "1wrg5dnsl785ygga7bp6qmakhjgh9n4g3jp2l85ab02r502cagig";
+    };
+  };
+
+  perlPodSimple = buildPerlPackage {
+    name = "Pod-Simple-3.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AR/ARANDAL/Pod-Simple-3.05.tar.gz;
+      sha256 = "1j0kqcvr9ykcqlkr797j1npkbggykb3p4w5ri73s8mi163lzxkqb";
+    };
+    propagatedBuildInputs = [perlconstant perlPodEscapes];
+  };
+
+  perlReadonly = buildPerlPackage rec {
+    name = "Readonly-1.03";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz";
+      sha256 = "1shkyxajh6l87nif47ygnfxjwvqf3d3kjpdvxaff4957vqanii2k";
+    };
+  };
+
+  perlRegexpAssemble = buildPerlPackage rec {
+    name = "Regexp-Assemble-0.34";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DL/DLAND/${name}.tar.gz";
+      sha256 = "173dnzi3dag88afr4xf5v0hki15cfaffyjimjfmvzv6gbx6fp96f";
+    };
+  };
+
+  perlRegexpCommon = buildPerlPackage rec {
+    name = "Regexp-Common-2.122";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AB/ABIGAIL/${name}.tar.gz";
+      sha256 = "1mi411nfsx58nfsgjsbyck50x9d0yfvwqpw63iavajlpx1z38n8r";
+    };
+  };
+
+  perlRegexpCopy = buildPerlPackage rec {
+    name = "Regexp-Copy-0.06";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JD/JDUNCAN/${name}.tar.gz";
+      sha256 = "09c8xb43p1s6ala6g4274az51mf33phyjkp66dpvgkgbi1xfnawp";
+    };
+  };
+
+  perlReturnValue = buildPerlPackage {
+    name = "Return-Value-1.302";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.302.tar.gz;
+      sha256 = "0hf5rmfap49jh8dnggdpvapy5r4awgx5hdc3acc9ff0vfqav8azm";
+    };
+  };
+
+  perlScopeGuard = buildPerlPackage {
+    name = "Scope-Guard-0.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.03.tar.gz;
+      sha256 = "07x966fkqxlwnngxs7a2jrhabh8gzhjfpqq56n9gkwy7f340sayb";
+    };
+  };
+
+  perlScopeUpper = buildPerlPackage rec {
+    name = "Scope-Upper-0.06";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz";
+      sha256 = "1qaf310wbfpjb0lmg3fpmhbfnjxqw3j47rj0w0f0cy4bgihi8l43";
+    };
+  };
+
+  perlSetObject = buildPerlPackage {
+    name = "Set-Object-1.26";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SA/SAMV/Set-Object-1.26.tar.gz;
+      sha256 = "1hx3wrw8xkvaggacc8zyn86hfi3079ahmia1n8vsw7dglp1bbhmj";
+    };
+  };
+
+  perlSQLAbstract = buildPerlPackage rec {
+    name = "SQL-Abstract-1.51";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz";
+      sha256 = "1q77yfdrkadf738zvdgarkv0136zs2shz3fdmwaaf03bhvhcbap2";
+    };
+    propagatedBuildInputs = [
+      perlTestDeep perlTestException perlTestWarn
+    ];
+  };
+
+  perlSQLAbstractLimit = buildPerlPackage rec {
+    name = "SQL-Abstract-Limit-0.141";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DA/DAVEBAIRD/${name}.tar.gz";
+      sha256 = "1qqh89kz065mkgyg5pjcgbf8qcpzfk8vf1lgkbwynknadmv87zqg";
+    };
+    propagatedBuildInputs = [
+      perlSQLAbstract perlTestException perlDBI perlTestDeep
+    ];
+    buildInputs = [perlTestPod perlTestPodCoverage];
+  };
+
+  perlStringMkPasswd = buildPerlPackage {
+    name = "String-MkPasswd-0.02";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CG/CGRAU/String-MkPasswd-0.02.tar.gz;
+      sha256 = "0si4xfgf8c2pfag1cqbr9jbyvg3hak6wkmny56kn2qwa4ljp9bk6";
+    };
+  };
+
+  perlSubExporter = buildPerlPackage rec {
+    name = "Sub-Exporter-0.982";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "0xf8q05k5xs3bw6qy3pnnl5d670njxsxbw2dprl7n50hf488cbvj";
+    };
+    propagatedBuildInputs = [perlSubInstall perlDataOptList perlParamsUtil];
+  };
+
+  perlSubIdentify = buildPerlPackage rec {
+    name = "Sub-Identify-0.04";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz";
+      sha256 = "16g4dkmb4h5hh15jsq0kvsf3irrlrlqdv7qk6605wh5gjjwbcjxy";
+    };
+  };
+
+  perlSubInstall = buildPerlPackage rec {
+    name = "Sub-Install-0.925";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "1sccc4nwp9y24zkr42ww2gwg6zwax4madi9spsdym1pqna3nwnm6";
+    };
+  };
+
+  perlSubName = buildPerlPackage {
+    name = "Sub-Name-0.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/X/XM/XMATH/Sub-Name-0.04.tar.gz;
+      sha256 = "1nlin0ag2krpmiyapp3lzb6qw2yfqvqmx57iz5zwbhr4pyi46bhb";
+    };
+  };
+
+  perlSubOverride = buildPerlPackage rec {
+    name = "Sub-Override-0.08";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz";
+      sha256 = "13s5zi6qz02q50vv4bmwdmhn9gvg0988fydjlrrv500g6hnyzlkj";
+    };
+    propagatedBuildInputs = [perlSubUplevel perlTestException];
+  };
+
+  perlSubUplevel = buildPerlPackage {
+    name = "Sub-Uplevel-0.2002";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2002.tar.gz;
+      sha256 = "19b2b9xsw7lvvkcmmnhhv8ybxdkbnrky9nnqgjridr108ww9m5rh";
+    };
+  };
+
+  perlSVK = buildPerlPackage {
+    name = "SVK-v2.0.2";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CL/CLKAO/SVK-v2.0.2.tar.gz;
+      sha256 = "0c4m2q7cvzwh9kk1nc1vd8lkxx2kss5nd4k20dpkal4c7735jns0";
+    };
+    propagatedBuildInputs = [
+      perlAlgorithmDiff perlAlgorithmAnnotate perlAppCLI
+      perlClassDataInheritable perlDataHierarchy perlEncode perlFileTemp
+      perlIODigest perlListMoreUtils perlPathClass perlPerlIOeol
+      perlPerlIOviadynamic perlPerlIOviasymlink perlPodEscapes
+      perlPodSimple perlSVNMirror perlTimeHiRes perlUNIVERSALrequire
+      perlURI perlYAMLSyck perlClassAutouse perlIOPager
+      perlLocaleMaketextLexicon perlFreezeThaw
+    ];
+  };
+
+  perlSVNMirror = buildPerlPackage {
+    name = "SVN-Mirror-0.73";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Mirror-0.73.tar.gz;
+      sha256 = "1scjaq7qjz6jlsk1c2l5q15yxf0sqbydvf22mb2xzy1bzaln0x2c";
+    };
+    propagatedBuildInputs = [
+      perlClassAccessor perlFilechdir pkgs.subversion perlURI
+      perlTermReadKey perlTimeDate perlSVNSimple
+    ];
+  };
+
+  perlSVNSimple = buildPerlPackage {
+    name = "SVN-Simple-0.27";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Simple-0.27.tar.gz;
+      sha256 = "0p7p52ja6sf4j0w3b05i0bbqi5wiambckw2m5dsr63bbmlhv4a71";
+    };
+    propagatedBuildInputs = [pkgs.subversion];
+  };
+
+  perlTaskCatalystTutorial = buildPerlPackage rec {
+    name = "Task-Catalyst-Tutorial-0.06";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
+      sha256 = "07nn8a30n3qylpnf7s4ma6w462g31pywwikib117hr2mc7cv5cbm";
+    };
+    propagatedBuildInputs = [
+      perlCatalystManual perlCatalystRuntime perlCatalystDevel
+      perlCatalystPluginSession perlCatalystPluginAuthentication
+      perlCatalystAuthenticationStoreDBIxClass
+      perlCatalystPluginAuthorizationRoles
+      perlCatalystPluginAuthorizationACL
+      perlCatalystPluginHTMLWidget
+      perlCatalystPluginSessionStoreFastMmap
+      perlCatalystPluginStackTrace
+      perlCatalystViewTT
+      perlDBIxClass perlDBIxClassHTMLWidget
+      perlCatalystControllerHTMLFormFu
+    ];
+    buildInputs = [perlTestPodCoverage];
+  };
+
+  perlTaskWeaken = buildPerlPackage {
+    name = "Task-Weaken-1.02";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AD/ADAMK/Task-Weaken-1.02.tar.gz;
+      sha256 = "10f9kd1lwbscmmjwgbfwa4kkp723mb463lkbmh29rlhbsl7kb5wz";
+    };
+  };
+
+  perlTemplateTimer = buildPerlPackage {
+    name = "Template-Timer-0.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PE/PETDANCE/Template-Timer-0.04.tar.gz;
+      sha256 = "0j0gmxbq1svp0rb4kprwj2fk2mhl07yah08bksfz0a0pfz6lsam4";
+    };
+    propagatedBuildInputs = [perlTemplateToolkit];
+  };
+
+  perlTemplateToolkit = buildPerlPackage {
+    name = "Template-Toolkit-2.20";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.20.tar.gz;
+      sha256 = "13wbh06a76k4ag14lhszmpwv4hb8hlj1d9glizhp8izazl3xf1zg";
+    };
+    propagatedBuildInputs = [perlAppConfig];
+    patches = [
+      # Needed to make TT works properly on templates in the Nix store.
+      ../development/perl-modules/template-toolkit-nix-store.patch
+    ];
+  };
+
+  perlTermReadKey = buildPerlPackage {
+    name = "TermReadKey-2.30";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.30.tar.gz;
+      md5 = "f0ef2cea8acfbcc58d865c05b0c7e1ff";
+    };
+  };
+
+  perlTestDeep = buildPerlPackage {
+    name = "Test-Deep-0.103";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FD/FDALY/Test-Deep-0.103.tar.gz;
+      sha256 = "0cdl08k5v0wc9w20va5qw98ynlbs9ifwndgsix8qhi7h15sj8a5j";
+    };
+    propagatedBuildInputs = [perlTestTester perlTestNoWarnings];
+  };
+
+  perlTestException = buildPerlPackage {
+    name = "Test-Exception-0.27";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AD/ADIE/Test-Exception-0.27.tar.gz;
+      sha256 = "1s921j7yv2szywd1ffi6yz3ngrbq97f9dh38bvvajqnm29g1xb9j";
+    };
+    propagatedBuildInputs = [perlTestHarness perlTestSimple perlSubUplevel];
+  };
+
+  perlTestHarness = buildPerlPackage {
+    name = "Test-Harness-3.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AN/ANDYA/Test-Harness-3.10.tar.gz;
+      sha256 = "1qd217yzppj1vbjhny06v8niqhz85pam996ry6bzi08z0jidr2wh";
+    };
+  };
+
+  perlTestLongString = buildPerlPackage rec {
+    name = "Test-LongString-0.11";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz";
+      sha256 = "0ln3117nfxzq7yxmfk77nnr7116inbjq4bf5v2p0hqlj4damx03d";
+    };
+  };
+
+  perlTestMockObject = buildPerlPackage {
+    name = "Test-MockObject-1.09";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.09.tar.gz;
+      sha256 = "1cz385x0jrkj84nmfs6qyzwwvv8m9v8r2isagfj1zxvhdw49wdyy";
+    };
+    propagatedBuildInputs = [perlTestException perlUNIVERSALisa perlUNIVERSALcan];
+  };
+
+  perlTestMockTime = buildPerlPackage rec {
+    name = "Test-MockTime-0.09";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DD/DDICK/${name}.tar.gz";
+      sha256 = "1j2riyikzyfkxsgkfdqirs7xa8q5d06b9klpk7l9sgydwqdvxdv3";
+    };
+  };
+
+  perlTestMore = perlTestSimple;
+
+  perlTestNoWarnings = buildPerlPackage {
+    name = "Test-NoWarnings-0.084";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FD/FDALY/Test-NoWarnings-0.084.tar.gz;
+      sha256 = "19g47pa3brr9px3jnwziapvxcnghqqjjwxz1jfch4asawpdx2s8b";
+    };
+    propagatedBuildInputs = [perlTestTester];
+  };
+
+  perlTestPod = buildPerlPackage {
+    name = "Test-Pod-1.26";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Pod-1.26.tar.gz;
+      sha256 = "025rviipiaa1rf0bp040jlwaxwvx48kdcjriaysvkjpyvilwvqd4";
+    };
+  };
+
+  perlTestPodCoverage = buildPerlPackage rec {
+    name = "Test-Pod-Coverage-1.08";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
+      sha256 = "0y2md932zhbxdjwzskx0vmw2qy7jxkn87f9lb5h3f3vxxg1kcqz0";
+    };
+    propagatedBuildInputs = [perlPodCoverage];
+  };
+
+  perlTestSimple = buildPerlPackage {
+    name = "Test-Simple-0.84";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Simple-0.84.tar.gz;
+      sha256 = "030j47q3p46jfk60dsh2d5m7ip4nqz0fl4inqr8hx8b8q0f00r4l";
+    };
+    propagatedBuildInputs = [perlTestHarness];
+  };
+
+  perlTestTester = buildPerlPackage {
+    name = "Test-Tester-0.107";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.107.tar.gz;
+      sha256 = "0qgmsl6s6xm39211lywyzwrlz0gcmax7fb8zipybs9yxfmwcvyx2";
+    };
+  };
+
+  perlTestUseOk = buildPerlPackage rec {
+    name = "Test-use-ok-0.02";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AU/AUDREYT/${name}.tar.gz";
+      sha256 = "11inaxiavb35k8zwxwbfbp9wcffvfqas7k9idy822grn2sz5gyig";
+    };
+  };
+
+  perlTestWarn = buildPerlPackage {
+    name = "Test-Warn-0.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CH/CHORNY/Test-Warn-0.11.tar.gz;
+      sha256 = "1y9g13bzvjsmg5v555zrl7w085jq40a47hfs4gc3k78s0bkwxbyi";
+    };
+    propagatedBuildInputs = [perlTestSimple perlTestException perlArrayCompare perlTreeDAGNode];
+    buildInputs = [perlTestPod];
+  };
+
+  perlTestWWWMechanize = buildPerlPackage rec {
+    name = "Test-WWW-Mechanize-1.24";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
+      sha256 = "11knym5ppish78rk8r1hymvq1py43h7z8d6nk8p4ig3p246xx5qa";
+    };
+    propagatedBuildInputs = [
+      perlCarpAssertMore perlURI perlTestLongString perlWWWMechanize
+    ];
+    doCheck = false;
+  };
+
+  perlTestWWWMechanizeCatalyst = buildPerlPackage rec {
+    name = "Test-WWW-Mechanize-Catalyst-0.45";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/L/LB/LBROCARD/${name}.tar.gz";
+      sha256 = "0hixz0hibv2z87kdqvrphzgww0xibgg56w7bh299dgw2739hy4yf";
+    };
+    propagatedBuildInputs = [
+      perlCatalystRuntime perlTestWWWMechanize perlWWWMechanize
+      perlCatalystPluginSessionStateCookie
+    ];
+    buildInputs = [perlTestPod];
+    doCheck = false;
+  };
+
+  perlTextCSV = buildPerlPackage rec {
+    name = "Text-CSV-1.10";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/${name}.tar.gz";
+      sha256 = "0vb0093v3kk7iczb46zzdg7myfyjldwrk8wbk7ibk56gvj350f7c";
+    };
+  };
+
+  perlTextSimpleTable = buildPerlPackage {
+    name = "Text-SimpleTable-0.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SR/SRI/Text-SimpleTable-0.05.tar.gz;
+      sha256 = "028pdfmr2gnaq8w3iar8kqvrpxcghnag8ls7h4227l9zbxd1k9p9";
+    };
+  };
+
+  perlTieToObject = buildPerlPackage {
+    name = "Tie-ToObject-0.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz;
+      sha256 = "1x1smn1kw383xc5h9wajxk9dlx92bgrbf7gk4abga57y6120s6m3";
+    };
+    propagatedBuildInputs = [perlTestUseOk];
+  };
+
+  perlTimeDate = buildPerlPackage {
+    name = "TimeDate-1.16";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GB/GBARR/TimeDate-1.16.tar.gz;
+      sha256 = "1cvcpaghn7dc14m9871sfw103g3m3a00m2mrl5iqb0mmh40yyhkr";
+    };
+  };
+
+  perlTimeHiRes = buildPerlPackage {
+    name = "Time-HiRes-1.9715";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9715.tar.gz;
+      sha256 = "0pgqrfkysy3mdcx5nd0x8c80lgqb7rkb3nrkii3vc576dcbpvw0i";
+    };
+  };
+
+  perlTreeDAGNode = buildPerlPackage {
+    name = "Tree-DAG_Node-1.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CO/COGENT/Tree-DAG_Node-1.06.tar.gz;
+      sha256 = "0anvwfh4vqj41ipq52p65sqlvw3rvm6cla5hbws13gyk9mvp09ah";
+    };
+  };
+
+  perlTreeSimple = buildPerlPackage {
+    name = "Tree-Simple-1.18";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/ST/STEVAN/Tree-Simple-1.18.tar.gz;
+      sha256 = "0bb2hc8q5rwvz8a9n6f49kzx992cxczmrvq82d71757v087dzg6g";
+    };
+    propagatedBuildInputs = [perlTestException];
+  };
+
+  perlTreeSimpleVisitorFactory = buildPerlPackage {
+    name = "Tree-Simple-VisitorFactory-0.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/ST/STEVAN/Tree-Simple-VisitorFactory-0.10.tar.gz;
+      sha256 = "1ghcgnb3xvqjyh4h4aa37x98613aldnpj738z9b80p33bbfxq158";
+    };
+    propagatedBuildInputs = [perlTreeSimple];
+    buildInputs = [perlTestException];
+  };
+
+  perlFontTTF = buildPerlPackage {
+    name = "perl-Font-TTF-0.43";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.43.tar.gz;
+      sha256 = "0782mj5n5a2qbghvvr20x51llizly6q5smak98kzhgq9a7q3fg89";
+    };
+  };
+
+  perlUNIVERSALcan = buildPerlPackage {
+    name = "UNIVERSAL-can-1.12";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.12.tar.gz;
+      sha256 = "1abadbgcy11cmlmj9qf1v73ycic1qhysxv5xx81h8s4p81alialr";
+    };
+  };
+
+  perlUNIVERSALisa = stdenv.mkDerivation rec {
+    name = "UNIVERSAL-isa-1.01";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz";
+      sha256 = "0iksklmfhiaxg2rsw827n97k1mris6dg596rdwk2gmrwl0rsk0wz";
+    };
+    # Urgh, this package doesn't have a Makefile.PL.
+    buildInputs = [perl];
+    configurePhase = "perl Build.PL --prefix=$out";
+    buildPhase = "perl ./Build";
+    doCheck = true;
+    checkPhase = "perl ./Build test";
+    installPhase = "perl ./Build install";
+  };
+
+  perlUNIVERSALrequire = buildPerlPackage {
+    name = "UNIVERSAL-require-0.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MS/MSCHWERN/UNIVERSAL-require-0.11.tar.gz;
+      sha256 = "1rh7i3gva4m96m31g6yfhlqcabszhghbb3k3qwxbgx3mkf5s6x6i";
+    };
+  };
+
+  perlURI = buildPerlPackage rec {
+    name = "URI-1.37";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
+      sha256 = "0amwbss2gz00fkdfnfixf1afmqal1246xhmj27g5c0ny7ahcid0j";
+    };
+  };
+
+  perlW3CLinkChecker = buildPerlPackage rec {
+    name = "W3C-LinkChecker-4.5";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SC/SCOP/${name}.tar.gz";
+      sha256 = "0j2zlg57g0y9hqy8n35x5rfkpm7rnfjlwny5g0zaxwrl62ndkbm9";
+    };
+    propagatedBuildInputs = [
+      perlLWP perlConfigGeneral perlNetIP perlTermReadKey perlPerl5lib
+      perlCryptSSLeay
+    ];
+    meta = {
+      homepage = http://validator.w3.org/checklink;
+      description = "A tool to check links and anchors in Web pages or full Web sites";
+    };
+  };
+
+  perlWWWMechanize = buildPerlPackage rec {
+    name = "WWW-Mechanize-1.54";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
+      sha256 = "1yxvw5xfng5fj4422869p5dwvmrkmqph9gdm2nl12wngydk93lnh";
+    };
+    propagatedBuildInputs = [perlLWP perlHTTPResponseEncoding perlHTTPServerSimple];
+    doCheck = false;
+  };
+
+  perlXMLDOM = buildPerlPackage {
+    name = "XML-DOM-1.44";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.44.tar.gz;
+      sha256 = "1r0ampc88ni3sjpzr583k86076qg399arfm9xirv3cw49k3k5bzn";
+    };
+    #buildInputs = [libxml2];
+    propagatedBuildInputs = [perlXMLRegExp perlXMLParser perlLWP];
+  };
+
+  perlXMLLibXML = buildPerlPackage {
+    name = "XML-LibXML-1.66";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PA/PAJAS/XML-LibXML-1.66.tar.gz;
+      sha256 = "1a0bdiv3px6igxnbbjq10064iahm8f5i310p4y05w6zn5d51awyl";
+    };
+    buildInputs = [pkgs.libxml2];
+    propagatedBuildInputs = [perlXMLLibXMLCommon perlXMLSAX];
+  };
+
+  perlXMLLibXMLCommon = buildPerlPackage {
+    name = "XML-LibXML-Common-0.13";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PH/PHISH/XML-LibXML-Common-0.13.tar.gz;
+      md5 = "13b6d93f53375d15fd11922216249659";
+    };
+    buildInputs = [pkgs.libxml2];
+  };
+
+  perlXMLNamespaceSupport = buildPerlPackage {
+    name = "XML-NamespaceSupport-1.09";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RB/RBERJON/XML-NamespaceSupport-1.09.tar.gz;
+      sha256 = "0ny2i4pf6j8ggfj1x02rm5zm9a37hfalgx9w9kxnk69xsixfwb51";
+    };
+  };
+
+  perlXMLParser = buildPerlPackage {
+    name = "XML-Parser-2.36";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz;
+      sha256 = "0gyp5qfbflhkin1zv8l6wlkjwfjvsf45a3py4vc6ni82fj32kmcz";
+    };
+    makeMakerFlags = "EXPATLIBPATH=${pkgs.expat}/lib EXPATINCPATH=${pkgs.expat}/include";
+  };
+
+  perlXMLRegExp = buildPerlPackage {
+    name = "XML-RegExp-0.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.03.tar.gz;
+      sha256 = "1gkarylvdk3mddmchcwvzq09gpvx5z26nybp38dg7mjixm5bs226";
+    };
+  };
+
+  perlXMLSAX = buildPerlPackage {
+    name = "XML-SAX-0.96";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-0.96.tar.gz;
+      sha256 = "024fbjgg6s87j0y3yik55plzf7d6qpn7slwd03glcb54mw9zdglv";
+    };
+    propagatedBuildInputs = [perlXMLNamespaceSupport];
+  };
+
+  perlXMLSimple = buildPerlPackage {
+    name = "XML-Simple-2.18";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.18.tar.gz;
+      sha256 = "09k8fvc9m5nd5rqq00rwm3m0wx7iwd6vx0vc947y58ydi30nfjd5";
+    };
+    propagatedBuildInputs = [perlXMLParser];
+  };
+
+  perlXMLTwig = buildPerlPackage {
+    name = "XML-Twig-3.32";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.32.tar.gz;
+      sha256 = "07zdsfzw9dlrx6ril9clf1jfif09vpf27rz66laja7mvih9izd1v";
+    };
+    propagatedBuildInputs = [perlXMLParser];
+  };
+
+  perlXMLWriter = buildPerlPackage {
+    name = "XML-Writer-0.602";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.602.tar.gz;
+      sha256 = "0kdi022jcn9mwqsxy2fiwl2cjlid4x13r038jvi426fhjknl11nl";
+    };
+  };
+
+  perlXSLoader = buildPerlPackage {
+    name = "XSLoader-0.08";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.08.tar.gz;
+      sha256 = "0mr4l3givrpyvz1kg0kap2ds8g0rza2cim9kbnjy8hi64igkixi5";
+    };
+  };
+
+  perlYAML = buildPerlPackage rec {
+    name = "YAML-0.68";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
+      sha256 = "0yg0pgsjkfczsblx03rxlw4ib92k0gwdyb1a258xb9wdg0w61h34";
+    };
+  };
+
+  perlYAMLSyck = buildPerlPackage rec {
+    name = "YAML-Syck-1.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AU/AUDREYT/${name}.tar.gz";
+      sha256 = "15acwp2qdxfmhfqj4c1s57xyy48hcfc87lblww3lbvihqbysyzss";
+    };
+  };
+
+}
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 601d18ed614..40b061b96ed 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -395,6 +395,10 @@ in {
     kernel = linux;
     virtualbox = linux;
   };
+
+  perlPackages = {
+    perlTaskCatalystTutorial = linux;
+  };
   
   xorg = {
     fontadobe100dpi = linux;

From b7c0e6b66b3c95ec9d95194831a39053f8d4cef9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Apr 2009 12:12:56 +0000
Subject: [PATCH 28/58] pdsh: Fix user option "pdsh { rsh = true/false; };".

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

diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index 7e60e60bfa3..81327c84bf5 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
                  + " " + (if readline == null then "--without-readline" else "--with-readline")
                  + " " + (if ssh == null then "--without-ssh" else "--with-ssh")
                  + " " + (if pam == null then "--without-pam" else "--with-pam")
-                 + " " + (if rsh == null then "--without-rsh" else "--with-rsh")
+                 + " " + (if rsh == false then "--without-rsh" else "--with-rsh")
                  + " --with-dshgroups"
                  + " --with-xcpu"
                  + " --without-genders"

From dd2e74e02b79fe8119bc0047546e487c9574be9f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 12:23:01 +0000
Subject: [PATCH 29/58] * Updated the Perl section of the manual.

svn path=/nixpkgs/trunk/; revision=15173
---
 doc/language-support.xml | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/doc/language-support.xml b/doc/language-support.xml
index f5e7e74c123..4e6dc98f8ca 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -20,9 +20,15 @@ a generic package builder function for any Perl package that has a
 standard <varname>Makefile.PL</varname>.  It’s implemented in <link
 xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>
 
-<para>Most Perl packages from CPAN are so straight-forward to build
-that they are defined in <filename>pkgs/all-packages.nix</filename>
-itself.  Here is an example:
+<para>Perl packages from CPAN are defined in <link
+xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/perl-packages.nix"><filename>pkgs/perl-packages.nix</filename></link>,
+rather than <filename>pkgs/all-packages.nix</filename>.  Most Perl
+packages are so straight-forward to build that they are defined here
+directly, rather than having a separate function for each package
+called from <filename>perl-packages.nix</filename>.  However, more
+complicated packages should be put in a separate file, typically in
+<filename>pkgs/development/perl-modules</filename>.  Here is an
+example of the former:
 
 <programlisting>
 perlClassC3 = buildPerlPackage rec {
@@ -37,10 +43,23 @@ perlClassC3 = buildPerlPackage rec {
 Note the use of <literal>mirror://cpan/</literal>, and the
 <literal>${name}</literal> in the URL definition to ensure that the
 name attribute is consistent with the source that we’re actually
-downloading.  As usual, you can test this package as follows:
+downloading.  Perl packages are made available in
+<filename>all-packages.nix</filename> through the variable
+<varname>perlPackages</varname>.  For instance, if you have a package
+that needs <varname>perlClassC3</varname>, you would typically write
+
+<programlisting>
+foo = import ../path/to/foo.nix {
+  inherit stdenv fetchurl ...;
+  inherit (perlPackages) perlClassC3;
+};
+</programlisting>
+
+in <filename>all-packages.nix</filename>.  You can test building a
+Perl package as follows:
 
 <screen>
-$ nix-build -A perlClassC3
+$ nix-build -A perlPackages.perlClassC3
 </screen>
 
 <varname>buildPerlPackage</varname> adds <literal>perl-</literal> to
@@ -53,7 +72,7 @@ $ nix-env -i perl-Class-C3
 </screen>
 
 (Of course you can also install using the attribute name:
-<literal>nix-env -i -A perlClassC3</literal>.)</para>
+<literal>nix-env -i -A perlPackages.perlClassC3</literal>.)</para>
 
 <para>So what does <varname>buildPerlPackage</varname> do?  It does
 the following:

From 3c4bdbc446e8c116ef4ab84c94d63adc6fe0a9f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 12:24:13 +0000
Subject: [PATCH 30/58] * Make Perl package show up in nix-env.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1de7294c22e..9daf84ed079 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4159,9 +4159,9 @@ let
 
   buildPerlPackage = import ../development/perl-modules/generic perl;
 
-  perlPackages = import ./perl-packages.nix {
+  perlPackages = recurseIntoAttrs (import ./perl-packages.nix {
     inherit pkgs;
-  };
+  });
 
   perlXMLParser = perlPackages.perlXMLParser;
 

From 2cbc76177988f125c818c10e0a3fd8c018621dc8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 12:37:10 +0000
Subject: [PATCH 31/58] * Move builder-defs to pkgs/build-support. 
 (pkgs/top-level is for   composition.)

svn path=/nixpkgs/trunk/; revision=15175
---
 .../builder-defs}/builder-defs.nix              |  0
 .../builder-defs}/template-composing+config.nix |  0
 .../template-composing-builder.nix              |  0
 pkgs/top-level/all-packages.nix                 |  2 +-
 pkgs/top-level/template-debian.nix              | 14 --------------
 pkgs/top-level/template-simple.nix              | 17 -----------------
 6 files changed, 1 insertion(+), 32 deletions(-)
 rename pkgs/{top-level => build-support/builder-defs}/builder-defs.nix (100%)
 rename pkgs/{top-level => build-support/builder-defs}/template-composing+config.nix (100%)
 rename pkgs/{top-level => build-support/builder-defs}/template-composing-builder.nix (100%)
 delete mode 100644 pkgs/top-level/template-debian.nix
 delete mode 100644 pkgs/top-level/template-simple.nix

diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
similarity index 100%
rename from pkgs/top-level/builder-defs.nix
rename to pkgs/build-support/builder-defs/builder-defs.nix
diff --git a/pkgs/top-level/template-composing+config.nix b/pkgs/build-support/builder-defs/template-composing+config.nix
similarity index 100%
rename from pkgs/top-level/template-composing+config.nix
rename to pkgs/build-support/builder-defs/template-composing+config.nix
diff --git a/pkgs/top-level/template-composing-builder.nix b/pkgs/build-support/builder-defs/template-composing-builder.nix
similarity index 100%
rename from pkgs/top-level/template-composing-builder.nix
rename to pkgs/build-support/builder-defs/template-composing-builder.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9daf84ed079..9afdcfc1b82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -159,7 +159,7 @@ let
       abort ("Unknown option specified: " + result))
     else x);
 
-  builderDefs = composedArgsAndFun (import ./builder-defs.nix) {
+  builderDefs = composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) {
     inherit stringsWithDeps lib stdenv writeScript fetchurl;
   };
 
diff --git a/pkgs/top-level/template-debian.nix b/pkgs/top-level/template-debian.nix
deleted file mode 100644
index 80621b27c4d..00000000000
--- a/pkgs/top-level/template-debian.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args: with args; with debPackage;
-debBuild ({
-  src = fetchurl {
-    url = mirror://debian/pool/(abort "Specify URL");
-  };
-  patch = fetchurl {
-    url = mirror://debian/pool/(abort "Specify URL");
-  };
-  name = "${abort "Specify name"}";
-  buildInputs = [];
-  meta = {
-    description = "${abort "Specify description"}";
-  };
-} // args)
diff --git a/pkgs/top-level/template-simple.nix b/pkgs/top-level/template-simple.nix
deleted file mode 100644
index 4eac1fcad0a..00000000000
--- a/pkgs/top-level/template-simple.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "";
-
-  src = fetchurl {
-    url = ;
-    sha256 = "";
-  };
-
-  buildInputs =[];
-
-  meta = {
-    description = "
-
-";
-  };
-}

From c61c9dc35b873d5d26df47a8240ef6c20aa6c948 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 12:49:35 +0000
Subject: [PATCH 32/58] * Drop the "perl" prefix from Perl attribute names. 
 It's redundant   now that Perl packages are in their own namespace  
 (perlPackages.<pkg>).

svn path=/nixpkgs/trunk/; revision=15176
---
 doc/language-support.xml                      |  14 +-
 .../office/openoffice/default.nix             |   6 +-
 pkgs/data/fonts/dejavu-fonts/default.nix      |   4 +-
 .../perl-modules/DBD-SQLite/default.nix       |   4 +-
 .../tools/misc/help2man/default.nix           |   6 +-
 .../tools/misc/icon-naming-utils/default.nix  |   6 +-
 pkgs/tools/misc/xmltv/default.nix             |  10 +-
 pkgs/tools/typesetting/docbook2x/default.nix  |   8 +-
 pkgs/top-level/all-packages.nix               |  19 +-
 pkgs/top-level/build-for-release.nix          |   2 +-
 pkgs/top-level/perl-packages.nix              | 826 +++++++++---------
 pkgs/top-level/release.nix                    |   3 +-
 12 files changed, 451 insertions(+), 457 deletions(-)

diff --git a/doc/language-support.xml b/doc/language-support.xml
index 4e6dc98f8ca..d1a85974d67 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -31,7 +31,7 @@ complicated packages should be put in a separate file, typically in
 example of the former:
 
 <programlisting>
-perlClassC3 = buildPerlPackage rec {
+ClassC3 = buildPerlPackage rec {
   name = "Class-C3-0.21";
   src = fetchurl {
     url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
@@ -46,12 +46,12 @@ name attribute is consistent with the source that we’re actually
 downloading.  Perl packages are made available in
 <filename>all-packages.nix</filename> through the variable
 <varname>perlPackages</varname>.  For instance, if you have a package
-that needs <varname>perlClassC3</varname>, you would typically write
+that needs <varname>ClassC3</varname>, you would typically write
 
 <programlisting>
 foo = import ../path/to/foo.nix {
   inherit stdenv fetchurl ...;
-  inherit (perlPackages) perlClassC3;
+  inherit (perlPackages) ClassC3;
 };
 </programlisting>
 
@@ -59,7 +59,7 @@ in <filename>all-packages.nix</filename>.  You can test building a
 Perl package as follows:
 
 <screen>
-$ nix-build -A perlPackages.perlClassC3
+$ nix-build -A perlPackages.ClassC3
 </screen>
 
 <varname>buildPerlPackage</varname> adds <literal>perl-</literal> to
@@ -72,7 +72,7 @@ $ nix-env -i perl-Class-C3
 </screen>
 
 (Of course you can also install using the attribute name:
-<literal>nix-env -i -A perlPackages.perlClassC3</literal>.)</para>
+<literal>nix-env -i -A perlPackages.ClassC3</literal>.)</para>
 
 <para>So what does <varname>buildPerlPackage</varname> do?  It does
 the following:
@@ -137,14 +137,14 @@ builds a Perl module that has runtime dependencies on a bunch of other
 modules:
 
 <programlisting>
-perlClassC3Componentised = buildPerlPackage rec {
+ClassC3Componentised = buildPerlPackage rec {
   name = "Class-C3-Componentised-1.0004";
   src = fetchurl {
     url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz";
     sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1";
   };
   propagatedBuildInputs = [
-    perlClassC3 perlClassInspector perlTestException perlMROCompat
+    ClassC3 ClassInspector TestException MROCompat
   ];
 };
 </programlisting>
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index d525ab42fc6..de618283d20 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, perlArchiveZip
-, perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
+{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip
+, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
 , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi, cups
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
 
   buildInputs = [
-    pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib 
+    pam python tcsh libxslt perl ArchiveZip CompressZlib zlib 
     libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl 
     libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack 
     getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index 72eb801fd29..e4175b88e52 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -1,9 +1,9 @@
-args: with args;
+{fetchurl, stdenv, fontforge, perl, fontconfig, FontTTF}:
 
 stdenv.mkDerivation {
   name = "dejavu-fonts-2.23";
   #fontconfig is needed only for fc-lang (?)
-  buildInputs = [fontforge perl perlFontTTF];
+  buildInputs = [fontforge perl FontTTF];
   src = fetchurl {
     url = mirror://sourceforge/dejavu/dejavu-fonts-2.23.tar.bz2;
     sha256 = "0gifaxiianls54i05yw5gxhi2a0j9jmy5p0q58ym4l9fxv5drnhn";
diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix
index 009c2693350..5631ec673e5 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, buildPerlPackage, perlDBI, sqlite}:
+{fetchurl, buildPerlPackage, DBI, sqlite}:
 
 buildPerlPackage {
   name = "DBD-SQLite-1.14";
@@ -8,7 +8,7 @@ buildPerlPackage {
     sha256 = "01qd5xfx702chg3bv2k727kfdp84zy5xh31y6njvivkp78vrs624";
   };
   
-  propagatedBuildInputs = [perlDBI];
+  propagatedBuildInputs = [DBI];
   
   makeMakerFlags = "SQLITE_LOCATION=${sqlite}";
 
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 0a9e66568b5..1e053546cae 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, gettext, perlLocaleGettext}:
+{stdenv, fetchurl, perl, gettext, LocaleGettext}:
 
 stdenv.mkDerivation {
   name = "help2man-1.35.1";
@@ -11,11 +11,11 @@ stdenv.mkDerivation {
   buildInputs = [
     perl
     gettext
-    perlLocaleGettext
+    LocaleGettext
   ];
 
   # So that configure can find `preloadable_libintl.so'.
-  LD_LIBRARY_PATH = gettext + "/lib";
+  LD_LIBRARY_PATH = "${gettext}/lib";
 
   inherit gettext;
 }
diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix
index fb8a863968a..edf8b30563f 100644
--- a/pkgs/development/tools/misc/icon-naming-utils/default.nix
+++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, perlXMLSimple}:
+{stdenv, fetchurl, perl, XMLSimple}:
 
 stdenv.mkDerivation {
   name = "icon-naming-utils-0.8.7";
@@ -6,11 +6,11 @@ stdenv.mkDerivation {
     url = http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz;
     sha256 = "1lj0lffdg7fjfinhrn0vsq1kj010dxlxlix4jfc969j6l3k9rd0w";
   };
-  buildInputs = [perl perlXMLSimple];
+  buildInputs = [perl XMLSimple];
   postInstall = "
     # Add XML::Simple to the runtime search path.
     substituteInPlace $out/libexec/icon-name-mapping \\
-        --replace '/bin/perl' '/bin/perl -I${perlXMLSimple}/lib/site_perl';
+        --replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/site_perl';
     ensureDir $out/lib
     ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF?
   ";
diff --git a/pkgs/tools/misc/xmltv/default.nix b/pkgs/tools/misc/xmltv/default.nix
index 35cbdd470b3..4b8ba43f597 100644
--- a/pkgs/tools/misc/xmltv/default.nix
+++ b/pkgs/tools/misc/xmltv/default.nix
@@ -1,7 +1,4 @@
-{ fetchurl, perl, perlTermReadKey, perlXMLTwig, perlXMLWriter
-, perlDateManip, perlHTMLTree, perlHTMLParser, perlHTMLTagset
-, perlURI, perlLWP
-}:
+{ fetchurl, perl, perlPackages }:
 
 import ../../../development/perl-modules/generic perl {
   name = "xmltv-0.5.51";
@@ -11,7 +8,8 @@ import ../../../development/perl-modules/generic perl {
   };
   #makeMakerFlags = "-components tv_grab_nl";
   buildInputs = [
-    perlTermReadKey perlXMLTwig perlXMLWriter perlDateManip
-    perlHTMLTree perlHTMLParser perlHTMLTagset perlURI perlLWP
+    perlPackages.TermReadKey perlPackages.XMLTwig perlPackages.XMLWriter
+    perlPackages.DateManip perlPackages.HTMLTree perlPackages.HTMLParser
+    perlPackages.HTMLTagset perlPackages.URI perlPackages.LWP
   ];
 }
diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix
index 30276fcb6f6..18833a45828 100644
--- a/pkgs/tools/typesetting/docbook2x/default.nix
+++ b/pkgs/tools/typesetting/docbook2x/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, texinfo, perl
-, perlXMLSAX, perlXMLParser, perlXMLNamespaceSupport
+, XMLSAX, XMLParser, XMLNamespaceSupport
 , groff, libxml2, libxslt, gnused
 , makeWrapper }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   patches = [ ./db2x_texixml-to-stdout.patch ];
 
   buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper
-                  perlXMLSAX perlXMLParser perlXMLNamespaceSupport ];
+                  XMLSAX XMLParser XMLNamespaceSupport ];
 
   postConfigure = ''
     # Broken substitution is used for `perl/config.pl', which leaves literal
@@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
       # XXX: We work around the fact that `wrapProgram' doesn't support
       # spaces below by inserting escaped backslashes.
       wrapProgram $out/bin/$i --prefix PERL5LIB :			\
-        "${perlXMLSAX}/lib/site_perl:${perlXMLParser}/lib/site_perl"	\
+        "${XMLSAX}/lib/site_perl:${XMLParser}/lib/site_perl"	\
 	--prefix PERL5LIB :						\
-	"${perlXMLNamespaceSupport}/lib/site_perl"			\
+	"${XMLNamespaceSupport}/lib/site_perl"			\
 	--prefix XML_CATALOG_FILES "\ "					\
 	"$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml"
     done
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9afdcfc1b82..3d26db84e35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -588,7 +588,7 @@ let
   docbook2x = import ../tools/typesetting/docbook2x {
     inherit fetchurl stdenv texinfo perl
             gnused groff libxml2 libxslt makeWrapper;
-    inherit (perlPackages) perlXMLSAX perlXMLParser perlXMLNamespaceSupport;
+    inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
   };
 
   dosfstools = composedArgsAndFun (import ../tools/misc/dosfstools) {
@@ -1442,10 +1442,7 @@ let
   };
 
   xmltv = import ../tools/misc/xmltv {
-    inherit fetchurl perl;
-    inherit (perlPackages)
-      perlTermReadKey perlXMLTwig perlXMLWriter perlDateManip
-      perlHTMLTree perlHTMLParser perlHTMLTagset perlURI perlLWP;
+    inherit fetchurl perl perlPackages;
   };
 
   xmpppy = builderDefsPackage (import ../development/python-modules/xmpppy) {
@@ -2524,12 +2521,12 @@ let
 
   help2man = import ../development/tools/misc/help2man {
     inherit fetchurl stdenv perl gettext;
-    inherit (perlPackages) perlLocaleGettext;
+    inherit (perlPackages) LocaleGettext;
   };
 
   iconnamingutils = import ../development/tools/misc/icon-naming-utils {
     inherit fetchurl stdenv perl;
-    inherit (perlPackages) perlXMLSimple;
+    inherit (perlPackages) XMLSimple;
   };
 
   indent = composedArgsAndFun (selectVersion ../development/tools/misc/indent "2.2.9") {
@@ -4163,7 +4160,7 @@ let
     inherit pkgs;
   });
 
-  perlXMLParser = perlPackages.perlXMLParser;
+  perlXMLParser = perlPackages.XMLParser;
 
 
   ### DEVELOPMENT / PYTHON MODULES
@@ -5417,7 +5414,7 @@ let
 
   dejavu_fonts = import ../data/fonts/dejavu-fonts {
     inherit fetchurl stdenv fontforge perl fontconfig;
-    inherit (perlPackages) perlFontTTF;
+    inherit (perlPackages) FontTTF;
   };
 
   docbook5 = import ../data/sgml+xml/schemas/docbook-5.0 {
@@ -6493,7 +6490,7 @@ let
     boost = boost_1_36_0;
     inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
     inherit (gtkLibs) gtk;
-    inherit (perlPackages) perlArchiveZip perlCompressZlib;
+    inherit (perlPackages) ArchiveZip CompressZlib;
   };
 
   opera = import ../applications/networking/browsers/opera {
@@ -6740,7 +6737,7 @@ let
     static = true;
   }));
 
-  svk = perlPackages.perlSVK;
+  svk = perlPackages.SVK;
 
   sylpheed = import ../applications/networking/mailreaders/sylpheed {
     inherit fetchurl stdenv pkgconfig openssl gpgme;
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index a76d5c29a48..3ab039d1d6f 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -215,7 +215,7 @@ let
       zip
       ;
     inherit (pkgs.perlPackages)
-      perlTaskCatalystTutorial
+      TaskCatalystTutorial
       ;    
     inherit (pkgs.xorg)
       fontbh100dpi
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 008c25a5fb6..65235b01b4d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11,16 +11,16 @@ rec {
 
   inherit (pkgs) buildPerlPackage fetchurl stdenv perl;
 
-  perlAlgorithmAnnotate = buildPerlPackage {
+  AlgorithmAnnotate = buildPerlPackage {
     name = "Algorithm-Annotate-0.10";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz;
       sha256 = "1y92k4nqkscfwpriv8q7c90rjfj85lvwq1k96niv2glk8d37dcf9";
     };
-    propagatedBuildInputs = [perlAlgorithmDiff];
+    propagatedBuildInputs = [AlgorithmDiff];
   };
 
-  perlAlgorithmDiff = buildPerlPackage rec {
+  AlgorithmDiff = buildPerlPackage rec {
     name = "Algorithm-Diff-1.1901";
     src = fetchurl {
       url = "mirror://cpan/authors/id/T/TY/TYEMQ/${name}.zip";
@@ -29,16 +29,16 @@ rec {
     buildInputs = [pkgs.unzip];
   };
 
-  perlAppCLI = buildPerlPackage {
+  AppCLI = buildPerlPackage {
     name = "App-CLI-0.07";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CL/CLKAO/App-CLI-0.07.tar.gz;
       sha256 = "000866qsm7jck3ini69b02sgbjwp6s297lsds002r7xk2wb6fqcz";
     };
-    propagatedBuildInputs = [perlLocaleMaketextSimple];
+    propagatedBuildInputs = [LocaleMaketextSimple];
   };
 
-  perlAppConfig = buildPerlPackage {
+  AppConfig = buildPerlPackage {
     name = "AppConfig-1.66";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz;
@@ -46,7 +46,7 @@ rec {
     };
   };
 
-  perlArrayCompare = buildPerlPackage {
+  ArrayCompare = buildPerlPackage {
     name = "Array-Compare-1.16";
     src = fetchurl {
       url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-1.16.tar.gz;
@@ -54,7 +54,7 @@ rec {
     };
   };
 
-  perlArchiveZip = buildPerlPackage {
+  ArchiveZip = buildPerlPackage {
     name = "Archive-Zip-1.16";
     src = fetchurl {
       url = http://nixos.org/tarballs/Archive-Zip-1.16.tar.gz;
@@ -62,21 +62,21 @@ rec {
     };
   };
 
-  perlBerkeleyDB = import ../development/perl-modules/BerkeleyDB {
+  BerkeleyDB = import ../development/perl-modules/BerkeleyDB {
     inherit buildPerlPackage fetchurl;
     inherit (pkgs) db4;
   };
 
-  perlBitVector = buildPerlPackage {
+  BitVector = buildPerlPackage {
     name = "Bit-Vector-6.4";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-6.4.tar.gz;
       sha256 = "146vr78r6w3cxrm0ji491ylaa1abqh7fs81qhg15g3gzzxfg33bp";
     };
-    propagatedBuildInputs = [perlCarpClan];
+    propagatedBuildInputs = [CarpClan];
   };
 
-  perlBoolean = buildPerlPackage rec {
+  Boolean = buildPerlPackage rec {
     name = "boolean-0.20";
     src = fetchurl {
       url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
@@ -84,7 +84,7 @@ rec {
     };
   };
 
-  perlCacheFastMmap = buildPerlPackage {
+  CacheFastMmap = buildPerlPackage {
     name = "Cache-FastMmap-1.28";
     src = fetchurl {
       url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.28.tar.gz;
@@ -92,17 +92,17 @@ rec {
     };
   };
 
-  perlCaptchaReCAPTCHA = buildPerlPackage rec {
+  CaptchaReCAPTCHA = buildPerlPackage rec {
     name = "Captcha-reCAPTCHA-0.92";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz";
       sha256 = "1fm0fvdy9b7z8k1cyah2qbj0gqlv01chxmqmashwj16198yr7vrc";
     };
-    propagatedBuildInputs = [perlHTMLTiny perlLWP];
-    buildInputs = [perlTestPod];
+    propagatedBuildInputs = [HTMLTiny LWP];
+    buildInputs = [TestPod];
   };
 
-  perlCarpAssert = buildPerlPackage rec {
+  CarpAssert = buildPerlPackage rec {
     name = "Carp-Assert-0.20";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz";
@@ -110,93 +110,93 @@ rec {
     };
   };
 
-  perlCarpAssertMore = buildPerlPackage rec {
+  CarpAssertMore = buildPerlPackage rec {
     name = "Carp-Assert-More-1.12";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
       sha256 = "1m9k6z0m10s03x2hnc9mh5d4r8lnczm9bqd54jmnw0wzm4m33lyr";
     };
-    propagatedBuildInputs = [perlTestException perlCarpAssert];
+    propagatedBuildInputs = [TestException CarpAssert];
   };
 
-  perlCarpClan = buildPerlPackage {
+  CarpClan = buildPerlPackage {
     name = "Carp-Clan-6.00";
     src = fetchurl {
       url = mirror://cpan/authors/id/J/JJ/JJORE/Carp-Clan-6.00.tar.gz;
       sha256 = "0lbin4i0vzagcwkywpd5x4gz3a4ira4yn5g5v1ip0pbpyqnjk15h";
     };
-    propagatedBuildInputs = [perlTestException];
+    propagatedBuildInputs = [TestException];
   };
 
-  perlCatalystActionRenderView = buildPerlPackage rec {
+  CatalystActionRenderView = buildPerlPackage rec {
     name = "Catalyst-Action-RenderView-0.09";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
       sha256 = "06bxbdfjgnwp8zz4mqq2x7n5ng02h94m27l610icsps7r9iwi8f9";
     };
-    propagatedBuildInputs = [perlCatalystRuntime perlHTTPRequestAsCGI perlDataVisitor];
+    propagatedBuildInputs = [CatalystRuntime HTTPRequestAsCGI DataVisitor];
   };
 
-  perlCatalystAuthenticationStoreDBIxClass = buildPerlPackage rec {
+  CatalystAuthenticationStoreDBIxClass = buildPerlPackage rec {
     name = "Catalyst-Authentication-Store-DBIx-Class-0.1082";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JA/JAYK/${name}.tar.gz";
       sha256 = "1rh5jwqw3fb16ll5id8z0igpqdwr0czi0xbaa2igalxr53hh2cni";
     };
     propagatedBuildInputs = [
-      perlCatalystRuntime perlCatalystPluginAuthentication perlCatalystModelDBICSchema
+      CatalystRuntime CatalystPluginAuthentication CatalystModelDBICSchema
     ];
   };
 
-  perlCatalystComponentInstancePerContext = buildPerlPackage rec {
+  CatalystComponentInstancePerContext = buildPerlPackage rec {
     name = "Catalyst-Component-InstancePerContext-0.001001";
     src = fetchurl {
       url = "mirror://cpan/authors/id/G/GR/GRODITI/${name}.tar.gz";
       sha256 = "0wfj4vnn2cvk6jh62amwlg050p37fcwdgrn9amcz24z6w4qgjqvz";
     };
-    propagatedBuildInputs = [perlCatalystRuntime perlMoose];
+    propagatedBuildInputs = [CatalystRuntime Moose];
   };
 
-  perlCatalystControllerHTMLFormFu = buildPerlPackage rec {
+  CatalystControllerHTMLFormFu = buildPerlPackage rec {
     name = "Catalyst-Controller-HTML-FormFu-0.03007";
     src = fetchurl {
       url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz";
       sha256 = "1vrd79d0nbqkana5q483fgsr41idlfgjhf7fpd3hc056z5nq8iyn";
     };
     propagatedBuildInputs = [
-      perlCatalystRuntime perlCatalystActionRenderView perlCatalystViewTT
-      perlCatalystPluginConfigLoader perlConfigGeneral
-      perlCatalystComponentInstancePerContext perlMoose
-      perlRegexpAssemble perlTestWWWMechanize
-      perlTestWWWMechanizeCatalyst perlHTMLFormFu
+      CatalystRuntime CatalystActionRenderView CatalystViewTT
+      CatalystPluginConfigLoader ConfigGeneral
+      CatalystComponentInstancePerContext Moose
+      RegexpAssemble TestWWWMechanize
+      TestWWWMechanizeCatalyst HTMLFormFu
     ];
   };
 
-  perlCatalystDevel = buildPerlPackage rec {
+  CatalystDevel = buildPerlPackage rec {
     name = "Catalyst-Devel-1.10";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
       sha256 = "19ylkx55gaq9xxxcl4a55284in7hdrr2sb6lqz64daq3xp29n73h";
     };
     propagatedBuildInputs = [
-      perlCatalystRuntime perlCatalystActionRenderView
-      perlCatalystPluginStaticSimple perlCatalystPluginConfigLoader
-      perlPathClass perlTemplateToolkit perlClassAccessor
-      perlConfigGeneral perlFileCopyRecursive perlParent
+      CatalystRuntime CatalystActionRenderView
+      CatalystPluginStaticSimple CatalystPluginConfigLoader
+      PathClass TemplateToolkit ClassAccessor
+      ConfigGeneral FileCopyRecursive Parent
     ];
   };
 
-  perlCatalystEngineHTTPPrefork = buildPerlPackage rec {
+  CatalystEngineHTTPPrefork = buildPerlPackage rec {
     name = "Catalyst-Engine-HTTP-Prefork-0.50";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz";
       sha256 = "1p8mnxqaxd6sxyy9q4f0h5gy4mcnvb3y93y49ziq6kmcvy6yw2p7";
     };
     propagatedBuildInputs = [
-      perlCatalystRuntime perlHTTPBody perlNetServer
-      perlCookieXS perlHTTPHeaderParserXS
+      CatalystRuntime HTTPBody NetServer
+      CookieXS HTTPHeaderParserXS
     ];
-    buildInputs = [perlTestPod perlTestPodCoverage];
+    buildInputs = [TestPod TestPodCoverage];
     patches = [
       # Fix chunked transfers (they were missing the final CR/LF at
       # the end, which makes curl barf).
@@ -204,169 +204,169 @@ rec {
     ];
   };
 
-  perlCatalystManual = buildPerlPackage rec {
+  CatalystManual = buildPerlPackage rec {
     name = "Catalyst-Manual-5.7016";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HK/HKCLARK/${name}.tar.gz";
       sha256 = "0axin80dca3xb0n7frn9w8lj43l7dykpwrf7jj44n1v1kyzw813f";
     };
-    buildInputs = [perlTestPod perlTestPodCoverage];
+    buildInputs = [TestPod TestPodCoverage];
   };
 
-  perlCatalystModelDBICSchema = buildPerlPackage {
+  CatalystModelDBICSchema = buildPerlPackage {
     name = "Catalyst-Model-DBIC-Schema-0.23";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Model-DBIC-Schema-0.23.tar.gz;
       sha256 = "1rzs4czrwr8pnrj0mvfpzc8i2cbw95rx2xirw9bhqs77z2722ym4";
     };
     propagatedBuildInputs = [
-      perlCatalystRuntime perlCatalystDevel perlDBIxClass
-      perlUNIVERSALrequire perlClassDataAccessor
-      perlDBIxClassSchemaLoader
+      CatalystRuntime CatalystDevel DBIxClass
+      UNIVERSALrequire ClassDataAccessor
+      DBIxClassSchemaLoader
     ];
   };
 
-  perlCatalystRuntime = buildPerlPackage rec{
+  CatalystRuntime = buildPerlPackage rec{
     name = "Catalyst-Runtime-5.71001";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
       sha256 = "1j3xsh7zi5xd8zdc63r83mwzhjfj30vhd39kgir53mq47v0y07jr";
     };
     propagatedBuildInputs = [
-      perlLWP perlClassAccessor perlClassDataInheritable perlClassInspector
-      perlCGISimple perlDataDump perlFileModified perlHTTPBody perlHTTPRequestAsCGI
-      perlPathClass perlTextSimpleTable perlTreeSimple perlTreeSimpleVisitorFactory
-      perlSubExporter perlMROCompat perlTestMockObject perlClassMOP perlMoose
-      perlNamespaceClean perlScopeUpper perlMooseXEmulateClassAccessorFast
-      perlClassC3 perlClassC3AdoptNEXT
+      LWP ClassAccessor ClassDataInheritable ClassInspector
+      CGISimple DataDump FileModified HTTPBody HTTPRequestAsCGI
+      PathClass TextSimpleTable TreeSimple TreeSimpleVisitorFactory
+      SubExporter MROCompat TestMockObject ClassMOP Moose
+      NamespaceClean ScopeUpper MooseXEmulateClassAccessorFast
+      ClassC3 ClassC3AdoptNEXT
     ];
   };
 
-  perlCatalystPluginAuthentication = buildPerlPackage rec {
+  CatalystPluginAuthentication = buildPerlPackage rec {
     name = "Catalyst-Plugin-Authentication-0.10010";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
       sha256 = "1jjdmyccsq0k8ysl9ppm7rddf6w4l2yhwjr60c0x4lp5iafzmf4z";
     };
-    propagatedBuildInputs = [perlCatalystRuntime perlCatalystPluginSession];
+    propagatedBuildInputs = [CatalystRuntime CatalystPluginSession];
   };
 
-  perlCatalystPluginAuthorizationACL = buildPerlPackage {
+  CatalystPluginAuthorizationACL = buildPerlPackage {
     name = "Catalyst-Plugin-Authorization-ACL-0.10";
     src = fetchurl {
       url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-Authorization-ACL-0.10.tar.gz;
       sha256 = "1y9pj0scpc4nd7m1xqy7yvjsffhfadzl0z5r4jjv2srndcv4xj1p";
     };
-    propagatedBuildInputs = [perlCatalystRuntime perlClassThrowable];
+    propagatedBuildInputs = [CatalystRuntime ClassThrowable];
   };
 
-  perlCatalystPluginAuthorizationRoles = buildPerlPackage {
+  CatalystPluginAuthorizationRoles = buildPerlPackage {
     name = "Catalyst-Plugin-Authorization-Roles-0.07";
     src = fetchurl {
       url = mirror://cpan/authors/id/B/BR/BRICAS/Catalyst-Plugin-Authorization-Roles-0.07.tar.gz;
       sha256 = "07b8zc7b06p0fprjj68fk7rgh781r9s3q8dx045sk03w0fnk3b4b";
     };
     propagatedBuildInputs = [
-      perlCatalystRuntime perlCatalystPluginAuthentication
-      perlTestException perlSetObject perlUNIVERSALisa
+      CatalystRuntime CatalystPluginAuthentication
+      TestException SetObject UNIVERSALisa
     ];
   };
 
-  perlCatalystPluginConfigLoader = buildPerlPackage rec {
+  CatalystPluginConfigLoader = buildPerlPackage rec {
     name = "Catalyst-Plugin-ConfigLoader-0.22";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BR/BRICAS/${name}.tar.gz";
       sha256 = "13ir2l0pvjn4myp7wfh2bxcdd4hp0b3ln28mz1kvlshhxl032lqn";
     };
-    propagatedBuildInputs = [perlCatalystRuntime perlDataVisitor perlConfigAny perlMROCompat];
+    propagatedBuildInputs = [CatalystRuntime DataVisitor ConfigAny MROCompat];
   };
 
-  perlCatalystPluginHTMLWidget = buildPerlPackage {
+  CatalystPluginHTMLWidget = buildPerlPackage {
     name = "Catalyst-Plugin-HTML-Widget-1.1";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SR/SRI/Catalyst-Plugin-HTML-Widget-1.1.tar.gz;
       sha256 = "1zzyfhmzlqvbwk2w930k3mqk8z1lzhrja9ynx9yfq5gmc8qqg95l";
     };
-    propagatedBuildInputs = [perlCatalystRuntime perlHTMLWidget];
+    propagatedBuildInputs = [CatalystRuntime HTMLWidget];
   };
 
-  perlCatalystPluginSession = buildPerlPackage rec {
+  CatalystPluginSession = buildPerlPackage rec {
     name = "Catalyst-Plugin-Session-0.20";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
       sha256 = "1p72hf68qi038gayhsxbbx3l3hg7b1njjii510alxqyw3a10y9sj";
     };
     propagatedBuildInputs = [
-      perlCatalystRuntime perlTestMockObject perlObjectSignature
-      perlTestDeep perlMROCompat
+      CatalystRuntime TestMockObject ObjectSignature
+      TestDeep MROCompat
     ];
   };
 
-  perlCatalystPluginSessionStateCookie = buildPerlPackage rec {
+  CatalystPluginSessionStateCookie = buildPerlPackage rec {
     name = "Catalyst-Plugin-Session-State-Cookie-0.10";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
       sha256 = "1630shg23cpk6v26fwf7xr53ml1s6l2mgirxw524nmciliczgldj";
     };
     propagatedBuildInputs = [
-      perlCatalystRuntime perlCatalystPluginSession perlTestMockObject
+      CatalystRuntime CatalystPluginSession TestMockObject
     ];
   };
 
-  perlCatalystPluginSessionStoreFastMmap = buildPerlPackage rec {
+  CatalystPluginSessionStoreFastMmap = buildPerlPackage rec {
     name = "Catalyst-Plugin-Session-Store-FastMmap-0.06";
     src = fetchurl {
       url = "mirror://cpan/authors/id/K/KA/KARMAN/${name}.tar.gz";
       sha256 = "0by8w1zbp2802f9n3sqp0cmm2q0pwnycf0jgzvvv75riicq1m9pn";
     };
     propagatedBuildInputs = [
-      perlPathClass perlCatalystPluginSession perlCacheFastMmap
+      PathClass CatalystPluginSession CacheFastMmap
     ];
   };
 
-  perlCatalystPluginStackTrace = buildPerlPackage {
+  CatalystPluginStackTrace = buildPerlPackage {
     name = "Catalyst-Plugin-StackTrace-0.09";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-StackTrace-0.09.tar.gz;
       sha256 = "1pywxjhvn5zmcpnxj9ba77pz1jxq4d037yd43y0ks9sc31p01ydh";
     };
-    propagatedBuildInputs = [perlCatalystRuntime perlDevelStackTrace];
+    propagatedBuildInputs = [CatalystRuntime DevelStackTrace];
   };
 
-  perlCatalystPluginStaticSimple = buildPerlPackage {
+  CatalystPluginStaticSimple = buildPerlPackage {
     name = "Catalyst-Plugin-Static-Simple-0.20";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AG/AGRUNDMA/Catalyst-Plugin-Static-Simple-0.20.tar.gz;
       sha256 = "1qpicgfha81ykxzg4kjll2qw8b1rwzdgvj4s3q9s20zl86gmfr3p";
     };
-    propagatedBuildInputs = [perlCatalystRuntime perlMIMETypes];
+    propagatedBuildInputs = [CatalystRuntime MIMETypes];
   };
 
-  perlCatalystViewDownload = buildPerlPackage rec {
+  CatalystViewDownload = buildPerlPackage rec {
     name = "Catalyst-View-Download-0.04";
     src = fetchurl {
       url = "mirror://cpan/authors/id/G/GA/GAUDEON/${name}.tar.gz";
       sha256 = "1d5ck28db6vbks7cwkj1qh0glhxskl3vymksv3izfzbk6xnjrabi";
     };
     propagatedBuildInputs = [
-      perlCatalystRuntime perlTestWWWMechanizeCatalyst perlTestUseOk
-      perlTextCSV
+      CatalystRuntime TestWWWMechanizeCatalyst TestUseOk
+      TextCSV
     ];
   };
 
-  perlCatalystViewTT = buildPerlPackage rec {
+  CatalystViewTT = buildPerlPackage rec {
     name = "Catalyst-View-TT-0.28";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
       sha256 = "18chdzgv0fvq65kfp8am2f5cayxpzg355q7jin4xlzygbgh2a5vg";
     };
     propagatedBuildInputs = [
-      perlCatalystRuntime perlTemplateToolkit perlClassAccessor
-      perlPathClass perlTemplateTimer
+      CatalystRuntime TemplateToolkit ClassAccessor
+      PathClass TemplateTimer
     ];
   };
 
-  perlCGICookieXS = buildPerlPackage rec {
+  CGICookieXS = buildPerlPackage rec {
     name = "CGI-Cookie-XS-0.16";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AG/AGENT/${name}.tar.gz";
@@ -374,7 +374,7 @@ rec {
     };
   };
 
-  perlCGISession = buildPerlPackage {
+  CGISession = buildPerlPackage {
     name = "CGI-Session-3.95";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SH/SHERZODR/CGI-Session-3.95.tar.gz;
@@ -382,7 +382,7 @@ rec {
     };
   };
 
-  perlCGISimple = buildPerlPackage {
+  CGISimple = buildPerlPackage {
     name = "CGI-Simple-1.106";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AN/ANDYA/CGI-Simple-1.106.tar.gz;
@@ -390,7 +390,7 @@ rec {
     };
   };
 
-  perlClassAccessor = buildPerlPackage {
+  ClassAccessor = buildPerlPackage {
     name = "Class-Accessor-0.31";
     src = fetchurl {
       url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.31.tar.gz;
@@ -398,25 +398,25 @@ rec {
     };
   };
 
-  perlClassAccessorChained = buildPerlPackage {
+  ClassAccessorChained = buildPerlPackage {
     name = "Class-Accessor-Chained-0.01";
     src = fetchurl {
       url = mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz;
       sha256 = "1lilrjy1s0q5hyr0888kf0ifxjyl2iyk4vxil4jsv0sgh39lkgx5";
     };
-    propagatedBuildInputs = [perlClassAccessor];
+    propagatedBuildInputs = [ClassAccessor];
   };
 
-  perlClassAccessorGrouped = buildPerlPackage rec {
+  ClassAccessorGrouped = buildPerlPackage rec {
     name = "Class-Accessor-Grouped-0.08003";
     src = fetchurl {
       url = "mirror://cpan/authors/id/C/CL/CLACO/${name}.tar.gz";
       sha256 = "0lvxj8fp79338p52ich0p7hi4gvvf572ks76g9kgkgfyqvmp732k";
     };
-    propagatedBuildInputs = [perlClassInspector perlMROCompat];
+    propagatedBuildInputs = [ClassInspector MROCompat];
   };
 
-  perlClassAutouse = buildPerlPackage {
+  ClassAutouse = buildPerlPackage {
     name = "Class-Autouse-1.99_02";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-1.99_02.tar.gz;
@@ -424,7 +424,7 @@ rec {
     };
   };
 
-  perlClassC3 = buildPerlPackage rec {
+  ClassC3 = buildPerlPackage rec {
     name = "Class-C3-0.21";
     src = fetchurl {
       url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
@@ -432,27 +432,27 @@ rec {
     };
   };
 
-  perlClassC3AdoptNEXT = buildPerlPackage rec {
+  ClassC3AdoptNEXT = buildPerlPackage rec {
     name = "Class-C3-Adopt-NEXT-0.07";
     src = fetchurl {
       url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
       sha256 = "1kxbdq10vicrbz3i6hvml3mma5x0r523gfdd649f9bvrsizb0jxj";
     };
-    propagatedBuildInputs = [perlMROCompat perlTestException perlListMoreUtils];
+    propagatedBuildInputs = [MROCompat TestException ListMoreUtils];
   };
 
-  perlClassC3Componentised = buildPerlPackage rec {
+  ClassC3Componentised = buildPerlPackage rec {
     name = "Class-C3-Componentised-1.0004";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz";
       sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1";
     };
     propagatedBuildInputs = [
-      perlClassC3 perlClassInspector perlTestException perlMROCompat
+      ClassC3 ClassInspector TestException MROCompat
     ];
   };
 
-  perlClassDataAccessor = buildPerlPackage {
+  ClassDataAccessor = buildPerlPackage {
     name = "Class-Data-Accessor-0.04004";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz;
@@ -460,7 +460,7 @@ rec {
     };
   };
 
-  perlClassDataInheritable = buildPerlPackage {
+  ClassDataInheritable = buildPerlPackage {
     name = "Class-Data-Inheritable-0.08";
     src = fetchurl {
       url = mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz;
@@ -468,7 +468,7 @@ rec {
     };
   };
 
-  perlClassFactoryUtil = buildPerlPackage rec {
+  ClassFactoryUtil = buildPerlPackage rec {
     name = "Class-Factory-Util-1.7";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
@@ -476,7 +476,7 @@ rec {
     };
   };
 
-  perlClassInspector = buildPerlPackage {
+  ClassInspector = buildPerlPackage {
     name = "Class-Inspector-1.23";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Inspector-1.23.tar.gz;
@@ -484,19 +484,19 @@ rec {
     };
   };
 
-  perlClassMOP = buildPerlPackage rec {
+  ClassMOP = buildPerlPackage rec {
     name = "Class-MOP-0.80";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
       sha256 = "1fmimzzbfkw7vrr57p8xa3y9v55i72bknix2qk3cdrn0jmg6h648";
     };
     propagatedBuildInputs = [
-      perlMROCompat perlTaskWeaken perlTestException perlSubName perlSubIdentify
-      perlDevelGlobalDestruction
+      MROCompat TaskWeaken TestException SubName SubIdentify
+      DevelGlobalDestruction
     ];
   };
 
-  perlClassSingleton = buildPerlPackage rec {
+  ClassSingleton = buildPerlPackage rec {
     name = "Class-Singleton-1.4";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AB/ABW/${name}.tar.gz";
@@ -504,7 +504,7 @@ rec {
     };
   };
 
-  perlClassThrowable = buildPerlPackage {
+  ClassThrowable = buildPerlPackage {
     name = "Class-Throwable-0.10";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/ST/STEVAN/Class-Throwable-0.10.tar.gz;
@@ -512,37 +512,37 @@ rec {
     };
   };
 
-  perlClassUnload = buildPerlPackage {
+  ClassUnload = buildPerlPackage {
     name = "Class-Unload-0.05";
     src = fetchurl {
       url = mirror://cpan/authors/id/I/IL/ILMARI/Class-Unload-0.05.tar.gz;
       sha256 = "01b0j10nxbz37xnnzw3hgmpfgq09mc489kq2d8f5nswsrlk75001";
     };
-    propagatedBuildInputs = [perlClassInspector];
+    propagatedBuildInputs = [ClassInspector];
   };
 
-  perlCompressRawBzip2 = import ../development/perl-modules/Compress-Raw-Bzip2 {
+  CompressRawBzip2 = import ../development/perl-modules/Compress-Raw-Bzip2 {
     inherit fetchurl buildPerlPackage;
     inherit (pkgs) bzip2;
   };
 
-  perlCompressRawZlib = import ../development/perl-modules/Compress-Raw-Zlib {
+  CompressRawZlib = import ../development/perl-modules/Compress-Raw-Zlib {
     inherit fetchurl buildPerlPackage;
     inherit (pkgs) zlib;
   };
 
-  perlCompressZlib = buildPerlPackage rec {
+  CompressZlib = buildPerlPackage rec {
     name = "Compress-Zlib-2.015";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
       sha256 = "1k1i539fszhxay8yllh687sw06i68g8ikw51pvy1c84p3kg6yk4v";
     };
     propagatedBuildInputs = [
-      perlCompressRawZlib perlIOCompressBase perlIOCompressGzip
+      CompressRawZlib IOCompressBase IOCompressGzip
     ];
   };
 
-  perlConfigAny = buildPerlPackage {
+  ConfigAny = buildPerlPackage {
     name = "Config-Any-0.14";
     src = fetchurl {
       url = mirror://cpan/authors/id/B/BR/BRICAS/Config-Any-0.14.tar.gz;
@@ -550,7 +550,7 @@ rec {
     };
   };
 
-  perlConfigGeneral = buildPerlPackage {
+  ConfigGeneral = buildPerlPackage {
     name = "Config-General-2.40";
     src = fetchurl {
       url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.40.tar.gz;
@@ -558,7 +558,7 @@ rec {
     };
   };
 
-  perlconstant = buildPerlPackage {
+  constant = buildPerlPackage {
     name = "constant-1.15";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SA/SAPER/constant-1.15.tar.gz;
@@ -566,18 +566,18 @@ rec {
     };
   };
 
-  perlCookieXS = buildPerlPackage rec {
+  CookieXS = buildPerlPackage rec {
     name = "Cookie-XS-0.11";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AG/AGENT/${name}.tar.gz";
       sha256 = "1616rcn2qn1cwiv3rxb8mq5fmwxpj4gya1lxxxq2w952h03p3fd3";
     };
     propagatedBuildInputs = [
-      perlTestMore perlCGICookieXS
+      TestMore CGICookieXS
     ];
   };
 
-  perlCryptCBC = buildPerlPackage rec {
+  CryptCBC = buildPerlPackage rec {
     name = "Crypt-CBC-2.30";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz";
@@ -585,16 +585,16 @@ rec {
     };
   };
 
-  perlCryptDES = buildPerlPackage rec {
+  CryptDES = buildPerlPackage rec {
     name = "Crypt-DES-2.05";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DP/DPARIS/${name}.tar.gz";
       sha256 = "1w12k1b7868v3ql0yprswlz2qri6ja576k9wlda7b8zf2d0rxgmp";
     };
-    buildInputs = [perlCryptCBC];
+    buildInputs = [CryptCBC];
   };
 
-  perlCryptPasswordMD5 = buildPerlPackage {
+  CryptPasswordMD5 = buildPerlPackage {
     name = "Crypt-PasswdMD5-1.3";
     src = fetchurl {
       url = mirror://cpan/authors/id/L/LU/LUISMUNOZ/Crypt-PasswdMD5-1.3.tar.gz;
@@ -602,7 +602,7 @@ rec {
     };
   };
 
-  perlCryptSSLeay = buildPerlPackage rec {
+  CryptSSLeay = buildPerlPackage rec {
     name = "Crypt-SSLeay-0.57";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DL/DLAND/${name}.tar.gz";
@@ -611,7 +611,7 @@ rec {
     makeMakerFlags = "--lib=${pkgs.openssl}/lib";
   };
 
-  perlDataDump = buildPerlPackage {
+  DataDump = buildPerlPackage {
     name = "Data-Dump-1.11";
     src = fetchurl {
       url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.11.tar.gz;
@@ -619,55 +619,55 @@ rec {
     };
   };
 
-  perlDataHierarchy = buildPerlPackage {
+  DataHierarchy = buildPerlPackage {
     name = "Data-Hierarchy-0.34";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz;
       sha256 = "1vfrkygdaq0k7006i83jwavg9wgszfcyzbl9b7fp37z2acmyda5k";
     };
-    propagatedBuildInputs = [perlTestException];
+    propagatedBuildInputs = [TestException];
   };
 
-  perlDataOptList = buildPerlPackage rec {
+  DataOptList = buildPerlPackage rec {
     name = "Data-OptList-0.104";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
       sha256 = "1k1qvf3ik2rn9mg65ginv3lyy6dlg1z08yddcnzbnizs8vbqqaxd";
     };
-    propagatedBuildInputs = [perlSubInstall perlParamsUtil];
+    propagatedBuildInputs = [SubInstall ParamsUtil];
   };
 
-  perlDataPage = buildPerlPackage {
+  DataPage = buildPerlPackage {
     name = "Data-Page-2.01";
     src = fetchurl {
       url = mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.01.tar.gz;
       sha256 = "0mvhlid9qx9yd94rgr4lfz9kvflimc1dzcah0x7q5disw39aqrzr";
     };
-    propagatedBuildInputs = [perlTestException perlClassAccessorChained];
+    propagatedBuildInputs = [TestException ClassAccessorChained];
   };
 
-  perlDataVisitor = buildPerlPackage {
+  DataVisitor = buildPerlPackage {
     name = "Data-Visitor-0.21";
     src = fetchurl {
       url = mirror://cpan/authors/id/N/NU/NUFFIN/Data-Visitor-0.21.tar.gz;
       sha256 = "10cjh3rrqi4gwrmkpzilzmaqdrh71wr59035s6b4p2dzd117p931";
     };
     propagatedBuildInputs = [
-      perlTestMockObject perlMouse perlTaskWeaken perlTestUseOk perlTieToObject
-      perlNamespaceClean
+      TestMockObject Mouse TaskWeaken TestUseOk TieToObject
+      NamespaceClean
     ];
   };
 
-  perlDateCalc = buildPerlPackage {
+  DateCalc = buildPerlPackage {
     name = "Date-Calc-5.4";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-5.4.tar.gz;
       sha256 = "1q7d1sy9ka1akpbysgwj673i7wiwb48yjv6wx1v5dhxllyxlxqc8";
     };
-    propagatedBuildInputs = [perlCarpClan perlBitVector];
+    propagatedBuildInputs = [CarpClan BitVector];
   };
 
-  perlDateManip = buildPerlPackage {
+  DateManip = buildPerlPackage {
     name = "DateManip-5.54";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-5.54.tar.gz;
@@ -675,80 +675,80 @@ rec {
     };
   };
 
-  perlDateTime = buildPerlPackage rec {
+  DateTime = buildPerlPackage rec {
     name = "DateTime-0.4501";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
       sha256 = "1hqhc4xfjgcc1r488gjbi498ws3pxiayabl46607lq02qddcv57s";
     };
-    propagatedBuildInputs = [perlDateTimeLocale perlDateTimeTimeZone];
+    propagatedBuildInputs = [DateTimeLocale DateTimeTimeZone];
   };
 
-  perlDateTimeFormatBuilder = buildPerlPackage rec {
+  DateTimeFormatBuilder = buildPerlPackage rec {
     name = "DateTime-Format-Builder-0.7901";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
       sha256 = "08zl89gh5lkff8736fkdnrf6dgppsjbmymnysbc06s7igd4ig8zf";
     };
     propagatedBuildInputs = [
-      perlDateTime perlParamsValidate perlTaskWeaken perlDateTimeFormatStrptime
-      perlClassFactoryUtil
+      DateTime ParamsValidate TaskWeaken DateTimeFormatStrptime
+      ClassFactoryUtil
     ];
-    buildInputs = [perlTestPod];
+    buildInputs = [TestPod];
   };
 
-  perlDateTimeFormatNatural = buildPerlPackage rec {
+  DateTimeFormatNatural = buildPerlPackage rec {
     name = "DateTime-Format-Natural-0.74";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/${name}.tar.gz";
       sha256 = "0hq33s5frfa8cpj2al7qi0sbmimm5sdlxf0h3b57fjm9x5arlkcn";
     };
     propagatedBuildInputs = [
-      perlDateTime perlListMoreUtils perlParamsValidate perlDateCalc
-      perlTestMockTime perlBoolean
+      DateTime ListMoreUtils ParamsValidate DateCalc
+      TestMockTime Boolean
     ];
   };
 
-  perlDateTimeFormatStrptime = buildPerlPackage rec {
+  DateTimeFormatStrptime = buildPerlPackage rec {
     name = "DateTime-Format-Strptime-1.0800";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RI/RICKM/${name}.tgz";
       sha256 = "10vsmwlhnc62krsh5fm2i0ya7bgjgjsm6nmj56f0bfifjh57ya1j";
     };
     propagatedBuildInputs = [
-      perlDateTime perlDateTimeLocale perlDateTimeTimeZone perlParamsValidate
+      DateTime DateTimeLocale DateTimeTimeZone ParamsValidate
     ];
   };
 
-  perlDateTimeLocale = buildPerlPackage rec {
+  DateTimeLocale = buildPerlPackage rec {
     name = "DateTime-Locale-0.42";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
       sha256 = "1cvp9a4j6vy3xpbv6ipzcz1paw7gzal7lkrbm5ipiilji47d5gaw";
     };
-    propagatedBuildInputs = [perlListMoreUtils perlParamsValidate];
+    propagatedBuildInputs = [ListMoreUtils ParamsValidate];
   };
 
-  perlDateTimeTimeZone = buildPerlPackage rec {
+  DateTimeTimeZone = buildPerlPackage rec {
     name = "DateTime-TimeZone-0.84";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
       sha256 = "0jwbldr3x1cl2ibd9dcshdmpg6s5ddc4qiaxcxyqc82cq09ah2vs";
     };
-    propagatedBuildInputs = [perlClassSingleton perlParamsValidate];
+    propagatedBuildInputs = [ClassSingleton ParamsValidate];
   };
 
-  perlDBDSQLite = import ../development/perl-modules/DBD-SQLite {
-    inherit fetchurl buildPerlPackage perlDBI;
+  DBDSQLite = import ../development/perl-modules/DBD-SQLite {
+    inherit fetchurl buildPerlPackage DBI;
     inherit (pkgs) sqlite;
   };
 
-  perlDBFile = import ../development/perl-modules/DB_File {
+  DBFile = import ../development/perl-modules/DB_File {
     inherit fetchurl buildPerlPackage;
     inherit (pkgs) db4;
   };
 
-  perlDBI = buildPerlPackage {
+  DBI = buildPerlPackage {
     name = "DBI-1.607";
     src = fetchurl {
       url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.607.tar.gz;
@@ -756,56 +756,56 @@ rec {
     };
   };
 
-  perlDBIxClass = buildPerlPackage rec {
+  DBIxClass = buildPerlPackage rec {
     name = "DBIx-Class-0.08099_08";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz";
       sha256 = "12kn3jylxi7n2c6ccqyrjaxxmk3lajvjv19j6rlifp4crn24cbpy";
     };
     propagatedBuildInputs = [
-      perlTestNoWarnings perlTestException perlDBI perlScopeGuard
-      perlPathClass perlClassInspector perlClassAccessorGrouped
-      perlCarpClan perlTestWarn perlDataPage perlSQLAbstract
-      perlSQLAbstractLimit perlClassC3 perlClassC3Componentised
-      perlModuleFind perlDBDSQLite perlJSONAny perlSubName
+      TestNoWarnings TestException DBI ScopeGuard
+      PathClass ClassInspector ClassAccessorGrouped
+      CarpClan TestWarn DataPage SQLAbstract
+      SQLAbstractLimit ClassC3 ClassC3Componentised
+      ModuleFind DBDSQLite JSONAny SubName
     ];
-    buildInputs = [perlTestPod perlTestPodCoverage];
+    buildInputs = [TestPod TestPodCoverage];
   };
 
-  perlDBIxClassHTMLWidget = buildPerlPackage rec {
+  DBIxClassHTMLWidget = buildPerlPackage rec {
     name = "DBIx-Class-HTMLWidget-0.16";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AN/ANDREMAR/${name}.tar.gz";
       sha256 = "05zhniyzl31nq410ywhxm0vmvac53h7ax42hjs9mmpvf45ipahj1";
     };
-    propagatedBuildInputs = [perlDBIxClass perlHTMLWidget];
+    propagatedBuildInputs = [DBIxClass HTMLWidget];
   };
 
-  perlDBIxClassSchemaLoader = buildPerlPackage rec {
+  DBIxClassSchemaLoader = buildPerlPackage rec {
     name = "DBIx-Class-Schema-Loader-0.04999_06";
     src = fetchurl {
       url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz";
       sha256 = "169ydwjarq6qk48jdxcn5ks8rx9aksk9fnx07gl5mz7banw5cs6y";
     };
     propagatedBuildInputs = [
-      perlDBI perlDBDSQLite perlDataDump perlUNIVERSALrequire
-      perlClassAccessor perlClassDataAccessor perlClassC3 perlCarpClan
-      perlClassInspector perlDBIxClass perlLinguaENInflectNumber
-      perlClassUnload
+      DBI DBDSQLite DataDump UNIVERSALrequire
+      ClassAccessor ClassDataAccessor ClassC3 CarpClan
+      ClassInspector DBIxClass LinguaENInflectNumber
+      ClassUnload
     ];
     doCheck = false; # disabled for now, since some tests fail
   };
 
-  perlDevelGlobalDestruction = buildPerlPackage rec {
+  DevelGlobalDestruction = buildPerlPackage rec {
     name = "Devel-GlobalDestruction-0.02";
     src = fetchurl {
       url = "mirror://cpan/authors/id/N/NU/NUFFIN/${name}.tar.gz";
       sha256 = "174m5dx2z89h4308gx6s6vmg93qzaq0bh9m91hp2vqbyialnarhw";
     };
-    propagatedBuildInputs = [perlSubExporter perlScopeGuard];
+    propagatedBuildInputs = [SubExporter ScopeGuard];
   };
 
-  perlDevelStackTrace = buildPerlPackage rec {
+  DevelStackTrace = buildPerlPackage rec {
     name = "Devel-StackTrace-1.20";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
@@ -813,27 +813,27 @@ rec {
     };
   };
 
-  perlDevelSymdump = buildPerlPackage rec {
+  DevelSymdump = buildPerlPackage rec {
     name = "Devel-Symdump-2.08";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz";
       sha256 = "0qzj68zw1yypk8jw77h0w5sdpdcrp4xcmgfghcfyddjr2aim60x5";
     };
     propagatedBuildInputs = [
-      perlTestPod /* cyclic dependency: perlTestPodCoverage */
+      TestPod /* cyclic dependency: TestPodCoverage */
     ];
   };
 
-  perlDigestHMAC = buildPerlPackage {
+  DigestHMAC = buildPerlPackage {
     name = "Digest-HMAC-1.01";
     src = fetchurl {
       url = mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.01.tar.gz;
       sha256 = "042d6nknc5icxqsy5asrh8v2shmvg7b3vbj95jyk4sbqlqpacwz3";
     };
-    propagatedBuildInputs = [perlDigestSHA1];
+    propagatedBuildInputs = [DigestSHA1];
   };
 
-  perlDigestSHA1 = buildPerlPackage {
+  DigestSHA1 = buildPerlPackage {
     name = "Digest-SHA1-2.11";
     src = fetchurl {
       url = mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz;
@@ -841,7 +841,7 @@ rec {
     };
   };
 
-  perlEmailAddress = buildPerlPackage {
+  EmailAddress = buildPerlPackage {
     name = "Email-Address-1.888";
     src = fetchurl {
       url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.888.tar.gz;
@@ -849,16 +849,16 @@ rec {
     };
   };
 
-  perlEmailSend = buildPerlPackage {
+  EmailSend = buildPerlPackage {
     name = "Email-Send-2.185";
     src = fetchurl {
       url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.185.tar.gz;
       sha256 = "0pbgnnbmv6z3zzqaiq1sdcv5d26ijhw4p8k8kp6ac7arvldblamz";
     };
-    propagatedBuildInputs = [perlEmailSimple perlEmailAddress perlModulePluggable perlReturnValue];
+    propagatedBuildInputs = [EmailSimple EmailAddress ModulePluggable ReturnValue];
   };
 
-  perlEmailSimple = buildPerlPackage {
+  EmailSimple = buildPerlPackage {
     name = "Email-Simple-2.003";
     src = fetchurl {
       url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.003.tar.gz;
@@ -866,17 +866,17 @@ rec {
     };
   };
 
-  perlEmailValid = buildPerlPackage {
+  EmailValid = buildPerlPackage {
     name = "Email-Valid-0.179";
     src = fetchurl {
       url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-0.179.tar.gz;
       sha256 = "13yfjll63cp1y4xqzdcr1mjhfncn48v6hckk5mvwi47w3ccj934a";
     };
-    propagatedBuildInputs = [perlMailTools perlNetDNS];
+    propagatedBuildInputs = [MailTools NetDNS];
     doCheck = false;
   };
 
-  perlEncode = buildPerlPackage {
+  Encode = buildPerlPackage {
     name = "Encode-2.25";
     src = fetchurl {
       url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.25.tar.gz;
@@ -884,16 +884,16 @@ rec {
     };
   };
 
-  perlExtUtilsInstall = buildPerlPackage {
+  ExtUtilsInstall = buildPerlPackage {
     name = "ExtUtils-Install-1.50";
     src = fetchurl {
       url = mirror://cpan/authors/id/Y/YV/YVES/ExtUtils-Install-1.50.tar.gz;
       sha256 = "18fr056fwnnhvgc646crx2p9mybf69mh5rkcphc7bbvahw9i61jy";
     };
-    propagatedBuildInputs = [perlExtUtilsMakeMaker];
+    propagatedBuildInputs = [ExtUtilsMakeMaker];
   };
 
-  perlExtUtilsMakeMaker = buildPerlPackage {
+  ExtUtilsMakeMaker = buildPerlPackage {
     name = "ExtUtils-MakeMaker-6.44";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-6.44.tar.gz;
@@ -901,7 +901,7 @@ rec {
     };
   };
 
-  perlExtUtilsManifest = buildPerlPackage {
+  ExtUtilsManifest = buildPerlPackage {
     name = "ExtUtils-Manifest-1.53";
     src = fetchurl {
       url = mirror://cpan/authors/id/R/RK/RKOBES/ExtUtils-Manifest-1.53.tar.gz;
@@ -909,7 +909,7 @@ rec {
     };
   };
 
-  perlFilechdir = buildPerlPackage {
+  Filechdir = buildPerlPackage {
     name = "File-chdir-0.1002";
     src = fetchurl {
       url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1002.tar.gz;
@@ -917,7 +917,7 @@ rec {
     };
   };
 
-  perlFileCopyRecursive = buildPerlPackage {
+  FileCopyRecursive = buildPerlPackage {
     name = "File-Copy-Recursive-0.37";
     src = fetchurl {
       url = mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.37.tar.gz;
@@ -925,7 +925,7 @@ rec {
     };
   };
 
-  perlFileModified = buildPerlPackage {
+  FileModified = buildPerlPackage {
     name = "File-Modified-0.07";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CO/CORION/File-Modified-0.07.tar.gz;
@@ -933,16 +933,16 @@ rec {
     };
   };
 
-  perlFileShareDir = buildPerlPackage rec {
+  FileShareDir = buildPerlPackage rec {
     name = "File-ShareDir-1.00";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
       sha256 = "1afr1r1ys2ij8i4r0i85hfrgrbvcha8c7cgkhcrdya1f0lnpw59z";
     };
-    propagatedBuildInputs = [perlClassInspector perlParamsUtil];
+    propagatedBuildInputs = [ClassInspector ParamsUtil];
   };
 
-  perlFileTemp = buildPerlPackage {
+  FileTemp = buildPerlPackage {
     name = "File-Temp-0.20";
     src = fetchurl {
       url = mirror://cpan/authors/id/T/TJ/TJENNESS/File-Temp-0.20.tar.gz;
@@ -950,7 +950,7 @@ rec {
     };
   };
 
-  perlFreezeThaw = buildPerlPackage {
+  FreezeThaw = buildPerlPackage {
     name = "FreezeThaw-0.43";
     src = fetchurl {
       url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.43.tar.gz;
@@ -958,43 +958,43 @@ rec {
     };
   };
 
-  perlHTMLFormFu = buildPerlPackage rec {
+  HTMLFormFu = buildPerlPackage rec {
     name = "HTML-FormFu-0.03007";
     src = fetchurl {
       url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz";
       sha256 = "03lc4pvygp4wn9rsgdkbwk8zkh8x2z5vp8613c6q74imwrfmmfqy";
     };
     propagatedBuildInputs = [
-      perlClassAccessorChained perlClassC3 perlConfigAny
-      perlDateCalc perlListMoreUtils perlLWP perlEmailValid
-      perlDataVisitor perlDateTime perlDateTimeFormatBuilder
-      perlDateTimeFormatStrptime perlDateTimeFormatNatural
-      perlReadonly perlYAMLSyck perlRegexpCopy
-      perlHTMLTokeParserSimple perlTestNoWarnings perlRegexpCommon
-      perlCaptchaReCAPTCHA perlHTMLScrubber perlFileShareDir
-      perlTemplateToolkit perlCryptCBC perlCryptDES
+      ClassAccessorChained ClassC3 ConfigAny
+      DateCalc ListMoreUtils LWP EmailValid
+      DataVisitor DateTime DateTimeFormatBuilder
+      DateTimeFormatStrptime DateTimeFormatNatural
+      Readonly YAMLSyck RegexpCopy
+      HTMLTokeParserSimple TestNoWarnings RegexpCommon
+      CaptchaReCAPTCHA HTMLScrubber FileShareDir
+      TemplateToolkit CryptCBC CryptDES
     ];
   };
 
-  perlHTMLParser = buildPerlPackage {
+  HTMLParser = buildPerlPackage {
     name = "HTML-Parser-3.56";
     src = fetchurl {
       url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.56.tar.gz;
       sha256 = "0x1h42r54aq4yqpwi7mla4jzia9c5ysyqh8ir2nav833f9jm6g2h";
     };
-    propagatedBuildInputs = [perlHTMLTagset];
+    propagatedBuildInputs = [HTMLTagset];
   };
 
-  perlHTMLScrubber = buildPerlPackage {
+  HTMLScrubber = buildPerlPackage {
     name = "HTML-Scrubber-0.08";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PO/PODMASTER/HTML-Scrubber-0.08.tar.gz;
       sha256 = "0xb5zj67y2sjid9bs3yfm81rgi91fmn38wy1ryngssw6vd92ijh2";
     };
-    propagatedBuildInputs = [perlHTMLParser];
+    propagatedBuildInputs = [HTMLParser];
   };
 
-  perlHTMLTagset = buildPerlPackage {
+  HTMLTagset = buildPerlPackage {
     name = "HTML-Tagset-3.10";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.10.tar.gz;
@@ -1002,7 +1002,7 @@ rec {
     };
   };
 
-  perlHTMLTiny = buildPerlPackage rec {
+  HTMLTiny = buildPerlPackage rec {
     name = "HTML-Tiny-1.03";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz";
@@ -1010,48 +1010,48 @@ rec {
     };
   };
 
-  perlHTMLTokeParserSimple = buildPerlPackage rec {
+  HTMLTokeParserSimple = buildPerlPackage rec {
     name = "HTML-TokeParser-Simple-3.15";
     src = fetchurl {
       url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz";
       sha256 = "0ii1ww17h7wps1lcj7bxrjbisa37f6cvlm0xxpgfq1s6iy06q05b";
     };
-    propagatedBuildInputs = [perlHTMLParser perlSubOverride];
-    buildInputs = [perlTestPod];
+    propagatedBuildInputs = [HTMLParser SubOverride];
+    buildInputs = [TestPod];
   };
 
-  perlHTMLTree = buildPerlPackage {
+  HTMLTree = buildPerlPackage {
     name = "HTML-Tree-3.23";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PE/PETEK/HTML-Tree-3.23.tar.gz;
       sha256 = "1pn80f4g1wixs030f40b80wrj12kwfinwycrx3f10drg4v7ml5zm";
     };
-    propagatedBuildInputs = [perlHTMLParser];
+    propagatedBuildInputs = [HTMLParser];
   };
 
-  perlHTMLWidget = buildPerlPackage {
+  HTMLWidget = buildPerlPackage {
     name = "HTML-Widget-1.11";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-Widget-1.11.tar.gz;
       sha256 = "02w21rd30cza094m5xs9clzw8ayigbhg2ddzl6jycp4jam0dyhmy";
     };
     propagatedBuildInputs = [
-      perlTestNoWarnings perlClassAccessor perlClassAccessorChained
-      perlClassDataAccessor perlModulePluggableFast perlHTMLTree
-      perlHTMLScrubber perlEmailValid perlDateCalc
+      TestNoWarnings ClassAccessor ClassAccessorChained
+      ClassDataAccessor ModulePluggableFast HTMLTree
+      HTMLScrubber EmailValid DateCalc
     ];
   };
 
-  perlHTTPBody = buildPerlPackage rec {
+  HTTPBody = buildPerlPackage rec {
     name = "HTTP-Body-1.05";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz";
       sha256 = "0s0496sb9l8jfkdx86vahwgdaaxrqb0j6acyww6nk0ajh82qrzfv";
     };
-    propagatedBuildInputs = [perlLWP perlYAML];
+    propagatedBuildInputs = [LWP YAML];
   };
 
-  perlHTTPHeaderParserXS = buildPerlPackage rec {
+  HTTPHeaderParserXS = buildPerlPackage rec {
     name = "HTTP-HeaderParser-XS-0.20";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MARKSMITH/${name}.tar.gz";
@@ -1059,35 +1059,35 @@ rec {
     };
   };
 
-  perlHTTPRequestAsCGI = buildPerlPackage {
+  HTTPRequestAsCGI = buildPerlPackage {
     name = "HTTP-Request-AsCGI-0.5";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-Request-AsCGI-0.5.tar.gz;
       sha256 = "164159iiyk0waqayplchkisxg2ldamx8iifrccx32p344714qcrh";
     };
-    propagatedBuildInputs = [perlClassAccessor perlLWP];
+    propagatedBuildInputs = [ClassAccessor LWP];
   };
 
-  perlHTTPResponseEncoding = buildPerlPackage rec {
+  HTTPResponseEncoding = buildPerlPackage rec {
     name = "HTTP-Response-Encoding-0.05";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz";
       sha256 = "04gdl633g0s2ckn7zixcma2krbpfcd46jngg155qpdx5sdwfkm16";
     };
-    propagatedBuildInputs = [perlLWP];
+    propagatedBuildInputs = [LWP];
   };
 
-  perlHTTPServerSimple = buildPerlPackage rec {
+  HTTPServerSimple = buildPerlPackage rec {
     name = "HTTP-Server-Simple-0.38";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JE/JESSE/${name}.tar.gz";
       sha256 = "1m1lmpbg0zhiv2vyc3fyyqfsv3jhhb2mbdl5624fqb0va2pnla6n";
     };
-    propagatedBuildInputs = [perlURI];
+    propagatedBuildInputs = [URI];
     doCheck = false;
   };
 
-  perlI18NLangTags = buildPerlPackage {
+  I18NLangTags = buildPerlPackage {
     name = "I18N-LangTags-0.35";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SB/SBURKE/I18N-LangTags-0.35.tar.gz;
@@ -1095,7 +1095,7 @@ rec {
     };
   };
 
-  perlIOCompressBase = buildPerlPackage rec {
+  IOCompressBase = buildPerlPackage rec {
     name = "IO-Compress-Base-2.015";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
@@ -1103,34 +1103,34 @@ rec {
     };
   };
 
-  perlIOCompressBzip2 = buildPerlPackage rec {
+  IOCompressBzip2 = buildPerlPackage rec {
     name = "IO-Compress-Bzip2-2.015";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
       sha256 = "1kfksf2bslfkviry228p07m1ksnf06mh8gkmdpbrmlmxlbs2idnc";
     };
-    propagatedBuildInputs = [perlIOCompressBase perlCompressRawBzip2];
+    propagatedBuildInputs = [IOCompressBase CompressRawBzip2];
   };
 
-  perlIOCompressGzip = buildPerlPackage rec {
+  IOCompressGzip = buildPerlPackage rec {
     name = "IO-Compress-Zlib-2.015";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
       sha256 = "0sbnx6xdryaajwpssrfgm5b2zasa4ri8pihqwsx3rm5kmkgzy9cx";
     };
-    propagatedBuildInputs = [perlIOCompressBase perlCompressRawZlib];
+    propagatedBuildInputs = [IOCompressBase CompressRawZlib];
   };
 
-  perlIODigest = buildPerlPackage {
+  IODigest = buildPerlPackage {
     name = "IO-Digest-0.10";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.10.tar.gz;
       sha256 = "1g6ilxqv2a7spf273v7k0721c6am7pwpjrin3h5zaqxfmd312nav";
     };
-    propagatedBuildInputs = [perlPerlIOviadynamic];
+    propagatedBuildInputs = [PerlIOviadynamic];
   };
 
-  perlIOPager = buildPerlPackage {
+  IOPager = buildPerlPackage {
     name = "IO-Pager-0.06.tgz";
     src = fetchurl {
       url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.06.tgz;
@@ -1138,7 +1138,7 @@ rec {
     };
   };
 
-  perlIPCRun = buildPerlPackage rec {
+  IPCRun = buildPerlPackage rec {
     name = "IPC-Run-0.82";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
@@ -1147,25 +1147,25 @@ rec {
     doCheck = false; /* attempts a network connection to localhost */
   };
 
-  perlJSON = buildPerlPackage {
+  JSON = buildPerlPackage {
     name = "JSON-2.12";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.12.tar.gz;
       sha256 = "0qbxfwvfsx8s50h2dzpb0z7qi22k9ghygfzbfk8v08kkpmrkls47";
     };
-    propagatedBuildInputs = [perlJSONXS];
+    propagatedBuildInputs = [JSONXS];
   };
 
-  perlJSONAny = buildPerlPackage {
+  JSONAny = buildPerlPackage {
     name = "JSON-Any-1.17";
     src = fetchurl {
       url = mirror://cpan/authors/id/R/RB/RBERJON/JSON-Any-1.17.tar.gz;
       sha256 = "07y6zb0vzb4c87k2lflxafb69zc4a29bxhzh6xdcpjhplf4vbifb";
     };
-    propagatedBuildInputs = [perlJSON];
+    propagatedBuildInputs = [JSON];
   };
 
-  perlJSONXS = buildPerlPackage {
+  JSONXS = buildPerlPackage {
     name = "JSON-XS-2.23";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-2.23.tar.gz;
@@ -1173,7 +1173,7 @@ rec {
     };
   };
 
-  perlLinguaENInflect = buildPerlPackage {
+  LinguaENInflect = buildPerlPackage {
     name = "Lingua-EN-Inflect-1.89";
     src = fetchurl {
       url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.89.tar.gz;
@@ -1181,16 +1181,16 @@ rec {
     };
   };
 
-  perlLinguaENInflectNumber = buildPerlPackage {
+  LinguaENInflectNumber = buildPerlPackage {
     name = "Lingua-EN-Inflect-Number-1.1";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-1.1.tar.gz;
       sha256 = "13hlr1srp9cd9mcc78snkng9il8iavvylfyh81iadvn2y7wikwfy";
     };
-    propagatedBuildInputs = [perlLinguaENInflect];
+    propagatedBuildInputs = [LinguaENInflect];
   };
 
-  perlListMoreUtils = buildPerlPackage {
+  ListMoreUtils = buildPerlPackage {
     name = "List-MoreUtils-0.22";
     src = fetchurl {
       url = mirror://cpan/authors/id/V/VP/VPARSEVAL/List-MoreUtils-0.22.tar.gz;
@@ -1198,7 +1198,7 @@ rec {
     };
   };
 
-  perlLocaleGettext = buildPerlPackage {
+  LocaleGettext = buildPerlPackage {
     name = "LocaleGettext-1.05";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz;
@@ -1206,25 +1206,25 @@ rec {
     };
   };
 
-  perlLocaleMaketext = buildPerlPackage {
+  LocaleMaketext = buildPerlPackage {
     name = "Locale-Maketext-1.13";
     src = fetchurl {
       url = mirror://cpan/authors/id/F/FE/FERREIRA/Locale-Maketext-1.13.tar.gz;
       sha256 = "0qvrhcs1f28ix3v8hcd5xr4z9s7plz4g5a4q1cjp7bs0c3w2yl6z";
     };
-    propagatedBuildInputs = [perlI18NLangTags];
+    propagatedBuildInputs = [I18NLangTags];
   };
 
-  perlLocaleMaketextLexicon = buildPerlPackage {
+  LocaleMaketextLexicon = buildPerlPackage {
     name = "Locale-Maketext-Lexicon-0.66";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Lexicon-0.66.tar.gz;
       sha256 = "1cd2kbcrlyjcmlr7m8kf94mm1hlr7hpv1r80a596f4ljk81f2nvd";
     };
-    propagatedBuildInputs = [perlLocaleMaketext];
+    propagatedBuildInputs = [LocaleMaketext];
   };
 
-  perlLocaleMaketextSimple = buildPerlPackage {
+  LocaleMaketextSimple = buildPerlPackage {
     name = "Locale-Maketext-Simple-0.18";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Simple-0.18.tar.gz;
@@ -1232,43 +1232,43 @@ rec {
     };
   };
 
-  perlLWP = buildPerlPackage rec {
+  LWP = buildPerlPackage rec {
     name = "libwww-perl-5.825";
     src = fetchurl {
       url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
       sha256 = "1wb7br1n86571xz19l20cc5ysy1lx3rhvlk02g5517919z3jxvhw";
     };
-    propagatedBuildInputs = [perlURI perlHTMLParser perlHTMLTagset];
+    propagatedBuildInputs = [URI HTMLParser HTMLTagset];
   };
 
-  perlMailTools = buildPerlPackage {
+  MailTools = buildPerlPackage {
     name = "MailTools-2.04";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.04.tar.gz;
       sha256 = "0w91rcrz4v0pjdnnv2mvlbrm9ww32f7ajhr7xkjdhhr3455p7adx";
     };
-    propagatedBuildInputs = [perlTimeDate perlTestPod];
+    propagatedBuildInputs = [TimeDate TestPod];
   };
 
-  perlMIMETypes = buildPerlPackage {
+  MIMETypes = buildPerlPackage {
     name = "MIME-Types-1.24";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-1.24.tar.gz;
       sha256 = "1j89kjv9lipv6r3bq6dp0k9b8y1f8z9vrmhi7b8h7cs1yc8g7qz9";
     };
-    propagatedBuildInputs = [perlTestPod];
+    propagatedBuildInputs = [TestPod];
   };
 
-  perlModuleBuild = buildPerlPackage {
+  ModuleBuild = buildPerlPackage {
     name = "Module-Build-0.2808";
     src = fetchurl {
       url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Module-Build-0.2808.tar.gz;
       sha256 = "1h8zpf4g2n8v47l9apmdqbdgcg039g70w75hpn84m37pmqkbnj8v";
     };
-    propagatedBuildInputs = [perlExtUtilsInstall perlExtUtilsManifest perlTestHarness];
+    propagatedBuildInputs = [ExtUtilsInstall ExtUtilsManifest TestHarness];
   };
 
-  perlModuleFind = buildPerlPackage {
+  ModuleFind = buildPerlPackage {
     name = "Module-Find-0.06";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.06.tar.gz;
@@ -1276,28 +1276,28 @@ rec {
     };
   };
 
-  perlMoose = buildPerlPackage rec {
+  Moose = buildPerlPackage rec {
     name = "Moose-0.73";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
       sha256 = "1h1d551fbrsbr0knvcah4jyg999667ykhgbldl5rv4h7kdzsqsvz";
     };
     propagatedBuildInputs = [
-      perlTestMore perlTestException perlTaskWeaken perlListMoreUtils
-      perlClassMOP perlSubExporter
+      TestMore TestException TaskWeaken ListMoreUtils
+      ClassMOP SubExporter
     ];
   };
 
-  perlMooseXEmulateClassAccessorFast = buildPerlPackage rec {
+  MooseXEmulateClassAccessorFast = buildPerlPackage rec {
     name = "MooseX-Emulate-Class-Accessor-Fast-0.00800";
     src = fetchurl {
       url = "mirror://cpan/authors/id/G/GR/GRODITI/${name}.tar.gz";
       sha256 = "1z2sld2sw1mlwxwzxxanik3086cw14rdsx2wwnzrfy7prsnigcl2";
     };
-    propagatedBuildInputs = [perlMoose perlNamespaceClean];
+    propagatedBuildInputs = [Moose NamespaceClean];
   };
 
-  perlMouse = buildPerlPackage {
+  Mouse = buildPerlPackage {
     name = "Mouse-0.09";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SA/SARTAK/Mouse-0.09.tar.gz;
@@ -1305,7 +1305,7 @@ rec {
     };
   };
 
-  perlMROCompat = buildPerlPackage {
+  MROCompat = buildPerlPackage {
     name = "MRO-Compat-0.09";
     src = fetchurl {
       url = mirror://cpan/authors/id/B/BL/BLBLACK/MRO-Compat-0.09.tar.gz;
@@ -1313,26 +1313,26 @@ rec {
     };
   };
 
-  perlNamespaceClean = buildPerlPackage {
+  NamespaceClean = buildPerlPackage {
     name = "namespace-clean-0.08";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PH/PHAYLON/namespace-clean-0.08.tar.gz;
       sha256 = "1jwc15zz1j6indqgz64l09ayg0db4gfaasq74x0vyi1yx3d9x2yx";
     };
-    propagatedBuildInputs = [perlScopeGuard];
+    propagatedBuildInputs = [ScopeGuard];
   };
 
-  perlNetDNS = buildPerlPackage {
+  NetDNS = buildPerlPackage {
     name = "Net-DNS-0.63";
     src = fetchurl {
       url = mirror://cpan/authors/id/O/OL/OLAF/Net-DNS-0.63.tar.gz;
       sha256 = "1pswrwhkav051xahm3k4cbyhi8kqpfmaz85lw44kwi2wc7mz4prk";
     };
-    propagatedBuildInputs = [perlNetIP perlDigestHMAC];
+    propagatedBuildInputs = [NetIP DigestHMAC];
     doCheck = false;
   };
 
-  perlNetIP = buildPerlPackage {
+  NetIP = buildPerlPackage {
     name = "Net-IP-1.25";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz;
@@ -1340,7 +1340,7 @@ rec {
     };
   };
 
-  perlNetServer = buildPerlPackage rec {
+  NetServer = buildPerlPackage rec {
     name = "Net-Server-0.97";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RH/RHANDOM/${name}.tar.gz";
@@ -1349,7 +1349,7 @@ rec {
     doCheck = false; # seems to hang waiting for connections
   };
 
-  perlObjectSignature = buildPerlPackage {
+  ObjectSignature = buildPerlPackage {
     name = "Object-Signature-1.05";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AD/ADAMK/Object-Signature-1.05.tar.gz;
@@ -1357,7 +1357,7 @@ rec {
     };
   };
 
-  perlParamsUtil = buildPerlPackage rec {
+  ParamsUtil = buildPerlPackage rec {
     name = "Params-Util-0.37";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
@@ -1365,7 +1365,7 @@ rec {
     };
   };
 
-  perlParamsValidate = buildPerlPackage rec {
+  ParamsValidate = buildPerlPackage rec {
     name = "Params-Validate-0.91";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
@@ -1373,7 +1373,7 @@ rec {
     };
   };
 
-  perlParent = buildPerlPackage {
+  Parent = buildPerlPackage {
     name = "parent-0.221";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CO/CORION/parent-0.221.tar.gz;
@@ -1381,7 +1381,7 @@ rec {
     };
   };
 
-  perlPathClass = buildPerlPackage {
+  PathClass = buildPerlPackage {
     name = "Path-Class-0.16";
     src = fetchurl {
       url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.16.tar.gz;
@@ -1389,7 +1389,7 @@ rec {
     };
   };
 
-  perlPerl5lib = buildPerlPackage rec {
+  Perl5lib = buildPerlPackage rec {
     name = "perl5lib-1.02";
     src = fetchurl {
       url = "mirror://cpan/authors/id/N/NO/NOBULL/${name}.tar.gz";
@@ -1397,7 +1397,7 @@ rec {
     };
   };
 
-  perlPerlIOeol = buildPerlPackage {
+  PerlIOeol = buildPerlPackage {
     name = "PerlIO-eol-0.14";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AU/AUDREYT/PerlIO-eol-0.14.tar.gz;
@@ -1405,7 +1405,7 @@ rec {
     };
   };
 
-  perlPerlIOviadynamic = buildPerlPackage {
+  PerlIOviadynamic = buildPerlPackage {
     name = "PerlIO-via-dynamic-0.12";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-dynamic-0.12.tar.gz;
@@ -1413,7 +1413,7 @@ rec {
     };
   };
 
-  perlPerlIOviasymlink = buildPerlPackage {
+  PerlIOviasymlink = buildPerlPackage {
     name = "PerlIO-via-symlink-0.05";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-symlink-0.05.tar.gz;
@@ -1421,7 +1421,7 @@ rec {
     };
   };
 
-  perlModulePluggable = buildPerlPackage {
+  ModulePluggable = buildPerlPackage {
     name = "Module-Pluggable-3.5";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-3.5.tar.gz;
@@ -1433,25 +1433,25 @@ rec {
     ];
   };
 
-  perlModulePluggableFast = buildPerlPackage {
+  ModulePluggableFast = buildPerlPackage {
     name = "Module-Pluggable-Fast-0.18";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SR/SRI/Module-Pluggable-Fast-0.18.tar.gz;
       sha256 = "140c311x2darrc2p1drbkafv7qwhzdcff4ad300n6whsx4dfp6wr";
     };
-    propagatedBuildInputs = [perlUNIVERSALrequire];
+    propagatedBuildInputs = [UNIVERSALrequire];
   };
 
-  perlPodCoverage = buildPerlPackage rec {
+  PodCoverage = buildPerlPackage rec {
     name = "Pod-Coverage-0.19";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz";
       sha256 = "1krsz4zwmnmq3z29p5vmyr5fdzrn8v0sg6rf3qxk7xpxw4z5np84";
     };
-    propagatedBuildInputs = [perlDevelSymdump];
+    propagatedBuildInputs = [DevelSymdump];
   };
 
-  perlPodEscapes = buildPerlPackage {
+  PodEscapes = buildPerlPackage {
     name = "Pod-Escapes-1.04";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SB/SBURKE/Pod-Escapes-1.04.tar.gz;
@@ -1459,16 +1459,16 @@ rec {
     };
   };
 
-  perlPodSimple = buildPerlPackage {
+  PodSimple = buildPerlPackage {
     name = "Pod-Simple-3.05";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AR/ARANDAL/Pod-Simple-3.05.tar.gz;
       sha256 = "1j0kqcvr9ykcqlkr797j1npkbggykb3p4w5ri73s8mi163lzxkqb";
     };
-    propagatedBuildInputs = [perlconstant perlPodEscapes];
+    propagatedBuildInputs = [constant PodEscapes];
   };
 
-  perlReadonly = buildPerlPackage rec {
+  Readonly = buildPerlPackage rec {
     name = "Readonly-1.03";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz";
@@ -1476,7 +1476,7 @@ rec {
     };
   };
 
-  perlRegexpAssemble = buildPerlPackage rec {
+  RegexpAssemble = buildPerlPackage rec {
     name = "Regexp-Assemble-0.34";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DL/DLAND/${name}.tar.gz";
@@ -1484,7 +1484,7 @@ rec {
     };
   };
 
-  perlRegexpCommon = buildPerlPackage rec {
+  RegexpCommon = buildPerlPackage rec {
     name = "Regexp-Common-2.122";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AB/ABIGAIL/${name}.tar.gz";
@@ -1492,7 +1492,7 @@ rec {
     };
   };
 
-  perlRegexpCopy = buildPerlPackage rec {
+  RegexpCopy = buildPerlPackage rec {
     name = "Regexp-Copy-0.06";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JD/JDUNCAN/${name}.tar.gz";
@@ -1500,7 +1500,7 @@ rec {
     };
   };
 
-  perlReturnValue = buildPerlPackage {
+  ReturnValue = buildPerlPackage {
     name = "Return-Value-1.302";
     src = fetchurl {
       url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.302.tar.gz;
@@ -1508,7 +1508,7 @@ rec {
     };
   };
 
-  perlScopeGuard = buildPerlPackage {
+  ScopeGuard = buildPerlPackage {
     name = "Scope-Guard-0.03";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.03.tar.gz;
@@ -1516,7 +1516,7 @@ rec {
     };
   };
 
-  perlScopeUpper = buildPerlPackage rec {
+  ScopeUpper = buildPerlPackage rec {
     name = "Scope-Upper-0.06";
     src = fetchurl {
       url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz";
@@ -1524,7 +1524,7 @@ rec {
     };
   };
 
-  perlSetObject = buildPerlPackage {
+  SetObject = buildPerlPackage {
     name = "Set-Object-1.26";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SA/SAMV/Set-Object-1.26.tar.gz;
@@ -1532,30 +1532,30 @@ rec {
     };
   };
 
-  perlSQLAbstract = buildPerlPackage rec {
+  SQLAbstract = buildPerlPackage rec {
     name = "SQL-Abstract-1.51";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz";
       sha256 = "1q77yfdrkadf738zvdgarkv0136zs2shz3fdmwaaf03bhvhcbap2";
     };
     propagatedBuildInputs = [
-      perlTestDeep perlTestException perlTestWarn
+      TestDeep TestException TestWarn
     ];
   };
 
-  perlSQLAbstractLimit = buildPerlPackage rec {
+  SQLAbstractLimit = buildPerlPackage rec {
     name = "SQL-Abstract-Limit-0.141";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DAVEBAIRD/${name}.tar.gz";
       sha256 = "1qqh89kz065mkgyg5pjcgbf8qcpzfk8vf1lgkbwynknadmv87zqg";
     };
     propagatedBuildInputs = [
-      perlSQLAbstract perlTestException perlDBI perlTestDeep
+      SQLAbstract TestException DBI TestDeep
     ];
-    buildInputs = [perlTestPod perlTestPodCoverage];
+    buildInputs = [TestPod TestPodCoverage];
   };
 
-  perlStringMkPasswd = buildPerlPackage {
+  StringMkPasswd = buildPerlPackage {
     name = "String-MkPasswd-0.02";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CG/CGRAU/String-MkPasswd-0.02.tar.gz;
@@ -1563,16 +1563,16 @@ rec {
     };
   };
 
-  perlSubExporter = buildPerlPackage rec {
+  SubExporter = buildPerlPackage rec {
     name = "Sub-Exporter-0.982";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
       sha256 = "0xf8q05k5xs3bw6qy3pnnl5d670njxsxbw2dprl7n50hf488cbvj";
     };
-    propagatedBuildInputs = [perlSubInstall perlDataOptList perlParamsUtil];
+    propagatedBuildInputs = [SubInstall DataOptList ParamsUtil];
   };
 
-  perlSubIdentify = buildPerlPackage rec {
+  SubIdentify = buildPerlPackage rec {
     name = "Sub-Identify-0.04";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz";
@@ -1580,7 +1580,7 @@ rec {
     };
   };
 
-  perlSubInstall = buildPerlPackage rec {
+  SubInstall = buildPerlPackage rec {
     name = "Sub-Install-0.925";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
@@ -1588,7 +1588,7 @@ rec {
     };
   };
 
-  perlSubName = buildPerlPackage {
+  SubName = buildPerlPackage {
     name = "Sub-Name-0.04";
     src = fetchurl {
       url = mirror://cpan/authors/id/X/XM/XMATH/Sub-Name-0.04.tar.gz;
@@ -1596,16 +1596,16 @@ rec {
     };
   };
 
-  perlSubOverride = buildPerlPackage rec {
+  SubOverride = buildPerlPackage rec {
     name = "Sub-Override-0.08";
     src = fetchurl {
       url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz";
       sha256 = "13s5zi6qz02q50vv4bmwdmhn9gvg0988fydjlrrv500g6hnyzlkj";
     };
-    propagatedBuildInputs = [perlSubUplevel perlTestException];
+    propagatedBuildInputs = [SubUplevel TestException];
   };
 
-  perlSubUplevel = buildPerlPackage {
+  SubUplevel = buildPerlPackage {
     name = "Sub-Uplevel-0.2002";
     src = fetchurl {
       url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2002.tar.gz;
@@ -1613,36 +1613,36 @@ rec {
     };
   };
 
-  perlSVK = buildPerlPackage {
+  SVK = buildPerlPackage {
     name = "SVK-v2.0.2";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CL/CLKAO/SVK-v2.0.2.tar.gz;
       sha256 = "0c4m2q7cvzwh9kk1nc1vd8lkxx2kss5nd4k20dpkal4c7735jns0";
     };
     propagatedBuildInputs = [
-      perlAlgorithmDiff perlAlgorithmAnnotate perlAppCLI
-      perlClassDataInheritable perlDataHierarchy perlEncode perlFileTemp
-      perlIODigest perlListMoreUtils perlPathClass perlPerlIOeol
-      perlPerlIOviadynamic perlPerlIOviasymlink perlPodEscapes
-      perlPodSimple perlSVNMirror perlTimeHiRes perlUNIVERSALrequire
-      perlURI perlYAMLSyck perlClassAutouse perlIOPager
-      perlLocaleMaketextLexicon perlFreezeThaw
+      AlgorithmDiff AlgorithmAnnotate AppCLI
+      ClassDataInheritable DataHierarchy Encode FileTemp
+      IODigest ListMoreUtils PathClass PerlIOeol
+      PerlIOviadynamic PerlIOviasymlink PodEscapes
+      PodSimple SVNMirror TimeHiRes UNIVERSALrequire
+      URI YAMLSyck ClassAutouse IOPager
+      LocaleMaketextLexicon FreezeThaw
     ];
   };
 
-  perlSVNMirror = buildPerlPackage {
+  SVNMirror = buildPerlPackage {
     name = "SVN-Mirror-0.73";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Mirror-0.73.tar.gz;
       sha256 = "1scjaq7qjz6jlsk1c2l5q15yxf0sqbydvf22mb2xzy1bzaln0x2c";
     };
     propagatedBuildInputs = [
-      perlClassAccessor perlFilechdir pkgs.subversion perlURI
-      perlTermReadKey perlTimeDate perlSVNSimple
+      ClassAccessor Filechdir pkgs.subversion URI
+      TermReadKey TimeDate SVNSimple
     ];
   };
 
-  perlSVNSimple = buildPerlPackage {
+  SVNSimple = buildPerlPackage {
     name = "SVN-Simple-0.27";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Simple-0.27.tar.gz;
@@ -1651,29 +1651,29 @@ rec {
     propagatedBuildInputs = [pkgs.subversion];
   };
 
-  perlTaskCatalystTutorial = buildPerlPackage rec {
+  TaskCatalystTutorial = buildPerlPackage rec {
     name = "Task-Catalyst-Tutorial-0.06";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz";
       sha256 = "07nn8a30n3qylpnf7s4ma6w462g31pywwikib117hr2mc7cv5cbm";
     };
     propagatedBuildInputs = [
-      perlCatalystManual perlCatalystRuntime perlCatalystDevel
-      perlCatalystPluginSession perlCatalystPluginAuthentication
-      perlCatalystAuthenticationStoreDBIxClass
-      perlCatalystPluginAuthorizationRoles
-      perlCatalystPluginAuthorizationACL
-      perlCatalystPluginHTMLWidget
-      perlCatalystPluginSessionStoreFastMmap
-      perlCatalystPluginStackTrace
-      perlCatalystViewTT
-      perlDBIxClass perlDBIxClassHTMLWidget
-      perlCatalystControllerHTMLFormFu
+      CatalystManual CatalystRuntime CatalystDevel
+      CatalystPluginSession CatalystPluginAuthentication
+      CatalystAuthenticationStoreDBIxClass
+      CatalystPluginAuthorizationRoles
+      CatalystPluginAuthorizationACL
+      CatalystPluginHTMLWidget
+      CatalystPluginSessionStoreFastMmap
+      CatalystPluginStackTrace
+      CatalystViewTT
+      DBIxClass DBIxClassHTMLWidget
+      CatalystControllerHTMLFormFu
     ];
-    buildInputs = [perlTestPodCoverage];
+    buildInputs = [TestPodCoverage];
   };
 
-  perlTaskWeaken = buildPerlPackage {
+  TaskWeaken = buildPerlPackage {
     name = "Task-Weaken-1.02";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AD/ADAMK/Task-Weaken-1.02.tar.gz;
@@ -1681,29 +1681,29 @@ rec {
     };
   };
 
-  perlTemplateTimer = buildPerlPackage {
+  TemplateTimer = buildPerlPackage {
     name = "Template-Timer-0.04";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PE/PETDANCE/Template-Timer-0.04.tar.gz;
       sha256 = "0j0gmxbq1svp0rb4kprwj2fk2mhl07yah08bksfz0a0pfz6lsam4";
     };
-    propagatedBuildInputs = [perlTemplateToolkit];
+    propagatedBuildInputs = [TemplateToolkit];
   };
 
-  perlTemplateToolkit = buildPerlPackage {
+  TemplateToolkit = buildPerlPackage {
     name = "Template-Toolkit-2.20";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.20.tar.gz;
       sha256 = "13wbh06a76k4ag14lhszmpwv4hb8hlj1d9glizhp8izazl3xf1zg";
     };
-    propagatedBuildInputs = [perlAppConfig];
+    propagatedBuildInputs = [AppConfig];
     patches = [
-      # Needed to make TT works properly on templates in the Nix store.
+      # Needed to make TT works proy on templates in the Nix store.
       ../development/perl-modules/template-toolkit-nix-store.patch
     ];
   };
 
-  perlTermReadKey = buildPerlPackage {
+  TermReadKey = buildPerlPackage {
     name = "TermReadKey-2.30";
     src = fetchurl {
       url = mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.30.tar.gz;
@@ -1711,25 +1711,25 @@ rec {
     };
   };
 
-  perlTestDeep = buildPerlPackage {
+  TestDeep = buildPerlPackage {
     name = "Test-Deep-0.103";
     src = fetchurl {
       url = mirror://cpan/authors/id/F/FD/FDALY/Test-Deep-0.103.tar.gz;
       sha256 = "0cdl08k5v0wc9w20va5qw98ynlbs9ifwndgsix8qhi7h15sj8a5j";
     };
-    propagatedBuildInputs = [perlTestTester perlTestNoWarnings];
+    propagatedBuildInputs = [TestTester TestNoWarnings];
   };
 
-  perlTestException = buildPerlPackage {
+  TestException = buildPerlPackage {
     name = "Test-Exception-0.27";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AD/ADIE/Test-Exception-0.27.tar.gz;
       sha256 = "1s921j7yv2szywd1ffi6yz3ngrbq97f9dh38bvvajqnm29g1xb9j";
     };
-    propagatedBuildInputs = [perlTestHarness perlTestSimple perlSubUplevel];
+    propagatedBuildInputs = [TestHarness TestSimple SubUplevel];
   };
 
-  perlTestHarness = buildPerlPackage {
+  TestHarness = buildPerlPackage {
     name = "Test-Harness-3.10";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AN/ANDYA/Test-Harness-3.10.tar.gz;
@@ -1737,7 +1737,7 @@ rec {
     };
   };
 
-  perlTestLongString = buildPerlPackage rec {
+  TestLongString = buildPerlPackage rec {
     name = "Test-LongString-0.11";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz";
@@ -1745,16 +1745,16 @@ rec {
     };
   };
 
-  perlTestMockObject = buildPerlPackage {
+  TestMockObject = buildPerlPackage {
     name = "Test-MockObject-1.09";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.09.tar.gz;
       sha256 = "1cz385x0jrkj84nmfs6qyzwwvv8m9v8r2isagfj1zxvhdw49wdyy";
     };
-    propagatedBuildInputs = [perlTestException perlUNIVERSALisa perlUNIVERSALcan];
+    propagatedBuildInputs = [TestException UNIVERSALisa UNIVERSALcan];
   };
 
-  perlTestMockTime = buildPerlPackage rec {
+  TestMockTime = buildPerlPackage rec {
     name = "Test-MockTime-0.09";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DD/DDICK/${name}.tar.gz";
@@ -1762,18 +1762,18 @@ rec {
     };
   };
 
-  perlTestMore = perlTestSimple;
+  TestMore = TestSimple;
 
-  perlTestNoWarnings = buildPerlPackage {
+  TestNoWarnings = buildPerlPackage {
     name = "Test-NoWarnings-0.084";
     src = fetchurl {
       url = mirror://cpan/authors/id/F/FD/FDALY/Test-NoWarnings-0.084.tar.gz;
       sha256 = "19g47pa3brr9px3jnwziapvxcnghqqjjwxz1jfch4asawpdx2s8b";
     };
-    propagatedBuildInputs = [perlTestTester];
+    propagatedBuildInputs = [TestTester];
   };
 
-  perlTestPod = buildPerlPackage {
+  TestPod = buildPerlPackage {
     name = "Test-Pod-1.26";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Pod-1.26.tar.gz;
@@ -1781,25 +1781,25 @@ rec {
     };
   };
 
-  perlTestPodCoverage = buildPerlPackage rec {
+  TestPodCoverage = buildPerlPackage rec {
     name = "Test-Pod-Coverage-1.08";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
       sha256 = "0y2md932zhbxdjwzskx0vmw2qy7jxkn87f9lb5h3f3vxxg1kcqz0";
     };
-    propagatedBuildInputs = [perlPodCoverage];
+    propagatedBuildInputs = [PodCoverage];
   };
 
-  perlTestSimple = buildPerlPackage {
+  TestSimple = buildPerlPackage {
     name = "Test-Simple-0.84";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Simple-0.84.tar.gz;
       sha256 = "030j47q3p46jfk60dsh2d5m7ip4nqz0fl4inqr8hx8b8q0f00r4l";
     };
-    propagatedBuildInputs = [perlTestHarness];
+    propagatedBuildInputs = [TestHarness];
   };
 
-  perlTestTester = buildPerlPackage {
+  TestTester = buildPerlPackage {
     name = "Test-Tester-0.107";
     src = fetchurl {
       url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.107.tar.gz;
@@ -1807,7 +1807,7 @@ rec {
     };
   };
 
-  perlTestUseOk = buildPerlPackage rec {
+  TestUseOk = buildPerlPackage rec {
     name = "Test-use-ok-0.02";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AU/AUDREYT/${name}.tar.gz";
@@ -1815,43 +1815,43 @@ rec {
     };
   };
 
-  perlTestWarn = buildPerlPackage {
+  TestWarn = buildPerlPackage {
     name = "Test-Warn-0.11";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CH/CHORNY/Test-Warn-0.11.tar.gz;
       sha256 = "1y9g13bzvjsmg5v555zrl7w085jq40a47hfs4gc3k78s0bkwxbyi";
     };
-    propagatedBuildInputs = [perlTestSimple perlTestException perlArrayCompare perlTreeDAGNode];
-    buildInputs = [perlTestPod];
+    propagatedBuildInputs = [TestSimple TestException ArrayCompare TreeDAGNode];
+    buildInputs = [TestPod];
   };
 
-  perlTestWWWMechanize = buildPerlPackage rec {
+  TestWWWMechanize = buildPerlPackage rec {
     name = "Test-WWW-Mechanize-1.24";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
       sha256 = "11knym5ppish78rk8r1hymvq1py43h7z8d6nk8p4ig3p246xx5qa";
     };
     propagatedBuildInputs = [
-      perlCarpAssertMore perlURI perlTestLongString perlWWWMechanize
+      CarpAssertMore URI TestLongString WWWMechanize
     ];
     doCheck = false;
   };
 
-  perlTestWWWMechanizeCatalyst = buildPerlPackage rec {
+  TestWWWMechanizeCatalyst = buildPerlPackage rec {
     name = "Test-WWW-Mechanize-Catalyst-0.45";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LB/LBROCARD/${name}.tar.gz";
       sha256 = "0hixz0hibv2z87kdqvrphzgww0xibgg56w7bh299dgw2739hy4yf";
     };
     propagatedBuildInputs = [
-      perlCatalystRuntime perlTestWWWMechanize perlWWWMechanize
-      perlCatalystPluginSessionStateCookie
+      CatalystRuntime TestWWWMechanize WWWMechanize
+      CatalystPluginSessionStateCookie
     ];
-    buildInputs = [perlTestPod];
+    buildInputs = [TestPod];
     doCheck = false;
   };
 
-  perlTextCSV = buildPerlPackage rec {
+  TextCSV = buildPerlPackage rec {
     name = "Text-CSV-1.10";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/${name}.tar.gz";
@@ -1859,7 +1859,7 @@ rec {
     };
   };
 
-  perlTextSimpleTable = buildPerlPackage {
+  TextSimpleTable = buildPerlPackage {
     name = "Text-SimpleTable-0.05";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SR/SRI/Text-SimpleTable-0.05.tar.gz;
@@ -1867,16 +1867,16 @@ rec {
     };
   };
 
-  perlTieToObject = buildPerlPackage {
+  TieToObject = buildPerlPackage {
     name = "Tie-ToObject-0.03";
     src = fetchurl {
       url = mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz;
       sha256 = "1x1smn1kw383xc5h9wajxk9dlx92bgrbf7gk4abga57y6120s6m3";
     };
-    propagatedBuildInputs = [perlTestUseOk];
+    propagatedBuildInputs = [TestUseOk];
   };
 
-  perlTimeDate = buildPerlPackage {
+  TimeDate = buildPerlPackage {
     name = "TimeDate-1.16";
     src = fetchurl {
       url = mirror://cpan/authors/id/G/GB/GBARR/TimeDate-1.16.tar.gz;
@@ -1884,7 +1884,7 @@ rec {
     };
   };
 
-  perlTimeHiRes = buildPerlPackage {
+  TimeHiRes = buildPerlPackage {
     name = "Time-HiRes-1.9715";
     src = fetchurl {
       url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9715.tar.gz;
@@ -1892,7 +1892,7 @@ rec {
     };
   };
 
-  perlTreeDAGNode = buildPerlPackage {
+  TreeDAGNode = buildPerlPackage {
     name = "Tree-DAG_Node-1.06";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CO/COGENT/Tree-DAG_Node-1.06.tar.gz;
@@ -1900,26 +1900,26 @@ rec {
     };
   };
 
-  perlTreeSimple = buildPerlPackage {
+  TreeSimple = buildPerlPackage {
     name = "Tree-Simple-1.18";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/ST/STEVAN/Tree-Simple-1.18.tar.gz;
       sha256 = "0bb2hc8q5rwvz8a9n6f49kzx992cxczmrvq82d71757v087dzg6g";
     };
-    propagatedBuildInputs = [perlTestException];
+    propagatedBuildInputs = [TestException];
   };
 
-  perlTreeSimpleVisitorFactory = buildPerlPackage {
+  TreeSimpleVisitorFactory = buildPerlPackage {
     name = "Tree-Simple-VisitorFactory-0.10";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/ST/STEVAN/Tree-Simple-VisitorFactory-0.10.tar.gz;
       sha256 = "1ghcgnb3xvqjyh4h4aa37x98613aldnpj738z9b80p33bbfxq158";
     };
-    propagatedBuildInputs = [perlTreeSimple];
-    buildInputs = [perlTestException];
+    propagatedBuildInputs = [TreeSimple];
+    buildInputs = [TestException];
   };
 
-  perlFontTTF = buildPerlPackage {
+  FontTTF = buildPerlPackage {
     name = "perl-Font-TTF-0.43";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.43.tar.gz;
@@ -1927,7 +1927,7 @@ rec {
     };
   };
 
-  perlUNIVERSALcan = buildPerlPackage {
+  UNIVERSALcan = buildPerlPackage {
     name = "UNIVERSAL-can-1.12";
     src = fetchurl {
       url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.12.tar.gz;
@@ -1935,7 +1935,7 @@ rec {
     };
   };
 
-  perlUNIVERSALisa = stdenv.mkDerivation rec {
+  UNIVERSALisa = stdenv.mkDerivation rec {
     name = "UNIVERSAL-isa-1.01";
     src = fetchurl {
       url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz";
@@ -1950,7 +1950,7 @@ rec {
     installPhase = "perl ./Build install";
   };
 
-  perlUNIVERSALrequire = buildPerlPackage {
+  UNIVERSALrequire = buildPerlPackage {
     name = "UNIVERSAL-require-0.11";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/MS/MSCHWERN/UNIVERSAL-require-0.11.tar.gz;
@@ -1958,7 +1958,7 @@ rec {
     };
   };
 
-  perlURI = buildPerlPackage rec {
+  URI = buildPerlPackage rec {
     name = "URI-1.37";
     src = fetchurl {
       url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
@@ -1966,15 +1966,15 @@ rec {
     };
   };
 
-  perlW3CLinkChecker = buildPerlPackage rec {
+  W3CLinkChecker = buildPerlPackage rec {
     name = "W3C-LinkChecker-4.5";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SC/SCOP/${name}.tar.gz";
       sha256 = "0j2zlg57g0y9hqy8n35x5rfkpm7rnfjlwny5g0zaxwrl62ndkbm9";
     };
     propagatedBuildInputs = [
-      perlLWP perlConfigGeneral perlNetIP perlTermReadKey perlPerl5lib
-      perlCryptSSLeay
+      LWP ConfigGeneral NetIP TermReadKey Perl5lib
+      CryptSSLeay
     ];
     meta = {
       homepage = http://validator.w3.org/checklink;
@@ -1982,37 +1982,37 @@ rec {
     };
   };
 
-  perlWWWMechanize = buildPerlPackage rec {
+  WWWMechanize = buildPerlPackage rec {
     name = "WWW-Mechanize-1.54";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
       sha256 = "1yxvw5xfng5fj4422869p5dwvmrkmqph9gdm2nl12wngydk93lnh";
     };
-    propagatedBuildInputs = [perlLWP perlHTTPResponseEncoding perlHTTPServerSimple];
+    propagatedBuildInputs = [LWP HTTPResponseEncoding HTTPServerSimple];
     doCheck = false;
   };
 
-  perlXMLDOM = buildPerlPackage {
+  XMLDOM = buildPerlPackage {
     name = "XML-DOM-1.44";
     src = fetchurl {
       url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.44.tar.gz;
       sha256 = "1r0ampc88ni3sjpzr583k86076qg399arfm9xirv3cw49k3k5bzn";
     };
     #buildInputs = [libxml2];
-    propagatedBuildInputs = [perlXMLRegExp perlXMLParser perlLWP];
+    propagatedBuildInputs = [XMLRegExp XMLParser LWP];
   };
 
-  perlXMLLibXML = buildPerlPackage {
+  XMLLibXML = buildPerlPackage {
     name = "XML-LibXML-1.66";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PA/PAJAS/XML-LibXML-1.66.tar.gz;
       sha256 = "1a0bdiv3px6igxnbbjq10064iahm8f5i310p4y05w6zn5d51awyl";
     };
     buildInputs = [pkgs.libxml2];
-    propagatedBuildInputs = [perlXMLLibXMLCommon perlXMLSAX];
+    propagatedBuildInputs = [XMLLibXMLCommon XMLSAX];
   };
 
-  perlXMLLibXMLCommon = buildPerlPackage {
+  XMLLibXMLCommon = buildPerlPackage {
     name = "XML-LibXML-Common-0.13";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PH/PHISH/XML-LibXML-Common-0.13.tar.gz;
@@ -2021,7 +2021,7 @@ rec {
     buildInputs = [pkgs.libxml2];
   };
 
-  perlXMLNamespaceSupport = buildPerlPackage {
+  XMLNamespaceSupport = buildPerlPackage {
     name = "XML-NamespaceSupport-1.09";
     src = fetchurl {
       url = mirror://cpan/authors/id/R/RB/RBERJON/XML-NamespaceSupport-1.09.tar.gz;
@@ -2029,7 +2029,7 @@ rec {
     };
   };
 
-  perlXMLParser = buildPerlPackage {
+  XMLParser = buildPerlPackage {
     name = "XML-Parser-2.36";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz;
@@ -2038,7 +2038,7 @@ rec {
     makeMakerFlags = "EXPATLIBPATH=${pkgs.expat}/lib EXPATINCPATH=${pkgs.expat}/include";
   };
 
-  perlXMLRegExp = buildPerlPackage {
+  XMLRegExp = buildPerlPackage {
     name = "XML-RegExp-0.03";
     src = fetchurl {
       url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.03.tar.gz;
@@ -2046,34 +2046,34 @@ rec {
     };
   };
 
-  perlXMLSAX = buildPerlPackage {
+  XMLSAX = buildPerlPackage {
     name = "XML-SAX-0.96";
     src = fetchurl {
       url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-0.96.tar.gz;
       sha256 = "024fbjgg6s87j0y3yik55plzf7d6qpn7slwd03glcb54mw9zdglv";
     };
-    propagatedBuildInputs = [perlXMLNamespaceSupport];
+    propagatedBuildInputs = [XMLNamespaceSupport];
   };
 
-  perlXMLSimple = buildPerlPackage {
+  XMLSimple = buildPerlPackage {
     name = "XML-Simple-2.18";
     src = fetchurl {
       url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.18.tar.gz;
       sha256 = "09k8fvc9m5nd5rqq00rwm3m0wx7iwd6vx0vc947y58ydi30nfjd5";
     };
-    propagatedBuildInputs = [perlXMLParser];
+    propagatedBuildInputs = [XMLParser];
   };
 
-  perlXMLTwig = buildPerlPackage {
+  XMLTwig = buildPerlPackage {
     name = "XML-Twig-3.32";
     src = fetchurl {
       url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.32.tar.gz;
       sha256 = "07zdsfzw9dlrx6ril9clf1jfif09vpf27rz66laja7mvih9izd1v";
     };
-    propagatedBuildInputs = [perlXMLParser];
+    propagatedBuildInputs = [XMLParser];
   };
 
-  perlXMLWriter = buildPerlPackage {
+  XMLWriter = buildPerlPackage {
     name = "XML-Writer-0.602";
     src = fetchurl {
       url = mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.602.tar.gz;
@@ -2081,7 +2081,7 @@ rec {
     };
   };
 
-  perlXSLoader = buildPerlPackage {
+  XSLoader = buildPerlPackage {
     name = "XSLoader-0.08";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.08.tar.gz;
@@ -2089,7 +2089,7 @@ rec {
     };
   };
 
-  perlYAML = buildPerlPackage rec {
+  YAML = buildPerlPackage rec {
     name = "YAML-0.68";
     src = fetchurl {
       url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
@@ -2097,7 +2097,7 @@ rec {
     };
   };
 
-  perlYAMLSyck = buildPerlPackage rec {
+  YAMLSyck = buildPerlPackage rec {
     name = "YAML-Syck-1.05";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AU/AUDREYT/${name}.tar.gz";
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 40b061b96ed..b93541d696c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -218,7 +218,6 @@ in {
   par2cmdline = all;
   pciutils = linux;
   perl = all;
-  perlTaskCatalystTutorial = linux;
   php = linux;
   pidgin = linux;
   pinentry = linux;
@@ -397,7 +396,7 @@ in {
   };
 
   perlPackages = {
-    perlTaskCatalystTutorial = linux;
+    TaskCatalystTutorial = linux;
   };
   
   xorg = {

From cf54a6238407d718c4c16f4fca590054961115d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 12:52:24 +0000
Subject: [PATCH 33/58] svn path=/nixpkgs/trunk/; revision=15178

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

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 8549ac7c813..8cf7c769440 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -582,7 +582,7 @@ rec {
   rpmClosureGenerator =
     {name, packagesList, urlPrefix, packages, archs ? []}:
     
-    runCommand "${name}.nix" {buildInputs = [perl perlPackages.perlXMLSimple]; inherit archs;} ''
+    runCommand "${name}.nix" {buildInputs = [perl perlPackages.XMLSimple]; inherit archs;} ''
       gunzip < ${packagesList} > ./packages.xml
       perl -w ${rpm/rpm-closure.pl} \
         ./packages.xml ${urlPrefix} ${toString packages} > $out

From f4cdb54fd3b61ac5cc429c4ae3465d6bbead6791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 20 Apr 2009 13:01:31 +0000
Subject: [PATCH 34/58] Added vacuum and vacuum-cairo packages.

svn path=/nixpkgs/trunk/; revision=15179
---
 .../haskell/strictConcurrency/default.nix     | 12 ++++++++++
 .../libraries/haskell/vacuum/default.nix      |  2 +-
 .../libraries/haskell/vacuumCairo/default.nix | 12 ++++++++++
 pkgs/top-level/haskell-packages.nix           | 22 +++++++++++++------
 4 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/strictConcurrency/default.nix
 create mode 100644 pkgs/development/libraries/haskell/vacuumCairo/default.nix

diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
new file mode 100644
index 00000000000..6e43e157c37
--- /dev/null
+++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
@@ -0,0 +1,12 @@
+{cabal, parallel}:
+
+cabal.mkDerivation (self : {
+  pname = "strict-concurrency";
+  version = "0.2.1";
+  sha256 = "8838600033bde2ce7ca6bd95a3815412da67244b57dfc0e2246a8f2469f5fd9c";
+  propagatedBuildInputs = [parallel];
+  meta = {
+    description = "Strict concurrency abstractions";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
index 75ac4778ed0..05e1448ddb1 100644
--- a/pkgs/development/libraries/haskell/vacuum/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum/default.nix
@@ -6,7 +6,7 @@ cabal.mkDerivation (self : {
   sha256 = "9240ec35b39d60928a73469893adf1d2aa742b9a781dbc6dcdaa54e96d9bf1af";
   propagatedBuildInputs = [ghcPaths haskellSrcMeta];
   meta = {
-    description = "Generic programming with systems of recursive datatypes";
+    description = "Extract graph representations of ghc heap values";
   };
 })  
 
diff --git a/pkgs/development/libraries/haskell/vacuumCairo/default.nix b/pkgs/development/libraries/haskell/vacuumCairo/default.nix
new file mode 100644
index 00000000000..cd30b77d5b7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vacuumCairo/default.nix
@@ -0,0 +1,12 @@
+{cabal, vacuum, gtk2hs, parallel, strictConcurrency}:
+
+cabal.mkDerivation (self : {
+  pname = "vacuum-cairo";
+  version = "0.4.1";
+  sha256 = "4d506fec246d40e5c983eea1dbd72735e276f882539aa3682cda9d9a33f8ddb2";
+  propagatedBuildInputs = [vacuum gtk2hs parallel strictConcurrency];
+  meta = {
+    description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 22d8d3ade30..13264ee819c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -183,6 +183,10 @@ rec {
     inherit cabal;
   };
 
+  strictConcurrency = import ../development/libraries/haskell/strictConcurrency {
+    inherit cabal parallel;
+  };
+
   time = import ../development/libraries/haskell/time {
     inherit cabal;
   };
@@ -195,15 +199,23 @@ rec {
     inherit cabal;
   };
 
-  wxHaskell = import ../development/libraries/haskell/wxHaskell {
-    inherit ghc;
-    inherit (pkgs) stdenv fetchurl unzip wxGTK;
+  vacuum = import ../development/libraries/haskell/vacuum {
+    inherit cabal ghcPaths haskellSrcMeta;
+  };
+
+  vacuumCairo = import ../development/libraries/haskell/vacuumCairo {
+    inherit cabal vacuum gtk2hs parallel strictConcurrency;
   };
 
   vty = import ../development/libraries/haskell/vty {
     inherit cabal;
   };
 
+  wxHaskell = import ../development/libraries/haskell/wxHaskell {
+    inherit ghc;
+    inherit (pkgs) stdenv fetchurl unzip wxGTK;
+  };
+
   X11 = import ../development/libraries/haskell/X11 {
     inherit cabal;
     inherit (pkgs.xlibs) libX11 libXinerama libXext;
@@ -282,10 +294,6 @@ rec {
     inherit cabal uulib;
   };
 
-  vacuum = import ../development/libraries/haskell/vacuum {
-    inherit cabal ghcPaths haskellSrcMeta;
-  };
-  
   # Applications.
 
   darcs = import ../applications/version-management/darcs/darcs-2.nix {

From 3fd1093d2d07b7c2938602a69f9190e56d683b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 20 Apr 2009 13:01:34 +0000
Subject: [PATCH 35/58] xmonad and xmobar updates

svn path=/nixpkgs/trunk/; revision=15180
---
 pkgs/applications/misc/xmobar/default.nix                 | 8 ++++----
 pkgs/applications/window-managers/xmonad/default.nix      | 8 ++++----
 .../window-managers/xmonad/xmonad-contrib.nix             | 4 ++--
 pkgs/development/libraries/haskell/X11/default.nix        | 4 ++--
 pkgs/top-level/haskell-packages.nix                       | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 4e767177e29..7c7fa4c88cc 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,11 +1,11 @@
-{cabal, X11}:
+{cabal, X11, mtl, parsec, stm}:
 
 cabal.mkDerivation (self : {
   pname = "xmobar";
   name = "${self.fname}";
-  version = "0.8";
-  sha256 = "88aa5bc0715e2592282e5897bc7938f16580804f56757bc71ed3762bf86c9415";
-  extraBuildInputs = [X11];
+  version = "0.9.2";
+  sha256 = "361295f5dc912512a2eb644ecd331562a271243192be6215cb071e44f50c7c66";
+  extraBuildInputs = [X11 mtl parsec stm];
   meta = {
     description = "xmobar is a minimalistic text based status bar";
   };
diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
index ed01ddd3e33..1207f2627fa 100644
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@@ -1,11 +1,11 @@
-{cabal, X11, xmessage}:
+{cabal, X11, mtl, xmessage}:
 
 cabal.mkDerivation (self : {
   pname = "xmonad";
   name = "${self.fname}";
-  version = "0.7";
-  sha256 = "d5ee338eb6d0680082e20eaafa0b23b32358fffe69e2ec4ad7bdf6e03c751d67";
-  extraBuildInputs = [X11];
+  version = "0.8.1";
+  sha256 = "9d58789a0bc08d40b9d14097b079822c7b8290d60efc6aa79144abf47d5db32c";
+  propagatedBuildInputs = [X11 mtl];
   meta = {
     description = "xmonad is a tiling window manager for X";
   };
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 2c0e250470f..9793eba3d76 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -3,8 +3,8 @@
 cabal.mkDerivation (self : {
   pname = "xmonad-contrib";
   name = "${self.fname}";
-  version = "0.7";
-  sha256 = "4034d0c8ce092fc9b4e9d9ecf89bc9c16c4ac28aad190f074edc9e4201db0697";
+  version = "0.8.1";
+  sha256 = "dedbd2e7718f7383e403f5f0b40d411f27099625e7e1dcddd42f7c12bf6488a9";
   extraBuildInputs = [X11 xmonad];
   meta = {
     description = "a huge extension library for xmonad";
diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix
index 3b6c87bab58..c9b57dccf4d 100644
--- a/pkgs/development/libraries/haskell/X11/default.nix
+++ b/pkgs/development/libraries/haskell/X11/default.nix
@@ -4,8 +4,8 @@ assert xineramaSupport -> (libXinerama != null && libXext != null);
 
 cabal.mkDerivation (self : {
   pname = "X11";
-  version = "1.4.2";
-  sha256 = "7a37ba1adee9c30a27013ea7058e907c2348ef08eaa79c9895e62e4f0d73d2aa";
+  version = "1.4.5";
+  sha256 = "6665056b9fe5801ca27bf960a90215c940ae70b549753efed0303d5ed8d89ddb";
   propagatedBuildInputs = [libX11] ++ (if xineramaSupport then [libXinerama libXext] else []);
   meta = {
     description = "A Haskell binding to the X11 graphics library";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 13264ee819c..f044d5f1247 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -307,11 +307,11 @@ rec {
   };
   
   xmobar = import ../applications/misc/xmobar {
-    inherit cabal X11;
+    inherit cabal X11 mtl parsec stm;
   };
 
   xmonad = import ../applications/window-managers/xmonad {
-    inherit cabal X11;
+    inherit cabal X11 mtl;
     inherit (pkgs.xlibs) xmessage;
   };
 

From fc3574b125bb534b48317f7f239d2f3199f489cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 20 Apr 2009 13:50:07 +0000
Subject: [PATCH 36/58] Updating openoffice to 3.0.1.

svn path=/nixpkgs/trunk/; revision=15181
---
 .../applications/office/openoffice/builder.sh |  8 ++-
 .../office/openoffice/default.nix             | 30 ++++----
 pkgs/applications/office/openoffice/oo.patch  | 72 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +-
 4 files changed, 98 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/applications/office/openoffice/oo.patch

diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh
index 5077463f1b2..c3df7c3899d 100644
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@@ -5,6 +5,11 @@ export NO_HIDS=TRUE
 
 export PATH=$icu/sbin:$PATH
 
+postUnpack=postUnpack
+postUnpack() {
+  tar xvjf $src_system
+}
+
 preConfigure=preConfigure
 preConfigure() {
     for i in sysui/desktop/share/makefile.mk; do 
@@ -34,6 +39,7 @@ postConfigure() {
 buildPhase=buildPhase
 buildPhase() {
     source LinuxX86*Env.Set.sh
+    export JOBS=2
     ./bootstrap
     dmake # wait a few hours...
 }
@@ -51,7 +57,7 @@ wrapSOffice() {
 # looks for it at runtime.
 export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$fontconfig/lib:$libjpeg/lib:$cups/lib
 export JAVA_HOME=$jdk
-exec $ooFiles/program/soffice $arg "\$@"
+exec $ooFiles/openoffice.org3/program/soffice $arg "\$@"
 EOF
     chmod +x $out/bin/$fn
 }
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index de618283d20..a5a422e0f94 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -2,20 +2,27 @@
 , CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
 , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
-, icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi, cups
-, libXinerama, openssl
+, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
+, libXinerama, openssl, gperf, cppunit
 }:
 
-let version = "2.4.1"; in
+let version = "3.0.1"; in
 stdenv.mkDerivation rec {
   name = "openoffice.org-${version}";
   builder = ./builder.sh;
 
-  src =
-    fetchurl {
+  src = fetchurl {
       url = "http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=${version}";
       name = "OOo_${version}_src_core.tar.bz2";
-      sha256 = "1405l6xb1qy6l43n9nli8hhay917nyr8a69agj483aaiskrpdxdb";
+      sha256 = "0fgk7n766lzsxn09p8g5ddabw568jw56k9bcdc02nlmk6k3a9qq0";
+    };
+
+  patches = [ ./oo.patch ];
+
+  src_system = fetchurl {
+      url = "http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=system&version=${version}";
+      name = "OOo_${version}_src_system.tar.bz2";
+      sha256 = "1zp8lbn5x9wwbv82inqkanaip4l2jyiybjqv1dpx7wbh6nrasgdv";
     };
 
   configureFlags = "
@@ -28,7 +35,6 @@ stdenv.mkDerivation rec {
     --disable-mozilla
     --disable-odk
     --disable-pasf
-    --disable-qadevooo
     --with-cairo
     --with-system-libs
     --with-system-python
@@ -49,8 +55,10 @@ stdenv.mkDerivation rec {
     --without-system-xml-apis
     --without-system-xt
     --without-system-db
-    --with-system-hsqldb
-    --with-hsqldb-jar=${hsqldb}/lib/hsqldb.jar
+    --without-system-jars
+    --without-system-hunspell
+    --without-system-altlinuxhyph
+    --without-system-lpsolve
   ";
 
   LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
@@ -60,13 +68,11 @@ stdenv.mkDerivation rec {
     libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl 
     libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack 
     getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
-    cups libXinerama openssl
+    cups libXinerama openssl gperf
   ];
 
   inherit icu fontconfig libjpeg jdk cups;
 
-  patches = [./ooo-libtextcat.patch ];
-
   meta = {
     description = "OpenOffice.org is a multiplatform and multilingual office suite";
     homepage = http://www.openoffice.org/;
diff --git a/pkgs/applications/office/openoffice/oo.patch b/pkgs/applications/office/openoffice/oo.patch
new file mode 100644
index 00000000000..1234d961fd1
--- /dev/null
+++ b/pkgs/applications/office/openoffice/oo.patch
@@ -0,0 +1,72 @@
+diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
+index 602b9b1..6be8427 100644
+--- a/libtextcat/makefile.mk
++++ b/libtextcat/makefile.mk
+@@ -57,7 +57,7 @@ ADDITIONAL_FILES= \
+ #CONFIGURE_DIR=$(BUILD_DIR)
+ 
+ #relative to CONFIGURE_DIR
+-CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
++CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" --prefix=$(TMPDIR)
+ CONFIGURE_FLAGS=
+ 
+ BUILD_ACTION=make
+diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
+index 0e64d50..547d66b 100644
+--- a/redland/raptor/makefile.mk
++++ b/redland/raptor/makefile.mk
+@@ -104,7 +104,7 @@ XSLTLIB:=$(XSLTLIB)
+ 
+ CONFIGURE_DIR=
+ CONFIGURE_ACTION=.$/configure
+-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
++CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
+ BUILD_ACTION=$(GNUMAKE)
+ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+ BUILD_DIR=$(CONFIGURE_DIR)
+diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
+index 850ee9c..3293a79 100644
+--- a/redland/rasqal/makefile.mk
++++ b/redland/rasqal/makefile.mk
+@@ -104,7 +104,7 @@ XSLTLIB:=$(XSLTLIB)
+ 
+ CONFIGURE_DIR=
+ CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
+-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
++CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
+ BUILD_ACTION=$(GNUMAKE)
+ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+ BUILD_DIR=$(CONFIGURE_DIR)
+diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
+index 5719272..75c31b7 100644
+--- a/redland/redland/makefile.mk
++++ b/redland/redland/makefile.mk
+@@ -108,7 +108,7 @@ XSLTLIB:=$(XSLTLIB)
+ 
+ CONFIGURE_DIR=
+ CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
+-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
++CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
+ BUILD_ACTION=$(GNUMAKE)
+ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+ BUILD_DIR=$(CONFIGURE_DIR)
+diff --git a/hunspell/hunspell-1.1.12.patch b/hunspell/hunspell-1.1.12.patch
+index 37b7964..e6fd962 100644
+--- a/hunspell/hunspell-1.1.12.patch
++++ b/hunspell/hunspell-1.1.12.patch
+@@ -487,3 +487,15 @@
+  i68568utf.test \
+  1706659.test \
+  digits_in_words.test \
++diff --git a/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
++index 90080f6..f069517 100755
++--- a/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
+++++ b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
++--- misc/hunspell-1.1.12/tests/test.sh	Sep  4 01:25:35 2007
+++++ misc/build/hunspell-1.1.12/tests/test.sh	Jun 18 11:53:11 2008
++@@ -1,4 +1,4 @@
++-#!/bin/bash
+++#!/bin/sh
++ export LC_ALL="C"
++ 
++ function check_valgrind_log () {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d26db84e35..afc1418fd1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6486,8 +6486,7 @@ let
     inherit fetchurl stdenv pam python tcsh libxslt perl zlib libjpeg
       expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron
       curl libsndfile flex zip unzip libmspack getopt file neon cairo
-      which icu jdk ant hsqldb cups openssl bison;
-    boost = boost_1_36_0;
+      which icu jdk ant cups openssl bison boost gperf cppunit;
     inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
     inherit (gtkLibs) gtk;
     inherit (perlPackages) ArchiveZip CompressZlib;

From ff894ae7736b8916412622b06ecfc42d9af87819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 20 Apr 2009 13:51:31 +0000
Subject: [PATCH 37/58] Fixing the openoffice build, to run with a single job.

svn path=/nixpkgs/trunk/; revision=15182
---
 pkgs/applications/office/openoffice/builder.sh         |  1 -
 .../office/openoffice/ooo-libtextcat.patch             | 10 ----------
 2 files changed, 11 deletions(-)
 delete mode 100644 pkgs/applications/office/openoffice/ooo-libtextcat.patch

diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh
index c3df7c3899d..0c8ebc85139 100644
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@@ -39,7 +39,6 @@ postConfigure() {
 buildPhase=buildPhase
 buildPhase() {
     source LinuxX86*Env.Set.sh
-    export JOBS=2
     ./bootstrap
     dmake # wait a few hours...
 }
diff --git a/pkgs/applications/office/openoffice/ooo-libtextcat.patch b/pkgs/applications/office/openoffice/ooo-libtextcat.patch
deleted file mode 100644
index 6fe7b7108c3..00000000000
--- a/pkgs/applications/office/openoffice/ooo-libtextcat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- OOH680_m17/libtextcat/makefile.mk	2008-01-02 18:33:39.000000000 +0100
-+++ OOH680_m17/libtextcat/makefile.mk	2008-08-14 15:52:19.000000000 +0200
-@@ -62,6 +62,6 @@ ADDITIONAL_FILES= \
- 
- #relative to CONFIGURE_DIR
- CONFIGURE_ACTION=configure CFLAGS="$(EXTRA_CFLAGS)"
--CONFIGURE_FLAGS=
-+CONFIGURE_FLAGS=--prefix="${out}"
- 
- BUILD_ACTION=make

From 035d7cb965be41a8986fc0ac72f60d63eb3abf43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 20 Apr 2009 14:23:50 +0000
Subject: [PATCH 38/58] * Updated lhs2TeX. * Propagated build inputs of Haskell
 pkgs are now automatically   propagated user-env pkgs. * Updated
 haskell-platform slightly.

svn path=/nixpkgs/trunk/; revision=15184
---
 .../libraries/haskell/cabal/cabal.nix         | 10 ++++----
 .../haskell/haskell-platform/default.nix      |  9 ++-----
 pkgs/tools/typesetting/lhs2tex/default.nix    | 25 ++++++++-----------
 pkgs/top-level/haskell-packages.nix           |  9 ++++---
 4 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index 0c976ca2322..263eaec6305 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -54,7 +54,7 @@ attrs :
               for i in Setup.hs Setup.lhs; do
                 test -f $i && ghc --make $i
               done
-              ./Setup configure --verbose --prefix="$out"
+              ./Setup configure --verbose --prefix="$out" $configureFlags
 
               eval "$postConfigure"
             '';
@@ -70,10 +70,7 @@ attrs :
 
 	    # installs via Cabal; creates a registration file for nix-support
 	    # so that the package can be used in other Haskell-builds; also
-	    # creates a register-${name}.sh in userspace that can be used to
-	    # register the library in a user environment (but this scheme
-	    # should sooner or later be deprecated in favour of using a
-	    # ghc-wrapper).
+	    # adds all propagated build inputs to the user environment packages
             installPhase = ''
               eval "$preInstall"
 
@@ -82,6 +79,9 @@ attrs :
               local confDir=$out/lib/ghc-pkgs/ghc-${attrs.ghc.ghc.version}
               ensureDir $confDir
               ./Setup register --gen-pkg-config=$confDir/${self.fname}.conf
+
+              ensureDir $out/nix-support
+              ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
               
               eval "$postInstall"
             '';
diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/default.nix
index 88aea6e1d39..4bf660c684f 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/default.nix
@@ -1,6 +1,6 @@
 {cabal, fetchurl, GLUT, HTTP, HUnit, OpenAL, OpenGL, QuickCheck, cgi, fgl,
  haskellSrc, html, parallel, regexBase, regexCompat, regexPosix,
- stm, time, xhtml, zlib, cabalInstall, alex, happy, haddock}:
+ stm, time, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}:
 
 cabal.mkDerivation (self : {
   pname = "haskell-platform";
@@ -20,13 +20,8 @@ cabal.mkDerivation (self : {
   propagatedBuildInputs = [
     GLUT HTTP HUnit OpenAL OpenGL QuickCheck cgi fgl
     haskellSrc html parallel regexBase regexCompat regexPosix
-    stm time xhtml zlib cabalInstall alex happy
+    stm time xhtml zlib cabalInstall alex happy ghc
   ];
-  /*
-  postFixup = ''
-    ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
-  '';
-  */
   meta = {
     description = "Haskell Platform meta package";
   };
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index c4fe10026dd..f5bbb572504 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -1,26 +1,21 @@
-{stdenv, fetchurl, tetex, polytable, ghc}:
+{cabal, tetex, polytable, regexCompat, utf8String}:
 
 assert tetex == polytable.tetex;
 
-stdenv.mkDerivation {
-  name = "lhs2tex-1.13";
-  
-  src = fetchurl {
-    url = "http://people.cs.uu.nl/andres/lhs2tex/lhs2tex-1.13.tar.gz";
-    sha256 = "28282cb4afcc71785b092d358ffb33f5ec7585e50b392ae4fb6391d495a0836b";
-  };
+cabal.mkDerivation (self : {
+  pname = "lhs2tex";
+  version = "1.14";
+  name = self.fname;
+  sha256 = "1667acce394a0d4852f8ad07fa85397e43873fd98a219db794e4773883288687";
+  extraBuildInputs = [tetex regexCompat utf8String];
+  propagatedBuildInputs = [polytable]; # automatically in user-env now with cabal
 
-  buildInputs = [tetex ghc];
-  propagatedBuildInputs = [polytable];
-  propagatedUserEnvPackages = [polytable];
+  configureFlags = ''--constraint=base<4'';
 
   postInstall = ''
     ensureDir "$out/share/doc/$name"
     cp doc/Guide2.pdf $out/share/doc/$name
     ensureDir "$out/nix-support"
-    echo "$propagatedUserEnvPackages" > $out/nix-support/propagated-user-env-packages
   '';
-
-  inherit tetex;
-}
+})
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f044d5f1247..396c895b237 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -78,6 +78,7 @@ rec {
     inherit cabal GLUT HTTP HUnit OpenAL OpenGL QuickCheck cgi fgl
       haskellSrc html parallel regexBase regexCompat regexPosix
       stm time xhtml zlib cabalInstall alex happy haddock;
+    ghc = ghcReal;
     inherit (pkgs) fetchurl;
   };
 
@@ -191,7 +192,7 @@ rec {
     inherit cabal;
   };
 
-  utf8_string = import ../development/libraries/haskell/utf8-string {
+  utf8String = import ../development/libraries/haskell/utf8-string {
     inherit cabal;
   };
 
@@ -302,7 +303,7 @@ rec {
   };
 
   leksah = import ../applications/editors/leksah {
-    inherit cabal gtk2hs binary parsec regexPosix utf8_string;
+    inherit cabal gtk2hs binary parsec regexPosix utf8String;
     inherit (pkgs) libedit makeWrapper;
   };
   
@@ -327,8 +328,8 @@ rec {
   };
 
   lhs2tex = import ../tools/typesetting/lhs2tex {
-    inherit ghc;
-    inherit (pkgs) fetchurl stdenv tetex polytable;
+    inherit cabal regexCompat utf8String;
+    inherit (pkgs) tetex polytable;
   };
 
 }

From df7c38c2cb497f5b365e8c58d6698d5e98c82a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 20 Apr 2009 14:26:09 +0000
Subject: [PATCH 39/58] Fixed a typo.

svn path=/nixpkgs/trunk/; revision=15185
---
 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 396c895b237..cb21f1a0e3b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -192,7 +192,7 @@ rec {
     inherit cabal;
   };
 
-  utf8String = import ../development/libraries/haskell/utf8-string {
+  utf8String = import ../development/libraries/haskell/utf8String {
     inherit cabal;
   };
 

From d2f9333dca08f66f91f525661d8a5b85cf1f959d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 20 Apr 2009 14:30:01 +0000
Subject: [PATCH 40/58] Made it even worse -- hopefully fixed now, sorry.

svn path=/nixpkgs/trunk/; revision=15186
---
 pkgs/applications/editors/leksah/default.nix | 4 ++--
 pkgs/top-level/haskell-packages.nix          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix
index 9943ce39ba8..9e576bb9109 100644
--- a/pkgs/applications/editors/leksah/default.nix
+++ b/pkgs/applications/editors/leksah/default.nix
@@ -1,4 +1,4 @@
-{cabal, gtk2hs, binary, parsec, regexPosix, utf8_string, libedit, makeWrapper}:
+{cabal, gtk2hs, binary, parsec, regexPosix, utf8String, libedit, makeWrapper}:
 
 cabal.mkDerivation (self : {
   pname = "leksah";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self : {
   sha256 = "092a8gi73jhalgs4ppg8ki761vwk3gdnjwlyd4chnahbv5i1wrjw";
 
   # !!! The explicit libedit dependency shouldn't be necessary.
-  extraBuildInputs = [gtk2hs binary parsec regexPosix utf8_string libedit makeWrapper];
+  extraBuildInputs = [gtk2hs binary parsec regexPosix utf8String libedit makeWrapper];
 
   preConfigure =
     ''
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cb21f1a0e3b..396c895b237 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -192,7 +192,7 @@ rec {
     inherit cabal;
   };
 
-  utf8String = import ../development/libraries/haskell/utf8String {
+  utf8String = import ../development/libraries/haskell/utf8-string {
     inherit cabal;
   };
 

From a00ef2d24747060d36b74a1dc23677d9ad3adf47 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 20 Apr 2009 14:49:51 +0000
Subject: [PATCH 41/58] updated strategoxt 0.17pre to bootstrap build

svn path=/nixpkgs/trunk/; revision=15188
---
 pkgs/development/compilers/strategoxt/0.17.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/strategoxt/0.17.nix b/pkgs/development/compilers/strategoxt/0.17.nix
index 7bc045fd64c..7f6b18484f4 100644
--- a/pkgs/development/compilers/strategoxt/0.17.nix
+++ b/pkgs/development/compilers/strategoxt/0.17.nix
@@ -30,11 +30,11 @@ rec {
 
   
   strategoxt = stdenv.mkDerivation rec {
-    name = "strategoxt-0.17pre18269";
+    name = "strategoxt-0.17pre18583";
 
     src = fetchurl {
-      url = "http://releases.strategoxt.org/strategoxt/${name}-a0f0wy0j/${name}.tar.gz";
-      sha256 = "7c51c2452bd45f34cd480b6b3cbaac50e0fc53fbb1a884d97cf4e2c2b5330577";
+      url = "http://releases.strategoxt.org/strategoxt/strategoxt-0.17pre18583-i573smdl/strategoxt-0.17pre18583.tar.gz";
+      sha256 = "4769d82a62d1c53fc3f4631ddef489e638ff2361a2eceb1226f2b56ab45b7784";
     };
 
     buildInputs = [pkgconfig aterm sdf getopt];

From 01f309e2d4901f74eee8f0f8a13d68be67801484 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 16:00:40 +0000
Subject: [PATCH 42/58] * Document the X.org generator.

svn path=/nixpkgs/trunk/; revision=15189
---
 doc/package-notes.xml | 54 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 6291abbe9bd..9ace151e512 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -165,12 +165,60 @@ splashutils_15 = ...;</programlisting>
 <!--============================================================-->
 
 <section>
-  <title>X.org</title>
-  <para>* Expression is auto-generated</para>
-  <para>* How to update</para>
+
+<title>X.org</title>
+
+<para>The Nix expressions for the X.org packages reside in
+<filename>pkgs/servers/x11/xorg/default.nix</filename>.  This file is
+automatically generated from lists of tarballs in an X.org
+release.  As such it should not be modified directly; rather, you
+should modify the lists or the generator script.</para>
+
+<para>The generator is invoked as follows:
+
+<screen>
+$ cd pkgs/servers/x11/xorg
+$ cat tarballs-7.4.list extra.list old.list \
+  | perl ./generate-expr-from-tarballs.pl
+</screen>
+
+For each of the tarballs in the <filename>.list</filename> files, the
+script downloads it, unpacks it, and searches its
+<filename>configure.ac</filename> and <filename>*.pc.in</filename>
+files for dependencies.  This information is used to generate
+<filename>default.nix</filename>.  The generator caches downloaded
+tarballs between runs.  Pay close attention to the <literal>NOT FOUND:
+<replaceable>name</replaceable></literal> messages at the end of the
+run, since they may indicate missing dependencies.  (Some might be
+optional dependencies, however.)</para>
+
+<para>A file like <filename>tarballs-7.4.list</filename> contains all
+tarballs in a X.org release.  It can be generated like this:
+
+<screen>
+$ export i="mirror://xorg/X11R7.4/src/everything/"
+$ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \
+  | perl -e 'while (&lt;>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' \
+  | sort > tarballs-7.4.list
+</screen>
+
+<filename>extra.list</filename> contains libraries that aren’t part of
+X.org proper, but are closely related to it, such as
+<literal>libxcb</literal>.  <filename>old.list</filename> contains
+some packages that were removed from X.org, but are still needed by
+some people or by other packages (such as
+<varname>imake</varname>).</para>
+
+<para>If the expression for a package requires derivation attributes
+that the generator cannot figure out automatically (say,
+<varname>patches</varname> or a <varname>postInstall</varname> hook),
+you should modify the generator script
+(<varname>generate-expr-from-tarballs.pl</varname>).</para>
+
 </section>
 
 
+
 <!--============================================================-->
 
 <section>

From ea933bf894ef56ce84d8e15bb9cc813e5badd44f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Apr 2009 07:05:38 +0000
Subject: [PATCH 43/58] Adding symlinks for cdrkit, to be similar to the
 cdrtools.

svn path=/nixpkgs/trunk/; revision=15203
---
 pkgs/tools/cd-dvd/cdrkit/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix
index 7e5bb44764c..b1060d97a1e 100644
--- a/pkgs/tools/cd-dvd/cdrkit/default.nix
+++ b/pkgs/tools/cd-dvd/cdrkit/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [cmake libcap zlib bzip2];
 
+  postInstall = ''
+    # file name compatibility with the old cdrecord (growisofs wants this name)
+    ln -s $out/bin/genisoimage $out/bin/mkisofs
+    ln -s $out/bin/devdump $out/bin/cdrecord
+  '';
+
   makeFlags = "PREFIX=\$(out)";
 
   meta = {

From 6757fbafb192ab8d5b2726e12436fa15232a668b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 21 Apr 2009 16:22:30 +0000
Subject: [PATCH 44/58] Added haskell-platform to release.

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b93541d696c..19e38f7c807 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -339,6 +339,7 @@ in {
     gtk2hs = ghcSupported;
     leksah = ghcSupported;
     lhs2tex = ghcSupported;
+    haskellPlatform = ghcSupported;
     xmonad = ghcSupported;
   };
 

From a6e86e241fcbe05fa0588817a7330257ed9da884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Apr 2009 19:47:20 +0000
Subject: [PATCH 45/58] Updating lua5.

svn path=/nixpkgs/trunk/; revision=15223
---
 pkgs/development/interpreters/lua-5/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 6408457e2a0..2b0d79f8019 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, ncurses, readline}: 
 
 stdenv.mkDerivation {
-  name = "lua-5.1.2";
+  name = "lua-5.1.4";
   src = fetchurl {
-    url = http://www.lua.org/ftp/lua-5.1.2.tar.gz;
-    sha256 = "17ixifwgjva5592s2rn1ki56wa7hgw0z210r4bcx5lv8zv39iw2w";
+    url = http://www.lua.org/ftp/lua-5.1.4.tar.gz;
+    sha256 = "0fmgk100ficm1jbm4ga9xy484v4cm89wsdfckdybb9gjx8jy4f5h";
   };
   buildFlags = "linux"; # TODO: support for non-linux systems
   installFlags = "install INSTALL_TOP=\${out}";

From ff0483b3d80c9afbe946f446b5d20bf26289ca43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Apr 2009 19:47:30 +0000
Subject: [PATCH 46/58] Adding gtkdialog.

svn path=/nixpkgs/trunk/; revision=15224
---
 .../tools/misc/gtkdialog/default.nix           | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  5 +++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/tools/misc/gtkdialog/default.nix

diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix
new file mode 100644
index 00000000000..80a7fe48925
--- /dev/null
+++ b/pkgs/development/tools/misc/gtkdialog/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, gtk, pkgconfig}:
+
+stdenv.mkDerivation {
+  name = "gtkdialog-0.7.9";
+
+  src = fetchurl {
+    url = ftp://linux.pte.hu/pub/gtkdialog/gtkdialog-0.7.9.tar.gz;
+    sha256 = "142k8fnh1b8jclm7my2rhk7n8j1b0xh76b2gg712r738r94qwka2";
+  };
+
+  buildInputs = [ gtk pkgconfig ];
+
+  meta = {
+    homepage = http://linux.pte.hu/~pipas/gtkdialog/;
+    description = "Small utility for fast and easy GUI building from many scripted and compiled languages";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afc1418fd1f..b9738e921e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2502,6 +2502,11 @@ let
     inherit fetchurl stdenv;
   };
 
+  gtkdialog = import ../development/tools/misc/gtkdialog {
+    inherit fetchurl stdenv pkgconfig;
+    inherit (gtkLibs) gtk;
+  };
+
   /*
   hsc2hs = import ../development/tools/misc/hsc2hs {
     inherit bleedingEdgeRepos stdenv;

From 1b3ee8bf6c85f5d6a49ecf988ef85a6f84d716c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Apr 2009 19:47:41 +0000
Subject: [PATCH 47/58] Adding libewf.

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

diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
new file mode 100644
index 00000000000..cbf6847c370
--- /dev/null
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -0,0 +1,17 @@
+{ fetchurl, stdenv, zlib, openssl, libuuid }:
+
+stdenv.mkDerivation rec {
+  name = "libewf-20080501";
+  src = fetchurl {
+    url = mirror://sourceforge/libewf/libewf-20080501.tar.gz;
+    sha256 = "0s8fp7kmpk0976zii0fbk8vhi8k1br2fjp510rmgr6q1ssqdbi36";
+  };
+
+  buildInputs = [ zlib openssl libuuid ];
+
+  meta = {
+    description = "Library for support of the Expert Witness Compression Format";
+    homepage = http://sourceforge.net/projects/libewf/;
+    license = "free";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9738e921e5..d8bd746d94c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3388,6 +3388,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  libewf = import ../development/libraries/libewf {
+    inherit fetchurl stdenv zlib openssl libuuid;
+  };
+
   libexif = import ../development/libraries/libexif {
     inherit fetchurl stdenv gettext;
   };

From 233cf7478157868e9566a64e06c7906b598606c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Apr 2009 19:47:51 +0000
Subject: [PATCH 48/58] Adding radare

svn path=/nixpkgs/trunk/; revision=15226
---
 .../tools/analysis/radare/default.nix         | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 ++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/radare/default.nix

diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix
new file mode 100644
index 00000000000..db83ade8fd4
--- /dev/null
+++ b/pkgs/development/tools/analysis/radare/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, pkgconfig, gtk, libusb, readline, lua, gtkdialog,
+  python, ruby, libewf, vte}:
+
+stdenv.mkDerivation {
+  name = "radare-1.2.2";
+
+  src = fetchurl {
+    url = http://radare.org/get/radare-1.2.2.tar.gz;
+    sha256 = "0624ic97s1b70ijbr16b33p76mls8rziqwla6bq29l554dh2hfn4";
+  };
+
+  buildInputs = [pkgconfig gtk readline libusb lua gtkdialog python
+    ruby libewf vte];
+
+  meta = {
+    description = "Free advanced command line hexadecimal editor";
+    homepage = http://radare.org/;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8bd746d94c..15fc2187637 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2604,6 +2604,14 @@ let
       inherit fetchurl stdenv;
     });
 
+  radare = import ../development/tools/analysis/radare {
+    inherit stdenv fetchurl pkgconfig libusb readline gtkdialog python
+      ruby libewf;
+    inherit (gtkLibs) gtk;
+    inherit (gnome) vte;
+    lua = lua5;
+  };
+
   ragel = import ../development/tools/parsing/ragel {
     inherit composableDerivation fetchurl transfig texLive;
   };

From d3b5bc4a2031f1334425d0580e668db1eb5271c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 21 Apr 2009 21:05:30 +0000
Subject: [PATCH 49/58] * Fixed external library dependencies for some
 Haskell-Platform packages. * Added Agda plus dependencies.

svn path=/nixpkgs/trunk/; revision=15227
---
 .../libraries/haskell/Agda/default.nix        | 15 +++++++++++
 .../libraries/haskell/GLUT/default.nix        |  4 +--
 .../libraries/haskell/QuickCheck/2.1.0.1.nix  | 13 +++++++++
 .../libraries/haskell/cabal/cabal.nix         | 12 ++-------
 .../haskell/extensible-exceptions/default.nix | 11 ++++++++
 .../libraries/haskell/haskeline/default.nix   | 12 +++++++++
 pkgs/top-level/haskell-packages.nix           | 27 ++++++++++++++++++-
 7 files changed, 81 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/Agda/default.nix
 create mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.1.0.1.nix
 create mode 100644 pkgs/development/libraries/haskell/extensible-exceptions/default.nix
 create mode 100644 pkgs/development/libraries/haskell/haskeline/default.nix

diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix
new file mode 100644
index 00000000000..e1f5b27c0ec
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@@ -0,0 +1,15 @@
+{cabal, QuickCheck, binary, haskeline, haskellSrc, mtl, utf8String, xhtml, zlib,
+ happy, alex}:
+
+cabal.mkDerivation (self : {
+  pname = "Agda";
+  version = "2.2.2";
+  sha256 = "265dbb5bc6d67bfeefa4a2a4ac9e5018d6d8b5c1a75816e05da2661c43a39bba";
+  extraBuildInputs = [happy alex];
+  propagatedBuildInputs =
+    [QuickCheck binary haskeline haskellSrc mtl utf8String xhtml zlib];
+  meta = {
+    description = "A dependently typed functional language and proof assistant";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/GLUT/default.nix b/pkgs/development/libraries/haskell/GLUT/default.nix
index 0ddbb73f9ff..9ccae0604f0 100644
--- a/pkgs/development/libraries/haskell/GLUT/default.nix
+++ b/pkgs/development/libraries/haskell/GLUT/default.nix
@@ -1,10 +1,10 @@
-{cabal, OpenGL, glut}:
+{cabal, OpenGL, glut, libSM, libICE, libXmu, libXi, mesa}:
 
 cabal.mkDerivation (self : {
   pname = "GLUT";
   version = "2.1.1.2"; # Haskell Platform 2009.0.0
   sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb";
-  propagatedBuildInputs = [OpenGL glut];
+  propagatedBuildInputs = [OpenGL glut libSM libICE libXmu libXi mesa];
   meta = {
     description = "A binding for the OpenGL Utility Toolkit";
   };
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.0.1.nix
new file mode 100644
index 00000000000..e84a7780983
--- /dev/null
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.0.1.nix
@@ -0,0 +1,13 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "QuickCheck";
+  version = "2.1.0.1";
+  sha256 = "f99edf1a45315e90c9ec672d5d959d5878dcc1de65678c6aed85829a896b75f1";
+  propagatedBuildInputs = [mtl];
+  configureFlags = ''--constraint=base<4'';
+  meta = {
+    description = "Automatic testing of Haskell programs";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index 263eaec6305..cac8990d271 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -39,22 +39,14 @@ attrs :
             # library directories that have to be added to the Cabal files
             extraLibDirs = map (x : x + "/lib") self.propagatedBuildInputs;
 
-            # file(s) that have to be patched with information about extra libraries;
-            # can be redefined to the empty list by the client if this is not desired
-            patchLibFiles = [ "${self.pname}.cabal" ];
-
-            # patches files, compiles Setup, and configures
+            # compiles Setup and configures
             configurePhase = ''
               eval "$preConfigure"
 
-              for i in ${toString self.patchLibFiles}; do
-                echo "patching $i"
-                test -f $i && sed -i '/[eE]xtra-[lL]ibraries/ { s|^\( *\)[eE]xtra-[lL]ibraries.*|&\n\1extra-lib-dirs: ${toString self.extraLibDirs}| }' $i
-              done
               for i in Setup.hs Setup.lhs; do
                 test -f $i && ghc --make $i
               done
-              ./Setup configure --verbose --prefix="$out" $configureFlags
+              ./Setup configure --verbose --prefix="$out" ${toString (map (x : "--extra-lib-dir=" + x) self.extraLibDirs)} $configureFlags
 
               eval "$postConfigure"
             '';
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/default.nix b/pkgs/development/libraries/haskell/extensible-exceptions/default.nix
new file mode 100644
index 00000000000..93857414f60
--- /dev/null
+++ b/pkgs/development/libraries/haskell/extensible-exceptions/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "extensible-exceptions";
+  version = "0.1.1.0";
+  sha256 = "c252dc5a505332700f041d4e1fd3d309cde6158892f9c35339bf5e67bad7f781";
+  meta = {
+    description = "Extensible exceptions";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix
new file mode 100644
index 00000000000..e46427bcc3c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskeline/default.nix
@@ -0,0 +1,12 @@
+{cabal, extensibleExceptions, mtl, utf8String}:
+
+cabal.mkDerivation (self : {
+  pname = "haskeline";
+  version = "0.6.1.3";
+  sha256 = "af27d17bf6df7647e843bca91548b542748a5305f072ba7cfef97105a52578d4";
+  propagatedBuildInputs = [extensibleExceptions mtl utf8String];
+  meta = {
+    description = "A command-line interface for user input, written in Haskell";
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 396c895b237..7f3621d26cc 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -23,6 +23,13 @@ rec {
 
   # Haskell libraries.
 
+  # Agda depends on a specific version of QuickCheck
+  Agda = import ../development/libraries/haskell/Agda {
+    inherit cabal binary haskeline haskellSrc mtl utf8String xhtml zlib
+      happy alex;
+    QuickCheck = QuickCheck2101;
+  };
+
   benchpress = import ../development/libraries/haskell/benchpress {
     inherit cabal;
   };
@@ -44,6 +51,10 @@ rec {
     inherit cabal;
   };
 
+  extensibleExceptions = import ../development/libraries/haskell/extensible-exceptions {
+    inherit cabal;
+  };
+
   fgl = import ../development/libraries/haskell/fgl {
     inherit cabal mtl;
   };
@@ -55,6 +66,8 @@ rec {
   GLUT = import ../development/libraries/haskell/GLUT {
     inherit cabal OpenGL;
     glut = pkgs.freeglut;
+    inherit (pkgs) mesa;
+    inherit (pkgs.xlibs) libSM libICE libXmu libXi;
   };
   
   gtk2hs = import ../development/libraries/haskell/gtk2hs {
@@ -62,6 +75,10 @@ rec {
     inherit (pkgs) stdenv fetchurl pkgconfig gnome cairo;
   };
 
+  haskeline = import ../development/libraries/haskell/haskeline {
+    inherit cabal extensibleExceptions mtl utf8String;
+  };
+
   haskellSrc = import ../development/libraries/haskell/haskell-src {
     inherit cabal happy;
   };
@@ -164,10 +181,18 @@ rec {
     inherit (pkgs) pcre;
   };
 
-  QuickCheck = import ../development/libraries/haskell/QuickCheck {
+  QuickCheck  = QuickCheck1;
+  QuickCheck1 = QuickCheck1200;
+  QuickCheck2 = QuickCheck2101;
+
+  QuickCheck1200 = import ../development/libraries/haskell/QuickCheck {
     inherit cabal;
   };
 
+  QuickCheck2101 = import ../development/libraries/haskell/QuickCheck/2.1.0.1.nix {
+    inherit cabal mtl;
+  };
+
   regexBase = import ../development/libraries/haskell/regex-base {
     inherit cabal mtl;
   };

From 8cfa1a503482c3f48afea006dfaf03224058dd29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 21 Apr 2009 21:12:56 +0000
Subject: [PATCH 50/58] Added readline package for Haskell.

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

diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix
new file mode 100644
index 00000000000..fe60a4c51f0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/readline/default.nix
@@ -0,0 +1,12 @@
+{ cabal, readline } :
+
+cabal.mkDerivation (self : {
+  pname = "readline";
+  version = "1.0.1.0";
+  sha256 = "07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d";
+  propagatedBuildInputs = [ readline ];
+  meta = {
+    description = "An interface to the GNU readline library";
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7f3621d26cc..449921cfdfb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -193,6 +193,11 @@ rec {
     inherit cabal mtl;
   };
 
+  readline = import ../development/libraries/haskell/readline {
+    inherit cabal;
+    inherit (pkgs) readline;
+  };
+
   regexBase = import ../development/libraries/haskell/regex-base {
     inherit cabal mtl;
   };

From d2067c300fcc0bd147e17785ca51110b0282466d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 21 Apr 2009 21:19:49 +0000
Subject: [PATCH 51/58] Updated editline for Haskell.

svn path=/nixpkgs/trunk/; revision=15229
---
 .../libraries/haskell/editline/default.nix      | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/haskell/editline/default.nix b/pkgs/development/libraries/haskell/editline/default.nix
index daf223b23fb..fb06cd52a80 100644
--- a/pkgs/development/libraries/haskell/editline/default.nix
+++ b/pkgs/development/libraries/haskell/editline/default.nix
@@ -2,20 +2,11 @@
 
 cabal.mkDerivation (self : {
   pname = "editline";
-  version = "0.2";
-  sha256 = "6ee0b553cc8d7542c096730ceebabdcb9b2951d7b00a5a0ddbf47b5436a77ce4";
-  buildInputs = [ libedit ];
-  patchLibFiles = [ "editline.buildinfo.in" ];
-  preConfigure = ''
-    sed -i -e '/el_get/d' include/HsEditline.h
-  '';
-  # I don't quite understand why ncurses as an extra-library is harmful, but
-  # it works only if we remove it ...
-  postConfigure = ''
-    sed -i -e 's/ncurses//' editline.buildinfo
-  '';
+  version = "0.2.1.0";
+  sha256 = "83618e5f86074fdc11d7f5033aa2886284462941be38fa02966acc92712c46e1";
+  propagatedBuildInputs = [ libedit ];
   meta = {
-    description = "Binding to the BSD editline library";
+    description = "Binding to the BSD editline library (libedit)";
   };
 })  
 

From 672890153e38829445ffff99833e25d2ee7f220f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Apr 2009 21:31:08 +0000
Subject: [PATCH 52/58] Fixing lua and perl for radare.

svn path=/nixpkgs/trunk/; revision=15230
---
 pkgs/development/tools/analysis/radare/default.nix |  6 ++++--
 pkgs/development/tools/analysis/radare/lua.patch   | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                    |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/tools/analysis/radare/lua.patch

diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix
index db83ade8fd4..083e32c2eb9 100644
--- a/pkgs/development/tools/analysis/radare/default.nix
+++ b/pkgs/development/tools/analysis/radare/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, pkgconfig, gtk, libusb, readline, lua, gtkdialog,
-  python, ruby, libewf, vte}:
+  python, ruby, libewf, vte, perl}:
 
 stdenv.mkDerivation {
   name = "radare-1.2.2";
@@ -9,8 +9,10 @@ stdenv.mkDerivation {
     sha256 = "0624ic97s1b70ijbr16b33p76mls8rziqwla6bq29l554dh2hfn4";
   };
 
+  patches = [ ./lua.patch ];
+
   buildInputs = [pkgconfig gtk readline libusb lua gtkdialog python
-    ruby libewf vte];
+    ruby libewf vte perl];
 
   meta = {
     description = "Free advanced command line hexadecimal editor";
diff --git a/pkgs/development/tools/analysis/radare/lua.patch b/pkgs/development/tools/analysis/radare/lua.patch
new file mode 100644
index 00000000000..3a2ca0d505d
--- /dev/null
+++ b/pkgs/development/tools/analysis/radare/lua.patch
@@ -0,0 +1,12 @@
+diff --git a/src/plug/hack/Makefile b/src/plug/hack/Makefile
+index b05d8dd..d6c73f9 100644
+--- a/src/plug/hack/Makefile
++++ b/src/plug/hack/Makefile
+@@ -7,7 +7,6 @@ PERL_LIBS=`perl -MExtUtils::Embed -e ldopts` -lncurses
+ PY_CFLAGS=-I${PREFIX}/include/python2.5/ -I/usr/include/python2.5/
+ PY_LIBS=-lpython2.5
+ LUA_CFLAGS=-I${PREFIX}/include/lua5.1/ -I/usr/include/lua5.1/
+-LUA_LIBS=
+ RUBY_CFLAGS=-I/usr/lib/ruby/1.8/i386-linux
+ RUBY_LIBS=-lruby18
+ SO=${SHARED_EXT}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15fc2187637..ccdffd6633c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2606,7 +2606,7 @@ let
 
   radare = import ../development/tools/analysis/radare {
     inherit stdenv fetchurl pkgconfig libusb readline gtkdialog python
-      ruby libewf;
+      ruby libewf perl;
     inherit (gtkLibs) gtk;
     inherit (gnome) vte;
     lua = lua5;

From e62cb1aa2019907a6666ca4cfdefd227d126a79f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 21 Apr 2009 21:48:10 +0000
Subject: [PATCH 53/58] Added HLint plus dependencies.

svn path=/nixpkgs/trunk/; revision=15231
---
 .../libraries/haskell/hscolour/default.nix           | 11 +++++++++++
 .../libraries/haskell/uniplate/default.nix           | 12 ++++++++++++
 pkgs/development/tools/haskell/hlint/default.nix     | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  | 12 ++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hscolour/default.nix
 create mode 100644 pkgs/development/libraries/haskell/uniplate/default.nix
 create mode 100644 pkgs/development/tools/haskell/hlint/default.nix

diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix
new file mode 100644
index 00000000000..10d702cde78
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hscolour/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "hscolour";
+  version = "1.10.1";
+  sha256 = "293f24b8373be1d70d9e5a4b8d3c527166ad645b4ac983c1a6fc5999c44a2d36";
+  meta = {
+    description = "Colourise Haskell code";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix
new file mode 100644
index 00000000000..7d7a14a8f8e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/uniplate/default.nix
@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "uniplate";
+  version = "1.2.0.3";
+  sha256 = "77cf07c96ae62799d790284c0c84beca9ee17c9c2416d4de6641f3fddd644b58";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Uniform type generic traversals";
+  };
+})  
+
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
new file mode 100644
index 00000000000..80daa6e38f5
--- /dev/null
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -0,0 +1,12 @@
+{cabal, haskellSrcExts, mtl, uniplate, hscolour}:
+
+cabal.mkDerivation (self : {
+  pname = "hlint";
+  version = "1.4";
+  name = self.fname;
+  sha256 = "deddcd8b2a2e1dce2510395dae1d6c78dc9264766e362ff378fe0f008db42e4e";
+  extraBuildInputs = [haskellSrcExts mtl uniplate hscolour];
+  meta = {
+    description = "Source code suggestions";
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 449921cfdfb..d9ab86a6d77 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -129,6 +129,10 @@ rec {
     inherit (pkgs) sqlite;
   };
 
+  hscolour = import ../development/libraries/haskell/hscolour {
+    inherit cabal;
+  };
+
   html = import ../development/libraries/haskell/html {
     inherit cabal;
   };
@@ -222,6 +226,10 @@ rec {
     inherit cabal;
   };
 
+  uniplate = import ../development/libraries/haskell/uniplate {
+    inherit cabal mtl;
+  };
+
   utf8String = import ../development/libraries/haskell/utf8-string {
     inherit cabal;
   };
@@ -321,6 +329,10 @@ rec {
     inherit (pkgs) perl;
   };
 
+  hlint = import ../development/tools/haskell/hlint {
+    inherit cabal haskellSrcExts mtl uniplate hscolour;
+  };
+
   uuagc = import ../development/tools/haskell/uuagc {
     inherit cabal uulib;
   };

From f70b4763bbd519ee7b1b56b257d7e08432964649 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Apr 2009 13:13:55 +0000
Subject: [PATCH 54/58] svn path=/nixpkgs/trunk/; revision=15245

---
 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 30404864b2a..02db6f4493c 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "nix-0.13pre15047";
+  name = "nix-0.13pre15214";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/13105/download/1/nix-0.13pre15047.tar.bz2;
-    sha256 = "1dce821bd14743169744da9514c08f6c3bba45f13d780e7c3e368e971d1281fb";
+    url = http://hydra.nixos.org/build/17407/download/1/nix-0.13pre15214.tar.bz2;
+    sha256 = "b2423eebb0c70fa2c38d11b5d5e6d8794ebc7283dfde8d1f1c02c54846014ab2";
   };
 
   buildInputs = [perl curl openssl];

From ea2d78f2bd35104f81967f095a7f0b7bc29e371d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 22 Apr 2009 16:44:11 +0000
Subject: [PATCH 55/58] Add STLport to hydra.

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 19e38f7c807..0ffcbf13086 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -250,6 +250,7 @@ in {
   sqlite = allBut "i686-cygwin";
   ssmtp = linux;
   stdenv = prio 175 all;
+  stlport = linux;
   strace = linux;
   su = linux;
   subversion = all;

From 202106305235b3bd0701e07740de5f5e75967310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 22 Apr 2009 21:33:24 +0000
Subject: [PATCH 56/58] Adding vwm, the console window manager.

svn path=/nixpkgs/trunk/; revision=15255
---
 .../window-managers/vwm/default.nix           | 31 +++++++++++++++++++
 .../window-managers/vwm/signal.patch          | 22 +++++++++++++
 .../libraries/libpseudo/default.nix           | 26 ++++++++++++++++
 .../libraries/libviper/default.nix            | 26 ++++++++++++++++
 pkgs/top-level/all-packages.nix               | 15 +++++++++
 5 files changed, 120 insertions(+)
 create mode 100644 pkgs/applications/window-managers/vwm/default.nix
 create mode 100644 pkgs/applications/window-managers/vwm/signal.patch
 create mode 100644 pkgs/development/libraries/libpseudo/default.nix
 create mode 100644 pkgs/development/libraries/libviper/default.nix

diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix
new file mode 100644
index 00000000000..fa2e6efb30c
--- /dev/null
+++ b/pkgs/applications/window-managers/vwm/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, ncurses, pkgconfig, glib, libviper, libpseudo, gpm}:
+
+stdenv.mkDerivation {
+  name = "vwm-2.0.1";
+ 
+  src = fetchurl {
+    url = mirror://sourceforge/vwm/vwm-2.0.1.tar.gz;
+    sha256 = "1kn1ga35kvl10s3xvgr5ys18gd4pp0gwah4pnvmfkvg0xazjrc0h";
+  };
+
+  prePatch = ''
+    sed -i -e s@/usr/local@$out@ \
+      -e s@/usr/lib@$out/lib@ \
+      -e 's@tic vwmterm@tic -o '$out/lib/terminfo' vwmterm@' \
+      -e /ldconfig/d Makefile modules/*/Makefile vwm.h
+  '';
+
+  patches = [ ./signal.patch ];
+
+  preInstall = ''
+    ensureDir $out/bin $out/include
+  '';
+ 
+  buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm];
+ 
+  meta = {
+    homepage = http://vwm.sourceforge.net/;
+    description = "Dynamic window manager for the console";
+    license="GPLv2+";
+  };
+}
diff --git a/pkgs/applications/window-managers/vwm/signal.patch b/pkgs/applications/window-managers/vwm/signal.patch
new file mode 100644
index 00000000000..b6cac4d262a
--- /dev/null
+++ b/pkgs/applications/window-managers/vwm/signal.patch
@@ -0,0 +1,22 @@
+diff --git a/modules/vwmterm2/signals.c b/modules/vwmterm2/signals.c
+index 239e7f2..07d78fd 100644
+--- a/modules/vwmterm2/signals.c
++++ b/modules/vwmterm2/signals.c
+@@ -1,4 +1,5 @@
+ #include <vwm.h>
++#include <signal.h>
+ 
+ struct sigaction* vwmterm_sigset(int signum,sighandler_t handler)
+ {
+diff --git a/vwm_private.h b/vwm_private.h
+index 2d48ebf..46457bd 100644
+--- a/vwm_private.h
++++ b/vwm_private.h
+@@ -2,6 +2,7 @@
+ #define _H_VWM_PRIVATE_
+ 
+ #include <glib.h>
++#include <signal.h>
+ 
+ #ifdef _VIPER_WIDE
+ #include <ncursesw/curses.h>
diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix
new file mode 100644
index 00000000000..c200a379187
--- /dev/null
+++ b/pkgs/development/libraries/libpseudo/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, pkgconfig, glib, ncurses}:
+stdenv.mkDerivation {
+  name = "libpseudo-1.1.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/libpseudo/libpseudo-1.1.0.tar.gz;
+    sha256 = "0fp64c6sbdrp4gs4a7rnh5zwis73p7zg04basdn91byshvs1giwv";
+  };
+
+  patchPhase = ''
+    sed -i -e s@/usr/local@$out@ -e /ldconfig/d Makefile
+  '';
+
+  preInstall = ''
+    ensureDir $out/include
+    ensureDir $out/lib
+  '';
+
+  buildInputs = [pkgconfig glib ncurses];
+
+  meta = {
+    homepage = http://libpseudo.sourceforge.net/;
+    description = "Simple, thread-safe messaging between threads";
+    license="GPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix
new file mode 100644
index 00000000000..10dee7d5638
--- /dev/null
+++ b/pkgs/development/libraries/libviper/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, pkgconfig, glib, ncurses, gpm}:
+stdenv.mkDerivation {
+  name = "libviper-1.2.2";
+
+  src = fetchurl {
+    url = mirror://sourceforge/libviper/libviper-1.4.2.tar.gz;
+    sha256 = "06ff9i914cxi3ifnr5xfpfbvz46kx150jaxvr6rcha6ylglw48c9";
+  };
+
+  patchPhase = ''
+    sed -i -e s@/usr/local@$out@ -e /ldconfig/d -e '/cd vdk/d' Makefile
+  '';
+
+  preInstall = ''
+    ensureDir $out/include
+    ensureDir $out/lib
+  '';
+
+  buildInputs = [pkgconfig glib ncurses gpm];
+
+  meta = {
+    homepage = http://libviper.sourceforge.net/;
+    description = "Simple window creation and management facilities for the console";
+    license="GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccdffd6633c..a71072fc5f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3539,6 +3539,11 @@ let
     inherit fetchurl stdenv zlib;
   };
 
+  libpseudo = import ../development/libraries/libpseudo {
+    inherit fetchurl stdenv pkgconfig ncurses;
+    inherit (gtkLibs) glib;
+  };
+
   /*libscdFun = lib.sumArgs (selectVersion ../development/libraries/libscd "0.4.2") {
     inherit stdenv fetchurl builderDefs libextractor perl pkgconfig;
   };
@@ -3600,6 +3605,11 @@ let
       libXinerama libXrandr randrproto libXtst;
   };
 
+  libviper = import ../development/libraries/libviper {
+    inherit fetchurl stdenv pkgconfig ncurses gpm;
+    inherit (gtkLibs) glib;
+  };
+
   libvorbis = import ../development/libraries/libvorbis {
     inherit fetchurl stdenv libogg;
   };
@@ -6888,6 +6898,11 @@ let
       speex flac;
   };
 
+  vwm = import ../applications/window-managers/vwm {
+    inherit fetchurl stdenv ncurses pkgconfig libviper libpseudo gpm;
+    inherit (gtkLibs) glib;
+  };
+
   w3m = import ../applications/networking/browsers/w3m {
     inherit fetchurl stdenv ncurses openssl boehmgc gettext zlib;
     graphicsSupport = false;

From 35bb7d64126194bbb83863974bb03845929f183f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 23 Apr 2009 10:24:40 +0000
Subject: [PATCH 57/58] Python-not-2.4 support for libxml2

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

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index a1043bad67c..1a0b0557b14 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -3,7 +3,7 @@
 assert zlib != null;
 assert pythonSupport -> python != null;
 
-stdenv.mkDerivation {
+stdenv.mkDerivation ({
   name = "libxml2-2.6.32";
   builder = ./builder.sh;
 
@@ -19,4 +19,8 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [zlib];
 
   postInstall = "ensureDir $out/nix-support; cp ${./setup-hook.sh} $out/nix-support/setup-hook";
-}
+} // (if pythonSupport then {
+  preConfigure = ''
+    sed -e "s^pythondir=.*$^pythondir=$(toPythonPath $out)^" < configure.old > configure
+  '';
+} else {}))

From 4c02ccd10783eecef9f613d86ebf576cac851830 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 23 Apr 2009 10:56:23 +0000
Subject: [PATCH 58/58] Fix git-with-svn instantiation

svn path=/nixpkgs/trunk/; revision=15266
---
 .../applications/version-management/git-and-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 5245c8e10e6..562fd3a91f9 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -15,7 +15,7 @@ rec {
       cpio tcl tk makeWrapper subversion;
     svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
     guiSupport = getConfig ["git" "guiSupport"] false;
-    perlLibs = [perlPackages.perlLWP perlPackages.perlURI perlPackages.perlTermReadKey subversion];
+    perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
   };
 
   gitGit = import ./git/git-git.nix {
@@ -26,7 +26,7 @@ rec {
     inherit (bleedingEdgeRepos) sourceByName;
     svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
     guiSupport = getConfig ["git" "guiSupport"] false;
-    perlLibs = [perlPackages.perlLWP perlPackages.perlURI perlPackages.perlTermReadKey subversion];
+    perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
   };
 
   qgit = import ./qgit {