From d8e873012767d8a844edf762a94c76b140a52356 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sun, 1 Apr 2012 22:46:15 +0000
Subject: [PATCH 001/293] Adding support for dhcpcd to wicd.

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

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 1f3240997d96..6332ff8ad5db 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus, 
- wpa_supplicant, dhcp, wirelesstools, nettools, iproute,
+ wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, iproute,
  locale ? "C" }:
 
 # Wicd has a ncurses interface that we do not build because it depends
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     
     substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
     
-    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in
+    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in
     sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
     sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in
     sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in

From 63bf8c3a0d3ed5ac26a2c4b24ef1bcc694fdef53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Apr 2012 09:59:25 +0000
Subject: [PATCH 002/293] * Support the 32-bit version of the Google Talk
 plugin.

svn path=/nixpkgs/trunk/; revision=33533
---
 .../mozilla-plugins/google-talk-plugin/default.nix        | 8 ++++++--
 .../browsers/mozilla-plugins/google-talk-plugin/preload.c | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index b8cb5b11a6b5..01f4fb901fd7 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -48,8 +48,12 @@ stdenv.mkDerivation {
         url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm";
         sha256 = "15909wnhspjci0fspvh5j87v1xl7dfix36zrpvk6fpc3m0vys0nh";
       }
-    else
-      throw "Google Talk does not support your platform.";
+    else if stdenv.system == "i686-linux" then
+      fetchurl {
+        url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm";
+        sha256 = "0sclsj6mcaynkw28kipgmcj6sx5vbyrz1rwwyx89ll48n46k65ya";
+      }
+    else throw "Google Talk does not support your platform.";
 
   buildInputs = [ rpm cpio ];
       
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
index 2ebcc2a40b17..9c543fed7582 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
@@ -25,7 +25,6 @@ const char * rewrite(const char * path, char * buf)
 
 int execvp(const char * path, char * const argv[])
 {
-    fprintf(stderr, "foo %s\n", path);
     int (*_execvp) (const char *, char * const argv[]) = dlsym(RTLD_NEXT, "execvp");
     char buf[PATH_MAX];
     return _execvp(rewrite(path, buf), argv);

From 29c20c72b154bb9ec8185a0a1f7c3708077dbe3a Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Mon, 2 Apr 2012 10:24:25 +0000
Subject: [PATCH 003/293] rxvt-unicode 9.15 (thx garbas)

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

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index aa8b1b2b29f4..a1297d64a180 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -3,7 +3,7 @@
 
 let 
   name = "rxvt-unicode";
-  version = "9.10";
+  version = "9.15";
   n = "${name}-${version}";
 in
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
 
   src = fetchurl {
     url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
-    sha256 = "1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a";
+    sha256 = "ec1aa2932da844979ed8140bd92223defb12042aa5e877e05ac31139ca81f2b1";
   };
 
   buildInputs =

From a09f26e1a22108dfc0468b13871a34b1a46c4eeb Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Mon, 2 Apr 2012 10:24:30 +0000
Subject: [PATCH 004/293] notmuch-0.12 (thx garbas)

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

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

From fd8c16adb86fc0abe8584c5adc34d49d840e176d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Apr 2012 15:19:05 +0000
Subject: [PATCH 005/293] stellarium: updated to version 0.11.2

svn path=/nixpkgs/trunk/; revision=33538
---
 pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 7dcc3c0b006b..dcf6ccd7d9b7 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
 
 let
-  name = "stellarium-0.11.1";
+  name = "stellarium-0.11.2";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "1lrz52g2li92yjsrnxqqfmgjy2jmcqszwqpaq9rz9319nd1f2zpl";
+    sha256 = "1qk26s0gal2pqr8zy95270fiszxsc6znzzrj5jap91zzibn17945";
   };
 
   buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];

From 5187b2211564d9b7d3b33dce0d766e3d3f0b2d81 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Apr 2012 18:44:03 +0000
Subject: [PATCH 006/293] haskell-fgl-visualize: added version 0.1

svn path=/nixpkgs/trunk/; revision=33543
---
 .../libraries/haskell/fgl-visualize/default.nix     | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/fgl-visualize/default.nix

diff --git a/pkgs/development/libraries/haskell/fgl-visualize/default.nix b/pkgs/development/libraries/haskell/fgl-visualize/default.nix
new file mode 100644
index 000000000000..e2987351d0ad
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fgl-visualize/default.nix
@@ -0,0 +1,13 @@
+{ cabal, dotgen, fgl }:
+
+cabal.mkDerivation (self: {
+  pname = "fgl-visualize";
+  version = "0.1";
+  sha256 = "0ri6ywg7rj8qfyngjxvihw43s2h2l3w03fwq1ipn59cdcnah08bc";
+  buildDepends = [ dotgen fgl ];
+  meta = {
+    description = "Convert FGL graphs to dot (graphviz) files";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b7271f41898d..bd0987e6a4bd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -681,6 +681,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {};
   fgl = self.fgl_5_4_2_4;
 
+  fglVisualize = callPackage ../development/libraries/haskell/fgl-visualize {};
+
   fingertree = callPackage ../development/libraries/haskell/fingertree {};
 
   gamma = callPackage ../development/libraries/haskell/gamma {};

From ba8b234c85ebe826e41d2b7ce34fa2638e49051f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Apr 2012 18:44:06 +0000
Subject: [PATCH 007/293] haskell-hoogle: fixed build

svn path=/nixpkgs/trunk/; revision=33544
---
 pkgs/top-level/haskell-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bd0987e6a4bd..0f5edce9e62d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -856,7 +856,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hmatrix = callPackage ../development/libraries/haskell/hmatrix {};
 
-  hoogle = callPackage ../development/libraries/haskell/hoogle {};
+  hoogle = callPackage ../development/libraries/haskell/hoogle {
+    haskellSrcExts = self.haskellSrcExts_1_11_1;
+  };
 
   hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
 

From 943904a8091aff0f3203a59ad90fba3ae67abbca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Apr 2012 18:44:09 +0000
Subject: [PATCH 008/293] haskell-SourceGraph: fixed build

svn path=/nixpkgs/trunk/; revision=33545
---
 pkgs/top-level/haskell-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0f5edce9e62d..cd616925f315 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1606,7 +1606,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hslogger = callPackage ../development/tools/haskell/hslogger {};
 
-  SourceGraph = callPackage ../development/tools/haskell/SourceGraph {};
+  SourceGraph = callPackage ../development/tools/haskell/SourceGraph {
+    haskellSrcExts = self.haskellSrcExts_1_11_1;
+  };
 
   tar_0_3_2_0 = callPackage ../development/tools/haskell/tar/0.3.2.0.nix {};
   tar_0_4_0_0 = callPackage ../development/tools/haskell/tar/0.4.0.0.nix {};

From 8585f4000b8cab833aed615dfef43f7b287c3dc1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 2 Apr 2012 20:15:19 +0000
Subject: [PATCH 009/293] Linux 3.3.1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix
index ecdcfc86a88a..03e496d00ce3 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix
@@ -225,19 +225,19 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.3";
+    version = "3.3.1";
 
     testing = false;
 
-    modDirVersion = "3.3.0";
+    modDirVersion = "3.3.1";
 
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
     '';
 
     src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2";
-      sha256 = "0czk8bj46r3r95iz6gi7xkavhjx847s5p9248vabi0c1wjs6kmlg";
+      url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
+      sha256 = "0b29ijg578nib9hxmzxsvi3jqydcbxdggp0n2k3x0bc14dwzyv0q";
     };
 
     config = configWithPlatform stdenv.platform;

From 8cd391b130395d19f7352906b8a5fae295035ebb Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 2 Apr 2012 20:18:52 +0000
Subject: [PATCH 010/293] Whoops, don't need modDirVersion for 3.3.1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix
index 03e496d00ce3..0ac2665c9a6a 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix
@@ -229,8 +229,6 @@ import ./generic.nix (
 
     testing = false;
 
-    modDirVersion = "3.3.1";
-
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
     '';

From 1eeaeaf3acc16eb79cf9f1e3cdf53c5673c9112a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Apr 2012 21:20:38 +0000
Subject: [PATCH 011/293] graphviz: enabled support for the gts library (used
 by sfdp renderer)

svn path=/nixpkgs/trunk/; revision=33548
---
 pkgs/tools/graphics/graphviz/default.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index c070a73d1f19..02f9534876b6 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
-, yacc, libtool, fontconfig, pango, gd, xlibs
+, yacc, libtool, fontconfig, pango, gd, xlibs, gts
 }:
 
 stdenv.mkDerivation rec {
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
-      pango gd
+      pango gd gts
     ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ];
-  
+
   configureFlags =
     [ "--with-pngincludedir=${libpng}/include"
       "--with-pnglibdir=${libpng}/lib"
@@ -34,7 +34,19 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A program for visualising graphs";
-    homepage = http://www.graphviz.org/;
+    homepage = "http://www.graphviz.org/";
+    description = "open source graph visualization software"
+
+    longDescription = ''
+      Graphviz is open source graph visualization software. Graph
+      visualization is a way of representing structural information as
+      diagrams of abstract graphs and networks. It has important
+      applications in networking, bioinformatics, software engineering,
+      database and web design, machine learning, and in visual
+      interfaces for other technical domains.
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From e623ca0e28de6082ee942c60fe46df36be9de28e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Apr 2012 21:54:14 +0000
Subject: [PATCH 012/293] graphviz: fixed typos

Thanks, Eelco.

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

diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 02f9534876b6..4edec43e243c 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.graphviz.org/";
-    description = "open source graph visualization software"
+    description = "Open source graph visualization software";
 
     longDescription = ''
       Graphviz is open source graph visualization software. Graph

From 2c99cdce3e965b569b35731feadfb35a79d9ec9a Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Mon, 2 Apr 2012 22:05:02 +0000
Subject: [PATCH 013/293] Adding examples to share directory

The easy-rsa example contains scripts for generating certificates.

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

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 98c3dd484dc8..1310fb7d0473 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
     --with-iproute-path=${iproute}/sbin/ip
   '';
 
+  postInstall = ''
+    mkdir -p $out/share/doc/openvpn/examples
+    cp -r sample-config-files/ $out/share/doc/openvpn/examples
+    cp -r sample-keys/ $out/share/doc/openvpn/examples
+    cp -r easy-rsa/ $out/share/doc/openvpn/examples
+    rm -r $out/share/doc/openvpn/examples/easy-rsa/Windows
+    cp -r sample-scripts/ $out/share/doc/openvpn/examples
+  '';
+
   meta = { 
       description="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes.";
       homepage="http://openvpn.net/";

From 1726c930cd8ff8c195ac6f7ebc44ddac696ac8ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Apr 2012 06:31:11 +0000
Subject: [PATCH 014/293] Updated Haskell packages.

 - fgl-visualize: added meta.maintainers
 - gtk2hs-buildtools: added version 0.12.3
 - network-conduit: added version 0.4.0
 - path-pieces: updated to version 0.1.1
 - void: added version 0.5.5

svn path=/nixpkgs/trunk/; revision=33551
---
 .../haskell/fgl-visualize/default.nix          |  1 +
 .../{default.nix => 0.12.1.nix}                |  0
 .../haskell/gtk2hs-buildtools/0.12.3.nix       | 18 ++++++++++++++++++
 .../haskell/network-conduit/default.nix        | 18 ++++++++++++++++++
 .../libraries/haskell/path-pieces/0.1.0.nix    | 15 ---------------
 .../path-pieces/{0.0.0.nix => default.nix}     |  8 ++++----
 .../libraries/haskell/void/default.nix         | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix            | 16 +++++++++-------
 8 files changed, 65 insertions(+), 26 deletions(-)
 rename pkgs/development/libraries/haskell/gtk2hs-buildtools/{default.nix => 0.12.1.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix
 create mode 100644 pkgs/development/libraries/haskell/network-conduit/default.nix
 delete mode 100755 pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
 rename pkgs/development/libraries/haskell/path-pieces/{0.0.0.nix => default.nix} (69%)
 mode change 100755 => 100644
 create mode 100644 pkgs/development/libraries/haskell/void/default.nix

diff --git a/pkgs/development/libraries/haskell/fgl-visualize/default.nix b/pkgs/development/libraries/haskell/fgl-visualize/default.nix
index e2987351d0ad..279f25eaca20 100644
--- a/pkgs/development/libraries/haskell/fgl-visualize/default.nix
+++ b/pkgs/development/libraries/haskell/fgl-visualize/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Convert FGL graphs to dot (graphviz) files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
rename to pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix
new file mode 100644
index 000000000000..a9b5efe58779
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix
@@ -0,0 +1,18 @@
+{ cabal, alex, filepath, happy, random }:
+
+cabal.mkDerivation (self: {
+  pname = "gtk2hs-buildtools";
+  version = "0.12.3";
+  sha256 = "1129p2b0hvmin7zpq43ik670v2c63jv704bnmnh3cr0bw06qrrbi";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ filepath random ];
+  buildTools = [ alex happy ];
+  meta = {
+    homepage = "http://projects.haskell.org/gtk2hs/";
+    description = "Tools to build the Gtk2Hs suite of User Interface libraries";
+    license = self.stdenv.lib.licenses.gpl2;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
new file mode 100644
index 000000000000..e16610fe3482
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -0,0 +1,18 @@
+{ cabal, conduit, liftedBase, monadControl, network, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "network-conduit";
+  version = "0.4.0";
+  sha256 = "0h0s33nxihd4zy9mvy2vpdrpvjapacbl69ndsw5zrbqhwbpz3mzs";
+  buildDepends = [
+    conduit liftedBase monadControl network transformers
+  ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Stream socket data using conduits";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
deleted file mode 100755
index ea66d1d54bdc..000000000000
--- a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "path-pieces";
-  version = "0.1.0";
-  sha256 = "12dgiq2pz94pwa5v5wv96ps0nl5w23r44nnp4lm4cdhl063c9w8d";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "http://github.com/snoyberg/path-pieces";
-    description = "Components of paths";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix
old mode 100755
new mode 100644
similarity index 69%
rename from pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
rename to pkgs/development/libraries/haskell/path-pieces/default.nix
index 6b5168e50c1a..d4f52aef58e9
--- a/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
+++ b/pkgs/development/libraries/haskell/path-pieces/default.nix
@@ -1,10 +1,10 @@
-{ cabal, text }:
+{ cabal, text, time }:
 
 cabal.mkDerivation (self: {
   pname = "path-pieces";
-  version = "0.0.0";
-  sha256 = "09sk4wlzy37gaii7spisjy4a3pizis9si4kv389bki20gfwpaivf";
-  buildDepends = [ text ];
+  version = "0.1.1";
+  sha256 = "17ymk2azgz2c1hwnzqd9xy77hh51mvrgz4zs7lz4ik6rnvvihraz";
+  buildDepends = [ text time ];
   meta = {
     homepage = "http://github.com/snoyberg/path-pieces";
     description = "Components of paths";
diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix
new file mode 100644
index 000000000000..585ac3df9fb5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/void/default.nix
@@ -0,0 +1,15 @@
+{ cabal, semigroups }:
+
+cabal.mkDerivation (self: {
+  pname = "void";
+  version = "0.5.5";
+  sha256 = "011ji37d5f6xrvd6sq0zkzggaq11r7nyb2z5v3ix3kn14r5psfz3";
+  buildDepends = [ semigroups ];
+  meta = {
+    homepage = "http://github.com/ekmett/void";
+    description = "A Haskell 98 logically uninhabited data type";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cd616925f315..5830d9d150ad 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -753,7 +753,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     libc = pkgs.stdenv.gcc.libc;
   };
 
-  gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {};
+  gtk2hsBuildtools_0_12_1 = callPackage ../development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix {};
+  gtk2hsBuildtools_0_12_3 = callPackage ../development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix {};
+  gtk2hsBuildtools = self.gtk2hsBuildtools_0_12_1;
   gtk2hsC2hs = self.gtk2hsBuildtools;
 
   gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 {
@@ -1042,6 +1044,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   network_2_3_0_11 = callPackage ../development/libraries/haskell/network/2.3.0.11.nix {};
   network = self.network_2_3_0_11;
 
+  networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
+
   nonNegative = callPackage ../development/libraries/haskell/non-negative {};
 
   numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {};
@@ -1065,9 +1069,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
 
-  pathPieces_0_0_0 = callPackage ../development/libraries/haskell/path-pieces/0.0.0.nix {};
-  pathPieces_0_1_0 = callPackage ../development/libraries/haskell/path-pieces/0.1.0.nix {};
-  pathPieces = self.pathPieces_0_1_0;
+  pathPieces = callPackage ../development/libraries/haskell/path-pieces {};
 
   pandoc = callPackage ../development/libraries/haskell/pandoc {};
 
@@ -1427,6 +1429,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   vectorSpace = callPackage ../development/libraries/haskell/vector-space {};
 
+  void = callPackage ../development/libraries/haskell/void {};
+
   vty = callPackage ../development/libraries/haskell/vty {
     mtl = self.mtl2;
   };
@@ -1497,9 +1501,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {};
 
-  yesodCore = callPackage ../development/libraries/haskell/yesod-core {
-    pathPieces = self.pathPieces_0_0_0;
-  };
+  yesodCore = callPackage ../development/libraries/haskell/yesod-core {};
 
   yesodDefault = callPackage ../development/libraries/haskell/yesod-default {};
 

From f35cf876000d2ba02dda9da1e411cfd4d55f9e21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Apr 2012 06:31:19 +0000
Subject: [PATCH 015/293] removed executable bits from Nix files

svn path=/nixpkgs/trunk/; revision=33552
---
 pkgs/development/libraries/haskell/ObjectName/default.nix         | 0
 pkgs/development/libraries/haskell/StateVar/default.nix           | 0
 pkgs/development/libraries/haskell/Tensor/default.nix             | 0
 pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix     | 0
 pkgs/development/libraries/haskell/async/default.nix              | 0
 pkgs/development/libraries/haskell/bytestring-mmap/default.nix    | 0
 .../development/libraries/haskell/continued-fractions/default.nix | 0
 pkgs/development/libraries/haskell/converge/default.nix           | 0
 pkgs/development/libraries/haskell/flexible-defaults/default.nix  | 0
 pkgs/development/libraries/haskell/funcmp/default.nix             | 0
 pkgs/development/libraries/haskell/gamma/default.nix              | 0
 pkgs/development/libraries/haskell/hsyslog/default.nix            | 0
 pkgs/development/libraries/haskell/random-source/default.nix      | 0
 pkgs/development/libraries/haskell/rvar/default.nix               | 0
 pkgs/development/libraries/haskell/semigroups/default.nix         | 0
 pkgs/development/libraries/haskell/streamproc/default.nix         | 0
 pkgs/stdenv/mingw/cygpath/default.nix                             | 0
 pkgs/stdenv/mingw/pkgs/default.nix                                | 0
 18 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 pkgs/development/libraries/haskell/ObjectName/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/StateVar/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/Tensor/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/async/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/bytestring-mmap/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/continued-fractions/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/converge/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/flexible-defaults/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/funcmp/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/gamma/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/hsyslog/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/random-source/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/rvar/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/semigroups/default.nix
 mode change 100755 => 100644 pkgs/development/libraries/haskell/streamproc/default.nix
 mode change 100755 => 100644 pkgs/stdenv/mingw/cygpath/default.nix
 mode change 100755 => 100644 pkgs/stdenv/mingw/pkgs/default.nix

diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/stdenv/mingw/cygpath/default.nix b/pkgs/stdenv/mingw/cygpath/default.nix
old mode 100755
new mode 100644
diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix
old mode 100755
new mode 100644

From ebae9a9fd729fd539782adc3433ebd5c1442f37f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 3 Apr 2012 11:07:50 +0000
Subject: [PATCH 016/293] * Git 1.7.9.5.

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

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index f859dcf96b05..64f9cf36270d 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "1.7.9.4";
+  version = "1.7.9.5";
   svn = subversionClient.override { perlBindings = true; };
 in
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "c59f4c1e37a99f00022b491a6674f633a00164513efdc269e74ed20537f71c39";
+    sha256 = "0nap6z8kfl61hx0h64ylk0x8786fxk31prdv7zk14ljbihs55p9x";
   };
 
   patches = [ ./docbook2texi.patch ];

From 31a37d918c5088097f3bbfddde00d4463c895b7f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 3 Apr 2012 11:56:45 +0000
Subject: [PATCH 017/293] Bumped libmatthew-java to version 0.8

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

diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix
index 785ba9ab9ead..0b77de56987b 100644
--- a/pkgs/development/libraries/java/libmatthew-java/default.nix
+++ b/pkgs/development/libraries/java/libmatthew-java/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, jdk}:
 
 stdenv.mkDerivation {
-  name = "libmatthew-java-0.7.2";
+  name = "libmatthew-java-0.8";
   src = fetchurl {
-    url = http://www.matthew.ath.cx/projects/java/libmatthew-java-0.7.2.tar.gz;
-    sha256 = "00zd6vplbvha64pf65bpw44abg2y8irblik30pbk35wcm86a0j4z";
+    url = http://www.matthew.ath.cx/projects/java/libmatthew-java-0.8.tar.gz;
+    sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85";
   };
   JAVA_HOME=jdk;
   PREFIX=''''${out}'';

From 7295830f7eacfc9b01430e418feda202511fbf4e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Apr 2012 18:37:58 +0000
Subject: [PATCH 018/293] Updated Haskell packages.

 - aeson: updated to version 0.6.0.1
 - alex-meta: updated to version 0.3.0.3
 - BNFC-meta: updated to version 0.3.0.1
 - hakyll: updated to version 3.2.7.1
 - happy-meta: updated to version 0.2.0.4
 - http-enumerator: updated to version 0.7.3.2
 - multiarg: updated to version 0.2.0.0

Disabled Haddock documentation for the following packages, because the
input crashes Haddock:

 - BNFC-meta
 - alex-meta

Re-enabled Haddock documentation for the following packages, because
previously occurring errors have been fixed:

 - ConfigFile
 - HDBC-odbc
 - Hipmunk
 - instant-generics
 - RepLib
 - type-equality
 - xmonad
 - xmonad-extras
 - yesod-core

svn path=/nixpkgs/trunk/; revision=33559
---
 pkgs/applications/window-managers/xmonad/default.nix |  1 -
 .../window-managers/xmonad/xmonad-extras.nix         |  1 -
 .../libraries/haskell/ConfigFile/default.nix         |  1 -
 .../development/libraries/haskell/HDBC/HDBC-odbc.nix |  1 -
 .../libraries/haskell/Hipmunk/default.nix            |  1 -
 .../development/libraries/haskell/RepLib/default.nix |  1 -
 pkgs/development/libraries/haskell/aeson/default.nix |  4 ++--
 .../development/libraries/haskell/hakyll/default.nix |  4 ++--
 .../libraries/haskell/http-enumerator/default.nix    |  4 ++--
 .../libraries/haskell/instant-generics/default.nix   |  1 -
 .../libraries/haskell/multiarg/default.nix           | 12 ++++--------
 .../libraries/haskell/type-equality/default.nix      |  1 -
 .../libraries/haskell/yesod-core/default.nix         |  1 -
 pkgs/development/tools/haskell/BNFC-meta/default.nix |  5 +++--
 pkgs/development/tools/haskell/alex-meta/default.nix |  5 +++--
 .../development/tools/haskell/happy-meta/default.nix |  4 ++--
 16 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
index c89088e400be..a490bc8018dd 100644
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@@ -7,7 +7,6 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ extensibleExceptions mtl utf8String X11 ];
-  noHaddock = true;
   meta = {
     homepage = "http://xmonad.org";
     description = "A tiling window manager";
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
index ce3b9fed7b70..ac0be1e70c4b 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
@@ -10,7 +10,6 @@ cabal.mkDerivation (self: {
     hint HList libmpd mtl network parsec random regexPosix split X11
     xmonad xmonadContrib
   ];
-  noHaddock = true;
   meta = {
     homepage = "http://projects.haskell.org/xmonad-extras";
     description = "Third party extensions for xmonad with wacky dependencies";
diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
index 70382d1cd631..29d417562ccb 100644
--- a/pkgs/development/libraries/haskell/ConfigFile/default.nix
+++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix
@@ -7,7 +7,6 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ MissingH mtl parsec ];
-  noHaddock = true;
   meta = {
     homepage = "http://software.complete.org/configfile";
     description = "Configuration file reading & writing";
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
index eb1b3b3ddaae..d5dca127ca15 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
@@ -8,7 +8,6 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ HDBC mtl time utf8String ];
   extraLibraries = [ odbc ];
-  noHaddock = true;
   meta = {
     homepage = "http://software.complete.org/hdbc-odbc";
     description = "ODBC driver for HDBC";
diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index ea2bc8cfc2c5..b5fbeb126a5b 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -5,7 +5,6 @@ cabal.mkDerivation (self: {
   version = "5.2.0.7";
   sha256 = "1cinxhz4qb8xcbygifx85q4zf6pmjwi90v01vqwyvwlfxmbk0j7k";
   buildDepends = [ StateVar transformers ];
-  noHaddock = true;
   meta = {
     homepage = "http://patch-tag.com/r/felipe/hipmunk/home";
     description = "A Haskell binding for Chipmunk";
diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
index 833e5956b2b3..b070301f4e79 100644
--- a/pkgs/development/libraries/haskell/RepLib/default.nix
+++ b/pkgs/development/libraries/haskell/RepLib/default.nix
@@ -5,7 +5,6 @@ cabal.mkDerivation (self: {
   version = "0.5.2";
   sha256 = "1wcxvl40wlnva2x7z13pm95485lwxbpy5di1mb1din3id8dprxfr";
   buildDepends = [ mtl typeEquality ];
-  noHaddock = true;
   meta = {
     homepage = "http://code.google.com/p/replib/";
     description = "Generic programming library with representation types";
diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index 4cb67db36f67..d3e0c360e3eb 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.6.0.0";
-  sha256 = "1j8g1q7xr1pgyfyrkbh2zz7fhqshj0q5qg7fczrnsbbzf5k459zw";
+  version = "0.6.0.1";
+  sha256 = "0hhhfq045drwfc4l3827006ybw9shwxi8mg25k9nsjx9wdhmkvy9";
   buildDepends = [
     attoparsec blazeBuilder deepseq dlist hashable mtl syb text time
     unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 1d75a0e00e01..59f219529c9c 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "3.2.7.0";
-  sha256 = "1jx4csfdr7icjrg9hvlw5pyi29qf3yyx0sjaw7nchz8jk43ikr2b";
+  version = "3.2.7.1";
+  sha256 = "07d7a8l2phb787wgqyh1rci1v9hzwxw35arg03hkal072sacif0c";
   buildDepends = [
     binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc
     parsec regexBase regexTdfa snapCore snapServer tagsoup time
diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix
index 3346f2b3328d..1104794be20a 100644
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-enumerator";
-  version = "0.7.3.1";
-  sha256 = "0a4p9340g6bx3s7mj3lbkrgw3db2kxpjncbbnnpdcwqyswi2vm75";
+  version = "0.7.3.2";
+  sha256 = "1djr41fc8blpmwcj3ckix0xnc0kfasbmkx82wpzrq23h54jrbdjl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix
index 5893e0b9d05c..648dfd7c3157 100644
--- a/pkgs/development/libraries/haskell/instant-generics/default.nix
+++ b/pkgs/development/libraries/haskell/instant-generics/default.nix
@@ -5,7 +5,6 @@ cabal.mkDerivation (self: {
   version = "0.3.4";
   sha256 = "0j3sfbw3j0izwmhvwcl8nxxvlrpfla5rngxx2yvl6w5i87wyhswi";
   buildDepends = [ syb ];
-  noHaddock = true;
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
     description = "Generic programming library with a sum of products view";
diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index 446c47a41dc4..0d922c4c0601 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -1,14 +1,10 @@
-{ cabal, explicitException, QuickCheck, text, transformers
-, utf8String
-}:
+{ cabal, explicitException, text, transformers, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.1.0.0";
-  sha256 = "010mph49fq0rdr5dmm4pdlbmfmaaas8wffa9p1cgprs2ic1hnx3g";
-  buildDepends = [
-    explicitException QuickCheck text transformers utf8String
-  ];
+  version = "0.2.0.0";
+  sha256 = "1jmhlh4ngmkddrkcafx0qcmzwbmi5crkmd6p8b07cfjpaq2pc6yx";
+  buildDepends = [ explicitException text transformers utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";
     description = "Combinators to build command line parsers";
diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix
index f660ea6193a4..66b8b1974ff4 100644
--- a/pkgs/development/libraries/haskell/type-equality/default.nix
+++ b/pkgs/development/libraries/haskell/type-equality/default.nix
@@ -4,7 +4,6 @@ cabal.mkDerivation (self: {
   pname = "type-equality";
   version = "0.1.0.2";
   sha256 = "09m6vc5hglf3xdg0bg9lgbkgjffmbkfgcrqf5ii36l92c4dik32q";
-  noHaddock = true;
   meta = {
     homepage = "http://github.com/hesselink/type-equality/";
     description = "Type equality, coercion/cast and other operations";
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 25dc59952c75..e7929b578ed6 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -17,7 +17,6 @@ cabal.mkDerivation (self: {
     shakespeareI18n shakespeareJs text time transformers
     transformersBase vector wai waiExtra waiLogger yesodRoutes
   ];
-  noHaddock = true;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Creation of type-safe, RESTful web applications";
diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix
index e19a452e7efa..19fe6eec95fa 100644
--- a/pkgs/development/tools/haskell/BNFC-meta/default.nix
+++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix
@@ -2,9 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "BNFC-meta";
-  version = "0.3";
-  sha256 = "17vmszgq9cyayqlykjbwzvm8mim641vhpzcrdr3l6zb84hr29xgs";
+  version = "0.3.0.1";
+  sha256 = "1qp6aanryrmmip45wgiaf62p842lgc1yqdr8qqn3ljmszxw591ak";
   buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ];
+  noHaddock = true;
   meta = {
     description = "Deriving Quasi-Quoters from BNF Grammars";
     license = self.stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix
index ca82ef1e580b..661c9c7895b5 100644
--- a/pkgs/development/tools/haskell/alex-meta/default.nix
+++ b/pkgs/development/tools/haskell/alex-meta/default.nix
@@ -2,9 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "alex-meta";
-  version = "0.3.0.2";
-  sha256 = "0kbscnax236qhr18ix9rnfl70z5rgl9zysx5mzd2vrp7h2dymigg";
+  version = "0.3.0.3";
+  sha256 = "08w7z2iq2s557vi9kp2x8qp1lwvh49skffbjm8kxrf2bn2il5q48";
   buildDepends = [ haskellSrcMeta QuickCheck ];
+  noHaddock = true;
   meta = {
     description = "Quasi-quoter for Alex lexers";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix
index 5ffc3edbb379..3b9a6d4c9838 100644
--- a/pkgs/development/tools/haskell/happy-meta/default.nix
+++ b/pkgs/development/tools/haskell/happy-meta/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happy-meta";
-  version = "0.2.0.3";
-  sha256 = "0bvm4rbmd48vfpyjjfq476466s9hf7x3y0bgzdfkacm89xx080g9";
+  version = "0.2.0.4";
+  sha256 = "1s1inv2l2hwdlvypn6wpiadmi5y5mpcjawiqjb1hv0d8y43dpz54";
   buildDepends = [ haskellSrcMeta mtl ];
   meta = {
     description = "Quasi-quoter for Happy parsers";

From f8af12bfefd80335c3a4ce0708220af9cab17932 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 4 Apr 2012 13:24:11 +0000
Subject: [PATCH 019/293] Bumped the disnixos revision

svn path=/nixpkgs/trunk/; revision=33562
---
 pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index f9c9aa8c593e..10f5168ba9d6 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, disnix, socat, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2pre31830";
+  name = "disnixos-0.2pre33556";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/1934498/download/3/disnixos-0.2pre31830.tar.gz;
-    sha256 = "02f2b4lk1gr24rqs56az82b3h3mnqrk1m48bcj21x109g4vrlpmm";
+    url = http://hydra.nixos.org/build/2363206/download/3/disnixos-0.2pre33556.tar.gz;
+    sha256 = "0fq96cqd0hfa6cwz7phq7ccm935hlcwmjd59vfsp6bwp0wyjzpzl";
   };
   
   buildInputs = [ socat pkgconfig disnix ];

From 4ae899f4bf316538b742952f08b43d64cce28e69 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Apr 2012 14:06:04 +0000
Subject: [PATCH 020/293] * Mercurial updated to 2.1.2.

svn path=/nixpkgs/trunk/; revision=33563
---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 19c7c0e9f910..a8898b818d96 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -2,14 +2,14 @@
 , guiSupport ? false, tk ? null, curses }:
 
 let
-  name = "mercurial-2.0.2";
+  name = "mercurial-2.1.2";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "ca8b8fb93f2e3e8c3cdf2f81d87e92592f5f20c5bfcaaeb6a75550d4a69572c9";
+    sha256 = "11lqjnbal667rkbafby9qvb7hyxfycyc7h3hw04p4s4mw64lhkci";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git

From b9bdfccec929437369bcb65e9602cedb18c1be48 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Apr 2012 14:07:57 +0000
Subject: [PATCH 021/293] * dhcpcd updated to 5.5.5.

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

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 9a862a461b66..e373d6c728ba 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-5.5.4";
+  name = "dhcpcd-5.5.5";
 
   src = fetchurl {
     url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
-    sha256 = "1zhpm89s6bk29lx7hq5f6fqm7i6dq2wq9vv5m25rv5wv6747v0m6";
+    sha256 = "0arypxvyk0hbaln2plc9r4naij8pzj2yhah5rslmdd49sd0h94k8";
   };
 
   configureFlags = "--sysconfdir=/etc";

From 23957ac8243ee139549aa1e5fbc42e94478e825a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Apr 2012 14:46:17 +0000
Subject: [PATCH 022/293] * Updated htop to 1.0.1.

svn path=/nixpkgs/trunk/; revision=33566
---
 pkgs/lib/maintainers.nix                |  1 +
 pkgs/os-specific/linux/htop/default.nix | 14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index e95d6a7ad0e6..6b63d40305b1 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -25,6 +25,7 @@
   piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
   qknight = "Joachim Schiele <js@lastlog.de>";
   raskin = "Michael Raskin <7c6f434c@mail.ru>";
+  rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   shlevy = "Shea Levy <shea@shealevy.com>";
diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix
index fcec5d988fd5..52db202a15f0 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@@ -1,21 +1,19 @@
-{fetchurl, stdenv, ncurses}:
+{ fetchurl, stdenv, ncurses }:
 
-let
-  name = "htop-1.0";
-in
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "htop-1.0.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/htop/${name}.tar.gz";
-    sha256 = "242879b86db4b97e1090e7cd391247268ccbe90834ff34b6e8242926c9664852";
+    sha256 = "1wh62mb102nxd5h3pnzakdf0lcyapv1yq44ndcc9wpw30az2rnq7";
   };
 
-  buildInputs = [ncurses];
+  buildInputs = [ ncurses ];
 
   meta = {
     description = "An interactive process viewer for Linux";
     homepage = "http://htop.sourceforge.net";
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.rob ];
   };
 }

From a1d87e58c157cfe68c070f8a7e265fde2599797e Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 4 Apr 2012 15:30:29 +0000
Subject: [PATCH 023/293] re-add overwritten svn2git (used/developed by kde
 people)

svn path=/nixpkgs/trunk/; revision=33567
---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/svn2git-kde/default.nix     | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 376e5286b05b..4a0c16b9343c 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -93,6 +93,8 @@ rec {
     git = gitSVN;
   };
 
+  svn2git_kde = callPackage ./svn2git-kde { };
+
   gitSubtree = import ./git-subtree {
     inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt;
   };
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
new file mode 100644
index 000000000000..ae928fa2d4d5
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, qt47, subversion, apr}:
+
+stdenv.mkDerivation rec {
+  name = "svn2git";
+
+  src = fetchgit {
+    url = http://git.gitorious.org/svn2git/svn2git.git;
+    rev = "197979b6a641b8b5fa4856c700b1235491c73a41";
+    sha256 = "7be1a8f5822aff2d4ea7f415dce0b4fa8c6a82310acf24e628c5f1ada2d2d613";
+  };
+
+  buildPhase = ''
+    sed -i 's|/bin/cat|cat|' ./src/repository.cpp
+    qmake
+    make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion}/include/subversion-1 -DVER="\"${src.rev}\""'
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp svn-all-fast-export $out/bin
+  '';
+
+  buildInputs = [subversion apr qt47];
+  
+}

From bf791214c916a699c631fe686d78226a81abbf99 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Apr 2012 15:33:33 +0000
Subject: [PATCH 024/293] * Thunderbird updated to 11.0.1.

svn path=/nixpkgs/trunk/; revision=33568
---
 pkgs/applications/networking/mailreaders/thunderbird/11.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix
index c0de194ba997..0c8ba4b05ff1 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix
@@ -12,7 +12,7 @@
 
 }:
 
-let version = "11.0";
+let version = "11.0.1";
 
     # This patch may become necessary when we use a more recent version of libpng
     # for now, it's actually not needed
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha256 = "0lrp7ngi3ni70m9v11f0l8xvp3s8sc50isxbgy8vj677fzb1qn2s";
+    sha1 = "037344b451b1c031472d92f96d401b15d8e3e7d3";
   };
 
   enableParallelBuilding = true;

From 8ecdd3a0aa897beca7ae1b511f4edd0b0602311b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Apr 2012 16:05:08 +0000
Subject: [PATCH 025/293] * Don't do a mkdir in the postHook.

svn path=/nixpkgs/trunk/; revision=33569
---
 pkgs/build-support/release/source-tarball.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix
index 45a871567482..85d0b29f5b70 100644
--- a/pkgs/build-support/release/source-tarball.nix
+++ b/pkgs/build-support/release/source-tarball.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation (
 
     buildInputs = buildInputs ++ bootstrapBuildInputs;
     
-    postHook = ''
+    preUnpack = ''
       mkdir -p $out/nix-support
     '';  
 

From e0b69cfc262289d869bd5079af9bb4584b97d98f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 4 Apr 2012 16:07:47 +0000
Subject: [PATCH 026/293] Let hydra build qt-4.8.1

svn path=/nixpkgs/trunk/; revision=33570
---
 .../libraries/qt-4.x/4.8/4.8.1.nix            | 112 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   5 +
 2 files changed, 117 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-4.x/4.8/4.8.1.nix

diff --git a/pkgs/development/libraries/qt-4.x/4.8/4.8.1.nix b/pkgs/development/libraries/qt-4.x/4.8/4.8.1.nix
new file mode 100644
index 000000000000..a3a78af439a4
--- /dev/null
+++ b/pkgs/development/libraries/qt-4.x/4.8/4.8.1.nix
@@ -0,0 +1,112 @@
+{ stdenv, fetchurl, substituteAll
+, libXrender, libXinerama, libXcursor, libXmu , libXv, libXext
+, libXfixes, libXrandr, libSM, freetype, fontconfig
+, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig
+, libtiff, glib, icu
+, mysql, postgresql, sqlite
+, perl, coreutils, libXi
+, buildMultimedia ? true, alsaLib, gstreamer, gst_plugins_base
+, buildWebkit ? true
+, flashplayerFix ? true, gdk_pixbuf
+, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
+}:
+
+let
+  v = "4.8.1";
+in
+
+# TODO:
+#  * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid
+#    false build-time dependencies
+
+stdenv.mkDerivation rec {
+  name = "qt-${v}";
+
+  src = fetchurl {
+    url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";
+    sha256 = "1s3sv2p8q4bjy0h6r81gdnd64apdx8kwm5jc7rxavd21m8v1m1gg";
+  };
+
+  patches = [ ( substituteAll {
+        src = ./dlopen-absolute-paths.diff;
+        inherit cups icu libXfixes;
+        glibc = stdenv.gcc.libc;
+      })
+    ] ++ stdenv.lib.optional gtkStyle (
+      substituteAll {
+        src = ./dlopen-gtkstyle.diff;
+        # substituteAll ignores env vars starting with capital letter
+        gconf = GConf; 
+        inherit gnome_vfs libgnomeui gtk;
+      }
+    ) ++ stdenv.lib.optional flashplayerFix (
+      substituteAll {
+        src = ./dlopen-webkit-nsplugin.diff;
+        inherit gtk gdk_pixbuf;
+      }
+    );
+
+  preConfigure =
+    ''
+      export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
+      configureFlags+="
+        -docdir $out/share/doc/${name}
+        -plugindir $out/lib/qt4/plugins
+        -importdir $out/lib/qt4/imports
+        -examplesdir $out/share/doc/${name}/examples
+        -demosdir $out/share/doc/${name}/demos
+        -datadir $out/share/${name}
+        -translationdir $out/share/${name}/translations
+      "
+    '';
+
+  configureFlags =
+    ''
+      -v -no-separate-debug-info -release -no-fast -confirm-license -opensource
+
+      -opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
+      -qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked -openssl-linked
+
+      ${if mysql != null then "-plugin" else "-no"}-sql-mysql -system-sqlite
+
+      -exceptions -xmlpatterns
+
+      -make libs -make tools -make translations
+      -nomake demos -nomake examples -nomake docs
+
+      -no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if buildMultimedia then "" else "-no"}-multimedia -audio-backend
+    '';
+
+  propagatedBuildInputs =
+    [ libXrender libXrandr libXinerama libXcursor libXext libXfixes
+      libXv libXi libSM mesa
+    ] ++ (stdenv.lib.optional (buildWebkit || buildMultimedia) alsaLib)
+    ++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ]
+    ++ (stdenv.lib.optionals (buildWebkit || buildMultimedia)
+        [ gstreamer gst_plugins_base ]);
+
+  # The following libraries are only used in plugins
+  buildInputs = [ cups # Qt dlopen's libcups instead of linking to it
+    mysql postgresql sqlite libjpeg libmng libtiff icu ]
+    ++ stdenv.lib.optionals gtkStyle [ gtk gdk_pixbuf ];
+
+  buildNativeInputs = [ perl pkgconfig which ];
+
+  prefixKey = "-prefix ";
+
+  prePatch = ''
+    substituteInPlace configure --replace /bin/pwd pwd
+    substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
+    sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://qt.nokia.com/products;
+    description = "A cross-platform application framework for C++";
+    license = "GPL/LGPL";
+    maintainers = with maintainers; [ urkud sander ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc24c5ec1c85..1ffdc96502dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4574,6 +4574,11 @@ let
     inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
   };
 
+  qt4_8_1 = callPackage ../development/libraries/qt-4.x/4.8/4.8.1.nix {
+    # GNOME dependencies are not used unless gtkStyle == true
+    inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
+  };
+
   qt4_for_skype = qt48.override {
     mysql = null;
     postgresql = null;

From 9105d0546dd2bd9ca7ac05dac3d4710da1924873 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 4 Apr 2012 16:14:57 +0000
Subject: [PATCH 027/293] Drop old kdevplatform/kdevelop

svn path=/nixpkgs/trunk/; revision=33571
---
 pkgs/applications/editors/kdevelop/4.3.0.nix  | 34 -------------------
 .../applications/editors/kdevelop/default.nix | 14 ++++----
 .../libraries/kdevplatform/1.3.0.nix          | 27 ---------------
 .../libraries/kdevplatform/default.nix        | 21 ++++++------
 pkgs/top-level/all-packages.nix               |  4 ---
 5 files changed, 16 insertions(+), 84 deletions(-)
 delete mode 100644 pkgs/applications/editors/kdevelop/4.3.0.nix
 delete mode 100644 pkgs/development/libraries/kdevplatform/1.3.0.nix

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

From 9a22323099b54d5b6b296a9e1da7f9edd3e22175 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 4 Apr 2012 16:16:07 +0000
Subject: [PATCH 028/293] add svneverever and updated pysvn

svn path=/nixpkgs/trunk/; revision=33572
---
 pkgs/top-level/python-packages.nix | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 32505c106b4d..f49e6dce5718 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1531,11 +1531,11 @@ let pythonPackages = python.modules // rec {
 
 
   pysvn = pkgs.stdenv.mkDerivation {
-    name = "pysvn-1.7.2";
+    name = "pysvn-1.7.6";
 
     src = fetchurl {
-      url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.2.tar.gz";
-      sha256 = "2b2980d200515e754e00a12d99dbce25c1ea90fddf8cba2bfa354c9305c5e455";
+      url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.6.tar.gz";
+      sha256 = "0wwb9h3rw2r8hzqya8mv5z8pgjpa6y3i15a3cccdv2mil44289a7";
     };
 
     buildInputs = [ python pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ]
@@ -1549,6 +1549,7 @@ let pythonPackages = python.modules // rec {
       python setup.py backport
       python setup.py configure \
         --apr-inc-dir=${pkgs.apr}/include/apr-1 \
+        --apu-inc-dir=${pkgs.aprutil}/include/apr-1 \
         --apr-lib-dir=${pkgs.apr}/lib \
         --svn-root-dir=${pkgs.subversion}
     '' + (if !stdenv.isDarwin then "" else ''
@@ -1947,6 +1948,20 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+  svneverever =  buildPythonPackage rec {
+    name = "svneverever-778489a8";
+
+    src = pkgs.fetchgit {
+      url = git://git.goodpoint.de/svneverever.git;
+      rev = "778489a8c6f07825fb18c9da3892a781c3d659ac";
+      sha256 = "41c9da1dab2be7b60bff87e618befdf5da37c0a56287385cb0cbd3f91e452bb6";
+    };
+
+    propagatedBuildInputs = [ pysvn argparse ];
+
+    doCheck = false;
+  };
+
   taskcoach = buildPythonPackage rec {
     name = "TaskCoach-1.3.8";
 

From 1c62133e9fdef4db823d86e76cc7028ec8b79ffc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Apr 2012 16:36:17 +0000
Subject: [PATCH 029/293] * Fix email address.

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

diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 6b63d40305b1..006429be6fab 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -4,7 +4,7 @@
   /* Add your name and email address here.  Keep the list
      alphabetically sorted.  */
 
-  all = "Nix Committers <nix-commits@cs.uu.nl>";
+  all = "Nix Committers <nix-commits@lists.science.uu.nl>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   bjg = "Brian Gough <bjg@gnu.org>";

From 4d0fdc5e6bba1bd058bfb58ea11764e5cca9fb51 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 4 Apr 2012 19:24:07 +0000
Subject: [PATCH 030/293] kmod: respect MODULE_DIR

svn path=/nixpkgs/trunk/; revision=33578
---
 pkgs/os-specific/linux/kmod/default.nix      |  2 ++
 pkgs/os-specific/linux/kmod/module-dir.patch | 24 ++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kmod/module-dir.patch

diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index c75b8bec1466..32e4215d6c63 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--with-xz" "--with-zlib" ];
 
+  patches = [ ./module-dir.patch ];
+
   meta = {
     homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/;
     description = "Tools for loading and managing Linux kernel modules";
diff --git a/pkgs/os-specific/linux/kmod/module-dir.patch b/pkgs/os-specific/linux/kmod/module-dir.patch
new file mode 100644
index 000000000000..95d08da45804
--- /dev/null
+++ b/pkgs/os-specific/linux/kmod/module-dir.patch
@@ -0,0 +1,24 @@
+diff -Naur kmod-7-orig/libkmod/libkmod.c kmod-7/libkmod/libkmod.c
+--- kmod-7-orig/libkmod/libkmod.c	2012-03-15 08:19:16.750010226 -0400
++++ kmod-7/libkmod/libkmod.c	2012-04-04 15:21:29.532074313 -0400
+@@ -200,7 +200,7 @@
+ static char *get_kernel_release(const char *dirname)
+ {
+ 	struct utsname u;
+-	char *p;
++	char *p, *dirname_prefix;
+ 
+ 	if (dirname != NULL)
+ 		return path_make_absolute_cwd(dirname);
+@@ -208,7 +208,10 @@
+ 	if (uname(&u) < 0)
+ 		return NULL;
+ 
+-	if (asprintf(&p, "%s/%s", dirname_default_prefix, u.release) < 0)
++	if ((dirname_prefix = getenv("MODULE_DIR")) == NULL)
++		dirname_prefix = dirname_default_prefix;
++
++	if (asprintf(&p, "%s/%s", dirname_prefix, u.release) < 0)
+ 		return NULL;
+ 
+ 	return p;

From f3f8040aafbeaaeaa584e306f7087b11a0e04b53 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 4 Apr 2012 19:28:33 +0000
Subject: [PATCH 031/293] kmod: Create compat program symlinks

svn path=/nixpkgs/trunk/; revision=33579
---
 pkgs/os-specific/linux/kmod/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 32e4215d6c63..b97a55b2ab57 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -14,6 +14,13 @@ stdenv.mkDerivation {
 
   patches = [ ./module-dir.patch ];
 
+  postInstall = ''
+    for prog in lsmod rmmod insmod modinfo modprobe depmod
+    do
+      ln -sv kmod $out/bin/$prog
+    done
+  '';
+
   meta = {
     homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/;
     description = "Tools for loading and managing Linux kernel modules";

From e0ca8e74ffd1a0e3d196c8f136c4358210588c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 4 Apr 2012 19:50:15 +0000
Subject: [PATCH 032/293] GNU: Add an `__overrides' parameter.

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

diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index 1c4af3bdbfbe..515218747f38 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -3,11 +3,15 @@
 args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
 , texinfo, glibcCross, hurdPartedCross, libuuid, samba_light
 , gccCrossStageStatic, gccCrossStageFinal
-, forceBuildDrv, forceSystem, callPackage, platform, config, crossSystem }:
+, forceBuildDrv, forceSystem, callPackage, platform, config, crossSystem
+, __overrides ? {} }:
 
 with args;
 
 rec {
+  # Allow callers to override elements of this attribute set.
+  inherit __overrides;
+
   hurdCross = forceBuildDrv(import ./hurd {
     inherit fetchgit stdenv autoconf libtool texinfo machHeaders
       mig glibcCross hurdPartedCross;

From 1663ca33447165932b3305c1e9a3ab0f8c353c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 4 Apr 2012 20:05:48 +0000
Subject: [PATCH 033/293] GNU: Use `overrides' instead of `__overrides' for the
 argument itself.

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

diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index 515218747f38..d46038c8ea5f 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -4,13 +4,13 @@ args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
 , texinfo, glibcCross, hurdPartedCross, libuuid, samba_light
 , gccCrossStageStatic, gccCrossStageFinal
 , forceBuildDrv, forceSystem, callPackage, platform, config, crossSystem
-, __overrides ? {} }:
+, overrides ? {} }:
 
 with args;
 
 rec {
   # Allow callers to override elements of this attribute set.
-  inherit __overrides;
+  __overrides = overrides;
 
   hurdCross = forceBuildDrv(import ./hurd {
     inherit fetchgit stdenv autoconf libtool texinfo machHeaders

From 3226d8b91db01e3a0cf3ae28671cb9b336c554e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 4 Apr 2012 20:25:51 +0000
Subject: [PATCH 034/293] GNU: Avoid `__overrides' altogether, by using a
 non-recursive attrset.

Thanks to Eelco for the suggestion.

svn path=/nixpkgs/trunk/; revision=33587
---
 pkgs/os-specific/gnu/default.nix | 180 ++++++++++++++++---------------
 pkgs/top-level/all-packages.nix  |   1 -
 2 files changed, 93 insertions(+), 88 deletions(-)

diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index d46038c8ea5f..19bdf8c0d343 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -3,96 +3,102 @@
 args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
 , texinfo, glibcCross, hurdPartedCross, libuuid, samba_light
 , gccCrossStageStatic, gccCrossStageFinal
-, forceBuildDrv, forceSystem, callPackage, platform, config, crossSystem
+, forceBuildDrv, forceSystem, newScope, platform, config, crossSystem
 , overrides ? {} }:
 
 with args;
 
-rec {
+let
+  callPackage = newScope gnu;
+
+  gnu = {
+    hurdCross = forceBuildDrv(import ./hurd {
+      inherit fetchgit stdenv autoconf libtool texinfo
+        glibcCross hurdPartedCross;
+      inherit (gnu) machHeaders mig;
+      libuuid = libuuid.hostDrv;
+      automake = automake111x;
+      headersOnly = false;
+      cross = assert crossSystem != null; crossSystem;
+      gccCross = gccCrossStageFinal;
+    });
+
+    hurdCrossIntermediate = forceBuildDrv(import ./hurd {
+      inherit fetchgit stdenv autoconf libtool texinfo glibcCross;
+      inherit (gnu) machHeaders mig;
+      automake = automake111x;
+      headersOnly = false;
+      cross = assert crossSystem != null; crossSystem;
+
+      # The "final" GCC needs glibc and the Hurd libraries (libpthread in
+      # particular) so we first need an intermediate Hurd built with the
+      # intermediate GCC.
+      gccCross = gccCrossStageStatic;
+
+      # This intermediate Hurd is only needed to build libpthread, which needs
+      # libihash, and to build Parted, which needs libstore and
+      # libshouldbeinlibc.
+      buildTarget = "libihash libstore libshouldbeinlibc";
+      installTarget = "libihash-install libstore-install libshouldbeinlibc-install";
+    });
+
+    hurdHeaders = callPackage ./hurd {
+      automake = automake111x;
+      headersOnly = true;
+      gccCross = null;
+      glibcCross = null;
+      libuuid = null;
+      hurdPartedCross = null;
+    };
+
+    libpthreadHeaders = callPackage ./libpthread {
+      headersOnly = true;
+      hurd = null;
+    };
+
+    libpthreadCross = forceBuildDrv(import ./libpthread {
+      inherit fetchgit stdenv autoconf automake libtool glibcCross;
+      inherit (gnu) machHeaders hurdHeaders;
+      hurd = gnu.hurdCrossIntermediate;
+      gccCross = gccCrossStageStatic;
+      cross = assert crossSystem != null; crossSystem;
+    });
+
+    # In theory GNU Mach doesn't have to be cross-compiled.  However, since it
+    # has to be built for i586 (it doesn't work on x86_64), one needs a cross
+    # compiler for that host.
+    mach = callPackage ./mach {
+      automake = automake111x;
+    };
+
+    machHeaders = callPackage ./mach {
+      automake = automake111x;
+      headersOnly = true;
+      mig = null;
+    };
+
+    mig = callPackage ./mig {
+      # Build natively, but force use of a 32-bit environment because we're
+      # targeting `i586-pc-gnu'.
+      stdenv = (forceSystem "i686-linux").stdenv;
+    };
+
+    # XXX: Use this one for its `.hostDrv'.  Using the one above from
+    # `x86_64-linux' leads to building a different cross-toolchain because of
+    # the `forceSystem'.
+    mig_raw = callPackage ./mig {};
+
+    smbfs = callPackage ./smbfs {
+      samba = samba_light;
+      hurd = hurdCross;
+    };
+
+    unionfs = callPackage ./unionfs {
+      hurd = hurdCross;
+    };
+  }
+
   # Allow callers to override elements of this attribute set.
-  __overrides = overrides;
+  // overrides;
 
-  hurdCross = forceBuildDrv(import ./hurd {
-    inherit fetchgit stdenv autoconf libtool texinfo machHeaders
-      mig glibcCross hurdPartedCross;
-    libuuid = libuuid.hostDrv;
-    automake = automake111x;
-    headersOnly = false;
-    cross = assert crossSystem != null; crossSystem;
-    gccCross = gccCrossStageFinal;
-  });
-
-  hurdCrossIntermediate = forceBuildDrv(import ./hurd {
-    inherit fetchgit stdenv autoconf libtool texinfo machHeaders
-      mig glibcCross;
-    automake = automake111x;
-    headersOnly = false;
-    cross = assert crossSystem != null; crossSystem;
-
-    # The "final" GCC needs glibc and the Hurd libraries (libpthread in
-    # particular) so we first need an intermediate Hurd built with the
-    # intermediate GCC.
-    gccCross = gccCrossStageStatic;
-
-    # This intermediate Hurd is only needed to build libpthread, which needs
-    # libihash, and to build Parted, which needs libstore and
-    # libshouldbeinlibc.
-    buildTarget = "libihash libstore libshouldbeinlibc";
-    installTarget = "libihash-install libstore-install libshouldbeinlibc-install";
-  });
-
-  hurdHeaders = callPackage ./hurd {
-    automake = automake111x;
-    headersOnly = true;
-    gccCross = null;
-    glibcCross = null;
-    libuuid = null;
-    hurdPartedCross = null;
-  };
-
-  libpthreadHeaders = callPackage ./libpthread {
-    headersOnly = true;
-    hurd = null;
-  };
-
-  libpthreadCross = forceBuildDrv(import ./libpthread {
-    inherit fetchgit stdenv autoconf automake libtool
-      machHeaders hurdHeaders glibcCross;
-    hurd = hurdCrossIntermediate;
-    gccCross = gccCrossStageStatic;
-    cross = assert crossSystem != null; crossSystem;
-  });
-
-  # In theory GNU Mach doesn't have to be cross-compiled.  However, since it
-  # has to be built for i586 (it doesn't work on x86_64), one needs a cross
-  # compiler for that host.
-  mach = callPackage ./mach {
-    automake = automake111x;
-  };
-
-  machHeaders = callPackage ./mach {
-    automake = automake111x;
-    headersOnly = true;
-    mig = null;
-  };
-
-  mig = callPackage ./mig {
-    # Build natively, but force use of a 32-bit environment because we're
-    # targeting `i586-pc-gnu'.
-    stdenv = (forceSystem "i686-linux").stdenv;
-  };
-
-  # XXX: Use this one for its `.hostDrv'.  Using the one above from
-  # `x86_64-linux' leads to building a different cross-toolchain because of
-  # the `forceSystem'.
-  mig_raw = callPackage ./mig {};
-
-  smbfs = callPackage ./smbfs {
-    samba = samba_light;
-    hurd = hurdCross;
-  };
-
-  unionfs = callPackage ./unionfs {
-    hurd = hurdCross;
-  };
-}
+in gnu # we trust!
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e795a5caa9cb..e6cc7a340660 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5447,7 +5447,6 @@ let
 
   # GNU/Hurd core packages.
   gnu = recurseIntoAttrs (callPackage ../os-specific/gnu {
-    callPackage = newScope pkgs.gnu;
     inherit platform crossSystem;
   });
 

From 36200a3ef3d9616f406c95e1d65d826767969173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 4 Apr 2012 21:09:04 +0000
Subject: [PATCH 035/293] hurdPartedCross: Use `.override' instead of
 reimporting.

svn path=/nixpkgs/trunk/; revision=33592
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6cc7a340660..2232ff56436e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1164,7 +1164,7 @@ let
 
   hurdPartedCross =
     if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-    then (callPackage ../tools/misc/parted {
+    then (parted.override {
         # Needs the Hurd's libstore.
         hurd = gnu.hurdCrossIntermediate;
 

From dd822c7ecec279604da0d83848b25f0162820934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 4 Apr 2012 21:24:09 +0000
Subject: [PATCH 036/293] GNU: Fix stale references.

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

diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index 19bdf8c0d343..67226c8a4788 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -90,11 +90,11 @@ let
 
     smbfs = callPackage ./smbfs {
       samba = samba_light;
-      hurd = hurdCross;
+      hurd = gnu.hurdCross;
     };
 
     unionfs = callPackage ./unionfs {
-      hurd = hurdCross;
+      hurd = gnu.hurdCross;
     };
   }
 

From 5d15ef0e7ce2c992630ec5338047a0b8db8508af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 4 Apr 2012 21:30:49 +0000
Subject: [PATCH 037/293] Updating vimprobable2 to 1.0.0

I took mainly the patch from Alexandr Foremny, but I had to solve conflicts.

Moreover it required the old webkit.


svn path=/nixpkgs/trunk/; revision=33596
---
 .../networking/browsers/vimprobable2/default.nix | 16 ++++++++--------
 pkgs/lib/maintainers.nix                         |  1 +
 pkgs/top-level/all-packages.nix                  |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index e4494f956562..071dcd371173 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit_gtk2, gtk, libX11, libsoup,
-glib_networking}:
+{ stdenv, fetchurl, makeWrapper, glib_networking, gtk, libsoup, libX11, perl,
+  pkgconfig, webkit }:
 
 stdenv.mkDerivation {
-  name = "vimprobable2-0.9.12.0";
+  name = "vimprobable2-1.0.0";
   src = fetchurl {
-    url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.12.0.tar.bz2";
-    sha256 = "1b6xs6rd4rxy9kdsva13bbx7pd2gy159ad8ncd4pplsqr46hw8fb";
+    url = "mirror://sourceforge/vimprobable/vimprobable2_1.0.0.tar.bz2";
+    sha256 = "1jlx8ssgk42vg1d70n0aa86lr5zixdkkagmcxjc4c7pjvh8vq3gn";
   };
-  buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit_gtk2 gtk ];
+  buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
   installPhase = ''
     make PREFIX=/ DESTDIR=$out install
     wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \
@@ -28,8 +28,8 @@ stdenv.mkDerivation {
       being completely featureless. 
     '';
     homepage = "http://sourceforge.net/apps/trac/vimprobable";
-    license = "MIT";
-    maintainers = ["Alexander Foremny <alexanderforemny@googlemail.com>"];
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.aforemny ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 006429be6fab..dcfc47a456ad 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -4,6 +4,7 @@
   /* Add your name and email address here.  Keep the list
      alphabetically sorted.  */
 
+  aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2232ff56436e..e97db624e945 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8608,6 +8608,7 @@ let
 
   vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
     inherit (gnome) libsoup;
+    webkit = webkit_gtk2;
   };
 
   vimprobable2Wrapper = wrapFirefox

From 4df1d122c45606be2dde869e431e4489f91487c6 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 4 Apr 2012 22:07:31 +0000
Subject: [PATCH 038/293] Bumped revision of DisnixOS

svn path=/nixpkgs/trunk/; revision=33598
---
 pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 10f5168ba9d6..93cd2f3f846d 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, disnix, socat, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2pre33556";
+  name = "disnixos-0.2pre33586";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/2363206/download/3/disnixos-0.2pre33556.tar.gz;
-    sha256 = "0fq96cqd0hfa6cwz7phq7ccm935hlcwmjd59vfsp6bwp0wyjzpzl";
+    url = http://hydra.nixos.org/build/2368187/download/3/disnixos-0.2pre33586.tar.gz;
+    sha256 = "110vn4390447dws343py8ss6s8jizx8yg7yl38i64nlqh0bcn4ny";
   };
   
   buildInputs = [ socat pkgconfig disnix ];

From a78b508f8eacac232183351ff78ab1cf062c183e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Apr 2012 22:59:16 +0000
Subject: [PATCH 039/293] * Latest nixUnstable.

svn path=/nixpkgs/trunk/; revision=33599
---
 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 edce730d73b8..a9039734fbb5 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre2632_b8fb0ce";
+  name = "nix-1.0pre2635_3b859ea";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/2337744/download/4/${name}.tar.bz2";
-    sha256 = "5f965a54ac4ef949b1531d21c3bc1c920552ea3103a39669a3b8a4f3187bd6da";
+    url = "http://hydra.nixos.org/build/2368213/download/4/${name}.tar.bz2";
+    sha256 = "32ce8c3816e4d073d6af27d13fc5c1069aade994ddee7775bc53489ecd3efa12";
   };
 
   buildNativeInputs = [ perl pkgconfig ];

From 6bc87a1ac8c92de8b3b5c45f7ee951facd714124 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 5 Apr 2012 04:46:11 +0000
Subject: [PATCH 040/293] Add packages to GAP

svn path=/nixpkgs/trunk/; revision=33601
---
 pkgs/applications/science/math/gap/default.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix
index 50457ff0353b..f76640567f60 100644
--- a/pkgs/applications/science/math/gap/default.nix
+++ b/pkgs/applications/science/math/gap/default.nix
@@ -1,5 +1,5 @@
 x@{builderDefsPackage
-  
+  , pari ? null 
   , ...}:
 builderDefsPackage
 (a :  
@@ -15,6 +15,9 @@ let
     name="${baseName}-${version}";
     url="ftp://ftp.gap-system.org/pub/gap/gap4/tar.gz/${baseName}${version}.tar.gz";
     hash="0flap5lbkvpms3zznq1zwxyxyj0ax3fk7m24f3bvhvr37vyxnf40";
+    pkgVer="2012_01_12-10_47_UTC";
+    pkgURL="ftp://ftp.gap-system.org/pub/gap/gap4/tar.bz2/packages-${pkgVer}.tar.bz2";
+    pkgHash="0z9ncy1m5gvv4llkclxd1vpcgpb0b81a2pfmnhzvw8x708frhmnb";
   };
 in
 rec {
@@ -23,6 +26,11 @@ rec {
     sha256 = sourceInfo.hash;
   };
 
+  pkgSrc = a.fetchurl {
+    url=sourceInfo.pkgURL;
+    sha256=sourceInfo.pkgHash;
+  };
+
   inherit (sourceInfo) name version;
   inherit buildInputs;
 
@@ -34,6 +42,11 @@ rec {
 
     cp -r . "$out/share/gap/build-dir"
 
+    tar xf "${pkgSrc}" -C "$out/share/gap/build-dir/pkg"
+
+    ${if a.pari != null then 
+      ''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" '' 
+    else ""}
     sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" 
 
     ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin"
@@ -47,7 +60,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "GPLv2+";
+    license = "GPLv2";
     homepage = "http://gap-system.org/";
   };
 }) x

From 407d3173adad10e76f1b76956340597ffa86d9e9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 5 Apr 2012 08:05:09 +0000
Subject: [PATCH 041/293] Fixing SuiteSparce build

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

diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix
index d1611cda623a..282195e55f47 100644
--- a/pkgs/development/libraries/suitesparse/default.nix
+++ b/pkgs/development/libraries/suitesparse/default.nix
@@ -1,15 +1,11 @@
-{ stdenv
-, fetchurl
-, blas
-, liblapack
-}:
+{ stdenv, fetchurl, blas, liblapack, gfortran } :
 stdenv.mkDerivation {
   name = "suitespare";
   src = fetchurl {
     url = http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-3.5.0.tar.gz ;
     sha256 = "0npn7c1j5qag5m2r0cmh3bwc42c1jk8k2yg2cfyxlcrp0h7wn4rc";  			
   };
-  buildInputs = [blas liblapack] ;
+  buildInputs = [blas liblapack gfortran] ;
   patches = [./disable-metis.patch];
 
   preConfigure = ''

From f5fbd16058910ef02c6f50a3984c7ed3d6402abf Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 5 Apr 2012 08:22:35 +0000
Subject: [PATCH 042/293] portaudio: upgraded to current stable version (svn as
 well)

svn path=/nixpkgs/trunk/; revision=33604
---
 pkgs/development/libraries/portaudio/default.nix  | 8 ++++----
 pkgs/development/libraries/portaudio/svn-head.nix | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 5941c55ee557..89361bf31216 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "portaudio-19-20071207";
-	
+  name = "portaudio-19-20111121";
+  
   src = fetchurl {
-    url = http://www.portaudio.com/archives/pa_stable_v19_20071207.tar.gz;
-    sha256 = "0axz8xzkb6ynzj65p6cv6b0cl5csxsdfvqkd0dljlf3dslkpg886";
+    url = http://www.portaudio.com/archives/pa_stable_v19_20111121.tgz;
+    sha256 = "168vmcag3c5y3zwf7h5298ydh83g72q5bznskrw9cr2h1lrx29lw";
   };
 
   buildInputs = [ alsaLib pkgconfig ];
diff --git a/pkgs/development/libraries/portaudio/svn-head.nix b/pkgs/development/libraries/portaudio/svn-head.nix
index ca536530f1c2..12b8257084b8 100644
--- a/pkgs/development/libraries/portaudio/svn-head.nix
+++ b/pkgs/development/libraries/portaudio/svn-head.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchsvn, alsaLib, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  revision = "1564";
+  revision = "1788";
   name = "portaudio-svn-r${revision}";
-	
+
   src = fetchsvn {
-    url = "https://www.portaudio.com/repos/portaudio/trunk";
+    url = "https://subversion.assembla.com/svn/portaudio/portaudio/trunk";
     rev = revision;
     sha256 = "0vhiy4lkmv0flhvkbbra71z5cfr3gbh27bbfcqqdc939b4z35lsi";
   };
 
   buildInputs = [ alsaLib pkgconfig ];
-  
+
   meta = {
     description = "Portable cross-platform Audio API";
     homepage = http://www.portaudio.com/;

From a6c996735c3fa1cbb3010966639fe9014f7ea824 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 5 Apr 2012 08:22:38 +0000
Subject: [PATCH 043/293] audacity: upgraded to 2.0.0

I took out some dependencies and compile flags that didn't seem
needed. If this breaks something please give a shout.

svn path=/nixpkgs/trunk/; revision=33605
---
 pkgs/applications/audio/audacity/default.nix | 16 +++++-----------
 pkgs/top-level/all-packages.nix              |  5 +----
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index f2e2a130c0ac..72b58b5b33e5 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -4,21 +4,15 @@
   }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.13";
+  version = "2.0.0";
   name = "audacity-${version}";
 
-  NIX_CFLAGS_COMPILE = "-fPIC -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0 -lz";
-
   src = fetchurl {
-    url = "mirror://sourceforge/audacity/audacity-minsrc-${version}-beta.tar.bz2";
-    sha256 = "4c2eda638e16e16dfddd202e86ccbe1d170b04c26cfb2c12ffcba0b79e7e1e83";
+    url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.bz2";
+    sha256 = "0spbib3f86b4qri0g13idyxvysg28hkpsglmjza681zrln62hjfq";
   };
-  buildInputs = [ wxGTK pkgconfig gettext gtk glib zlib intltool perl 
-    libogg libvorbis libmad alsaLib libsndfile libsamplerate flac lame
-    expat id3lib ffmpeg portaudio];
-
-  configureFlags = [
-  ];
+  buildInputs = [ pkgconfig wxGTK libsndfile expat alsaLib libsamplerate
+                  libvorbis libmad flac id3lib ffmpeg gettext ];
 
   dontDisableStatic = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e97db624e945..81f49bf27043 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6329,10 +6329,7 @@ let
 
   audacious = callPackage ../applications/audio/audacious { };
 
-  audacity = callPackage ../applications/audio/audacity {
-    portaudio = portaudioSVN;
-    ffmpeg = ffmpeg_0_6_90;
-  };
+  audacity = callPackage ../applications/audio/audacity { };
 
   aumix = callPackage ../applications/audio/aumix {
     gtkGUI = false;

From c742116695fb20d9a868e55ed1d37c6f3287b530 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 5 Apr 2012 08:22:42 +0000
Subject: [PATCH 044/293] haskell reactive banana

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

diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
new file mode 100644
index 000000000000..051a3800f695
--- /dev/null
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -0,0 +1,19 @@
+{ cabal, fclabels, hashable, QuickCheck, transformers
+, unorderedContainers, vault
+}:
+
+cabal.mkDerivation (self: {
+  pname = "reactive-banana";
+  version = "0.5.0.0";
+  sha256 = "1dabyzdkc8imm397cj7i18r3784233a45jlli3y6ch8zg2kl1iri";
+  buildDepends = [
+    fclabels hashable QuickCheck transformers unorderedContainers vault
+  ];
+  meta = {
+    homepage = "http://haskell.org/haskellwiki/Reactive-banana";
+    description = "Practical library for functional reactive programming (FRP)";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bluescreen303 ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5830d9d150ad..6e02c61bc7a7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1164,6 +1164,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   rvar = callPackage ../development/libraries/haskell/rvar {};
 
+  reactiveBanana = callPackage ../development/libraries/haskell/reactive-banana {};
+
   readline = callPackage ../development/libraries/haskell/readline {
     inherit (pkgs) readline;
   };

From 8c23da31e61ddd7dd01cdc873fa646bf8140e688 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 5 Apr 2012 08:58:47 +0000
Subject: [PATCH 045/293] Fix typo

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

diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix
index 282195e55f47..b3fe6db059ac 100644
--- a/pkgs/development/libraries/suitesparse/default.nix
+++ b/pkgs/development/libraries/suitesparse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, blas, liblapack, gfortran } :
 stdenv.mkDerivation {
-  name = "suitespare";
+  name = "suitesparse";
   src = fetchurl {
     url = http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-3.5.0.tar.gz ;
     sha256 = "0npn7c1j5qag5m2r0cmh3bwc42c1jk8k2yg2cfyxlcrp0h7wn4rc";  			

From 8fb94bace56664773604c78ae0ce1bbad32834c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Apr 2012 09:12:38 +0000
Subject: [PATCH 046/293] * Remove some obsolete kernel.org mirrors.

svn path=/nixpkgs/trunk/; revision=33609
---
 pkgs/build-support/fetchurl/mirrors.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index cd52c1ce17cd..9268bd6857ae 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -96,8 +96,6 @@ rec {
   # kernel.org's /pub (/pub/{linux,software}) tree.
   kernel = [
     http://www.all.kernel.org/pub/
-    http://www.eu.kernel.org/pub/
-    http://www.de.kernel.org/pub/
     http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/
     http://linux-kernel.uio.no/pub/
     http://kernel.osuosl.org/pub/

From 78d9ee096aa5824b8ba192d6dc8d6519b94752f2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 5 Apr 2012 10:45:53 +0000
Subject: [PATCH 047/293] Bumped revision of disnix

svn path=/nixpkgs/trunk/; revision=33610
---
 pkgs/tools/package-management/disnix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

From 2f97078c96c36dd041690c65a74a6ebc482f2c37 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 5 Apr 2012 12:18:08 +0000
Subject: [PATCH 048/293] Support shared library build

svn path=/nixpkgs/trunk/; revision=33612
---
 pkgs/development/libraries/science/math/atlas/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 74d206210898..6382ec413e2f 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true }:
+{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false }:
 
 let
   optionalString = stdenv.lib.optionalString;
@@ -25,7 +25,9 @@ stdenv.mkDerivation {
   #   machine in the first place.
   configureFlags = "-Fa alg -fPIC"
     + optionalString stdenv.isi686 " -b 32"
-    + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0";
+    + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0"
+    + optionalString shared " --shared "
+    ;
 
   buildInputs = [ gfortran ];
 

From 3c69bcf348e1c6f13e79241ce54dad47d8533bdd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 5 Apr 2012 12:18:56 +0000
Subject: [PATCH 049/293] Support shared library build; tests do not currently
 work for shared build.

svn path=/nixpkgs/trunk/; revision=33613
---
 .../science/math/liblapack/default.nix        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 28bfa4df8019..e2b43b6b0531 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -1,5 +1,8 @@
-{ stdenv, fetchurl, gfortran, atlas, cmake, python }:
-
+{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }:
+let 
+  atlasMaybeShared = if shared then atlas.override {shared=true;} else atlas;
+  usedLibExtension = if shared then ".so" else ".a";
+in
 stdenv.mkDerivation {
   name = "liblapack-3.4.0";
   src = fetchurl {
@@ -7,18 +10,20 @@ stdenv.mkDerivation {
     sha256 = "1sf30v1ps5icg67dvw5sbx5yhypx13am470gqg2f7l04f3wrw4x7";
   };
 
-  propagatedBuildInputs = [ atlas ];
+  propagatedBuildInputs = [ atlasMaybeShared ];
   buildInputs = [ gfortran cmake ];
   buildNativeInputs = [ python ];
 
   cmakeFlags = [
     "-DUSE_OPTIMIZED_BLAS=ON"
-    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlas}/lib/libf77blas.a"
-    "-DBLAS_ATLAS_atlas_LIBRARY=${atlas}/lib/libatlas.a"
+    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
+    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
     "-DCMAKE_Fortran_FLAGS=-fPIC"
-  ];
+  ]
+  ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON")
+  ;
 
-  doCheck = true;
+  doCheck = ! shared;
 
   checkPhase = "
     sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py

From 12e1751e93fb16995077c0210ffd7674745fe2d8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 5 Apr 2012 12:22:55 +0000
Subject: [PATCH 050/293] Adding Julia programming language

svn path=/nixpkgs/trunk/; revision=33614
---
 pkgs/development/compilers/julia/default.nix | 92 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 94 insertions(+)
 create mode 100644 pkgs/development/compilers/julia/default.nix

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
new file mode 100644
index 000000000000..4ab42562e740
--- /dev/null
+++ b/pkgs/development/compilers/julia/default.nix
@@ -0,0 +1,92 @@
+{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, blas, liblapack
+ , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
+ , ncurses
+ } :
+let
+  liblapackShared = liblapack.override{shared=true;};
+in
+stdenv.mkDerivation rec {
+  pname = "julia";
+  date = "20120405";
+  name = "${pname}-git-${date}";
+
+  grisu_ver = "1.1";
+  dsfmt_ver = "2.1";
+  arpack_ver = "3.0.2";
+  clp_ver = "1.14.5";
+  lighttpd_ver = "1.4.29";
+
+  grisu_src = fetchurl {
+    url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
+    sha256 = "addee31d11350e4dde2b19c749eda648cb0ab38a68b0dd0d0a45dc49c7346fe7";
+  };
+  dsfmt_src = fetchurl {
+    url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
+    name = "dsfmt-${dsfmt_ver}.tar.gz";
+    sha256 = "e9d3e04bc984ec3b14033342f5ebdcd5202d8d8e40128dd737f566945612378f";
+  };
+  arpack_src = fetchurl {
+    url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/353/get/";
+    name = "arpack-ng-${arpack_ver}.tar.gz";
+    sha256 = "4add769386e0f6b0484491bcff129c6f5234190dbf58e07cc068fbd5dc7278bf";
+  };
+  clp_src = fetchurl {
+    url = "http://www.coin-or.org/download/source/Clp/Clp-${clp_ver}.tgz";
+    name = "clp-${clp_ver}.tar.gz";
+    sha256 = "e6cabe8b4319c17a9bbe6fe172194ab6cd1fe6e376f5e9969d3040636ea3a817";
+  };
+  lighttpd_src = fetchurl {
+    url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz";
+    sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85";
+  };
+
+  src = fetchgit {
+    url = "git://github.com/JuliaLang/julia.git";
+    rev = "a6324519931e874d3691be258af7f81e4e4826e4";
+    sha256 = "897019f1dc5c4ce7d1e5c607c1f9cb6efe0e6fb74184fdd921ab239c3adaed6d";
+  };
+
+  buildInputs = [ gfortran perl m4 gmp pcre llvm blas liblapackShared readline 
+    fftw fftwSinglePrec libunwind suitesparse glpk ncurses
+    ];
+
+  configurePhase = ''
+    for i in GMP LLVM PCRE BLAS LAPACK READLINE FFTW LIBUNWIND SUITESPARSE GLPK; 
+    do 
+      sed -e "s@USE_SYSTEM_$i=0@USE_SYSTEM_$i=1@" -i Make.inc; 
+    done
+    sed -e 's@-lcurses@@g' -i Make.inc
+
+    copy_kill_hash(){
+      cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
+    }
+
+    for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${lighttpd_src}" ; do
+      copy_kill_hash "$i" external
+    done
+    copy_kill_hash "${dsfmt_src}" external/random
+
+    sed -e '/cd SuiteSparse-SYSTEM/,+1s@find /lib /usr/lib /usr/local/lib@find ${suitesparse}/lib@' -i external/Makefile
+
+    export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.gcc.gcc}/lib -L${stdenv.gcc.gcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk "
+
+    sed -e 's@ cpp @ gcc -E @g' -i base/Makefile
+  '';
+
+  preInstall = ''
+    export makeFlags="$makeFlags PREFIX=\"$out\""
+  '';
+
+  postInstall = ''
+    mkdir -p "$out/bin"
+    ln -s "$out/share/julia/julia" "$out/bin"
+  '';
+
+  meta = {
+    description = "High-level performance-oriented dynamical language for technical computing.";
+    homepage = "http://julialang.org/";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81f49bf27043..2334875819f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2361,6 +2361,8 @@ let
 
   jikes = callPackage ../development/compilers/jikes { };
 
+  julia = callPackage ../development/compilers/julia { };
+
   lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) {
     inherit makeWrapper gtk glib pango atk gdk_pixbuf;
     inherit (xlibs) libXi inputproto libX11 xproto libXext xextproto;

From 7d2b8fe48f5c0ffbe472e59acbc51c849a9826f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Apr 2012 12:24:08 +0000
Subject: [PATCH 051/293] * Upstart 1.5.

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

diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix
index d8a6d7335ab2..6ad255caef45 100644
--- a/pkgs/os-specific/linux/upstart/default.nix
+++ b/pkgs/os-specific/linux/upstart/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, dbus, libnih }:
 
-let version = "1.4"; in
+let version = "1.5"; in
 
 stdenv.mkDerivation rec {
   name = "upstart-${version}";
   
   src = fetchurl {
     url = "http://upstart.ubuntu.com/download/${version}/${name}.tar.gz";
-    md5 = "3aa9ddf8459b56547a6238aa77c61815";
+    md5 = "870920a75f8c13f3a3af4c35916805ac";
   };
 
   buildInputs = [ pkgconfig dbus libnih ];

From 9a1080d7eac1df11c12e1332e31ac4329e55f0be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Apr 2012 12:26:13 +0000
Subject: [PATCH 052/293] * Enable NUMA.  On our 48-core machines this cut the
 duration of a   kernel build from 12m27s to 4m42s.

svn path=/nixpkgs/trunk/; revision=33616
---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 10 ++++++----
 pkgs/os-specific/linux/kernel/linux-3.3.nix |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index c5d7dedb1118..59df5962744f 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -37,10 +37,12 @@ let
       IOSCHED_CFQ y
       BLK_CGROUP y # required by CFQ
 
+      # Enable NUMA.
+      NUMA? y
+
       # Disable some expensive (?) features.
       FTRACE n
       KPROBES n
-      NUMA? n
       PM_TRACE_RTC n
 
       # Enable various subsystems.
@@ -226,7 +228,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.2.11";
+    version = "3.2.14";
     testing = false;
 
     modDirVersion = version;
@@ -236,8 +238,8 @@ import ./generic.nix (
     '';
 
     src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2";
-      sha256 = "1hacfmf08ydzf4xlg6wkkckl5icj7w9h3nh17myz1s67bp7q61qs";
+      url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz";
+      sha256 = "032bv24wsab4c589svlq5ip8dcc4vihjcynq3ka18fgvxih251fm";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix
index 0ac2665c9a6a..fb7342defa91 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix
@@ -37,10 +37,12 @@ let
       IOSCHED_CFQ y
       BLK_CGROUP y # required by CFQ
 
+      # Enable NUMA.
+      NUMA? y
+
       # Disable some expensive (?) features.
       FTRACE n
       KPROBES n
-      NUMA? n
       PM_TRACE_RTC n
 
       # Enable various subsystems.
@@ -227,8 +229,6 @@ import ./generic.nix (
   rec {
     version = "3.3.1";
 
-    testing = false;
-
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
     '';

From 8e160830c11c7f29e35ae60282950a8daa9b99d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Apr 2012 13:09:30 +0000
Subject: [PATCH 053/293] * Doh.

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix
index fb7342defa91..83b29fba85e8 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix
@@ -228,6 +228,7 @@ import ./generic.nix (
 
   rec {
     version = "3.3.1";
+    testing = false;
 
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""

From e1743e57be209e43bdf1e748f24fde41eb019bbd Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Apr 2012 13:50:34 +0000
Subject: [PATCH 054/293] qt-4.8.1, kde-4.8.2

svn path=/nixpkgs/trunk/; revision=33621
---
 pkgs/desktops/kde-4.8/default.nix             |   2 +-
 .../files/kde-base-artwork-nokde.patch        |  13 -
 pkgs/desktops/kde-4.8/kde-base-artwork.nix    |  17 -
 pkgs/desktops/kde-4.8/kde-package/4.8.1.nix   | 301 ------------------
 pkgs/desktops/kde-4.8/kde-package/4.8.2.nix   | 299 +++++++++++++++++
 pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix | 277 ----------------
 pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix | 277 ++++++++++++++++
 .../libraries/qt-4.x/4.8/4.8.1.nix            | 112 -------
 .../libraries/qt-4.x/4.8/default.nix          |   4 +-
 pkgs/top-level/all-packages.nix               |   5 -
 10 files changed, 579 insertions(+), 728 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kde-base-artwork.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kde-package/4.8.1.nix
 create mode 100644 pkgs/desktops/kde-4.8/kde-package/4.8.2.nix
 delete mode 100644 pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix
 create mode 100644 pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix
 delete mode 100644 pkgs/development/libraries/qt-4.x/4.8/4.8.1.nix

diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix
index 6404173bb12d..a358bff25d1b 100644
--- a/pkgs/desktops/kde-4.8/default.nix
+++ b/pkgs/desktops/kde-4.8/default.nix
@@ -1,7 +1,7 @@
 { callPackage, callPackageOrig, stdenv, qt48 }:
 
 let
-  release = "4.8.1";
+  release = "4.8.2";
 
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
diff --git a/pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch b/pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch
deleted file mode 100644
index a7bdeacf9f5f..000000000000
--- a/pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 04d2142..294b9a8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,6 @@
--find_package(KDE4 REQUIRED)
--include(KDE4Defaults)
-+if(NOT DATA_INSTALL_DIR)
-+  find_package(KDE4 REQUIRED)
-+  include(KDE4Defaults)
-+endif()
- 
- add_subdirectory( ksplashx-themes )
diff --git a/pkgs/desktops/kde-4.8/kde-base-artwork.nix b/pkgs/desktops/kde-4.8/kde-base-artwork.nix
deleted file mode 100644
index 3a582c354892..000000000000
--- a/pkgs/desktops/kde-4.8/kde-base-artwork.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  buildNativeInputs = [ cmake ];
-
-  patches = [ ./files/kde-base-artwork-nokde.patch ];
-
-  cmakeFlags = "-DDATA_INSTALL_DIR=share";
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "2ab8942ba6813c21859077faa2c9fea88ec9a2d7af73bb5911cc4edbe1a04a04";
-
-  meta = {
-    description = "KDE KSplashx themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kde-package/4.8.1.nix b/pkgs/desktops/kde-4.8/kde-package/4.8.1.nix
deleted file mode 100644
index 42dadd9e434d..000000000000
--- a/pkgs/desktops/kde-4.8/kde-package/4.8.1.nix
+++ /dev/null
@@ -1,301 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="analitza";value="0hz8bryfxbf0ri0572drf79v582pjbhyag076nr7k80cbsvgcb95";}
-  {name="ark";value="1l5jrhj303fcbn34zpgcczajaknrj3ynqqw1kfsdz2jzan7pi620";}
-  {name="blinken";value="04dk6kdigmbaysi3q5f6qgy1aqigflf465np5waav9ydm6yfx9xr";}
-  {name="cantor";value="0gz338d5vi89i9c6r8lcrkvm3a0fi7kjfp5ql530p70rmyj0h4g5";}
-  {name="filelight";value="0fqxpx7zm6x601ph1n46mamwpgiffbkv5vqyy06z5cb6hbhip3g5";}
-  {name="gwenview";value="0f1knjmg2k5g0nikz4jxhf5d8ipp6qc6aw34yi0zanyg3h3jicql";}
-  {name="jovie";value="116yr8hhc18fl176lv8pqz1qjah7rlzavx7kcxq6ghvmaiv0yfxr";}
-  {name="kaccessible";value="167x5cmzspsriim8162lf361xs3g9ancfy88arwlvp5kwrs61ply";}
-  {name="kactivities";value="04sz2rjs15p2yhi9wchdkiclcc4pgd3bpsi20kcnnn5jwx2rvgim";}
-  {name="kalgebra";value="11fisig1zay8kb2i4sr4sba7889np3qbg46l823a89v7rwm6qc32";}
-  {name="kalzium";value="0n63s85y3ddr93wiyhhrfg3h2nv68f7rzfxdd200y0gjrkfb1yxs";}
-  {name="kamera";value="1fv1zr5zfs68yd09lg2gapha9cjh7lljvyrrcmhyn7yjkz2kn7r0";}
-  {name="kanagram";value="00h9ljx518sp950wc8h40c2qn1xh3499isy8hm1danal1y3m3n2v";}
-  {name="kate";value="0d35mydj6fzzjzk2qm6amlpb6hdg46cf1iqp52fj7d3i7vhwvzz7";}
-  {name="kbruch";value="1d9n2pbimkq56a0sc1khh8zvnaf84c1r9s96qs71nv93ka3248qw";}
-  {name="kcalc";value="11bailcjvlx7ggjj7jahh3l1p85w7s3wp1001cchm36qdmisbhyg";}
-  {name="kcharselect";value="10fzkh142b7k5rvar200zzpds6pgjbz3rapa7l8hcxpcgb9fxqvf";}
-  {name="kcolorchooser";value="04h8g2g47780jcrbnwdjivgkxb6sabqr2hr57dlycw7lsmxfj2v3";}
-  {name="kdeadmin";value="11fndxajknxwsshrmxa4hsbx8ycysbcq8kc4p0zqq508s9z0p4wf";}
-  {name="kdeartwork";value="0g3s1cn9w0mkrcwg8f6qc3v8iy3qxf1mkj8jaqdh98c7k8q906m9";}
-  {name="kde-baseapps";value="0gdfiw6bjhijvp8jf5ny8979km0fabjs6jp8fqdqnb0ybc6yi3sh";}
-  {name="kde-base-artwork";value="0qd1yc1g8wzi01hmrwfbyp80drk42k3h5g46hzk3y81pb3gg5490";}
-  {name="kdegames";value="0jbvr9baspdh7z9gxjhbz316097c99wkvhiniwx8wfbrj3nfsvkx";}
-  {name="kdegraphics-mobipocket";value="03gx1y9xdrc5imbc5hb3r17i693vgfcix4slm8i7xs7fz3f9x6jx";}
-  {name="kdegraphics-strigi-analyzer";value="0g674b0ba0bmgnaq8qspasbw40r7i60s0n27imh3f46isj34w0d2";}
-  {name="kdegraphics-thumbnailers";value="01a79779hjv19q3fxmwr05flcz75fpmivjysv3bj32jz72f4fk79";}
-  {name="kdelibs";value="1v2zkj76bf62fl3ykzx6r24c37amf2a8v1qrvhi2ibq7g7nfnasa";}
-  {name="kdemultimedia";value="0656135yq3d9j9hc974bm6zqszcq3prllhk7dfxd9wxkyf1jbifq";}
-  {name="kdenetwork";value="00f9284y2rb0b0f8j9a17kn8i1k7zdm8nypxf6hg51zphn91hnib";}
-  {name="kdepim";value="0fvvnab971k2a9gaavf17k7hvvz4n6dyrx9q0w9af821pf77asbm";}
-  {name="kdepimlibs";value="1jzw9ad5bzhcpfjgmqfzk8hjj8g6ivm7y31psckhgcasni7lv4hx";}
-  {name="kdepim-runtime";value="1k0hnmg73i02f5pddpva47mnfnnl9ydsdycnb4kaslyv8lzb7p19";}
-  {name="kdeplasma-addons";value="178y3h8j1nn0j421rp49b9q7jphhhrqd37y4jcisx37lky8dgdmb";}
-  {name="kde-runtime";value="06y5g7vfwdfin6xyia0j5flk5bbwa82ki3lnaz9zz4sz0x8swb8z";}
-  {name="kdesdk";value="1q4rcm7zagam44dr07mjr08drmncfk1w50kia159kgsx74n0rsqp";}
-  {name="kdetoys";value="0i49zvq2h2md4xmbzbw9s23yd3y7vmbp6y7b121j1pv9v8jkpa8c";}
-  {name="kde-wallpapers";value="131j2217c50addi02qldyx83y8afxwqaazldmvbfbk5ampkszkwr";}
-  {name="kdewebdev";value="1yjibwk4nihrwzbcz8bmylx0paprklgxkky9iy86pp20a4ndzy2x";}
-  {name="kde-workspace";value="1czlxxnldarp45yl2n5yin298rs8zdwjl9bzm55l5x27xaw5zlfq";}
-  {name="kdf";value="1gs57qnrhnxq8xbypn9dp8rpk9xz1rv29d4l0n23fbnhfw42fzw9";}
-  {name="kfloppy";value="09v7zv0s93qmir3vlkh4vf45v11k92jd6cv6j14hmgx3lpr289yj";}
-  {name="kgamma";value="169d2rjk45zr1a58fnn81myydzj1pjxjfglk3lyd9g21mwka8nng";}
-  {name="kgeography";value="087cz0wm2pfrh803kc8a0hh6nhk82w42fchpll0bv953adqi2dww";}
-  {name="kgpg";value="1mghmnjpy8jzzp43bg6z1nqlyir22wsa2nz7bpzigc1zv7i85pf9";}
-  {name="khangman";value="11m1s9rzlvg5p7wzy1zlgm3f743k4m7jfwv08g82mk3k9dcqnbq7";}
-  {name="kig";value="1kd042d7v56daxjwvvi026kh3bi7p8prxf5a3rpdmnbr2awd8qb6";}
-  {name="kimono";value="00vif9dmlp1lmv3fyjacd4jp8w84kq3fxsmsv72fbvxs66pa3a9y";}
-  {name="kiten";value="0xl1pqb5la2cnpi39npyal65yrqf87nqkxcbxli4ynw37k1x95pm";}
-  {name="klettres";value="0g1wryfhbaphmhkj3nisfgadray1nnrn3m1fd5rq774rhk7rnlfr";}
-  {name="kmag";value="12cfx5mj22lwbqnmd8sbjyfxxmgnql4q2hmgj4hx7izfl91zw4fb";}
-  {name="kmousetool";value="0ynr2zdxmisvs1jancisc0a2djap345b2bhp8dpssx48pxbf72r0";}
-  {name="kmouth";value="06wnsgrirdnk9h2vdxhfkcvf950hhryzg8qmwpm4pg53gsqfm3sb";}
-  {name="kmplot";value="0yr7mgcbr54djk521g5mxj87slps41473rfmf8hv0rbymnv5qfmf";}
-  {name="kolourpaint";value="148sp5bzkrlaq6mnh4996zm52m0jncbrldd93qkpbms1b0qpx0fk";}
-  {name="konsole";value="1lcj9bbfmyw2bv9cvhfsv9fk3szgvd2kmmrxsf3r1hcb6a1x3ab5";}
-  {name="korundum";value="0dfkl5wya041yrq9zhbrfklzlc41kp19icn34bjsgin4gfw2bds1";}
-  {name="kremotecontrol";value="05pzq3n5a75ccdznrw93ic0gadh24r9bjl9cdz8caj1skhyyzqcg";}
-  {name="kross-interpreters";value="1ix67rcyxqyaacfkmx3nccy2pyirsx0ykc4lycjhv5d7zlc2682c";}
-  {name="kruler";value="1k73wm2lca3p9x504il73sk5k21fm8f57m5a8d46cp5xh3hcyz54";}
-  {name="ksaneplugin";value="1zwmzl4bqmjnvbapcdy60avydgbidrhr87q4cb79wbqbif8g3941";}
-  {name="ksecrets";value="1b4ld8snnw42yg54sndlrv9j1rjryxlsbx6pdjwsrg35x4cf3l8x";}
-  {name="ksnapshot";value="1c64igffxz9lgl6izqxi9j5ahpcl34gm06i5bz42mwgwffsyqdkk";}
-  {name="kstars";value="0ids1mpscvrcdjjns6pvishr16ack160q6bp628sw53gx6f0cf3i";}
-  {name="ktimer";value="0zqwnjpql6qan6z2dlb9y3irs3785cnav6zcpnxrgi0i5n0v4kyx";}
-  {name="ktouch";value="0r050awybjz5cjcjy8ivj0h8f95m1mqqcrvpg0gk07fphs68i2na";}
-  {name="kturtle";value="0bdyyf0dfwmqc42d7xx82bkaygj2znzxbidwfza1w9lzizsmmkqv";}
-  {name="kwallet";value="1jpxalr8k2mydias4xgifacswy8f6ma4dcf2kpx49sq7hlnx4rdi";}
-  {name="kwordquiz";value="1zi6pkn55cf62f8bmhfdxpykxk2hcl5bc9zqcp2gcapg5ap58gj8";}
-  {name="libkdcraw";value="0imyxfppk75zf97p8y7mnzx40vg7wbdqf6qlp1m9yraz4ply9bf1";}
-  {name="libkdeedu";value="19x0hajs82kimm8i80vxdzz5xkdhhv2vjnv1anx1nkb9fpgmz22y";}
-  {name="libkexiv2";value="020k8lbh4ad67ybfj5hvbpb0qp6kcwq4yb63as2hgvpvajny0rzr";}
-  {name="libkipi";value="040wsm35sbbfkdp9yak496w6h2wc3mswab17240c3xl7mbfx405h";}
-  {name="libksane";value="15cf360jxd27098g7rx7g2rnd3ffpbrj8flkn1913ibccbc44kvn";}
-  {name="marble";value="0kpln6nhyv6vvy2x64lr4dmf7scvq4k8i6f60flyrc0vll51w0xv";}
-  {name="okular";value="0jgg6ar1b9zahh1cgkz0yksxq55vjyflp8xc6m9fy0diw4cjhi2i";}
-  {name="oxygen-icons";value="045fh2609fyn8q22r0w14xa3b0ji9k1xkhh2yb25nnjyh3b10a8w";}
-  {name="parley";value="00ab2xvmlxzn4rdbnp56yf3jsx02rjxf9f6m4516sb5dgf0gmsvq";}
-  {name="perlkde";value="138hq7njf9394564addslwy1zibmy7pnsj3ckzwhacab4497pyj4";}
-  {name="perlqt";value="0lrdf2gl8kw3rkyhy1a1fwnazpziai57w3k1nr0bv1g7s49ri84r";}
-  {name="printer-applet";value="00c5nh6rm3ixfqn1ahb2hcdijnkdrj2381m1m9l4vxikdchb6whl";}
-  {name="pykde4";value="087srnqva1kqmgqvsyc54yr8i19xaxl1ax7w6acdk00bz0pyw76i";}
-  {name="qtruby";value="0imy1afh0w5rx97cxcp4bg2h95wn687sj7dlm09nd6hrpr31ivqd";}
-  {name="qyoto";value="1gndimc95s6b6m2bgh3z7pwb9p9jlj8z7sypz72py9aza5hkxiyn";}
-  {name="rocs";value="13gj83a4j202f0980v3ihlw3w5w4f5xh610plc5fnnba5csrpil4";}
-  {name="smokegen";value="08jz7v86lr6n743cr1ig9lb05wq9f0fyrrgwnn9wzmnfyrlqny0z";}
-  {name="smokekde";value="1z6hwkv6c5kx12gzi2kld2596az8gyc1aw83091bkkcj7885sai3";}
-  {name="smokeqt";value="0s3dz9vyhkazd68j9185rgjk3rkwgdfg53pxq10fqldv7pavw230";}
-  {name="step";value="0xgv7cbs540sk18915v3m4hq09j8j844briic5wy7mgn46gwlycc";}
-  {name="superkaramba";value="0gck0v9nrg4040w011yhwpj282kkhk2mwdwd0vkgl4760qqfgr2j";}
-  {name="svgpart";value="1yzrniz0h36v9xw0nglylv043gzlzcm7zzcv7j4p9faicl154vb8";}
-  {name="sweeper";value="1xyg2qwmwi5jajijamavgq7qqb52iphg6xad3y5r7i52172j7am1";}
-];
-modules=[
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ksecrets";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="printer-applet"; sane="printer_applet"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-    { name="konsole";  }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeadmin";  split=false;
-  pkgs=[
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kuser"; }
-    { name="kcron"; }
-    { name="ksystemlog"; }
-    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
-  ];
-
-}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-    { name="aurorae"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdegames";  split=false;}
-{ module="kdelibs";  split=false;}
-{ module="kdemultimedia";  split=false;}
-{ module="kdenetwork";  split=false;
-  pkgs=[
-    { name="kfile-plugins"; sane="kfile_plugins";}
-    { name="kget"; }
-    { name="kopete"; }
-    { name="krdc"; }
-    { name="kppp"; }
-    { name="krfb"; }
-    { name="kdnssd"; }
-    { name="filesharing"; }
-  ];
-
-}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kdesdk";  split=false;
-  pkgs=[
-    { name="cervisia"; }
-    { name="lokalize"; }
-    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
-    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
-    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
-    { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
-    { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
-    { name="kcachegrind"; }
-    { name="kapptemplate"; }
-    { name="kpartloader"; }
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kioslave"; }
-    { name="okteta"; }
-    { name="kmtrace"; }
-    { name="kompare"; }
-    { name="kprofilemethod"; }
-    { name="kstartperf"; }
-    { name="kuiviewer"; }
-    { name="poxml"; }
-    { name="scripts"; }
-    { name="umbrello"; }
-  ];
-
-}
-{ module="kdetoys";  split=false;
-  pkgs=[
-    { name="kteatime"; }
-    { name="ktux"; }
-    { name="amor"; }
-  ];
-
-}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.8/kde-package/4.8.2.nix b/pkgs/desktops/kde-4.8/kde-package/4.8.2.nix
new file mode 100644
index 000000000000..16878de71754
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kde-package/4.8.2.nix
@@ -0,0 +1,299 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="analitza";value="0dkz8y16qjjwq81rnnz7r8nchcqlk8rs0vlz9vlib2fsd85y2rm3";}
+  {name="ark";value="11adynnzli5w3g82g9mbl1gl9n4kph7n746sw0bc3hdwfzzy361c";}
+  {name="blinken";value="13b88f08c1p76k5067bhkbivgwi1zx05gwxp8yx22rx03ql5114i";}
+  {name="cantor";value="1di1lbqzz1i0ijd8bl1dyn29vkz2d7968a5lnzz226dhgzkkacx3";}
+  {name="filelight";value="0r1ay89hci5pkgk2gl2f5mmj91acsd3qqjh5286sv2s06fnwx9yw";}
+  {name="gwenview";value="1qfisab89bkqcxnj80d57bfl0b2ps3kz8hxxqpp7srp8x0wmwlr4";}
+  {name="jovie";value="0jxav473r1bcsjlccykihnmnjw6pcdgrc29q6lv6gw41d0dwl1a1";}
+  {name="kaccessible";value="0czgqnzv74fx5nrgfld2ii04k694dn6wp75zq0yxq0642pjla8xc";}
+  {name="kactivities";value="1hnpspy4xsmany48babzi7y88xmjihhb7smv6gmhqbwqpnrzn7dy";}
+  {name="kalgebra";value="1028gjmdlirm2mc5l72c7wlmhhkclfmx4pkscxywfa5a6cafkxxy";}
+  {name="kalzium";value="14xcrq2p3rhr66xvf6fxapf1xc5w72wf3yc3fl2g902g655d3li1";}
+  {name="kamera";value="03smprvzrvdi3j8h9zn76rjwhzsqi44wg2bs95c31mxa7kydxz2r";}
+  {name="kanagram";value="022il9rkxzpdhb8wr0gyv4dsys5zvsazq1k390gv2r5m0h13bdzb";}
+  {name="kate";value="1ady49ipndsvk6b43msllmpvygn299d6hmhpx8lzlhxxyvp5k3gk";}
+  {name="kbruch";value="1icm1f0lp4hyh5dp413dgnq709jkz5xr5bp1v05l4gfwk4gcmh7f";}
+  {name="kcalc";value="057cqdmxj0j6kp4q1lx830kypp52ph56lhdhg6cz32xz64igvk75";}
+  {name="kcharselect";value="0wblkfmg7lbnfnl042d2k7rgdh2pfm0pw4l691adaxvczm031ig2";}
+  {name="kcolorchooser";value="168kfmam4vxf7g120c9gsjwr78cs7l7pfl3q1zcna0ysd9cz9v4y";}
+  {name="kdeadmin";value="0cxkq2gq3gv5apb6yg8phnkn0ln1mdq6cq6s5icsf5qz5m7b9996";}
+  {name="kdeartwork";value="16iip7ys2kah3xnlj8n972530kd58f4baihhcgdmlr6x0dlxviqq";}
+  {name="kde-baseapps";value="0fd2amnlx3vg06k8xkarg13zksjzvwz1bqdhqmpj4hqjq04s7pkh";}
+  {name="kdegames";value="1plvrdj46ldgc7plx3b3g252a5l24hkdwdxwf848bja78717mp8w";}
+  {name="kdegraphics-mobipocket";value="0x4c0pb4a0rwvwk6xnq0c73px0p9ha4dyrym78gs22m7j8wh44zb";}
+  {name="kdegraphics-strigi-analyzer";value="10nkkqvipzmh8lyc5rwsclk5y4y0q6l9x6q14ybcyi9sjrdp16xj";}
+  {name="kdegraphics-thumbnailers";value="12434z4c5hvqqkii2lbmfay09pl4pmcdh2xf248j75jdis0wxr03";}
+  {name="kdelibs";value="0ic0f8d2qx77z971rkmkll2095alaz0ih5mnx9xfh51zjprrxqk8";}
+  {name="kdemultimedia";value="0lrn0v44pr5k169g21q3gx059n9aspaj77x44vrr2iaqdbqzipjj";}
+  {name="kdenetwork";value="04knna0rfvxj5d90mpwln341fspagyh1hpprb0gw7ambjzpicv1n";}
+  {name="kdepim";value="17wgnf3l4zhwr0lr0d05ik419ik1s18c7fd2d3fd8mmgcj0k8s8q";}
+  {name="kdepimlibs";value="1w3qz42rhj4spi88lp6dn3i92c1dx89004mwpakjcbh0bb10fyc2";}
+  {name="kdepim-runtime";value="0gl0qa0nyvf403fwb16v9bg2d98c8y1xnkfgwrf7f26ww8mink46";}
+  {name="kdeplasma-addons";value="05dfp0l8n7k5hplfrr47y15xq2qbl8km6m06m91hb0v5ds6zsjhn";}
+  {name="kde-runtime";value="0sx46fwl07s0z6bb0sadnv6w6p8x735kbwzgvm004m9y1fdn3pp8";}
+  {name="kdesdk";value="0aly8br19y4acj3ah61aypxqpig3cf25xdnr9drgqgl2519rb0bk";}
+  {name="kdetoys";value="1wjwibf0aqwnjwysc9khriwg8h80fyzcgprrvam0a82b3xzns43v";}
+  {name="kde-wallpapers";value="07l035jhrysn56nbivxnkgyrayfczbk2b6idij5pfr29c9nha7xk";}
+  {name="kdewebdev";value="0768x2c70xr9fybjw24aw9n53517496hrlhx5ww2p5lbxd71m9hp";}
+  {name="kde-workspace";value="0a4rn3j8aardsdn9qp20i7f3dijsyhh691cac2z9djkcx0zb4fxd";}
+  {name="kdf";value="0d7pp1l86qwp40zkj575ispxszsjm3nsg5c0x2f6i2bagi9wnrq8";}
+  {name="kfloppy";value="0mcs7fnj0y505nwbg76fgq2n107vwhf0ypw3v4y0gyswvcg6lv5f";}
+  {name="kgamma";value="09jqqrqnpc1n0pkm3mw1qh0i7l1f1v8a7wqg2x0cawd0vqiqjd8n";}
+  {name="kgeography";value="1a0dxqzz8z5ndnnznmafgs8i6kz7jqsgl8ra0nqclbghzpxjbl55";}
+  {name="kgpg";value="0w2hfg5bi5cdr8rh783m1ygx6f1w9674gp7knifhiv037zc47xn8";}
+  {name="khangman";value="0rkaawjv3g5jnlnqkaxcg1946zrmmxr5x6g24ip0syvwrasaa98z";}
+  {name="kig";value="1mjppcj8rbalhaafr4m9xbc2ydagfmdwwhdcjrwxnk84xr1p5a53";}
+  {name="kimono";value="1ayx8zbrjq4j78970k0pifs3m7z1a2szh6d6qk2bajr3dav708cb";}
+  {name="kiten";value="10mmfys6bg16whpgidjmbwqcd9hcq30gn3vkyasq8kblvkig2g7m";}
+  {name="klettres";value="0w4zhan6q9rsilvhf724b0nrj03szrf91zc861vbizch64a7glw2";}
+  {name="kmag";value="1vgwpfiy5n1kjrd6f87ikxg6hmnj85qcn8nsgsbg4c4wwg325mhp";}
+  {name="kmousetool";value="0aiznlb7nkq6im14zfr6iikkrhv62c96cnq5iqax55w432bqjx7x";}
+  {name="kmouth";value="1nnvhb29q9s55byns0bk4xj165dlk7mypzama6l9ayc734qpcib8";}
+  {name="kmplot";value="1ic4g3g87fg7shmr8lw7xnyqpkgc0ha9rji9a64knanv94c21jfz";}
+  {name="kolourpaint";value="096xqwnx54s37lbzdgqgdi3lvc0dw3xgpvbmn2zbchk98rfccrbg";}
+  {name="konsole";value="05w05c6579hvs98iajf3vw3rck2a90nvy1bapyrb0hhwz651p1n7";}
+  {name="korundum";value="1wqshxypn9v3jlcx518xqbmmcng71fk1nb7xq3q9m2dqn81p7095";}
+  {name="kremotecontrol";value="0ry7jr09klkkfa446yg820dc5j3wivkyz6z9h117wiccacpfylxl";}
+  {name="kross-interpreters";value="0wcmaac003h5gc0z29sqkzczgap1i7abir75gpp5y67qkvb52zbn";}
+  {name="kruler";value="14f209gh2rbjvjvv9pjlcl6vhfnfr4s0rnc57vzirk0cb5wjfjx9";}
+  {name="ksaneplugin";value="15p822y8nn817b4qsmxfb1cz928dnk14mr3667ysvynjfa9l0kkc";}
+  {name="ksecrets";value="1i87ccjdvmlpvqlqsyihxcb9r7xg8ybhc9y8z91fn0y0dihvysfs";}
+  {name="ksnapshot";value="1p4krsbkgmzgsa0q6xrs4anq35qzxzdx1g0mv129p5wg6570yr0c";}
+  {name="kstars";value="15dan9l18wm25i2lkdlgxrmn6rkznhq1riag3kd83i4qwc2rzzdj";}
+  {name="ktimer";value="1pwxilhr3ymqghii00vmpsjrmzivv8j9jn6aypzs9z1qhp9v7gi7";}
+  {name="ktouch";value="0m08zgr6phkp8c8k04sj67m4d6him0c6pirijdb4z8ki0b5sgmp6";}
+  {name="kturtle";value="1701nb2p78yyl5j7f9cq0i6maddy0pjkrxjs4v8r92n2bl0wpl8b";}
+  {name="kwallet";value="1p7krlp824v7v0hlafgwx139i7g42x2x7raqjyyw5l22gy6qq05l";}
+  {name="kwordquiz";value="175pm548vkdfpiiq9c66jsw9p1h3m6bi6q6b8df5kknap914radi";}
+  {name="libkdcraw";value="12brv1wlgcghhcha1h65902rgpcdl2hfh5vaaysmvczs72j18rvf";}
+  {name="libkdeedu";value="085qfp84r2ck4b1rzh5qqk0cr5z6g7b4xnw3cgnqr6z93901llic";}
+  {name="libkexiv2";value="1mcvm7ffjy5brybbpr3pdcfh0prkd55323023rjysv3iyv4lylp8";}
+  {name="libkipi";value="0mhqaaxglh1ksc9fga3llvnmi66d0xkpnp8pcq1k3xc03f9gay3w";}
+  {name="libksane";value="0cxamj8djmhqn2xcx8672y06zq511l92p56ic32bpq8337xf9gzl";}
+  {name="marble";value="13ndxh8jdydz7adslkc4bzrq741hw3w0w16vys0ps0829sqbqpzn";}
+  {name="okular";value="038b1c9d7w3hyzfinzirixfmakxva4hyhbsrkjn3kgxmndmp2rrn";}
+  {name="oxygen-icons";value="1a15rjma3wgb36c6v1x58m8dv6ndgsp6k9a958vyack57775xri9";}
+  {name="parley";value="1bf2zc8qcx4m3yam1wsydmhs5z0830zfdl1s7zy84nffnslmszn6";}
+  {name="perlkde";value="0lkpvnqfjspl9c61avczvc1lbl515vkpr82vxa0bdkrnjijn2zz9";}
+  {name="perlqt";value="04sp4ricpwvaz856lyf6r7aal9pbr2chn8w8x77ydhy9pm6lpr3c";}
+  {name="printer-applet";value="0c5bazz3xa5scxiih11fx2z4qakcvmgnbnla3hy7hyc5xygzicpz";}
+  {name="pykde4";value="1rg0zikjdldm7vnrnhi4z10f89b3ka8lsghkwvjqmi742rqa097v";}
+  {name="qtruby";value="0nbn1lm55sxaiq5xkdqnph8kd9v831lq15h6niyard744133fhir";}
+  {name="qyoto";value="11ispw0a60dzxn9v9m1l6g61q7242z5jr95s3lf2ajl13gmrx0l9";}
+  {name="rocs";value="1jgpigcirjdyvpryvgba76qy46lnxsvr2x2d5chf7jzgzy3l5753";}
+  {name="smokegen";value="1qy7qj47rlsp56j3ghc1a077k2qydsy9lv1d09i48cn8xf3r0mcs";}
+  {name="smokekde";value="0fxfplcdndcvb7lsp6f3va5nn1x9knk1qi76wrmfwm1h4ahb0jsr";}
+  {name="smokeqt";value="0whw8r6hx8qza9an9x4yil8klmdicwxp3gsh2pq4bxavlgrw1f28";}
+  {name="step";value="06kf1vc6bxs8sg0j691cyprkv6bkaw8fmi3ikna9d54s33mnq5cj";}
+  {name="superkaramba";value="02k9f1jr9bvlf2zg8wm47qwch3i4ps24mhp6j2i25rpj9l8g7pm1";}
+  {name="svgpart";value="0sl94xia81hqjqy0ydqlqffpwsdybyaam9an4w6qa6sszmx7kbyj";}
+  {name="sweeper";value="0yin8jbpxjkdxv1sg3n8nysfm4hvfr37m15bxhn92bgjdkbh2zdz";}
+];
+modules=[
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ksecrets";  }
+    { name="ktimer";  }
+    { name="kwallet";  }
+    { name="printer-applet"; sane="printer_applet"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kdeaccessibility";
+  split=true;
+  pkgs=[
+    { name="jovie";  }
+    { name="kaccessible";  }
+    { name="kmag";  }
+    { name="kmousetool";  }
+    { name="kmouth";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+    { name="konsole";  }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeadmin";  split=false;
+  pkgs=[
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kuser"; }
+    { name="kcron"; }
+    { name="ksystemlog"; }
+    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
+  ];
+
+}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="sounds"; }
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+    { name="aurorae"; }
+  ];
+
+}
+{ module="kdegames";  split=false;}
+{ module="kdelibs";  split=false;}
+{ module="kdemultimedia";  split=false;}
+{ module="kdenetwork";  split=false;
+  pkgs=[
+    { name="kfile-plugins"; sane="kfile_plugins";}
+    { name="kget"; }
+    { name="kopete"; }
+    { name="krdc"; }
+    { name="kppp"; }
+    { name="krfb"; }
+    { name="kdnssd"; }
+    { name="filesharing"; }
+  ];
+
+}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kdesdk";  split=false;
+  pkgs=[
+    { name="cervisia"; }
+    { name="lokalize"; }
+    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
+    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
+    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
+    { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
+    { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
+    { name="kcachegrind"; }
+    { name="kapptemplate"; }
+    { name="kpartloader"; }
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kioslave"; }
+    { name="okteta"; }
+    { name="kmtrace"; }
+    { name="kompare"; }
+    { name="kprofilemethod"; }
+    { name="kstartperf"; }
+    { name="kuiviewer"; }
+    { name="poxml"; }
+    { name="scripts"; }
+    { name="umbrello"; }
+  ];
+
+}
+{ module="kdetoys";  split=false;
+  pkgs=[
+    { name="kteatime"; }
+    { name="ktux"; }
+    { name="amor"; }
+  ];
+
+}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix
deleted file mode 100644
index a9b64d215617..000000000000
--- a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix
+++ /dev/null
@@ -1,277 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "0yzirmv6275479xifhipajdrmnf85xlb7nr00b9r73ghz5y9i8la";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "14fkmr0ixnrn4v2xs3hffiipk4dfdw2c2nyldlljlls3wim9kg5k";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "11f2n5rb5vq64lj2w913xkfvbw0rn31nnf1bpaywd86jh4sr4h6v";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "1c2j18gjlj778f97k44xk1pnxx696gsmlqjjsmanw9r0jnbkvp6z";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "1zhpbk2bdw40hss80zfnhq3ml9s9hlyayg6gsqg1jqwkfjxy0fdi";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "04jpi5lhx5lj15vxlh22g08zjqwzp7fjj2hy84axjm2q57vmgxfh";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "14qivzzhzv5z7yc3l8xvhwvspn1834r6zvf7pfiqmb4anhf3k26q";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "1l2s1yzi58f6nixw86k0rg0irpj786hcb07q3b1n7p991a0x34ij";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "044r8c0w3avcfb7wl7v8zaw05hyvif9cdp482fwrggg6v61fz0h6";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "15z1w8vkfq19z6wyi0zlbbh4ysv66jf74y68qz544d6riqzj61ii";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "1154wmjcgasvh48cli8zdbf1bqk9w3jvrq12g03jdr66mqgs2fry";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "0yww5pa7bm0fdcai1w1jrfvcwjcrzw0yp2r5vxggwlwjlslahzsp";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "1xrd91d0k14mk826a6277sghbaji2lr7yjlggbjshh59qrwnmm5f";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "0zy0slm6zn3b3zhvygfac0cnsgnc3bfx4wzd0rdiy2270idkvk9s";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "1nazarjvf7w1pvwca9igsp0w1fa2qgk2h45rrm4vpq05r2j9pd16";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "1b17lbjqaflz21ciijs4d2dr8r2jc781yf62gk6pgw3r91wd9gla";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "1wq67fi3r09ymz95pxc5nrjs01kdf7xlb2z11snzvjfbpyxg0fpp";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "046kvzqgxs2phgrdx736ydv4q9jc594hb32lj2qaysm378w67hz3";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "1ywfd2fv806v4ilin3b99rcajwsczbmghl8y152nkyza8vak33rv";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "0r77sh2s5kvh7pb1v7fvl8cxckx7jh8i46lrrli6hyvfi8gwdzl0";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "0jjm1kl2lc2pdyhyxz6jljsbdc8b6msyp01bwyldgd9pannrixfi";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "0sl28a39v9gb7fj7rfyrn2wqn41l7q1zzfkhgjac273wb9cwisfq";
-}
-{
-  lang = "id";
-  saneName = "id";
-  sha256 = "0whbnl3rglv9bwp4x2f6p8v6w0ns87l6fkz74qgwqq9xf5h7cq8w";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "0951lcd6if6ylwx2gpq0kg08134g02wfnwpvi9w7jsxia6c3byv9";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "0radqz2nicji3sm2nhr9sy250s015vccx7g1k6zz30qfs6v7d081";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "0n5hhq0h7xvxnxmd3k2wv6p5n5raqyq667f1x1vvfx3gjgl8l6za";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "12fd76wcr141pqd9lcpwzi0fvd8r66551vcd3rz1p5gkl41wnzih";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "0y7gaa19ycbp4v97rwf7h2ijam68fjzpx62iab4q8p925d5bf5gz";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "1bvlw16wvj9k82c00p6vbwvc1f6y4lgq7yfwi3d62wjmq34ry9y3";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "10zjs4a8chsf6i8v9xbzqikz7j1kqwaxv6hbzphz5qlabxx1vfhh";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "0bzh4j9m8jmandrx6y7pl2dm8xlp0m4vw5lnz0mhbzrpbf9y91f5";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "1imkd6540npybpg34vz00z7x3c2vgzigkjz0ha8xhsnsrbsyph1c";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "1jqpmqma7pwgpfhlz5rf9jbda3y6psd9ikbpl0r18kwbjxmmydbf";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "0rv81v06m27kk922d7cy58jm7rxx3lwhy7hnwc3iym0kzlb1kn8k";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "1z9wysi99sb7whrqbjsywvzr99bbph8ajlrpgjx2sc6r0pq9kiz2";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "1cj65wnkzrkd9bpjaihgzqhcjmjrjlfzvcc5w66wy976lj3bmhbj";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "17ilmmdjzlk16avr6v37fwx50gn70ds0s66i1pr6bgfjwzirhbwr";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "0c3ibrnhfhgpn51bzkx9skqzhbc3y3b9z8x9mqfj8qb88y8daxr6";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "07aazd6326jnl98xsw60d2a23cgqz9hlhr3359ing0f85y0h4553";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "18d8xmvppp8y01g9kbfchd4ppbgc0xzd0s2xhicglsjq0mxgsl1d";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "0mxrikinff8a94pjag1dw6d4ywx1f8niy6160cfy9yhzww7kxdid";
-}
-{
-  lang = "si";
-  saneName = "si";
-  sha256 = "1a8wqihfxqvwxpz1x46kq88jwh3gbilqiba6sk9bq2mszp4p67rm";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "0x07css69r5ji9k3xz6b86945zawhnx3cxx8mjc21yhb88ns9abg";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "157b1qbv68455gxjfw0a16pn754cwsslr7rjj98m3wxb0x2l6jm6";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "1hj0z12g6srhhl3rim8ch2a51jxmzgbrd3wz9x1dcbb280qvx7dh";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "0caji21v1lb6kqb12rrd0ff4pi4kr5533x686c8aqmj82dldc0i1";
-}
-{
-  lang = "tg";
-  saneName = "tg";
-  sha256 = "0v4kggr5k0nl0kj2y2diw37mdi51p76wmwxjldlhvkxind40sab9";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "13vvfl1nkm8a3vd1h95rs73cvh4q84vdgnvy1144v2lfg62qz2wr";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "0nc8c68y6ykplkhh0pij2lwwq5pa0sgwdiarwmjlwiy2rzyjm49c";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "1rw2jq6899xkn39ij6w6k7qgnv94w6rivx56czwpldxslzw5aikf";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "0w42f4fg4pk4ny1sldhv4nsganid5jayc0n5m1slsvd70f89l4cq";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "093d4fsf38kxlpr99yf7nnr4amvlwsj92h9ix3hh2mql1vcrjzxh";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "048awkb3a07bxd2kbfv05ig49r2hix6glag5wdjsmn3dmjlf7lam";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "0hkrj9j6rzxnprvdsf6b0xy2i6mngrq5sgsg6k9dqxwjfnnfd1g5";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "096mwkla69sj4236f05grhv7wrvfxfq7m7gyq3r58nar37b5nrkz";
-}
-]
diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix
new file mode 100644
index 000000000000..20734ec9424f
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix
@@ -0,0 +1,277 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "0xg4rp3k7zcvrrs7y2c3rxmb07mlmkfxnw5vnhgj0hp67zsa0xqc";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "13xh14bknqp0yfy093y70bkkazbfi81x190m0mqbc03npp7f0fny";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "1wdkxij7w04f73ha8aqqrh5awvad1flsv2yhl5qd5yrsf0f47pcn";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "03ngb8jidmh5xsfgrbcsgs387cwrqlb5bclyrx7x66ig2a6cj293";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "1lnir36hv69a2lr70l3gc787r4dmkwfm4cnygkajwz13hh02a5yw";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "0zrmcmxkcc31sys9svnvqdhls9z121hy6x4649hlvqykjy906wsx";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "18zwx64wsrlfamhq81573ss4zci4jsh9fzfiibqfnailyq7vh6af";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "14fm8lmwqzs741s9vpp6avq0xv41g528glj1inq53p9shxnnyqii";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "1282cf55vb6j1p7xj6k5yjvs5js6j2ia82qrk1lbilrp0z2i0gmv";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "03irsv325yl552afa6cwzvm51bsdhlvkk7p3j09bld64jdafsy51";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "1a2jwbzx1nygygsmhpiwchrm4lsfji0823dbhmi5a7nccdz8qcl7";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "0h3a2kpf2658mgix1p8l84mh64vd4d3pd57s9s0hhgkqz393rfyw";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "0mzyq0z6kjpp442i4y2v2xkfygd816ija2p9s4rmh8p83z3m4vf3";
+}
+{
+  lang = "fa";
+  saneName = "fa";
+  sha256 = "1ha1rnqki9ydlqyb8m9kxpvj706rg6jzzqpsy5dd3jwmbq9p3hih";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0wljp5ka2mm4xxmf6gplsh06ynibw3vcn62dxhawpw04xpj561z0";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "18dihln161rrh8269j0c2pypxwhddigd6qgscjqypkhh3nclc158";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "0r8hv5lnrjjxbzbpxfsipaj0nd8lmlwf69073x0nyxvins6yl8r8";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "1qh81dqz5wm7viqvx9mkb6v5m11c67igqz2n44ax8f87m4d2n14n";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "1ld68csc2dxwmql2j79xnnbi7ib1hjs9hd28bbqcn3v240jmfrhc";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "00m40mxfgm8ymfq1l51i3kd1493cmddn0my6sahh6hy21zhbfb7p";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "0vxanrd8q8ykmzhyz9h2a38izccfyssmck2gvrm2r53hli3zfnl5";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "0ys5ysq15aazifmjx26sd73801bdfl5hsaranbwarrmky2w0ahmw";
+}
+{
+  lang = "id";
+  saneName = "id";
+  sha256 = "0lw4gi3p4cms519l36p1xa7hpavwmbvl60chw8ji1xyh29fkylz8";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "09lzndfxck7s5bryn7i9w8pya18wiy9y27rzqaq8sa9hmjswmkc7";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "1s2b9rrwj4yfx4xk323wcyzvidxiipb3sfws3hsb56vdvhkmr7hs";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "0gzishadvm9s863r0z6xbi35qgcl5da5l2nn8b5dqdjz61ndj7w7";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "1yy3yaifcgj8203wajnqvr7li42w8zvy02gqirxjb5n2kshcjnm3";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "1a717bsxp75xb8wrxg6a1817d69a9zdvhsha9dlrxqif8krvg8kw";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "1965ai6hchhmdsi8lz68zwgb0hynzdpv60vx7z716428qki4kaxy";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "15d6r4jyp3qkf64wfqixrkc899a27s7vkgzgaxr6qpln5nhwxhiz";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "0y6xdl7rpb78s4mdisr33afvmhvk2pn0x13vylv7rxcxa34qzgp0";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1llf9w22ys3kr1gbff60rqr8x55b8rjchxwk3zx8sidpflfj2jxx";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1qixvdl916lriar5cq5s2ssin9klavy1kap6n4mlj2v1pwzqncv0";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "1bq6dshbbl36pd1kik60kdqpm3fj95409wrz07rvw21bc5wn4ng0";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "085vkfx26sfqz2vg1zs38fri99h344gmjfg9p64l82csx9fkr6d3";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "01q6kirkn7ah0m9hkd5i90la52p9cdjs01q0a99ic6jyfkjnzdms";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "1ixrfkb8lklh0475j2w97s21hwxcsf1vqafq5hg0819g6qd2aijl";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "0hcbfhxw66vilad81rmw88wybbsalidq50wfy4c2cb415cfqi1sr";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "0pwzmhkk2acmkqfvsbv2r58wjfrikqzpy5j74prpwk7w3ikch683";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "0xs9m6hqiqgknbm139wv46g4gwz595bqdnhzxibaadibrpaby8yq";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "0j2nb2nwipm8y894s0dqxs46slwcwgj5c6j62xw40jxr3zl726xc";
+}
+{
+  lang = "si";
+  saneName = "si";
+  sha256 = "1np69csgvfmg9nr07jxy45z1hpr0s7x0cfyv4gzidgwgrrjgy9rx";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "0f46d1wkac2mnl9wmzg3xhak5jxs1rdnqafk26zvg84ksdapy9ji";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "1ca7z7n4hsf6x9dh1xy9if1i8x7vdmapwl03q67752rvms60zgpc";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "0vqhy5s3pw53h0mh0vqwicg9yxb7dc45qa1y37lrb3rxbl0hf4b2";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "0f864y58jg3cm7wl2almljqhdcspyxcxb0ig2axb4ynmk1m7qfwd";
+}
+{
+  lang = "tg";
+  saneName = "tg";
+  sha256 = "1xybl1cp7hivzyw2j4s3j3ahv18kpxx54zpi8qn9nfpsxwz6nzzm";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "06n7r9pc44y53qs3lkmywsh40g0mmlq91sn6ma1j4nxbyglyk851";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "1ibypwg8wgwsgwp6s7n56wa3j4paxl948cmbhmiahmclpyhs8g3k";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "0z99bs4yxr4w6d5xxbr4k8h6494b64g00i3fkv4r1lrbldp0nsmi";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "05jrypr1gwlv15yymk3qmh6y982256lz2jyyw6jak4pwv2l4pdp1";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "1wzrdgp6w33qzy6w4jk0w9yk4v1pbx31lnjg1423c3f4byb4rx8s";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "0grlfffq3qzh2l0pnxwil0812l1a628i9gsi7zm1p6rp6hhv9fwp";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "18q6nhk12fi10i582vm6sdbhirq81702pfc1793dww4s8ys8lf1x";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "0x4yq975xwn2igyzdw0ygc1qiwcg30fvdhwnv15md6bfwk2m813l";
+}
+]
diff --git a/pkgs/development/libraries/qt-4.x/4.8/4.8.1.nix b/pkgs/development/libraries/qt-4.x/4.8/4.8.1.nix
deleted file mode 100644
index a3a78af439a4..000000000000
--- a/pkgs/development/libraries/qt-4.x/4.8/4.8.1.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{ stdenv, fetchurl, substituteAll
-, libXrender, libXinerama, libXcursor, libXmu , libXv, libXext
-, libXfixes, libXrandr, libSM, freetype, fontconfig
-, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig
-, libtiff, glib, icu
-, mysql, postgresql, sqlite
-, perl, coreutils, libXi
-, buildMultimedia ? true, alsaLib, gstreamer, gst_plugins_base
-, buildWebkit ? true
-, flashplayerFix ? true, gdk_pixbuf
-, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
-}:
-
-let
-  v = "4.8.1";
-in
-
-# TODO:
-#  * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid
-#    false build-time dependencies
-
-stdenv.mkDerivation rec {
-  name = "qt-${v}";
-
-  src = fetchurl {
-    url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";
-    sha256 = "1s3sv2p8q4bjy0h6r81gdnd64apdx8kwm5jc7rxavd21m8v1m1gg";
-  };
-
-  patches = [ ( substituteAll {
-        src = ./dlopen-absolute-paths.diff;
-        inherit cups icu libXfixes;
-        glibc = stdenv.gcc.libc;
-      })
-    ] ++ stdenv.lib.optional gtkStyle (
-      substituteAll {
-        src = ./dlopen-gtkstyle.diff;
-        # substituteAll ignores env vars starting with capital letter
-        gconf = GConf; 
-        inherit gnome_vfs libgnomeui gtk;
-      }
-    ) ++ stdenv.lib.optional flashplayerFix (
-      substituteAll {
-        src = ./dlopen-webkit-nsplugin.diff;
-        inherit gtk gdk_pixbuf;
-      }
-    );
-
-  preConfigure =
-    ''
-      export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
-      configureFlags+="
-        -docdir $out/share/doc/${name}
-        -plugindir $out/lib/qt4/plugins
-        -importdir $out/lib/qt4/imports
-        -examplesdir $out/share/doc/${name}/examples
-        -demosdir $out/share/doc/${name}/demos
-        -datadir $out/share/${name}
-        -translationdir $out/share/${name}/translations
-      "
-    '';
-
-  configureFlags =
-    ''
-      -v -no-separate-debug-info -release -no-fast -confirm-license -opensource
-
-      -opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
-      -qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked -openssl-linked
-
-      ${if mysql != null then "-plugin" else "-no"}-sql-mysql -system-sqlite
-
-      -exceptions -xmlpatterns
-
-      -make libs -make tools -make translations
-      -nomake demos -nomake examples -nomake docs
-
-      -no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if buildMultimedia then "" else "-no"}-multimedia -audio-backend
-    '';
-
-  propagatedBuildInputs =
-    [ libXrender libXrandr libXinerama libXcursor libXext libXfixes
-      libXv libXi libSM mesa
-    ] ++ (stdenv.lib.optional (buildWebkit || buildMultimedia) alsaLib)
-    ++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ]
-    ++ (stdenv.lib.optionals (buildWebkit || buildMultimedia)
-        [ gstreamer gst_plugins_base ]);
-
-  # The following libraries are only used in plugins
-  buildInputs = [ cups # Qt dlopen's libcups instead of linking to it
-    mysql postgresql sqlite libjpeg libmng libtiff icu ]
-    ++ stdenv.lib.optionals gtkStyle [ gtk gdk_pixbuf ];
-
-  buildNativeInputs = [ perl pkgconfig which ];
-
-  prefixKey = "-prefix ";
-
-  prePatch = ''
-    substituteInPlace configure --replace /bin/pwd pwd
-    substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
-    sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://qt.nokia.com/products;
-    description = "A cross-platform application framework for C++";
-    license = "GPL/LGPL";
-    maintainers = with maintainers; [ urkud sander ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 5313c8afefad..a3a78af439a4 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -12,7 +12,7 @@
 }:
 
 let
-  v = "4.8.0";
+  v = "4.8.1";
 in
 
 # TODO:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";
-    sha256 = "0vhb6bysjqz8l0dygg2yypm4frsggma2g9877rdgf5ay917bg4lk";
+    sha256 = "1s3sv2p8q4bjy0h6r81gdnd64apdx8kwm5jc7rxavd21m8v1m1gg";
   };
 
   patches = [ ( substituteAll {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2334875819f5..e789ce87a3c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4576,11 +4576,6 @@ let
     inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
   };
 
-  qt4_8_1 = callPackage ../development/libraries/qt-4.x/4.8/4.8.1.nix {
-    # GNOME dependencies are not used unless gtkStyle == true
-    inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
-  };
-
   qt4_for_skype = qt48.override {
     mysql = null;
     postgresql = null;

From 7aeb6ef2bb061eb48cc4bff8616e8b88bea87418 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Apr 2012 13:50:47 +0000
Subject: [PATCH 055/293] Remove ksecrets, fix outputHash

svn path=/nixpkgs/trunk/; revision=33622
---
 pkgs/desktops/kde-4.8/default.nix             |  2 +
 pkgs/desktops/kde-4.8/kde-wallpapers.nix      |  2 +-
 .../kde-4.8/kdeutils/ksecrets-ftbfs.patch     | 43 -------------------
 pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix   | 11 -----
 pkgs/desktops/kde-4.8/oxygen-icons.nix        |  2 +-
 5 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix

diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix
index a358bff25d1b..7b85e8c198e3 100644
--- a/pkgs/desktops/kde-4.8/default.nix
+++ b/pkgs/desktops/kde-4.8/default.nix
@@ -10,6 +10,8 @@ let
 
   # The list of igored individual modules
   ignoreList = {
+    # Doesn't work yet
+    kdeutils = [ "ksecrets" ];
     # kdeadmin/strigi-analyzer has no real code
     kdeadmin = [ "strigi-analyzer" ];
     # kdesdk/kioslave is splitted into kioslave-svn and kioslave-git
diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix
index 1cec814b81e1..4fadc9edf000 100644
--- a/pkgs/desktops/kde-4.8/kde-wallpapers.nix
+++ b/pkgs/desktops/kde-4.8/kde-wallpapers.nix
@@ -9,7 +9,7 @@ kde {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "326b19180e1a03c9fbf5e99f1a3ee6d4dfd0bd6fde5c0ef4b7a5608b20e75a5f";
+  outputHash = "69cbb2e8c6fd78931af7196c3a79918f87b5aed31c52521b8d4089eb98e7557b";
 
   meta = {
     description = "Wallpapers for KDE";
diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch b/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch
deleted file mode 100644
index 24a68e114406..000000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/ksecrets/CMakeLists.txt b/ksecrets/CMakeLists.txt
-index 040b55f..a1e04c3 100644
---- a/ksecrets/CMakeLists.txt
-+++ b/ksecrets/CMakeLists.txt
-@@ -5,7 +5,6 @@ PROJECT (ksecrets)
- 
- include(MacroLibrary)
- include(KDE4Defaults)
--include(PkgConfigGetVar)
- 
- INCLUDE_DIRECTORIES (
-     ${KDE4_INCLUDES}
-diff --git a/ksecretsserviced/CMakeLists.txt b/ksecretsserviced/CMakeLists.txt
-index d2feb41..339225b 100644
---- a/ksecretsserviced/CMakeLists.txt
-+++ b/ksecretsserviced/CMakeLists.txt
-@@ -2,7 +2,6 @@ PROJECT (ksecretsserviced)
- 
- include(MacroLibrary)
- include(KDE4Defaults)
--include(PkgConfigGetVar)
- 
- INCLUDE_DIRECTORIES (
-     ${KDE4_INCLUDES}
-@@ -38,4 +37,5 @@ TARGET_LINK_LIBRARIES (ksecretsserviced
- 
- install( TARGETS ksecretsserviced ${INSTALL_TARGETS_DEFAULT_ARGS})
- install( FILES ksecretsserviced.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
--dbus_add_activation_service(org.kde.ksecretsserviced.service.in)
-+configure_file(org.kde.ksecretsserviced.service.in org.kde.ksecretsserviced.service)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ksecretsserviced.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR} )
-diff --git a/kwl2kss/CMakeLists.txt b/kwl2kss/CMakeLists.txt
-index 41d8ec0..4cedb0e 100644
---- a/kwl2kss/CMakeLists.txt
-+++ b/kwl2kss/CMakeLists.txt
-@@ -3,7 +3,6 @@ project(kwl2kss)
- 
- include(MacroLibrary)
- include(KDE4Defaults)
--include(PkgConfigGetVar)
- 
- ########### Configure checks for kwalletbackend ###############
- 
diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix b/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix
deleted file mode 100644
index da9b7f0861cd..000000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, qca2 }:
-
-kde {
-  buildInputs = [ kdelibs qca2 ];
-
-  patches = [ ./ksecrets-ftbfs.patch ];
-
-  meta = {
-    description = "KDE implementation of SecretsService";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/oxygen-icons.nix b/pkgs/desktops/kde-4.8/oxygen-icons.nix
index 7f02e1e90779..32af5be17991 100644
--- a/pkgs/desktops/kde-4.8/oxygen-icons.nix
+++ b/pkgs/desktops/kde-4.8/oxygen-icons.nix
@@ -3,7 +3,7 @@
 kde {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "78f35ceba58bd34059ca4b2107bb55d4de56733e8932ba2ea22dcac18ee995ce";
+  outputHash = "973f53b59e31e1e1dca41aa5abf0fc50e9cf0cbee57f156d90c2e754f33cc1b9";
 
   buildNativeInputs = [ cmake ];
 

From b4e5ce8de529d801e26eaee15fb564dee9ea022f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Apr 2012 15:11:19 +0000
Subject: [PATCH 056/293] avahi: use libiconv if needed

svn path=/nixpkgs/trunk/; revision=33624
---
 pkgs/development/libraries/avahi/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix              | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 7730e403d58a..0789ef0ea7ca 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
-, expat, gettext, intltool, glib, qt4 ? null, lib
+, expat, gettext, intltool, glib, qt4 ? null, libiconvOrEmpty
 , qt4Support ? false
 , withLibdnssdCompat ? false }:
 
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
   patches = [ ./no-mkdir-localstatedir.patch ];
 
   buildInputs = [ libdaemon dbus perl perlXMLParser glib expat ]
-    ++ (lib.optional qt4Support qt4);
+    ++ (stdenv.lib.optional qt4Support qt4)
+    ++ libiconvOrEmpty;
 
   buildNativeInputs = [ pkgconfig gettext intltool ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e789ce87a3c8..2844d47a501a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4084,9 +4084,11 @@ let
 
   libiconv = callPackage ../development/libraries/libiconv { };
 
+  libiconvOrEmpty = if (libiconvOrNull == null) then [] else libiconv;
+
   libiconvOrNull = if gcc ? libc then null else libiconv;
 
-  libiconvOrLibc = if gcc ? libc then gcc.libc else libiconv;
+  libiconvOrLibc = if (libiconvOrNull == null) then gcc.libc else libiconv;
 
   libid3tag = callPackage ../development/libraries/libid3tag { };
 

From 68b6d23a350b691a164aae420484756bf781783a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Apr 2012 15:31:10 +0000
Subject: [PATCH 057/293] Fix altermime build

svn path=/nixpkgs/trunk/; revision=33625
---
 .../networking/altermime/altermime.patch      | 48 -------------------
 .../networking/altermime/debian-patches.nix   | 18 +++++++
 .../networking/altermime/debian-patches.txt   |  4 ++
 pkgs/tools/networking/altermime/default.nix   |  2 +-
 4 files changed, 23 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/tools/networking/altermime/altermime.patch
 create mode 100644 pkgs/tools/networking/altermime/debian-patches.nix
 create mode 100644 pkgs/tools/networking/altermime/debian-patches.txt

diff --git a/pkgs/tools/networking/altermime/altermime.patch b/pkgs/tools/networking/altermime/altermime.patch
deleted file mode 100644
index 00ed513cf32e..000000000000
--- a/pkgs/tools/networking/altermime/altermime.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-AUR patch for fixing build
-
-diff -Naur altermime-0.3.10/qpe.c altermime-0.3.10-new/qpe.c
---- altermime-0.3.10/qpe.c	2008-11-16 09:45:45.000000000 +0100
-+++ altermime-0.3.10-new/qpe.c	2010-11-24 14:28:43.153334114 +0100
-@@ -97,7 +97,7 @@
- 				op+= strlen(paragraph);// +3; /** jump the output + =\r\n **/
- 				out_remaining-= (strlen(paragraph)); // Was +3, updated to fix Outlook problems
- 
--				QPD fprintf(stdout, "Soft break (%d + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph);
-+				QPD fprintf(stdout, "Soft break (%zd + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph);
- 				
- 				/** reinitialize the paragraph **/
- 				paragraph[0] = '\0';
-@@ -108,7 +108,7 @@
- 			}
- 
- 			snprintf(pp, pp_remaining, "%s", charout);
--			QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%d result='%s'\n", charout, charout_size, pp_remaining, paragraph);
-+			QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%zd result='%s'\n", charout, charout_size, pp_remaining, paragraph);
- 			pp += charout_size;
- 			pp_remaining -= charout_size;
- 			p++;
-@@ -149,13 +149,13 @@
- 	out_size = in_size *3;
- 	in_buffer = malloc( sizeof(char) *in_size +1);
- 	if (in_buffer == NULL) {
--		QPD fprintf(stdout,"Error allocating %d bytes for input buffer\n", in_size);
-+		QPD fprintf(stdout,"Error allocating %zd bytes for input buffer\n", in_size);
- 		return -1;
- 	}
- 
- 	out_buffer = malloc( sizeof(char) *out_size *3 +1);
- 	if (in_buffer == NULL) {
--		QPD fprintf(stdout,"Error allocating %d bytes for output buffer\n", out_size);
-+		QPD fprintf(stdout,"Error allocating %zd bytes for output buffer\n", out_size);
- 		return -1;
- 	}
- 
-@@ -169,7 +169,7 @@
- 	  ** we segfault ;)  **/
- 	*(in_buffer +in_size) = '\0';
- 
--	QPD fprintf(stdout,"file %s is loaded, size = %d\n", fname, in_size);
-+	QPD fprintf(stdout,"file %s is loaded, size = %zd\n", fname, in_size);
- 
- 	qp_encode( out_buffer, out_size, in_buffer, in_size );
- 
diff --git a/pkgs/tools/networking/altermime/debian-patches.nix b/pkgs/tools/networking/altermime/debian-patches.nix
new file mode 100644
index 000000000000..cd0ae77511b6
--- /dev/null
+++ b/pkgs/tools/networking/altermime/debian-patches.nix
@@ -0,0 +1,18 @@
+# Generated by debian-patches.sh from debian-patches.txt
+let
+  prefix = "http://patch-tracker.debian.org/patch/series/dl/altermime/0.3.10-7";
+in
+[
+  {
+    url = "${prefix}/15_fix_snprintf.diff";
+    sha256 = "0fbi99s7pc2jvg9s2zldvg18i6g5ca3pcyaxy47kyabnz956dris";
+  }
+  {
+    url = "${prefix}/10_fix_printk_warnings.diff";
+    sha256 = "1fqsym07r3gv8zllg7c956g5a04gsxnr1ibbgkjr3yx6nm5ci1j7";
+  }
+  {
+    url = "${prefix}/20_fix-unused-but-set-variables.diff";
+    sha256 = "0ski67k44amrgg2g3gwdjzrlix2gjg60r5rs5wbjingvq1n7255r";
+  }
+]
diff --git a/pkgs/tools/networking/altermime/debian-patches.txt b/pkgs/tools/networking/altermime/debian-patches.txt
new file mode 100644
index 000000000000..77cb0ff10c15
--- /dev/null
+++ b/pkgs/tools/networking/altermime/debian-patches.txt
@@ -0,0 +1,4 @@
+altermime/0.3.10-7
+15_fix_snprintf.diff
+10_fix_printk_warnings.diff
+20_fix-unused-but-set-variables.diff
diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix
index 8335b0eb8db3..a80757faa1fa 100644
--- a/pkgs/tools/networking/altermime/default.nix
+++ b/pkgs/tools/networking/altermime/default.nix
@@ -26,7 +26,7 @@ rec {
   inherit (sourceInfo) name version;
   inherit buildInputs;
 
-  patches = [./altermime.patch];
+  patches = map a.fetchurl (import ./debian-patches.nix);
 
   phaseNames = ["doPatch" "fixTarget" "doMakeInstall"];
   fixTarget = a.fullDepEntry (''

From e78a048265df66a95499b301cee0d7331e534ff1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Apr 2012 15:37:52 +0000
Subject: [PATCH 058/293] * Add a function "filterAttrs" and clean up some
 comments.

svn path=/nixpkgs/trunk/; revision=33626
---
 pkgs/lib/attrsets.nix | 11 +++++++++++
 pkgs/lib/lists.nix    | 25 ++++++++++++++++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix
index fcaf4f5c9b5c..db4b9fb210c6 100644
--- a/pkgs/lib/attrsets.nix
+++ b/pkgs/lib/attrsets.nix
@@ -78,6 +78,17 @@ rec {
   catAttrs = attr: l: fold (s: l: if hasAttr attr s then [(getAttr attr s)] ++ l else l) [] l;
 
 
+  /* Filter an attribute set by removing all attributes for which the
+     given predicate return false.
+
+     Example:
+       filterAttrs (n: v: n == "foo") { foo = 1; bar = 2; }
+       => { foo = 1; }
+  */
+  filterAttrs = pred: set:
+    listToAttrs (fold (n: ys: let v = getAttr n set; in if pred n v then [(nameValuePair n v)] ++ ys else ys) [] (attrNames set));
+
+
   /* Recursively collect sets that verify a given predicate named `pred'
      from the set `attrs'.  The recursion is stopped when the predicate is
      verified.
diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix
index e5b47f0d9ce7..67b0add50dcb 100644
--- a/pkgs/lib/lists.nix
+++ b/pkgs/lib/lists.nix
@@ -27,11 +27,13 @@ rec {
     then nul
     else foldl op (op nul (head list)) (tail list);
 
+    
   # map with index: `imap (i: v: "${v}-${toString i}") ["a" "b"] ==
   # ["a-1" "b-2"]'
   imap = f: list:
     zipListsWith f (range 1 (length list)) list;
 
+    
   # Concatenate a list of lists.
   concatLists = fold (x: y: x ++ y) [];
 
@@ -54,12 +56,15 @@ rec {
   filter = pred: list:
     fold (x: y: if pred x then [x] ++ y else y) [] list;
 
+    
   # Remove elements 'e' from a list. Useful for buildInputs
   remove = e: filter (x: x != e);
 
+  
   # Given two lists, removes all elements of the first list from the second list
   removeList = l: filter (x: elem x l);
 
+  
   # Return true if `list' has an element `x':
   elem = x: list: fold (a: bs: x == a || bs) false list;
 
@@ -145,17 +150,19 @@ rec {
 
   zipLists = zipListsWith (fst: snd: { inherit fst snd; });
 
-  # invert the order of the elements of a list.
+  
+  # Reverse the order of the elements of a list.
   reverseList = l:
     let reverse_ = accu: l:
       if l == [] then accu
       else reverse_ ([(head l)] ++ accu) (tail l);
     in reverse_ [] l;
 
-  # Sort a list based on the `strictLess' function which compare the two
-  # elements and return true if the first argument is strictly below the
-  # second argument.  The returned list is sorted in an increasing order.
-  # The implementation does a quick-sort.
+    
+  # Sort a list based on a comparator function which compares two
+  # elements and returns true if the first argument is strictly below
+  # the second argument.  The returned list is sorted in an increasing
+  # order.  The implementation does a quick-sort.
   sort = strictLess: list:
     let
       # This implementation only have one element lists on the left hand
@@ -171,25 +178,29 @@ rec {
       qs list [];
 
 
-  # haskell's take:  take 2 [1 2 3 4]  yields  [1 2] 
+  # Return the first (at most) N elements of a list.
   take = count: list:
     if list == [] || count == 0 then []
     else [ (head list) ] ++ take (builtins.sub count 1) (tail list);
 
-  # haskell's drop. drop count elements from head of list
+    
+  # Remove the first (at most) N elements of a list.
   drop = count: list:
     if count == 0 then list
     else drop (builtins.sub count 1) (tail list);
 
+    
   last = list:
     assert list != [];
     let loop = l: if tail l == [] then head l else loop (tail l); in
     loop list;
 
+    
   # Zip two lists together.
   zipTwoLists = xs: ys:
     if xs != [] && ys != [] then
       [ {first = head xs; second = head ys;} ]
       ++ zipTwoLists (tail xs) (tail ys)
     else [];
+
 }

From 6caf0820f96a0f8cf0380e32dca7ccc500d3cc53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 5 Apr 2012 16:26:44 +0000
Subject: [PATCH 059/293] lsh: Assume UNIX98 PTYs are available.

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

diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix
index c41ff1c1097d..ab43813f923b 100644
--- a/pkgs/tools/networking/lsh/default.nix
+++ b/pkgs/tools/networking/lsh/default.nix
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
             s|/usr/bin/df|$(type -P df)|g ;
             s|/usr/bin/ipcs|$(type -P ipcs)|g ;
             s|/usr/bin/uptime|$(type -P uptime)|g"
+
+    # Skip the `configure' script that checks whether /dev/ptmx & co. work as
+    # expected, because it relies on impurities (for instance, /dev/pts may
+    # be unavailable in chroots.)
+    export lsh_cv_sys_unix98_ptys=yes
   '';
 
   buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam ];

From b3980b78f8ff79a8859c4fccfb336178779739d0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Apr 2012 16:38:03 +0000
Subject: [PATCH 060/293] * Bump nixUnstable.

svn path=/nixpkgs/trunk/; revision=33628
---
 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 a9039734fbb5..a2d1052beae7 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre2635_3b859ea";
+  name = "nix-1.0pre2636_f2467eb";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/2368213/download/4/${name}.tar.bz2";
-    sha256 = "32ce8c3816e4d073d6af27d13fc5c1069aade994ddee7775bc53489ecd3efa12";
+    url = "http://hydra.nixos.org/build/2369138/download/4/${name}.tar.bz2";
+    sha256 = "8af17741f0372657e8e764f11d1d88a5fee6214b9c63dc2a8aef911293c60014";
   };
 
   buildNativeInputs = [ perl pkgconfig ];

From 5474f1e5231b87c99d5c6f4bc665955715478ae4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Apr 2012 16:51:59 +0000
Subject: [PATCH 061/293] Updated Haskell packages.

 - aeson: updated to version 0.6.0.2
 - attoparsec-conduit: updated to version 0.4.0
 - authenticate: updated to version 1.2.0.1
 - blaze-builder-conduit: updated to version 0.4.0
 - certificate: updated to version 1.1.1
 - conduit: updated to version 0.4.0.1
 - crypto-conduit: updated to version 0.3.0.1
 - hakyll: patched to support the latest version of hamlet
 - hamlet: updated to version 1.0.1
 - happstack-happstack-hamlet: patched to support the latest version of hamlet
 - happstack-server: updated to version 7.0.0
 - hoogle: patched to accept the latest versions of wai, warp, and conduit
 - http-conduit: updated to version 1.4.0.2
 - monadcryptorandom: added version 0.4
 - persistent-sqlite: updated to version 0.9.0
 - persistent-template: updated to version 0.9.0
 - persistent: updated to version 0.9.0
 - pool-conduit: updated to version 0.1.0
 - reactive-banana: updated to version 0.5.0.0
 - shakespeare-css: updated to version 1.0.1
 - shakespeare-i18n: updated to version 1.0.0
 - shakespeare-js: updated to version 1.0.0
 - shakespeare-text: updated to version 1.0.0
 - shakespeare: updated to version 1.0.0
 - simple-sendfile: updated to version 0.2.2
 - texmath: updated to version 0.6.0.4
 - tls-extra: updated to version 0.4.4
 - tls: updated to version 0.9.2
 - wai-app-static: updated to version 1.2.0
 - wai-extra: updated to version 1.2.0.2
 - wai: updated to version 1.2.0
 - warp: updated to version 1.2.0
 - xml-conduit: updated to version 0.7.0.1
 - yaml: updated to version 0.7.0
 - yesod-auth: updated to version 1.0.0
 - yesod-core: updated to version 1.0.0
 - yesod-default: updated to version 1.0.0
 - yesod-form: updated to version 1.0.0
 - yesod-json: updated to version 1.0.0
 - yesod-persistent: updated to version 1.0.0
 - yesod-routes: updated to version 1.0.0
 - yesod-static: updated to version 1.0.0
 - yesod: updated to version 1.0.0
 - zlib-conduit: updated to version 0.4.0
 - zlib-enum: updated to version 0.2.2

svn path=/nixpkgs/trunk/; revision=33629
---
 .../libraries/haskell/aeson/default.nix         |  4 ++--
 .../haskell/attoparsec-conduit/default.nix      |  4 ++--
 .../libraries/haskell/authenticate/default.nix  | 13 +++++++------
 .../haskell/blaze-builder-conduit/default.nix   |  4 ++--
 .../libraries/haskell/certificate/default.nix   |  4 ++--
 .../libraries/haskell/conduit/default.nix       | 11 ++++++-----
 .../haskell/crypto-conduit/default.nix          |  4 ++--
 .../libraries/haskell/hakyll/default.nix        |  3 +++
 .../libraries/haskell/hamlet/default.nix        |  8 ++++----
 .../haskell/happstack/happstack-hamlet.nix      |  3 +++
 .../haskell/happstack/happstack-server.nix      |  4 ++--
 .../libraries/haskell/hoogle/default.nix        |  1 +
 .../hoogle/relax-version-requirements.patch     | 15 +++++++++++++++
 .../libraries/haskell/http-conduit/default.nix  | 14 +++++++-------
 .../haskell/monadcryptorandom/default.nix       | 15 +++++++++++++++
 .../haskell/persistent-sqlite/default.nix       |  4 ++--
 .../haskell/persistent-template/default.nix     |  4 ++--
 .../libraries/haskell/persistent/default.nix    | 14 +++++++-------
 .../libraries/haskell/pool-conduit/default.nix  |  8 ++++----
 .../haskell/reactive-banana/default.nix         |  5 ++++-
 .../haskell/shakespeare-css/default.nix         |  8 ++++----
 .../haskell/shakespeare-i18n/default.nix        |  6 +++---
 .../haskell/shakespeare-js/default.nix          |  6 +++---
 .../haskell/shakespeare-text/default.nix        |  6 +++---
 .../libraries/haskell/shakespeare/default.nix   |  6 +++---
 .../haskell/simple-sendfile/default.nix         |  4 ++--
 .../libraries/haskell/texmath/default.nix       |  4 ++--
 .../libraries/haskell/tls-extra/default.nix     |  4 ++--
 .../libraries/haskell/tls/default.nix           |  4 ++--
 .../haskell/wai-app-static/default.nix          |  4 ++--
 .../libraries/haskell/wai-extra/default.nix     |  6 +++---
 .../libraries/haskell/wai/default.nix           |  4 ++--
 .../libraries/haskell/warp/default.nix          | 12 ++++++------
 .../libraries/haskell/xml-conduit/default.nix   | 10 +++++-----
 .../libraries/haskell/yaml/default.nix          | 10 +++++-----
 .../libraries/haskell/yesod-auth/default.nix    |  6 +++---
 .../libraries/haskell/yesod-core/default.nix    | 17 +++++++++--------
 .../libraries/haskell/yesod-default/default.nix | 15 ++++++++-------
 .../libraries/haskell/yesod-form/default.nix    |  6 +++---
 .../libraries/haskell/yesod-json/default.nix    |  6 +++---
 .../haskell/yesod-persistent/default.nix        |  6 +++---
 .../libraries/haskell/yesod-routes/default.nix  |  6 +++---
 .../libraries/haskell/yesod-static/default.nix  |  6 +++---
 .../libraries/haskell/yesod/default.nix         |  6 +++---
 .../libraries/haskell/zlib-bindings/0.0.3.2.nix | 15 ---------------
 .../zlib-bindings/{0.1.0.1.nix => default.nix}  |  0
 .../libraries/haskell/zlib-conduit/default.nix  |  4 ++--
 .../libraries/haskell/zlib-enum/default.nix     |  4 ++--
 pkgs/top-level/haskell-packages.nix             | 10 ++++------
 49 files changed, 185 insertions(+), 158 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/hoogle/relax-version-requirements.patch
 create mode 100644 pkgs/development/libraries/haskell/monadcryptorandom/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix
 rename pkgs/development/libraries/haskell/zlib-bindings/{0.1.0.1.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index d3e0c360e3eb..c1cacb9eaa35 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.6.0.1";
-  sha256 = "0hhhfq045drwfc4l3827006ybw9shwxi8mg25k9nsjx9wdhmkvy9";
+  version = "0.6.0.2";
+  sha256 = "04vyjpp3zi2g65rrkq4x4bddw0nfclniq5hhfq7l3jhybd8jxy51";
   buildDepends = [
     attoparsec blazeBuilder deepseq dlist hashable mtl syb text time
     unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index 59060ef0682b..402c9a0a6b5b 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-conduit";
-  version = "0.2.0.1";
-  sha256 = "1jxb2zanfmfqdmd5q770r4yz2s0giky9ify6fcsjwc8wiah4aji1";
+  version = "0.4.0";
+  sha256 = "1vlgpa90sgaym754w5wr3jjqjra9yrn3yn4fhi148v25y4ijrrc0";
   buildDepends = [ attoparsec conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index f5359ee0d6ad..50df0746c560 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -1,16 +1,17 @@
 { cabal, aeson, attoparsec, blazeBuilder, blazeBuilderConduit
-, caseInsensitive, conduit, httpConduit, httpTypes, network
-, tagsoup, text, transformers, unorderedContainers, xmlConduit
+, caseInsensitive, conduit, httpConduit, httpTypes, monadControl
+, network, resourcet, tagsoup, text, transformers
+, unorderedContainers, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "1.0.0.1";
-  sha256 = "0wrbr7kwd4g8idd6i4ghvpd5q7nq0b8zx5qphqvkbs128m0r308d";
+  version = "1.2.0.1";
+  sha256 = "1wyqkam1wgcg5rg4vjh3rlyffhiw7hmx5wshhg9hi2vqpgz0rs65";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
-    conduit httpConduit httpTypes network tagsoup text transformers
-    unorderedContainers xmlConduit
+    conduit httpConduit httpTypes monadControl network resourcet
+    tagsoup text transformers unorderedContainers xmlConduit
   ];
   meta = {
     homepage = "http://github.com/yesodweb/authenticate";
diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
index 5d92e3ba28d0..57752798446c 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder-conduit";
-  version = "0.2.0.1";
-  sha256 = "0p6kq43avsf21biskjardv7k47bag16ki2gmwjpk8ram9mwlz0zg";
+  version = "0.4.0";
+  sha256 = "0lpm480xc2y3syv42l3v7v6yhhnfr69bj7vc80fj0074h5288vjy";
   buildDepends = [ blazeBuilder conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
index 8d5cc0959375..e885c39cb05f 100644
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ b/pkgs/development/libraries/haskell/certificate/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "certificate";
-  version = "1.1.0";
-  sha256 = "10xpszfr51nd72kqmr4l1fna3bc3a272h3vf5b5hlls6k9kxzddg";
+  version = "1.1.1";
+  sha256 = "1n9sj69haqsiny1zn1lb09q86ga4ccypbdbkxsk5bzv10ygkk7d9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 52345c9446f1..7c303a09a4b2 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -1,13 +1,14 @@
-{ cabal, liftedBase, monadControl, text, transformers
-, transformersBase
+{ cabal, liftedBase, monadControl, resourcet, text, transformers
+, transformersBase, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "0.2.2";
-  sha256 = "1iwmf0zdrrxh8q3xja742j17nanj6va5zj9bs9a5m78whf8cc80j";
+  version = "0.4.0.1";
+  sha256 = "1n4a42ayww55hvvsnis6gdfwfciwxpzz0wxa0b3ybvmyr0jsidiq";
   buildDepends = [
-    liftedBase monadControl text transformers transformersBase
+    liftedBase monadControl resourcet text transformers
+    transformersBase void
   ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
index 552a40b6659b..c3bd4be6dbeb 100644
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-conduit";
-  version = "0.1.3.1";
-  sha256 = "0b8n2njz2ccdb9gql79l96jgv1nlq4ls09d25a2yy9f69w7h1ww5";
+  version = "0.3.0.1";
+  sha256 = "1j7j1ga9in9j9i5gxdkpijarcw7a0y8w0z4sj00d2yzb1qhdalzq";
   buildDepends = [ cereal conduit cryptoApi transformers ];
   meta = {
     homepage = "https://github.com/meteficha/crypto-conduit";
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 59f219529c9c..053fce65ce2d 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc
     parsec regexBase regexTdfa snapCore snapServer tagsoup time
   ];
+  patchPhase = ''
+    sed -i 's|hamlet      >= 0.10.3 && < 0.11|hamlet|' hakyll.cabal
+  '';
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 57bd463fecba..668ac64af94a 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,15 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "0.10.9.1";
-  sha256 = "1z2g7ymb8ihx13dkfq0k0s2fn1k6nig8h306i8p4q76wy7ybw3g0";
+  version = "1.0.1";
+  sha256 = "1h3bq9vignnbvnjwr35yf4am0k90l1c21x0phnhnigdx7wanygcz";
   buildDepends = [
     blazeBuilder blazeHtml failure parsec shakespeare text
   ];
   meta = {
-    homepage = "http://www.yesodweb.com/book/templates";
+    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "Haml-like template files that are compile-time checked";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index 089905fd620a..44f5a88f6fb8 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -5,6 +5,9 @@ cabal.mkDerivation (self: {
   version = "7.0.0";
   sha256 = "15r6xpyg193iwqin96mn7c9x5w7l8q9m3vbgiwv7bxvhdrl1dp7j";
   buildDepends = [ hamlet happstackServer text ];
+  patchPhase = ''
+    sed -i 's|hamlet >= 0.10 && <0.11|hamlet|' happstack-hamlet.cabal
+  '';
   meta = {
     homepage = "http://www.happstack.com/";
     description = "Support for Hamlet HTML templates in Happstack";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 29ba6b50d8f1..f81c281d378a 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "6.6.5";
-  sha256 = "1s0sa0sk2g6q55xwmzzdca327kp7mhxwc4dlg8lrdqa4dr3hm3gj";
+  version = "7.0.0";
+  sha256 = "09i573gracz04z8b5rls7jm6hq5dfg7a4gkn7xpfsl1nmhnf1xhv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index c03484b93f51..147212dc299c 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
     haskellSrcExts httpTypes parsec random safe tagsoup time
     transformers uniplate wai warp
   ];
+  patches = [ ./relax-version-requirements.patch ];
   meta = {
     homepage = "http://www.haskell.org/hoogle/";
     description = "Haskell API Search";
diff --git a/pkgs/development/libraries/haskell/hoogle/relax-version-requirements.patch b/pkgs/development/libraries/haskell/hoogle/relax-version-requirements.patch
new file mode 100644
index 000000000000..63b7f857697f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoogle/relax-version-requirements.patch
@@ -0,0 +1,15 @@
+--- hoogle-4.2.10-orig/hoogle.cabal	2012-04-05 18:43:21.465011394 +0200
++++ hoogle-4.2.10/hoogle.cabal	2012-04-05 18:46:22.791068726 +0200
+@@ -114,9 +114,9 @@
+         blaze-builder >= 0.2 && < 0.4,
+         http-types == 0.6.*,
+         case-insensitive >= 0.2 && < 0.5,
+-        conduit == 0.2.*,
+-        wai == 1.1.*,
+-        warp == 1.1.*,
++        conduit,
++        wai,
++        warp,
+         Cabal >= 1.8 && < 1.15
+ 
+     other-modules:
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index d49b0dde7d62..6490d14711d1 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -1,21 +1,21 @@
 { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
 , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
 , conduit, cookie, cprngAes, dataDefault, failure, httpTypes
-, liftedBase, monadControl, mtl, network, regexCompat, socks, text
-, time, tls, tlsExtra, transformers, transformersBase, utf8String
-, zlibConduit
+, liftedBase, monadControl, mtl, network, regexCompat, resourcet
+, socks, text, time, tls, tlsExtra, transformers, transformersBase
+, utf8String, void, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.2.6";
-  sha256 = "0gspqkydw5v4wb9s0ipy5s708nmqp3phkh3j95mzn6nlbk2r9kvn";
+  version = "1.4.0.2";
+  sha256 = "1zhsz9zqa4h5f18yalihcqa5p4ji50b8cw7h88i9s46q3fwcrbhh";
   buildDepends = [
     asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
     blazeBuilderConduit caseInsensitive certificate conduit cookie
     cprngAes dataDefault failure httpTypes liftedBase monadControl mtl
-    network regexCompat socks text time tls tlsExtra transformers
-    transformersBase utf8String zlibConduit
+    network regexCompat resourcet socks text time tls tlsExtra
+    transformers transformersBase utf8String void zlibConduit
   ];
   meta = {
     homepage = "http://www.yesodweb.com/book/http-conduit";
diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
new file mode 100644
index 000000000000..6a7c4d6fde5e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@@ -0,0 +1,15 @@
+{ cabal, cryptoApi, mtl, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "monadcryptorandom";
+  version = "0.4";
+  sha256 = "1wxqffi5x8kv0qrx82bvpvlqzzwy8vrw5ybqvf2h6cln36ff23m6";
+  buildDepends = [ cryptoApi mtl transformers ];
+  meta = {
+    homepage = "http://trac.haskell.org/crypto-api/wiki";
+    description = "A monad for using CryptoRandomGen";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index d1a067bcbb02..fa4b4e953b65 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-sqlite";
-  version = "0.8.0";
-  sha256 = "19dly53g4jzcqi9px49w9qaf2vnlpsxc6jf5xn63827ylmxlmk5q";
+  version = "0.9.0";
+  sha256 = "0l0w4g83bxaqlwwqs9xvlws0ksl0i8jmqsi4lpgywylvpywnhlgc";
   buildDepends = [
     aeson conduit monadControl persistent text transformers
   ];
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 22948d89946d..2beef995d2af 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "0.8.2";
-  sha256 = "0lmdp2gmrbgnp2ls4b76hnjcrllgmzrsiszkmbywkb2dmlxm5wdq";
+  version = "0.9.0";
+  sha256 = "17rcmqmakpqk2d630rpj6i345jc7hk225c26s5v8ks3hds4dn85w";
   buildDepends = [ aeson monadControl persistent text transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 0ebb1d2d7c0f..ea4052e8d9af 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -1,17 +1,17 @@
 { cabal, aeson, attoparsec, base64Bytestring, blazeHtml, conduit
-, liftedBase, monadControl, mtl, pathPieces, poolConduit, sqlite
-, text, time, transformers, transformersBase, unorderedContainers
-, vector
+, liftedBase, monadControl, mtl, pathPieces, poolConduit, resourcet
+, sqlite, text, time, transformers, transformersBase
+, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.8.0.2";
-  sha256 = "10v11fnx7dhj2gg09k3ji054iywbpazs789vhfxn56wfg6rz59wb";
+  version = "0.9.0";
+  sha256 = "00nd76is0yijzh52a5dgv00v30mcign9j86lmmfbpxpaa460g3hn";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
-    monadControl mtl pathPieces poolConduit text time transformers
-    transformersBase unorderedContainers vector
+    monadControl mtl pathPieces poolConduit resourcet text time
+    transformers transformersBase unorderedContainers vector
   ];
   extraLibraries = [ sqlite ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix
index 4d4f9101456c..40aea355c50c 100644
--- a/pkgs/development/libraries/haskell/pool-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix
@@ -1,10 +1,10 @@
-{ cabal, conduit, resourcePool, transformers }:
+{ cabal, resourcePool, resourcet, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "pool-conduit";
-  version = "0.0.0.1";
-  sha256 = "1im5fpwadg9hmajay6dkwmlzbp5rzn8hh9wh01iy23jgivkqk2q0";
-  buildDepends = [ conduit resourcePool transformers ];
+  version = "0.1.0";
+  sha256 = "1rxagidgd18a9xk7qqafz8l3nqlbr1s4231k8bf1sxd62b8rs4sm";
+  buildDepends = [ resourcePool resourcet transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
     description = "Resource pool allocations via ResourceT";
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 051a3800f695..72046994a87a 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Practical library for functional reactive programming (FRP)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.bluescreen303 ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.bluescreen303
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index d24529425d0e..f3a777e83382 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "0.10.8";
-  sha256 = "1c3a48rfrr5ifarr15zkcwg74zkqw08lhfk5fpkr5z6gxhwnbkas";
+  version = "1.0.1";
+  sha256 = "0n7ld8lr73k16gx3q1ab0qgsv6h0j77ma8dm7daisav9hci9sdbs";
   buildDepends = [ parsec shakespeare text ];
   meta = {
-    homepage = "http://www.yesodweb.com/book/templates";
+    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "Stick your haskell variables into css at compile time";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
index 47749bf05650..3d5d87e32103 100644
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-i18n";
-  version = "0.0.2.1";
-  sha256 = "1gaxngqihz6wi5d6hyb9mdlhgcxnr4bvmm1si919zgjndwnms8z8";
+  version = "1.0.0";
+  sha256 = "16zbf4y00l1jfah9j8xkhva5avgp6vg0spgjjrm3rxrs1kclxzpv";
   buildDepends = [ parsec shakespeare text ];
   meta = {
-    homepage = "http://www.yesodweb.com/book/i18n";
+    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "A type-based approach to internationalization";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index eb8d029496b2..bbdbfe894aa9 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "0.11.2";
-  sha256 = "1ck39bgl4wswd88w42b1fx5dlsd7r31d60ssv1lk11x6s4cjihgz";
+  version = "1.0.0";
+  sha256 = "0i94kx1cnnz8kaf3zzy8bphp3k670jgq4ajynzc0ys47hb5sy3h9";
   buildDepends = [ shakespeare text ];
   meta = {
-    homepage = "http://www.yesodweb.com/book/templates";
+    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "Stick your haskell variables into javascript/coffeescript at compile time";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index acf55d9d0828..75643dc638a8 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "0.11";
-  sha256 = "02h8vi28kzvv44hy1ix9jc01x4jx302cp71bdj8blsjxzqyr6aq8";
+  version = "1.0.0";
+  sha256 = "1bsvjmkjlqwmgbv1ki7a8djdfqvdcx7b7586a20zcgichxkkzgf6";
   buildDepends = [ shakespeare text ];
   meta = {
-    homepage = "http://www.yesodweb.com/book/templates";
+    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "Interpolation with quasi-quotation: put variables strings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 04305bbed224..78a5ed2913b9 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "0.11";
-  sha256 = "0ksjgl2x97n5ci346vlmc2kd8plvsg6kn5cncbxkd8c6w4h28a4b";
+  version = "1.0.0";
+  sha256 = "16f9ynk537sra32bs5c4wncryx9sb4mfabxcjyq2mw42b8kn7ggs";
   buildDepends = [ parsec text ];
   meta = {
-    homepage = "http://www.yesodweb.com/book/templates";
+    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "A toolkit for making compile-time interpolated templates";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index 3df9ac1a5e1f..82d316e4d765 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.2.1";
-  sha256 = "0mbnqdy7g9jp2d6x9mcrz315b4xhp92as28bxygf7jhc0aai66aq";
+  version = "0.2.2";
+  sha256 = "0id3d6ynl2xz4w0vcxm3wyj1kxjnchcl3h0xa4prh3s0giap8yax";
   buildDepends = [ network ];
   meta = {
     description = "Cross platform library for the sendfile system call";
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 7391896817df..82a638ee21f7 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.0.3";
-  sha256 = "0vj1kh62qs7badv00lcda9m3j53kc069kmrv5lmz62a96y4kx5yi";
+  version = "0.6.0.4";
+  sha256 = "1jbjqis5vfsv3yihgp1gdnj7zmdpvf6f47bbrkqdf7j75hyq2x66";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index 5a58a2002b16..98bbcdde1625 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls-extra";
-  version = "0.4.3";
-  sha256 = "1qr7l70c5fgqpf9hnhsngghcss2cannhca1snlvbcrq074hc2f2n";
+  version = "0.4.4";
+  sha256 = "1yj4v140pgvgpjv1g8h3dv00k983vjnsvdgc6y4w8ij8s4jvfbay";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 31b261c920c4..765d9621224b 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "0.9.1";
-  sha256 = "0724xwk3mchb2hd6sq4zhrs7pyd18banr0ndxc6bhim75vci53sl";
+  version = "0.9.2";
+  sha256 = "0qhgf3lxclcjgvnqz6zc41l4s6fzlwpg96jdp6n7q8snn4mdfn5s";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 0f181935cefa..64807567d731 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "1.1.2";
-  sha256 = "1nvzqg3wk7i2p1kcpb9f9wdzbrfl6gxid44l94mmvc7xjcmdl6qw";
+  version = "1.2.0";
+  sha256 = "1y41pw7aw10b2qdx64ygi0qcm0vjv2fx9hncfjqk5y5hlzblqv7s";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
     httpDate httpTypes text time transformers unixCompat wai
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 077fd7ae24f6..877edea7474e 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.1.0.1";
-  sha256 = "0kavvbywkkwj9914y622wsziwfca9qjaqz798mjhl1ip5bfy73b0";
+  version = "1.2.0.2";
+  sha256 = "0kfbk505nli51h9lx8865gfgcnji7kgxcjfmfdanv1im00ghrq1v";
   buildDepends = [
     ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
     conduit dataDefault fastLogger httpTypes network text time
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://github.com/yesodweb/wai";
     description = "Provides some basic WAI handlers and middleware";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index e08981e9c9c6..b16b3940d5dd 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "1.1.0.1";
-  sha256 = "0klyi3d4rivgvbasamxccvkz1w44ak0rcbx840ypdcjq8mbcb85f";
+  version = "1.2.0";
+  sha256 = "0kiv2z387a2m5crpxissmind6xnxglv7kfvznr0z9ycl6mi9fb9a";
   buildDepends = [
     blazeBuilder conduit httpTypes network text transformers vault
   ];
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 45632743e679..daacb75394a0 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -1,15 +1,15 @@
-{ cabal, blazeBuilder, blazeBuilderConduit, bytestringLexing
-, caseInsensitive, conduit, httpTypes, liftedBase, network
+{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
+, conduit, httpTypes, liftedBase, network, networkConduit
 , simpleSendfile, transformers, unixCompat, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.1.0.1";
-  sha256 = "1bgjnnkqgcyj00jd4rgsnpmac0yfd1ydd6i61b252gyrr9dd0wm9";
+  version = "1.2.0";
+  sha256 = "1dz7nrybr08k40phynk5xm7pc5hk86k5r92yr3pri1wdyg7yb6kv";
   buildDepends = [
-    blazeBuilder blazeBuilderConduit bytestringLexing caseInsensitive
-    conduit httpTypes liftedBase network simpleSendfile transformers
+    blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
+    liftedBase network networkConduit simpleSendfile transformers
     unixCompat wai
   ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 16d142ea955f..dc49a5ef7995 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -1,16 +1,16 @@
 { cabal, attoparsec, attoparsecConduit, blazeBuilder
 , blazeBuilderConduit, conduit, dataDefault, failure, monadControl
-, systemFilepath, text, transformers, xmlTypes
+, resourcet, systemFilepath, text, transformers, xmlTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "0.5.4";
-  sha256 = "1apvh2xlh4wkrfak0yqycsadsnkybfwjb86zqalm8ni9w2p9lwr6";
+  version = "0.7.0.1";
+  sha256 = "0ikkdgzvvadz7787jii8hwx8rls95jwvk7p4g2lw3ib8372hz4ly";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
-    conduit dataDefault failure monadControl systemFilepath text
-    transformers xmlTypes
+    conduit dataDefault failure monadControl resourcet systemFilepath
+    text transformers xmlTypes
   ];
   meta = {
     homepage = "http://github.com/snoyberg/xml";
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 0f41c7ace7b1..a495ba4df3ce 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -1,14 +1,14 @@
-{ cabal, aeson, attoparsec, conduit, text, transformers
+{ cabal, aeson, attoparsec, conduit, resourcet, text, transformers
 , unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.5.2";
-  sha256 = "1jhzycasfmjlfdpca1cflrggc16jp16852af7d6cwfsy342wh6gp";
+  version = "0.7.0";
+  sha256 = "10l5isiidmjn818zm05ac65yaidrkq0qcb1bcpwnvi0fgjr308n5";
   buildDepends = [
-    aeson attoparsec conduit text transformers unorderedContainers
-    vector
+    aeson attoparsec conduit resourcet text transformers
+    unorderedContainers vector
   ];
   meta = {
     homepage = "http://github.com/snoyberg/yaml/";
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index f656c17ffd1a..9671fc2583a8 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "0.8.1.1";
-  sha256 = "0wmvywyil6cnpxq777a0w4qknw4lr4i53nni4bcigrvmpg7gzgac";
+  version = "1.0.0";
+  sha256 = "1wdzz6xy55430xgaibzqwij1c4yswkz3da22n2016xl5nyspaijl";
   buildDepends = [
     aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail
     persistent persistentTemplate pureMD5 pwstoreFast random SHA
@@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Authentication for Yesod";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index e7929b578ed6..d197aabaf0df 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,26 +1,27 @@
 { cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal
 , clientsession, conduit, cookie, failure, fastLogger, hamlet
 , httpTypes, liftedBase, monadControl, parsec, pathPieces, random
-, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs, text
-, time, transformers, transformersBase, vector, wai, waiExtra
-, waiLogger, yesodRoutes
+, resourcet, shakespeare, shakespeareCss, shakespeareI18n
+, shakespeareJs, text, time, transformers, transformersBase, vector
+, wai, waiExtra, waiLogger, yesodRoutes
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "0.10.3";
-  sha256 = "1mw78h6h7b4g67kyg4y01rcgi5bpb97hhzx0yqk4bmq23mzisg9m";
+  version = "1.0.0";
+  sha256 = "0za3pflbcmgxd45jx0g2yc7cmhmhn1qk45j0mg4qq73r1lcyj6x0";
   buildDepends = [
     aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
     conduit cookie failure fastLogger hamlet httpTypes liftedBase
-    monadControl parsec pathPieces random shakespeare shakespeareCss
-    shakespeareI18n shakespeareJs text time transformers
+    monadControl parsec pathPieces random resourcet shakespeare
+    shakespeareCss shakespeareI18n shakespeareJs text time transformers
     transformersBase vector wai waiExtra waiLogger yesodRoutes
   ];
+  noHaddock = true;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Creation of type-safe, RESTful web applications";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix
index f839b5a16dbc..b7c7c3cecc26 100644
--- a/pkgs/development/libraries/haskell/yesod-default/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-default/default.nix
@@ -1,19 +1,20 @@
-{ cabal, shakespeareCss, shakespeareJs, text, transformers
-, unorderedContainers, wai, waiExtra, warp, yaml, yesodCore
+{ cabal, networkConduit, shakespeareCss, shakespeareJs, text
+, transformers, unorderedContainers, wai, waiExtra, warp, yaml
+, yesodCore
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-default";
-  version = "0.6.1";
-  sha256 = "0am5f8r2w7695zfc6vi0gy8yin9kfgj37qzr14r5v6wzhk1gq5da";
+  version = "1.0.0";
+  sha256 = "1l6x56ky3jf20nvz03jsxs19dvh1rz108gzhgbh86qjhcisaaqvi";
   buildDepends = [
-    shakespeareCss shakespeareJs text transformers unorderedContainers
-    wai waiExtra warp yaml yesodCore
+    networkConduit shakespeareCss shakespeareJs text transformers
+    unorderedContainers wai waiExtra warp yaml yesodCore
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Default config and main functions for your yesod application";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 8be3b65b93fd..4e7777df6604 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "0.4.2.1";
-  sha256 = "0zpmyqxbknz8pdib1gdf410jv4xndn4pphdigagqxl5m5c2hi1v2";
+  version = "1.0.0";
+  sha256 = "0ghv21yb54ldik0zq2k69d3s9dfs6wvy71nh5hkzh2hqpxhcq112";
   buildDepends = [
     blazeBuilder blazeHtml dataDefault emailValidate hamlet network
     persistent shakespeareCss shakespeareJs text time transformers wai
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Form handling support for Yesod Web Framework";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
index 25a4ba34f167..debc3d7cb096 100644
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-json";
-  version = "0.3.1";
-  sha256 = "17w82mfl364dc0k1zk1gqas3fyskz2jc50diq71fiw87apslva4v";
+  version = "1.0.0";
+  sha256 = "159j303yd3d5n2iqkbi55vj9d5d3jdnpnz115m9p6nf60qqmhj97";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs
     text transformers vector wai waiExtra yesodCore yesodRoutes
@@ -14,7 +14,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Generate content for Yesod using the aeson package";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
index b50e34df8b33..42f3f93c5076 100644
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -2,15 +2,15 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-persistent";
-  version = "0.3.1";
-  sha256 = "0pxzwqrq4wr9hdnppi5ri0iip2a8gg2y7lplmhn2791jc001ll7m";
+  version = "1.0.0";
+  sha256 = "1dawhs9ab2z5njq9m37p9zrr5wdzrmw4i0ixb2j4rhff8z50hjaf";
   buildDepends = [
     persistent persistentTemplate transformers yesodCore
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Some helpers for using Persistent from Yesod";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix
index 78781dc3f741..7037ac029630 100644
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-routes";
-  version = "0.0.1";
-  sha256 = "19bnww5idxr0j2l8g838idxkhhn73bhdz0bnvglinv7163fy8xhl";
+  version = "1.0.0";
+  sha256 = "1sqlcawsbv8sz22prcg41dvma6kywyl18dwp7msjlbkxgc2msp3a";
   buildDepends = [ pathPieces text vector ];
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Efficient routing for Yesod";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index dc065b572b28..316477101ff5 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "0.10.1";
-  sha256 = "07dapygk2n6d7sk39gwi06w96b13dqhxgx3l7ac198nil5x2m68m";
+  version = "1.0.0";
+  sha256 = "1l4wj8d5s7h52fx4bs0780rz43wmxaf5fllnj1z8iwkc7rydkydx";
   buildDepends = [
     base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
     httpTypes text transformers unixCompat wai waiAppStatic yesodCore
@@ -14,7 +14,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Static file serving subsite for Yesod Web Framework";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index f9320acc6e79..763de7b1595f 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "0.10.2";
-  sha256 = "15dswvhn9vz3bpdvbypg8x8gwhjkwj170b8mqznp10drccxyizs2";
+  version = "1.0.0";
+  sha256 = "05bmx6767a07am0vz5a6xa9xa51gwnsm2myvi8f5hzscfck2p6lp";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -21,7 +21,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Creation of type-safe, RESTful web applications";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix b/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix
deleted file mode 100644
index ba2a14a23d0a..000000000000
--- a/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib-bindings";
-  version = "0.0.3.2";
-  sha256 = "0x78fkjinfhhihhfihr0g5rc4d8jkhza3vw5qsyds74skd6rsy1q";
-  buildDepends = [ zlib ];
-  meta = {
-    homepage = "http://github.com/snoyberg/zlib-bindings";
-    description = "Low-level bindings to the zlib package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix
rename to pkgs/development/libraries/haskell/zlib-bindings/default.nix
diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
index 260ef687edbe..03ca2f155744 100644
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-conduit";
-  version = "0.2.0.1";
-  sha256 = "0css7cr9jj6rn829bw8mlbdl0d6iz9ckhsbrlrdcppx8k4gzb4rg";
+  version = "0.4.0";
+  sha256 = "0snjvpybkdcnqzw2dkja7fvakd6fwvr29l40ghxk48bzzs2j308i";
   buildDepends = [ conduit transformers zlibBindings ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix
index 9ee7063317f0..0e1245bca0c7 100644
--- a/pkgs/development/libraries/haskell/zlib-enum/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-enum";
-  version = "0.2.1";
-  sha256 = "0cnx7sbgj6s0gvq6pcqyi3xahx7x3bj47ap10z89qfbk0906rkq8";
+  version = "0.2.2";
+  sha256 = "1fmlvjj1krigj5aqipq5pf0mqnybr7zz50mgqr30kznfg48ry29y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ enumerator transformers zlibBindings ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6e02c61bc7a7..7082a17e4c47 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -996,6 +996,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   monadControl_0_3_1_1 = callPackage ../development/libraries/haskell/monad-control/0.3.1.1.nix {};
   monadControl = self.monadControl_0_3_1_1;
 
+  monadcryptorandom = callPackage ../development/libraries/haskell/monadcryptorandom {};
+
   monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
 
   monadPar = callPackage ../development/libraries/haskell/monad-par {};
@@ -1539,15 +1541,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   };
   zlib = self.zlib_0_5_3_3;
 
-  zlibBindings_0_0_3_2 = callPackage ../development/libraries/haskell/zlib-bindings/0.0.3.2.nix {};
-  zlibBindings_0_1_0_1 = callPackage ../development/libraries/haskell/zlib-bindings/0.1.0.1.nix {};
-  zlibBindings = self.zlibBindings_0_0_3_2;
+  zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
 
   zlibConduit = callPackage ../development/libraries/haskell/zlib-conduit {};
 
-  zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {
-    zlibBindings = self.zlibBindings_0_0_3_2;
-  };
+  zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {};
 
   Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {};
 

From c0172418aba3f740e7972197900ccb5d36f88f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 5 Apr 2012 17:32:02 +0000
Subject: [PATCH 062/293] hurdPartedCross: Make overridable.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2844d47a501a..4cafd94eb333 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1164,17 +1164,20 @@ let
 
   hurdPartedCross =
     if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-    then (parted.override {
-        # Needs the Hurd's libstore.
-        hurd = gnu.hurdCrossIntermediate;
+    then (makeOverridable
+            ({ hurd }:
+              (parted.override {
+                # Needs the Hurd's libstore.
+                inherit hurd;
 
-        # The Hurd wants a libparted.a.
-        enableStatic = true;
+                # The Hurd wants a libparted.a.
+                enableStatic = true;
 
-        gettext = null;
-        readline = null;
-        devicemapper = null;
-      }).hostDrv
+                gettext = null;
+                readline = null;
+                devicemapper = null;
+              }).hostDrv)
+           { hurd = gnu.hurdCrossIntermediate; })
     else null;
 
   patch = gnupatch;

From 0ef5f0961f0609d335bfce361a6c862251c97ed6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 5 Apr 2012 19:07:14 +0000
Subject: [PATCH 063/293] Trying to remove tarball error

svn path=/nixpkgs/trunk/; revision=33631
---
 pkgs/development/compilers/julia/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 4ab42562e740..4e2fc8f8f248 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -4,6 +4,7 @@
  } :
 let
   liblapackShared = liblapack.override{shared=true;};
+  realGcc = stdenv.gcc.gcc;
 in
 stdenv.mkDerivation rec {
   pname = "julia";
@@ -68,7 +69,8 @@ stdenv.mkDerivation rec {
 
     sed -e '/cd SuiteSparse-SYSTEM/,+1s@find /lib /usr/lib /usr/local/lib@find ${suitesparse}/lib@' -i external/Makefile
 
-    export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.gcc.gcc}/lib -L${stdenv.gcc.gcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk "
+    ${if realGcc ==null then "" else 
+    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk "''}
 
     sed -e 's@ cpp @ gcc -E @g' -i base/Makefile
   '';

From ef0b72dd6c683fd63450a16b84060eb4d8829c27 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Apr 2012 20:04:51 +0000
Subject: [PATCH 064/293] kde-runtime: drop patch (applied upstream)

svn path=/nixpkgs/trunk/; revision=33632
---
 pkgs/desktops/kde-4.8/kde-runtime.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix
index 6f2e4cf0e65e..a3b687404cc5 100644
--- a/pkgs/desktops/kde-4.8/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.8/kde-runtime.nix
@@ -10,13 +10,6 @@ kde {
 
   passthru.propagatedUserEnvPackages = [ virtuoso ];
 
-  patches = map fetchurl [{
-    # See https://bugs.kde.org/show_bug.cgi?id=289932
-    url = "http://bugsfiles.kde.org/attachment.cgi?id=69386";
-    name = "resourceidentifier.patch";
-    sha256 = "1fpjg1yc191i6ga9sz6r530q9zwh790m3qahsp0i6kzajwpi7jwz";
-  }];
-
   meta = {
     license = "LGPL";
   };

From 3bf7f18d4dcfa177998cab26bba47063f8532592 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Thu, 5 Apr 2012 21:12:12 +0000
Subject: [PATCH 065/293] Adding libconfig, a simple library for processing
 config files

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

diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix
new file mode 100644
index 000000000000..03b7b2cfb928
--- /dev/null
+++ b/pkgs/development/libraries/libconfig/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libconfig-${version}";
+  version = "1.4.8";
+
+  src = fetchurl {
+    url = "http://www.hyperrealm.com/libconfig/${name}.tar.gz";
+    sha256 = "1v817hy9y416i64ly17xdmgrn62qwj225wqakdzqr2j3pygm1c8q";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://www.hyperrealm.com/libconfig;
+    description = "a simple library for processing structured configuration files";
+    license = licenses.lgpl3;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cafd94eb333..f8be12222c34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -939,6 +939,8 @@ let
 
   lftp = callPackage ../tools/networking/lftp { };
 
+  libconfig = callPackage ../development/libraries/libconfig { };
+
   libtirpc = callPackage ../development/libraries/ti-rpc { };
 
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };

From bbd76bc29a89a7d25d2ce8bf52c59bbd49d591fa Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Thu, 5 Apr 2012 21:53:42 +0000
Subject: [PATCH 066/293] Adding ffado, Linux Firewire audio drivers

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

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
new file mode 100644
index 000000000000..16d88aacf3db
--- /dev/null
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchsvn, dbus_glib, dbus_libs, expat, glibmm, jackaudio
+, libconfig, libiec61883, libraw1394, libxmlxx, pkgconfig, pyqt4, python
+, pythonDBus, qt4, scons }:
+
+stdenv.mkDerivation rec {
+  name = "libffado-svn";
+
+  src = fetchsvn {
+    url = "http://subversion.ffado.org/ffado/trunk/libffado";
+    rev = "2117";
+    sha256 = "0awv1ccvxxxs5ycd5v3xn79flr79ia8290wmraf0646avihkcpvj";
+  };
+
+  buildInputs =
+    [ dbus_glib dbus_libs expat glibmm jackaudio libconfig libiec61883
+      libraw1394 libxmlxx pkgconfig pyqt4 python pythonDBus qt4 scons
+    ];
+
+  buildPhase = "scons";
+  installPhase = ''
+    scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado install
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.ffado.org;
+    description = "Firewire audio drivers";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8be12222c34..6ebb0782ff76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5421,6 +5421,8 @@ let
 
   eject = callPackage ../os-specific/linux/eject { };
 
+  ffado = callPackage ../os-specific/linux/ffado { };
+
   fbterm = builderDefsPackage (import ../os-specific/linux/fbterm) {
     inherit fontconfig gpm freetype pkgconfig ncurses;
   };

From e7b964ba33bec862e1408051f2a9009cc7c073c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 5 Apr 2012 22:34:11 +0000
Subject: [PATCH 067/293] Updating gnash. I'm not sure it builds... it takes a
 lot of time to build; at least it does not fail very early.

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

diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index f8415bbe22a4..db6bde782b99 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -10,14 +10,14 @@
 
 assert stdenv ? glibc;
 
-let version = "0.8.9"; in
+let version = "0.8.10"; in
 
 stdenv.mkDerivation rec {
   name = "gnash-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gnash/${version}/${name}.tar.bz2";
-    sha256 = "1ga8khwaympj4fphhpyqx6ddcikv0zmcpnlykcipny1xy33bs3gr";
+    sha256 = "090j5lly5r6jzbnvlc3mhay6dsrd9sfrkjcgqaibm4nz8lp0f9cn";
   };
 
   patchPhase = ''
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
          --with-sdl-incl=${SDL}/include/SDL                     \
          --with-npapi-plugindir=$out/plugins                    \
          --enable-media=gst                                     \
+         --without-gconf
          --enable-gui=gtk"
 
        # In `libmedia', Gnash compiles with "-I$gst_plugins_base/include",

From 4e9175965c0a13896b9c5a239886bbf9bacaa6d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Apr 2012 23:03:52 +0000
Subject: [PATCH 068/293] Updated Haskell packages.

 - clientsession: updated to version 0.7.4.3
 - data-default: updated to version 0.4.0
 - hoogle: updated to version 4.2.11
 - pandoc: updated to version 1.9.2
 - yesod-core: updated to version 1.0.0.1
 - yesod-form: updated to version 1.0.0.1
 - yesod-static: updated to version 1.0.0.1

svn path=/nixpkgs/trunk/; revision=33636
---
 pkgs/development/libraries/haskell/clientsession/default.nix | 4 ++--
 pkgs/development/libraries/haskell/data-default/default.nix  | 4 ++--
 pkgs/development/libraries/haskell/hoogle/default.nix        | 5 ++---
 pkgs/development/libraries/haskell/pandoc/default.nix        | 4 ++--
 pkgs/development/libraries/haskell/yesod-core/default.nix    | 5 ++---
 pkgs/development/libraries/haskell/yesod-form/default.nix    | 4 ++--
 pkgs/development/libraries/haskell/yesod-static/default.nix  | 4 ++--
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index 98bda13ddb75..f52122fb3293 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.7.4.2";
-  sha256 = "0b1afz9frky3kp2crrkmk8cvj77fnyyxrfv1ky0p0cb0lllvdhwp";
+  version = "0.7.4.3";
+  sha256 = "16bnglk2mhjdlcsbp4f470yjpb6dgdf49l9lf9ygfr6g3l6hll9f";
   buildDepends = [
     base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
     skein tagged
diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix
index dbb5ce9fc413..41728d393f83 100644
--- a/pkgs/development/libraries/haskell/data-default/default.nix
+++ b/pkgs/development/libraries/haskell/data-default/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-default";
-  version = "0.3.0";
-  sha256 = "0nbvknfa9kkc46fl1ffji0ghqb41wwsccmc55mya5zavfq9g05g9";
+  version = "0.4.0";
+  sha256 = "1pil8dxbk0zl2zw1xj9h2bpwpdriwfd7aj48kh0xpw9yazg3m802";
   buildDepends = [ dlist ];
   meta = {
     description = "A class for types with a default value";
diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 147212dc299c..9db10b33b1d7 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.10";
-  sha256 = "0vb4jj9m512v476fclmjzlk725hgba8q5njx2h1xwb0a76qvj2mg";
+  version = "4.2.11";
+  sha256 = "0m708qlj3q8s9vywg51gj7bwwasz5nxqxqhqh8f0k96iawqd9gid";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -14,7 +14,6 @@ cabal.mkDerivation (self: {
     haskellSrcExts httpTypes parsec random safe tagsoup time
     transformers uniplate wai warp
   ];
-  patches = [ ./relax-version-requirements.patch ];
   meta = {
     homepage = "http://www.haskell.org/hoogle/";
     description = "Haskell API Search";
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index d7003cc82fc0..4843c8afb801 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.9.1.2";
-  sha256 = "0sjdcmf3k64y9q0x1g2y3p7km73ir7gk4xxrvvx37aqwk3v9yraj";
+  version = "1.9.2";
+  sha256 = "1hp51ddfwlg4pg5n16jhf7w8r4s074n5baiy55fi2p47lx278jsq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index d197aabaf0df..c8e97a3e9e6b 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.0.0";
-  sha256 = "0za3pflbcmgxd45jx0g2yc7cmhmhn1qk45j0mg4qq73r1lcyj6x0";
+  version = "1.0.0.1";
+  sha256 = "15k4zq06qi3pv2l73mxjz1qm18d5665bis7m4fwnk83jbqj2l2xk";
   buildDepends = [
     aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
     conduit cookie failure fastLogger hamlet httpTypes liftedBase
@@ -17,7 +17,6 @@ cabal.mkDerivation (self: {
     shakespeareCss shakespeareI18n shakespeareJs text time transformers
     transformersBase vector wai waiExtra waiLogger yesodRoutes
   ];
-  noHaddock = true;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Creation of type-safe, RESTful web applications";
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 4e7777df6604..c3c8bf78fe1b 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.0.0";
-  sha256 = "0ghv21yb54ldik0zq2k69d3s9dfs6wvy71nh5hkzh2hqpxhcq112";
+  version = "1.0.0.1";
+  sha256 = "072q0sjx88dhpp8qz6lschb8y8hf1n6fqhxan69djaz03jrm164l";
   buildDepends = [
     blazeBuilder blazeHtml dataDefault emailValidate hamlet network
     persistent shakespeareCss shakespeareJs text time transformers wai
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 316477101ff5..a921e621f5cb 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "1.0.0";
-  sha256 = "1l4wj8d5s7h52fx4bs0780rz43wmxaf5fllnj1z8iwkc7rydkydx";
+  version = "1.0.0.1";
+  sha256 = "1zrpwd9dfqw5bzmrcsny4xkrw3y71ki8xhdfcyznf1bkmbnbim5n";
   buildDepends = [
     base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
     httpTypes text transformers unixCompat wai waiAppStatic yesodCore

From 3e5e535bb4e8a5dbac373640a0eb5720daefa926 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Apr 2012 23:05:05 +0000
Subject: [PATCH 069/293] dropped obsolete file

svn path=/nixpkgs/trunk/; revision=33637
---
 .../hoogle/relax-version-requirements.patch       | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/hoogle/relax-version-requirements.patch

diff --git a/pkgs/development/libraries/haskell/hoogle/relax-version-requirements.patch b/pkgs/development/libraries/haskell/hoogle/relax-version-requirements.patch
deleted file mode 100644
index 63b7f857697f..000000000000
--- a/pkgs/development/libraries/haskell/hoogle/relax-version-requirements.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- hoogle-4.2.10-orig/hoogle.cabal	2012-04-05 18:43:21.465011394 +0200
-+++ hoogle-4.2.10/hoogle.cabal	2012-04-05 18:46:22.791068726 +0200
-@@ -114,9 +114,9 @@
-         blaze-builder >= 0.2 && < 0.4,
-         http-types == 0.6.*,
-         case-insensitive >= 0.2 && < 0.5,
--        conduit == 0.2.*,
--        wai == 1.1.*,
--        warp == 1.1.*,
-+        conduit,
-+        wai,
-+        warp,
-         Cabal >= 1.8 && < 1.15
- 
-     other-modules:

From 799722afdedc77696b5ba9b6d204c721fd53983d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Apr 2012 23:11:00 +0000
Subject: [PATCH 070/293] git-annex: updated to version 3.20120405

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

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index ecdb08119965..0eb4d6e3add3 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -5,14 +5,14 @@
 }:
 
 let
-  version = "3.20120315";
+  version = "3.20120405";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
-    sha256 = "eeefca150f7f86a9373ac60cef9be22fe6fcb03fd13fda54793a4f8d46b747a1";
+    sha256 = "55c565904712d1c92db908081376e347d82bb68488121e3ae563c33749d259db";
     name = "git-annex-${version}.tar.gz";
   };
 

From cbded3238da6249c52bfafa01b9ee04e5828b7dc Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Thu, 5 Apr 2012 23:53:20 +0000
Subject: [PATCH 071/293] Adding dbus-cplusplus, c++ bindings for dbus

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

diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix
new file mode 100644
index 000000000000..2704b9586b1a
--- /dev/null
+++ b/pkgs/development/libraries/dbus-cplusplus/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, dbus, glib, gtkmm, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "dbus-cplusplus-${version}";
+  version = "0.9.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz";
+    name = "dbus-cplusplus.tar.gz";
+    sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw";
+  };
+
+  buildInputs = [ dbus glib gtkmm pkgconfig ];
+
+  configureFlags = "--disable-ecore";
+
+  meta = with stdenv.lib; {
+    homepage = http://dbus-cplusplus.sourceforge.net;
+    description = "C++ API for D-BUS";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ebb0782ff76..a2770464a4c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3386,6 +3386,8 @@ let
     useX11 = true;
   };
 
+  dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { };
+
   dbus_glib = callPackage ../development/libraries/dbus-glib { };
 
   dbus_java = callPackage ../development/libraries/java/dbus-java { };

From 725745c5b48647b925d38a66f2011ad7b2a9b09e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 6 Apr 2012 08:32:50 +0000
Subject: [PATCH 072/293] Add VRPN.

svn path=/nixpkgs/trunk/; revision=33640
---
 pkgs/development/libraries/vrpn/default.nix | 33 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/vrpn/default.nix

diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix
new file mode 100644
index 000000000000..3544e984077a
--- /dev/null
+++ b/pkgs/development/libraries/vrpn/default.nix
@@ -0,0 +1,33 @@
+{ fetchurl, stdenv, unzip, cmake, mesa }:
+
+stdenv.mkDerivation {
+  name = "vrpn-07.30";
+
+  src = fetchurl {
+    url = "ftp://ftp.cs.unc.edu/pub/packages/GRIP/vrpn/vrpn_07_30.zip";
+    sha256 = "1rysp08myv88q3a30dr7js7vg3hvq8zj2bjrpcgpp86fm3gjpvb4";
+  };
+
+  buildInputs = [ unzip cmake mesa ];
+
+  doCheck = false;                                # FIXME: test failure
+  checkTarget = "test";
+
+  meta = {
+    description = "Virtual Reality Peripheral Network";
+
+    longDescription =
+      '' The Virtual-Reality Peripheral Network (VRPN) is a set of classes
+         within a library and a set of servers that are designed to implement
+         a network-transparent interface between application programs and the
+         set of physical devices (tracker, etc.) used in a virtual-reality
+         (VR) system.
+      '';
+
+    homepage = http://www.cs.unc.edu/Research/vrpn/;
+
+    license = "BSL1.0"; # Boost Software License,
+                        # see # <http://www.cs.unc.edu/Research/vrpn/obtaining_vrpn.html>
+
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2770464a4c6..fa38d84de828 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4770,6 +4770,8 @@ let
 
   vmime = callPackage ../development/libraries/vmime { };
 
+  vrpn = callPackage ../development/libraries/vrpn { };
+
   vtk = callPackage ../development/libraries/vtk { };
 
   vxl = callPackage ../development/libraries/vxl {

From 292e9d102917ec5d7c0ba896c44fbd2faa9a8452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 6 Apr 2012 09:07:23 +0000
Subject: [PATCH 073/293] Ogre: Rewrite using `stdenv'; enable various
 plug-ins.

svn path=/nixpkgs/trunk/; revision=33641
---
 pkgs/development/libraries/ogre/default.nix | 83 ++++++++-------------
 1 file changed, 31 insertions(+), 52 deletions(-)

diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index e7744f43e128..110774e81d34 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -1,62 +1,41 @@
-x@{builderDefsPackage
-  , mesa, cmake, automake, libtool, autoconf
-  , freetype, freeimage, zziplib, randrproto, libXrandr
-  , libXaw, freeglut, libXt, libpng, boost, ois
-  , xproto, libX11, libXmu, libSM, pkgconfig
-  , libXxf86vm, xf86vidmodeproto, libICE
-  , renderproto, libXrender
-  , nvidia_cg_toolkit
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ fetchurl, stdenv
+, cmake, mesa
+, freetype, freeimage, zziplib, randrproto, libXrandr
+, libXaw, freeglut, libXt, libpng, boost, ois
+, xproto, libX11, libXmu, libSM, pkgconfig
+, libXxf86vm, xf86vidmodeproto, libICE
+, renderproto, libXrender
+, nvidia_cg_toolkit }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="ogre";
-    majorVersion="1";
-    minorVersion="7";
-    patchLevel="2";
-    version="${majorVersion}.${minorVersion}.${patchLevel}";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="mirror://sourceforge/project/${project}/${baseName}/${majorVersion}.${minorVersion}/${baseName}_src_v${majorVersion}-${minorVersion}-${patchLevel}.tar.bz2";
-    hash="10q8jx842s4aws9py6q67rb4dh5vli5vvg54jl8manjb4f388jh5";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation {
+  name = "ogre-1.7.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ogre/1.7/ogre_src_v1-7-2.tar.bz2";
+    sha256 = "10q8jx842s4aws9py6q67rb4dh5vli5vvg54jl8manjb4f388jh5";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  cmakeFlags =
+    (map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") [ "BSP" "CG" "OCTREE" "PCZ" "PFX" ])
+    ++ (map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]);
 
-  doMyBuild = a.fullDepEntry ("make -j4") ["doCmake"];
+  enableParallelBuilding = true;
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doCmake" "doMyBuild" "doMakeInstall"];
-
-  cmakeSkipRpath = false;
+  buildInputs =
+   [ cmake mesa
+     freetype freeimage zziplib randrproto libXrandr
+     libXaw freeglut libXt libpng boost ois
+     xproto libX11 libXmu libSM pkgconfig
+     libXxf86vm xf86vidmodeproto libICE
+     renderproto libXrender
+     nvidia_cg_toolkit
+   ];
 
   meta = {
     description = "A 3D engine";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    homepage = http://www.ogre3d.org/;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = stdenv.lib.platforms.linux;
     license = "MIT";
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.ogre3d.org/download/source";
-    };
-  };
-}) x
-
+}

From 45fbf22761de1ef002b66875a098d5bbf26c0dc9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 6 Apr 2012 10:20:37 +0000
Subject: [PATCH 074/293] Solve missing symbol problem

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

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 4e2fc8f8f248..62fce4c27754 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, blas, liblapack
  , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
- , ncurses
+ , ncurses, libunistring
  } :
 let
   liblapackShared = liblapack.override{shared=true;};
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gfortran perl m4 gmp pcre llvm blas liblapackShared readline 
-    fftw fftwSinglePrec libunwind suitesparse glpk ncurses
+    fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring
     ];
 
   configurePhase = ''
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     sed -e '/cd SuiteSparse-SYSTEM/,+1s@find /lib /usr/lib /usr/local/lib@find ${suitesparse}/lib@' -i external/Makefile
 
     ${if realGcc ==null then "" else 
-    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk "''}
+    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring "''}
 
     sed -e 's@ cpp @ gcc -E @g' -i base/Makefile
   '';

From 29ae6a2332d344a8796541f7625c3be217c69948 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Apr 2012 11:06:07 +0000
Subject: [PATCH 075/293] * Remove unused file.

svn path=/nixpkgs/trunk/; revision=33643
---
 STABLE | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 STABLE

diff --git a/STABLE b/STABLE
deleted file mode 100644
index c227083464fb..000000000000
--- a/STABLE
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file

From 3e923680d234e7bd17cd1eec468d43d65936eb0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 6 Apr 2012 13:01:55 +0000
Subject: [PATCH 076/293] Making gnash build with the default firefox
 xulrunner.

I have not checked if gnash needs it; I only changed it from the
xulrunner of iceweasel (which does not build) to that more maintained xulrunner
that builds.


svn path=/nixpkgs/trunk/; revision=33647
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa38d84de828..6fad754535a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6803,7 +6803,7 @@ let
   gmu = callPackage ../applications/audio/gmu { };
 
   gnash = callPackage ../applications/video/gnash {
-    xulrunner = icecatXulrunner3;
+    xulrunner = firefoxPkgs.xulrunner;
     inherit (gnome) gtkglext;
   };
 

From 9f2068ac9bc5931ea9e04f8c4cec7fb52b1628c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Apr 2012 13:10:19 +0000
Subject: [PATCH 077/293] * Don't build Boost on Cygwin.  It takes way too
 long.

svn path=/nixpkgs/trunk/; revision=33648
---
 pkgs/top-level/release.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 571f468aa0d2..1d2551352b8f 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -40,8 +40,6 @@ with (import ./release-lib.nix);
   bitlbee = linux;
   bittorrent = linux;
   blender = linux;
-  boost = all;
-  boostFull = all;
   bsdiff = all;
   btrfsProgs = linux;
   bvi = all;

From e24eab9b8723280eaa460109914a70d30370e107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 6 Apr 2012 13:18:58 +0000
Subject: [PATCH 078/293] GNU: Use `callPackage'.

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

diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index 67226c8a4788..0a42b83a46f2 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -12,7 +12,7 @@ let
   callPackage = newScope gnu;
 
   gnu = {
-    hurdCross = forceBuildDrv(import ./hurd {
+    hurdCross = forceBuildDrv(callPackage ./hurd {
       inherit fetchgit stdenv autoconf libtool texinfo
         glibcCross hurdPartedCross;
       inherit (gnu) machHeaders mig;
@@ -23,9 +23,11 @@ let
       gccCross = gccCrossStageFinal;
     });
 
-    hurdCrossIntermediate = forceBuildDrv(import ./hurd {
+    hurdCrossIntermediate = forceBuildDrv(callPackage ./hurd {
       inherit fetchgit stdenv autoconf libtool texinfo glibcCross;
       inherit (gnu) machHeaders mig;
+      hurdPartedCross = null;
+      libuuid = null;
       automake = automake111x;
       headersOnly = false;
       cross = assert crossSystem != null; crossSystem;
@@ -56,7 +58,7 @@ let
       hurd = null;
     };
 
-    libpthreadCross = forceBuildDrv(import ./libpthread {
+    libpthreadCross = forceBuildDrv(callPackage ./libpthread {
       inherit fetchgit stdenv autoconf automake libtool glibcCross;
       inherit (gnu) machHeaders hurdHeaders;
       hurd = gnu.hurdCrossIntermediate;

From 6a838a4ba1cd6afafa79bad0ea41fd9cc446d515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 6 Apr 2012 18:33:51 +0000
Subject: [PATCH 079/293] Making x11perf build.

svn path=/nixpkgs/trunk/; revision=33651
---
 pkgs/servers/x11/xorg/overrides.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 517e0f11b63d..46903124568e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -119,6 +119,11 @@ in
       '';
   };
 
+  x11perf = attrs: attrs // {
+    NIX_CFLAGS_COMPILE = "-I${args.freetype}/include/freetype2";
+    buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ];
+  };
+
   xf86inputevdev = attrs: attrs // {
     preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
     buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto];

From f04ca020f32edb111ac15cb62b2349bbfbbce34f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Apr 2012 18:56:00 +0000
Subject: [PATCH 080/293] xlockmore: updated to version 5.38

svn path=/nixpkgs/trunk/; revision=33652
---
 pkgs/misc/screensavers/xlockmore/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index 46a28039e79e..2df8f2fd97a7 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -1,23 +1,22 @@
-{stdenv, fetchurl, pam ? null, x11, freetype}:
+{ stdenv, fetchurl, pam ? null, x11 }:
 
 stdenv.mkDerivation rec {
-  # FIXME: Password authentication doesn't work!
 
-  name = "xlockmore-5.29";
+  name = "xlockmore-5.38";
   src = fetchurl {
     url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2";
-    sha256 = "47700f74cdd6ada80717358fd9cbb4316a0b2350fd527cfcd1e9b018d3818db2";
+    sha256 = "15x5l43zdjn881xf2m9psz9s2hvd2l8py2kzdhdh1v9m4ml20nf4";
   };
 
-  # Optionally, it can use GTK+ as well.
-  buildInputs = [pam x11 freetype];
+  # Optionally, it can use GTK+.
+  buildInputs = [ pam x11 ];
 
   # The `xlock' program needs to be linked against Glibc's
   # `libgcrypt', which contains `crypt(3)'.
   patches = [ ./makefile-libcrypt.patch ];
 
-  # Don't try to install `xlock' setuid.  Instead, the user should add
-  # it to `security.extraSetuidPrograms'.
+  # Don't try to install `xlock' setuid. Password authentication works
+  # fine via PAM without super user privileges.
   configureFlags =
       " --with-crypt"		# TODO: set --enable-appdefaultdir to a suitable value
     + " --disable-setuid"
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Xlockmore, a screen locker for the X Window System.";
-    homepage = http://www.tux.org/~bagleyd/xlockmore.html;
+    homepage = "http://www.tux.org/~bagleyd/xlockmore.html";
     license = "GPL";
   };
 }

From 44b6ab6d32aa7f908a9aacea4f6d5c48403ad332 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Apr 2012 18:56:05 +0000
Subject: [PATCH 081/293] slock: updated to version 1.0

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

diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index acd8aa699053..b33ca25fb107 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, xproto, libX11, libXext }:
 stdenv.mkDerivation rec {
-  name = "slock-0.9";
+  name = "slock-1.0";
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "1gfp2ic2i63yz8wrf5cqzv9g422j9qs249y7g4chq0brpcybgpc9";
+    sha256 = "b4e44ff1660f6f7eb270a0575d6ae1e0fbffcf0cdd96860a1695d57e89ae2df9";
   };
   buildInputs = [ xproto libX11 libXext	];
   installFlags = "DESTDIR=\${out} PREFIX=";

From 8beb891d52ed387255db66ebf26e4b49285f9e89 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Apr 2012 19:30:30 +0000
Subject: [PATCH 082/293] xscreensaver: updated to version 5.15 (and moved to
 pkgs/misc/screensavers hierarchy)

svn path=/nixpkgs/trunk/; revision=33655
---
 .../screensavers}/xscreensaver/default.nix                | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/{applications/graphics => misc/screensavers}/xscreensaver/default.nix (87%)

diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
similarity index 87%
rename from pkgs/applications/graphics/xscreensaver/default.nix
rename to pkgs/misc/screensavers/xscreensaver/default.nix
index 7458626769a4..f1d094d23743 100644
--- a/pkgs/applications/graphics/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.14";
+  version = "5.15";
   name = "xscreensaver-${version}";
 
   src = fetchurl {
     url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
-    sha256 = "08zhxccdny7198x4yi3hm7jrw98bi3mnc1c4fwhmf5rf8l7h9siy";
+    sha256 = "4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d";
   };
 
   buildInputs =
@@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
       "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
     ];
 
-  preConfigure =
+  preConfigure = ''
     ''
       sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
         -i driver/Makefile.in po/Makefile.in.in
     '';
 
   meta = {
-    homepage = http://www.jwz.org/xscreensaver/;
+    homepage = "http://www.jwz.org/xscreensaver/";
     description = "A set of screensavers";
     maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
     platforms = stdenv.lib.platforms.allBut "i686-cygwin";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fad754535a8..53c662c5afbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4795,7 +4795,7 @@ let
       perl = perl510;
     };
 
-  webkit_gtk2 = 
+  webkit_gtk2 =
     builderDefsPackage ../development/libraries/webkit/gtk2.nix {
       inherit (gnome) gtkdoc libsoup;
       inherit gtk atk pango glib;
@@ -7666,7 +7666,7 @@ let
     pyrex = pyrex095;
   };
 
-  xscreensaver = callPackage ../applications/graphics/xscreensaver {
+  xscreensaver = callPackage ../misc/screensavers/xscreensaver {
     inherit (gnome) libglade;
   };
 

From b73fb52648378a2caacaa447009c3780f34a0fbe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Apr 2012 19:39:43 +0000
Subject: [PATCH 083/293] Oops, fixed typo from previous commit.

svn path=/nixpkgs/trunk/; revision=33656
---
 pkgs/misc/screensavers/xscreensaver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index f1d094d23743..2cd915c498ee 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
     ];
 
-  preConfigure = ''
+  preConfigure =
     ''
       sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
         -i driver/Makefile.in po/Makefile.in.in

From bf47f4bbe39e7cf9b7443f64b12dc65f0dbf56bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Apr 2012 19:48:24 +0000
Subject: [PATCH 084/293] Updated Haskell packages.

 - HsOpenSSL: updated to version 0.10.2
 - zip-archive: updated to version 0.1.1.8

svn path=/nixpkgs/trunk/; revision=33657
---
 pkgs/development/libraries/haskell/HsOpenSSL/default.nix   | 4 ++--
 pkgs/development/libraries/haskell/zip-archive/default.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index a283acacd6d0..83bc8a227b74 100644
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HsOpenSSL";
-  version = "0.10.1.4";
-  sha256 = "1zrmngxm1xs51ql5za46lw6xkiyczx6qyvpami9k13g8k6kznqbz";
+  version = "0.10.2";
+  sha256 = "0bji31lb9n08ybzs23251q6afr32fjvzcjm7qs3fvy3r7bc3gqbf";
   buildDepends = [ network time ];
   extraLibraries = [ openssl ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix
index a7029cc953e5..050d48280d2e 100644
--- a/pkgs/development/libraries/haskell/zip-archive/default.nix
+++ b/pkgs/development/libraries/haskell/zip-archive/default.nix
@@ -2,15 +2,15 @@
 
 cabal.mkDerivation (self: {
   pname = "zip-archive";
-  version = "0.1.1.7";
-  sha256 = "1q52v18kl1j049kk3yb7rp0k27p6q7r72mg1vcbdid6qd7a9dh48";
+  version = "0.1.1.8";
+  sha256 = "0rq4jk1sxi6lrc7d7sh500lh83v2fxxrfh2gknqiyzxd3wh364y1";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary digest filepath mtl utf8String zlib ];
   meta = {
     homepage = "http://github.com/jgm/zip-archive";
     description = "Library for creating and modifying zip archives";
-    license = "GPL";
+    license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };

From 9b0323859fea9cc56121df28b1bfa03c4d68a01c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 7 Apr 2012 11:59:28 +0000
Subject: [PATCH 085/293] Updated Haskell packages.

 - cabal2nix: updated to version 1.31
 - gloss: updated to version 1.7.2.1
 - repa-algorithms: updated to version 3.1.0.1
 - repa-bytestring: deleted obsolete package
 - repa-examples: updated to version 3.1.0.1
 - repa-io: updated to version 3.1.0.1
 - repa: updated to version 3.1.0.1
 - semigroups: updated to version 0.8.0.1

svn path=/nixpkgs/trunk/; revision=33659
---
 .../libraries/haskell/gloss/default.nix           |  4 ++--
 .../libraries/haskell/repa-algorithms/default.nix |  7 ++++---
 .../libraries/haskell/repa-bytestring/default.nix | 15 ---------------
 .../libraries/haskell/repa-examples/default.nix   |  4 ++--
 .../libraries/haskell/repa-io/default.nix         |  8 ++++----
 .../libraries/haskell/repa/default.nix            |  4 ++--
 .../libraries/haskell/semigroups/default.nix      |  4 ++--
 .../tools/haskell/cabal2nix/default.nix           |  4 ++--
 pkgs/top-level/haskell-packages.nix               |  5 -----
 9 files changed, 18 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/repa-bytestring/default.nix

diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index d5b828cb0e71..0e41ecd756a5 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.7.1.1";
-  sha256 = "0fmmcmmdcvc5vj33bm9xzzb2jpnnb7r89ghdqwgg2c5gxjqbcfbd";
+  version = "1.7.2.1";
+  sha256 = "1s8xq39xnynsslzrzm7svv8qd301j66zcz9ckcs4f1zwzpq62z0p";
   buildDepends = [ bmp GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
index f97981966933..c938b6eb52ad 100644
--- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
@@ -1,10 +1,11 @@
-{ cabal, repa, vector }:
+{ cabal, llvm, repa, vector }:
 
 cabal.mkDerivation (self: {
   pname = "repa-algorithms";
-  version = "2.2.0.1";
-  sha256 = "1ggxa2h2swgf7621nrzlqmmyi3h2v526w69zcwvms84kyd257p4p";
+  version = "3.1.0.1";
+  sha256 = "17479hp6x02vdwbn201gvxrqsc6smp5q1ip61qbfsvirjih8f3pz";
   buildDepends = [ repa vector ];
+  extraLibraries = [ llvm ];
   meta = {
     homepage = "http://repa.ouroborus.net";
     description = "Algorithms using the Repa array library";
diff --git a/pkgs/development/libraries/haskell/repa-bytestring/default.nix b/pkgs/development/libraries/haskell/repa-bytestring/default.nix
deleted file mode 100644
index 1d03f5c64586..000000000000
--- a/pkgs/development/libraries/haskell/repa-bytestring/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, repa, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "repa-bytestring";
-  version = "2.2.0.1";
-  sha256 = "0yc814wyiy5cb9j04515rv24mm4qd5xqyz2dxsmg1p46qb69hvsg";
-  buildDepends = [ repa vector ];
-  meta = {
-    homepage = "http://repa.ouroborus.net";
-    description = "Conversions between Repa Arrays and ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix
index 18a8cb44bd6b..e807a01fe205 100644
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ b/pkgs/development/libraries/haskell/repa-examples/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa-examples";
-  version = "2.2.0.1";
-  sha256 = "0rqpq4v2ir86x9z0aw8pcz929imcw9lf415j88kg12x2rk451mm0";
+  version = "3.1.0.1";
+  sha256 = "1zyhq7qd7j0a0rx7j395j6330kybfi0g3whsf25clrg4znd1iwjc";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ random repa repaAlgorithms repaIo vector ];
diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix
index 0d4772016fb3..01325019a709 100644
--- a/pkgs/development/libraries/haskell/repa-io/default.nix
+++ b/pkgs/development/libraries/haskell/repa-io/default.nix
@@ -1,10 +1,10 @@
-{ cabal, binary, bmp, repa, repaBytestring, vector }:
+{ cabal, binary, bmp, repa, vector }:
 
 cabal.mkDerivation (self: {
   pname = "repa-io";
-  version = "2.2.0.1";
-  sha256 = "1akp6xkfvbc7jmnzlrz4y5fncqrv9d06y981dndcv6lgxz4hv4j1";
-  buildDepends = [ binary bmp repa repaBytestring vector ];
+  version = "3.1.0.1";
+  sha256 = "1il0zsba9qz0560c56f9hn6wks5kk1bvh8bpng46w70c12gxh81w";
+  buildDepends = [ binary bmp repa vector ];
   meta = {
     homepage = "http://repa.ouroborus.net";
     description = "Read and write Repa arrays in various formats";
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index 5bb059a457cb..cd98b9a9c1b7 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa";
-  version = "2.2.0.1";
-  sha256 = "016cigxivjd17g0hysf76b3lznjpk478q0hg9hsy154ms7xap3dy";
+  version = "3.1.0.1";
+  sha256 = "0dcx2n7bqw8rrr1aaxnrbmjv0c89lvxl6fgccrw0qci5rzwccnp2";
   buildDepends = [ QuickCheck vector ];
   meta = {
     homepage = "http://repa.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index 6c070bc6d24b..f2b7e88de244 100644
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroups";
-  version = "0.8";
-  sha256 = "12ly9f1lxzrxvwkcx25cjik7d1f1l2j1rkd0cabgpcg53hz4158c";
+  version = "0.8.0.1";
+  sha256 = "0z2pmfqk75qpjv720l06237cjdn8nmcchzyq7rp4wcvgdik8ahin";
   meta = {
     homepage = "http://github.com/ekmett/semigroups/";
     description = "Haskell 98 semigroups";
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index d81d92c5cfae..11369a427853 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.30";
-  sha256 = "1qkrdxqvasm0q4sh98c50qwpm7nff6yzp4yjhx8sdy39v4gvbw2b";
+  version = "1.31";
+  sha256 = "04qc74h6w3mvb3h3mv0hb3bbwk22ifl29hg3dcq1d5bg4y21j1vr";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7082a17e4c47..3b6529c7315b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1210,13 +1210,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   regular = callPackage ../development/libraries/haskell/regular {};
 
   repa = callPackage ../development/libraries/haskell/repa {};
-
   repaAlgorithms = callPackage ../development/libraries/haskell/repa-algorithms {};
-
-  repaBytestring = callPackage ../development/libraries/haskell/repa-bytestring {};
-
   repaExamples = callPackage ../development/libraries/haskell/repa-examples {};
-
   repaIo = callPackage ../development/libraries/haskell/repa-io {};
 
   RepLib = callPackage ../development/libraries/haskell/RepLib {};

From 7b00953c70ffecde83e4ed96b1a1709abecd5c99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 7 Apr 2012 13:16:33 +0000
Subject: [PATCH 086/293] haskell-hoogle: fixed build

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3b6529c7315b..20219643be83 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -858,9 +858,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hmatrix = callPackage ../development/libraries/haskell/hmatrix {};
 
-  hoogle = callPackage ../development/libraries/haskell/hoogle {
-    haskellSrcExts = self.haskellSrcExts_1_11_1;
-  };
+  hoogle = callPackage ../development/libraries/haskell/hoogle {};
 
   hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
 

From 285af645e67f6e817afeef4f1122b65d1702077f Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 7 Apr 2012 23:57:30 +0000
Subject: [PATCH 087/293] Adding extra requirements, fixing some of the ffado
 utilities

svn path=/nixpkgs/trunk/; revision=33664
---
 pkgs/os-specific/linux/ffado/default.nix      | 31 +++++++++++++------
 .../linux/ffado/enable-mixer-and-dbus.patch   | 25 +++++++++++++++
 2 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 16d88aacf3db..86ce29c8f61f 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -1,9 +1,9 @@
-{stdenv, fetchsvn, dbus_glib, dbus_libs, expat, glibmm, jackaudio
-, libconfig, libiec61883, libraw1394, libxmlxx, pkgconfig, pyqt4, python
-, pythonDBus, qt4, scons }:
+{ stdenv, fetchsvn, dbus, dbus_cplusplus, expat, glibmm, libconfig
+, libavc1394, libiec61883, libraw1394, libxmlxx, makeWrapper, pkgconfig
+, pyqt4, python, pythonDBus, qt4, scons }:
 
 stdenv.mkDerivation rec {
-  name = "libffado-svn";
+  name = "libffado-svn-2117";
 
   src = fetchsvn {
     url = "http://subversion.ffado.org/ffado/trunk/libffado";
@@ -12,18 +12,31 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ dbus_glib dbus_libs expat glibmm jackaudio libconfig libiec61883
-      libraw1394 libxmlxx pkgconfig pyqt4 python pythonDBus qt4 scons
+    [ dbus dbus_cplusplus expat glibmm libavc1394 libconfig
+      libiec61883 libraw1394 libxmlxx makeWrapper pkgconfig pyqt4
+      python pythonDBus qt4 scons
     ];
 
-  buildPhase = "scons";
+  patches = [ ./enable-mixer-and-dbus.patch ];
+
+  preBuild = "export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages";
+
+  # TODO fix ffado-diag, it doesn't seem to use PYPKGDIR
+  buildPhase = "scons PYPKGDIR=$out/$PYLIBSUFFIX";
   installPhase = ''
-    scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado install
+    scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \
+      PYPKGDIR=$out/$PYLIBSUFFIX install
+
+    PYDIR=$out/$PYLIBSUFFIX
+    wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \
+      $PYTHONPATH:$PYDIR:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX:
+    wrapProgram $out/bin/ffado-diag --prefix PYTHONPATH : \
+      $PYTHONPATH:$PYDIR:$out/share/libffado/python:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX:
     '';
 
   meta = with stdenv.lib; {
     homepage = http://www.ffado.org;
-    description = "Firewire audio drivers";
+    description = "FireWire audio drivers";
     license = licenses.gpl3;
     maintainers = [ maintainers.goibhniu ];
   };
diff --git a/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch b/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
new file mode 100644
index 000000000000..44c0b991e0ad
--- /dev/null
+++ b/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
@@ -0,0 +1,25 @@
+--- libffado-r2117/SConstruct	1970-01-01 01:00:01.000000000 +0100
++++ libffado-r2117/SConstruct	2012-04-06 18:26:45.521100690 +0200
+@@ -314,10 +314,8 @@
+ #
+ 
+ # PyQT checks
+-build_mixer = False
+-if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
+-    env['PYUIC4'] = True
+-    build_mixer = True
++env['PYUIC4'] = True
++build_mixer = True
+ 
+ if conf.CheckForApp( 'xdg-desktop-menu --help' ):
+     env['XDG_TOOLS'] = True
+@@ -348,7 +346,8 @@
+     name2 = pkg.replace("+","").replace(".","").replace("-","").upper()
+     env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, pkgs[pkg] )
+ 
+-if not env['DBUS1_FLAGS'] or not env['DBUSC1_FLAGS'] or not conf.CheckForApp('which dbusxx-xml2cpp'):
++
++if False:
+     env['DBUS1_FLAGS'] = ""
+     env['DBUSC1_FLAGS'] = ""
+     print """

From bce9de06bd1a1be5bc88816841135bb056adc4bc Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 8 Apr 2012 00:00:03 +0000
Subject: [PATCH 088/293] Adding firewire support

svn path=/nixpkgs/trunk/; revision=33665
---
 pkgs/misc/jackaudio/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 2470915ea8ed..7e6d0da90317 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, alsaLib, python, dbus, pythonDBus, expat, makeWrapper }:
+{ stdenv, fetchurl, alsaLib, dbus, expat, libsamplerate
+, libsndfile, makeWrapper, pkgconfig, python, pythonDBus
+, firewireSupport ? false, ffado ? null }:
+
+assert firewireSupport -> ffado != null;
 
 stdenv.mkDerivation rec {
   name = "jackdbus-${version}";
@@ -9,9 +13,16 @@ stdenv.mkDerivation rec {
     sha256 = "0788092zxrivcfnfg15brpjkf14x8ma8cwjz4k0b9xdxajn2wwac";
   };
 
-  buildInputs = [ pkgconfig alsaLib python dbus pythonDBus expat makeWrapper ];
+  buildInputs =
+    [ alsaLib dbus expat libsamplerate libsndfile makeWrapper
+      pkgconfig python pythonDBus
+    ] ++ (stdenv.lib.optional firewireSupport ffado);
 
-  configurePhase = "cd jack-1.9.8 && python waf configure --prefix=$out --dbus --alsa";
+  configurePhase = ''
+    cd jack-1.9.8
+    python waf configure --prefix=$out --dbus --alsa \
+      ${if firewireSupport then "--firewire" else ""}
+  '';
 
   buildPhase = "python waf build";
 

From d989f361ac129ba8830d738cb97e212d2e96fdd7 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 8 Apr 2012 00:16:59 +0000
Subject: [PATCH 089/293] Updating to 0.121.3, adding optional FireWire support
 and replacing composableDerivation with mkDerivation

svn path=/nixpkgs/trunk/; revision=33666
---
 pkgs/misc/jackaudio/jack1.nix | 48 +++++++++++------------------------
 1 file changed, 15 insertions(+), 33 deletions(-)

diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index bb11e5d5f043..540735ab8108 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -1,44 +1,26 @@
-# Perhaps we can get some ideas from here ? http://gentoo-wiki.com/HOWTO_Jack
-# still much to test but it compiles now
+{ stdenv, fetchurl, pkgconfig, alsaLib
+, firewireSupport ? false, ffado ? null }:
 
-{ composableDerivation, fetchurl, pkgconfig, alsaLib }:
+assert firewireSupport -> ffado != null;
 
-let inherit (composableDerivation) edf; in
+stdenv.mkDerivation rec {
+  name = "jack-${version}";
+  version = "0.121.3";
 
-composableDerivation.composableDerivation {} {
-  name = "jack-0.120.1";
-  
   src = fetchurl {
-    url = "http://jackaudio.org/downloads/jack-audio-connection-kit-0.120.1.tar.gz";
-    sha256 = "02h8536c67059gq2vsl323kvy9jak9dp0syi1h58awlkbgzlg80d";
+    url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz";
+    sha256 = "1ypa3gjwy4vmaskin0vczmmdwybckkl42wmkfabx3v5yx8yms2dp";
   };
   
-  buildInputs = [ pkgconfig ];
-  
-  flags =
-      # FIXME: tidy up
-       edf { name = "posix-shm"; } #use POSIX shm API
-    // edf { name = "timestamps"; }                      # allow clients to use the JACK timestamp API
-    // edf { name = "capabilities"; }                   #use libcap to gain realtime scheduling priviledges
-    // edf { name = "oldtrans"; }                      #remove old transport interfaces
-    // edf { name = "stripped-jackd"; }                 #strip jack before computing its md5 sum
-    // edf { name = "portaudio"; }                     #ignore PortAudio driver
-    // edf { name = "coreaudio"; }                     #ignore CoreAudio driver
-    // edf { name = "oss"; }                           #ignore OSS driver
-    // edf { name = "freebob"; }                       #ignore FreeBob driver
-    // edf { name = "alsa"; enable = { buildInputs = [ alsaLib ]; }; };
+  preBuild = "echo ok";
 
-  cfg = {
-    posix_shmSupport = true;
-    timestampsSupport = true;
-    alsaSupport = true;
-  };
-  
-  # make sure the jackaudio is found by symlinking lib64 to lib
-  postInstall = ''
-    mkdir -p $out/lib
-    ln -s $out/lib{64,}/pkgconfig
+  configureFlags = ''
+    ${if firewireSupport then "--enable-firewire" else ""}
   '';
+
+  buildInputs = 
+    [ pkgconfig alsaLib
+    ] ++ (stdenv.lib.optional firewireSupport ffado);
   
   meta = {
     description = "JACK audio connection kit";

From 78ffc6b30d3d45739c2a5ce1f18d5dff302a6c66 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 8 Apr 2012 00:25:09 +0000
Subject: [PATCH 090/293] Adding a2jmidid

svn path=/nixpkgs/trunk/; revision=33667
---
 pkgs/applications/audio/a2jmidid/default.nix | 27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 pkgs/applications/audio/a2jmidid/default.nix

diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
new file mode 100644
index 000000000000..ca8565ac3238
--- /dev/null
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, alsaLib, dbus, jackaudio, pkgconfig, python }:
+
+stdenv.mkDerivation rec {
+  name = "a2jmidid-${version}";
+  version = "7";
+
+  src = fetchurl {
+    url = "http://download.gna.org/a2jmidid/${name}.tar.bz2";
+    sha256 = "1pl91y7npirhmikzlizpbyx2vkfvdkvc6qvc2lv4capj3cp6ypx7";
+  };
+
+  buildInputs = [ alsaLib dbus jackaudio pkgconfig python ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = http://home.gna.org/a2jmidid;
+    description = "daemon for exposing legacy ALSA sequencer applications in JACK MIDI system";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+
+  };
+}

From 3ec76c0a25136d6f5bcc1d968ce3bea9a30afe52 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 8 Apr 2012 00:28:37 +0000
Subject: [PATCH 091/293] Adding a2jmidid, a daemon for exposing legacy ALSA
 sequencer applications in JACK MIDI system

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53c662c5afbe..1c565bd7b334 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6300,6 +6300,7 @@ let
 
   ### APPLICATIONS
 
+  a2jmidid = callPackage ../applications/audio/a2jmidid { };
 
   aangifte2005 = callPackage_i686 ../applications/taxes/aangifte-2005 { };
 

From 4292793d4078bcc0128f50600575de5f0cff7e84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Apr 2012 10:48:14 +0000
Subject: [PATCH 092/293] git-annex: updated to version 3.20120406

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

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 0eb4d6e3add3..1e4ee72e3ffa 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -5,14 +5,14 @@
 }:
 
 let
-  version = "3.20120405";
+  version = "3.20120406";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
-    sha256 = "55c565904712d1c92db908081376e347d82bb68488121e3ae563c33749d259db";
+    sha256 = "486b35a8dd342681cea6544af9668330739f3a8d40d4a70b9d56f64195f96954";
     name = "git-annex-${version}.tar.gz";
   };
 

From e1155499ada0be87fefff780c26085f6a33e6bfb Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 8 Apr 2012 11:10:11 +0000
Subject: [PATCH 093/293] Reverting to revision 1995, this is what AVLinux
 uses, and works well with jackdbus too

svn path=/nixpkgs/trunk/; revision=33670
---
 pkgs/os-specific/linux/ffado/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 86ce29c8f61f..3755bbe80bbd 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -3,12 +3,11 @@
 , pyqt4, python, pythonDBus, qt4, scons }:
 
 stdenv.mkDerivation rec {
-  name = "libffado-svn-2117";
+  name = "libffado-svn-1995";
 
   src = fetchsvn {
     url = "http://subversion.ffado.org/ffado/trunk/libffado";
-    rev = "2117";
-    sha256 = "0awv1ccvxxxs5ycd5v3xn79flr79ia8290wmraf0646avihkcpvj";
+    rev = "1995";
   };
 
   buildInputs =

From fc1bc797bdfde80bcac895b14a9bcf2830b472e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Apr 2012 11:14:28 +0000
Subject: [PATCH 094/293] Updated Haskell packages.

 - file-embed: updated to version 0.0.4.2
 - mtl: added version 2.1
 - texmath: updated to version 0.6.0.5
 - text: added version 0.11.2.0
 - removed obsolete overrides

svn path=/nixpkgs/trunk/; revision=33671
---
 .../libraries/haskell/file-embed/default.nix  |  4 +--
 .../development/libraries/haskell/mtl/2.1.nix | 14 +++++++++
 .../libraries/haskell/texmath/default.nix     |  4 +--
 .../libraries/haskell/text/0.11.2.0.nix       | 15 ++++++++++
 pkgs/top-level/haskell-packages.nix           | 29 ++++++++-----------
 5 files changed, 45 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/mtl/2.1.nix
 create mode 100644 pkgs/development/libraries/haskell/text/0.11.2.0.nix

diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix
index 3cb11471baad..0e18777b5ba6 100644
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ b/pkgs/development/libraries/haskell/file-embed/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "file-embed";
-  version = "0.0.4.1";
-  sha256 = "156ydqljhxp16192s4pj6h8jcvrfmj2lnsvzy0zg394wi97bxpi2";
+  version = "0.0.4.2";
+  sha256 = "1nismycqm8shh6zgjjfysc0yhn5yrcdvw23k6adzizawsvr92bkw";
   meta = {
     homepage = "http://github.com/snoyberg/file-embed/tree/master";
     description = "Use Template Haskell to embed file contents directly";
diff --git a/pkgs/development/libraries/haskell/mtl/2.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.nix
new file mode 100644
index 000000000000..e231a3a1f3aa
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mtl/2.1.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "mtl";
+  version = "2.1";
+  sha256 = "041fhi6vgddj43y26ljhxqjryjbsj0rb6m6gfpvrjynzp6c7c5n6";
+  buildDepends = [ transformers ];
+  meta = {
+    description = "Monad classes, using functional dependencies";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 82a638ee21f7..a519170ca85f 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.0.4";
-  sha256 = "1jbjqis5vfsv3yihgp1gdnj7zmdpvf6f47bbrkqdf7j75hyq2x66";
+  version = "0.6.0.5";
+  sha256 = "08zryp5y2llhzwbp93wbm37c1lykqgrbq8h23bv39ql8idpym0wq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];
diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix
new file mode 100644
index 000000000000..213464f3f19e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/text/0.11.2.0.nix
@@ -0,0 +1,15 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "text";
+  version = "0.11.2.0";
+  sha256 = "1fx5302m41awzbms410x3gcixsck36rl7i1ma7pz6l5d1pmi538p";
+  buildDepends = [ deepseq ];
+  meta = {
+    homepage = "https://github.com/bos/text";
+    description = "An efficient packed Unicode text type";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 20219643be83..a97d899bab2b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -153,7 +153,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     xhtml        = self.xhtml_3000_2_0_5;       # 7.4.1 ok
     zlib         = self.zlib_0_5_3_3;           # 7.4.1 ok
     HTTP         = self.HTTP_4000_2_2;          # 7.4.1 ok
-    text         = self.text_0_11_1_13;         # 7.4.1 ok
+    text         = self.text_0_11_2_0;          # 7.4.1 ok
     transformers = self.transformers_0_2_2_0;   # 7.4.1 ok
     mtl          = self.mtl_2_0_1_0;            # 7.4.1 ok
     random       = self.random_1_0_1_1;         # 7.4.1 ok
@@ -564,10 +564,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cprngAes = callPackage ../development/libraries/haskell/cprng-aes {};
 
-  criterion = callPackage ../development/libraries/haskell/criterion {
-    mtl = self.mtl2;
-    parsec = self.parsec3;
-  };
+  criterion = callPackage ../development/libraries/haskell/criterion {};
 
   Crypto = callPackage ../development/libraries/haskell/Crypto {};
 
@@ -970,9 +967,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   mathFunctions = callPackage ../development/libraries/haskell/math-functions {};
 
-  maude = callPackage ../development/libraries/haskell/maude {
-    parsec = self.parsec3;
-  };
+  maude = callPackage ../development/libraries/haskell/maude {};
 
   MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
 
@@ -1017,9 +1012,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {};
   mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {};
   mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {};
+  mtl_2_1 = callPackage ../development/libraries/haskell/mtl/2.1.nix {
+    transformers = self.transformers_0_3_0_0;
+  };
   mtl1 = self.mtl_1_1_0_2;
-  mtl2 = self.mtl_2_0_1_0;
-  mtl  = self.mtl1;
+  mtl2 = self.mtl_2_1;
+  mtl  = self.mtl2;
 
   mtlparse = callPackage ../development/libraries/haskell/mtlparse {};
 
@@ -1357,7 +1355,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {};
   text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {};
   text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {};
-  text = self.text_0_11_1_13;
+  text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {};
+  text = self.text_0_11_2_0;
 
   thespian = callPackage ../development/libraries/haskell/thespian {};
 
@@ -1428,9 +1427,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   void = callPackage ../development/libraries/haskell/void {};
 
-  vty = callPackage ../development/libraries/haskell/vty {
-    mtl = self.mtl2;
-  };
+  vty = callPackage ../development/libraries/haskell/vty {};
 
   wai = callPackage ../development/libraries/haskell/wai {};
 
@@ -1633,9 +1630,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     };
   };
 
-  xmobar = callPackage ../applications/misc/xmobar {
-    parsec = self.parsec3;
-  };
+  xmobar = callPackage ../applications/misc/xmobar {};
 
   xmonad = callPackage ../applications/window-managers/xmonad {
     X11 = self.X11_1_5_0_1;

From 11040732bd247970584a1f00712c876e452e8ad0 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 8 Apr 2012 12:03:15 +0000
Subject: [PATCH 095/293] It seems to get stuck on the line break so I'm
 putting it all on one line now

svn path=/nixpkgs/trunk/; revision=33672
---
 pkgs/misc/jackaudio/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 7e6d0da90317..7447421fc949 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -20,8 +20,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     cd jack-1.9.8
-    python waf configure --prefix=$out --dbus --alsa \
-      ${if firewireSupport then "--firewire" else ""}
+    python waf configure --prefix=$out --dbus --alsa ${if firewireSupport then "--firewire" else ""}
   '';
 
   buildPhase = "python waf build";

From 68f739cc45e6f4749dc0372dcc3f31d774cec0f3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 8 Apr 2012 14:32:00 +0000
Subject: [PATCH 096/293] nodejs/v8: Bump

svn path=/nixpkgs/trunk/; revision=33673
---
 pkgs/development/libraries/v8/default.nix | 4 ++--
 pkgs/development/web/nodejs/default.nix   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 68215c555b7a..b26bcf0aaeb6 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -5,14 +5,14 @@ assert readline != null;
 let
   system = stdenv.system;
   arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else "";
-  version = "3.6.6.20";
+  version = "3.6.6.24";
 in
 assert arch != "";
 stdenv.mkDerivation rec {
     name = "v8-${version}";
     src = fetchsvn {
       url = "http://v8.googlecode.com/svn/tags/${version}";
-      sha256 = "68565086baa5a37a0fa15e1c0b7914210fa590b29a8196014cd83789da6a01ba";
+      sha256 = "405c905f6240b37b0da14769781e7ec6444fe9153a02ddacd5d774713fe1eb41";
     };
 
     buildInputs = [python scons readline makeWrapper];
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 05c5af4571e1..e1526c49f3cb 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, python, zlib, v8, darwinInstallNameToolUtility }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.11";
+  version = "0.6.14";
   name = "nodejs-${version}";
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "1lfb2f8b6j0wszvsmarzs17h1gwaqvz1rr4nbfnx4pv4c8nxpfwl";
+    sha256 = "07ygshbzx4xxj4apx5qzlpwsavnpkk54i2845my1kiamh4q246g4";
   };
 
   configureFlags = [

From 2b18ccf305d59db465401d42f5bdf4c52692dca3 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Mon, 9 Apr 2012 09:42:20 +0000
Subject: [PATCH 097/293] * Added "easytag", a GUI for organizing id3tags in
 mp3s. * Updated some ocaml packages. * Updated coccinelle.

svn path=/nixpkgs/trunk/; revision=33674
---
 pkgs/applications/audio/easytag/default.nix   |  22 +++
 .../ocaml-modules/menhir/default.nix          |   6 +-
 .../ocaml-modules/pycaml/default.nix          |  66 +++----
 .../ocaml-modules/sexplib/default.nix         |  14 +-
 .../sexplib/sexp-3.10-compat.patch            | 167 ++++++++++++++++++
 .../ocaml-modules/typeconv/default.nix        |   8 +-
 .../tools/misc/coccinelle/default.nix         |  50 ++----
 pkgs/top-level/all-packages.nix               |   7 +-
 8 files changed, 250 insertions(+), 90 deletions(-)
 create mode 100644 pkgs/applications/audio/easytag/default.nix
 create mode 100644 pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch

diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
new file mode 100644
index 000000000000..18a31460987d
--- /dev/null
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, gtk, libid3tag, id3lib, libvorbis, libogg, flac }:
+
+let
+
+  version = "2.1.7";
+  sha256 = "bfed34cbdce96aca299a0db2b531dbc66feb489b911a34f0a9c67f2eb6ee9301";
+
+in stdenv.mkDerivation {
+  name = "easytag-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/easytag/easytag-${version}.tar.bz2";
+    inherit sha256;
+  };
+
+  buildInputs = [ pkgconfig gtk libid3tag id3lib libvorbis libogg flac ];
+
+  meta = {
+    description = "an utility for viewing and editing tags for various audio files";
+    homepage = http://http://easytag.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index ea706ef511fa..d02516e410a3 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -2,7 +2,7 @@
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "20090505";
+  version = "20120123";
 in
 
 stdenv.mkDerivation {
@@ -10,13 +10,11 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://pauillac.inria.fr/~fpottier/menhir/menhir-${version}.tar.gz";
-    sha256 = "1dsy80wp7k9wbxc89pjzy2izdkk4b72104m9ik747xzy23mssbyx";
+    sha256 = "65cd9e4f813c62697c60c344963ca11bd461169f574ba3a866c2691541cb4682";
   };
 
   buildInputs = [ocaml findlib];
 
-  configurePhase = "true";	# Skip configure
-
   createFindlibDestdir = true;
 
   preBuild = ''
diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix
index b6c0df5ac15b..070bd270b11a 100644
--- a/pkgs/development/ocaml-modules/pycaml/default.nix
+++ b/pkgs/development/ocaml-modules/pycaml/default.nix
@@ -1,46 +1,46 @@
-{stdenv, fetchurl, ocaml, findlib, python, ocaml_make}:
+{stdenv, fetchurl, ocaml, findlib, ncurses, python, ocaml_make}:
 
-# The actual version of pycaml is unclear, as it is the original
-# 0.82 version with some patches applied in order to use it for
-# the kompostilo type setter (see README). Apparently, some of
-# the patches provide Python 3.1 support.
-# This version also differs from the Debian version, which
-# is also a heavily patched 0.82.
-# Therefore, we may at some point try to find out what is
-# actually the "real" version (if the library is still alive).
+# This is the original pycaml version with patches from debian.
 
-stdenv.mkDerivation {
-  name = "pycaml-0.82";
+let debian = fetchurl {
+      url = "mirror://debian/pool/main/p/pycaml/pycaml_0.82-14.debian.tar.gz";
+      sha256 = "a763088ec1fa76c769bf586ed6692e7ac035b0a2bfd48a90a8e7a9539ec0c2f1";
+    };
 
-  src = fetchurl {
-    name = "pycaml.tar.gz";
-    url = "http://github.com/chemoelectric/pycaml/tarball/master";
-    sha256 = "ff6d863c42b4ef798f50ff5eff77b47b77b5c0d28b6f65364e8a436a216dc591";
-  };
+in stdenv.mkDerivation {
+  name = "pycaml-0.82-14";
 
-  buildInputs = [ocaml findlib python ocaml_make];
+  srcs = [
+    (fetchurl {
+      url = "mirror://debian/pool/main/p/pycaml/pycaml_0.82.orig.tar.gz";
+      sha256 = "d57be559c8d586c575717d47817986bbdbcebe2ffd16ad6b291525c62868babe";
+    })
 
+    (fetchurl {
+      url = "mirror://debian/pool/main/p/pycaml/pycaml_0.82-14.debian.tar.gz";
+      sha256 = "a763088ec1fa76c769bf586ed6692e7ac035b0a2bfd48a90a8e7a9539ec0c2f1";
+    })
+  ];
+
+  postPatch = ''
+    rm -f Makefile* configure*
+    cp ../debian/META ../debian/Makefile .
+    sed -i "Makefile" -e's|/usr/share/ocamlmakefile/OCamlMakefile|${ocaml_make}/include/OCamlMakefile|g'
+  '';
+
+  sourceRoot = "pycaml";
+  patches = [ "../debian/patches/*.patch" ];
+
+  buildInputs = [ ncurses ocaml findlib python ocaml_make ];
   createFindlibDestdir = true;
 
-  phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" ];
-
-  # fix some paths to the appropriate store paths.
-  patchPhase = ''
-    sed -i "Makefile" -e's|/usr/include/OCamlMakefile|${ocaml_make}/include/OCamlMakefile|g'
-    sed -i "Makefile" -e's|/usr|${python}|g'
-    '';
-
-  buildPhase = ''
-    make -f Makefile -j1 PYVER=`python -c 'import sys; print("{0}.{1}".format(sys.version_info.major, sys.version_info.minor));'`
-    '';
-
   # the Makefile is not shipped with an install target, hence we do it ourselves.
   installPhase = ''
     ocamlfind install pycaml \
-      dllpycaml_stubs.so* libpycaml_stubs.a pycaml.a pycaml.cma \
-      pycaml.cmi pycaml.cmo pycaml.cmx pycaml.cmxa pycaml.ml pycaml.mli \
-      pycaml.o pycaml_stubs.c pycaml_stubs.h pycaml_stubs.o META
-    '';
+     dllpycaml_stubs.so libpycaml_stubs.a pycaml.a pycaml.cma \
+     pycaml.cmi pycaml.cmo pycaml.cmx pycaml.cmxa \
+     META
+  '';
 
   meta = {
     homepage = "http://github.com/chemoelectric/pycaml";
diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix
index d2df36ec38d9..d999dc471bdb 100644
--- a/pkgs/development/ocaml-modules/sexplib/default.nix
+++ b/pkgs/development/ocaml-modules/sexplib/default.nix
@@ -1,22 +1,18 @@
 {stdenv, fetchurl, ocaml, findlib, ocaml_typeconv}:
 
-# note: only works with ocaml>3.12
-# use version 5.2.0 if you still want an 3.11 version...
-
 stdenv.mkDerivation {
-  name = "ocaml-sexplib-7.0.4";
+  name = "ocaml-sexplib-7.0.5";
 
   src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/699/sexplib-7.0.4.tar.gz";
-    sha256 = "83c6c771f423d91bebc4f57202066358adf3775fb000dd780079f51436045a43";
+    url = "http://forge.ocamlcore.org/frs/download.php/832/sexplib-7.0.5.tar.gz";
+    sha256 = "b1022da052254581aae51fb634345920364439f715a2c786abcd0b828c2ce697";
   };
 
-  buildInputs = [ocaml findlib ocaml_typeconv];
+  patches = [ ./sexp-3.10-compat.patch ];
+  buildInputs = [ocaml findlib ocaml_typeconv ];
 
   createFindlibDestdir = true;
 
-  configurePhase = "true";
-
   meta = {
     homepage = "http://forge.ocamlcore.org/projects/sexplib/";
     description = "Library for serializing OCaml values to and from S-expressions.";
diff --git a/pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch b/pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch
new file mode 100644
index 000000000000..45e2abc61864
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch
@@ -0,0 +1,167 @@
+diff -ur orig/sexplib-7.0.5/lib/conv.ml sexplib-7.0.5/lib/conv.ml
+--- orig/sexplib-7.0.5/lib/conv.ml	2012-03-20 17:41:54.000000000 +0100
++++ sexplib-7.0.5/lib/conv.ml	2012-03-26 20:04:58.128032729 +0200
+@@ -665,7 +665,7 @@
+         | Parse_error pe ->
+             let ppos =
+               match pe.parse_state with
+-              | `Sexp { parse_pos } | `Annot { parse_pos } -> parse_pos
++              | `Sexp { parse_pos = parse_pos } | `Annot { parse_pos = parse_pos } -> parse_pos
+             in
+             List [
+               Atom "Sexplib.Sexp.Parse_error";
+diff -ur orig/sexplib-7.0.5/lib/pre_sexp.ml sexplib-7.0.5/lib/pre_sexp.ml
+--- orig/sexplib-7.0.5/lib/pre_sexp.ml	2012-03-20 17:41:54.000000000 +0100
++++ sexplib-7.0.5/lib/pre_sexp.ml	2012-03-26 20:04:58.129032741 +0200
+@@ -172,13 +172,7 @@
+ (* Output of S-expressions to file *)
+ 
+ let save_of_output ?perm output_function file sexp =
+-  let tmp_name, oc =
+-    let temp_dir =
+-      if Filename.is_relative file then "."
+-      else Filename.dir_sep
+-    in
+-    Filename.open_temp_file ~temp_dir file "tmp"
+-  in
++  let tmp_name, oc = Filename.open_temp_file file "tmp" in
+   try
+     output_function oc sexp;
+     close_out oc;
+@@ -316,9 +310,9 @@
+     else if text_char < 0 then fail "text_char < 0"
+     else if global_offset < 0 then fail "global_offset < 0"
+     else if buf_pos < 0 then fail "buf_pos < 0"
+-    else { text_line; text_char; global_offset; buf_pos }
++    else { text_line = text_line; text_char = text_char; global_offset = global_offset; buf_pos = buf_pos }
+ 
+-  let with_buf_pos t buf_pos = { t with buf_pos }
++  let with_buf_pos t buf_pos = { t with buf_pos = buf_pos }
+ end
+ 
+ type ('a, 't) parse_result =
+@@ -347,11 +341,11 @@
+ 
+ exception Parse_error of parse_error
+ 
+-let bump_text_line { parse_pos } =
++let bump_text_line { parse_pos = parse_pos } =
+   parse_pos.Parse_pos.text_line <- parse_pos.Parse_pos.text_line + 1;
+   parse_pos.Parse_pos.text_char <- 0
+ 
+-let bump_text_pos { parse_pos } =
++let bump_text_pos { parse_pos = parse_pos } =
+   parse_pos.Parse_pos.text_char <- parse_pos.Parse_pos.text_char + 1
+ 
+ let bump_pos_cont state str ~max_pos ~pos cont =
+@@ -378,18 +372,18 @@
+   parse_pos.Parse_pos.buf_pos <- buf_pos;
+   parse_pos.Parse_pos.global_offset <- parse_pos.Parse_pos.global_offset + len
+ 
+-let mk_parse_pos { parse_pos } buf_pos =
++let mk_parse_pos { parse_pos = parse_pos } buf_pos =
+   set_parse_pos parse_pos buf_pos;
+   parse_pos
+ 
+ let raise_parse_error parse_state location buf_pos err_msg =
+   begin
+     match parse_state with
+-    | `Sexp { parse_pos } | `Annot { parse_pos } ->
++    | `Sexp { parse_pos = parse_pos } | `Annot { parse_pos = parse_pos } ->
+         set_parse_pos parse_pos buf_pos;
+         parse_pos.Parse_pos.text_char <- parse_pos.Parse_pos.text_char + 1;
+   end;
+-  let parse_error = { location; err_msg; parse_state } in
++  let parse_error = { location = location; err_msg = err_msg; parse_state = parse_state } in
+   raise (Parse_error parse_error)
+ 
+ let raise_unexpected_char parse_state location buf_pos c =
+@@ -657,7 +651,7 @@
+     let max_pos = check_str_bounds "parse" ~pos ~len str in \
+     let state = \
+       { \
+-        parse_pos; \
++        parse_pos = parse_pos; \
+         pstack = INIT_PSTACK; \
+         pbuf = Buffer.create 128; \
+       } \
+@@ -681,20 +675,20 @@
+ 
+ let mk_annot_pos
+       ({ Parse_pos.text_line = line; text_char = col } as parse_pos) pos =
+-  { Annot.line; col; offset = get_glob_ofs parse_pos pos }
++  { Annot.line = line; col = col; offset = get_glob_ofs parse_pos pos }
+ 
+ let mk_annot_pos1
+       ({ Parse_pos.text_line = line; text_char = col } as parse_pos) pos =
+-  { Annot.line; col = col + 1; offset = get_glob_ofs parse_pos pos }
++  { Annot.line = line; col = col + 1; offset = get_glob_ofs parse_pos pos }
+ 
+-let add_annot_pos { parse_pos; pstack } pos =
++let add_annot_pos { parse_pos = parse_pos; pstack = pstack } pos =
+   pstack.Annot.positions <- mk_annot_pos parse_pos pos :: pstack.Annot.positions
+ 
+-let add_annot_pos1 { parse_pos; pstack } pos =
++let add_annot_pos1 { parse_pos = parse_pos; pstack = pstack } pos =
+   pstack.Annot.positions <-
+     mk_annot_pos1 parse_pos pos :: pstack.Annot.positions
+ 
+-let get_annot_range { parse_pos; pstack } pos =
++let get_annot_range { parse_pos = parse_pos; pstack = pstack } pos =
+   let start_pos =
+     match pstack.Annot.positions with
+     | [] -> assert false  (* impossible *)
+@@ -708,7 +702,7 @@
+       offset = get_glob_ofs parse_pos pos;
+     }
+   in
+-  { Annot.start_pos; end_pos }
++  { Annot.start_pos = start_pos; end_pos = end_pos }
+ 
+ let mk_annot_atom parse_state str pos =
+   Annot.Atom (get_annot_range parse_state pos, Atom str)
+@@ -780,7 +774,7 @@
+   let rec loop this_parse ~pos ~len ~is_incomplete =
+     if len > 0 then
+       match this_parse ~pos ~len buf with
+-      | Done (sexp, ({ Parse_pos.buf_pos } as parse_pos)) ->
++      | Done (sexp, ({ Parse_pos.buf_pos = buf_pos } as parse_pos)) ->
+           rev_sexps_ref := sexp :: !rev_sexps_ref;
+           let n_parsed = buf_pos - pos in
+           let this_parse = mk_this_parse ~parse_pos my_parse in
+@@ -813,7 +807,7 @@
+ 
+ let of_string_bigstring loc this_parse ws_buf get_len get_sub str =
+   match this_parse str with
+-  | Done (_, { Parse_pos.buf_pos }) when buf_pos <> get_len str ->
++  | Done (_, { Parse_pos.buf_pos = buf_pos }) when buf_pos <> get_len str ->
+       let prefix_len = min (get_len str - buf_pos) 20 in
+       let prefix = get_sub str buf_pos prefix_len in
+       let msg =
+@@ -874,7 +868,7 @@
+       failwith (sprintf "Sexplib.Sexp.gen_load_sexp: end of file: %s" file)
+     else
+       match this_parse ~pos:0 ~len buf with
+-      | Done (sexp, ({ Parse_pos.buf_pos } as parse_pos))
++      | Done (sexp, ({ Parse_pos.buf_pos = buf_pos } as parse_pos))
+         when strict ->
+           let rec strict_loop this_parse ~pos ~len =
+             match this_parse ~pos ~len buf with
+@@ -938,7 +932,7 @@
+ 
+   let get_conv_exn ~file ~exc annot_sexp =
+     let range = get_range annot_sexp in
+-    let { start_pos = { line; col } } = range in
++    let { start_pos = { line = line; col = col } } = range in
+     let loc = sprintf "%s:%d:%d" file line col in
+     Of_sexp_error (Annot.Conv_exn (loc, exc), get_sexp annot_sexp)
+ end
+@@ -1003,7 +997,7 @@
+   let sexp = of_string str in
+   try f sexp
+   with Of_sexp_error (exc, sub_sexp) ->
+-    raise (Of_string_conv_exn.E { Of_string_conv_exn.exc; sexp; sub_sexp })
++    raise (Of_string_conv_exn.E { Of_string_conv_exn.exc = exc; sexp = sexp; sub_sexp = sub_sexp })
+ 
+ let of_string_conv_exn str f = gen_of_string_conv_exn of_string str f
+ let of_bigstring_conv_exn bstr f = gen_of_string_conv_exn of_bigstring bstr f
diff --git a/pkgs/development/ocaml-modules/typeconv/default.nix b/pkgs/development/ocaml-modules/typeconv/default.nix
index c3ef8dd9856b..299e7729b91e 100644
--- a/pkgs/development/ocaml-modules/typeconv/default.nix
+++ b/pkgs/development/ocaml-modules/typeconv/default.nix
@@ -3,19 +3,17 @@
 # note: works only with ocaml >3.12
 
 stdenv.mkDerivation {
-  name = "ocaml-typeconv-3.0.4";
+  name = "ocaml-typeconv-3.0.5";
 
   src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/697/ocaml-type-conv-3.0.4.tar.gz";
-    sha256 = "63b6f2872d29fb4c0b1448343bb5ec0649365126756128049d45a81238b59f12";
+    url = "http://forge.ocamlcore.org/frs/download.php/821/type_conv-3.0.5.tar.gz";
+    sha256 = "90ac6c401a600a23012a3f513def6f67d4979b11bd551f4d0af78f0f0b479198";
   };
 
   buildInputs = [ocaml findlib ]; 
 
   createFindlibDestdir = true;
 
-  configurePhase = "true";
-
   meta = {
     homepage = "http://forge.ocamlcore.org/projects/type-conv/";
     description = "Support library for OCaml preprocessor type conversions";
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index ce3eb9cf5ec6..1d1db3b87ad1 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,45 +1,25 @@
-{ fetchurl, stdenv, perl, python, ncurses, makeWrapper
-, ocaml, ocamlPackages }:
+{ fetchurl, stdenv, python, ncurses, ocamlPackages }:
 
-stdenv.mkDerivation rec {
-  name = "coccinelle-1.0.0-rc9";
+let
+
+  name = "coccinelle-1.0.0-rc12";
+  sha256 = "03b8930a53623ec79dc2486e9b6a569e373958cf46074c5f1d0028c70708498d";
+
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
-    sha256 = "75d5354e76500b627ccc33b8a929305e5a815ebf08027a8dc094f75ece241697";
+    inherit sha256;
   };
 
-  buildInputs = [
-      ocaml ocamlPackages.findlib
-      ocamlPackages.menhir ocamlPackages.ocaml_batteries
-      ocamlPackages.ocaml_pcre ocamlPackages.ocaml_sexplib
-      ocamlPackages.ocaml_extlib ocamlPackages.pycaml
-      python ncurses makeWrapper perl
-    ];
+  buildInputs = with ocamlPackages; [
+    ocaml findlib menhir
+    ocaml_pcre ocaml_sexplib pycaml
+    python ncurses
+  ];
 
-  preConfigure =
-    '' sed -i "configure" -e's|/usr/bin/perl|${perl}/bin/perl|g'
-       sed -i "globals/config.ml.in" \
-           -e"s|/usr/local/share|$out/share|g"
-    '';
-
-  buildPhase = "make depend && make all && make all.opt";
-
-  # Note: The tests want $out/share/coccinelle/standard.h so they must be run
-  # after "make install".
-  doCheck = false;
-
-  postInstall =
-    '' wrapProgram "$out/bin/spatch"                                    \
-         --prefix "LD_LIBRARY_PATH" ":" "$out/lib"                      \
-         --prefix "PYTHONPATH" ":" "$out/share/coccinelle/python"
-
-       wrapProgram "$out/bin/spatch.opt"                                \
-         --prefix "LD_LIBRARY_PATH" ":" "$out/lib"                      \
-         --prefix "PYTHONPATH" ":" "$out/share/coccinelle/python"
-
-       yes | make test
-    '';
+  configureFlagsArray = [ "--enable-release" ];
 
   meta = {
     description = "Coccinelle, a program to apply C code semantic patches";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c565bd7b334..0af14654d884 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2968,10 +2968,7 @@ let
 
   cmakeWithGui = cmakeCurses.override { useQt4 = true; };
 
-  coccinelle = callPackage ../development/tools/misc/coccinelle {
-    ocamlPackages = ocamlPackages_3_12_1;
-    ocaml = ocaml_3_12_1;
-  };
+  coccinelle = callPackage ../development/tools/misc/coccinelle { };
 
   cppi = callPackage ../development/tools/misc/cppi { };
 
@@ -7112,6 +7109,8 @@ let
     inherit (xlibs) libX11 xproto;
   };
 
+  easytag = callPackage ../applications/audio/easytag { };
+
   mp3info = callPackage ../applications/audio/mp3info { };
 
   mpc123 = callPackage ../applications/audio/mpc123 { };

From 4d34820fbacda6a910d6831e7d1c9df90cb3d851 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 9 Apr 2012 10:17:17 +0000
Subject: [PATCH 098/293] UHC: upgraded and changed to the new official github
 repository

svn path=/nixpkgs/trunk/; revision=33675
---
 pkgs/development/compilers/uhc/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index d2fe6150374d..c15839ad11c4 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, coreutils, glibc, fetchsvn, m4, libtool, ghc, uulib
+{ stdenv, coreutils, glibc, fetchgit, m4, libtool, ghc, uulib
 , uuagc, mtl, network, binary, llvm, fgl, syb
 }:
 
-let
-  revision = "2495";
-in
 stdenv.mkDerivation {
-  name = "uhc-svn-${revision}";
+  name = "uhc-svn-git20120405";
 
-  src = fetchsvn {
-     url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC";
-     rev = revision;
-     sha256 = "0402cb05629454e29bdca02051406bc9e515d2525a785c85079469b674378fca";
+  src = fetchgit {
+     url = "https://github.com/UU-ComputerScience/uhc.git";
+     rev = "d6d75a131a36899ff2db2d8c9a4ae6601d7d0675";
+     sha256 = "4117688bf1e4a892d8551c3bcc59c5ec5743842e6a67ec66d399f390fec05b4c";
   };
 
+  postUnpack = "sourceRoot=\${sourceRoot}/EHC";
+
   propagatedBuildInputs = [mtl network binary fgl syb];
   buildInputs = [coreutils m4 ghc libtool uulib uuagc];
 

From 6ef610851eb08d704e826799f7281e06f3a5e090 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 9 Apr 2012 10:17:20 +0000
Subject: [PATCH 099/293] kde okular: include pkgconfig, otherwise libspectre
 isn't found (.ps viewing)

svn path=/nixpkgs/trunk/; revision=33676
---
 pkgs/desktops/kde-4.7/kdegraphics/okular.nix | 4 ++--
 pkgs/desktops/kde-4.8/kdegraphics/okular.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/kdegraphics/okular.nix b/pkgs/desktops/kde-4.7/kdegraphics/okular.nix
index c322767eb433..0c5c7b49b17d 100644
--- a/pkgs/desktops/kde-4.7/kdegraphics/okular.nix
+++ b/pkgs/desktops/kde-4.7/kdegraphics/okular.nix
@@ -1,9 +1,9 @@
 { chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
-, qimageblitz }:
+, qimageblitz, pkgconfig }:
 
 kde {
   buildInputs =
-    [ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz ];
+    [ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz pkgconfig ];
 
   meta = {
     description = "Okular, the KDE document viewer";
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/okular.nix b/pkgs/desktops/kde-4.8/kdegraphics/okular.nix
index c322767eb433..0c5c7b49b17d 100644
--- a/pkgs/desktops/kde-4.8/kdegraphics/okular.nix
+++ b/pkgs/desktops/kde-4.8/kdegraphics/okular.nix
@@ -1,9 +1,9 @@
 { chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
-, qimageblitz }:
+, qimageblitz, pkgconfig }:
 
 kde {
   buildInputs =
-    [ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz ];
+    [ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz pkgconfig ];
 
   meta = {
     description = "Okular, the KDE document viewer";

From 94749e4463445cb8f7e54cad6c5ea9c8e3e0257a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 9 Apr 2012 10:17:23 +0000
Subject: [PATCH 100/293] libksba: upgraded to 1.2.0

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

diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index ec2468aca1d3..5e038ad85720 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libksba-1.0.7";
+  name = "libksba-1.2.0";
 
   src = fetchurl {
     url = "mirror://gnupg/libksba/${name}.tar.bz2";
-    sha256 = "1biabl4ijaf0jyl4zf3qrhcs0iaq9pypjibp8wgnim3n3kg0bdda";
+    sha256 = "0jwk7hm3x3g4hd7l12z3d79dy7359x7lc88dq6z7q0ixn1jwxbq9";
   };
 
   propagatedBuildInputs = [libgpgerror];

From 5cdd04e950e8ea7b4a4aa9a34bee4b8a2c438642 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 9 Apr 2012 10:17:26 +0000
Subject: [PATCH 101/293] gnupg: upgraded to 2.0.19

svn path=/nixpkgs/trunk/; revision=33678
---
 pkgs/tools/security/gnupg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 3d759d733adb..d3c9e3c13b6a 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -13,11 +13,11 @@ assert useUsb -> (libusb != null);
 assert useCurl -> (curl != null);
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.18";
+  name = "gnupg-2.0.19";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0nxf5nbgxi5splnw6xww5iy6sw367kz9x1cy5aaznhx45ivdvbj8";
+    sha256 = "08n636sfffs5qvg9ppiprvsh00q0dmdw425psg3m3nssja53m8pg";
   };
 
   buildInputs = [ readline zlib libgpgerror pth libgcrypt libassuan libksba ]

From 81d6e98d349e17ae8632673ee7605a6ceb1a8c1e Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 9 Apr 2012 10:17:29 +0000
Subject: [PATCH 102/293] gpgme: upgraded to 1.3.1

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

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 5f06c82c3349..582208f08b67 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }:
 
 stdenv.mkDerivation rec {
-  name = "gpgme-1.3.0";
+  name = "gpgme-1.3.1";
   
   src = fetchurl {
     url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
-    sha256 = "18g6wgiacnbj437yfsczbjxaf041ljia48dnv2qgcqb0sky41q3l";
+    sha256 = "1m7l7nicn6gd952cgspv9xr8whqivbg33nbg8kbpj3dffnl2gvqm";
   };
   
   propagatedBuildInputs = [ libgpgerror glib pth libassuan ];

From 9779ae082af21abe17204c937a64145b1d35a005 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 9 Apr 2012 10:17:32 +0000
Subject: [PATCH 103/293] npth: successor of the pth library, used by upcoming
 versions of gnupg and its libraries

svn path=/nixpkgs/trunk/; revision=33680
---
 pkgs/development/libraries/npth/default.nix | 31 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/npth/default.nix

diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix
new file mode 100644
index 000000000000..a9f80fa9348b
--- /dev/null
+++ b/pkgs/development/libraries/npth/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "npth-git20120407";
+
+  src = fetchgit {
+    url = "git://git.gnupg.org/npth.git";
+    rev = "cbb52bd5ada02bbd914869f4540221831358d077";
+    sha256 = "1789b15bc49171d47bbd5a3bccbadc7dde1ae095bb2c205c7ec5d7a36573876d";
+  };
+
+  buildInputs = [ autoconf automake libtool ];
+
+  preConfigure = "autoreconf -vfi";
+
+  meta = {
+    description = "The New GNU Portable Threads Library";
+    longDescription = ''
+      This is a library to provide the GNU Pth API and thus a non-preemptive
+      threads implementation.
+
+      In contrast to GNU Pth is is based on the system's standard threads
+      implementation.  This allows the use of libraries which are not
+      compatible to GNU Pth.  Experience with a Windows Pth emulation showed
+      that this is a solid way to provide a co-routine based framework.
+    '';
+    homepage = http://www.gnupg.org;
+    license = "LGPLv3";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0af14654d884..106bbe569818 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1087,6 +1087,8 @@ let
 
   nlopt = callPackage ../development/libraries/nlopt {};
 
+  npth = callPackage ../development/libraries/npth {};
+
   nmap = callPackage ../tools/security/nmap {
     inherit (pythonPackages) pysqlite;
   };

From 0765ca769a59500d5c4c1853d72de737ebd82d21 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 9 Apr 2012 10:17:36 +0000
Subject: [PATCH 104/293] libassuan: added extra package with current git
 version

needed for upcoming gnupg 2.1

svn path=/nixpkgs/trunk/; revision=33681
---
 pkgs/development/libraries/libassuan/git.nix | 33 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/libassuan/git.nix

diff --git a/pkgs/development/libraries/libassuan/git.nix b/pkgs/development/libraries/libassuan/git.nix
new file mode 100644
index 000000000000..743528d92651
--- /dev/null
+++ b/pkgs/development/libraries/libassuan/git.nix
@@ -0,0 +1,33 @@
+{ fetchgit, stdenv, pth, libgpgerror, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "libassuan-2.1pre-git20120407";
+
+  src = fetchgit {
+    url = "git://git.gnupg.org/libassuan.git";
+    rev = "5c00c7cc2901a879927a5756e1bb7ecf49439ebc";
+    sha256 = "14ebcc65930360a067eea8cfbdaa5418c909bd9dfb27fe366edf78ad6c1aa69f";
+  };
+
+  propagatedBuildInputs = [ pth libgpgerror ];
+  buildInputs = [ autoconf automake libtool ];
+
+  doCheck = true;
+
+  preConfigure = "autoreconf -v";
+
+  meta = {
+    description = "Libassuan, the IPC library used by GnuPG and related software";
+
+    longDescription = ''
+      Libassuan is a small library implementing the so-called Assuan
+      protocol.  This protocol is used for IPC between most newer
+      GnuPG components.  Both, server and client side functions are
+      provided.
+    '';
+
+    homepage = http://gnupg.org;
+    license = "LGPLv2+";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 106bbe569818..bd0feb81537d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3913,6 +3913,8 @@ let
 
   libassuan = callPackage ../development/libraries/libassuan { };
 
+  libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { };
+
   libav = callPackage ../development/libraries/libav { };
 
   libavc1394 = callPackage ../development/libraries/libavc1394 { };

From 107c8325e51ee130ca56abe2b54baeebc9c6f736 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 9 Apr 2012 10:17:40 +0000
Subject: [PATCH 105/293] added extra package for gnupg 2.1 git pre version.

contains the merge of gnupg-ecc, enabling ecdsa and other algorithms.

I mainly need this because I use ecdsa for my ssh keys, and want
gpg-agent to be able to handle them.

svn path=/nixpkgs/trunk/; revision=33682
---
 pkgs/tools/security/gnupg/git.nix | 57 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  4 +++
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/tools/security/gnupg/git.nix

diff --git a/pkgs/tools/security/gnupg/git.nix b/pkgs/tools/security/gnupg/git.nix
new file mode 100644
index 000000000000..3d7db862dce0
--- /dev/null
+++ b/pkgs/tools/security/gnupg/git.nix
@@ -0,0 +1,57 @@
+# Remember to install Pinentry and
+# 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'.
+
+{ fetchgit, stdenv, readline, zlib, libgpgerror, npth, libgcrypt, libassuan
+, libksba, coreutils, autoconf, automake, transfig, ghostscript, texinfo
+, useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null, useUsb ? true
+, libusb ? null, useCurl ? true, curl ? null
+}:
+
+assert useLdap -> (openldap != null);
+assert useBzip2 -> (bzip2 != null);
+assert useUsb -> (libusb != null);
+assert useCurl -> (curl != null);
+
+stdenv.mkDerivation rec {
+  name = "gnupg-2.1pre-git20120407";
+
+  src = fetchgit {
+    url = "git://git.gnupg.org/gnupg.git";
+    rev = "f1e1387bee286c7434f0462185048872bcdb4484";
+    sha256 = "8f5a14587beccdd3752f9e430e56c6ea2d393dddb7843bfc17029e1a309045bb";
+  };
+
+  buildInputs = [ readline zlib libgpgerror npth libgcrypt libassuan libksba 
+                  autoconf automake transfig ghostscript texinfo ]
+    ++ stdenv.lib.optional useLdap openldap
+    ++ stdenv.lib.optional useBzip2 bzip2
+    ++ stdenv.lib.optional useUsb libusb
+    ++ stdenv.lib.optional useCurl curl;
+
+  patchPhase = ''
+    find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i
+  '';
+
+  preConfigure = "autoreconf -v";
+  configureFlags = "--enable-maintainer-mode";
+
+  meta = {
+    description = "GNU Privacy Guard (GnuPG), GNU Project's implementation of the OpenPGP standard";
+
+    longDescription = ''
+      GnuPG is the GNU project's complete and free implementation of
+      the OpenPGP standard as defined by RFC4880.  GnuPG allows to
+      encrypt and sign your data and communication, features a
+      versatile key managment system as well as access modules for all
+      kind of public key directories.  GnuPG, also known as GPG, is a
+      command line tool with features for easy integration with other
+      applications.  A wealth of frontend applications and libraries
+      are available.  Version 2 of GnuPG also provides support for
+      S/MIME.
+    '';
+
+    homepage = http://gnupg.org/;
+
+    license = "GPLv3+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd0feb81537d..b7c4ca2ceee0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -769,6 +769,10 @@ let
 
   gnupg = callPackage ../tools/security/gnupg { };
 
+  gnupg2_1 = callPackage ../tools/security/gnupg/git.nix {
+    libassuan = libassuan2_1;
+  };
+
   gnuplot = callPackage ../tools/graphics/gnuplot {
     texLive = null;
     lua = null;

From b041d3e49b141107228b8396b4874eab4dc91702 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Apr 2012 12:37:39 +0000
Subject: [PATCH 106/293] Updated Haskell packages.

 - blaze-builder-conduit: updated to version 0.4.0.1
 - enumerator: updated to version 0.4.19
 - persistent-sqlite: updated to version 0.9.0.1
 - persistent-template: updated to version 0.9.0.1
 - persistent: updated to version 0.9.0.1
 - pool-conduit: updated to version 0.1.0.1
 - semigroups: updated to version 0.8.2
 - shakespeare-css: updated to version 1.0.1.1
 - shakespeare-i18n: updated to version 1.0.0.1
 - shakespeare-js: updated to version 1.0.0.1
 - shakespeare-text: updated to version 1.0.0.1
 - shakespeare: updated to version 1.0.0.1
 - void: updated to version 0.5.5.1
 - wai-app-static: updated to version 1.2.0.1
 - wai: updated to version 1.2.0.1
 - warp: updated to version 1.2.0.1
 - yesod-core: updated to version 1.0.0.2
 - yesod: updated to version 1.0.0.2
 - zlib-conduit: updated to version 0.4.0.1

svn path=/nixpkgs/trunk/; revision=33683
---
 .../haskell/blaze-builder-conduit/default.nix          |  4 ++--
 .../libraries/haskell/enumerator/default.nix           |  4 ++--
 .../libraries/haskell/persistent-sqlite/default.nix    |  6 +++---
 .../libraries/haskell/persistent-template/default.nix  |  6 +++---
 .../libraries/haskell/persistent/default.nix           | 10 +++++-----
 .../libraries/haskell/pool-conduit/default.nix         |  6 +++---
 .../libraries/haskell/semigroups/default.nix           |  4 ++--
 .../libraries/haskell/shakespeare-css/default.nix      |  4 ++--
 .../libraries/haskell/shakespeare-i18n/default.nix     |  6 +++---
 .../libraries/haskell/shakespeare-js/default.nix       |  6 +++---
 .../libraries/haskell/shakespeare-text/default.nix     |  6 +++---
 .../libraries/haskell/shakespeare/default.nix          |  6 +++---
 pkgs/development/libraries/haskell/void/default.nix    |  4 ++--
 .../libraries/haskell/wai-app-static/default.nix       |  6 +++---
 pkgs/development/libraries/haskell/wai/default.nix     |  6 +++---
 pkgs/development/libraries/haskell/warp/default.nix    |  6 +++---
 .../libraries/haskell/yesod-core/default.nix           |  4 ++--
 pkgs/development/libraries/haskell/yesod/default.nix   |  4 ++--
 .../libraries/haskell/zlib-conduit/default.nix         |  4 ++--
 19 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
index 57752798446c..63516f61681c 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder-conduit";
-  version = "0.4.0";
-  sha256 = "0lpm480xc2y3syv42l3v7v6yhhnfr69bj7vc80fj0074h5288vjy";
+  version = "0.4.0.1";
+  sha256 = "059i7k49vpwsd7dlm4di4k5xhiparq71h8qagssw8a4nsk9jglvp";
   buildDepends = [ blazeBuilder conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix
index 9592b3009cbb..5b44c9efc62a 100644
--- a/pkgs/development/libraries/haskell/enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/enumerator/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "enumerator";
-  version = "0.4.18";
-  sha256 = "0xqgcn3xs0i7kdy73lizfhs4dzj8crf2x9pmb9d37kqrhdgznl9d";
+  version = "0.4.19";
+  sha256 = "1avxy55vbvkz6yj512bkb2b986y3m0b28c9c5lfc3wd2na7w1s5g";
   buildDepends = [ text transformers ];
   meta = {
     homepage = "https://john-millikin.com/software/enumerator/";
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index fa4b4e953b65..ed8d8094eb1c 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -4,15 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-sqlite";
-  version = "0.9.0";
-  sha256 = "0l0w4g83bxaqlwwqs9xvlws0ksl0i8jmqsi4lpgywylvpywnhlgc";
+  version = "0.9.0.1";
+  sha256 = "19bwkaazg3c822n3308awy70ml40jvncr4c3rvidq72zzdvql9c2";
   buildDepends = [
     aeson conduit monadControl persistent text transformers
   ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
     description = "Backend for the persistent library using sqlite3";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 2beef995d2af..b83a32385dec 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "0.9.0";
-  sha256 = "17rcmqmakpqk2d630rpj6i345jc7hk225c26s5v8ks3hds4dn85w";
+  version = "0.9.0.1";
+  sha256 = "0hxv69qifkmv36zkzlhlw40s6zzv4jf977iqim069b4v8824r9pc";
   buildDepends = [ aeson monadControl persistent text transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
     description = "Type-safe, non-relational, multi-backend persistence";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index ea4052e8d9af..270e8744ad4a 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -1,23 +1,23 @@
 { cabal, aeson, attoparsec, base64Bytestring, blazeHtml, conduit
-, liftedBase, monadControl, mtl, pathPieces, poolConduit, resourcet
+, liftedBase, monadControl, pathPieces, poolConduit, resourcet
 , sqlite, text, time, transformers, transformersBase
 , unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.9.0";
-  sha256 = "00nd76is0yijzh52a5dgv00v30mcign9j86lmmfbpxpaa460g3hn";
+  version = "0.9.0.1";
+  sha256 = "0qlvlv7rlxs4r5w5hr4vbj1bwjkn3nzpk2w8q52cnn2c37wz24h8";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
-    monadControl mtl pathPieces poolConduit resourcet text time
+    monadControl pathPieces poolConduit resourcet text time
     transformers transformersBase unorderedContainers vector
   ];
   extraLibraries = [ sqlite ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
     description = "Type-safe, multi-backend data serialization";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix
index 40aea355c50c..abb5d83f5e7a 100644
--- a/pkgs/development/libraries/haskell/pool-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "pool-conduit";
-  version = "0.1.0";
-  sha256 = "1rxagidgd18a9xk7qqafz8l3nqlbr1s4231k8bf1sxd62b8rs4sm";
+  version = "0.1.0.1";
+  sha256 = "1a88x8yi5p99qpq262idfzn9f5cjjdq417rbayp0kknm5c6d9n5c";
   buildDepends = [ resourcePool resourcet transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
     description = "Resource pool allocations via ResourceT";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index f2b7e88de244..d622018e5881 100644
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroups";
-  version = "0.8.0.1";
-  sha256 = "0z2pmfqk75qpjv720l06237cjdn8nmcchzyq7rp4wcvgdik8ahin";
+  version = "0.8.2";
+  sha256 = "1vxavkpg68qfs5arhi76liafds1jd8prircnp66ykhkj40z5aix0";
   meta = {
     homepage = "http://github.com/ekmett/semigroups/";
     description = "Haskell 98 semigroups";
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index f3a777e83382..1fd81d9d6a52 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.1";
-  sha256 = "0n7ld8lr73k16gx3q1ab0qgsv6h0j77ma8dm7daisav9hci9sdbs";
+  version = "1.0.1.1";
+  sha256 = "1janifi0sqdvxwq8ywk6g1y9r8qgy2jvizlm0drp09lnw1dlss25";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
index 3d5d87e32103..5ef05d877e30 100644
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-i18n";
-  version = "1.0.0";
-  sha256 = "16zbf4y00l1jfah9j8xkhva5avgp6vg0spgjjrm3rxrs1kclxzpv";
+  version = "1.0.0.1";
+  sha256 = "1g4jczz3kvfvdk2w64kbphmv451g8khx5d1bxmhscqkmlh6zgqjz";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "A type-based approach to internationalization";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index bbdbfe894aa9..f6b7fbbea4b3 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.0.0";
-  sha256 = "0i94kx1cnnz8kaf3zzy8bphp3k670jgq4ajynzc0ys47hb5sy3h9";
+  version = "1.0.0.1";
+  sha256 = "13l1hsc6b87lbz10xhihvmzf1922mwmrbinr4rhkrn48hlxf2fii";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "Stick your haskell variables into javascript/coffeescript at compile time";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index 75643dc638a8..ad12fdd1d07a 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "1.0.0";
-  sha256 = "1bsvjmkjlqwmgbv1ki7a8djdfqvdcx7b7586a20zcgichxkkzgf6";
+  version = "1.0.0.1";
+  sha256 = "0afbxjz6ma0fk4m3xp8cx9sfaxdnsxzbj3ikyfn6vmx4ivid299f";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "Interpolation with quasi-quotation: put variables strings";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 78a5ed2913b9..f8a88002f71c 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.0.0";
-  sha256 = "16f9ynk537sra32bs5c4wncryx9sb4mfabxcjyq2mw42b8kn7ggs";
+  version = "1.0.0.1";
+  sha256 = "1x682irbxr7wwrpz4ri2j4pl85r8s8hs0draf9bfaskagp14d522";
   buildDepends = [ parsec text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "A toolkit for making compile-time interpolated templates";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix
index 585ac3df9fb5..c2b56d95d98b 100644
--- a/pkgs/development/libraries/haskell/void/default.nix
+++ b/pkgs/development/libraries/haskell/void/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "void";
-  version = "0.5.5";
-  sha256 = "011ji37d5f6xrvd6sq0zkzggaq11r7nyb2z5v3ix3kn14r5psfz3";
+  version = "0.5.5.1";
+  sha256 = "1j8rss4b5j4213h40n4nl38p12z275lbsk46dvy4x5s96gqyximp";
   buildDepends = [ semigroups ];
   meta = {
     homepage = "http://github.com/ekmett/void";
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 64807567d731..2614d1b7f95a 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "1.2.0";
-  sha256 = "1y41pw7aw10b2qdx64ygi0qcm0vjv2fx9hncfjqk5y5hlzblqv7s";
+  version = "1.2.0.1";
+  sha256 = "0z3bx6sx3f5k00x0i9lk81a3gh9blnsqw55w89l0pl946fv002pc";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
     httpDate httpTypes text time transformers unixCompat wai
@@ -14,7 +14,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://www.yesodweb.com/book/wai";
     description = "WAI application for static serving";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index b16b3940d5dd..dcb2ee3bee31 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -4,15 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "1.2.0";
-  sha256 = "0kiv2z387a2m5crpxissmind6xnxglv7kfvznr0z9ycl6mi9fb9a";
+  version = "1.2.0.1";
+  sha256 = "00f95r1g2s689s1b0div28v7dnjiqz01d66acz77acp28cm0bnmc";
   buildDepends = [
     blazeBuilder conduit httpTypes network text transformers vault
   ];
   meta = {
     homepage = "https://github.com/yesodweb/wai";
     description = "Web Application Interface";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index daacb75394a0..c723128ed7ff 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.2.0";
-  sha256 = "1dz7nrybr08k40phynk5xm7pc5hk86k5r92yr3pri1wdyg7yb6kv";
+  version = "1.2.0.1";
+  sha256 = "0lbyi6xchjkf6fx3d7dh5hg8gfq041hb0yls6vq8svd75dr0x5nv";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
     liftedBase network networkConduit simpleSendfile transformers
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://github.com/yesodweb/wai";
     description = "A fast, light-weight web server for WAI applications";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index c8e97a3e9e6b..5556212355ab 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.0.0.1";
-  sha256 = "15k4zq06qi3pv2l73mxjz1qm18d5665bis7m4fwnk83jbqj2l2xk";
+  version = "1.0.0.2";
+  sha256 = "0l6mfgcw0jmm941w7s0df091hm1c1v66p8sc89xjqzcwvdhcnyyd";
   buildDepends = [
     aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
     conduit cookie failure fastLogger hamlet httpTypes liftedBase
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 763de7b1595f..5a2d13e296b9 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.0.0";
-  sha256 = "05bmx6767a07am0vz5a6xa9xa51gwnsm2myvi8f5hzscfck2p6lp";
+  version = "1.0.0.2";
+  sha256 = "171a7nbcz48ykdn9sz6gzpnkjhv2n75c8v9gdlp9slbnmbphq94p";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
index 03ca2f155744..1b68250b61eb 100644
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-conduit";
-  version = "0.4.0";
-  sha256 = "0snjvpybkdcnqzw2dkja7fvakd6fwvr29l40ghxk48bzzs2j308i";
+  version = "0.4.0.1";
+  sha256 = "07x0fgzxnwaaw5yg1ks2w9dc66biqbg50x79h84jpgb6d9pw2d7z";
   buildDepends = [ conduit transformers zlibBindings ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From d4913759da0e863c4e136190dfed7fe39d2fb240 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 9 Apr 2012 17:56:38 +0000
Subject: [PATCH 107/293] Update darktable to version 1.0.

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

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index d6e1a6c11195..4d3b1a12b62b 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -8,12 +8,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "0.9.3";
+  version = "1.0";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
-    sha256 = "0al9fxifqv9vg8rj6vybjsn6f25pq5ij9367imlhpmsv6m9m5mqw";
+    sha256 = "0wjv2x62kf25db61ivbn8y8xr9hr8hdlcjq6l1qxfqn2bn8a3qkm";
   };
 
   buildInputs =

From 0684ca8745e05db787f4046e80329ed9718fc88c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 9 Apr 2012 19:54:34 +0000
Subject: [PATCH 108/293] Adding the memtest86 from memtest86.com, and renaming
 the top-level attribute name of memtest86+ to memtest86plus.

I think it makes more sense for the attribute memtest86 to point to the
upstream memtest86.com version.


svn path=/nixpkgs/trunk/; revision=33689
---
 pkgs/tools/misc/memtest86/default.nix | 10 ++++-----
 pkgs/tools/misc/memtest86/plus.nix    | 31 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/tools/misc/memtest86/plus.nix

diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix
index 633d08e4c666..35395fc116f4 100644
--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "memtest86+-4.20";
+  name = "memtest86-4.0a";
   
   src = fetchurl {
-    url = http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz;
-    sha256 = "0dw7kvfxiwqdmhapbz6ds1j9fralbky56hnzj4c6fsqfinbwwc2n";
+    url = http://memtest86.com/memtest86-4.0a.tar.gz;
+    sha256 = "0d2n3nzyvna9k880zk6vl1z3b7wal1hrwcqay9vda8br7yp7634y";
   };
 
   preBuild = ''
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://www.memtest.org/;
-    description = "A tool to detect memory errors";
+    homepage = http://memtest86.com/;
+    description = "A tool to detect memory errors, to be run from a bootloader";
   };
 }
diff --git a/pkgs/tools/misc/memtest86/plus.nix b/pkgs/tools/misc/memtest86/plus.nix
new file mode 100644
index 000000000000..262811d330d6
--- /dev/null
+++ b/pkgs/tools/misc/memtest86/plus.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "memtest86+-4.20";
+  
+  src = fetchurl {
+    url = http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz;
+    sha256 = "0dw7kvfxiwqdmhapbz6ds1j9fralbky56hnzj4c6fsqfinbwwc2n";
+  };
+
+  preBuild = ''
+    # Really dirty hack to get Memtest to build without needing a Glibc
+    # with 32-bit libraries and headers.
+    if test "$system" = x86_64-linux; then
+        mkdir gnu
+        touch gnu/stubs-32.h
+    fi
+  '';
+
+  NIX_CFLAGS_COMPILE = "-I.";
+  
+  installPhase = ''
+    mkdir -p $out
+    cp memtest.bin $out/
+  '';
+
+  meta = {
+    homepage = http://www.memtest.org/;
+    description = "A tool to detect memory errors, fork from memtest86";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7c4ca2ceee0..f8f780c35eb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -985,6 +985,8 @@ let
 
   memtest86 = callPackage ../tools/misc/memtest86 { };
 
+  memtest86plus = callPackage ../tools/misc/memtest86/plus.nix { };
+
   mc = callPackage ../tools/misc/mc { };
 
   mcabber = callPackage ../applications/networking/instant-messengers/mcabber { };

From e5c7358336e8c029dbd63feae1f69db104b5f704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:50:45 +0000
Subject: [PATCH 109/293] GNU help2man 1.40.8.

svn path=/nixpkgs/trunk/; revision=33694
---
 pkgs/development/tools/misc/help2man/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 36a674d0880f..edbc37e76a60 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "help2man-1.40.5";
+  name = "help2man-1.40.8";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.gz";
-    sha256 = "1d1wn9krvf9mp97c224710n1pcfh73p7w7na65zn2a06124rln8k";
+    sha256 = "0s6phazn8jgvpbsby8kj2m58rj1zjghi1aipvamh8af226ssqfzj";
   };
 
   buildInputs = [ makeWrapper perl gettext LocaleGettext ];

From 0e84e560830165713cdf7271af7b01b116ba81df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:50:50 +0000
Subject: [PATCH 110/293] GNU Zile 2.4.7.

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

diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 47d5aab04eeb..0d765a0ad5c0 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.4.3";
+  name = "zile-2.4.7";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "0rygkc3i9bngzn49kq9fnrbz80d8pa2yjy8iz7vjlc4ayc2akvc3";
+    sha256 = "1ak7qjb7s4whxg8qpkg7yixfnhinwfmzgav7rzi0kjmm93z35xcc";
   };
 
   buildInputs = [ ncurses boehmgc ];

From 369fe599b130207bd788dd86e7aacf866977073b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:50:54 +0000
Subject: [PATCH 111/293] GNU Parallel 20120322.

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 2c46b1164507..235cb70cd868 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20111222";
+  name = "parallel-20120322";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0rip8hnby1c2kcz7w7h6c2kf0y63hyw8bwprsd8fnqw96lgypf1b";
+    sha256 = "1nm3ljgaxh2rg2dfwpw9r31zs7k09ab9i14yvbm4wrqasa2bcrxj";
   };
 
   patchPhase =

From f62c2740114813db7947d6867f8bf392e83f7a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:50:59 +0000
Subject: [PATCH 112/293] GNU GLOBAL 6.2.2.

svn path=/nixpkgs/trunk/; revision=33697
---
 pkgs/development/tools/misc/global/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 6e6464a590be..91cf2be4f73b 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libtool, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "global-6.1";
+  name = "global-6.2.2";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "1q305isw1hy2zxcg10jk1g9rmpl8x2r3nkla52jdl4dbydsg6z39";
+    sha256 = "0a41d3wc22f05fqi5zpx1r22annsi4whdkjdmw50nidjca1vq5pj";
   };
 
   buildInputs = [ libtool ncurses ];

From 24feabdcec3a7c4ec39ea43bc748eb66d9888f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:04 +0000
Subject: [PATCH 113/293] GNU Emacs 23.4.

svn path=/nixpkgs/trunk/; revision=33698
---
 pkgs/applications/editors/emacs-23/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix
index a1a9aa4fa325..7b1ecf9d2fe3 100644
--- a/pkgs/applications/editors/emacs-23/default.nix
+++ b/pkgs/applications/editors/emacs-23/default.nix
@@ -8,13 +8,13 @@ assert (libXft != null) -> libpng != null;	# probably a bug
 assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise
 
 stdenv.mkDerivation rec {
-  name = "emacs-23.3b";
+  name = "emacs-23.4";
 
   builder = ./builder.sh;
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${name}.tar.bz2";
-    sha256 = "1vp6qbbjgh5zpd87j3ggsvgf8q6cax8z3cdx3syv5v2662dapp46";
+    sha256 = "1fc8x5p38qihg7l6z2b1hjc534lnjb8gqpwgywlwg5s3csg6ymr6";
   };
 
   buildInputs =

From 5dc812bb8f5fbb289520739269bd41f4abf27409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:08 +0000
Subject: [PATCH 114/293] GNU libtasn1 2.12.

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

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index edaae75a66b5..f70f7d348016 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-2.11";
+  name = "libtasn1-2.12";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "1yws0xfys6fm7ywb3pr8ncl3gr37iky7454if8dbzsicq5vkrm7l";
+    sha256 = "0p8w38l04fgm82iqgl1abhb1ajp04v116bi6fd7lc3n80657l98f";
   };
 
   doCheck = true;

From b65bcf445c9d3a9d7fca55fd5ecf8db875b8f355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:13 +0000
Subject: [PATCH 115/293] GNU idutils 4.6.

svn path=/nixpkgs/trunk/; revision=33700
---
 pkgs/tools/misc/idutils/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix
index 00541c053399..4b81d48b0278 100644
--- a/pkgs/tools/misc/idutils/default.nix
+++ b/pkgs/tools/misc/idutils/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, emacs }:
 
 stdenv.mkDerivation rec {
-  name = "idutils-4.5";
-  
+  name = "idutils-4.6";
+
   src = fetchurl {
-    url = "mirror://gnu/idutils/${name}.tar.gz";
-    sha256 = "0j92k2dwg381kx2z556v9162l16mfra3xqbfcjrkdd2fw5jsgn2q";
+    url = "mirror://gnu/idutils/${name}.tar.xz";
+    sha256 = "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1";
   };
 
   buildInputs = stdenv.lib.optional stdenv.isLinux emacs;

From e658288235c74ff5d2ddbbbc73c19f3fad9bdbff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:18 +0000
Subject: [PATCH 116/293] GNU FreeIPMI 1.1.3.

svn path=/nixpkgs/trunk/; revision=33701
---
 pkgs/tools/system/freeipmi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index fe0bf0384db0..62afb2fe0785 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libgcrypt, readline }:
 
 stdenv.mkDerivation rec {
-  name = "freeipmi-1.1.1";
+  name = "freeipmi-1.1.3";
 
   src = fetchurl {
     url = "mirror://gnu/freeipmi/${name}.tar.gz";
-    sha256 = "03q6wg1wdmr94dxh81lxllb53nmab0d637wgh2s1xn6rfmxf7ypf";
+    sha256 = "11kawxzk8cp9g3q5hdm1sqgzanprc2gagjdnm33lyz5df8xjfkmk";
   };
 
   buildInputs = [ libgcrypt readline ];

From 4cedde0da4491b2856c63a8d31c3227603f37551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:22 +0000
Subject: [PATCH 117/293] GNU cppi 1.16.

svn path=/nixpkgs/trunk/; revision=33702
---
 pkgs/development/tools/misc/cppi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From eabcd9d210c0ebb623b31252100b2b53f052a34d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:27 +0000
Subject: [PATCH 118/293] GNU Parted 3.1.

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

diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 3d217d2660c5..1d0c4f2a9e74 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -2,11 +2,11 @@
 , utillinux, check, enableStatic ? false, hurd ? null }:
 
 stdenv.mkDerivation rec {
-  name = "parted-3.0";
+  name = "parted-3.1";
 
   src = fetchurl {
     url = "mirror://gnu/parted/${name}.tar.xz";
-    sha256 = "054ybvjkj1mbm4mpn1rl12jzhvqg37b0xwwr4ly1zisvzrjhi11a";
+    sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y";
   };
 
   buildInputs = [ libuuid ]

From 3f76364cf884003fcb880628a1a27787e0d2b3a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:31 +0000
Subject: [PATCH 119/293] GNU xorriso 1.2.2.

svn path=/nixpkgs/trunk/; revision=33704
---
 pkgs/tools/cd-dvd/xorriso/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix
index 4936bca1ba10..2c2eb2f80d1f 100644
--- a/pkgs/tools/cd-dvd/xorriso/default.nix
+++ b/pkgs/tools/cd-dvd/xorriso/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }:
 
 stdenv.mkDerivation rec {
-  name = "xorriso-1.1.8";
+  name = "xorriso-1.2.2";
 
   src = fetchurl {
     url = "mirror://gnu/xorriso/${name}.tar.gz";
-    sha256 = "1pnmjk2nvxg54zrm4mha6vvgi6sl5xzznqcfzrlrvgsdy5liwb4x";
+    sha256 = "0kw4fiqn24vya3zhay6minzrbz10zlxm8sjs272z7l5s2kwcjypx";
   };
 
   doCheck = true;

From 7e5a8c93d6e6198e8a0731e11128db68478484d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:36 +0000
Subject: [PATCH 120/293] GnuTLS 3.0.18.

svn path=/nixpkgs/trunk/; revision=33705
---
 pkgs/development/libraries/gnutls/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 243b4b0191d0..26555b9c3c79 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -1,15 +1,15 @@
 { fetchurl, stdenv, zlib, lzo, libtasn1, nettle
-, guileBindings, guile, perl }:
+, guileBindings, guile, perl, psmisc }:
 
 assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-3.0.11";
+  name = "gnutls-3.0.18";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.xz";
-    sha256 = "1l8k96hms7891zl43qjd7lngjh23kxdq22l6ahm1ham7fyhhrh9r";
+    sha256 = "1ynqnj1j6rrzplk2i64dik34829r0y7lwk4qlvjx993q3mj7z863";
   };
 
   configurePhase = ''
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  postCheck =
+    # Kill a process that's left behind.
+    stdenv.lib.optionalString doCheck "${psmisc}/bin/killall mini-loss-time";
+
   meta = {
     description = "The GNU Transport Layer Security Library";
 

From 03e6e149865cac632eacd1f352989041e5ff2179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:40 +0000
Subject: [PATCH 121/293] GNU SIP Witch 1.2.3.

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

diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 51a7fe61cf67..7fa9a62e5e3f 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sipwitch-1.2.1";
+  name = "sipwitch-1.2.3";
 
   src = fetchurl {
     url = "mirror://gnu/sipwitch/${name}.tar.gz";
-    sha256 = "01364q67gyxpxx5fxrmf9kns3qgivnp41kzhi81jdq8sa48c7qbq";
+    sha256 = "0vc7x061m2jdj8hwpw56yiz8ij07x058vm1rm1dz7w98slpkcj6d";
   };
 
   buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];

From 9f0a692a0614f5da4ef035fc5b1b3d65fb98237f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:45 +0000
Subject: [PATCH 122/293] GNU uCommon C++ 5.2.2.

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

diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index 68d5eefa4537..cfcb47dd54f0 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "ucommon-5.1.2";
+  name = "ucommon-5.2.2";
 
   src = fetchurl {
-    url = mirror://gnu/commoncpp/ucommon-5.1.2.tar.gz;
-    sha256 = "1a6wfvrqpkk4w3l33jx5bdj38ljlyr92041aakvwmajpkczjf2q3";
+    url = mirror://gnu/commoncpp/ucommon-5.2.2.tar.gz;
+    sha256 = "1s9r7yhvqnj57aiw7sklp2p6llfzn1jxvc3hwhpli5zq3r6kypwx";
   };
 
   buildInputs = [ pkgconfig gnutls zlib ];

From 3c8c5d9939a3e48e1e8f9a7d89381300af26ba3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:50 +0000
Subject: [PATCH 123/293] GNU ccRTP 2.0.3.

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

diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index 5610588ea41a..a6e426b164a1 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }:
 
 stdenv.mkDerivation {
-  name = "ccrtp-2.0.2";
+  name = "ccrtp-2.0.3";
 
   src = fetchurl {
-    url = mirror://gnu/ccrtp/ccrtp-2.0.2.tar.gz;
-    sha256 = "1n42nscqwryz9f0jpg8lnv22x9m8mzr6rqir9cvbgm1r2skwjh4f";
+    url = mirror://gnu/ccrtp/ccrtp-2.0.3.tar.gz;
+    sha256 = "1p4zzqn02zvnyjy84khiq8v65pl422fb6ni946h9sxh4yw2lgn01";
   };
 
   buildInputs = [ openssl pkgconfig libgcrypt ucommon ];

From 1e13bf5b12d39f47cc8f8012e82ec70771af7ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:51:54 +0000
Subject: [PATCH 124/293] GNU Shishi 1.0.1.

svn path=/nixpkgs/trunk/; revision=33709
---
 pkgs/servers/shishi/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 607332755099..6779ac9e0c3a 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libtasn1, libgcrypt, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "shishi-1.0.0";
+  name = "shishi-1.0.1";
 
   src = fetchurl {
     url = "mirror://gnu/shishi/${name}.tar.gz";
-    sha256 = "1j8jbfsdpwqqfv7938gy4b6kvdai3l2nk8267sv18rbp95k9j7ig";
+    sha256 = "13c6w9rpaqb3am65nrn86byvmll5r78pld2vb0i68491vww4fzlx";
   };
 
   buildInputs = [ libtasn1 libgcrypt gnutls ] ;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8f780c35eb7..919b2f196421 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5276,10 +5276,7 @@ let
     openldap = null;
   };
 
-  shishi = callPackage ../servers/shishi {
-    # GNU Shishi 1.0.0 fails to build with GnuTLS 3.x.
-    gnutls = gnutls2;
-  };
+  shishi = callPackage ../servers/shishi { };
 
   sipwitch = callPackage ../servers/sip/sipwitch { };
 

From 4bca5587a6da08bb0c4aff667e37dcd75835fc1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:52:00 +0000
Subject: [PATCH 125/293] GNU Xnee 3.12.

svn path=/nixpkgs/trunk/; revision=33710
---
 pkgs/tools/X11/xnee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index 3344bdfce493..98808c7d399c 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -2,11 +2,11 @@
 , gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "xnee-3.11";
+  name = "xnee-3.12";
 
   src = fetchurl {
     url = "mirror://gnu/xnee/${name}.tar.gz";
-    sha256 = "1x4frrf5ayslbkmr5cwll7psssxk11r4acnadp4qdvd218x50xrq";
+    sha256 = "10vxn0in0l2jir6x90grx5jc64x63l3b0f8liladdbplc8za8zmw";
   };
 
   patchPhase =

From d656d037f264f211d2acf15a66aac868c7d06a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:52:05 +0000
Subject: [PATCH 126/293] GNUnet 0.9.2.

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

diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 5d5d6128bb42..be67c289814c 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -1,23 +1,23 @@
 { stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
 , zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
-, libxml2, ncurses, gettext
+, libxml2, ncurses, gettext, libunistring
 , gtkSupport ? false, gtk ? null, libglade ? null
 , makeWrapper }:
 
 assert gtkSupport -> (gtk != null) && (libglade != null);
 
 stdenv.mkDerivation rec {
-  name = "gnunet-0.9.1";
+  name = "gnunet-0.9.2";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/${name}.tar.gz";
-    sha256 = "0ipx027lzcgdv70adfk8f4h0zrzm9mlhy3vj9cgc0ck8x52llfpq";
+    sha256 = "1sa7xc85l7lkd0s7vyxnqhnm7cngnycrvp7zc6yj4b3qjg5z3x94";
   };
 
   buildInputs = [
     libextractor libmicrohttpd libgcrypt gmp curl libtool
     zlib adns sqlite libxml2 ncurses
-    pkgconfig gettext makeWrapper
+    pkgconfig gettext libunistring makeWrapper
   ] ++ (if gtkSupport then [ gtk libglade ] else []);
 
   preConfigure = ''

From 4bf921f1938bb35992eacd7ad3a23fad6d386afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 9 Apr 2012 20:52:10 +0000
Subject: [PATCH 127/293] GNU Classpath 0.99.

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

diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix
index f3231ab4ee77..9bbfd381a0db 100644
--- a/pkgs/development/libraries/java/classpath/default.nix
+++ b/pkgs/development/libraries/java/classpath/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk, gconf }:
 
 stdenv.mkDerivation rec {
-  name = "classpath-0.98";
+  name = "classpath-0.99";
 
   src = fetchurl {
     url = "mirror://gnu/classpath/${name}.tar.gz";
-    sha256 = "0gxcdysw36vk3dpylg6f44c0fc8g10ayyb521l8bcygz9p6ml6sh";
+    sha256 = "1j7cby4k66f1nvckm48xcmh352b1d1b33qk7l6hi7dp9i9zjjagr";
   };
 
   patches = [ ./missing-casts.patch ];

From 5dfcf188015721255f9056308d4f641441cb2cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 9 Apr 2012 21:01:00 +0000
Subject: [PATCH 128/293] Adding a minimal FTRACE to the 3.2 and 3.3 linux
 kernels, that should not affect the kernel performance, but allow more
 tracing.

svn path=/nixpkgs/trunk/; revision=33713
---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 6 ++++++
 pkgs/os-specific/linux/kernel/linux-3.3.nix | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 59df5962744f..aff17db22f66 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -220,6 +220,12 @@ let
       CONNECTOR y
       PROC_EVENTS y
 
+      # Tracing
+      FTRACE y
+      FUNCTION_TRACER y
+      FTRACE_SYSCALLS y
+      SCHED_TRACER y
+
       ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
       ${extraConfig}
     '';
diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix
index 83b29fba85e8..5e863cc9b889 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix
@@ -219,6 +219,12 @@ let
       CONNECTOR y
       PROC_EVENTS y
 
+      # Tracing
+      FTRACE y
+      FUNCTION_TRACER y
+      FTRACE_SYSCALLS y
+      SCHED_TRACER y
+
       ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
       ${extraConfig}
     '';

From b35d2c6b895607a939cfef446ca37b0d869fede6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 9 Apr 2012 21:02:17 +0000
Subject: [PATCH 129/293] Adding a patch for linux 3.3 for btrfs regarding
 ENOSPC.

This should solve the problem I had, where I could not boot either 3.3 or 3.3.1
in my system, as I got ENOSPC all the time.


svn path=/nixpkgs/trunk/; revision=33714
---
 .../linux/kernel/btrfs-enospc.patch           | 21 +++++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix     |  5 +++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 27 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/btrfs-enospc.patch

diff --git a/pkgs/os-specific/linux/kernel/btrfs-enospc.patch b/pkgs/os-specific/linux/kernel/btrfs-enospc.patch
new file mode 100644
index 000000000000..aebe285227de
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/btrfs-enospc.patch
@@ -0,0 +1,21 @@
+Revert of http://git.kernel.org/?p=linux/kernel/git/mason/linux-btrfs.git;a=commit;h=5500cdbe14d7435e04f66ff3cfb8ecd8b8e44ebf
+
+Btrfs mailing list where this patch comes from:
+http://article.gmane.org/gmane.comp.file-systems.btrfs/16650
+
+This change caused early ENOSPC, and should be integrated to some linux 3.3, but it is still
+not there. That's what #btrfs people say.
+
+diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
+index dc083f5..079e5a1 100644
+--- a/fs/btrfs/extent-tree.c
++++ b/fs/btrfs/extent-tree.c
+@@ -4108,7 +4108,7 @@ static u64 calc_global_metadata_size(struct btrfs_fs_info *fs_info)
+ 	num_bytes += div64_u64(data_used + meta_used, 50);
+ 
+ 	if (num_bytes * 3 > meta_used)
+-		num_bytes = div64_u64(meta_used, 3) * 2;
++		num_bytes = div64_u64(meta_used, 3);
+ 
+ 	return ALIGN(num_bytes, fs_info->extent_root->leafsize << 10);
+ }
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 75f6473b57ba..9d4a6d001c4a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -359,4 +359,9 @@ rec {
       name = "guruplug-arch-number";
       patch = ./guruplug-mach-type.patch;
     };
+
+  btrfs_enospc =
+    { name = "btrfs-enospc-3.3-revert";
+      patch = ./btrfs-enospc.patch;
+    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 919b2f196421..fd1f06120b87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5713,6 +5713,7 @@ let
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs3_3
         kernelPatches.efi_bootstub_config_3_3
+        kernelPatches.btrfs_enospc
         #kernelPatches.mips_restart_2_6_36
       ];
   };

From 9595946c73a02af48695d07ca880451b32076d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 10 Apr 2012 07:13:52 +0000
Subject: [PATCH 130/293] Fixing details of debugVersion, and adding a
 'symbolsVersion'.

I could merge both into one, but I'll do that later.


svn path=/nixpkgs/trunk/; revision=33715
---
 pkgs/misc/misc.nix | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix
index de23d6fa2c8d..df4a0ce81023 100644
--- a/pkgs/misc/misc.nix
+++ b/pkgs/misc/misc.nix
@@ -109,14 +109,15 @@ in
   # build a debug version of a package
   debugVersion = pkg: lib.overrideDerivation pkg (attrs: {
 
-    prePhases = ["preHook"] ++ lib.optionals (pkgs ? prePhases) pkgs.prePhases;
+    prePhases = ["debugPhase"] ++ lib.optionals (attrs ? prePhases) attrs.prePhases;
+    postPhases = ["objectsPhase"] ++ lib.optionals (attrs ? postPhases) attrs.postPhases;
 
     dontStrip = true;
 
     CFLAGS="-ggdb -O0";
     CXXFLAGS="-ggdb -O0";
 
-    preHook = ''
+    debugPhase = ''
       s=$out/src
       mkdir -p $s; cd $s;
       export TMP=$s
@@ -128,5 +129,38 @@ in
       echo "file should tell that executable has not been stripped"
     '';
 
+    objectsPhase = ''
+      cd $out/src
+      find . -name "*.o" -exec rm {} \;
+    '';
+  });
+
+  # build an optimized ersion of a package but with symbols and source
+  symbolsVersion = pkg: lib.overrideDerivation pkg (attrs: {
+
+    prePhases = ["debugPhase"] ++ lib.optionals (attrs ? prePhases) attrs.prePhases;
+    postPhases = ["objectsPhase"] ++ lib.optionals (attrs ? postPhases) attrs.postPhases;
+
+    dontStrip = true;
+
+    CFLAGS="-g -O2";
+    CXXFLAGS="-g -O2";
+
+    debugPhase = ''
+      s=$out/src
+      mkdir -p $s; cd $s;
+      export TMP=$s
+      export TEMP=$s
+
+      for var in CFLAGS CXXFLAGS NIX_CFLAGS_COMPILE; do
+        declare -x "$var=''${!var} -g -O2"
+      done
+      echo "file should tell that executable has not been stripped"
+    '';
+
+    objectsPhase = ''
+      cd $out/src
+      find . -name "*.o" -exec rm {} \;
+    '';
   });
 }

From e7dcb5c31f14434c699fa3139c532b8811001b0b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 12:56:00 +0000
Subject: [PATCH 131/293] * dhcpcd updated to 5.5.6.

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

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index e373d6c728ba..dc2a84982239 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-5.5.5";
+  name = "dhcpcd-5.5.6";
 
   src = fetchurl {
     url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
-    sha256 = "0arypxvyk0hbaln2plc9r4naij8pzj2yhah5rslmdd49sd0h94k8";
+    sha256 = "1rz8n6crw6yh9hzqwdqjpl37v60i1szr7dbhf6gvm374gpf10zv5";
   };
 
   configureFlags = "--sysconfdir=/etc";

From 16e2cac6f4930f79f9d492a02da9779084099afc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 10 Apr 2012 14:53:39 +0000
Subject: [PATCH 132/293] Updating Julia to include a few fixes - and adding
 web-repl

svn path=/nixpkgs/trunk/; revision=33726
---
 pkgs/development/compilers/julia/default.nix | 21 ++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 62fce4c27754..ceb75f52c5f7 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, blas, liblapack
  , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
- , ncurses, libunistring
+ , ncurses, libunistring, lighttpd
  } :
 let
   liblapackShared = liblapack.override{shared=true;};
@@ -8,7 +8,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "julia";
-  date = "20120405";
+  date = "20120410";
   name = "${pname}-git-${date}";
 
   grisu_ver = "1.1";
@@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
-    rev = "a6324519931e874d3691be258af7f81e4e4826e4";
-    sha256 = "897019f1dc5c4ce7d1e5c607c1f9cb6efe0e6fb74184fdd921ab239c3adaed6d";
+    rev = "73776ba8ed510862b81eb1dd5c70e2055deb5895";
+    sha256 = "e833caeeecedc5603ee71405a8cb3813bf7ace10df8f7b4a43c7beccf0ccaf0d";
   };
 
   buildInputs = [ gfortran perl m4 gmp pcre llvm blas liblapackShared readline 
@@ -82,6 +82,19 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p "$out/bin"
     ln -s "$out/share/julia/julia" "$out/bin"
+
+    mkdir -p "$out/share/julia/ui/"
+    cp -r ui/website "$out/share/julia/ui/"
+    cp external/lighttpd.conf "$out/share/julia/ui/"
+
+    mkdir -p "$out/share/julia/ui/webserver/"
+    cp -r ui/webserver/{*.jl,*.h} "$out/share/julia/ui/webserver/"
+
+    echo -e '#!/bin/sh' >> "$out/bin/julia-webserver"
+    echo -e "cd \"$out/share/julia\"" >> "$out/bin/julia-webserver"
+    echo -e '${lighttpd}/sbin/lighttpd -D -f ./ui/lighttpd.conf &' >> "$out/bin/julia-webserver"
+    echo -e './julia-release-webserver -p 2001' >> "$out/bin/julia-webserver"
+    chmod a+x "$out/bin/julia-webserver"
   '';
 
   meta = {

From e40f598035fcc7d6d4ea3f28d67c8f95b2bd4d4d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 21:46:08 +0000
Subject: [PATCH 133/293] * Change the default Linux kernel to 3.2, since
 2.6.35 is old and   unmaintained.

svn path=/nixpkgs/trunk/; revision=33737
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd1f06120b87..aa947588ecaf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5849,7 +5849,7 @@ let
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;
-  linuxPackages = linuxPackages_2_6_35;
+  linuxPackages = linuxPackages_3_2;
 
   keyutils = callPackage ../os-specific/linux/keyutils { };
 

From 7c2e04a8ffe09914edf105d46f481580c8470877 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 22:48:27 +0000
Subject: [PATCH 134/293] * Apply the CIFS timeout patch to Linux 3.2.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa947588ecaf..a22d5a1161f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5702,6 +5702,7 @@ let
       [ #kernelPatches.fbcondecor_2_6_38
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs3_2
+        kernelPatches.cifs_timeout_2_6_38
         #kernelPatches.mips_restart_2_6_36
       ];
   };

From 8b0bc7a7457cf65e7520efaf54494da44593cfc7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Apr 2012 07:45:12 +0000
Subject: [PATCH 135/293] * Add modules required by Linux 3.2.

svn path=/nixpkgs/trunk/; revision=33742
---
 pkgs/build-support/vm/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 5c3d66595afe..2f8afb1f3889 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1,7 +1,10 @@
 { pkgs
 , linuxKernel ? pkgs.linux
 , img ? "bzImage"
-, rootModules ? [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3" "unix" ]
+, rootModules ?
+    [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3"
+      "unix" "hmac" "md4" "ecb" "des_generic"
+    ]
 }:
 
 with pkgs;

From 52f4dd95d4c34fbf6b95e61e846002a11fc3e093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 11 Apr 2012 16:38:21 +0000
Subject: [PATCH 136/293] GMP 5.0.3: Fix FreeBSD builds.

svn path=/nixpkgs/trunk/; revision=33748
---
 pkgs/development/libraries/gmp/5.0.3.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gmp/5.0.3.nix b/pkgs/development/libraries/gmp/5.0.3.nix
index 8c3d24d2d113..dbc9e83ed8d2 100644
--- a/pkgs/development/libraries/gmp/5.0.3.nix
+++ b/pkgs/development/libraries/gmp/5.0.3.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, m4, cxx ? true }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "gmp-5.0.3";
 
   src = fetchurl {
@@ -51,3 +51,21 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.all;
   };
 }
+
+//
+
+(if stdenv.isFreeBSD
+ then {
+   # On FreeBSD, GMP's `config.guess' detects the sub-architecture (e.g.,
+   # "k8") and generates code specific to that sub-architecture, in spite of
+   # `--enable-fat', leading to illegal instructions and similar errors on
+   # machines with a different sub-architecture.
+   # See <http://hydra.nixos.org/build/2269915/nixlog/1/raw>, for an example.
+   # Thus, use GNU's standard `config.guess' so that it assumes the generic
+   # architecture (e.g., "x86_64").
+   preConfigure =
+     '' rm config.guess && ln -s configfsf.guess config.guess
+        chmod +x configfsf.guess.
+     '';
+ }
+ else { }))

From 8794d3ed45c4b3932f9abbe6885d03cbdff8aae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 11 Apr 2012 20:09:25 +0000
Subject: [PATCH 137/293] GMP 5.0.3: Fix typo.

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

diff --git a/pkgs/development/libraries/gmp/5.0.3.nix b/pkgs/development/libraries/gmp/5.0.3.nix
index dbc9e83ed8d2..979552979416 100644
--- a/pkgs/development/libraries/gmp/5.0.3.nix
+++ b/pkgs/development/libraries/gmp/5.0.3.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (rec {
    # architecture (e.g., "x86_64").
    preConfigure =
      '' rm config.guess && ln -s configfsf.guess config.guess
-        chmod +x configfsf.guess.
+        chmod +x configfsf.guess
      '';
  }
  else { }))

From 65d9b6076de000a1c02147a72158ea12838cdfc7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Apr 2012 06:10:44 +0000
Subject: [PATCH 138/293] Updating libunwind

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

diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index ea657e8e43d8..5bfd76f919b4 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "libunwind-0.98.6";
+  name = "libunwind-1.0.1";
   
   src = fetchurl {
     url = "http://download.savannah.nongnu.org/releases/libunwind/${name}.tar.gz";
-    sha256 = "1qfxqkyx4r5dmwajyhvsyyl8zwxs6n2rcg7a61fgfdfp0gxvpzgx";
+    sha256 = "aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f";
   };
   
   NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";

From 674de696b5b4ea2e561b26a20881e42218d9c906 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Apr 2012 06:18:42 +0000
Subject: [PATCH 139/293] Take into account an installation process quirk

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

diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 5bfd76f919b4..49e230173697 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
   };
   
   NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
+  preInstall = ''
+    mkdir -p "$out/lib"
+    touch "$out/lib/libunwind-generic.so"
+  '';
   
   meta = {
     homepage = http://www.nongnu.org/libunwind;

From fa1ecfed54b356cf751a8d2bcc26596c5d843b61 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Apr 2012 07:12:07 +0000
Subject: [PATCH 140/293] Update Kona/fix its build

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

diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix
index 7e4f1e408b44..cec0d35bde52 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/pkgs/development/interpreters/kona/default.nix
@@ -14,12 +14,12 @@ rec {
   srcDrv = a.fetchgit {
     url = "https://github.com/kevinlawler/kona.git";
     inherit rev;
-    sha256 = "165ff5f3d1b510a1ad73ec465b4ed1b8ef44d7affa94f952781fea212c72d891";
+    sha256 = "a8189c94fca3e62a740eb6823ab3fc571c0960ff5e7a3eb0353e5cf36ef9fdcb";
   };
 
   src = "${srcDrv}/";
 
-  rev = "fddc2688ef515a653fb6";
+  rev = "81e95b395144f4b02fe8782ad87c1f218b511c43";
   version = "git-${rev}";
   name = "kona-${version}";
   inherit buildInputs;

From dd3ef46cacd0bee56d9541777c172fb409423333 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Apr 2012 07:23:52 +0000
Subject: [PATCH 141/293] Update TPTP

svn path=/nixpkgs/trunk/; revision=33754
---
 pkgs/applications/science/logic/tptp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index 11b8f7ce535a..ecd70843e0fd 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -11,10 +11,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="TPTP";
-    version="5.1.0";
+    version="5.3.0";
     name="${baseName}-${version}";
     url="http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz";
-    hash="1wh2k575nn51ykg1jnwfwjqhg5x42k5vvn2spq09px26vhs4yksy";
+    hash="0xzybh332x53q4cmb3i47ygln0x6rd2nx810la1hmja9d1ixnz9b";
   };
 in
 rec {

From 25ef476ba0288316cb1550f80fe57382c2334c10 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Apr 2012 07:55:49 +0000
Subject: [PATCH 142/293] Fix ttf2pt1 build

svn path=/nixpkgs/trunk/; revision=33755
---
 pkgs/tools/misc/ttf2pt1/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix
index 2deb8893f4e0..379db7d533f0 100644
--- a/pkgs/tools/misc/ttf2pt1/default.nix
+++ b/pkgs/tools/misc/ttf2pt1/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation {
   '';
 
   buildInputs = [ freetype ];
+  buildNativeInputs = [ perl ];
   
   patches = ./gentoo-makefile.patch; # also contains the freetype patch
 

From 49b28405d888065098d209321b708d5a0254cf6a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Apr 2012 09:31:31 +0000
Subject: [PATCH 143/293] Samba security update

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

diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 6d34d1f64f58..39ccfa9184e5 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -18,11 +18,11 @@
 assert useKerberos -> kerberos != null;
 
 stdenv.mkDerivation rec {
-  name = "samba-3.6.3";
+  name = "samba-3.6.4";
 
   src = fetchurl {
     url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";
-    sha256 = "0x30qv5y5m5cip077k44gf2khl0hk0s5hpy98ywmqkay5ngl1qk7";
+    sha256 = "052r5c9pwqk6qnzc2g6wljxml6j3nkydbpisgfa0xmvdgzyc42jr";
   };
 
   patches =

From 700bedb833ea82a892a463f1fd4785a849a2e1c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 12 Apr 2012 10:00:18 +0000
Subject: [PATCH 144/293] Adding me as a maintainer for octave.

svn path=/nixpkgs/trunk/; revision=33757
---
 pkgs/development/interpreters/octave/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 132b66a7d28d..dbbb0324d144 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -24,4 +24,11 @@ stdenv.mkDerivation rec {
   postInstall = ''
     cp test/fntests.log $out/share/octave/${name}-fntests.log
   '';
+
+  meta = {
+    homepage = http://octave.org/;
+    license = "GPLv3+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
 }

From 5cdb676ac7f2ac733f896ed5c219a4127b2cbcb1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Apr 2012 11:39:40 +0000
Subject: [PATCH 145/293] Adding FSharp compiler

svn path=/nixpkgs/trunk/; revision=33758
---
 pkgs/development/compilers/fsharp/default.nix | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/compilers/fsharp/default.nix

diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
new file mode 100644
index 000000000000..fb0d3e799cce
--- /dev/null
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, mono, unzip, pkgconfig
+ } :
+stdenv.mkDerivation rec {
+  pname = "fsharp";
+  date = "2011-08-10";
+  name = "${pname}-${date}";
+
+  src = fetchurl {
+    url = "http://download.mono-project.com/sources/fsharp/fsharp-cc126f2.zip";
+    sha256 = "03j2ypnfddl2zpvg8ivhafjy8dlz49b38rdy89l8c3irxdsb7k6i";
+  };
+
+  buildInputs = [mono unzip pkgconfig];
+
+  sourceRoot = "fsharp";
+
+  # To fix this error when running:
+  # The file "/nix/store/path/whatever.exe" is an not a valid CIL image
+  dontStrip = true;
+
+  meta = {
+    description = "A functional CLI language";
+    homepage = "http://tryfsharp.org/";
+    license = stdenv.lib.licenses.some;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a22d5a1161f0..6aa395ad4656 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2319,6 +2319,8 @@ let
     inherit cmake;
   };
 
+  fsharp = callPackage ../development/compilers/fsharp {};
+
   go = callPackage ../development/compilers/go { };
 
   gprolog = callPackage ../development/compilers/gprolog { };

From 40347a43c23b030de4abefcc26fde3604df4ac40 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Apr 2012 11:57:43 +0000
Subject: [PATCH 146/293] Fix license

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

diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index fb0d3e799cce..bb9c6d75d446 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A functional CLI language";
     homepage = "http://tryfsharp.org/";
-    license = stdenv.lib.licenses.some;
+    license = stdenv.lib.licenses.asl20;
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = with stdenv.lib.platforms; linux;
   };

From fcc5136cfc68446410013d02f6265d7d2c238da6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Apr 2012 13:20:58 +0000
Subject: [PATCH 147/293] * Latest EC2 AMI/API tools.

svn path=/nixpkgs/trunk/; revision=33760
---
 pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix | 4 ++--
 pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
index d40fec073a70..b05596ed50ac 100644
--- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "ec2-ami-tools-1.4.0.5";
+  name = "ec2-ami-tools-1.4.0.7";
   
   buildInputs = [ unzip makeWrapper ];
   
   src = fetchurl {
     url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
-    sha256 = "0vhdqmi076ipqj05dd7fn0drbhcvzccdcdhy8br9sp684scg9a75";
+    sha256 = "0l8c623i1w30bh9k622cdjj5f57rlfc1zs0i01ya016ijyr08qip";
   };
 
   # Amazon EC2 requires that disk images are writable.  If they're
diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
index 73b65a7e0fc9..fbc210c86090 100644
--- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, makeWrapper, jre }:
 
 stdenv.mkDerivation {
-  name = "ec2-api-tools-1.4.4.2";
+  name = "ec2-api-tools-1.5.2.5";
   
   src = fetchurl {
     url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip;
-    sha256 = "03immxrrc7brbwm9nbp6dqw4bxpcb18l8rsj75nd6h2vanq2qlj4";
+    sha256 = "1p4126hcxz0c1kcrhdlsgx31klh3kv7kp8dn9sgjivmgxgillyyc";
   };
 
   buildInputs = [ unzip makeWrapper ];

From 054382bbfef87964a167355e3087e1d6dac01c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 12 Apr 2012 13:44:14 +0000
Subject: [PATCH 148/293] GMP 5.0.3: Really fix FreeBSD builds at
 hydra.nixos.org.

Patch by Eelco Dolstra, backported from `stdenv-updates'.

svn path=/nixpkgs/trunk/; revision=33761
---
 pkgs/development/libraries/gmp/5.0.3.nix      | 14 ++-------
 .../libraries/gmp/ignore-bad-cpuid.patch      | 31 +++++++++++++++++++
 2 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/libraries/gmp/ignore-bad-cpuid.patch

diff --git a/pkgs/development/libraries/gmp/5.0.3.nix b/pkgs/development/libraries/gmp/5.0.3.nix
index 979552979416..962c2c5b74b1 100644
--- a/pkgs/development/libraries/gmp/5.0.3.nix
+++ b/pkgs/development/libraries/gmp/5.0.3.nix
@@ -56,16 +56,8 @@ stdenv.mkDerivation (rec {
 
 (if stdenv.isFreeBSD
  then {
-   # On FreeBSD, GMP's `config.guess' detects the sub-architecture (e.g.,
-   # "k8") and generates code specific to that sub-architecture, in spite of
-   # `--enable-fat', leading to illegal instructions and similar errors on
-   # machines with a different sub-architecture.
-   # See <http://hydra.nixos.org/build/2269915/nixlog/1/raw>, for an example.
-   # Thus, use GNU's standard `config.guess' so that it assumes the generic
-   # architecture (e.g., "x86_64").
-   preConfigure =
-     '' rm config.guess && ln -s configfsf.guess config.guess
-        chmod +x configfsf.guess
-     '';
+   # The FreeBSD boxes at hydra.nixos.org are VMs run in QEMU.  This patch
+   # allows GMP to work correctly in that environment.
+   patches = [ ./ignore-bad-cpuid.patch ];
  }
  else { }))
diff --git a/pkgs/development/libraries/gmp/ignore-bad-cpuid.patch b/pkgs/development/libraries/gmp/ignore-bad-cpuid.patch
new file mode 100644
index 000000000000..840d530a450b
--- /dev/null
+++ b/pkgs/development/libraries/gmp/ignore-bad-cpuid.patch
@@ -0,0 +1,31 @@
+Don't abort when seeing the default CPU model/platform returned by
+QEMU.
+
+diff -ru -x '*~' gmp-5.0.4-orig/mpn/x86_64/fat/fat.c gmp-5.0.4/mpn/x86_64/fat/fat.c
+--- gmp-5.0.4-orig/mpn/x86_64/fat/fat.c	2012-02-10 11:23:05.000000000 +0100
++++ gmp-5.0.4/mpn/x86_64/fat/fat.c	2012-04-01 21:38:35.843066724 +0200
+@@ -194,13 +194,16 @@
+     {
+       switch (family)
+ 	{
++#if 0
+ 	case 4:
+ 	case 5:
+ 	  abort ();		/* 32-bit processors */
++#endif
+ 
+ 	case 6:
+ 	  switch (model)
+ 	    {
++#if 0
+ 	    case 0x00:
+ 	    case 0x01:
+ 	    case 0x02:
+@@ -217,6 +220,7 @@
+ 	    case 0x0d:		/* Dothan */
+ 	    case 0x0e:		/* Yonah */
+ 	      abort ();		/* 32-bit processors */
++#endif
+ 
+ 	    case 0x0f:		/* Conroe Merom Kentsfield Allendale */
+ 	    case 0x10:

From 205dbbd991003903a2da21c5e57c6b86657efb0d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Apr 2012 14:16:23 +0000
Subject: [PATCH 149/293] * Update euca2ools.

svn path=/nixpkgs/trunk/; revision=33762
---
 .../virtualization/euca2ools/default.nix      | 30 +++++--------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix
index 7992ced6d0cc..ce84706c3566 100644
--- a/pkgs/tools/virtualization/euca2ools/default.nix
+++ b/pkgs/tools/virtualization/euca2ools/default.nix
@@ -1,30 +1,16 @@
-{ stdenv, fetchurl, which, pythonPackages }:
+{ stdenv, fetchgit, which, pythonPackages }:
 
-stdenv.mkDerivation rec {
-  name = "euca2ools-1.3.1";
+pythonPackages.buildPythonPackage rec {
+  name = "euca2ools-2.0.0-pre-20111230";
   namePrefix = "";
 
-  src = fetchurl {
-    url = "http://eucalyptussoftware.com/downloads/releases/${name}.tar.gz";
-    sha256 = "1k4hakbxqsv2gzcdrf6dbyrpnajcan9yilddhs47cg7lgqw7b41f";
+  src = fetchgit {
+    url = https://github.com/eucalyptus/euca2ools.git;
+    rev = "0032f7c85603f34b728a6f8bc6f25d7e4892432e";
+    sha256 = "ae3c3918d60411ebf15faefb6dc94e3a98ab73cf751d8180c52f51b19ed64c09";
   };
 
-  makeFlags = "PREFIX=$(out)";
-
-  buildInputs = [ which pythonPackages.python pythonPackages.wrapPython ];
-
-  # We need boto 1.9 for now.  See https://bugs.launchpad.net/euca2ools/devel/+bug/623888
-  pythonPath = [ pythonPackages.setuptools pythonPackages.boto_1_9 pythonPackages.m2crypto ];
-
-  preBuild =
-    ''
-      substituteInPlace Makefile --replace "-o root" ""
-    
-      substituteInPlace euca2ools/Makefile \
-        --replace 'python setup.py install' "python setup.py install --prefix=$out"
-    '';
-
-  postInstall = "wrapPythonPrograms";
+  pythonPath = [ pythonPackages.boto pythonPackages.m2crypto pythonPackages.ssl ];
 
   meta = {
     homepage = http://open.eucalyptus.com/downloads;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6aa395ad4656..a63a8774ae8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -650,7 +650,7 @@ let
 
   ethtool = callPackage ../tools/misc/ethtool { };
 
-  euca2ools = callPackage ../tools/virtualization/euca2ools { };
+  euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; };
 
   exif = callPackage ../tools/graphics/exif { };
 

From eb7575138ae5ca5fe767f6782d300cee4e570d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 12 Apr 2012 15:30:02 +0000
Subject: [PATCH 150/293] Coccinelle: Make sure Python modules are looked up in
 the right place.

svn path=/nixpkgs/trunk/; revision=33763
---
 pkgs/development/tools/misc/coccinelle/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 1d1db3b87ad1..0b5fa4b8d611 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, python, ncurses, ocamlPackages }:
+{ fetchurl, stdenv, python, ncurses, ocamlPackages, makeWrapper }:
 
 let
 
@@ -16,11 +16,21 @@ in stdenv.mkDerivation {
   buildInputs = with ocamlPackages; [
     ocaml findlib menhir
     ocaml_pcre ocaml_sexplib pycaml
-    python ncurses
+    python ncurses makeWrapper
   ];
 
   configureFlagsArray = [ "--enable-release" ];
 
+  postInstall =
+    # On non-NixOS systems, Coccinelle would end up looking up Python modules
+    # in the wrong directory.
+    '' for p in "$out/bin/"*
+       do
+         wrapProgram "$p" \
+           --prefix "PYTHONPATH" ":" "${python}/lib/python${python.majorVersion}"
+       done
+    '';
+
   meta = {
     description = "Coccinelle, a program to apply C code semantic patches";
 

From 351bcc3b7076e7486fbf7730fbf219f901de74f9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Apr 2012 20:54:39 +0000
Subject: [PATCH 151/293] Fix tailor URL

svn path=/nixpkgs/trunk/; revision=33767
---
 pkgs/applications/version-management/tailor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index 67567679b903..54529503d82a 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -2,7 +2,7 @@ args : with args;
 let version = if args ? version then args.version else "0.9.35"; in
 rec {
   src = fetchurl {
-    url = "http://darcs.arstecnica.it/tailor-${version}.tar.gz";
+    url = "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz";
     sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh";
   };
 

From 02ff38f7b114ccf3a60dc25f0f0620890add1518 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 12 Apr 2012 21:28:45 +0000
Subject: [PATCH 152/293] Patch unused variable errors

svn path=/nixpkgs/trunk/; revision=33768
---
 pkgs/tools/misc/fileschanged/default.nix      |  2 +
 .../unused-variables.debian.patch             | 48 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/tools/misc/fileschanged/unused-variables.debian.patch

diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix
index 5619174f74f0..d0a03f955a89 100644
--- a/pkgs/tools/misc/fileschanged/default.nix
+++ b/pkgs/tools/misc/fileschanged/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ fam ];
 
+  patches = [./unused-variables.debian.patch];
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/tools/misc/fileschanged/unused-variables.debian.patch b/pkgs/tools/misc/fileschanged/unused-variables.debian.patch
new file mode 100644
index 000000000000..73d307f9413d
--- /dev/null
+++ b/pkgs/tools/misc/fileschanged/unused-variables.debian.patch
@@ -0,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_unused_variables.dpatch by Colin Watson <cjwatson@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: GCC 4.6 warns about unused variables, and fileschanged builds with
+## DP: -Werror, so deal with unused variable warnings.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fileschanged-0.6.5~/src/monitor.c fileschanged-0.6.5/src/monitor.c
+--- fileschanged-0.6.5~/src/monitor.c	2006-04-19 20:42:29.000000000 +0100
++++ fileschanged-0.6.5/src/monitor.c	2011-09-14 01:17:23.000000000 +0100
+@@ -84,6 +84,7 @@
+ 	  retval = FAMMonitorDirectory (c, node->filename, &node->request,
+ 					(void *) node);
+ 	  //printf ("FAMMonitorDirectory returns %d (reqnum %d)\n", retval, node->request.reqnum);
++	  (void) retval;
+ 	}
+       else if (S_ISREG (node->statbuf.st_mode))
+ 	{
+@@ -91,6 +92,7 @@
+ 	  retval = FAMMonitorFile (c, node->filename, &node->request,
+ 				   (void *) node);
+ 	  //printf ("FAMMonitorFile returns %d (reqnum %d)\n", retval, node->request.reqnum);
++	  (void) retval;
+ 	}
+       monitor_handle_events (c, list, 0, 30);
+     }
+
+diff -r -U3 fileschanged-0.6.9-orig/src/main.c fileschanged-0.6.9/src/main.c
+--- fileschanged-0.6.9-orig/src/main.c  2012-04-13 01:31:59.160601022 +0400
++++ fileschanged-0.6.9/src/main.c       2012-04-13 01:32:47.549599643 +0400
+@@ -126,6 +126,7 @@
+     {
+       retval = process_file (filelist, filelist_len, arguments.args[i]);
+     }
++  (void) retval;
+   return 0;
+ }
+ 
+@@ -168,6 +169,7 @@
+ 
+   if (fileptr != stdin)
+     fclose (fileptr);
++  (void) retval;
+   return 0;
+ }
+ int 
+

From d34679a9dbe95b8a2346d78a5e6c0c6aec5d2fd5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 13 Apr 2012 05:32:12 +0000
Subject: [PATCH 153/293] Extreme Tux Racer still requires libpng 1.2

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a63a8774ae8e..b4ce9dc869e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3425,9 +3425,10 @@ let
 
   extremetuxracer = builderDefsPackage (import ../games/extremetuxracer) {
     inherit mesa tcl freeglut SDL SDL_mixer pkgconfig
-      libpng gettext intltool;
+      gettext intltool;
     inherit (xlibs) libX11 xproto libXi inputproto
       libXmu libXext xextproto libXt libSM libICE;
+    libpng = libpng12;
   };
 
   eventlog = callPackage ../development/libraries/eventlog { };

From ef6bff049a9f822cf8b3d991d7d169d636358dcd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 13 Apr 2012 05:40:05 +0000
Subject: [PATCH 154/293] GCL needs gmp4

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4ce9dc869e4..c90abea310b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2148,7 +2148,8 @@ let
 
   gcl = builderDefsPackage ../development/compilers/gcl {
     inherit mpfr m4 binutils fetchcvs emacs zlib which
-      gmp texinfo;
+      texinfo;
+    gmp = gmp4;
     inherit (xlibs) libX11 xproto inputproto libXi
       libXext xextproto libXt libXaw libXmu;
     inherit stdenv;

From 47fcc276ae1f29db80c56315f6f6091226d44ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 13 Apr 2012 12:41:36 +0000
Subject: [PATCH 155/293] Apple GCC: Fix `no-sys-dirs.patch' so that it
 applies.

svn path=/nixpkgs/trunk/; revision=33773
---
 .../compilers/gcc/4.2-apple64/default.nix     |  5 ++--
 .../gcc/4.2-apple64/no-sys-dirs.patch         | 29 +------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.2-apple64/default.nix b/pkgs/development/compilers/gcc/4.2-apple64/default.nix
index 9f46f1da1e4c..011086164adf 100644
--- a/pkgs/development/compilers/gcc/4.2-apple64/default.nix
+++ b/pkgs/development/compilers/gcc/4.2-apple64/default.nix
@@ -34,8 +34,9 @@ stdenv.mkDerivation {
   sourceRoot = "gcc-${revision}/";
 
   patches =
-    [ ./pass-cxxcpp.patch ./fix-libstdc++-link.patch ]
-    ++ stdenv.lib.optional noSysDirs [ ./no-sys-dirs.patch ];
+    [ ./pass-cxxcpp.patch ]
+    ++ stdenv.lib.optional noSysDirs ./no-sys-dirs.patch
+    ++ stdenv.lib.optional langCC ./fix-libstdc++-link.patch;
 
   inherit noSysDirs langCC langF77 langObjC;
   langC = true;
diff --git a/pkgs/development/compilers/gcc/4.2-apple64/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.2-apple64/no-sys-dirs.patch
index b7b93d6944cc..69f9d9d14c66 100644
--- a/pkgs/development/compilers/gcc/4.2-apple64/no-sys-dirs.patch
+++ b/pkgs/development/compilers/gcc/4.2-apple64/no-sys-dirs.patch
@@ -1,17 +1,3 @@
-diff -ruN gcc-4.1.0/gcc/cppdefault.c gcc-4.1.0.new/gcc/cppdefault.c
---- gcc-4.1.0/gcc/cppdefault.c	2005-06-25 04:02:01.000000000 +0200
-+++ gcc-4.1.0.new/gcc/cppdefault.c	2006-03-01 18:48:58.000000000 +0100
-@@ -41,6 +41,10 @@
- # undef CROSS_INCLUDE_DIR
- #endif
- 
-+#undef LOCAL_INCLUDE_DIR
-+#undef SYSTEM_INCLUDE_DIR
-+#undef STANDARD_INCLUDE_DIR
-+
- const struct default_include cpp_include_defaults[]
- #ifdef INCLUDE_DEFAULTS
- = INCLUDE_DEFAULTS;
 diff -ruN gcc-4.1.0/gcc/Makefile.in gcc-4.1.0.new/gcc/Makefile.in
 --- gcc-4.1.0/gcc/Makefile.in	2006-02-16 16:23:24.000000000 +0100
 +++ gcc-4.1.0.new/gcc/Makefile.in	2006-03-01 18:55:12.000000000 +0100
@@ -55,20 +41,7 @@ diff -ruN gcc-4.1.0/gcc/Makefile.in gcc-4.1.0.new/gcc/Makefile.in
    -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
    -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
    @TARGET_SYSTEM_ROOT_DEFINE@
-diff -ruN gcc-4.1.0/libstdc++-v3/include/Makefile.in gcc-4.1.0.new/libstdc++-v3/include/Makefile.in
---- gcc-4.1.0/libstdc++-v3/include/Makefile.in	2006-01-10 18:14:00.000000000 +0100
-+++ gcc-4.1.0.new/libstdc++-v3/include/Makefile.in	2006-03-01 18:57:32.000000000 +0100
-@@ -1257,8 +1257,8 @@
- 	if [ ! -d "${pch_output_builddir}" ]; then \
- 	  mkdir -p ${pch_output_builddir}; \
- 	fi; \
--	$(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g.gch; \
--	$(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g.gch;
-+	$(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g.gch; \
-+	$(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g.gch;
- 
- # For robustness sake (in light of junk files or in-source
- # configuration), copy from the build or source tree to the install
+
 diff -ruN gcc-4.1.0/ltcf-cxx.sh gcc-4.1.0.new/ltcf-cxx.sh
 --- gcc-4.1.0/ltcf-cxx.sh	2005-07-16 04:30:53.000000000 +0200
 +++ gcc-4.1.0.new/ltcf-cxx.sh	2006-03-01 18:58:15.000000000 +0100

From 17cbe60a5bbaf99537ce52baf491b85cc7ee0077 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 13 Apr 2012 14:53:56 +0000
Subject: [PATCH 156/293] uhc upgrade

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

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index c15839ad11c4..b7b2cb4cb628 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation {
-  name = "uhc-svn-git20120405";
+  name = "uhc-svn-git20120412";
 
   src = fetchgit {
      url = "https://github.com/UU-ComputerScience/uhc.git";
-     rev = "d6d75a131a36899ff2db2d8c9a4ae6601d7d0675";
-     sha256 = "4117688bf1e4a892d8551c3bcc59c5ec5743842e6a67ec66d399f390fec05b4c";
+     rev = "eef10f64d84bc0aa145121f2a61accea03b9bc76";
+     sha256 = "c867d22423adb17396a28eef030c53f282b1443db2149aa7b8ab659ac7c18576";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/EHC";

From 9b5ca91497114c1b01c18b488c43df02db4e5552 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 13 Apr 2012 14:53:59 +0000
Subject: [PATCH 157/293] nvidia driver: upgraded to 295.40

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 0243dcb88d41..4f06b3975ab2 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 
-let versionNumber = "295.20"; in
+let versionNumber = "295.40"; in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@@ -19,12 +19,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "006my8y7dkmzy1y3md1j2p9sy53cvhz7idkjgzizyg05jgac778g";
+        sha256 = "0anffkx1p1yhcflmz6jv9b57xb9mnvqadnjhgwr50fl4vms6bm6c";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "1m69ki94szy7inqc5x2znab9jjqjfyjd4lwvx9qnazq918gdf1kx";
+        sha256 = "0rs9nfkw8f9z52ippadap8r50zrrgldv9d9hdkm8g08cyif5g95w";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From 100b95e57ee2023e87cc4838d103361078276afa Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 13 Apr 2012 14:54:02 +0000
Subject: [PATCH 158/293] alsa upgraded to 1.0.25

svn path=/nixpkgs/trunk/; revision=33777
---
 pkgs/os-specific/linux/alsa-lib/default.nix     | 4 ++--
 pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ++--
 pkgs/os-specific/linux/alsa-utils/default.nix   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index 5ebf52644398..36d9fa2ba9ee 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-lib-1.0.23";
+  name = "alsa-lib-1.0.25";
   
   src = fetchurl {
     url = "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2";
-    sha256 = "08zl1yvva6xsdl9pghbvyjdrzwkyll8hc606my1i6jjypb58w8xl";
+    sha256 = "1rl6wa06d1jiqnrshyqh5qb1lwg6dh8m1ilyaink21j1y1f806js";
   };
   
   configureFlags = "--disable-xmlto";
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index 2ae39d4cf16d..180f9153043c 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "alsa-plugins-1.0.23";
+  name = "alsa-plugins-1.0.25";
 
   src = fetchurl {
     url = "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2";
-    sha256 = "10ri5dpmhk028r0qvajswh2xl40kjd600h7hykq03vrkmn8jf6sw";
+    sha256 = "1assar5k8zb2srqdcph6a54daqfymlyygdm5fcs6isaydpyp9qx0";
   };
 
   buildInputs =
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index ad092fa78214..8bd273582e3d 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -1,17 +1,17 @@
 {stdenv, fetchurl, alsaLib, gettext, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-utils-1.0.23";
+  name = "alsa-utils-1.0.25";
   
   src = fetchurl {
     url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2";
-    sha256 = "1c7pl5k3d60wacnha8zfn2dixz7hiiaxvijis4559y15bs8mxl5p";
+    sha256 = "0b1hbdq1bdkbz72zdfy5cgp75jqpysb0mqb0n9wy5gsbccpnlrrf";
   };
   
   buildInputs = [ alsaLib ncurses ];
   buildNativeInputs = [ gettext ];
   
-  configureFlags = "--disable-xmlto";
+  configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d";
 
   meta = {
     description = "ALSA, the Advanced Linux Sound Architecture utils";

From 713b7ecdbbc1e5985411c50ff849740eab8d1cad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 13 Apr 2012 17:52:29 +0000
Subject: [PATCH 159/293] Removing a commented patch that is not needed for
 kernels newer than 2.6.36 iirc. The patch got upstream back then.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c90abea310b2..6c3a8705fb42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5663,7 +5663,6 @@ let
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs2_1_2_6_38
         kernelPatches.cifs_timeout_2_6_38
-        #kernelPatches.mips_restart_2_6_36
       ];
   };
 
@@ -5675,7 +5674,6 @@ let
       [ #kernelPatches.fbcondecor_2_6_38
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs2_1_2_6_39
-        #kernelPatches.mips_restart_2_6_36
       ];
   };
 
@@ -5686,7 +5684,6 @@ let
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs3_0
         #kernelPatches.aufs2_1_3_0
-        #kernelPatches.mips_restart_2_6_36
       ];
   };
 
@@ -5696,7 +5693,6 @@ let
       [ #kernelPatches.fbcondecor_2_6_38
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs3_1
-        #kernelPatches.mips_restart_2_6_36
       ];
   };
 
@@ -5707,7 +5703,6 @@ let
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs3_2
         kernelPatches.cifs_timeout_2_6_38
-        #kernelPatches.mips_restart_2_6_36
       ];
   };
 
@@ -5719,7 +5714,6 @@ let
         kernelPatches.aufs3_3
         kernelPatches.efi_bootstub_config_3_3
         kernelPatches.btrfs_enospc
-        #kernelPatches.mips_restart_2_6_36
       ];
   };
 

From 8ebd53f45f7b910e9406ef3b65b534f6fa4b23f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 13 Apr 2012 18:09:27 +0000
Subject: [PATCH 160/293] Updating linux to 3.3.2

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix
index 5e863cc9b889..58038cb9203d 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix
@@ -12,7 +12,7 @@ let
       TIMER_STATS y
       USB_SUSPEND y
       BACKTRACE_SELF_TEST n
-      CPU_NOTIFIER_ERROR_INJECT n
+      CPU_NOTIFIER_ERROR_INJECT? n
       DEBUG_DEVRES n
       DEBUG_NX_TEST n
       DEBUG_STACK_USAGE n
@@ -233,7 +233,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.3.1";
+    version = "3.3.2";
     testing = false;
 
     preConfigure = ''
@@ -242,7 +242,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "0b29ijg578nib9hxmzxsvi3jqydcbxdggp0n2k3x0bc14dwzyv0q";
+      sha256 = "19paxvcs3bj32j5fp4ibx963la30p0331w7zvg3zcwmx0ml9pn9y";
     };
 
     config = configWithPlatform stdenv.platform;

From 4250dd81047c14e994443a4679a28475298c314d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 13 Apr 2012 18:46:24 +0000
Subject: [PATCH 161/293] I made atlas build for fixed architectures.

We saw a crash in many computers, in the octave check phase, where octave crashed.
It was due to atlas being built for AMD Family 10h, which has a special SSE
trick that others computer don't have.

For x86_64, atlas is for K7. And for i686, PII.


svn path=/nixpkgs/trunk/; revision=33780
---
 .../libraries/science/math/atlas/default.nix      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 6382ec413e2f..c975e2c94fb0 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -15,16 +15,23 @@ stdenv.mkDerivation {
   # Configure outside of the source directory.
   preConfigure = '' mkdir build; cd build; configureScript=../configure; '';
 
-  # * The manual says you should pass -fPIC as configure arg. Not sure why, but
-  #   it works.
+  # * -fPIC allows to build atlas inside shared objects, as octave does.
   #
   # * Atlas aborts the build if it detects that some kind of CPU frequency
   #   scaling is active on the build machine because that feature offsets the
   #   performance timings. We ignore that check, however, because with binaries
   #   being pre-built on Hydra those timings aren't accurate for the local
   #   machine in the first place.
-  configureFlags = "-Fa alg -fPIC"
-    + optionalString stdenv.isi686 " -b 32"
+  # * Atlas detects the cpu and does some tricks. For example, notices the
+  #   hydra AMD Family 10h computer, and uses a SSE trick for it (bit 17 of MXCSR)
+  #   available, for what I know, only in that family. So we hardcode K7
+  #     -A 31 = Athlon K7
+  #     -A 18 = Pentium II
+  #     -V 192 = SSE1|SSE2 (Or it takes SSE3 somehow in my machine without SSE3)
+  #     -t 0 = No threading
+  configureFlags = "-Fa alg -fPIC -t 0 -V 192"
+    + optionalString stdenv.isi686 " -b 32 -A 18"
+    + optionalString stdenv.isx86_64 " -A 31"
     + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0"
     + optionalString shared " --shared "
     ;

From cf250029e08278c9f27cc32833fb336b86d1bda6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 14 Apr 2012 10:26:09 +0000
Subject: [PATCH 162/293] samba_light: Drop dependency on libunwind.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c3a8705fb42..06ef9f5d6a58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5278,6 +5278,9 @@ let
     cups = null;
     acl = null;
     openldap = null;
+
+    # libunwind 1.0.1 is not ported to GNU/Hurd.
+    libunwind = null;
   };
 
   shishi = callPackage ../servers/shishi { };

From 641576e0cc3e67d66d137ae50cfc9d08cbfe2e3f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 14 Apr 2012 11:46:45 +0000
Subject: [PATCH 163/293] * Fix alsa-utils.  http://hydra.nixos.org/eval/603729

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

diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index 8bd273582e3d..ca3a45bddfd1 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   
   configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d";
 
+  installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy";
+
   meta = {
     description = "ALSA, the Advanced Linux Sound Architecture utils";
 

From 4d8e2180b51c4c4dc7391a014871ad462cd6de80 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 14 Apr 2012 14:19:13 +0000
Subject: [PATCH 164/293] * Set the channel name to "nixpkgs".

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

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index fad3993ddc12..9f97b49ebb08 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -69,6 +69,7 @@ releaseTools.makeSourceTarball {
     mkdir -p $out/tarballs
     mkdir ../$releaseName
     cp -prd . ../$releaseName
+    echo nixpkgs > ../$releaseName/channel-name
     (cd .. && tar cfa $out/tarballs/$releaseName.tar.bz2 $releaseName) || false
     (cd .. && tar cfa $out/tarballs/$releaseName.tar.lzma $releaseName) || false
 

From 9b6e521d44b145fbd71e734a75cc147c4df1881b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 14 Apr 2012 18:36:04 +0000
Subject: [PATCH 165/293] SBCL update

svn path=/nixpkgs/trunk/; revision=33786
---
 pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix
index beb4c61e377d..66e389947a0a 100644
--- a/pkgs/development/compilers/sbcl/src-for-default.nix
+++ b/pkgs/development/compilers/sbcl/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.0.55";
-   name="sbcl-1.0.55";
-   hash="1b87s99d000khjpg8i7bcp28mph8812axwfh64a6qarhkixnl8g3";
-   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.55/sbcl-1.0.55-source.tar.bz2";
-   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.55/sbcl-1.0.55-source.tar.bz2";
+   version="1.0.56";
+   name="sbcl-1.0.56";
+   hash="0cq5hyzv3nnva0y1y6zjyd7rfdwwpxswnvmbfmqvhihz72ivyl1w";
+   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.56/sbcl-1.0.56-source.tar.bz2";
+   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.56/sbcl-1.0.56-source.tar.bz2";
   
   
 }

From 60ecc500f9e512e97f411eae563f071a3cc55c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 14 Apr 2012 18:58:30 +0000
Subject: [PATCH 166/293] Trying to fix atlas i686. I set Pentium II and having
 sse/sse2 at the same time for i686...

I think Pentium II does not have sse.


svn path=/nixpkgs/trunk/; revision=33787
---
 pkgs/development/libraries/science/math/atlas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index c975e2c94fb0..3b390380e6f9 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -29,9 +29,9 @@ stdenv.mkDerivation {
   #     -A 18 = Pentium II
   #     -V 192 = SSE1|SSE2 (Or it takes SSE3 somehow in my machine without SSE3)
   #     -t 0 = No threading
-  configureFlags = "-Fa alg -fPIC -t 0 -V 192"
+  configureFlags = "-t 0"
     + optionalString stdenv.isi686 " -b 32 -A 18"
-    + optionalString stdenv.isx86_64 " -A 31"
+    + optionalString stdenv.isx86_64 " -A 31 -V 192"
     + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0"
     + optionalString shared " --shared "
     ;

From 163c7375a3457656ab8eb73dbd6a60ec85215bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 14 Apr 2012 21:40:55 +0000
Subject: [PATCH 167/293] Adding a version of sqlite with more things, based on
 the upstream repository src.

svn path=/nixpkgs/trunk/; revision=33788
---
 pkgs/development/interpreters/tcl/default.nix |  4 ++
 pkgs/development/libraries/sqlite/full.nix    | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/libraries/sqlite/full.nix

diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix
index c9aa16ce28d4..060aa3b5a6ba 100644
--- a/pkgs/development/interpreters/tcl/default.nix
+++ b/pkgs/development/interpreters/tcl/default.nix
@@ -19,4 +19,8 @@ stdenv.mkDerivation {
     description = "The Tcl scription language";
     homepage = http://www.tcl.tk/;
   };
+  
+  passthru = {
+    libdir = "lib/tcl8.5";
+  };
 }
diff --git a/pkgs/development/libraries/sqlite/full.nix b/pkgs/development/libraries/sqlite/full.nix
new file mode 100644
index 000000000000..83ca19866ca6
--- /dev/null
+++ b/pkgs/development/libraries/sqlite/full.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, tcl, readline ? null, ncurses ? null }:
+
+assert readline != null -> ncurses != null;
+
+stdenv.mkDerivation {
+  # I try to keep a version no newer than default.nix, and similar CFLAGS,
+  # for this to be compatible with it.
+  name = "sqlite-3.7.9-full";
+
+  src = fetchurl {
+    url = "http://www.sqlite.org/cgi/src/tarball/SQLite-3.7.9.tar.gz?uuid=version-3.7.9";
+    sha256 = "0v11slxgjpx2nv7wp8c76wk2pa1dijs9v6zlcn2dj9jblp3bx8fk";
+  };
+
+  buildInputs = [ readline ncurses ];
+  buildNativeInputs = [ tcl ];
+
+  doCheck = true;
+  checkTarget = "test";
+  
+  configureFlags = "--enable-threadsafe --enable-tempstore";
+
+  preConfigure = ''
+    export TCLLIBDIR=$out/${tcl.libdir}
+  '';
+
+  CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1";
+  LDFLAGS = if readline != null then "-lncurses" else "";
+
+  postInstall = ''
+    make sqlite3_analyzer
+    cp sqlite3_analyzer $out/bin
+  '';
+
+  meta = {
+    homepage = http://www.sqlite.org/;
+    description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06ef9f5d6a58..36b78385df86 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4715,6 +4715,10 @@ let
     inherit readline ncurses;
   });
 
+  sqliteFull = callPackage ../development/libraries/sqlite/full.nix {
+    inherit readline ncurses;
+  };
+
   stlport = callPackage ../development/libraries/stlport { };
 
   strigi = callPackage ../development/libraries/strigi {};

From 30d7a7fbe1e52f7b8f50cfb557ebce5d35ea2e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 14 Apr 2012 22:00:12 +0000
Subject: [PATCH 168/293] I think we better disable SIMD for i686. Or it can
 detect whatever the machine has.

svn path=/nixpkgs/trunk/; revision=33789
---
 pkgs/development/libraries/science/math/atlas/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 3b390380e6f9..58fd2422159c 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -28,9 +28,10 @@ stdenv.mkDerivation {
   #     -A 31 = Athlon K7
   #     -A 18 = Pentium II
   #     -V 192 = SSE1|SSE2 (Or it takes SSE3 somehow in my machine without SSE3)
+  #     -V 0 = No SIMD (Pentium II does not have any SSE)
   #     -t 0 = No threading
   configureFlags = "-t 0"
-    + optionalString stdenv.isi686 " -b 32 -A 18"
+    + optionalString stdenv.isi686 " -b 32 -A 18 -V 0"
     + optionalString stdenv.isx86_64 " -A 31 -V 192"
     + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0"
     + optionalString shared " --shared "

From 023cd3b7bdfbd77a89d87d55fb5b54e7a0d1a8f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 15 Apr 2012 07:58:58 +0000
Subject: [PATCH 169/293] Oh, I removed -fPIC in my last atlas commit. I didn't
 mean to.

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

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 58fd2422159c..c6864cb98cb6 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   #     -V 192 = SSE1|SSE2 (Or it takes SSE3 somehow in my machine without SSE3)
   #     -V 0 = No SIMD (Pentium II does not have any SSE)
   #     -t 0 = No threading
-  configureFlags = "-t 0"
+  configureFlags = "-Fa alg fPIC -t 0"
     + optionalString stdenv.isi686 " -b 32 -A 18 -V 0"
     + optionalString stdenv.isx86_64 " -A 31 -V 192"
     + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0"

From 2e753bc4cf4d34f82023ae8e8d2b888139f82ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 15 Apr 2012 08:11:12 +0000
Subject: [PATCH 170/293] Typo again in atlas.

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

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index c6864cb98cb6..c014eb6bee4b 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   #     -V 192 = SSE1|SSE2 (Or it takes SSE3 somehow in my machine without SSE3)
   #     -V 0 = No SIMD (Pentium II does not have any SSE)
   #     -t 0 = No threading
-  configureFlags = "-Fa alg fPIC -t 0"
+  configureFlags = "-Fa alg -fPIC -t 0"
     + optionalString stdenv.isi686 " -b 32 -A 18 -V 0"
     + optionalString stdenv.isx86_64 " -A 31 -V 192"
     + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0"

From e612f476c4e68eef88717004f821b12495a7cff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 15 Apr 2012 09:05:09 +0000
Subject: [PATCH 171/293] Limiting the number of fds on the sqlite full build,
 as it's required by some tests.

svn path=/nixpkgs/trunk/; revision=33792
---
 pkgs/development/libraries/sqlite/full.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/sqlite/full.nix b/pkgs/development/libraries/sqlite/full.nix
index 83ca19866ca6..ccb960643bd0 100644
--- a/pkgs/development/libraries/sqlite/full.nix
+++ b/pkgs/development/libraries/sqlite/full.nix
@@ -21,6 +21,9 @@ stdenv.mkDerivation {
   configureFlags = "--enable-threadsafe --enable-tempstore";
 
   preConfigure = ''
+    ${ # The tests oserror-1.1.{1,2,3} need the fd limit < 2000
+       # and on the builders in NixOS we have 4096 now.
+       if stdenv.isLinux then "ulimit -n 1024" else ""}
     export TCLLIBDIR=$out/${tcl.libdir}
   '';
 

From 8f50680a053d06ffc53d3f30c4708016b85e0043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 15 Apr 2012 12:44:48 +0000
Subject: [PATCH 172/293] I hope now I guess fine how to tell ATLAS not to
 accept any simd for i686.

svn path=/nixpkgs/trunk/; revision=33793
---
 pkgs/development/libraries/science/math/atlas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index c014eb6bee4b..2cca8d7d9c44 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -28,10 +28,10 @@ stdenv.mkDerivation {
   #     -A 31 = Athlon K7
   #     -A 18 = Pentium II
   #     -V 192 = SSE1|SSE2 (Or it takes SSE3 somehow in my machine without SSE3)
-  #     -V 0 = No SIMD (Pentium II does not have any SSE)
+  #     -V 1 = No SIMD (Pentium II does not have any SSE)
   #     -t 0 = No threading
   configureFlags = "-Fa alg -fPIC -t 0"
-    + optionalString stdenv.isi686 " -b 32 -A 18 -V 0"
+    + optionalString stdenv.isi686 " -b 32 -A 18 -V 1"
     + optionalString stdenv.isx86_64 " -A 31 -V 192"
     + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0"
     + optionalString shared " --shared "

From 73d98c07c231f7bf37e7e24d351830c343beecf2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 15 Apr 2012 16:23:08 +0000
Subject: [PATCH 173/293] * Linux 3.2.15.

svn path=/nixpkgs/trunk/; revision=33794
---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index aff17db22f66..69f9b5ec38ce 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -234,7 +234,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.2.14";
+    version = "3.2.15";
     testing = false;
 
     modDirVersion = version;
@@ -245,7 +245,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "032bv24wsab4c589svlq5ip8dcc4vihjcynq3ka18fgvxih251fm";
+      sha256 = "19cqk1da9b1pzwxxj4k1ri38c164160pnjxf4nky2g3xryafl784";
     };
 
     config = configWithPlatform stdenv.platform;

From a9c51d7af3bd5c6b633d56afe1cb854b967e5c57 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Sun, 15 Apr 2012 22:33:36 +0000
Subject: [PATCH 174/293] games/urbanterror: Fixed compilation issue, but it
 still doesn't work.

svn path=/nixpkgs/trunk/; revision=33795
---
 pkgs/games/urbanterror/default.nix    | 12 +++++++++++-
 pkgs/games/urbanterror/l_script.patch | 21 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/games/urbanterror/l_script.patch

diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index 74448cdad76f..875dfc93bb10 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -10,21 +10,31 @@ stdenv.mkDerivation rec {
     url = "http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/ioUrbanTerrorSource_2007_12_20.zip";
     sha256 = "1s1wq9m7shhvvk7s4400yrmz7dys501i4c9ln1mglc9dhmi8dmcn";
   };
+  buildInputs = [ unzip SDL mesa openal curl ];
   unpackPhase = ''
     mkdir urbanterror
     cd urbanterror
     unzip $src1
     unzip $src2
   '';
+  patches = [ ./l_script.patch ];
+  patchPhase = ''
+    for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource
+    do
+      cd "$d"
+      patch -p 0 < "''${patches[0]}"
+      cd ..
+    done
+  '';
   configurePhase = ''
     cd ioUrbanTerrorClientSource
     echo "USE_OPENAL = 1" > Makefile.local
     echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local
     echo "USE_CURL = 1" >> Makefile.local
     echo "USE_CURL_DLOPEN = 0" >> Makefile.local
+    substituteInPlace code/tools/asm/Makefile --replace -Werror ""
     cd ..
   '';
-  buildInputs = [ unzip SDL mesa openal curl ];
   buildPhase = ''
     for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource
     do
diff --git a/pkgs/games/urbanterror/l_script.patch b/pkgs/games/urbanterror/l_script.patch
new file mode 100644
index 000000000000..8aa176cca8cb
--- /dev/null
+++ b/pkgs/games/urbanterror/l_script.patch
@@ -0,0 +1,21 @@
+diff -ur code/botlib/l_script.c kode/botlib/l_script.c
+--- code/botlib/l_script.c	2007-10-09 02:47:26.000000000 +0400
++++ kode/botlib/l_script.c	2012-04-16 02:02:55.170360236 +0400
+@@ -1118,7 +1118,7 @@
+ {
+ 	if (*string == '\"')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string) - 1);
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\"')
+ 	{
+@@ -1135,7 +1135,7 @@
+ {
+ 	if (*string == '\'')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string) - 1);
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\'')
+ 	{

From 8a677091830176ba5e820f5421e7d6f7eb938f8c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 15 Apr 2012 23:31:48 +0000
Subject: [PATCH 175/293] Add mkMerge and obsolete mkThenElse.

svn path=/nixpkgs/trunk/; revision=33796
---
 pkgs/lib/modules.nix    | 44 +++++++++++++++++++++++++++++------------
 pkgs/lib/properties.nix | 31 ++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index 8ecb04156e78..eb528f141fe2 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -41,29 +41,31 @@ rec {
   # attributes.
   unifyModuleSyntax = m:
     let
-      getImports = m:
+      delayedModule = delayProperties m;
+      getImports =
         if m ? config || m ? options then
           attrByPath ["imports"] [] m
         else
-          toList (rmProperties (attrByPath ["require"] [] (delayProperties m)));
+          toList (rmProperties (attrByPath ["require"] [] delayedModule));
 
-      getImportedPaths = m: filter isPath (getImports m);
-      getImportedSets = m: filter (x: !isPath x) (getImports m);
+      getImportedPaths = filter isPath getImports;
+      getImportedSets = filter (x: !isPath x) getImports;
+
+      getConfig =
+        removeAttrs delayedModule ["require" "key"];
 
-      getConfig = m:
-        removeAttrs (delayProperties m) ["require" "key"];
     in
       if isModule m then
         { key = "<unknown location>"; } // m
       else
         {
           key = "<unknown location>";
-          imports = getImportedPaths m;
-          config = getConfig m;
+          imports = getImportedPaths;
+          config = getConfig;
         } // (
-          if getImportedSets m != [] then
-            assert tail (getImportedSets m) == [];
-            { options = head (getImportedSets m); }
+          if getImportedSets != [] then
+            assert tail getImportedSets == [];
+            { options = head getImportedSets; }
           else
             {}
         );
@@ -124,9 +126,25 @@ rec {
         value
     ) module;
 
+  # Handle mkMerge function left behind after a delay property.
+  moduleFlattenMerge = module:
+    if module ? config &&
+       isProperty module.config &&
+       isMerge module.config.property
+    then
+      (map (cfg: { key = module.key; config = cfg; }) module.config.content)
+      ++ [ (module // { config = {}; }) ]
+    else
+      [ module ];
 
+  # Handle mkMerge attributes which are left behind by previous delay
+  # properties and convert them into a list of modules. Delay properties
+  # inside the config attribute of a module and create a second module if a
+  # mkMerge attribute was left behind.
+  #
+  # Module -> [ Module ]
   delayModule = module:
-    moduleApply { config = delayProperties; } module;
+    map (moduleApply { config = delayProperties; }) (moduleFlattenMerge module);
 
   evalDefinitions = opt: values:
     if opt ? type && opt.type.delayOnGlobalEval then
@@ -170,7 +188,7 @@ rec {
       addName = name:
         if path == "" then name else path + "." + name;
 
-      modules = map delayModule modules_;
+      modules = concatLists (map delayModule modules_);
 
       modulesOf = name: filterModules name modules;
       declarationsOf = name: filter (m: m ? options) (modulesOf name);
diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix
index d7df14f716f5..0d864b0c553c 100644
--- a/pkgs/lib/properties.nix
+++ b/pkgs/lib/properties.nix
@@ -82,7 +82,19 @@ rec {
       attrs;
 
   delayProperties = # implicit attrs argument.
-    delayPropertiesWithIter (f: p: v: lib.mapAttrs f v) "";
+    let
+      # mapAttrs except that it also recurse into potential mkMerge
+      # functions.  This may cause a strictness issue because looking the
+      # type of a string implies evaluating it.
+      iter = fun: path: value:
+        lib.mapAttrs (attr: val:
+          if isProperty val && isMerge val.property then
+            val // { content = map (fun attr) val.content; }
+          else
+            fun attr val
+        ) value;
+    in
+      delayPropertiesWithIter iter "";
 
   # Call onDelay functions.
   triggerPropertiesDelay = name: attrs:
@@ -179,6 +191,22 @@ rec {
   copyProperties = attrs: newAttrs:
     foldProperty id (x: newAttrs) attrs;
 
+  /* Merge. */
+
+  # Create "merge" statement which is skipped by the delayProperty function
+  # and interpreted by the underlying system using properties (modules).
+
+  # Create a "Merge" property which only contains a condition.
+  isMerge = attrs: (typeOf attrs) == "merge";
+  mkMerge = content: mkProperty {
+    property = {
+      _type = "merge";
+      onDelay = name: val: throw "mkMerge is not the first of the list of properties.";
+      onEval = val: throw "mkMerge is not allowed on option definitions.";
+    };
+    inherit content;
+  };
+
   /* If. ThenElse. Always. */
 
   # create "if" statement that can be delayed on sets until a "then-else" or
@@ -202,6 +230,7 @@ rec {
   isThenElse = attrs: (typeOf attrs) == "then-else";
   mkThenElse = attrs:
     assert attrs ? thenPart && attrs ? elsePart;
+    __trace "Obsolete usage of mkThenElse, replace it by mkMerge."
     mkProperty {
       property = {
         _type = "then-else";

From 6a9ac1f01699a28c2d16ee082ff744291675df92 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 15 Apr 2012 23:38:38 +0000
Subject: [PATCH 176/293] Add opentyrian game.

svn path=/nixpkgs/trunk/; revision=33797
---
 pkgs/games/opentyrian/default.nix | 37 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/games/opentyrian/default.nix

diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix
new file mode 100644
index 000000000000..260b146217cc
--- /dev/null
+++ b/pkgs/games/opentyrian/default.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchhg, fetchurl, unzip, SDL, SDL_net}:
+
+stdenv.mkDerivation rec {
+  name = "opentyrian-${version}";
+  version = "0.0.955";
+
+  src = fetchhg {
+    url = "https://opentyrian.googlecode.com/hg/";
+    tag = "13ef8ce47362";
+    md5 = "95c8f9e7ff3d4207f1c692c7cec6c9b0";
+  };
+
+  data = fetchurl {
+    url = http://sites.google.com/a/camanis.net/opentyrian/tyrian/tyrian21.zip;
+    md5 = "2a3b206a6de25ed4b771af073f8ca904";
+  };
+
+  buildInputs = [SDL SDL_net unzip];
+
+  patchPhase = "
+    substituteInPlace src/file.c --replace /usr/share $out/share
+  ";
+  buildPhase = "make release";
+  installPhase = "
+    ensureDir $out/bin
+    cp ./opentyrian $out/bin
+    ensureDir $out/share/opentyrian/data
+    unzip -j $data -d $out/share/opentyrian/data
+  ";
+
+  meta = {
+    description = ''OpenTyrian is an open source port of the game "Tyrian".'';
+    homepage = https://opentyrian.googlecode.com/;
+    # This does not account of Tyrian data.
+    # license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36b78385df86..6124f927aead 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7842,6 +7842,8 @@ let
     zlib = zlibStatic;
   };
 
+  opentyrian = callPackage ../games/opentyrian { };
+
   pioneers = callPackage ../games/pioneers { };
 
   pong3d = callPackage ../games/pong3d { };

From 82b308bf110ed9d246922bc8f742837323585a24 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 15 Apr 2012 23:41:25 +0000
Subject: [PATCH 177/293] Add armv7l support.

svn path=/nixpkgs/trunk/; revision=33798
---
 pkgs/applications/networking/sync/unison/default.nix | 2 +-
 pkgs/build-support/clang-wrapper/default.nix         | 2 +-
 pkgs/build-support/gcc-wrapper/default.nix           | 2 +-
 pkgs/development/compilers/ocaml/3.12.1.nix          | 4 ++--
 pkgs/development/compilers/ocaml/cvs.nix             | 4 ++--
 pkgs/development/interpreters/perl/5.10/default.nix  | 2 +-
 pkgs/development/interpreters/perl/5.14/default.nix  | 2 +-
 pkgs/development/libraries/freetype/default.nix      | 2 +-
 pkgs/development/libraries/glibc/2.13/common.nix     | 2 +-
 pkgs/development/libraries/glibc/2.14/common.nix     | 2 +-
 pkgs/development/libraries/glibc/2.9/default.nix     | 2 +-
 pkgs/development/libraries/glibc/2.9/headers.nix     | 2 +-
 pkgs/development/libraries/glibc/2.9/locales.nix     | 2 +-
 pkgs/development/libraries/libxcrypt/default.nix     | 2 +-
 pkgs/lib/platforms.nix                               | 2 +-
 pkgs/lib/systems.nix                                 | 1 +
 pkgs/os-specific/linux/kbd/default.nix               | 2 +-
 pkgs/os-specific/linux/kernel-headers/2.4.nix        | 2 +-
 pkgs/os-specific/linux/kernel-headers/2.6.28.nix     | 2 +-
 pkgs/os-specific/linux/kernel-headers/2.6.32.nix     | 2 +-
 pkgs/os-specific/linux/kernel-headers/default.nix    | 2 +-
 pkgs/os-specific/linux/kernel/generic.nix            | 4 ++--
 pkgs/os-specific/linux/pam/default.nix               | 4 ++--
 pkgs/os-specific/linux/pam_unix2/default.nix         | 2 +-
 pkgs/os-specific/linux/udev/173.nix                  | 2 +-
 pkgs/stdenv/default.nix                              | 1 +
 pkgs/stdenv/generic/default.nix                      | 4 +++-
 pkgs/stdenv/linux/bootstrap/armv7l/default.nix       | 3 +++
 pkgs/stdenv/linux/default.nix                        | 1 +
 pkgs/tools/archivers/gnutar/default.nix              | 9 +++++++--
 pkgs/top-level/all-packages.nix                      | 4 ++--
 31 files changed, 46 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/stdenv/linux/bootstrap/armv7l/default.nix

diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index e3b042aa810e..b6906c86afe2 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -2,7 +2,7 @@
 , enableX11 ? true}:
 
 let
-  nativeCode = if stdenv.system == "armv5tel-linux" then false else true;
+  nativeCode = if stdenv.isArm then false else true;
 in
 stdenv.mkDerivation (rec {
 
diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix
index 8e9fb4d9de49..165e3bace906 100644
--- a/pkgs/build-support/clang-wrapper/default.nix
+++ b/pkgs/build-support/clang-wrapper/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
     if !nativeLibc then
       (if stdenv.system == "i686-linux" then "ld-linux.so.2" else
        if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
-       if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else
+       if stdenv.isArm then "ld-linux.so.3" else
        if stdenv.system == "powerpc-linux" then "ld.so.1" else
        if stdenv.system == "mips64el-linux" then "ld.so.1" else
        abort "don't know the name of the dynamic linker for this platform")
diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index f0062f8191ed..d3fe5a0569f9 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation {
     if !nativeLibc then
       (if stdenv.system == "i686-linux" then "ld-linux.so.2" else
        if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
-       if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else
+       if stdenv.isArm then "ld-linux.so.3" else
        if stdenv.system == "powerpc-linux" then "ld.so.1" else
        if stdenv.system == "mips64el-linux" then "ld.so.1" else
        abort "don't know the name of the dynamic linker for this platform")
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index 155523ebe560..44fe2d139d8b 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, ncurses, x11 }:
 
 let
-   useX11 = stdenv.system != "armv5tel-linux";
-   useNativeCompilers = stdenv.system != "armv5tel-linux";
+   useX11 = !stdenv.isArm;
+   useNativeCompilers = !stdenv.isArm;
    inherit (stdenv.lib) optionals optionalString;
 in
 
diff --git a/pkgs/development/compilers/ocaml/cvs.nix b/pkgs/development/compilers/ocaml/cvs.nix
index 475a1d46d589..cc40ca9aac54 100644
--- a/pkgs/development/compilers/ocaml/cvs.nix
+++ b/pkgs/development/compilers/ocaml/cvs.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation (rec {
   prefixKey = "-prefix ";
   configureFlags = ["-no-tk"];
   buildFlags = "world" +
-    (if (stdenv.system != "armv5tel-linux") then "bootstrap world.opt" else "");
+    (if !stdenv.isArm then "bootstrap world.opt" else "");
   buildInputs = [ncurses];
-  installTargets = "install" + (if (stdenv.system != "armv5tel-linux") then "installopt" else ""); 
+  installTargets = "install" + (if !stdenv.isArm then "installopt" else "");
   patchPhase = ''
     CAT=$(type -tp cat)
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
diff --git a/pkgs/development/interpreters/perl/5.10/default.nix b/pkgs/development/interpreters/perl/5.10/default.nix
index 76928d104481..92e3d00e02d0 100644
--- a/pkgs/development/interpreters/perl/5.10/default.nix
+++ b/pkgs/development/interpreters/perl/5.10/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     ''
       configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
 
-      ${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") ''
+      ${stdenv.lib.optionalString stdenv.isArm ''
         configureFlagsArray=(-Dldflags="-lm -lrt")
       ''}
     '';
diff --git a/pkgs/development/interpreters/perl/5.14/default.nix b/pkgs/development/interpreters/perl/5.14/default.nix
index 75b15da3efd0..00eaac6b1da8 100644
--- a/pkgs/development/interpreters/perl/5.14/default.nix
+++ b/pkgs/development/interpreters/perl/5.14/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     ''
       configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
 
-      ${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") ''
+      ${stdenv.lib.optionalString stdenv.isArm ''
         configureFlagsArray=(-Dldflags="-lm -lrt")
       ''}
     '';
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 895d2585b674..e53a3c297ff1 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (rec {
     "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1";
 
   # The asm for armel is written with the 'asm' keyword.
-  CFLAGS = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "-std=gnu99";
+  CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99";
 
   meta = {
     description = "A font rendering engine";
diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix
index 6cb663d7f127..840c60545524 100644
--- a/pkgs/development/libraries/glibc/2.13/common.nix
+++ b/pkgs/development/libraries/glibc/2.13/common.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation ({
     (if cross.float == "soft" then "--without-fp" else "--with-fp")
     "--enable-kernel=2.6.0"
     "--with-__thread"
-  ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [
+  ] ++ stdenv.lib.optionals stdenv.isArm [
     "--host=arm-linux-gnueabi"
     "--build=arm-linux-gnueabi"
     "--without-fp"
diff --git a/pkgs/development/libraries/glibc/2.14/common.nix b/pkgs/development/libraries/glibc/2.14/common.nix
index 4ded6e4edd8b..8edbbd1125a4 100644
--- a/pkgs/development/libraries/glibc/2.14/common.nix
+++ b/pkgs/development/libraries/glibc/2.14/common.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation ({
     (if cross.float == "soft" then "--without-fp" else "--with-fp")
     "--enable-kernel=2.6.0"
     "--with-__thread"
-  ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [
+  ] ++ stdenv.lib.optionals stdenv.isArm [
     "--host=arm-linux-gnueabi"
     "--build=arm-linux-gnueabi"
     "--without-fp"
diff --git a/pkgs/development/libraries/glibc/2.9/default.nix b/pkgs/development/libraries/glibc/2.9/default.nix
index b778743147e6..7d42825206e2 100644
--- a/pkgs/development/libraries/glibc/2.9/default.nix
+++ b/pkgs/development/libraries/glibc/2.9/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     "--enable-kernel=2.6.0"
     "--without-fp"
     "--with-__thread"
-  ] ++ (if (stdenv.system == "armv5tel-linux") then [
+  ] ++ (if stdenv.isArm then [
     "--host=arm-linux-gnueabi"
     "--build=arm-linux-gnueabi"
     "--without-fp"
diff --git a/pkgs/development/libraries/glibc/2.9/headers.nix b/pkgs/development/libraries/glibc/2.9/headers.nix
index adb9a22f4810..7adeb11c8bc1 100644
--- a/pkgs/development/libraries/glibc/2.9/headers.nix
+++ b/pkgs/development/libraries/glibc/2.9/headers.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     "--disable-sanity-checks"
     "--enable-hacker-mode"
     (if profilingLibraries then "--enable-profile" else "--disable-profile")
-  ] ++ (if (stdenv.system == "armv5tel-linux") then [
+  ] ++ (if stdenv.isArm then [
     "--host=arm-linux-gnueabi"
     "--build=arm-linux-gnueabi"
     "--without-fp"
diff --git a/pkgs/development/libraries/glibc/2.9/locales.nix b/pkgs/development/libraries/glibc/2.9/locales.nix
index c7b1bb2bff0a..a1fe9f82f143 100644
--- a/pkgs/development/libraries/glibc/2.9/locales.nix
+++ b/pkgs/development/libraries/glibc/2.9/locales.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     "--enable-add-ons"
     "--without-headers"
     "--disable-profile"
-  ] ++ (if (stdenv.system == "armv5tel-linux") then [
+  ] ++ (if stdenv.isArm then [
     "--host=arm-linux-gnueabi"
     "--build=arm-linux-gnueabi"
     "--without-fp"
diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix
index 9122335b34ac..536d30992bbd 100644
--- a/pkgs/development/libraries/libxcrypt/default.nix
+++ b/pkgs/development/libraries/libxcrypt/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 # I could not build it in armv5tel-linux or the fuloon2f
-assert stdenv.system != "armv5tel-linux";
+assert !stdenv.isArm;
 assert stdenv.system != "mips64el-linux";
    
 stdenv.mkDerivation {
diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix
index c10d0e63a97a..c79e8468b23d 100644
--- a/pkgs/lib/platforms.nix
+++ b/pkgs/lib/platforms.nix
@@ -3,7 +3,7 @@ let lists = import ./lists.nix; in
 rec {
   gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */
   linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux"
-    "mips64el-linux"];
+    "armv7l-linux" "mips64el-linux"];
   darwin = ["i686-darwin" "powerpc-darwin" "x86_64-darwin"];
   freebsd = ["i686-freebsd" "x86_64-freebsd" "powerpc-freebsd"];
   openbsd = ["i686-openbsd" "x86_64-openbsd"];
diff --git a/pkgs/lib/systems.nix b/pkgs/lib/systems.nix
index 41fdaacde448..09d04042f1cf 100644
--- a/pkgs/lib/systems.nix
+++ b/pkgs/lib/systems.nix
@@ -30,6 +30,7 @@ rec {
     setTypes "cpu-type" {
       arm =      { bits = 32; significantByte = littleEndian; };
       armv5tel = { bits = 32; significantByte = littleEndian; };
+      armv7l   = { bits = 32; significantByte = littleEndian; };
       i686 =     { bits = 32; significantByte = littleEndian; };
       powerpc =  { bits = 32; significantByte = bigEndian; };
       x86_64 =   { bits = 64; significantByte = littleEndian; };
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index cc95a6cff16b..da45b39cee1e 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   # We get a warning in armv5tel-linux and the fuloong2f,
   # so we disable -Werror in it
-  patchPhase = if (stdenv.system == "armv5tel-linux" ||
+  patchPhase = if (stdenv.isArm ||
     stdenv.system == "mips64el-linux")
     then ''
       sed -i s/-Werror// src/Makefile.am
diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix
index 32daf5633f79..c5926ff2e477 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.4.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.4.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
     if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.system == "armv5tel-linux" then "arm" else
+    if stdenv.isArm then "arm" else
     abort "don't know what the kernel include directory is called for this platform";
 
   buildInputs = [perl];
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
index fdbe6cf1bce6..b576b68773c8 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
     if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.system == "armv5tel-linux" then "arm" else
+    if stdenv.isArm then "arm" else
     if stdenv.system == "mips64el-linux" then "mips" else
     abort "don't know what the kernel include directory is called for this platform";
 
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
index a7ec522b3d66..a2fc597eaac7 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
     if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.system == "armv5tel-linux" then "arm" else
+    if stdenv.isArm then "arm" else
     if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
     abort "don't know what the kernel include directory is called for this platform";
 
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index f5fec3d8620c..3fb5ef8ef2df 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
     if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.system == "armv5tel-linux" then "arm" else
+    if stdenv.isArm then "arm" else
     if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
     abort "don't know what the kernel include directory is called for this platform";
 
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 223a38da54e7..9e8ee74acb17 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -46,7 +46,7 @@
 }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
-  || stdenv.system == "armv5tel-linux" || stdenv.system == "mips64el-linux";
+  || stdenv.isArm || stdenv.system == "mips64el-linux";
 
 assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null;
 
@@ -101,7 +101,7 @@ stdenv.mkDerivation {
     if userModeLinux then "um" else
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "armv5tel-linux" then "arm" else
+    if stdenv.isArm then "arm" else
     if stdenv.system == "mips64el-linux" then "mips" else
     abort "Platform ${stdenv.system} is not supported.";
 
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 6ac140951037..d7d4f1a43d49 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [ flex ];
   buildInputs = [ cracklib ]
     ++ stdenv.lib.optional
-      (stdenv.system != "armv5tel-linux" && stdenv.system != "mips64el-linux")
+      (stdenv.isArm && stdenv.system != "mips64el-linux")
       libxcrypt;
 
   crossAttrs = {
-    # Skip libxcrypt cross-building, as it fails for mips and armv5tel
+    # Skip libxcrypt cross-building, as it fails for mips and arm
     propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ];
     preConfigure = preConfigure + ''
       ar x ${flex.hostDrv}/lib/libfl.a
diff --git a/pkgs/os-specific/linux/pam_unix2/default.nix b/pkgs/os-specific/linux/pam_unix2/default.nix
index d48598afd0d3..c2eec4a2e4b6 100644
--- a/pkgs/os-specific/linux/pam_unix2/default.nix
+++ b/pkgs/os-specific/linux/pam_unix2/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "067xnyd3q8ik73glxwyx1lydk4bgl78lzq44mnqqp4jrpnpd04ml";
   };
 
-  buildInputs = [ pam ] ++ stdenv.lib.optional (stdenv.system != "armv5tel-linux") libxcrypt;
+  buildInputs = [ pam ] ++ stdenv.lib.optional (!stdenv.isArm) libxcrypt;
 
   meta = {
     homepage = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2;
diff --git a/pkgs/os-specific/linux/udev/173.nix b/pkgs/os-specific/linux/udev/173.nix
index 41b17777edcb..795826cf6bf3 100644
--- a/pkgs/os-specific/linux/udev/173.nix
+++ b/pkgs/os-specific/linux/udev/173.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       url = https://bugs.archlinux.org/task/25356?getfile=7281;
       sha256 = "01xib1pfdbwacgx8dqxgrf67a0mwkpm4kxy9f9v3df93v0m4pmbm";
     })] ++
-    stdenv.lib.optional (stdenv.system == "armv5tel-linux") ./pre-accept4-kernel.patch;
+    stdenv.lib.optional stdenv.isArm ./pre-accept4-kernel.patch;
 
   meta = {
     homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 03f14d6d57b2..c454204f8977 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -55,6 +55,7 @@ rec {
     if stdenvType == "i686-linux" then stdenvLinux else
     if stdenvType == "x86_64-linux" then stdenvLinux else
     if stdenvType == "armv5tel-linux" then stdenvLinux else
+    if stdenvType == "armv7l-linux" then stdenvLinux else
     if stdenvType == "mips64el-linux" then stdenvLinux else
     if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else
     if stdenvType == "i686-mingw" then stdenvMinGW else
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 2cfdf30a171c..749de01deff6 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -93,6 +93,7 @@ let
                || result.system == "x86_64-linux"
                || result.system == "powerpc-linux"
                || result.system == "armv5tel-linux"
+               || result.system == "armv7l-linux"
                || result.system == "mips64el-linux";
         isGNU = result.system == "i686-gnu";      # GNU/Hurd
         isSunOS = result.system == "i686-solaris"
@@ -120,7 +121,8 @@ let
                 || result.system == "x86_64-darwin";
         isMips = result.system == "mips-linux"
                 || result.system == "mips64el-linux";
-        isArm = result.system == "armv5tel-linux";
+        isArm = result.system == "armv5tel-linux"
+             || result.system == "armv7l-linux";
 
         # Utility function: allow stdenv to be easily regenerated with
         # a different setup script.  (See all-packages.nix for an
diff --git a/pkgs/stdenv/linux/bootstrap/armv7l/default.nix b/pkgs/stdenv/linux/bootstrap/armv7l/default.nix
new file mode 100644
index 000000000000..0fc2002068ef
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap/armv7l/default.nix
@@ -0,0 +1,3 @@
+# rely on ARM backward compatibility to build armv7l binaries with the
+# bootstrap tools of armv5tel.
+import ../armv5tel
\ No newline at end of file
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 8b6599e6bc03..3105e76f8177 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -16,6 +16,7 @@ rec {
     else if system == "x86_64-linux" then import ./bootstrap/x86_64
     else if system == "powerpc-linux" then import ./bootstrap/powerpc
     else if system == "armv5tel-linux" then import ./bootstrap/armv5tel
+    else if system == "armv7l-linux" then import ./bootstrap/armv5tel
     else if system == "mips64el-linux" then import ./bootstrap/loongson2f
     else abort "unsupported platform for the pure Linux stdenv";
 
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index cb322e82f398..1db426669bb9 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "gnutar-1.26";
 
   src = fetchurl {
@@ -32,4 +32,9 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.ludo ];
     platforms = stdenv.lib.platforms.all;
   };
-}
\ No newline at end of file
+}
+  # May have some issues with root compilation because the bootstrap tool
+  # cannot be used as a login shell for now.
+// stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux") {
+  FORCE_UNSAFE_CONFIGURE = 1;
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6124f927aead..78473fed050b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1883,7 +1883,7 @@ let
       gettext which noSysDirs;
     # bootstrapping a profiled compiler does not work in the sheevaplug:
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
-    profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;
+    profiledCompiler = if stdenv.isArm then false else true;
 
     # When building `gcc.hostDrv' (a "Canadian cross", with host == target
     # and host != build), `cross' must be null but the cross-libc must still
@@ -1912,7 +1912,7 @@ let
 
     # bootstrapping a profiled compiler does not work in the sheevaplug:
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
-    profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;
+    profiledCompiler = if stdenv.isArm then false else true;
 
     # When building `gcc.hostDrv' (a "Canadian cross", with host == target
     # and host != build), `cross' must be null but the cross-libc must still

From 811b035171a46b34a2841005fdbf51d706def95d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 15 Apr 2012 23:48:07 +0000
Subject: [PATCH 178/293] Mercurial: Support ssl and curses python packages for
 fast-export and crecord.

svn path=/nixpkgs/trunk/; revision=33799
---
 pkgs/applications/version-management/mercurial/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index a8898b818d96..24e1b95bf0cb 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ python makeWrapper docutils unzip ];
 
+  PYTHONPATH = "${python}/lib/python2.6/site-packages:${python}/lib/python2.7/site-packages:${docutils}/lib/python2.5/site-packages:${docutils}/lib/python2.6/site-packages:${docutils}/lib/python2.7/site-packages";
+
   makeFlags = "PREFIX=$(out)";
 
   postInstall = (stdenv.lib.optionalString guiSupport

From 7b7dd238fcc3a08fc08e4b1af332dbc03452bc14 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 15 Apr 2012 23:48:11 +0000
Subject: [PATCH 179/293] Add dulwich (git filesystem in python). Add bugz
 (command line tool for bugzilla) Add gitBz (bugzilla in git)

svn path=/nixpkgs/trunk/; revision=33800
---
 .../git-and-tools/default.nix                 |  7 +++
 pkgs/development/tools/misc/gdb/default.nix   |  2 -
 pkgs/top-level/python-packages.nix            | 56 ++++++++++++++++++-
 3 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 4a0c16b9343c..034d0254c633 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -23,6 +23,13 @@ rec {
     ];
   };
 
+  # support for bugzilla
+  gitBz = import ./git-bz {
+    inherit fetchgit stdenv makeWrapper python asciidoc xmlto # docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
+      ;
+    inherit (pythonPackages) pysqlite;
+  };
+
   # Git with SVN support, but without GUI.
   gitSVN = lowPrio (appendToName "with-svn" (git.override {
     svnSupport = true;
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index e9c424ccf11a..a1be30b4b141 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -75,8 +75,6 @@ stdenv.mkDerivation rec {
        rm -v $out/share/info/{standards,configure,bfd}.info
     '';
 
-  enableParallelBuilding = true;
-
   # TODO: Investigate & fix the test failures.
   doCheck = false;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f49e6dce5718..002fc8daff10 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4,7 +4,7 @@ let pythonPackages = python.modules // rec {
 
   inherit python;
 
-  inherit (pkgs) fetchurl fetchsvn stdenv;
+  inherit (pkgs) fetchurl fetchsvn fetchgit stdenv;
 
 
   buildPythonPackage = import ../development/python-modules/generic {
@@ -201,6 +201,25 @@ let pythonPackages = python.modules // rec {
   };
 
 
+  bugz = buildPythonPackage (rec {
+    name = "bugz-0.9.3";
+
+    src = fetchgit {
+      url = "git://github.com/williamh/pybugz.git";
+      rev = "refs/tags/0.9.3";
+    };
+
+    propagatedBuildInputs = [ argparse python.modules.ssl ];
+
+    doCheck = false;
+
+    meta = {
+      homepage = http://www.liquidx.net/pybugz/;
+      description = "Command line interface for Bugzilla";
+    };
+  });
+
+
   carrot = buildPythonPackage rec {
     name = "carrot-0.10.7";
 
@@ -368,6 +387,41 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+  dulwich = buildPythonPackage rec {
+    name = "dulwich-0.8.1";
+
+    src = fetchurl {
+      url = "http://samba.org/~jelmer/dulwich/${name}.tar.gz";
+      sha256 = "1a1619e9c7e63fe9bdc93356ee893be1016b7ea12ad953f4e1f1f5c0c5056ee8";
+    };
+
+    buildPhase = "make build";
+    installCommand = ''
+      python setup.py install --prefix="$out" --root=/ --record="$out/lib/${python.libPrefix}/site-packages/dulwich/list.txt" --single-version-externally-managed
+    '';
+    doCheck = false;
+
+    meta = {
+      description = "Simple Python implementation of the Git file formats and protocols.";
+      homepage = http://samba.org/~jelmer/dulwich/;
+    };
+  };
+
+  hggit = buildPythonPackage rec {
+    name = "hg-git-0.3.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/h/hg-git/${name}.tar.gz";
+      md5 = "4b15867a07abb0be985177581ce64cee";
+    };
+
+    propagatedBuildInputs = [ dulwich ];
+
+    meta = {
+      description = "Push and pull from a Git server using Mercurial.";
+      homepage = http://hg-git.github.com/;
+    };
+  };
 
   docutils = buildPythonPackage rec {
     name = "docutils-0.8.1";

From 7a4cf2135016fc7d771c5872cffec3a3d8449634 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 15 Apr 2012 23:48:16 +0000
Subject: [PATCH 180/293] Add git-bz nix expression.

svn path=/nixpkgs/trunk/; revision=33801
---
 .../git-and-tools/git-bz/default.nix          | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-bz/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
new file mode 100644
index 000000000000..5e6b9fdc2438
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchgit, python, asciidoc, xmlto, pysqlite, makeWrapper }:
+
+let
+  version = "3.20110902";
+in
+stdenv.mkDerivation {
+  name = "git-bz";
+
+  src = fetchgit {
+    url = "git://git.fishsoup.net/git-bz";
+    rev = "refs/heads/master";
+  };
+
+  buildInputs = [
+    makeWrapper python pysqlite # asciidoc xmlto
+  ];
+
+  buildPhase = ''
+    true
+    # make git-bz.1
+  '';
+
+  installPhase = ''
+    ensureDir $out
+    ensureDir $out/bin
+    cp git-bz $out/bin
+    wrapProgram $out/bin/git-bz \
+      --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $pysqlite)"
+  '';
+
+  meta = {
+    homepage = "http://git.fishsoup.net/cgit/git-bz/";
+    description = "integration of git with Bugzilla";
+    license = stdenv.lib.licenses.gpl2;
+
+    longDescription = ''
+      git-bz is a tool for integrating the Git command line with the
+      Bugzilla bug-tracking system. Operations such as attaching patches to
+      bugs, applying patches in bugs to your current tree, and closing bugs
+      once you've pushed the fixes publically can be done completely from
+      the command line without having to go to your web browser.
+
+      Authentication for git-bz is done by reading the cookies for the
+      Bugzilla host from your web browser. In order to do this, git-bz needs
+      to know how to access the cookies for your web browser; git-bz
+      currently is able to do this for Firefox, Epiphany, Galeon and
+      Chromium on Linux.
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.pierron ];
+  };
+}

From d775e93f90b07bbd9c7d3a0d68921d347f6c2c93 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Apr 2012 12:07:58 +0000
Subject: [PATCH 181/293] Updated Haskell packages.

 - HTTP: added version 4000.2.3
 - RSA: updated to version 1.2.0.0
 - RepLib: updated to version 0.5.2.1
 - conduit: updated to version 0.4.1.1
 - data-accessor: updated to version 0.2.2.2
 - deepseq-th: updated to version 0.1.0.3
 - explicit-exception: updated to version 0.1.7
 - ghc-mod: updated to version 1.10.15
 - gitit: updated to version 0.9.0.1
 - hakyll: updated to version 3.2.7.2
 - hjsmin: updated to version 0.0.16
 - http-conduit: updated to version 1.4.1
 - iteratee: updated to version 0.8.8.2
 - language-javascript: updated to version 0.5.0
 - reactive-banana: updated to version 0.5.0.1
 - repa: updated to version 3.1.1.1
 - rvar: updated to version 0.2.0.1
 - semigroups: updated to version 0.8.3
 - simple-sendfile: updated to version 0.2.3
 - storable-record: updated to version 0.0.2.5
 - unbound: updated to version 0.4.0.2
 - wxc: added version 0.90.0.2

svn path=/nixpkgs/trunk/; revision=33802
---
 .../libraries/haskell/HTTP/4000.2.3.nix        | 15 +++++++++++++++
 .../libraries/haskell/RSA/default.nix          |  8 ++++----
 .../libraries/haskell/RepLib/default.nix       |  4 ++--
 .../libraries/haskell/conduit/default.nix      |  4 ++--
 .../haskell/data-accessor/data-accessor.nix    |  4 ++--
 .../libraries/haskell/deepseq-th/default.nix   |  4 ++--
 .../haskell/explicit-exception/default.nix     |  4 ++--
 .../libraries/haskell/ghc-mod/default.nix      |  4 ++--
 .../libraries/haskell/gitit/default.nix        | 18 +++++++++---------
 .../libraries/haskell/hakyll/default.nix       |  7 ++-----
 .../libraries/haskell/hjsmin/default.nix       |  4 ++--
 .../libraries/haskell/http-conduit/default.nix |  4 ++--
 .../libraries/haskell/iteratee/default.nix     |  4 ++--
 .../haskell/language-javascript/default.nix    |  8 ++++----
 .../haskell/reactive-banana/default.nix        |  4 ++--
 .../libraries/haskell/repa/default.nix         |  4 ++--
 .../libraries/haskell/rvar/default.nix         |  4 ++--
 .../libraries/haskell/semigroups/default.nix   |  4 ++--
 .../haskell/simple-sendfile/default.nix        |  4 ++--
 .../haskell/storable-record/default.nix        |  4 ++--
 .../libraries/haskell/unbound/default.nix      |  4 ++--
 .../libraries/haskell/wxHaskell/wxc.nix        | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  7 +++++--
 23 files changed, 87 insertions(+), 56 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
 create mode 100644 pkgs/development/libraries/haskell/wxHaskell/wxc.nix

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
new file mode 100644
index 000000000000..cff762864bc6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
@@ -0,0 +1,15 @@
+{ cabal, mtl, network, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "HTTP";
+  version = "4000.2.3";
+  sha256 = "1z7s5rkyljwdl95cwqbqg64i207wjwxgpksrdmvcv82k39srzx80";
+  buildDepends = [ mtl network parsec ];
+  meta = {
+    homepage = "https://github.com/haskell/HTTP";
+    description = "A library for client-side HTTP";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index 173ddc314952..3f9b37535952 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -1,12 +1,12 @@
-{ cabal, binary, pureMD5, random, SHA }:
+{ cabal, binary, cryptoApi, monadcryptorandom, pureMD5, SHA }:
 
 cabal.mkDerivation (self: {
   pname = "RSA";
-  version = "1.0.6.3";
-  sha256 = "0lk3nsh6nvacv1xzrg2pxxhd5gglmy40dkb8a47c9r9px0q6yjpj";
+  version = "1.2.0.0";
+  sha256 = "0x4wa0yq4k43ccdakqcmy0mxvdlvrkfg6kc1j2hv7hh8b4vjisms";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ binary pureMD5 random SHA ];
+  buildDepends = [ binary cryptoApi monadcryptorandom pureMD5 SHA ];
   meta = {
     description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
index b070301f4e79..1be11a557f8d 100644
--- a/pkgs/development/libraries/haskell/RepLib/default.nix
+++ b/pkgs/development/libraries/haskell/RepLib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "RepLib";
-  version = "0.5.2";
-  sha256 = "1wcxvl40wlnva2x7z13pm95485lwxbpy5di1mb1din3id8dprxfr";
+  version = "0.5.2.1";
+  sha256 = "133zpiszfdb8s4hqd1xpgsiac98v04dclk3hivzxcg0h77m7qpcc";
   buildDepends = [ mtl typeEquality ];
   meta = {
     homepage = "http://code.google.com/p/replib/";
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 7c303a09a4b2..89b06d1164fe 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "0.4.0.1";
-  sha256 = "1n4a42ayww55hvvsnis6gdfwfciwxpzz0wxa0b3ybvmyr0jsidiq";
+  version = "0.4.1.1";
+  sha256 = "1y5bccjd3r1kakwiq0nlp3dk2jwrdsm3f8dncnfsmnlk093ajyxa";
   buildDepends = [
     liftedBase monadControl resourcet text transformers
     transformersBase void
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
index b3bb3408bcfb..6f73cc48817f 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-accessor";
-  version = "0.2.2.1";
-  sha256 = "1zb7z9fnlnxxlvjd655vadfscanzq9msvjv21cjmdric0ja24hxb";
+  version = "0.2.2.2";
+  sha256 = "1q9hx2bkp7dknr9ygx39lj93i846x8g9j7lkhkjijvsicih28yyi";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Record_access";
diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix
index 36ab9f8a8e94..1072bcb9ca7e 100644
--- a/pkgs/development/libraries/haskell/deepseq-th/default.nix
+++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "deepseq-th";
-  version = "0.1.0.2";
-  sha256 = "0f2hrp2rjb3iailnxh47wl1imgq6jqr9qj31vi7k8lgp5pwa90mc";
+  version = "0.1.0.3";
+  sha256 = "1xx88i55iskyxrpxbdg0srb64y5siqs1b8qj7bh3i1893qs9sha2";
   buildDepends = [ deepseq ];
   meta = {
     description = "Template Haskell based deriver for optimised NFData instances";
diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix
index 47c0f57252b4..86d4cc50c3ba 100644
--- a/pkgs/development/libraries/haskell/explicit-exception/default.nix
+++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "explicit-exception";
-  version = "0.1.6";
-  sha256 = "0pgdbaav952bwcmbfwg0fgvc15k57rlnw131bs3pnp8rqdbxfv39";
+  version = "0.1.7";
+  sha256 = "0pqh97fxs55554bd16dknggkr0yayqj1dz0sddp9b2svjy2q4vrm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ transformers ];
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 248387cf64c2..b95d1e6d73be 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "1.10.12";
-  sha256 = "1r06phm9fjrzwga63065lzdd7dn24sqn3g4fkyh8s30n531672rg";
+  version = "1.10.15";
+  sha256 = "1ywsv8nxd5040k3v5r9kf4zb0myicnjg6yckxmp6xnvf5glylylm";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 61251bfabc38..14951eebbd54 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -1,5 +1,5 @@
-{ cabal, blazeHtml, cgi, ConfigFile, feed, filepath, filestore
-, ghcPaths, happstackServer, happstackUtil, highlightingKate
+{ cabal, base64Bytestring, blazeHtml, cgi, ConfigFile, feed
+, filepath, filestore, ghcPaths, happstackServer, highlightingKate
 , hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc
 , pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup
 , text, time, url, utf8String, xhtml, xml, xssSanitize, zlib
@@ -7,16 +7,16 @@
 
 cabal.mkDerivation (self: {
   pname = "gitit";
-  version = "0.9";
-  sha256 = "00kjfmczj5m3b8r8djdpad8d27s44z7pf76yyc0sdja1f3bd4mlp";
+  version = "0.9.0.1";
+  sha256 = "1k1z6qvp72c61yhrfma3340wf4ysjkb80f8lqapaqsyhp96qjl3m";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeHtml cgi ConfigFile feed filepath filestore ghcPaths
-    happstackServer happstackUtil highlightingKate hslogger
-    HStringTemplate HTTP json mtl network pandoc pandocTypes parsec
-    random recaptcha safe SHA syb tagsoup text time url utf8String
-    xhtml xml xssSanitize zlib
+    base64Bytestring blazeHtml cgi ConfigFile feed filepath filestore
+    ghcPaths happstackServer highlightingKate hslogger HStringTemplate
+    HTTP json mtl network pandoc pandocTypes parsec random recaptcha
+    safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
+    zlib
   ];
   meta = {
     homepage = "http://gitit.net";
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 053fce65ce2d..04375877bca2 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -5,15 +5,12 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "3.2.7.1";
-  sha256 = "07d7a8l2phb787wgqyh1rci1v9hzwxw35arg03hkal072sacif0c";
+  version = "3.2.7.2";
+  sha256 = "1l37w3q2jhcxjkq3h0nh8hl21vscgvsj6jkkd2hni62kfzfrgqhw";
   buildDepends = [
     binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc
     parsec regexBase regexTdfa snapCore snapServer tagsoup time
   ];
-  patchPhase = ''
-    sed -i 's|hamlet      >= 0.10.3 && < 0.11|hamlet|' hakyll.cabal
-  '';
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";
diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index 46aebc66e249..a224e846a405 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hjsmin";
-  version = "0.0.15";
-  sha256 = "1bik3bvaz4zjhyx8nyghhs61l14zm71hndfhj4k0xvkw3h6hlj9k";
+  version = "0.0.16";
+  sha256 = "0svpmhrzhra3yhc1bzwga9d13k4kd8vw6va1q9866pkw385j5jr4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeBuilder languageJavascript text ];
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 6490d14711d1..50a7188cbad9 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.4.0.2";
-  sha256 = "1zhsz9zqa4h5f18yalihcqa5p4ji50b8cw7h88i9s46q3fwcrbhh";
+  version = "1.4.1";
+  sha256 = "1jv5nk2h17hf2fp1r6ych9grnlx2hsclxgn10d5f1vx21xbd0hkl";
   buildDepends = [
     asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
     blazeBuilderConduit caseInsensitive certificate conduit cookie
diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index 901f3c5e81a6..2a2708f70ac5 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iteratee";
-  version = "0.8.8.1";
-  sha256 = "1d6b83j3k2idpa9xcii8h9wa6mvxngp7rymb4xy6w8lvrmi7rmwz";
+  version = "0.8.8.2";
+  sha256 = "1d76an95y8svaja5ksx8p05fk22z62hp3gfwnd1d917qccffw6ry";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index 053bbef01ebc..5d7f6d9edf5a 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -1,12 +1,12 @@
-{ cabal, happy, mtl, utf8Light }:
+{ cabal, blazeBuilder, happy, mtl, utf8Light, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "language-javascript";
-  version = "0.4.10";
-  sha256 = "1bk5xrhj5cpacz2bcfjz28sldizdadg05daalppxq8vs830sdx5h";
+  version = "0.5.0";
+  sha256 = "0fx087z8sa360bsbd22g7jsnzz0dzvm6pfr59d4vamfwc0zg2yg9";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ mtl utf8Light ];
+  buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
   buildTools = [ happy ];
   meta = {
     homepage = "http://github.com/alanz/language-javascript";
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 72046994a87a..7d0f08a6d2eb 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana";
-  version = "0.5.0.0";
-  sha256 = "1dabyzdkc8imm397cj7i18r3784233a45jlli3y6ch8zg2kl1iri";
+  version = "0.5.0.1";
+  sha256 = "04mr1pb0q1ks29q3mzy3apk5ki1sbzlslavbldfnrrq3g2s90366";
   buildDepends = [
     fclabels hashable QuickCheck transformers unorderedContainers vault
   ];
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index cd98b9a9c1b7..2584107dc36e 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa";
-  version = "3.1.0.1";
-  sha256 = "0dcx2n7bqw8rrr1aaxnrbmjv0c89lvxl6fgccrw0qci5rzwccnp2";
+  version = "3.1.1.1";
+  sha256 = "0r78xd8caqpjvf1wxlv9mp13n5as8k98j76sni6wyrj2i55sx7ls";
   buildDepends = [ QuickCheck vector ];
   meta = {
     homepage = "http://repa.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix
index 3f2f3915ddfa..6f2ed95ab636 100644
--- a/pkgs/development/libraries/haskell/rvar/default.nix
+++ b/pkgs/development/libraries/haskell/rvar/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rvar";
-  version = "0.2";
-  sha256 = "1in2qn1clv9b7ijyllhjflh9zdkna31hpyclhlkfnsc6899z3y1f";
+  version = "0.2.0.1";
+  sha256 = "17wgd4gc1hn04dck168nkyzn9jyipgbysxsznyzy2z36vafqqqbm";
   buildDepends = [ MonadPrompt mtl randomSource transformers ];
   meta = {
     homepage = "https://github.com/mokus0/random-fu";
diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index d622018e5881..4c2def192b40 100644
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroups";
-  version = "0.8.2";
-  sha256 = "1vxavkpg68qfs5arhi76liafds1jd8prircnp66ykhkj40z5aix0";
+  version = "0.8.3";
+  sha256 = "179m5vvhf8rf01fnq8b2lg7v8i70yx6yq975jiazghm0qnsm32ji";
   meta = {
     homepage = "http://github.com/ekmett/semigroups/";
     description = "Haskell 98 semigroups";
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index 82d316e4d765..19ccce16ab28 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.2.2";
-  sha256 = "0id3d6ynl2xz4w0vcxm3wyj1kxjnchcl3h0xa4prh3s0giap8yax";
+  version = "0.2.3";
+  sha256 = "1i3jx90kwq504fdl2qbhz25psjvq9ldvwgx5cij82ajjqi61pfrv";
   buildDepends = [ network ];
   meta = {
     description = "Cross platform library for the sendfile system call";
diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix
index 61085b1c719b..455d860ba5e9 100644
--- a/pkgs/development/libraries/haskell/storable-record/default.nix
+++ b/pkgs/development/libraries/haskell/storable-record/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "storable-record";
-  version = "0.0.2.4";
-  sha256 = "5ed2680dcfc4c3d4fe605d23e797b847fe047b7acd3f4acfd82155c93e72b280";
+  version = "0.0.2.5";
+  sha256 = "078vwwcr47d3dmzkhxr7ggjkq9d5rnxv4z8p049kdnmzfbcmisn3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ transformers utilityHt ];
diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
index 1a186b4a5086..b64aff3ae130 100644
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unbound";
-  version = "0.4.0.1";
-  sha256 = "0zb029wji85b643iqf4cnkd9d68accrjxnk8422xs82zik2kn6zf";
+  version = "0.4.0.2";
+  sha256 = "0vwbqrjrahg7ifsqgmq18ddmmczjxnsdz5w3kfgb4jpv1glwlxrh";
   buildDepends = [ mtl RepLib transformers ];
   meta = {
     homepage = "http://code.google.com/p/replib/";
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
new file mode 100644
index 000000000000..1d3a331e35e8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
@@ -0,0 +1,16 @@
+{ cabal, libX11, mesa, wxdirect, wxGTK }:
+
+cabal.mkDerivation (self: {
+  pname = "wxc";
+  version = "0.90.0.2";
+  sha256 = "1vqs9517qacm04d2bxpbpcdgfmlhpblm6af45nmcdikvlfa1v0jp";
+  buildDepends = [ wxdirect ];
+  extraLibraries = [ libX11 mesa wxGTK ];
+  meta = {
+    homepage = "http://haskell.org/haskellwiki/WxHaskell";
+    description = "wxHaskell C++ wrapper";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a97d899bab2b..c12a48733d90 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -152,7 +152,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     syb          = self.syb_0_3_6;              # 7.4.1 ok
     xhtml        = self.xhtml_3000_2_0_5;       # 7.4.1 ok
     zlib         = self.zlib_0_5_3_3;           # 7.4.1 ok
-    HTTP         = self.HTTP_4000_2_2;          # 7.4.1 ok
+    HTTP         = self.HTTP_4000_2_3;          # 7.4.1 ok
     text         = self.text_0_11_2_0;          # 7.4.1 ok
     transformers = self.transformers_0_2_2_0;   # 7.4.1 ok
     mtl          = self.mtl_2_0_1_0;            # 7.4.1 ok
@@ -810,7 +810,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {};
   HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {};
   HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {};
-  HTTP = self.HTTP_4000_2_2;
+  HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
+  HTTP = self.HTTP_4000_2_3;
 
   hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
 
@@ -1462,6 +1463,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {};
 
+  wxc = callPackage ../development/libraries/haskell/wxHaskell/wxc.nix {};
+
   wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix {
     wxGTK = pkgs.wxGTK28;
   };

From cccc48263ff0c0c265ced48b483e48053fd5b56e Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Mon, 16 Apr 2012 15:14:19 +0000
Subject: [PATCH 182/293] Sane backends URL seems to have changed.

Also advance version to 1.0.22

svn path=/nixpkgs/trunk/; revision=33803
---
 pkgs/misc/sane-backends/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix
index 3f9ecdccb408..31372aa84186 100644
--- a/pkgs/misc/sane-backends/default.nix
+++ b/pkgs/misc/sane-backends/default.nix
@@ -6,11 +6,11 @@ in
 assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
 
 stdenv.mkDerivation {
-  name = "sane-backends-1.0.21";
+  name = "sane-backends-1.0.22";
   
   src = fetchurl {
-    url = ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.21/sane-backends-1.0.21.tar.gz;
-    sha256 = "12wl4a86hxwlrx46lm5z6lw4id3j8wi82yv3khxcz5sqjai2ykp4";
+    url = http://alioth.debian.org/frs/download.php/3503/sane-backends-1.0.22.tar.gz;
+    sha256 = "0m0cz4ljw9asqvpryl6gx1ndwf7ll2qinlvql9whnzs901la314z";
   };
   
   udevSupport = hotplugSupport;

From 682690bd715b8a4d0ed109ed9fbd8c42ac26337f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 16 Apr 2012 21:44:12 +0000
Subject: [PATCH 183/293] Adding mosh.

svn path=/nixpkgs/trunk/; revision=33804
---
 pkgs/tools/networking/mosh/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  4 ++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/networking/mosh/default.nix

diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
new file mode 100644
index 000000000000..60a9e5cab871
--- /dev/null
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, zlib, boost, protobuf, ncurses, pkgconfig, IOTty
+, makeWrapper, perl }:
+
+stdenv.mkDerivation rec {
+  name = "mosh-1.1.3";
+
+  src = fetchurl {
+    url = "https://github.com/downloads/keithw/mosh/${name}.tar.gz";
+    sha256 = "1vkf7h8mcmfn9dgcwrww05mdijrl7321xv9wlhf7j99nwmklc8sk";
+  };
+
+  buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl ];
+
+  postInstall = ''
+      wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
+  '';
+
+  meta = {
+    homepage = http://mosh.mit.edu/;
+    description = "Remote terminal application that allows roaming, local echo, etc.";
+    license = "GPLv3+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78473fed050b..28aa478f678f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1019,6 +1019,10 @@ let
     inherit openssl flex bison;
   };
 
+  mosh = callPackage ../tools/networking/mosh {
+    inherit (perlPackages) IOTty;
+  };
+
   mpage = callPackage ../tools/text/mpage { };
 
   mscgen = callPackage ../tools/graphics/mscgen { };

From 526b207211900872b748cc5eaad3db788a3ead9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 16 Apr 2012 22:13:27 +0000
Subject: [PATCH 184/293] Adding a headers-only version of boost. I wrote it in
 a new file, replicating the 'src', because to me this way looks simpler
 despite the copy of src..

svn path=/nixpkgs/trunk/; revision=33805
---
 .../libraries/boost/1.49-headers.nix          | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/boost/1.49-headers.nix

diff --git a/pkgs/development/libraries/boost/1.49-headers.nix b/pkgs/development/libraries/boost/1.49-headers.nix
new file mode 100644
index 000000000000..58c0c19a17bc
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.49-headers.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "boost-1.49.0-headers";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2";
+    sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/include
+    tar xvf $src -C $out/include --strip-components=1 boost_1_49_0/boost
+  '';
+
+  meta = {
+    homepage = "http://boost.org/";
+    description = "Boost C++ Library Collection";
+    license = "boost-license";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.viric ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28aa478f678f..f6df2669d936 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3276,6 +3276,7 @@ let
   boost147 = callPackage ../development/libraries/boost/1.47.nix { };
   boost148 = callPackage ../development/libraries/boost/1.48.nix { };
   boost149 = callPackage ../development/libraries/boost/1.49.nix { };
+  boost149headers = callPackage ../development/libraries/boost/1.49-headers.nix { };
   boost = boost149;
 
   # A Boost build with all library variants enabled.  Very large (about 250 MB).

From a01828abd55939736b01e0adca8f5d1d3e903b0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 16 Apr 2012 22:16:38 +0000
Subject: [PATCH 185/293] Made mosh use boostHeaders, and not boost. A much
 lighter dependency, of great help on the Sheevaplug.

I'm not sure of the name 'boostHeaders' and 'boostHeaders149'. Changes welcome.


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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6df2669d936..038fc5242674 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1020,6 +1020,7 @@ let
   };
 
   mosh = callPackage ../tools/networking/mosh {
+    boost = boostHeaders;
     inherit (perlPackages) IOTty;
   };
 
@@ -3276,9 +3277,11 @@ let
   boost147 = callPackage ../development/libraries/boost/1.47.nix { };
   boost148 = callPackage ../development/libraries/boost/1.48.nix { };
   boost149 = callPackage ../development/libraries/boost/1.49.nix { };
-  boost149headers = callPackage ../development/libraries/boost/1.49-headers.nix { };
   boost = boost149;
 
+  boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { };
+  boostHeaders = boostHeaders149;
+
   # A Boost build with all library variants enabled.  Very large (about 250 MB).
   boostFull = appendToName "full" (boost.override {
     enableDebug = true;

From adb332af4c5e09b0da4ed3731489485b631f3034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 17 Apr 2012 09:57:57 +0000
Subject: [PATCH 186/293] Ogre: Build the samples.

svn path=/nixpkgs/trunk/; revision=33807
---
 pkgs/development/libraries/ogre/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 110774e81d34..3a8e1c4ae556 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation {
     sha256 = "10q8jx842s4aws9py6q67rb4dh5vli5vvg54jl8manjb4f388jh5";
   };
 
-  cmakeFlags =
-    (map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") [ "BSP" "CG" "OCTREE" "PCZ" "PFX" ])
+  cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ]
+    ++ (map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")
+            [ "BSP" "CG" "OCTREE" "PCZ" "PFX" ])
     ++ (map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]);
 
   enableParallelBuilding = true;

From 6c1bc7767357059bb5dec3eef52da00497643b50 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 17 Apr 2012 13:05:20 +0000
Subject: [PATCH 187/293] Updating VUE

svn path=/nixpkgs/trunk/; revision=33808
---
 pkgs/applications/misc/vue/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix
index 8caa86a71cbe..c90e4d24f37a 100644
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@@ -11,10 +11,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="vue";
-    version="3.1.1";
+    version="3.1.2";
     name="${baseName}-${version}";
-    url="http://releases.atech.tufts.edu/vue/v${version}/VUE_3_1_1.zip";
-    hash="1wq2mdvfm7c4vhs9ivl7n3w9ncwyrjgdgycbapzd6l1nym5iz76y";
+    url="http://releases.atech.tufts.edu/vue/v${version}/VUE_3_1_2.zip";
+    hash="0ga98gnp4qhcrb31cb8j0mwbrh6ym6hr4k5y4blxvyfff9c0vq47";
   };
 in
 rec {

From de5fdd541a9057b74bd9c754e1ab55091d210aef Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 17 Apr 2012 13:05:57 +0000
Subject: [PATCH 188/293] Fix line endings

svn path=/nixpkgs/trunk/; revision=33809
---
 pkgs/servers/http/joseki/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix
index 1a7e6f6d16c2..f23a6ce73ebe 100644
--- a/pkgs/servers/http/joseki/default.nix
+++ b/pkgs/servers/http/joseki/default.nix
@@ -79,6 +79,8 @@ rec {
     chmod a+x "$TARGET/bin/"*
     mkdir -p "$out/bin"
 
+    sed -e 's/\r//g' -i "$TARGET/bin"/*
+
     echo -e '#! /bin/sh\nls "'"$TARGET"'"/bin' > "$out/bin/jena-list-commands"
     echo '#! /bin/sh' >> "$out/bin/jena-command"
     echo 'export JENAROOT="'"$TARGET"'"' >> "$out/bin/jena-command"

From f699257450b3d9d63dd96a6fb073ea3334e58cf4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 17 Apr 2012 13:06:12 +0000
Subject: [PATCH 189/293] Adding blobby volleybal

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

diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
new file mode 100644
index 000000000000..0ce5c55a785b
--- /dev/null
+++ b/pkgs/games/blobby/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}:
+stdenv.mkDerivation rec {
+  version = "2.0-RC1";
+  name = "blobby-volley-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0RC1/blobby2-linux-1.0rc1.tar.gz";
+    sha256 = "1cb56bd31vqkc12cmzp43q2aai99505isq2mii95jp0rzdqks4fy";
+  };
+
+  buildInputs = [SDL SDL_image mesa cmake physfs boost zip zlib];
+
+  preConfigure = ''
+    sed -re '1i#include <cassert>' -i src/CrossCorrelation.h
+  '';
+
+  meta = {
+    description = ''A blobby volleyball game.'';
+    license = with stdev.lib.licenses; bsd3;
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [raskin];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 038fc5242674..b177291e95bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7750,6 +7750,8 @@ let
 
   blackshadeselite = callPackage ../games/blackshadeselite { };
 
+  blobby = callPackage ../games/blobby {};
+
   bsdgames = callPackage ../games/bsdgames { };
 
   btanks = callPackage ../games/btanks { };

From eec2c680c786baed4954a43e89752d19103563e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Apr 2012 13:56:27 +0000
Subject: [PATCH 190/293] Updated Haskell packages.

 - HsOpenSSL: updated to version 0.10.3
 - RSA: downgraded to version 1.0.6.3
 - language-javascript: updated to version 0.5.1
 - maude: fixed build
 - pem: added version 0.1.0

svn path=/nixpkgs/trunk/; revision=33811
---
 .../libraries/haskell/HsOpenSSL/default.nix       |  4 ++--
 .../development/libraries/haskell/RSA/default.nix |  8 ++++----
 .../haskell/language-javascript/default.nix       |  6 ++----
 .../development/libraries/haskell/pem/default.nix | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  6 +++++-
 5 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/pem/default.nix

diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index 83bc8a227b74..0d11acb7ce87 100644
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HsOpenSSL";
-  version = "0.10.2";
-  sha256 = "0bji31lb9n08ybzs23251q6afr32fjvzcjm7qs3fvy3r7bc3gqbf";
+  version = "0.10.3";
+  sha256 = "1f876xbx0a8xrs4ainmb79nisr6pflslzk26vk4psxgn9a159cvk";
   buildDepends = [ network time ];
   extraLibraries = [ openssl ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index 3f9b37535952..173ddc314952 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -1,12 +1,12 @@
-{ cabal, binary, cryptoApi, monadcryptorandom, pureMD5, SHA }:
+{ cabal, binary, pureMD5, random, SHA }:
 
 cabal.mkDerivation (self: {
   pname = "RSA";
-  version = "1.2.0.0";
-  sha256 = "0x4wa0yq4k43ccdakqcmy0mxvdlvrkfg6kc1j2hv7hh8b4vjisms";
+  version = "1.0.6.3";
+  sha256 = "0lk3nsh6nvacv1xzrg2pxxhd5gglmy40dkb8a47c9r9px0q6yjpj";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ binary cryptoApi monadcryptorandom pureMD5 SHA ];
+  buildDepends = [ binary pureMD5 random SHA ];
   meta = {
     description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index 5d7f6d9edf5a..9a258f7e88de 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -2,10 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-javascript";
-  version = "0.5.0";
-  sha256 = "0fx087z8sa360bsbd22g7jsnzz0dzvm6pfr59d4vamfwc0zg2yg9";
-  isLibrary = true;
-  isExecutable = true;
+  version = "0.5.1";
+  sha256 = "12nb951xcsg1qxrg347f4sxmdzi78vxwkjhx0fib6pkbcz9yqf5q";
   buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
   buildTools = [ happy ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix
new file mode 100644
index 000000000000..35d8a49c2c83
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pem/default.nix
@@ -0,0 +1,15 @@
+{ cabal, attoparsec, base64Bytestring, cereal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "pem";
+  version = "0.1.0";
+  sha256 = "0qhkmxfhzpzg3ycdzr4b7zzf84vmhbqv2irh95ymmdbr0cc5hhn9";
+  buildDepends = [ attoparsec base64Bytestring cereal mtl ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-pem";
+    description = "Privacy Enhanced Mail (PEM) format reader and writer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c12a48733d90..f55a5f0714e4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -968,7 +968,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   mathFunctions = callPackage ../development/libraries/haskell/math-functions {};
 
-  maude = callPackage ../development/libraries/haskell/maude {};
+  maude = callPackage ../development/libraries/haskell/maude {
+    parsec = self.parsec3;
+  };
 
   MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
 
@@ -1102,6 +1104,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   pcreLight = callPackage ../development/libraries/haskell/pcre-light {};
 
+  pem = callPackage ../development/libraries/haskell/pem {};
+
   permutation = callPackage ../development/libraries/haskell/permutation {};
 
   persistent = callPackage ../development/libraries/haskell/persistent {};

From 39c9ece183ea2081c2ff6163595c44c180d4ee86 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Apr 2012 13:56:30 +0000
Subject: [PATCH 191/293] wxGTK-2.9: updated the development version of wxGTK
 to 2.9.3

I deleted older snapshots because my attempts to use 2.9.0 or 2.9.1 ran into
problems with our recent version of libpng. The 2.9.3 version seems to work
fine, though. If you still need the older versions, please feel free to
reinstate them.

svn path=/nixpkgs/trunk/; revision=33812
---
 .../development/libraries/wxGTK-2.9/2.9.1.nix | 47 -------------------
 .../wxGTK-2.9/{2.9.0.nix => default.nix}      |  6 +--
 pkgs/games/rigsofrods/default.nix             |  4 +-
 pkgs/top-level/all-packages.nix               |  7 +--
 4 files changed, 6 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
 rename pkgs/development/libraries/wxGTK-2.9/{2.9.0.nix => default.nix} (87%)

diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
deleted file mode 100644
index d59ab4880c33..000000000000
--- a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gst_plugins_base, GConf
-, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
-}:
-
-assert withMesa -> mesa != null;
-
-with stdenv.lib;
-
-stdenv.mkDerivation {
-  name = "wxwidgets-2.9.1";
-
-  src = fetchurl {
-    url = mirror://sourceforge/wxwindows/wxWidgets-2.9.1.tar.bz2;
-    sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
-  };
-
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
-    ++ optional withMesa mesa;
-
-  buildNativeInputs = [ pkgconfig ];
-
-  configureFlags = [
-    "--enable-gtk2"
-    (if compat24 then "--enable-compat24" else "--disable-compat24")
-    (if compat26 then "--enable-compat26" else "--disable-compat26")
-    "--disable-precomp-headers"
-    (if unicode then "--enable-unicode" else "")
-    "--enable-mediactrl"
-  ] ++ optional withMesa "--with-opengl";
-
-  SEARCH_LIB = optionalString withMesa "${mesa}/lib";
-
-  preConfigure = "
-    substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
-    substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
-    substituteInPlace configure --replace /usr /no-such-path
-  ";
-
-  postInstall = "
-    (cd $out/include && ln -s wx-*/* .)
-  ";
-
-  passthru = {inherit gtk compat24 compat26 unicode;};
-
-  enableParallelBuilding = true;
-}
diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
similarity index 87%
rename from pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
rename to pkgs/development/libraries/wxGTK-2.9/default.nix
index 619806fb7b27..a0e69bff0fea 100644
--- a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/default.nix
@@ -8,11 +8,11 @@ assert withMesa -> mesa != null;
 with stdenv.lib;
 
 stdenv.mkDerivation {
-  name = "wxwidgets-2.9.0";
+  name = "wxwidgets-2.9.3";
 
   src = fetchurl {
-    url = mirror://sourceforge/wxwindows/wxWidgets-2.9.0.tar.bz2;
-    sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
+    url = "mirror://sourceforge/wxwindows/wxWidgets-2.9.3.tar.bz2";
+    sha256 = "739c31a360b5c46b55904a7fb086f5cdfff0816efbc491d8263349210bf323b2";
   };
 
   buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index f92b5775ab72..90ebab92942c 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -1,4 +1,4 @@
-{ fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost, 
+{ fetchsvn, fetchurl, stdenv, wxGTK29, freeimage, cmake, zziplib, mesa, boost,
   pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
   angelscript, caelum, ogrepaged, mysocketw, libxcb
   }:
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./doubleslash.patch ./paths.patch ];
 
-  buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig
+  buildInputs = [ wxGTK29 freeimage cmake zziplib mesa boost pkgconfig
     libuuid openal ogre ois curl gtk mygui unzip angelscript
     caelum ogrepaged mysocketw libxcb ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b177291e95bf..f7f2438208a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4858,12 +4858,7 @@ let
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
-  wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
-    inherit (gnome) GConf;
-    withMesa = lib.elem system lib.platforms.mesaPlatforms;
-  };
-
-  wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix {
+  wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
     inherit (gnome) GConf;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };

From 5b8103b57c6d87c25c4d974ebbe8b9699bdb778f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Apr 2012 13:56:34 +0000
Subject: [PATCH 192/293] wxHaskell: updated to version 0.90 based on wxGTK
 version 2.9.3

 - wx: updated to version 0.90
 - wxcore: updated to version 0.90
 - wxdirect: updated to version 0.90
 - wxc: this project contains no native Haskell code -- only C++ glue -- so we cannot run Haddock on it

svn path=/nixpkgs/trunk/; revision=33813
---
 .../development/libraries/haskell/wxHaskell/wx.nix |  4 ++--
 .../libraries/haskell/wxHaskell/wxc.nix            |  5 +++++
 .../libraries/haskell/wxHaskell/wxcore.nix         |  9 +++++----
 .../libraries/haskell/wxHaskell/wxdirect.nix       |  4 ++--
 pkgs/top-level/haskell-packages.nix                | 14 +++++++++-----
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
index 6a7a10e01020..98dcc20feb0f 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wx";
-  version = "0.13.2.1";
-  sha256 = "0s5jmsrip26ahvz7mzf12m9rcibrk9is3kwbswz87h0sr0k11nbv";
+  version = "0.90";
+  sha256 = "01rr8n99mas5x0vfxh8wf01vbh29vil860waxnsn6xdqc9fm5jj2";
   buildDepends = [ stm wxcore ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
index 1d3a331e35e8..b96ecfb4d9d8 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
@@ -6,6 +6,11 @@ cabal.mkDerivation (self: {
   sha256 = "1vqs9517qacm04d2bxpbpcdgfmlhpblm6af45nmcdikvlfa1v0jp";
   buildDepends = [ wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
+  noHaddock = true;
+  postInstall = ''
+    cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so
+  '';
+
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "wxHaskell C++ wrapper";
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index ab90f6a1ebec..4627e7fcf1d7 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -1,11 +1,12 @@
-{ cabal, filepath, libX11, mesa, parsec, stm, time, wxdirect, wxGTK
+{ cabal, filepath, libX11, mesa, parsec, stm, time, wxc, wxdirect
+, wxGTK
 }:
 
 cabal.mkDerivation (self: {
   pname = "wxcore";
-  version = "0.13.2.1";
-  sha256 = "0p0d9vxw2pyvnhswsgasdd62hj86w3ixbbsx41wkswzkjjjib9i6";
-  buildDepends = [ filepath parsec stm time wxdirect ];
+  version = "0.90";
+  sha256 = "1vrv683576cdvxfiriw2aw5kw1gzrddd27pxa06rrg5nny0jni46";
+  buildDepends = [ filepath parsec stm time wxc wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
index f6f487633a16..c37e04282db5 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wxdirect";
-  version = "0.13.1.2";
-  sha256 = "1gn5si6939yizlkf7hzm2a2gff5sa98m7q5q1hz23av98zfa8pv7";
+  version = "0.90";
+  sha256 = "0vlqvj9sys5d2x9ccpq0yxqbsq060g4jb6xrckjspxb605c98r3r";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec strict time ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f55a5f0714e4..57ac9d8f0a67 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1467,13 +1467,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {};
 
-  wxc = callPackage ../development/libraries/haskell/wxHaskell/wxc.nix {};
-
-  wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix {
-    wxGTK = pkgs.wxGTK28;
+  wxc = callPackage ../development/libraries/haskell/wxHaskell/wxc.nix {
+    wxGTK = pkgs.wxGTK29;
   };
 
-  wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {};
+  wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix {
+    wxGTK = pkgs.wxGTK29;
+  };
+
+  wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {
+    time = self.time_1_2_0_5;
+  };
 
   X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix {};
   X11_1_6_0 = callPackage ../development/libraries/haskell/X11/1.6.0.nix {};

From e4509bda5ddbce8bd2a592e51ad9a5d33a318b8e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Apr 2012 13:56:38 +0000
Subject: [PATCH 193/293] blobby: fixed typo

svn path=/nixpkgs/trunk/; revision=33814
---
 pkgs/games/blobby/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index 0ce5c55a785b..b9f5f5d7e2a5 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = ''A blobby volleyball game.'';
-    license = with stdev.lib.licenses; bsd3;
+    license = with stdenv.lib.licenses; bsd3;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
   };

From 934ef8e3fcda795b2deabc6a37b49b39df7db44e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Apr 2012 15:31:44 +0000
Subject: [PATCH 194/293] * Fix evaluation of pythonPackages.bugz.

svn path=/nixpkgs/trunk/; revision=33815
---
 pkgs/development/interpreters/python/2.7/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 986937376767..439cc82bf3e9 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -172,6 +172,8 @@ let
       deps = [ sqlite ];
     };
 
+    ssl = null;
+
     tkinter = buildInternalPythonModule {
       moduleName = "tkinter";
       deps = [ tcl tk x11 ];

From 62765a92a8a48d60e4bb141582e2c2e911c47cdf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Apr 2012 15:56:14 +0000
Subject: [PATCH 195/293] * Bump nixUnstable.

svn path=/nixpkgs/trunk/; revision=33817
---
 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 a2d1052beae7..f0675398cc39 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre2636_f2467eb";
+  name = "nix-1.0pre2661_9cd3ff1";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/2369138/download/4/${name}.tar.bz2";
-    sha256 = "8af17741f0372657e8e764f11d1d88a5fee6214b9c63dc2a8aef911293c60014";
+    url = "http://hydra.nixos.org/build/2416959/download/4/${name}.tar.bz2";
+    sha256 = "6341b512f3c48477af50d234311e23d889a4333c865bfb4a2c619196e58dd7bd";
   };
 
   buildNativeInputs = [ perl pkgconfig ];

From 969c89aa2f35875766a738de958021778edbef55 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 17 Apr 2012 17:12:56 +0000
Subject: [PATCH 196/293] Update xxdiff

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

diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix
index f4847e1b42d3..1a44cd4bcbf7 100644
--- a/pkgs/development/tools/misc/xxdiff/default.nix
+++ b/pkgs/development/tools/misc/xxdiff/default.nix
@@ -5,8 +5,9 @@ stdenv.mkDerivation {
 
   src = fetchhg {
     name = "xxdiff";
+    tag = "fdc247a7d9e5";
     url = https://hg.furius.ca/public/xxdiff;
-    sha256 = "0ahx80vdf67vq9w0g66dx39y27gvz6v1aybqj9554n6vxvg1zk5n";
+    sha256 = "7ae7d81becc25b1adabc9383bb5b9005dddb31510cdc404ce8a0d6ff6c3dc47e";
   };
 
   buildNativeInputs = [ flex bison qt4 ];

From b8a6e4d2dc51a6d8a018f56cea87eb3d63f5111f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Apr 2012 17:41:57 +0000
Subject: [PATCH 197/293] haskell-cabal-install: added version 0.14.0

svn path=/nixpkgs/trunk/; revision=33819
---
 .../cabal-install/0.14.0.nix                  | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  5 +++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/package-management/cabal-install/0.14.0.nix

diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix
new file mode 100644
index 000000000000..ecbd46de52c2
--- /dev/null
+++ b/pkgs/tools/package-management/cabal-install/0.14.0.nix
@@ -0,0 +1,19 @@
+{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-install";
+  version = "0.14.0";
+  sha256 = "1n2vvlmfgfrj3z4ag5bj278vmdh6fw7xb0ixbxxxcngzd41bbwpl";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    Cabal filepath HTTP mtl network random time zlib
+  ];
+  meta = {
+    homepage = "http://www.haskell.org/cabal/";
+    description = "The command-line interface for Cabal and Hackage";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 57ac9d8f0a67..df43536a8b76 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -157,7 +157,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     transformers = self.transformers_0_2_2_0;   # 7.4.1 ok
     mtl          = self.mtl_2_0_1_0;            # 7.4.1 ok
     random       = self.random_1_0_1_1;         # 7.4.1 ok
-    cabalInstall = self.cabalInstall_0_10_2;    # 7.4.1 fails
+    cabalInstall = self.cabalInstall_0_14_0;    # 7.4.1 ok
     alex         = self.alex_3_0_1;             # 7.4.1 ok
     happy        = self.happy_1_18_9;           # 7.4.1 ok
     haddock      = self.haddock_2_10_0;         # 7.4.1 ok
@@ -1666,7 +1666,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cabalInstall_0_8_0  = callPackage ../tools/package-management/cabal-install/0.8.0.nix  {};
   cabalInstall_0_8_2  = callPackage ../tools/package-management/cabal-install/0.8.2.nix  {};
   cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
-  cabalInstall = self.cabalInstall_0_6_2;
+  cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
+  cabalInstall = self.cabalInstall_0_14_0;
 
   lhs2tex = callPackage ../tools/typesetting/lhs2tex {};
 

From 46ec48923b425a00a8c26ec2d04c9e08e13dcddb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Apr 2012 20:39:09 +0000
Subject: [PATCH 198/293] * Updated Cache::FastMmap etc.

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9e38bbba10d6..5029da590f71 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -213,10 +213,10 @@ rec {
   };
 
   CacheFastMmap = buildPerlPackage rec {
-    name = "Cache-FastMmap-1.39";
+    name = "Cache-FastMmap-1.40";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Cache/${name}.tar.gz";
-      sha256 = "0dq93pz6lqya26pzgpgfa7c7i67h8rg0ylshzmvqzq4brqjpbqsk";
+      sha256 = "0h3ckr04cdn6dvl40m4m97vl5ybf30v1lwhw3jvkr92kpksvq4hd";
     };
   };
 
@@ -478,10 +478,10 @@ rec {
   };
 
   CatalystPluginSession = buildPerlPackage rec {
-    name = "Catalyst-Plugin-Session-0.32";
+    name = "Catalyst-Plugin-Session-0.34";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz";
-      sha256 = "1pyrvwfan3qiaixbii57q4g34r9i1v61c5rfri6c25wryfh4f2bj";
+      sha256 = "0vgm3pjymzxqnjn8cj8ld1wprwj3hq15n26djvjmnx6pwyf2ffgz";
     };
     buildInputs = [ TestMockObject TestDeep ];
     propagatedBuildInputs =
@@ -499,10 +499,10 @@ rec {
   };
 
   CatalystPluginSessionStoreFastMmap = buildPerlPackage rec {
-    name = "Catalyst-Plugin-Session-Store-FastMmap-0.14";
+    name = "Catalyst-Plugin-Session-Store-FastMmap-0.16";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz";
-      sha256 = "1ywm96k1kpw9vbh7ihrxlfnfc5s4frb37cbix7xxlfz2vk10jw0d";
+      sha256 = "0x3j6zv3wr41jlwr6yb2jpmcx019ibyn11y8653ffnwhpzbpzsxs";
     };
     propagatedBuildInputs =
       [ PathClass CatalystPluginSession CacheFastMmap MROCompat ];

From f59b9490ecb20c4d76af9d3a9ad1b46fcd2b9d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Apr 2012 17:22:04 +0000
Subject: [PATCH 199/293] GNU libc: Improve description and name for the Hurd;
 fix `needsPorts'.

svn path=/nixpkgs/trunk/; revision=33833
---
 pkgs/development/libraries/glibc/2.13/common.nix  | 6 ++++--
 pkgs/development/libraries/glibc/2.13/default.nix | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix
index 840c60545524..ca5be5998aaf 100644
--- a/pkgs/development/libraries/glibc/2.13/common.nix
+++ b/pkgs/development/libraries/glibc/2.13/common.nix
@@ -16,7 +16,8 @@ let
 
   needsPortsNative = stdenv.isMips || stdenv.isArm;
   needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
-  needsPorts = if (stdenv ? cross) && stdenv.cross != null then true
+  needsPorts =
+    if (stdenv ? cross) && stdenv.cross != null && hurdHeaders == null then true
     else if cross == null then needsPortsNative
     else needsPortsCross;
 
@@ -181,7 +182,8 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = http://www.gnu.org/software/libc/;
-    description = "The GNU C Library";
+    description = "The GNU C Library"
+      + stdenv.lib.optionalString (hurdHeaders != null) ", for GNU/Hurd";
 
     longDescription =
       '' Any Unix-like operating system needs a C library: the library which
diff --git a/pkgs/development/libraries/glibc/2.13/default.nix b/pkgs/development/libraries/glibc/2.13/default.nix
index 1b4e43b1013a..f80ed9372e63 100644
--- a/pkgs/development/libraries/glibc/2.13/default.nix
+++ b/pkgs/development/libraries/glibc/2.13/default.nix
@@ -14,7 +14,9 @@ let
   cross = if gccCross != null then gccCross.target else null;
 in
   build cross ({
-    name = "glibc${if debugSymbols then "-debug" else ""}";
+    name = "glibc"
+      + stdenv.lib.optionalString (hurdHeaders != null) "-hurd"
+      + stdenv.lib.optionalString debugSymbols "-debug";
 
     inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries
       gccCross;

From 61bb81195ff2b5f2735c84ff8c15eea3aea59eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Apr 2012 17:22:10 +0000
Subject: [PATCH 200/293] GNU Hurd: Restructure for easier overriding, and
 easier avoided rebuilds.

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

diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index ca1c71053e5d..e37867e3bef5 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -40,18 +40,17 @@ stdenv.mkDerivation ({
         then [ "--with-parted" ]
         else [ "--without-parted" ]);
 
-  preConfigure = "autoreconf -vfi";
+  preConfigure =
+    '' autoreconf -vfi
 
-  patchPhase =
-    '' echo "removing \`-o root' from makefiles..."
+       echo "removing \`-o root' from makefiles..."
        for mf in {utils,daemons}/Makefile
        do
          sed -i "$mf" -e's/-o root//g'
        done
     '';
 
-  buildPhase = "make ${buildTarget}";
-  installPhase = "make ${installTarget}";
+  crossAttrs.dontPatchShebangs = true;
 
   meta = {
     description = "The GNU Hurd, GNU project's replacement for the Unix kernel";
@@ -74,6 +73,17 @@ stdenv.mkDerivation ({
 
 //
 
+(if !headersOnly && buildTarget != null
+ then assert installTarget != null; {
+   # Use the default `buildPhase' and `installPhase' so that the usual hooks
+   # can still be used.
+   buildFlags = buildTarget;
+   installTargets = installTarget;
+ }
+ else {})
+
+//
+
 (if headersOnly
  then { buildPhase = ":"; installPhase = "make install-headers"; }
  else (if (cross != null)

From 40675e46bd9d51c42234c516e3238c5f2412c569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Apr 2012 18:42:44 +0000
Subject: [PATCH 201/293] GNU Hurd: Use `preConfigure' to `autoreconf' only.

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

diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index e37867e3bef5..0c9059a30085 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -40,10 +40,12 @@ stdenv.mkDerivation ({
         then [ "--with-parted" ]
         else [ "--without-parted" ]);
 
-  preConfigure =
-    '' autoreconf -vfi
+  # Use `preConfigure' only for `autoreconf', so that users know they can
+  # simply clear it when the autoconf phase is unneeded.
+  preConfigure = "autoreconf -vfi";
 
-       echo "removing \`-o root' from makefiles..."
+  postConfigure =
+    '' echo "removing \`-o root' from makefiles..."
        for mf in {utils,daemons}/Makefile
        do
          sed -i "$mf" -e's/-o root//g'

From 7762bb93eeac0566cd786b2633c0ea50b0c474af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Apr 2012 10:22:03 +0000
Subject: [PATCH 202/293] Updated Haskell packages.

 - cabal-install: added support for version 0.14.0 to GHC 7.0.4, 6.12.3, and 6.10.4
 - crypto-conduit: updated to version 0.3.1
 - haskell-src-exts: updated to version 1.13.2
 - hjsmin: updated to version 0.1.0
 - persistent: updated to version 0.9.0.2
 - wai-extra: updated to version 1.2.0.3
 - wxdirect: updated to version 0.90.0.1
 - yesod-core: updated to version 1.0.1
 - yesod-default: updated to version 1.0.1
 - yesod-form: updated to version 1.0.0.2
 - yesod-routes: updated to version 1.0.1
 - yesod: updated to version 1.0.1

svn path=/nixpkgs/trunk/; revision=33838
---
 .../libraries/haskell/crypto-conduit/default.nix         | 4 ++--
 .../haskell/haskell-src-exts/{1.13.0.nix => 1.13.2.nix}  | 4 ++--
 pkgs/development/libraries/haskell/hjsmin/default.nix    | 6 ++----
 .../development/libraries/haskell/persistent/default.nix | 4 ++--
 pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++--
 .../development/libraries/haskell/wxHaskell/wxdirect.nix | 4 ++--
 .../development/libraries/haskell/yesod-core/default.nix | 4 ++--
 .../libraries/haskell/yesod-default/default.nix          | 4 ++--
 .../development/libraries/haskell/yesod-form/default.nix | 4 ++--
 .../libraries/haskell/yesod-routes/default.nix           | 4 ++--
 pkgs/development/libraries/haskell/yesod/default.nix     | 4 ++--
 pkgs/top-level/haskell-packages.nix                      | 9 +++++++--
 12 files changed, 29 insertions(+), 26 deletions(-)
 rename pkgs/development/libraries/haskell/haskell-src-exts/{1.13.0.nix => 1.13.2.nix} (84%)

diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
index c3bd4be6dbeb..4fa65cb16d90 100644
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-conduit";
-  version = "0.3.0.1";
-  sha256 = "1j7j1ga9in9j9i5gxdkpijarcw7a0y8w0z4sj00d2yzb1qhdalzq";
+  version = "0.3.1";
+  sha256 = "0hb9wkq70bmx54vksj78f0av1byvksjhqlr730cfc5fc6w60kzqk";
   buildDepends = [ cereal conduit cryptoApi transformers ];
   meta = {
     homepage = "https://github.com/meteficha/crypto-conduit";
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix
rename to pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix
index 9f6c69669a0d..108021564a10 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-exts";
-  version = "1.13.0";
-  sha256 = "1kkhv8frvrry9jb38p5xmsqij0wrz88gszz5zcndcmbhkr5d4b64";
+  version = "1.13.2";
+  sha256 = "1vq4qagbypm8lp4dr6zjd6mhgiv096a2cpyfvfs3yq06iqv5x602";
   buildDepends = [ cpphs ];
   buildTools = [ happy ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index a224e846a405..edd5b3afea85 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -2,10 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hjsmin";
-  version = "0.0.16";
-  sha256 = "0svpmhrzhra3yhc1bzwga9d13k4kd8vw6va1q9866pkw385j5jr4";
-  isLibrary = true;
-  isExecutable = true;
+  version = "0.1.0";
+  sha256 = "071aa5xvg4arrmphrr6880kmgjifrglnhiabrc7iv0r5ycgav001";
   buildDepends = [ blazeBuilder languageJavascript text ];
   meta = {
     homepage = "http://github.com/alanz/hjsmin";
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 270e8744ad4a..2ecf9d5fdcb8 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.9.0.1";
-  sha256 = "0qlvlv7rlxs4r5w5hr4vbj1bwjkn3nzpk2w8q52cnn2c37wz24h8";
+  version = "0.9.0.2";
+  sha256 = "0m9m13gyjmzk33da2jd0b4l061n0gg6xj6rrnrnli2n8f70ywlnv";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
     monadControl pathPieces poolConduit resourcet text time
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 877edea7474e..5786b8b7decc 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.2.0.2";
-  sha256 = "0kfbk505nli51h9lx8865gfgcnji7kgxcjfmfdanv1im00ghrq1v";
+  version = "1.2.0.3";
+  sha256 = "0iigswknh5w5zi6r99jks3bppylnw9hca9by2klwr2biw07nf09d";
   buildDepends = [
     ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
     conduit dataDefault fastLogger httpTypes network text time
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
index c37e04282db5..a1caaef1bc9e 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wxdirect";
-  version = "0.90";
-  sha256 = "0vlqvj9sys5d2x9ccpq0yxqbsq060g4jb6xrckjspxb605c98r3r";
+  version = "0.90.0.1";
+  sha256 = "04jslgxw601g6wh8f2wrdnipzh6x0487kfxb89fkgfgjhxrkfyr3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec strict time ];
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 5556212355ab..afc40baa5e71 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.0.0.2";
-  sha256 = "0l6mfgcw0jmm941w7s0df091hm1c1v66p8sc89xjqzcwvdhcnyyd";
+  version = "1.0.1";
+  sha256 = "15i4ysyf6j137aia0mv1kvh7pnmdnj89wgcj70all9v1413rxzgq";
   buildDepends = [
     aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
     conduit cookie failure fastLogger hamlet httpTypes liftedBase
diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix
index b7c7c3cecc26..50896ae3c0ed 100644
--- a/pkgs/development/libraries/haskell/yesod-default/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-default/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-default";
-  version = "1.0.0";
-  sha256 = "1l6x56ky3jf20nvz03jsxs19dvh1rz108gzhgbh86qjhcisaaqvi";
+  version = "1.0.1";
+  sha256 = "1b9qxfs9pbgn090cipnnbd6vf1ajyhs0xjfynkj87k8fx6j2lqb9";
   buildDepends = [
     networkConduit shakespeareCss shakespeareJs text transformers
     unorderedContainers wai waiExtra warp yaml yesodCore
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index c3c8bf78fe1b..99a84fcbe05a 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.0.0.1";
-  sha256 = "072q0sjx88dhpp8qz6lschb8y8hf1n6fqhxan69djaz03jrm164l";
+  version = "1.0.0.2";
+  sha256 = "1jvp0hw9kprwcwdxx1i2aazycf03i1vf8q5vjmdpynhgzyrpkrx1";
   buildDepends = [
     blazeBuilder blazeHtml dataDefault emailValidate hamlet network
     persistent shakespeareCss shakespeareJs text time transformers wai
diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix
index 7037ac029630..adf9ed5f2c64 100644
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-routes";
-  version = "1.0.0";
-  sha256 = "1sqlcawsbv8sz22prcg41dvma6kywyl18dwp7msjlbkxgc2msp3a";
+  version = "1.0.1";
+  sha256 = "12m2j7sl7gr8755xza7k5nlqxl4g7az3vin5vdl8km5aw754761w";
   buildDepends = [ pathPieces text vector ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 5a2d13e296b9..732c89622fa7 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.0.0.2";
-  sha256 = "171a7nbcz48ykdn9sz6gzpnkjhv2n75c8v9gdlp9slbnmbphq94p";
+  version = "1.0.1";
+  sha256 = "0ff72z0ixx5xdd2n6vrn474ga4n5zzr1z566s9wb54lqxd8vrdn0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index df43536a8b76..f446f1fac99a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -210,6 +210,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
       haskellPlatform = self.haskellPlatform_2011_4_0_0;
       mtl1 = self.mtl_1_1_1_1;
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
+      cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
     };
 
   haskellPlatform_2011_4_0_0 =
@@ -252,6 +253,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
       haskellPlatform = self.haskellPlatform_2011_2_0_1;
       mtl1 = self.mtl_1_1_1_1;
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
+      cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
     };
 
   haskellPlatform_2011_2_0_1 =
@@ -294,6 +296,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
       haskellPlatform = self.haskellPlatform_2011_2_0_0;
       mtl1 = self.mtl_1_1_1_1;
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
+      cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
     };
 
   haskellPlatform_2011_2_0_0 =
@@ -332,6 +335,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     self : self.haskellPlatformArgs_2010_2_0_0 self // {
       haskellPlatform = self.haskellPlatform_2010_2_0_0;
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
+      cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
       deepseq = self.deepseq_1_1_0_2;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
     };
@@ -412,6 +416,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
       extensibleExceptions = self.extensibleExceptions_0_1_1_0;
       text = self.text_0_11_0_6;
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
+      cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
       deepseq = self.deepseq_1_1_0_2;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
     };
@@ -797,8 +802,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   haskellSrc = self.haskellSrc_1_0_1_5;
 
   haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {};
-  haskellSrcExts_1_13_0 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.0.nix {};
-  haskellSrcExts = self.haskellSrcExts_1_13_0;
+  haskellSrcExts_1_13_2 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.2.nix {};
+  haskellSrcExts = self.haskellSrcExts_1_13_2;
 
   haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};
 

From 8691ff4ea1ebabdd451138390cddaf0c33225032 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Apr 2012 11:16:36 +0000
Subject: [PATCH 203/293] Updated Haskell packages.

 - certificate: updated to version 1.2.1
 - crypto-api: updated to version 0.10.1
 - crypto-conduit: patched to build crypto-api 0.10.x
 - http-conduit: updated to version 1.4.1.2
 - http-enumerator: deleted obsolete package
 - MonadCatchIO-transformers: updated to version 0.3.0.0
 - pem: updated to version 0.1.1
 - RSA: updated to version 1.2.0.0
 - skein: updated to version 0.1.0.5
 - snap-core: patched to support MonadCatchIO-transformers version 0.3.0.0
 - snap-server: patched to support MonadCatchIO-transformers version 0.3.0.0
 - tagged: updated to version 0.4.2
 - tls-extra: updated to version 0.4.5
 - tls: updated to version 0.9.3
 - yesod-auth: updated to version 1.0.1
 - yesod: updated to version 1.0.1.1

svn path=/nixpkgs/trunk/; revision=33839
---
 .../MonadCatchIO-transformers/default.nix     |  4 +--
 .../libraries/haskell/RSA/default.nix         |  8 +++---
 .../libraries/haskell/certificate/default.nix | 11 +++-----
 .../libraries/haskell/crypto-api/default.nix  |  4 +--
 .../haskell/crypto-conduit/default.nix        |  3 +++
 .../haskell/http-conduit/default.nix          |  4 +--
 .../haskell/http-enumerator/default.nix       | 27 -------------------
 .../libraries/haskell/pem/default.nix         |  4 +--
 .../libraries/haskell/skein/default.nix       |  3 +++
 .../libraries/haskell/snap/core.nix           |  3 +++
 .../libraries/haskell/snap/server.nix         |  3 +++
 .../libraries/haskell/tagged/default.nix      |  9 +++----
 .../libraries/haskell/tls-extra/default.nix   |  4 +--
 .../libraries/haskell/tls/default.nix         |  4 +--
 .../libraries/haskell/yesod-auth/default.nix  |  4 +--
 .../libraries/haskell/yesod/default.nix       |  4 +--
 pkgs/top-level/haskell-packages.nix           |  2 --
 17 files changed, 40 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/http-enumerator/default.nix

diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
index 5ee945d26782..4edd801d08d8 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MonadCatchIO-transformers";
-  version = "0.2.2.3";
-  sha256 = "1qwy9rrmf3kl7rb7v46n81xmrwy4xl63lfnlsiz1qc0hybjkl7m6";
+  version = "0.3.0.0";
+  sha256 = "0v7k6npfr1x9s4bk409y6sc1vhzs5pm4mwpky356z7kdvz2z274c";
   buildDepends = [ extensibleExceptions transformers ];
   meta = {
     description = "Monad-transformer compatible version of the Control.Exception module";
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index 173ddc314952..3f9b37535952 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -1,12 +1,12 @@
-{ cabal, binary, pureMD5, random, SHA }:
+{ cabal, binary, cryptoApi, monadcryptorandom, pureMD5, SHA }:
 
 cabal.mkDerivation (self: {
   pname = "RSA";
-  version = "1.0.6.3";
-  sha256 = "0lk3nsh6nvacv1xzrg2pxxhd5gglmy40dkb8a47c9r9px0q6yjpj";
+  version = "1.2.0.0";
+  sha256 = "0x4wa0yq4k43ccdakqcmy0mxvdlvrkfg6kc1j2hv7hh8b4vjisms";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ binary pureMD5 random SHA ];
+  buildDepends = [ binary cryptoApi monadcryptorandom pureMD5 SHA ];
   meta = {
     description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
index e885c39cb05f..7e77aa41f5e8 100644
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ b/pkgs/development/libraries/haskell/certificate/default.nix
@@ -1,15 +1,12 @@
-{ cabal, asn1Data, base64Bytestring, cryptoPubkeyTypes, mtl, time
-}:
+{ cabal, asn1Data, cryptoPubkeyTypes, mtl, pem, time }:
 
 cabal.mkDerivation (self: {
   pname = "certificate";
-  version = "1.1.1";
-  sha256 = "1n9sj69haqsiny1zn1lb09q86ga4ccypbdbkxsk5bzv10ygkk7d9";
+  version = "1.2.1";
+  sha256 = "0lhw38jqkiw7dwckwcqwmsi9br1insb5dp8wajcpgas6xn6cy2qy";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [
-    asn1Data base64Bytestring cryptoPubkeyTypes mtl time
-  ];
+  buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-certificate";
     description = "Certificates and Key Reader/Writer";
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
index 51b827c9e252..742da01b464c 100644
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-api";
-  version = "0.9";
-  sha256 = "11372brnpiqdm6fdfp95wyyl8nvhbagnq0q2bdhn4xsskpnp4hnp";
+  version = "0.10.1";
+  sha256 = "1l73c9pik6109frzyrxh8kpdsfpa9wf6ijnd8zfbnhmk5pn6jaww";
   buildDepends = [ cereal entropy largeword tagged ];
   meta = {
     homepage = "http://trac.haskell.org/crypto-api/wiki";
diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
index 4fa65cb16d90..8ef4c9408f51 100644
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
@@ -5,6 +5,9 @@ cabal.mkDerivation (self: {
   version = "0.3.1";
   sha256 = "0hb9wkq70bmx54vksj78f0av1byvksjhqlr730cfc5fc6w60kzqk";
   buildDepends = [ cereal conduit cryptoApi transformers ];
+  patchPhase = ''
+    sed -i -e 's|crypto-api >= 0.9 && < 0.10|crypto-api|' crypto-conduit.cabal
+  '';
   meta = {
     homepage = "https://github.com/meteficha/crypto-conduit";
     description = "Conduit interface for cryptographic operations (from crypto-api)";
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 50a7188cbad9..d4c6e27fa3dc 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.4.1";
-  sha256 = "1jv5nk2h17hf2fp1r6ych9grnlx2hsclxgn10d5f1vx21xbd0hkl";
+  version = "1.4.1.2";
+  sha256 = "1ji7pdqrzhzlmy2ig21s8fcfcqa29lc9k56l29zkw9qqgdaq5x3s";
   buildDepends = [
     asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
     blazeBuilderConduit caseInsensitive certificate conduit cookie
diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix
deleted file mode 100644
index 1104794be20a..000000000000
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ cabal, asn1Data, attoparsec, attoparsecEnumerator
-, base64Bytestring, blazeBuilder, blazeBuilderEnumerator
-, caseInsensitive, certificate, cprngAes, dataDefault, enumerator
-, failure, httpTypes, monadControl, network, tls, tlsExtra
-, transformers, utf8String, zlibEnum
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-enumerator";
-  version = "0.7.3.2";
-  sha256 = "1djr41fc8blpmwcj3ckix0xnc0kfasbmkx82wpzrq23h54jrbdjl";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    asn1Data attoparsec attoparsecEnumerator base64Bytestring
-    blazeBuilder blazeBuilderEnumerator caseInsensitive certificate
-    cprngAes dataDefault enumerator failure httpTypes monadControl
-    network tls tlsExtra transformers utf8String zlibEnum
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/http-enumerator";
-    description = "HTTP client package with enumerator interface and HTTPS support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix
index 35d8a49c2c83..ff9b91fe0dac 100644
--- a/pkgs/development/libraries/haskell/pem/default.nix
+++ b/pkgs/development/libraries/haskell/pem/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pem";
-  version = "0.1.0";
-  sha256 = "0qhkmxfhzpzg3ycdzr4b7zzf84vmhbqv2irh95ymmdbr0cc5hhn9";
+  version = "0.1.1";
+  sha256 = "0klb39w6mihx35xgdw5wvi1q6r61xgrsqvcqi4c5r6psv5z94cil";
   buildDepends = [ attoparsec base64Bytestring cereal mtl ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-pem";
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index a1123c793f3c..9d2a13b11a32 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -5,6 +5,9 @@ cabal.mkDerivation (self: {
   version = "0.1.0.5";
   sha256 = "12hyyydznss802v4pwfcpjr0y7241114a9z82xxq60q8dval8fyb";
   buildDepends = [ cereal cryptoApi tagged ];
+  patchPhase = ''
+    sed -i -e 's|tagged  *>= 0.2 && < 0.3|tagged|' -e 's|crypto-api  *>= 0.6 && < 0.10|crypto-api|' skein.cabal
+  '';
   meta = {
     description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index 21d95eca679b..c9352d812766 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     MonadCatchIOTransformers mtl mwcRandom regexPosix text time
     transformers unixCompat unorderedContainers vector zlibEnum
   ];
+  patchPhase = ''
+    sed -i -e 's|MonadCatchIO-transformers >= 0.2.1 && < 0.3|MonadCatchIO-transformers|' snap-core.cabal
+  '';
   meta = {
     homepage = "http://snapframework.com/";
     description = "Snap: A Haskell Web Framework (core interfaces and types)";
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index 028d8175861d..731903f3cfab 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     PSQueue snapCore text time transformers unixCompat vector
     vectorAlgorithms
   ];
+  patchPhase = ''
+    sed -i -e 's|MonadCatchIO-transformers >= 0.2.1    && < 0.3|MonadCatchIO-transformers|' snap-server.cabal
+  '';
   meta = {
     homepage = "http://snapframework.com/";
     description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index 07d671ac33da..2611c988d593 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -1,13 +1,12 @@
-{ cabal, dataDefault, semigroups }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "tagged";
-  version = "0.2.3.1";
-  sha256 = "0ldc9w35yzlrz78kakkqial32g2c7da9b5v334jh5wpgsn7lrm3n";
-  buildDepends = [ dataDefault semigroups ];
+  version = "0.4.2";
+  sha256 = "16c2006b7f87003z6vz13fisw18iiqncjqk9x0f4wwzj6i70wgbw";
   meta = {
     homepage = "http://github.com/ekmett/tagged";
-    description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments";
+    description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index 98bbcdde1625..d3fd7241340e 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls-extra";
-  version = "0.4.4";
-  sha256 = "1yj4v140pgvgpjv1g8h3dv00k983vjnsvdgc6y4w8ij8s4jvfbay";
+  version = "0.4.5";
+  sha256 = "0pra0ah086y214hs4zvgkv3p4g6iara27im7x7z1djbj96ikah8a";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 765d9621224b..4337165fbbf8 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "0.9.2";
-  sha256 = "0qhgf3lxclcjgvnqz6zc41l4s6fzlwpg96jdp6n7q8snn4mdfn5s";
+  version = "0.9.3";
+  sha256 = "172aq99w8zdr52b2gjqg2sfcd9412wbh4cpayzc3ck2j8wfdlzp5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 9671fc2583a8..d05d4620c574 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.0.0";
-  sha256 = "1wdzz6xy55430xgaibzqwij1c4yswkz3da22n2016xl5nyspaijl";
+  version = "1.0.1";
+  sha256 = "0rbpf2fldpd46dbcd77zryb91gh3q86k5xdb07clsy384qx7ynq6";
   buildDepends = [
     aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail
     persistent persistentTemplate pureMD5 pwstoreFast random SHA
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 732c89622fa7..ff8318e1fa77 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.0.1";
-  sha256 = "0ff72z0ixx5xdd2n6vrn474ga4n5zzr1z566s9wb54lqxd8vrdn0";
+  version = "1.0.1.1";
+  sha256 = "17dg6n37hdyizw3g5jqsg08ax31ilm4nlsvvsiaf6ywr7q0wrylz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f446f1fac99a..00b60bf5ef67 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -904,8 +904,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   httpDate = callPackage ../development/libraries/haskell/http-date {};
 
-  httpEnumerator = callPackage ../development/libraries/haskell/http-enumerator {};
-
   httpTypes = callPackage ../development/libraries/haskell/http-types {};
 
   HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {};

From e12f48b3a1605d33fc2e15a59fe12816aa251756 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Apr 2012 15:11:41 +0000
Subject: [PATCH 204/293] haskell-Graphalyze: updated to version 0.13.0.0

svn path=/nixpkgs/trunk/; revision=33840
---
 .../libraries/haskell/Graphalyze/default.nix        | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix
index cdd071b2b675..5ba5d1c7a104 100644
--- a/pkgs/development/libraries/haskell/Graphalyze/default.nix
+++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix
@@ -1,17 +1,14 @@
-{ cabal, bktrees, extensibleExceptions, fgl, graphviz, pandoc
-, random, text, time
+{ cabal, bktrees, fgl, filepath, graphviz, pandoc, random, text
+, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "Graphalyze";
-  version = "0.12.0.0";
-  sha256 = "0lsbwf08flaifdddbg6d3ndrb2d1wzs943hk7n0m316bvahq6kgx";
+  version = "0.13.0.0";
+  sha256 = "1xh6xg2rw43cbi83rmpb0c2yib9cfj0pwg66nx5x5a0al2c9pdsr";
   buildDepends = [
-    bktrees extensibleExceptions fgl graphviz pandoc random text time
+    bktrees fgl filepath graphviz pandoc random text time
   ];
-  patchPhase = ''
-    sed -i Graphalyze.cabal -e 's|pandoc == 1.8.\*|pandoc|'
-  '';
   meta = {
     description = "Graph-Theoretic Analysis library";
     license = "unknown";

From 08f798736bf7d2aec78c386ae2be7c897b7d7865 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Apr 2012 15:11:50 +0000
Subject: [PATCH 205/293] haskell-graphviz: updated to version 2999.13.0.1

svn path=/nixpkgs/trunk/; revision=33841
---
 .../libraries/haskell/graphviz/default.nix          | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index 224cff2124a0..97470ebae251 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -1,16 +1,13 @@
-{ cabal, colour, dlist, extensibleExceptions, fgl, filepath
-, polyparse, text, transformers, wlPprintText
+{ cabal, colour, dlist, fgl, filepath, polyparse, text
+, transformers, wlPprintText
 }:
 
 cabal.mkDerivation (self: {
   pname = "graphviz";
-  version = "2999.12.0.4";
-  sha256 = "02yg5c02k3sdrcq5srzpdvlzs6cnrns67576qzr8n7ynhpvard73";
-  isLibrary = true;
-  isExecutable = true;
+  version = "2999.13.0.1";
+  sha256 = "1x6pbcixlqbxcg3dsl9z1f5r0qax2p967z0csqb27am812knakky";
   buildDepends = [
-    colour dlist extensibleExceptions fgl filepath polyparse text
-    transformers wlPprintText
+    colour dlist fgl filepath polyparse text transformers wlPprintText
   ];
   meta = {
     homepage = "http://projects.haskell.org/graphviz/";

From ee29e0bc9f6347c8e0ee96bfc5a9f667e68ed92b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Apr 2012 15:11:55 +0000
Subject: [PATCH 206/293] haskell-monadcryptorandom: updated to version 0.4.1

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

diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
index 6a7c4d6fde5e..c1901f470fd3 100644
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monadcryptorandom";
-  version = "0.4";
-  sha256 = "1wxqffi5x8kv0qrx82bvpvlqzzwy8vrw5ybqvf2h6cln36ff23m6";
+  version = "0.4.1";
+  sha256 = "01x3zfr4m93bgx062rhxqk1d8qhn6s7rkfkm4yf00p89fclyjsg1";
   buildDepends = [ cryptoApi mtl transformers ];
   meta = {
     homepage = "http://trac.haskell.org/crypto-api/wiki";

From c5c473b469191c6c49a35932a7633f960b7bc7c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Apr 2012 15:11:58 +0000
Subject: [PATCH 207/293] haskell-SourceGraph: updated to version 0.7.0.2

svn path=/nixpkgs/trunk/; revision=33843
---
 .../tools/haskell/SourceGraph/default.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix
index 80714727741b..731722126ca1 100644
--- a/pkgs/development/tools/haskell/SourceGraph/default.nix
+++ b/pkgs/development/tools/haskell/SourceGraph/default.nix
@@ -1,16 +1,16 @@
-{ cabal, Cabal, extensibleExceptions, fgl, filepath, Graphalyze
-, graphviz, haskellSrcExts, mtl, multiset, random
+{ cabal, Cabal, fgl, filepath, Graphalyze, graphviz, haskellSrcExts
+, mtl, multiset, random
 }:
 
 cabal.mkDerivation (self: {
   pname = "SourceGraph";
-  version = "0.7.0.1";
-  sha256 = "0f6h240a72cxa65cwjrp34cx80c6frzhgl9dpv3krc8xzhxssk78";
+  version = "0.7.0.2";
+  sha256 = "0cdspzsz15r83fjry9467z67h6vvnjh31fip6gf64k74gdjkfisl";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    Cabal extensibleExceptions fgl filepath Graphalyze graphviz
-    haskellSrcExts mtl multiset random
+    Cabal fgl filepath Graphalyze graphviz haskellSrcExts mtl multiset
+    random
   ];
   meta = {
     description = "Static code analysis using graph-theoretic techniques";

From 6a01fe514e44e8a4cf53f87e80d77d1733fb5386 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Apr 2012 15:15:39 +0000
Subject: [PATCH 208/293] * Fix PAM.  It accidentally lost xcrypt support in
 r33798.

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

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index d7d4f1a43d49..c18ea2b1f2b4 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [ flex ];
   buildInputs = [ cracklib ]
     ++ stdenv.lib.optional
-      (stdenv.isArm && stdenv.system != "mips64el-linux")
+      (!stdenv.isArm && stdenv.system != "mips64el-linux")
       libxcrypt;
 
   crossAttrs = {

From 4b414f89ed4db9d2b401390c0ed67884ea891e49 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Apr 2012 16:49:35 +0000
Subject: [PATCH 209/293] * e2fsprogs updated to 1.42.2.

svn path=/nixpkgs/trunk/; revision=33846
---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 0e0ec13aaeb3..6cc767d3e248 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.42";
+  name = "e2fsprogs-1.42.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "0ijabrxxmmna4y4wmy7d002nrzq1ifl98i71bl7fpqn3rsq6vd2m";
+    sha256 = "1gmq3h4hp4hz1zh8yznx9nb0p7yaykb52f7zkpsqbhjawg2zwdhx";
   };
 
   buildInputs = [ pkgconfig libuuid ];

From f92ee1a13dbd0cd2067ffc6650d2f4c899eb6ab9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Apr 2012 18:39:58 +0000
Subject: [PATCH 210/293] * QEMU/KVM 1.0.1.  Will make this the default if it
 looks stable.

svn path=/nixpkgs/trunk/; revision=33847
---
 pkgs/os-specific/linux/qemu-kvm/1.0.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/qemu-kvm/1.0.nix b/pkgs/os-specific/linux/qemu-kvm/1.0.nix
index 162fcaee55a6..dd12e79bd69c 100644
--- a/pkgs/os-specific/linux/qemu-kvm/1.0.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/1.0.nix
@@ -3,16 +3,18 @@
 
 assert stdenv.isLinux;
 
-let version = "1.0"; in
+let version = "1.0.1"; in
+
 stdenv.mkDerivation rec {
   name = "qemu-kvm-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz";
-    sha256 = "0vhigv9r9yrhph4wc4mhg99a683iwf121kjigqzg92x2l3ayl4dp";
+    sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p";
   };
 
   patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ];
+
   postPatch =
     '' for i in $(find kvm -type f)
        do

From 9aa30ba705eb19a9f0aeaf775d58baff3ef1deb5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Apr 2012 18:44:02 +0000
Subject: [PATCH 211/293] * Pass -cpu kvm64 to keep GMP from barfing.

svn path=/nixpkgs/trunk/; revision=33848
---
 pkgs/build-support/vm/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 2f8afb1f3889..b2fd4db4e75f 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -211,7 +211,8 @@ rec {
 
 
   qemuCommandLinux = ''
-    ${kvm}/bin/qemu-system-x86_64 \
+    ${kvm}/bin/qemu-kvm \
+      ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
       -nographic -no-reboot \
       -net nic,model=virtio \
       -chardev socket,id=samba,path=./samba \
@@ -407,7 +408,7 @@ rec {
     
   qemuCommandGeneric = ''
     PATH="${samba}/sbin:$PATH" \
-    ${kvm}/bin/qemu-system-x86_64 \
+    ${kvm}/bin/qemu-kvm \
       -nographic -no-reboot \
       -smb $(pwd) -hda $diskImage \
       $QEMU_OPTS

From e24547ab88075aad3dbbb86631558cdeb5fa69f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Apr 2012 21:40:07 +0000
Subject: [PATCH 212/293] * libvirt updated to 0.9.11.

svn path=/nixpkgs/trunk/; revision=33850
---
 pkgs/development/libraries/libarchive/default.nix | 10 +++++-----
 pkgs/development/libraries/libvirt/default.nix    | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 36e345043e3c..fc554dcd8756 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -1,5 +1,5 @@
-{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs
-, sharutils}:
+{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs
+, sharutils }:
 
 stdenv.mkDerivation rec {
   name = "libarchive-2.8.3";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a";
   };
 
-  propagatedBuildInputs = [libxml2 zlib bzip2 openssl] ++
-    (if stdenv.isLinux then [e2fsprogs attr acl] else []);
+  propagatedBuildInputs = [ libxml2 zlib bzip2 openssl ] ++
+    stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ];
 
-  buildInputs = [sharutils];
+  buildInputs = [ sharutils ];
 
   meta = {
     description = "A library for reading and writing streaming archives";
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 2e7e4a57e9f8..aee034c25daa 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
 , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext 
-, libtasn1, ebtables, libgcrypt
+, libtasn1, ebtables, libgcrypt, yajl
 }:
 
-let version = "0.9.7"; in
+let version = "0.9.11"; in
 
 stdenv.mkDerivation {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    sha256 = "08xg0pfjqfia37xby9187ycsxkrxaz99w9rcq206cz8pwnzhbzr9";
+    sha256 = "0qk0fsc5rxwwjp7801vdanmw61p89xqiy6q279i0kqc3bx1zx66f";
   };
 
   buildInputs =
     [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
-      utillinux udev libpciaccess gettext libtasn1 libgcrypt
+      utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl
     ];
 
   preConfigure =
@@ -34,6 +34,8 @@ stdenv.mkDerivation {
         --replace "$out/bin" "${gettext}/bin"
     '';
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://libvirt.org/;
     description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes)";

From e9226f1ca65ed4a63ec26d527834b82c754950f0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 20 Apr 2012 04:31:17 +0000
Subject: [PATCH 213/293] Add a needed dependency

svn path=/nixpkgs/trunk/; revision=33851
---
 pkgs/applications/virtualization/virt-viewer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index b11016ae65d3..51ef6c5b39ef 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , gnome, gtk, glib, libxml2, pkgconfig, libvirt, gtkvnc, cyrus_sasl, libtasn1
-  , gnupg, libgcrypt, perl, nettle
+  , gnupg, libgcrypt, perl, nettle, yajl
   , ...}:
 builderDefsPackage
 (a :  

From c05f314f7fbf568df0e6f8a0d9ef7083b7efb61f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Apr 2012 09:57:42 +0000
Subject: [PATCH 214/293] Updated Haskell packages.

 - authenticate: updated to version 1.2.1
 - blaze-builder-enumerator: updated to version 0.2.0.4
 - graphviz: updated to version 2999.13.0.2
 - tls: updated to version 0.9.4

svn path=/nixpkgs/trunk/; revision=33853
---
 pkgs/development/libraries/haskell/authenticate/default.nix   | 4 ++--
 .../libraries/haskell/blaze-builder-enumerator/default.nix    | 4 ++--
 pkgs/development/libraries/haskell/graphviz/default.nix       | 4 ++--
 pkgs/development/libraries/haskell/tls/default.nix            | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index 50df0746c560..9512e2bce8e1 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "1.2.0.1";
-  sha256 = "1wyqkam1wgcg5rg4vjh3rlyffhiw7hmx5wshhg9hi2vqpgz0rs65";
+  version = "1.2.1";
+  sha256 = "0ifx24129ahq1rb2601n4736w5j257w10wcym5m9kp0jjb4p7s83";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
     conduit httpConduit httpTypes monadControl network resourcet
diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
index f8c639588608..a953d9f45258 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder-enumerator";
-  version = "0.2.0.3";
-  sha256 = "00a9rly27sh49gi5askg7z3ji8ig9llxk4qcznsag01d1z0kb97n";
+  version = "0.2.0.4";
+  sha256 = "1zwp9hcjsmy5p5i436ajvl86zl1z4pzcfp6c57sj8vfr08rrrkq9";
   buildDepends = [ blazeBuilder enumerator transformers ];
   meta = {
     homepage = "https://github.com/meiersi/blaze-builder-enumerator";
diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index 97470ebae251..fe6e811b902a 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "graphviz";
-  version = "2999.13.0.1";
-  sha256 = "1x6pbcixlqbxcg3dsl9z1f5r0qax2p967z0csqb27am812knakky";
+  version = "2999.13.0.2";
+  sha256 = "17b95zi8j7mnzrp3kybyfyqqpcdhbf0mdrk0sfnw3qp8fbyfrw1i";
   buildDepends = [
     colour dlist fgl filepath polyparse text transformers wlPprintText
   ];
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 4337165fbbf8..279751fdbdf1 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "0.9.3";
-  sha256 = "172aq99w8zdr52b2gjqg2sfcd9412wbh4cpayzc3ck2j8wfdlzp5";
+  version = "0.9.4";
+  sha256 = "1yvarwd3cbagg14pk6fj3r1jhvrwnbz042fdxvw9jjrdz9khy0wc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From cbbf85d83970ade6ccfcdf5c960e8ebaaf5ccb05 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Apr 2012 11:35:13 +0000
Subject: [PATCH 215/293] haskell-tls-extra: updated to version 0.4.6

svn path=/nixpkgs/trunk/; revision=33854
---
 .../libraries/haskell/tls-extra/default.nix            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index d3fd7241340e..349c4e057543 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -1,16 +1,16 @@
 { cabal, certificate, cryptoApi, cryptocipher, cryptohash, mtl
-, network, text, time, tls, vector
+, network, pem, text, time, tls, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "tls-extra";
-  version = "0.4.5";
-  sha256 = "0pra0ah086y214hs4zvgkv3p4g6iara27im7x7z1djbj96ikah8a";
+  version = "0.4.6";
+  sha256 = "1xl55i4nr7kyc3qxi8zmq18m0xhlwlrx9fwkck22krshqgq2i6nn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    certificate cryptoApi cryptocipher cryptohash mtl network text time
-    tls vector
+    certificate cryptoApi cryptocipher cryptohash mtl network pem text
+    time tls vector
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-tls-extra";

From 6242869b9d0ae20818d5f72d9b7bb8d80e759da2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Apr 2012 11:35:17 +0000
Subject: [PATCH 216/293] haskell-edit-distance: added version 0.2.1

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

diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix
new file mode 100644
index 000000000000..07744765adba
--- /dev/null
+++ b/pkgs/development/libraries/haskell/edit-distance/default.nix
@@ -0,0 +1,17 @@
+{ cabal, random }:
+
+cabal.mkDerivation (self: {
+  pname = "edit-distance";
+  version = "0.2.1";
+  sha256 = "1zhiyzgqmxi4mn7zn5q6rg03hgff9y5f9xizbs00069v7ncygi38";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ random ];
+  meta = {
+    homepage = "http://github.com/batterseapower/edit-distance";
+    description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 00b60bf5ef67..5359966c9b8a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -639,6 +639,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dstring = callPackage ../development/libraries/haskell/dstring {};
 
+  editDistance = callPackage ../development/libraries/haskell/edit-distance {};
+
   editline = callPackage ../development/libraries/haskell/editline {};
 
   emailValidate = callPackage ../development/libraries/haskell/email-validate {};

From 4fc0e49bdd235d74ed71afe3331aa6a75246a37b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Apr 2012 11:35:20 +0000
Subject: [PATCH 217/293] git-annex: updated to version 3.20120418

svn path=/nixpkgs/trunk/; revision=33856
---
 .../version-management/git-and-tools/default.nix           | 2 +-
 .../version-management/git-and-tools/git-annex/default.nix | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 034d0254c633..6d69c9f8131e 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -46,7 +46,7 @@ rec {
     inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils;
     inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc
       HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse
-      QuickCheck2 bloomfilter;
+      QuickCheck2 bloomfilter editDistance;
   };
 
   qgit = import ./qgit {
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 1e4ee72e3ffa..af5927fd5985 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
 , ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
 , QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
-, IfElse, bloomfilter
+, IfElse, bloomfilter, editDistance
 }:
 
 let
-  version = "3.20120406";
+  version = "3.20120418";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
-    sha256 = "486b35a8dd342681cea6544af9668330739f3a8d40d4a70b9d56f64195f96954";
+    sha256 = "7e429009006ee00f33224b18392433b5b5e0df92c7c62153415a2cea909144e0";
     name = "git-annex-${version}.tar.gz";
   };
 
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
     curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
     libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
     rsync SHA testpack utf8String which liftedBase IfElse bloomfilter
+    editDistance
   ];
 
   checkTarget = "test";

From 8915da0a6bf2edd453ea7f0cd10d2b932428ae88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Fri, 20 Apr 2012 12:22:23 +0000
Subject: [PATCH 218/293] New GHC snapshots.

svn path=/nixpkgs/trunk/; revision=33858
---
 pkgs/development/compilers/ghc/7.4.2.nix | 45 ++++++++++++++++++++++++
 pkgs/development/compilers/ghc/head.nix  |  6 ++--
 pkgs/top-level/all-packages.nix          |  9 ++++-
 3 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/compilers/ghc/7.4.2.nix

diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
new file mode 100644
index 000000000000..567e6c75def5
--- /dev/null
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -0,0 +1,45 @@
+{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
+
+stdenv.mkDerivation rec {
+  version = "7.4.1.20120412";
+
+  name = "ghc-${version}";
+
+  src = fetchurl {
+    url = "http://haskell.org/ghc/dist/stable/dist/${name}-src.tar.bz2";
+    sha256 = "0hpzd51s5nvlsjk3wza45ji5v6m0szqjzch45fvv7wfzllrm595l";
+  };
+
+  buildInputs = [ghc perl gmp ncurses] ++
+    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+  '';
+
+  preConfigure = ''
+    echo "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '';
+
+  configureFlags=[
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags=["-S" "--keep-file-symbols"];
+
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    maintainers = [
+      stdenv.lib.maintainers.marcweber
+      stdenv.lib.maintainers.andres
+      stdenv.lib.maintainers.simons
+    ];
+    platforms = ghc.meta.platforms;
+  };
+
+}
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 0a08cc3a4e70..8d495a092c16 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
 
 stdenv.mkDerivation rec {
-  version = "7.4.0.20120126";
+  version = "7.5.20120413";
 
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://haskell.org/ghc/dist/7.4.1-rc2/${name}-src.tar.bz2";
-    sha256 = "0arnvzhwjzk2z3m2891b4z13p4v1c84f31jgyj13a1fbfpylgs64";
+    url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
+    sha256 = "0mvpdibdvbanpia8lngrw6pinn1jm867mjcz55zj5nv8wqhgfs7r";
   };
 
   buildInputs = [ghc perl gmp ncurses] ++
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7f2438208a5..c80694ff6ef9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2307,12 +2307,19 @@ let
         (if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
         (x : x.ghc741Prefs) false false lowPrio);
 
+  # Stable branch snapshot.
+  haskellPackages_ghc742 =
+    recurseIntoAttrs
+      (haskellPackagesFun ../development/compilers/ghc/7.4.2.nix
+        (if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
+        (x : x.ghcHEADPrefs) false false lowPrio);
+
   # Reasonably current HEAD snapshot. Should *always* be lowPrio.
   haskellPackages_ghcHEAD =
     recurseIntoAttrs
       (haskellPackagesFun ../development/compilers/ghc/head.nix
         # (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ]))
-        (if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
+        ghc704Binary
         (x : x.ghcHEADPrefs) false false lowPrio);
 
   haxeDist = import ../development/compilers/haxe {

From b5c67150cfb1e45042b02ccfe13ecd65222d5df8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Apr 2012 12:50:37 +0000
Subject: [PATCH 219/293] Updated Haskell packages.

 - blaze-html: updated to version 0.4.3.4
 - gloss: updated to version 1.7.3.1
 - hashtables: updated to version 1.0.1.4
 - repa: updated to version 3.1.2.1
 - skein: updated to version 0.1.0.6

svn path=/nixpkgs/trunk/; revision=33859
---
 pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++--
 pkgs/development/libraries/haskell/gloss/default.nix      | 4 ++--
 pkgs/development/libraries/haskell/hashtables/default.nix | 4 ++--
 pkgs/development/libraries/haskell/repa/default.nix       | 4 ++--
 pkgs/development/libraries/haskell/skein/default.nix      | 7 ++-----
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index e4772a1f51cf..e3ec5167f367 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.4.3.3";
-  sha256 = "0a3g4s4k85h2qvs2kcalv83ma4z5arqdydla64q5d1qlk9c99mzg";
+  version = "0.4.3.4";
+  sha256 = "1xd8l28rriczd5zxgmjif393kjzqibrp68pfah0kknrjmc3ybn20";
   buildDepends = [ blazeBuilder text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 0e41ecd756a5..c8b8f65bd29c 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.7.2.1";
-  sha256 = "1s8xq39xnynsslzrzm7svv8qd301j66zcz9ckcs4f1zwzpq62z0p";
+  version = "1.7.3.1";
+  sha256 = "0vylil8jsj7mb14dijrx2ylmsgs1ma3rh2nmiaakr5cmpp4xshf0";
   buildDepends = [ bmp GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix
index a091d972a45f..d6852e7f81b0 100644
--- a/pkgs/development/libraries/haskell/hashtables/default.nix
+++ b/pkgs/development/libraries/haskell/hashtables/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hashtables";
-  version = "1.0.1.3";
-  sha256 = "1ad8psza13ff15sd4s862sryw6z8msiys1f7frnp4sibgr6bwdca";
+  version = "1.0.1.4";
+  sha256 = "1s1xj5x90dz9n85bkmjpdp8zwnvvv13m19aaxzi63n3iyn4jki33";
   buildDepends = [ hashable primitive vector ];
   meta = {
     homepage = "http://github.com/gregorycollins/hashtables";
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index 2584107dc36e..ae65e52168f1 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa";
-  version = "3.1.1.1";
-  sha256 = "0r78xd8caqpjvf1wxlv9mp13n5as8k98j76sni6wyrj2i55sx7ls";
+  version = "3.1.2.1";
+  sha256 = "15g2l8f5d02jy63ljyvjdd2ymdml072bjylsxvn4xmr0jzmi689x";
   buildDepends = [ QuickCheck vector ];
   meta = {
     homepage = "http://repa.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 9d2a13b11a32..a066e7d67d0a 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -2,12 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "0.1.0.5";
-  sha256 = "12hyyydznss802v4pwfcpjr0y7241114a9z82xxq60q8dval8fyb";
+  version = "0.1.0.6";
+  sha256 = "041qg0vy5h5xd0142chbmkhmqxbglrb7x0ybcalrxr7dawxksm8d";
   buildDepends = [ cereal cryptoApi tagged ];
-  patchPhase = ''
-    sed -i -e 's|tagged  *>= 0.2 && < 0.3|tagged|' -e 's|crypto-api  *>= 0.6 && < 0.10|crypto-api|' skein.cabal
-  '';
   meta = {
     description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
     license = self.stdenv.lib.licenses.bsd3;

From 8e510f1888294d5aa10f6e8c49521183f3ec6671 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 20 Apr 2012 13:45:49 +0000
Subject: [PATCH 220/293] Update scala to 2.9.2

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

diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index f50c15a3a0b8..340076cc1378 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -3,11 +3,11 @@
 # at runtime, need jre or jdk
 
 stdenv.mkDerivation rec {
-  name = "scala-2.8.1";
+  name = "scala-2.9.2";
 
   src = fetchurl {
-    url = "http://www.scala-lang.org/downloads/distrib/files/${name}.final.tgz";
-    sha256 = "0lf76fclvd5l2as3gvzx9jc1b9narx4j046111bmbkcwqw7iw8bl";
+    url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tgz";
+    sha256 = "0s1shpzw2hyz7bwxdqq19rcrzbpq4d7b0kvdvjvhy7h05x496b46";
   };
 
   installPhase = ''

From 8ee3bc82ee57e0f04daecf21ffbb061270251e07 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Apr 2012 20:15:29 +0000
Subject: [PATCH 221/293] haskell-Graphalyze: removed myself from the list of
 maintainers

svn path=/nixpkgs/trunk/; revision=33862
---
 pkgs/development/libraries/haskell/Graphalyze/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix
index 5ba5d1c7a104..f6b46061c6a0 100644
--- a/pkgs/development/libraries/haskell/Graphalyze/default.nix
+++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix
@@ -15,7 +15,6 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = [
       self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
     ];
   };
 })

From f412a1fbe74e24d962aa6ebdd077d87ad02c0e12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Apr 2012 20:17:07 +0000
Subject: [PATCH 222/293]  development/compilers/ghc/head.nix: fixed sha256
 hash

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

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 8d495a092c16..0b62d6c74ad1 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "0mvpdibdvbanpia8lngrw6pinn1jm867mjcz55zj5nv8wqhgfs7r";
+    sha256 = "a111054715133d12fc35d1565f371e149677416af9131e6a47ffdb0354e8a87f";
   };
 
   buildInputs = [ghc perl gmp ncurses] ++

From 34b058dcce87b5b988926f519d690c69c966139d Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Fri, 20 Apr 2012 20:37:54 +0000
Subject: [PATCH 223/293] Upgrading qjackctl from 0.3.7 to 0.3.8, fixes a bug
 where it crashes when jack is stopped

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

diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 4cdea1a21ce3..01fa24a065e0 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.7";
+  version = "0.3.8";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "1gynym21d8d4d38qyl817qg0v8360brcpga4wcdapccbgpaz3c28";
+    sha256 = "1rbipbknq7f8qfma33vwfv2ar3vxkz1p1ykp5mx6nirmcn1nj247";
   };
 
   buildInputs = [ qt4 alsaLib jackaudio dbus ];

From 45ac14621a382b4f88c7a16d335ede216d7b43fc Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Fri, 20 Apr 2012 20:39:42 +0000
Subject: [PATCH 224/293] Adding LinuxSampler and dependencies, using SVN
 version for SFZ support

svn path=/nixpkgs/trunk/; revision=33865
---
 pkgs/applications/audio/gigedit/default.nix   | 30 ++++++++++++++
 .../audio/linuxsampler/default.nix            | 40 +++++++++++++++++++
 pkgs/development/libraries/libgig/default.nix | 23 +++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 4 files changed, 99 insertions(+)
 create mode 100644 pkgs/applications/audio/gigedit/default.nix
 create mode 100644 pkgs/applications/audio/linuxsampler/default.nix
 create mode 100644 pkgs/development/libraries/libgig/default.nix

diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
new file mode 100644
index 000000000000..be6970f01e16
--- /dev/null
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45
+, docbook_xsl, gtkmm, intltool, libgig, libsndfile, libtool, libxslt
+, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "gigedit-svn-${version}";
+  version = "2342";
+
+  src = fetchsvn {
+    url = "https://svn.linuxsampler.org/svn/gigedit/trunk";
+    rev = "${version}";
+    sha256 = "0wi94gymj0ns5ck9lq1d970gb4gnzrq4b57j5j7k3d6185yg2gjs";
+  };
+
+  patchPhase = "sed -e 's/which/type -P/g' -i Makefile.cvs";
+
+  preConfigure = "make -f Makefile.cvs";
+
+  buildInputs = [ 
+    autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm intltool
+    libgig libsndfile libtool libxslt pkgconfig 
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.linuxsampler.org;
+    description = "Gigasampler file access library";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
new file mode 100644
index 000000000000..a100390c2708
--- /dev/null
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
+, jackaudio, libgig, libsndfile, libtool , pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "linuxsampler-svn-${version}";
+  version = "2340";
+
+  src = fetchsvn {
+    url = "https://svn.linuxsampler.org/svn/linuxsampler/trunk";
+    rev = "${version}";
+    sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7";
+  };
+
+  patchPhase = "sed -e 's/which/type -P/g' -i scripts/generate_parser.sh";
+
+  preConfigure = "make -f Makefile.cvs";
+
+  buildInputs = [ 
+   alsaLib asio autoconf automake bison jackaudio libgig libsndfile
+   libtool pkgconfig 
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.linuxsampler.org;
+    description = "Sampler backend";
+    longDescription = ''
+      Includes sampler engine, audio and MIDI drivers, network layer
+      (LSCP) API and native C++ API.
+
+      LinuxSampler is licensed under the GNU GPL with the exception
+      that USAGE of the source code, libraries and applications FOR
+      COMMERCIAL HARDWARE OR SOFTWARE PRODUCTS IS NOT ALLOWED without
+      prior written permission by the LinuxSampler authors. If you
+      have questions on the subject, that are not yet covered by the
+      FAQ, please contact us.
+    ''; 
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix
new file mode 100644
index 000000000000..6129ef42f3dc
--- /dev/null
+++ b/pkgs/development/libraries/libgig/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchsvn, autoconf, automake, libsndfile, libtool, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libgig-svn-${version}";
+  version = "2334";
+
+  src = fetchsvn {
+    url = "https://svn.linuxsampler.org/svn/libgig/trunk";
+    rev = "${version}";
+    sha256 = "0i7sj3zm6banl5avjdxblx0mlbxxzbsbr4x5hsl2fhrdsv5dnxhc";
+  };
+
+  buildInputs = [ autoconf automake libsndfile libtool pkgconfig ];
+
+  preConfigure = "make -f Makefile.cvs";
+
+  meta = with stdenv.lib; {
+    homepage = http://www.linuxsampler.org;
+    description = "Gigasampler file access library";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c80694ff6ef9..8128fb85c388 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4025,6 +4025,8 @@ let
   libgdata = (newScope gnome) ../development/libraries/libgdata {};
   libgdata_0_6 = (newScope gnome) ../development/libraries/libgdata/0.6.nix {};
 
+  libgig = callPackage ../development/libraries/libgig { };
+
   libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
   libgnome_keyring3 = callPackage ../development/libraries/libgnome-keyring/3.x.nix { };
 
@@ -6879,6 +6881,8 @@ let
 
   geeqie = callPackage ../applications/graphics/geeqie { };
 
+  gigedit = callPackage ../applications/audio/gigedit { };
+
   gqview = callPackage ../applications/graphics/gqview { };
 
   gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk {
@@ -7049,6 +7053,8 @@ let
     inherit (gnome) libglade;
   };
 
+  linuxsampler = callPackage ../applications/audio/linuxsampler { };
+
   lmms = callPackage ../applications/audio/lmms { };
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };

From 68f07e270afc05b38fb6234f3e12ae860f76f71b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Apr 2012 22:37:30 +0000
Subject: [PATCH 225/293] magit: updated to version 1.1.1

svn path=/nixpkgs/trunk/; revision=33866
---
 pkgs/applications/editors/emacs-modes/magit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index 1af31c2ba5cc..f096d3b0057d 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, emacs, texinfo }:
 
 let
-  version = "1.1.0";
+  version = "1.1.1";
 in
 stdenv.mkDerivation {
   name = "magit-${version}";
 
   src = fetchurl {
     url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz";
-    sha256 = "8e147e1f2e69938232f859daf712515b46aa367d7b7d90b42538e083f52a72b4";
+    sha256 = "0zp5qxippmalin2fr73w2alf2w7ilcahmybzdvgn4ch2s3dgvzcz";
   };
 
   buildInputs = [emacs texinfo];

From 6264f9cd91e895c63bb898c232e00a8e14461a33 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Fri, 20 Apr 2012 22:44:50 +0000
Subject: [PATCH 226/293] Adding qsampler, the frontend for LinuxSampler

svn path=/nixpkgs/trunk/; revision=33867
---
 pkgs/applications/audio/qsampler/default.nix  | 24 +++++++++++++++++++
 .../development/libraries/liblscp/default.nix | 23 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 3 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/audio/qsampler/default.nix
 create mode 100644 pkgs/development/libraries/liblscp/default.nix

diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
new file mode 100644
index 000000000000..7cfe73c9c750
--- /dev/null
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchsvn, autoconf, automake, liblscp, libtool, pkgconfig
+, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "qsampler-svn-${version}";
+  version = "2342";
+
+  src = fetchsvn {
+    url = "https://svn.linuxsampler.org/svn/qsampler/trunk";
+    rev = "${version}";
+    sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx";
+  };
+
+  buildInputs = [ autoconf automake liblscp libtool pkgconfig qt4 ];
+
+  preConfigure = "make -f Makefile.svn";
+
+  meta = with stdenv.lib; {
+    homepage = http://www.linuxsampler.org;
+    description = "graphical frontend to LinuxSampler";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix
new file mode 100644
index 000000000000..33731e5d7557
--- /dev/null
+++ b/pkgs/development/libraries/liblscp/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchsvn, autoconf, automake, libtool, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "liblscp-svn-${version}";
+  version = "2319";
+
+  src = fetchsvn {
+    url = "https://svn.linuxsampler.org/svn/liblscp/trunk";
+    rev = "${version}";
+    sha256 = "0jgdy9gi9n8x2pqrbll9158vhx8293lnxv8vzl0szcincslgk7hi";
+  };
+
+  buildInputs = [ autoconf automake libtool pkgconfig ];
+
+  preConfigure = "make -f Makefile.svn";
+
+  meta = with stdenv.lib; {
+    homepage = http://www.linuxsampler.org;
+    description = "LinuxSampler Control Protocol (LSCP) wrapper library";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8128fb85c388..54988e0f90ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4038,6 +4038,8 @@ let
 
   liblrdf = callPackage ../development/libraries/liblrdf {};
 
+  liblscp = callPackage ../development/libraries/liblscp { };
+
   libev = builderDefsPackage ../development/libraries/libev {
   };
 
@@ -7309,6 +7311,8 @@ let
 
   qemuImage = callPackage ../applications/virtualization/qemu/linux-img { };
 
+  qsampler = callPackage ../applications/audio/qsampler { };
+
   qsynth = callPackage ../applications/audio/qsynth { };
 
   qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };

From 81db13ca1682278268c3297a3e3cb4cd73bfede1 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sat, 21 Apr 2012 04:04:06 +0000
Subject: [PATCH 227/293] Eigen hash does not match.  I wonder whether upstream
 replaced it?

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

diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 771ae0dff5e5..6884aca16fcb 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
     name = "eigen-${v}.tar.bz2";
-    sha256 = "04lzlhl7r1yqkpq9xabm1v5vgz0z9xqf1k7indgwdw8nfyma3qar";
+    sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0";
   };
   
   buildNativeInputs = [ cmake ];

From 0842337d804d7651578c10551ba802cefb25d315 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sat, 21 Apr 2012 04:21:25 +0000
Subject: [PATCH 228/293] The hash for qhull has changed too.

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

diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix
index b9d9c19a10d8..6d15ce576ff8 100644
--- a/pkgs/development/libraries/qhull/default.nix
+++ b/pkgs/development/libraries/qhull/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/download/${name}-src.tgz";
-    sha256 = "19hb10vs7ww45ifn7mpvxykn470gd1g568d84mlld6v4pnz7gamv";
+    sha256 = "127zpjp6sm8c101hz239k82lpxqcqf4ksdyfqc2py2sm22kclpm3";
   };
 
   buildNativeInputs = [ cmake ];

From 2eb8304fcf01045af1e09b02a078a9ba4e86b714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 21 Apr 2012 15:04:46 +0000
Subject: [PATCH 229/293] Adding ntop. It runs for me, if using "-P directory".

svn path=/nixpkgs/trunk/; revision=33870
---
 pkgs/tools/networking/ntop/default.nix | 29 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/networking/ntop/default.nix

diff --git a/pkgs/tools/networking/ntop/default.nix b/pkgs/tools/networking/ntop/default.nix
new file mode 100644
index 000000000000..945effabcfbd
--- /dev/null
+++ b/pkgs/tools/networking/ntop/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, autoconf, automake, libtool, wget, libpcap, gdbm, zlib, openssl, rrdtool
+, python, geoip }:
+
+stdenv.mkDerivation rec {
+  name = "ntop-4.1.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ntop/${name}.tar.gz";
+    sha256 = "19440gnswnqwvkbzpay9hzmnfnhbyc2ifpl2jri8dhcyhxima7n7";
+  };
+
+  preConfigure = ''
+    ./autogen.sh
+    cp ${libtool}/share/aclocal/libtool.m4 libtool.m4.in
+  '';
+
+  buildNativeInputs = [ autoconf automake libtool wget libpcap gdbm zlib openssl rrdtool
+    python geoip ];
+
+  meta = {
+    description = "Traffic analysis with NetFlow and sFlow support";
+
+    license = "GLPv3+";
+
+    homepage = http://www.ntop.org/products/ntop/;
+
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54988e0f90ca..1d77961c7864 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1109,6 +1109,8 @@ let
   # ntfsprogs are merged into ntfs-3g
   ntfsprogs = pkgs.ntfs3g;
 
+  ntop = callPackage ../tools/networking/ntop { };
+
   ntp = callPackage ../tools/networking/ntp { };
 
   nssmdns = callPackage ../tools/networking/nss-mdns { };

From 1097d768016d94096a109c7c55c9025ea7a43d49 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sat, 21 Apr 2012 20:23:00 +0000
Subject: [PATCH 230/293] Fix download URL for Perl Graph package.

svn path=/nixpkgs/trunk/; revision=33871
---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5029da590f71..bfd90c4cf5c1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1597,7 +1597,7 @@ rec {
   Graph = buildPerlPackage rec {
     name = "Graph-0.94";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JH/JHI/modules/${name}.tar.gz";
+      url = "mirror://cpan/authors/id/J/JH/JHI/${name}.tar.gz";
       sha256 = "1lyfl9s4mkhahnpxk2z5v6j750jqb4sls56b9rnkl5lni9ms7xgn";
     };
 

From 819a05bfae94b284ad9428ea17f08bea287989c7 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sat, 21 Apr 2012 22:36:15 +0000
Subject: [PATCH 231/293] Update mysql 5.5 to 5.5.23 and fix no longer
 responding URL.

svn path=/nixpkgs/trunk/; revision=33872
---
 pkgs/servers/sql/mysql55/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix
index df390e4abf2e..f105b4daaf6a 100644
--- a/pkgs/servers/sql/mysql55/default.nix
+++ b/pkgs/servers/sql/mysql55/default.nix
@@ -3,11 +3,11 @@
 # Note: zlib is not required; MySQL can use an internal zlib.
 
 stdenv.mkDerivation {
-  name = "mysql-5.5.20";
+  name = "mysql-5.5.23";
 
   src = fetchurl {
-    url = ftp://mirror.leaseweb.com/mysql/Downloads/MySQL-5.5/mysql-5.5.20.tar.gz;
-    sha256 = "03jl60mzrsd1jb8fvkz6c8j2239b37k8n1i07jk1q4yk58aq8ynh";
+    url = ftp://ftp.inria.fr/pub/MySQL/Downloads/MySQL-5.5/mysql-5.5.23.tar.gz;
+    sha256 = "0sklcz6miff7nb6bi1pqncgjv819255y7if6jxcqgiqs50z319i0";
   };
 
   buildInputs = [ cmake bison ncurses openssl readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwinInstallNameToolUtility perl ];

From 2dbe2887edb561a66273449c45a8920e849d6153 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sun, 22 Apr 2012 00:25:20 +0000
Subject: [PATCH 232/293] Fix build of dvdauthor; also advance version to 0.7.0

svn path=/nixpkgs/trunk/; revision=33873
---
 .../dvdauthor/build-against-libpng15.patch    | 27 +++++++++++++++++++
 pkgs/applications/video/dvdauthor/default.nix | 13 +++++----
 2 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/video/dvdauthor/build-against-libpng15.patch

diff --git a/pkgs/applications/video/dvdauthor/build-against-libpng15.patch b/pkgs/applications/video/dvdauthor/build-against-libpng15.patch
new file mode 100644
index 000000000000..8e62cef35af0
--- /dev/null
+++ b/pkgs/applications/video/dvdauthor/build-against-libpng15.patch
@@ -0,0 +1,27 @@
+commit c82aaa4eb1a1c36bf7e2b7ae3c9140d0bf8000b5
+Author: Lawrence D'Oliveiro <ldo@geek-central.gen.nz>
+Date:   Wed Jan 26 00:48:37 2011 +0000
+
+    fix to build against png-1.5 (thanks to Thomas Klausner)
+
+diff --git a/src/spuunmux.c b/src/spuunmux.c
+index 5e565d1..9ad2371 100644
+--- a/src/spuunmux.c
++++ b/src/spuunmux.c
+@@ -39,6 +39,7 @@
+ #include <netinet/in.h>
+ 
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "rgb.h"
+ #include "common.h"
+@@ -610,7 +611,7 @@ static int write_png
+         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+         return -1;
+       } /*if*/
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+       {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         fclose(fp);
diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix
index 8c64721bc7e5..c72e9b892dba 100644
--- a/pkgs/applications/video/dvdauthor/default.nix
+++ b/pkgs/applications/video/dvdauthor/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng }:
+{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib }:
 
 stdenv.mkDerivation {
-  name = "dvdauthor-0.6.14";
+  name = "dvdauthor-0.7.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/dvdauthor/dvdauthor-0.6.14.tar.gz;
-    sha256 = "1x4flj3ja7m8rbc956a6ha3qk0k6zxd1y6sl826r6r7dyc91a6yx";
+    url = mirror://sourceforge/dvdauthor/dvdauthor-0.7.0.tar.gz;
+    sha256 = "1l1l5zya7lirwa1783pa7h22wrfcq8hibbf5kpx8z8zbk5xsz9mf";
   };
 
-  buildInputs = [ imagemagick libdvdread libxml2 freetype fribidi libpng ];
+  buildInputs = [ imagemagick libdvdread libxml2 freetype fribidi libpng zlib ];
+
+  # Does not build against recent versions of libpng without patch.
+  patches = [ ./build-against-libpng15.patch ];
 
   meta = { 
     description = "Tools for generating DVD files to be played on standalone DVD players";

From e81f9de12174e3a681ab5d1b63cf618afca1625b Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sun, 22 Apr 2012 05:31:22 +0000
Subject: [PATCH 233/293] Advance wesnoth version to 1.10.2; fixes old version
 failing build.

svn path=/nixpkgs/trunk/; revision=33874
---
 pkgs/games/wesnoth/default.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index f9f1ddebc1d8..e8ba8e7b7490 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,34 +1,34 @@
-{ stdenv, fetchurl, automake, autoconf, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango
+{ stdenv, fetchurl, cmake, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango
 , gettext, zlib, boost, freetype, libpng, pkgconfig, lua, dbus, fontconfig, libtool
 , fribidi, asciidoc }:
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.8.6";
+  version = "1.10.2";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "10c01ys846zsy831gprdy2nx3qlzv65s4jy99lw6misak3x07rjg";
+    sha256 = "0hawzq85sq0kdddj0s7y6kpx043g1hsl7cvyw1xcxqh45hkgw2ix";
   };
 
   buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
-                  automake autoconf freetype libpng pkgconfig lua dbus fontconfig libtool ];
+                  cmake freetype libpng pkgconfig lua dbus fontconfig libtool ];
 
   # The preInstall sed substitution fix errors which I
   # believe arise from autotools version mismatches.  Rather than
   # hunt for the correct automake and autoconf versions these changes
   # make the build work with the versions current in Nixpkgs.
-  preInstall = ''
-    sed -i -e s,@MKINSTALLDIRS@,`pwd`/config/mkinstalldirs, po/*/Makefile
-  '';
+#  preInstall = ''
+#    sed -i -e s,@MKINSTALLDIRS@,`pwd`/config/mkinstalldirs, po/*/Makefile
+#  '';
 
-  configurePhase = ''
-    ./autogen.sh --prefix=$out --with-boost=${boost} \
-                 --with-preferences-dir=.${pname} \
-                 --with-datadir-name=${pname}
-  '';
+#  configurePhase = ''
+#    ./autogen.sh --prefix=$out --with-boost=${boost} \
+#                 --with-preferences-dir=.${pname} \
+#                 --with-datadir-name=${pname}
+#  '';
 
   # Make the package build with the gcc currently available in Nixpkgs.
   NIX_CFLAGS_COMPILE = "-Wno-ignored-qualifiers";

From 72ed8688039995f0b2cdd01c962de9ded6466d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 22 Apr 2012 10:44:53 +0000
Subject: [PATCH 234/293] GnuTLS: Allow builds on non-Linux-based OSes.

svn path=/nixpkgs/trunk/; revision=33876
---
 pkgs/development/libraries/gnutls/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 26555b9c3c79..4bd0dfdc5291 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ nettle libtasn1 ];
 
-  doCheck = true;
+  # XXX: Disable tests on non-Linux because of the `mini-loss-time' hack
+  # below, which is Linux-specific.
+  doCheck = stdenv.isLinux;
 
   postCheck =
     # Kill a process that's left behind.

From d0300a2776dd4f9255d7a880fea4a100780c96db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 22 Apr 2012 16:30:27 +0000
Subject: [PATCH 235/293] * Switch to QEMU/KVM 1.0.1.

svn path=/nixpkgs/trunk/; revision=33878
---
 pkgs/os-specific/linux/qemu-kvm/1.0.nix     | 53 ---------------------
 pkgs/os-specific/linux/qemu-kvm/default.nix | 23 ++++++---
 pkgs/top-level/all-packages.nix             |  1 -
 3 files changed, 16 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/qemu-kvm/1.0.nix

diff --git a/pkgs/os-specific/linux/qemu-kvm/1.0.nix b/pkgs/os-specific/linux/qemu-kvm/1.0.nix
deleted file mode 100644
index dd12e79bd69c..000000000000
--- a/pkgs/os-specific/linux/qemu-kvm/1.0.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
-, libjpeg, libpng, ncurses, python, glib }:
-
-assert stdenv.isLinux;
-
-let version = "1.0.1"; in
-
-stdenv.mkDerivation rec {
-  name = "qemu-kvm-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz";
-    sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p";
-  };
-
-  patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ];
-
-  postPatch =
-    '' for i in $(find kvm -type f)
-       do
-         sed -i "$i" \
-             -e 's|/bin/bash|/bin/sh|g ;
-                 s|/usr/bin/python|${python}/bin/python|g ;
-                 s|/bin/rm|rm|g'
-       done
-    '';
-
-  configureFlags =
-    [ "--audio-drv-list=alsa"
-      "--smbd=smbd"                               # use `smbd' from $PATH
-    ];
-
-  enableParallelBuilding = true;
-
-  buildInputs =
-    [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
-      ncurses python glib
-    ];
-
-  postInstall =
-    ''
-      # Libvirt expects us to be called `qemu-kvm'.  Otherwise it will
-      # set the domain type to "qemu" rather than "kvm", which can
-      # cause architecture selection to misbehave.
-      ln -sv $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm
-    '';
-
-  meta = {
-    homepage = http://www.linux-kvm.org/;
-    description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index c5c7e0b01f0a..dd12e79bd69c 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -3,16 +3,28 @@
 
 assert stdenv.isLinux;
 
+let version = "1.0.1"; in
+
 stdenv.mkDerivation rec {
-  name = "qemu-kvm-0.15.1";
+  name = "qemu-kvm-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/kvm/${name}.tar.gz";
-    sha256 = "0gkk96yid3nq8i4z8xbiarj0r9v7b2zavf5mnh0rc7kclzxa7mmf";
+    url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz";
+    sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p";
   };
 
   patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ];
 
+  postPatch =
+    '' for i in $(find kvm -type f)
+       do
+         sed -i "$i" \
+             -e 's|/bin/bash|/bin/sh|g ;
+                 s|/usr/bin/python|${python}/bin/python|g ;
+                 s|/bin/rm|rm|g'
+       done
+    '';
+
   configureFlags =
     [ "--audio-drv-list=alsa"
       "--smbd=smbd"                               # use `smbd' from $PATH
@@ -27,13 +39,10 @@ stdenv.mkDerivation rec {
 
   postInstall =
     ''
-      # extboot.bin isn't installed due to a bug in the Makefile.
-      cp pc-bios/optionrom/extboot.bin $out/share/qemu/
-
       # Libvirt expects us to be called `qemu-kvm'.  Otherwise it will
       # set the domain type to "qemu" rather than "kvm", which can
       # cause architecture selection to misbehave.
-      ln -s $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm
+      ln -sv $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm
     '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d77961c7864..139197e152eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5998,7 +5998,6 @@ let
   pwdutils = callPackage ../os-specific/linux/pwdutils { };
 
   qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { };
-  qemu_kvm_1_0 = callPackage ../os-specific/linux/qemu-kvm/1.0.nix { };
 
   firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };
 

From 1a355ca2ea4dbfae0354f9ec989b747632d03c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 22 Apr 2012 16:31:21 +0000
Subject: [PATCH 236/293] Updated the GHC HEAD snapshot.

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

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 0b62d6c74ad1..c578c15c5fd9 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
 
 stdenv.mkDerivation rec {
-  version = "7.5.20120413";
+  version = "7.5.20120419";
 
   name = "ghc-${version}";
 
   src = fetchurl {
     url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "a111054715133d12fc35d1565f371e149677416af9131e6a47ffdb0354e8a87f";
+    sha256 = "0fwq2s3syk3l4xx0m8x6h67snldlf3qk9bjjkvx46sgr0q3xjd05";
   };
 
   buildInputs = [ghc perl gmp ncurses] ++

From bf3b6be1573c63ea18f007f511deadd1be36829a Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 22 Apr 2012 16:55:12 +0000
Subject: [PATCH 237/293] Adding Piano Booster, a MIDI file player that teaches
 you how to play the piano.

svn path=/nixpkgs/trunk/; revision=33880
---
 .../audio/pianobooster/default.nix            | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/audio/pianobooster/default.nix

diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
new file mode 100644
index 000000000000..d5cdffbed952
--- /dev/null
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, alsaLib, cmake, qt4 }:
+
+stdenv.mkDerivation  rec {
+  name = "pianobooster-${version}";
+  version = "0.6.4b";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/pianobooster/pianobooster-src-0.6.4b.tar.gz";
+    sha256 = "1xwyap0288xcl0ihjv52vv4ijsjl0yq67scc509aia4plmlm6l35";
+  };
+
+  preConfigure = "cd src";
+
+  buildInputs = [ alsaLib cmake qt4 ];
+
+  meta = with stdenv.lib; {
+    description = "A MIDI file player that teaches you how to play the piano";
+    homepage = http://pianobooster.sourceforge.net;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 139197e152eb..0268553b49f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7257,6 +7257,8 @@ let
 
   pdftk = callPackage ../tools/typesetting/pdftk { };
 
+  pianobooster = callPackage ../applications/audio/pianobooster { };
+
   pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
     openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null;
     gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null;

From 75692dfc1e9af219cb887734e80a4a51b4633acc Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sun, 22 Apr 2012 18:56:30 +0000
Subject: [PATCH 238/293] Remove some commented out instructions.

svn path=/nixpkgs/trunk/; revision=33881
---
 pkgs/games/wesnoth/default.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index e8ba8e7b7490..2bac3cba198b 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -16,20 +16,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
                   cmake freetype libpng pkgconfig lua dbus fontconfig libtool ];
 
-  # The preInstall sed substitution fix errors which I
-  # believe arise from autotools version mismatches.  Rather than
-  # hunt for the correct automake and autoconf versions these changes
-  # make the build work with the versions current in Nixpkgs.
-#  preInstall = ''
-#    sed -i -e s,@MKINSTALLDIRS@,`pwd`/config/mkinstalldirs, po/*/Makefile
-#  '';
-
-#  configurePhase = ''
-#    ./autogen.sh --prefix=$out --with-boost=${boost} \
-#                 --with-preferences-dir=.${pname} \
-#                 --with-datadir-name=${pname}
-#  '';
-
   # Make the package build with the gcc currently available in Nixpkgs.
   NIX_CFLAGS_COMPILE = "-Wno-ignored-qualifiers";
 

From 50cab85e88ca3272179e6bf1f5e9927b2b5ec411 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sun, 22 Apr 2012 20:39:43 +0000
Subject: [PATCH 239/293] Fix mlton build: apply Marc Weber patch and update
 download URL.

svn path=/nixpkgs/trunk/; revision=33882
---
 pkgs/development/compilers/mlton/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index c7217f820a7f..770a6b17b158 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -5,18 +5,18 @@ stdenv.mkDerivation rec {
 
   binSrc =
     if stdenv.system == "i686-linux" then (fetchurl {
-      url = "http://mlton.org/pages/Download/attachments/${name}-1.x86-linux.static.tgz";
+      url = "http://sourceforge.net/projects/mlton/files/mlton/20100608/${name}-1.x86-linux.static.tgz";
       sha256 = "16qg8df9hg2pmnsblkgxp6bgm7334rsqkxqzskv5fl21wivmnwfw";
     })
     else if stdenv.system == "x86_64-linux" then (fetchurl {
-        url = "http://mlton.org/pages/Download/attachments/${name}-1.amd64-linux.static.tgz";
+        url = "http://sourceforge.net/projects/mlton/files/mlton/20100608/${name}-1.amd64-linux.static.tgz";
         sha256 = "0i6ic8f6prl0cigrmf6bj9kqz3plzappxn17lz1rg2v832nfbw9r";
     })
     else throw "Architecture not supported";
 
   codeSrc =
     fetchurl {
-      url = "http://mlton.org/pages/Download/attachments/${name}.src.tgz";
+      url = "http://sourceforge.net/projects/mlton/files/mlton/20100608/${name}.src.tgz";
       sha256 = "0cqb3k6ld9965hyyfyayi510f205vqzd5qqm3crh13nasvq2rjzj";
     };
 
@@ -30,9 +30,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     # Fix paths in the source.
-    for f in $(find $(pwd) -type f ) ; do
-      substituteInPlace $f --replace '/usr/bin/env bash' $(type -p bash)
-    done
+    find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@"
 
     substituteInPlace $(pwd)/Makefile --replace '/bin/cp' $(type -p cp)
 

From 50a0b839af5ca49075d268b93e4a94473ff4cfff Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 23 Apr 2012 00:12:47 +0000
Subject: [PATCH 240/293] Linux 3.3.3

This incorporates the btrfs fix, so remove that patch. Also, I will test
that this builds after committing, and fix it if it fails

svn path=/nixpkgs/trunk/; revision=33885
---
 .../linux/kernel/btrfs-enospc.patch           | 21 -------------------
 pkgs/os-specific/linux/kernel/linux-3.3.nix   |  4 ++--
 pkgs/os-specific/linux/kernel/patches.nix     |  5 -----
 pkgs/top-level/all-packages.nix               |  1 -
 4 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/btrfs-enospc.patch

diff --git a/pkgs/os-specific/linux/kernel/btrfs-enospc.patch b/pkgs/os-specific/linux/kernel/btrfs-enospc.patch
deleted file mode 100644
index aebe285227de..000000000000
--- a/pkgs/os-specific/linux/kernel/btrfs-enospc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Revert of http://git.kernel.org/?p=linux/kernel/git/mason/linux-btrfs.git;a=commit;h=5500cdbe14d7435e04f66ff3cfb8ecd8b8e44ebf
-
-Btrfs mailing list where this patch comes from:
-http://article.gmane.org/gmane.comp.file-systems.btrfs/16650
-
-This change caused early ENOSPC, and should be integrated to some linux 3.3, but it is still
-not there. That's what #btrfs people say.
-
-diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
-index dc083f5..079e5a1 100644
---- a/fs/btrfs/extent-tree.c
-+++ b/fs/btrfs/extent-tree.c
-@@ -4108,7 +4108,7 @@ static u64 calc_global_metadata_size(struct btrfs_fs_info *fs_info)
- 	num_bytes += div64_u64(data_used + meta_used, 50);
- 
- 	if (num_bytes * 3 > meta_used)
--		num_bytes = div64_u64(meta_used, 3) * 2;
-+		num_bytes = div64_u64(meta_used, 3);
- 
- 	return ALIGN(num_bytes, fs_info->extent_root->leafsize << 10);
- }
diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix
index 58038cb9203d..94e2d9e0dc64 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix
@@ -233,7 +233,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.3.2";
+    version = "3.3.3";
     testing = false;
 
     preConfigure = ''
@@ -242,7 +242,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "19paxvcs3bj32j5fp4ibx963la30p0331w7zvg3zcwmx0ml9pn9y";
+      sha256 = "1i0wxn40iwv4pl3azqq1dhzxi0sxfk4na3lrl9n8k5aip74yqyfb";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 9d4a6d001c4a..75f6473b57ba 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -359,9 +359,4 @@ rec {
       name = "guruplug-arch-number";
       patch = ./guruplug-mach-type.patch;
     };
-
-  btrfs_enospc =
-    { name = "btrfs-enospc-3.3-revert";
-      patch = ./btrfs-enospc.patch;
-    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0268553b49f9..ef93ea826c00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5736,7 +5736,6 @@ let
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs3_3
         kernelPatches.efi_bootstub_config_3_3
-        kernelPatches.btrfs_enospc
       ];
   };
 

From f9a88de275ae75a55f0b43293d7c11237638dc60 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 23 Apr 2012 04:25:18 +0000
Subject: [PATCH 241/293] VirtualBox 4.1.12

svn path=/nixpkgs/trunk/; revision=33888
---
 .../virtualization/virtualbox/default.nix         |  4 ++--
 .../virtualbox/guest-additions/default.nix        | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 350b73e339f5..a2a8cff84d2f 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 
-let version = "4.1.10"; in
+let version = "4.1.12"; in
 
 stdenv.mkDerivation {
   name = "virtualbox-${version}-${kernel.version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "1gsp3arp79x6gmh403sayh4lzr3l8fc3anp664fyl1dl0ykgmqs7";
+    sha256 = "00hx7cl8n4qdmipxxx8a96x8yw6yim9bz3fjbyzcrs8yls0r2jsf";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index f9adf6132f5d..a11e4ee8218e 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
 , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
 
-let version = "4.1.0"; in
+let version = "4.1.12"; in
 
 stdenv.mkDerivation {
   name = "VirtualBox-GuestAdditions-${version}";
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "0azj08l0457cjl5v2ddgb5kz8gblsi7cgjgdmyiszvlqpyfbh98w";
+    sha256 = "0if2q188zf608p1dkq6pd46dafhslqcxmfpmarypbd68k7fi7kkx";
   };
   KERN_DIR = "${kernel}/lib/modules/*/build";
   buildInputs = [ patchelf cdrkit makeWrapper ];
@@ -98,16 +98,13 @@ stdenv.mkDerivation {
     # Install desktop file
     mkdir -p $out/share/autostart
     cp -v share/VBoxGuestAdditions/vboxclient.desktop $out/share/autostart
-    
-    # Install HAL FDI file
-    mkdir -p $out/share/hal/fdi/policy
-    install -m 644 share/VBoxGuestAdditions/90-vboxguest.fdi $out/share/hal/fdi/policy
-    
+
     # Install Xorg drivers
     mkdir -p $out/lib/xorg/modules/{drivers,input}
     install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
-    install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so
-    
+    # There doesn't appear to be a vboxmouse driver for Xorg 1.9. Was there ever?
+#    install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so
+
     # Install kernel modules
     cd src
     

From f1135ba5455336742adf473a422085b69ef688b8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Apr 2012 09:34:01 +0000
Subject: [PATCH 242/293] Updated Haskell packages.

 - alternative-io: updated to version 0.0.1
 - blaze-markup: added version 0.5.1.0
 - crypto-conduit: updated to version 0.3.2
 - cryptohash: updated to version 0.7.5
 - darcs: updated to version 2.8.0
 - filestore: updated to version 0.4.2
 - Graphalyze: cosmetic change
 - hamlet: updated to version 1.0.1.1
 - happstack-hamlet: updated to version 7.0.1
 - happstack-server: updated to version 7.0.1
 - HFuse: updated to version 0.2.4.1
 - Hipmunk: updated to version 5.2.0.8
 - language-javascript: updated to version 0.5.2
 - libmpd: updated to version 0.8.0
 - lifted-base: updated to version 0.1.0.4
 - monad-control: updated to version 0.3.1.2
 - persistent: updated to version 0.9.0.3
 - regex-compat: use latest version when building with GHC 7.4.1
 - skein: updated to version 0.1.0.7
 - snap-core: updated to version 0.8.1
 - snap-server: updated to version 0.8.1.1
 - tls: updated to version 0.9.5
 - vty: updated to version 4.7.0.12
 - wai-app-static: updated to version 1.2.0.2
 - yesod-core: updated to version 1.0.1.1

svn path=/nixpkgs/trunk/; revision=33889
---
 .../version-management/darcs/default.nix        |  9 +++++----
 .../libraries/haskell/Graphalyze/default.nix    |  4 +---
 .../libraries/haskell/Hipmunk/default.nix       |  4 ++--
 .../haskell/alternative-io/default.nix          |  6 +++---
 .../libraries/haskell/blaze-markup/default.nix  | 15 +++++++++++++++
 .../haskell/crypto-conduit/default.nix          |  7 ++-----
 .../libraries/haskell/cryptohash/default.nix    |  4 ++--
 .../libraries/haskell/filestore/default.nix     | 14 ++++++++++----
 .../libraries/haskell/hamlet/default.nix        |  4 ++--
 .../haskell/happstack/happstack-hamlet.nix      |  7 ++-----
 .../haskell/happstack/happstack-server.nix      | 12 ++++++------
 .../libraries/haskell/hfuse/default.nix         |  6 +++---
 .../haskell/language-javascript/default.nix     |  4 ++--
 .../libraries/haskell/libmpd/default.nix        | 10 ++++------
 .../libraries/haskell/lifted-base/default.nix   |  4 ++--
 .../libraries/haskell/monad-control/0.2.0.3.nix | 15 ---------------
 .../libraries/haskell/monad-control/0.3.1.nix   | 17 -----------------
 .../monad-control/{0.3.1.1.nix => default.nix}  |  4 ++--
 .../libraries/haskell/persistent/default.nix    |  4 ++--
 .../libraries/haskell/skein/default.nix         |  5 +++--
 .../development/libraries/haskell/snap/core.nix |  7 ++-----
 .../libraries/haskell/snap/server.nix           |  7 ++-----
 .../libraries/haskell/tls/default.nix           |  4 ++--
 .../libraries/haskell/vty/default.nix           |  4 ++--
 .../haskell/wai-app-static/default.nix          |  4 ++--
 .../libraries/haskell/yesod-core/default.nix    |  4 ++--
 pkgs/top-level/haskell-packages.nix             | 13 +++++--------
 27 files changed, 85 insertions(+), 113 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/blaze-markup/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/monad-control/0.3.1.nix
 rename pkgs/development/libraries/haskell/monad-control/{0.3.1.1.nix => default.nix} (85%)

diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index 60b9309bbdcc..4ce820b78760 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -1,17 +1,18 @@
 { cabal, curl, extensibleExceptions, filepath, hashedStorage
 , haskeline, html, HTTP, mmap, mtl, network, parsec, random
-, regexCompat, tar, terminfo, text, zlib
+, regexCompat, tar, terminfo, text, vector, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "darcs";
-  version = "2.5.2";
-  sha256 = "11mk1xcrxk2x5c0s96s19wb4xvhjl9s59bdqcrj8f4w09zbgjlw9";
+  version = "2.8.0";
+  sha256 = "10yfab7qb20hzikwrgra7zhx7ad2j0s6l7zksmvczf4xm6hw458l";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     extensibleExceptions filepath hashedStorage haskeline html HTTP
-    mmap mtl network parsec random regexCompat tar terminfo text zlib
+    mmap mtl network parsec random regexCompat tar terminfo text vector
+    zlib
   ];
   extraLibraries = [ curl ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix
index f6b46061c6a0..d0258fd26988 100644
--- a/pkgs/development/libraries/haskell/Graphalyze/default.nix
+++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix
@@ -13,8 +13,6 @@ cabal.mkDerivation (self: {
     description = "Graph-Theoretic Analysis library";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index b5fbeb126a5b..d6c3b5ffc231 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Hipmunk";
-  version = "5.2.0.7";
-  sha256 = "1cinxhz4qb8xcbygifx85q4zf6pmjwi90v01vqwyvwlfxmbk0j7k";
+  version = "5.2.0.8";
+  sha256 = "0xsckndxmzbp32fqb8i90k21rz0xjj3smxjijw742l637p3mv5zw";
   buildDepends = [ StateVar transformers ];
   meta = {
     homepage = "http://patch-tag.com/r/felipe/hipmunk/home";
diff --git a/pkgs/development/libraries/haskell/alternative-io/default.nix b/pkgs/development/libraries/haskell/alternative-io/default.nix
index 23c79325755d..9daf9406742c 100644
--- a/pkgs/development/libraries/haskell/alternative-io/default.nix
+++ b/pkgs/development/libraries/haskell/alternative-io/default.nix
@@ -3,13 +3,13 @@
 
 cabal.mkDerivation (self: {
   pname = "alternative-io";
-  version = "0.0.0";
-  sha256 = "1nfwiw753m8ljrk47yi5cgncbfkddnr4fz44fk1pv501a86cmk8y";
+  version = "0.0.1";
+  sha256 = "01hypbci3hw2czkmx78ls51ycx518ich4k753jgv0z8ilrq8isch";
   buildDepends = [
     liftedBase monadControl transformers transformersBase
   ];
   meta = {
-    description = "IO as Alternative instance";
+    description = "IO as Alternative instance (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix
new file mode 100644
index 000000000000..7a5adbf10794
--- /dev/null
+++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix
@@ -0,0 +1,15 @@
+{ cabal, blazeBuilder, text }:
+
+cabal.mkDerivation (self: {
+  pname = "blaze-markup";
+  version = "0.5.1.0";
+  sha256 = "0vq0xzwa13sjybg6zdi3ynsn6yxyl1q6rbalvb9r6f3plrmik37a";
+  buildDepends = [ blazeBuilder text ];
+  meta = {
+    homepage = "http://jaspervdj.be/blaze";
+    description = "A blazingly fast markup combinator library for Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
index 8ef4c9408f51..747cbbf2864d 100644
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
@@ -2,12 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-conduit";
-  version = "0.3.1";
-  sha256 = "0hb9wkq70bmx54vksj78f0av1byvksjhqlr730cfc5fc6w60kzqk";
+  version = "0.3.2";
+  sha256 = "09f6l60wcblp15hx3hppskjsyah9bh6jwqqr4dvl6j03011gx4id";
   buildDepends = [ cereal conduit cryptoApi transformers ];
-  patchPhase = ''
-    sed -i -e 's|crypto-api >= 0.9 && < 0.10|crypto-api|' crypto-conduit.cabal
-  '';
   meta = {
     homepage = "https://github.com/meteficha/crypto-conduit";
     description = "Conduit interface for cryptographic operations (from crypto-api)";
diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 26af168e8a46..77ecc4ef554a 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.7.4";
-  sha256 = "1nplmwihq40jmng4r3wiyfb0i33a8wx2gmlbqajc62wny98l7sab";
+  version = "0.7.5";
+  sha256 = "18x1k22m2mw0jx3p1mc68n0gg1vsnkp50qvmlkh3i34vdnjcdrqg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cereal cryptoApi tagged ];
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index 6b34efc20777..8462629a4be2 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -1,10 +1,16 @@
-{ cabal, Diff, filepath, parsec, split, time, utf8String, xml }:
+{ cabal, Diff, filepath, HUnit, mtl, parsec, split, time
+, utf8String, xml
+}:
 
 cabal.mkDerivation (self: {
   pname = "filestore";
-  version = "0.4.1";
-  sha256 = "02ki6b4rbmk463qmmqia7igkrsr7h1kxal94k6pikkikylx2f8r7";
-  buildDepends = [ Diff filepath parsec split time utf8String xml ];
+  version = "0.4.2";
+  sha256 = "1zv5c1r82a77p6dadabj8853a0z7p8qrk0fdxvr9sr02zd95cg16";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    Diff filepath HUnit mtl parsec split time utf8String xml
+  ];
   meta = {
     homepage = "http://johnmacfarlane.net/repos/filestore";
     description = "Interface for versioning file stores";
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 668ac64af94a..90fbd70fdc52 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.0.1";
-  sha256 = "1h3bq9vignnbvnjwr35yf4am0k90l1c21x0phnhnigdx7wanygcz";
+  version = "1.0.1.1";
+  sha256 = "16a7aym0cpcq9lsiwfh5bvgh1bkyz4j06bhyvnxawsdgzmmsbch4";
   buildDepends = [
     blazeBuilder blazeHtml failure parsec shakespeare text
   ];
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index 44f5a88f6fb8..6c105b1e4763 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -2,12 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-hamlet";
-  version = "7.0.0";
-  sha256 = "15r6xpyg193iwqin96mn7c9x5w7l8q9m3vbgiwv7bxvhdrl1dp7j";
+  version = "7.0.1";
+  sha256 = "13ayypl2x402h6a7yq7fvgd2mn21gl5gcw2hk7f5vr2bdlvwv53n";
   buildDepends = [ hamlet happstackServer text ];
-  patchPhase = ''
-    sed -i 's|hamlet >= 0.10 && <0.11|hamlet|' happstack-hamlet.cabal
-  '';
   meta = {
     homepage = "http://www.happstack.com/";
     description = "Support for Hamlet HTML templates in Happstack";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index f81c281d378a..6ccf6d77a0c9 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -1,19 +1,19 @@
 { cabal, base64Bytestring, blazeHtml, extensibleExceptions
 , filepath, hslogger, html, monadControl, mtl, network, parsec
-, sendfile, syb, text, time, transformers, transformersBase
-, utf8String, xhtml, zlib
+, sendfile, syb, systemFilepath, text, time, transformers
+, transformersBase, utf8String, xhtml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.0.0";
-  sha256 = "09i573gracz04z8b5rls7jm6hq5dfg7a4gkn7xpfsl1nmhnf1xhv";
+  version = "7.0.1";
+  sha256 = "0sjcfxcpv9sssk5fr5np57b10rajcid7x582s5ialf3yc9n1fshj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
-    html monadControl mtl network parsec sendfile syb text time
-    transformers transformersBase utf8String xhtml zlib
+    html monadControl mtl network parsec sendfile syb systemFilepath
+    text time transformers transformersBase utf8String xhtml zlib
   ];
   meta = {
     homepage = "http://happstack.com";
diff --git a/pkgs/development/libraries/haskell/hfuse/default.nix b/pkgs/development/libraries/haskell/hfuse/default.nix
index ef51afca0c71..8ff4f7fd2757 100644
--- a/pkgs/development/libraries/haskell/hfuse/default.nix
+++ b/pkgs/development/libraries/haskell/hfuse/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HFuse";
-  version = "0.2.4";
-  sha256 = "1v3kfkm2rz7bvwk0j8p9rhnnsffbnkismnsq0fkgnzi5z0bz5sgv";
+  version = "0.2.4.1";
+  sha256 = "12k04dvh92kk2i68bcb70xnk378qxmh46f241k06di5rkcgwyg1k";
   extraLibraries = [ fuse ];
 
   preConfigure = ''
@@ -11,7 +11,7 @@ cabal.mkDerivation (self: {
   '';
 
   meta = {
-    homepage = "https://github.com/realdesktop/hfuse";
+    homepage = "https://github.com/toothbrush/hfuse";
     description = "HFuse is a binding for the Linux FUSE library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index 9a258f7e88de..77f72ecf626e 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-javascript";
-  version = "0.5.1";
-  sha256 = "12nb951xcsg1qxrg347f4sxmdzi78vxwkjhx0fib6pkbcz9yqf5q";
+  version = "0.5.2";
+  sha256 = "0q9xy72z7i2ivqzbjzn9nl5y0x07d2y3a737yw26a4zhbmhwg236";
   buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
   buildTools = [ happy ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
index f9deadd85379..c0ba821d5f1c 100644
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ b/pkgs/development/libraries/haskell/libmpd/default.nix
@@ -1,12 +1,10 @@
-{ cabal, filepath, mtl, network, time, utf8String }:
+{ cabal, filepath, mtl, network, text, time, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "libmpd";
-  version = "0.7.2";
-  sha256 = "109bm5fgwmydh3bi93wxr6ac3gkp7pcvp4a8z226c1wlgc995zap";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath mtl network time utf8String ];
+  version = "0.8.0";
+  sha256 = "0sn9yqiqr011glb7q0f3xj24wkkvnib0khzf833npcas4420d0ya";
+  buildDepends = [ filepath mtl network text time utf8String ];
   meta = {
     homepage = "http://github.com/joachifm/libmpd-haskell";
     description = "An MPD client library";
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index bc4af6298de6..d2ffc52d28dd 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.1.0.3";
-  sha256 = "1fk2jv8xwjb4xmzcx7h74nh14i3wf5mpifiki9rvq4hnrb7gdx36";
+  version = "0.1.0.4";
+  sha256 = "0xd41nminlrj78l2ggcba6z764c5v6x9w08d6mb0qk3ssj7ldv89";
   buildDepends = [
     baseUnicodeSymbols monadControl transformersBase
   ];
diff --git a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
deleted file mode 100644
index d313df8f65bb..000000000000
--- a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, baseUnicodeSymbols, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-control";
-  version = "0.2.0.3";
-  sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh";
-  buildDepends = [ baseUnicodeSymbols transformers ];
-  meta = {
-    homepage = "https://github.com/basvandijk/monad-control/";
-    description = "Lift control operations, like exception catching, through monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-control/0.3.1.nix b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix
deleted file mode 100644
index d04308a4aa21..000000000000
--- a/pkgs/development/libraries/haskell/monad-control/0.3.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, baseUnicodeSymbols, transformers, transformersBase }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-control";
-  version = "0.3.1";
-  sha256 = "0laqvbnj1dfcdxrybxdnzw5g95drv34ys0cbwkcw47nl9w801p45";
-  buildDepends = [
-    baseUnicodeSymbols transformers transformersBase
-  ];
-  meta = {
-    homepage = "https://github.com/basvandijk/monad-control";
-    description = "Lift control operations, like exception catching, through monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix
rename to pkgs/development/libraries/haskell/monad-control/default.nix
index 67608ebbf81c..17f351ed9fd5 100644
--- a/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-control";
-  version = "0.3.1.1";
-  sha256 = "09sr9zw6xzci4r86sjpslwnd64ickcsv6qs1fr6ig4w7mwacyx4x";
+  version = "0.3.1.2";
+  sha256 = "0nrvz5zc5w7j2payg7ji7dpvkbk4ssg75pwi3pqjq6jrfyf4aw9m";
   buildDepends = [
     baseUnicodeSymbols transformers transformersBase
   ];
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 2ecf9d5fdcb8..c632010f78ce 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.9.0.2";
-  sha256 = "0m9m13gyjmzk33da2jd0b4l061n0gg6xj6rrnrnli2n8f70ywlnv";
+  version = "0.9.0.3";
+  sha256 = "07w2d5x4wlbs8smkq2mini4rkmdd38zmapwqcn59vna8cq9wslz6";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
     monadControl pathPieces poolConduit resourcet text time
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index a066e7d67d0a..143bf530d097 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -2,10 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "0.1.0.6";
-  sha256 = "041qg0vy5h5xd0142chbmkhmqxbglrb7x0ybcalrxr7dawxksm8d";
+  version = "0.1.0.7";
+  sha256 = "13yhbp17iq30cjh9fid3l0wkyvpj0f1b1bak9s7gfj96basg9ig2";
   buildDepends = [ cereal cryptoApi tagged ];
   meta = {
+    homepage = "https://github.com/meteficha/skein";
     description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index c9352d812766..08616b1b8419 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-core";
-  version = "0.8.0.1";
-  sha256 = "0lw1c5gczb75878vr5acjck656aq5zg1hva9bfny321v0442azds";
+  version = "0.8.1";
+  sha256 = "11r4zd9z241qvzji7gcmynkib5w9b7c7wa8jx7al2z2aq4qhfx1b";
   buildDepends = [
     attoparsec attoparsecEnumerator base16Bytestring blazeBuilder
     blazeBuilderEnumerator bytestringMmap bytestringNums
@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
     MonadCatchIOTransformers mtl mwcRandom regexPosix text time
     transformers unixCompat unorderedContainers vector zlibEnum
   ];
-  patchPhase = ''
-    sed -i -e 's|MonadCatchIO-transformers >= 0.2.1 && < 0.3|MonadCatchIO-transformers|' snap-core.cabal
-  '';
   meta = {
     homepage = "http://snapframework.com/";
     description = "Snap: A Haskell Web Framework (core interfaces and types)";
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index 731903f3cfab..37111f3b847b 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-server";
-  version = "0.8.0.1";
-  sha256 = "1648p0m4n4ha4976gw891z112rzxd9q4s7n4x3v0z3qb10aynxjb";
+  version = "0.8.1.1";
+  sha256 = "0k47z9fhc64bnv86ixaxvndwc7hk28ny3mf5ny9d5jmp77a3ws46";
   buildDepends = [
     attoparsec attoparsecEnumerator binary blazeBuilder
     blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
     PSQueue snapCore text time transformers unixCompat vector
     vectorAlgorithms
   ];
-  patchPhase = ''
-    sed -i -e 's|MonadCatchIO-transformers >= 0.2.1    && < 0.3|MonadCatchIO-transformers|' snap-server.cabal
-  '';
   meta = {
     homepage = "http://snapframework.com/";
     description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 279751fdbdf1..71067cd75ff7 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "0.9.4";
-  sha256 = "1yvarwd3cbagg14pk6fj3r1jhvrwnbz042fdxvw9jjrdz9khy0wc";
+  version = "0.9.5";
+  sha256 = "1nbfimyxi546n239brhw5lrb7907svvhvy5zgy1f853h17vnli5y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix
index 39126b2c7fa1..6cd63e8a8733 100644
--- a/pkgs/development/libraries/haskell/vty/default.nix
+++ b/pkgs/development/libraries/haskell/vty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vty";
-  version = "4.7.0.10";
-  sha256 = "03cvr4z0fvxfyrikgf89777cp1xqhy22yj83p0dysp0i5ds6cd9v";
+  version = "4.7.0.12";
+  sha256 = "0mmx8rhj6k8c56qhaz7ay2yf9x61h27zxs14mrkw2y4qag6d4bii";
   buildDepends = [
     deepseq mtl parallel parsec terminfo utf8String vector
   ];
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 2614d1b7f95a..32f6ee0f610a 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "1.2.0.1";
-  sha256 = "0z3bx6sx3f5k00x0i9lk81a3gh9blnsqw55w89l0pl946fv002pc";
+  version = "1.2.0.2";
+  sha256 = "15rd2vlx3ag5bavrivscah7yqm9lv14v68wr3p9incg2ksf8h7d7";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
     httpDate httpTypes text time transformers unixCompat wai
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index afc40baa5e71..ac5f201a028c 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.0.1";
-  sha256 = "15i4ysyf6j137aia0mv1kvh7pnmdnj89wgcj70all9v1413rxzgq";
+  version = "1.0.1.1";
+  sha256 = "05zspm7dfkjzb40839qnf002hxsav01vxkv3dccidvp0q340j0vz";
   buildDepends = [
     aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
     conduit cookie failure fastLogger hamlet httpTypes liftedBase
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5359966c9b8a..b52c77b0ef26 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -146,7 +146,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     parsec       = self.parsec_3_1_2;           # 7.4.1 ok
     QuickCheck   = self.QuickCheck_2_4_2;       # 7.4.1 ok
     regexBase    = self.regexBase_0_93_2;       # 7.4.1 ok
-    regexCompat  = self.regexCompat_0_93_1;     # 7.4.1 ok
+    regexCompat  = self.regexCompat_0_95_1;     # 7.4.1 ok
     regexPosix   = self.regexPosix_0_95_1;      # 7.4.1 ok
     stm          = self.stm_2_3;		# 7.4.1 ok
     syb          = self.syb_0_3_6;              # 7.4.1 ok
@@ -492,6 +492,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
 
+  blazeMarkup = callPackage ../development/libraries/haskell/blaze-markup {};
+
   blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {};
 
   bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
@@ -993,9 +995,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {};
 
-  monadControl_0_2_0_3 = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {};
-  monadControl_0_3_1_1 = callPackage ../development/libraries/haskell/monad-control/0.3.1.1.nix {};
-  monadControl = self.monadControl_0_3_1_1;
+  monadControl = callPackage ../development/libraries/haskell/monad-control {};
 
   monadcryptorandom = callPackage ../development/libraries/haskell/monadcryptorandom {};
 
@@ -1011,9 +1011,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   monadsTf = callPackage ../development/libraries/haskell/monads-tf {};
 
-  mongoDB = callPackage ../development/libraries/haskell/mongoDB {
-    monadControl = self.monadControl_0_2_0_3;
-  };
+  mongoDB = callPackage ../development/libraries/haskell/mongoDB {};
 
   mpppc = callPackage ../development/libraries/haskell/mpppc {};
 
@@ -1631,7 +1629,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   # Applications.
 
   darcs = callPackage ../applications/version-management/darcs {
-    regexCompat = self.regexCompat93;
     tar = self.tar_0_3_2_0;
   };
 

From 0a9d954bc6aa8012a1ac8d0f9dafb26a2a3ce1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Apr 2012 15:47:21 +0000
Subject: [PATCH 243/293] GNU Patch: On Darwin, use an existing tarball, and
 patch from there.

svn path=/nixpkgs/trunk/; revision=33892
---
 pkgs/tools/text/gnupatch/darwin-fix.patch | 60 +++++++++++++++++++++++
 pkgs/tools/text/gnupatch/default.nix      | 23 +++++----
 2 files changed, 71 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/tools/text/gnupatch/darwin-fix.patch

diff --git a/pkgs/tools/text/gnupatch/darwin-fix.patch b/pkgs/tools/text/gnupatch/darwin-fix.patch
new file mode 100644
index 000000000000..50d085348148
--- /dev/null
+++ b/pkgs/tools/text/gnupatch/darwin-fix.patch
@@ -0,0 +1,60 @@
+Fix builds on Darwin:
+http://lists.gnu.org/archive/html/bug-patch/2010-01/msg00004.html .
+
+
+commit 2c4e3ecddec8a686bd50d238f4cefebb950298b7
+Author: Andreas Gruenbacher <agruen@suse.de>
+Date:   Fri Jan 1 15:58:15 2010 +0100
+
+    * Makefile.in (LIBSRCS, LIBM4FILES): Add the missing files strnlen.c,
+    strnlen.m4, and safe-read.m4.
+
+diff --git a/Makefile.in b/Makefile.in
+index 3b3d78a..26dc281 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -91,6 +91,7 @@ LIBSRCS = \
+ 	gl/lib/stripslash.c \
+ 	gl/lib/strncasecmp.c \
+ 	gl/lib/strndup.c \
++	gl/lib/strnlen.c \
+ 	gl/lib/xmalloc.c \
+ 	gl/lib/xstrndup.c
+
+
+Add the missing bits from Gnulib.
+
+--- /dev/null	2012-04-23 08:54:35.747205543 +0200
++++ b/gl/lib/strnlen.c	2012-01-16 22:35:02.000000000 +0100
+@@ -0,0 +1,31 @@
++/* Find the length of STRING, but scan at most MAXLEN characters.
++   Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc.
++   Written by Simon Josefsson.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software Foundation,
++   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
++
++#include <config.h>
++
++#include <string.h>
++
++/* Find the length of STRING, but scan at most MAXLEN characters.
++   If no '\0' terminator is found in that many characters, return MAXLEN.  */
++
++size_t
++strnlen (const char *string, size_t maxlen)
++{
++  const char *end = memchr (string, '\0', maxlen);
++  return end ? (size_t) (end - string) : maxlen;
++}
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index 782c0bec8508..a7a166c95c3b 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -1,19 +1,12 @@
 { stdenv, fetchurl, ed }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "patch-2.6.1";
 
-  src =
-    if stdenv.isDarwin
-    then fetchurl {
-      # Temporary fix for
-      # http://lists.gnu.org/archive/html/bug-patch/2010-01/msg00004.html .
-      url = "ftp://alpha.gnu.org/gnu/patch/patch-2.6.1.87-94d8.tar.gz";
-      sha256 = "0jnw8p0nvkmwi1a2z56bssqik8fvkb71zd2cpzl1sklnrg1g3b6p";
-    } else fetchurl {
-      url = "mirror://gnu/patch/${name}.tar.gz";
-      sha256 = "1fc1jyq80nswkf492fiqdbl2bhvlw2wb44ghqlfd3zngx4qkfmni";
-    };
+  src = fetchurl {
+    url = "mirror://gnu/patch/${name}.tar.gz";
+    sha256 = "1fc1jyq80nswkf492fiqdbl2bhvlw2wb44ghqlfd3zngx4qkfmni";
+  };
 
   buildInputs = (stdenv.lib.optional doCheck ed);
 
@@ -40,3 +33,9 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.all;
   };
 }
+
+//
+
+(stdenv.lib.optionalAttrs stdenv.isDarwin {
+  patches = [ ./darwin-fix.patch ];
+}))

From 04600bbec1d0902b6aeec4528718f6fc7c3dc040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Apr 2012 15:47:31 +0000
Subject: [PATCH 244/293] Darwin: Add `mig', `lipo', etc. to `stdenvNative'.

Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
---
 .../native-darwin-cctools-wrapper/builder.sh  | 14 ++++++++++--
 .../native-darwin-cctools-wrapper/default.nix |  9 ++++++++
 pkgs/development/compilers/ghc/7.0.2.nix      |  5 ++---
 pkgs/development/compilers/ghc/7.0.3.nix      |  5 ++---
 pkgs/development/compilers/ghc/7.0.4.nix      |  5 ++---
 pkgs/development/compilers/ghc/7.2.1.nix      |  5 ++---
 pkgs/development/compilers/ghc/7.2.2.nix      |  5 ++---
 pkgs/development/compilers/ghc/7.4.1.nix      |  5 ++---
 pkgs/development/compilers/ghc/head.nix       |  5 ++---
 pkgs/development/compilers/llvm/clang.nix     |  4 ++--
 pkgs/development/compilers/llvm/default.nix   |  5 ++---
 .../interpreters/python/2.6/default.nix       |  6 +----
 .../interpreters/python/2.7/default.nix       |  6 +----
 .../interpreters/python/3.1/default.nix       |  5 +----
 .../interpreters/python/3.2/default.nix       |  5 +----
 pkgs/development/libraries/mesa/default.nix   |  4 ++--
 pkgs/development/libraries/yajl/default.nix   |  5 ++---
 .../tools/analysis/valgrind/default.nix       | 16 --------------
 .../tools/build-managers/cmake/264.nix        |  3 +--
 .../tools/build-managers/cmake/default.nix    |  3 +--
 pkgs/development/web/nodejs/default.nix       |  4 ++--
 pkgs/os-specific/darwin/arch/builder.sh       |  3 ---
 pkgs/os-specific/darwin/arch/default.nix      |  8 -------
 .../darwin/install_name_tool/builder.sh       |  3 ---
 .../darwin/install_name_tool/default.nix      |  8 -------
 pkgs/os-specific/darwin/lipo/builder.sh       |  3 ---
 pkgs/os-specific/darwin/lipo/default.nix      |  8 -------
 pkgs/os-specific/darwin/sw_vers/builder.sh    |  3 ---
 pkgs/os-specific/darwin/sw_vers/default.nix   |  8 -------
 pkgs/servers/sql/mysql55/default.nix          |  6 ++---
 pkgs/top-level/all-packages.nix               | 22 +++----------------
 31 files changed, 57 insertions(+), 139 deletions(-)
 delete mode 100755 pkgs/os-specific/darwin/arch/builder.sh
 delete mode 100644 pkgs/os-specific/darwin/arch/default.nix
 delete mode 100755 pkgs/os-specific/darwin/install_name_tool/builder.sh
 delete mode 100644 pkgs/os-specific/darwin/install_name_tool/default.nix
 delete mode 100755 pkgs/os-specific/darwin/lipo/builder.sh
 delete mode 100644 pkgs/os-specific/darwin/lipo/default.nix
 delete mode 100755 pkgs/os-specific/darwin/sw_vers/builder.sh
 delete mode 100644 pkgs/os-specific/darwin/sw_vers/default.nix

diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
index 2e2e125c6495..f412ee7caf09 100644
--- a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
+++ b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
@@ -1,6 +1,16 @@
 source $stdenv/setup
 
 mkdir -p $out/bin
-for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil libtool; do 
-    ln -s /usr/bin/$i $out/bin/
+for i in $binaries
+do 
+    ln -s "/usr/bin/$i" "$out/bin/"
 done
+
+# MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so
+# let it see the impure directories.
+cat > "$out/bin/mig" <<EOF
+#!/bin/sh
+export PATH="/usr/bin:/bin:\$PATH"
+exec /usr/bin/mig "\$@"
+EOF
+chmod +x "$out/bin/mig"
diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/default.nix b/pkgs/build-support/native-darwin-cctools-wrapper/default.nix
index e4f0e3e1dd1e..8fed8183ec56 100644
--- a/pkgs/build-support/native-darwin-cctools-wrapper/default.nix
+++ b/pkgs/build-support/native-darwin-cctools-wrapper/default.nix
@@ -2,5 +2,14 @@
 
 stdenv.mkDerivation {
   name = "native-darwin-cctools-wrapper";
+
+  # Standard binaries normally found under /usr/bin (MIG is omitted here, and
+  # handled specially in ./builder.sh).
+  binaries =
+    [ "ar" "as" "c++filt" "gprof" "ld" "nm" "nmedit" "ranlib"
+      "size" "strings" "strip" "dsymutil" "libtool" "lipo"
+      "install_name_tool" "arch" "sw_vers"
+    ];
+
   builder = ./builder.sh;
 }
diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix
index c0ba5f1fe09c..426c8725d0ba 100644
--- a/pkgs/development/compilers/ghc/7.0.2.nix
+++ b/pkgs/development/compilers/ghc/7.0.2.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "7.0.2";
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "f0551f1af2f008a8a14a888b70c0557e00dd04f9ae309ac91897306cd04a6668";
   };
 
-  buildInputs = [ghc perl gmp ncurses] ++
-    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
+  buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
diff --git a/pkgs/development/compilers/ghc/7.0.3.nix b/pkgs/development/compilers/ghc/7.0.3.nix
index f6e4d81029a2..ad80dd9e79d9 100644
--- a/pkgs/development/compilers/ghc/7.0.3.nix
+++ b/pkgs/development/compilers/ghc/7.0.3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "7.0.3";
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1nfc2c6bdcdfg3f3d9q5v109jrrwhz6by3qa4qi7k0xbip16jq8m";
   };
 
-  buildInputs = [ghc perl gmp ncurses] ++
-    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
+  buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix
index 7230b9069e7c..1cafdd51bee8 100644
--- a/pkgs/development/compilers/ghc/7.0.4.nix
+++ b/pkgs/development/compilers/ghc/7.0.4.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "7.0.4";
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed";
   };
 
-  buildInputs = [ghc perl gmp ncurses] ++
-    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
+  buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
diff --git a/pkgs/development/compilers/ghc/7.2.1.nix b/pkgs/development/compilers/ghc/7.2.1.nix
index f2c3acff59c2..3938d608d331 100644
--- a/pkgs/development/compilers/ghc/7.2.1.nix
+++ b/pkgs/development/compilers/ghc/7.2.1.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "7.2.1";
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "099w2bvx07jq4b1k8f1hspri30wbk35dz6ilsivxr2xg661c2qjm";
   };
 
-  buildInputs = [ghc perl gmp ncurses] ++
-    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
+  buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix
index 358f41dcf089..0450537ad900 100644
--- a/pkgs/development/compilers/ghc/7.2.2.nix
+++ b/pkgs/development/compilers/ghc/7.2.2.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "7.2.2";
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz";
   };
 
-  buildInputs = [ghc perl gmp ncurses] ++
-    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
+  buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
diff --git a/pkgs/development/compilers/ghc/7.4.1.nix b/pkgs/development/compilers/ghc/7.4.1.nix
index 62d49910e9a8..95590518a281 100644
--- a/pkgs/development/compilers/ghc/7.4.1.nix
+++ b/pkgs/development/compilers/ghc/7.4.1.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "7.4.1";
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ycscsagyy9n796a59q6761s6ar50d8inibvnrcp96siksj0j73j";
   };
 
-  buildInputs = [ghc perl gmp ncurses] ++
-    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
+  buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index c578c15c5fd9..66b939cdfed1 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "7.5.20120419";
@@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0fwq2s3syk3l4xx0m8x6h67snldlf3qk9bjjkvx46sgr0q3xjd05";
   };
 
-  buildInputs = [ghc perl gmp ncurses] ++
-    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
+  buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix
index 3319744ab482..663e1bfab28b 100644
--- a/pkgs/development/compilers/llvm/clang.nix
+++ b/pkgs/development/compilers/llvm/clang.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, perl, groff, llvm, cmake, darwinInstallNameToolUtility }:
+{ stdenv, fetchurl, perl, groff, llvm, cmake }:
 
 let version = "3.0"; in
 
 stdenv.mkDerivation {
   name = "clang-${version}";
 
-  buildInputs = [ perl llvm groff cmake ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;
+  buildInputs = [ perl llvm groff cmake ];
 
   patches = stdenv.lib.optionals (stdenv.gcc.libc != null) 
     [ ./clang-include-paths.patch ./clang-ld-flags.patch ];
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 01b16fcda8d6..0fb1cf82cc27 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, groff, darwinSwVersUtility, darwinInstallNameToolUtility, cmake }:
+{ stdenv, fetchurl, perl, groff, cmake }:
 
 let version = "3.0"; in
 
@@ -10,8 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji";
   };
 
-  buildInputs = [ perl groff cmake ] ++
-    stdenv.lib.optionals stdenv.isDarwin [ darwinSwVersUtility darwinInstallNameToolUtility ];
+  buildInputs = [ perl groff cmake ];
 
   cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
 
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 4e36bfa17428..f87e1e3810f0 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -1,11 +1,8 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
 , sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
-, darwinArchUtility ? null, darwinSwVersUtility ? null
 }:
 
 assert zlibSupport -> zlib != null;
-assert stdenv.isDarwin -> darwinArchUtility != null;
-assert stdenv.isDarwin -> darwinSwVersUtility != null;
 
 with stdenv.lib;
 
@@ -33,8 +30,7 @@ let
   buildInputs =
     optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
     [ bzip2 ]
-    ++ optional zlibSupport zlib
-    ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
+    ++ optional zlibSupport zlib;
 
     
   # Build the basic Python interpreter without modules that have
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 439cc82bf3e9..e4d3d057570f 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -1,11 +1,8 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
 , sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
-, darwinArchUtility ? null, darwinSwVersUtility ? null
 }:
 
 assert zlibSupport -> zlib != null;
-assert stdenv.isDarwin -> darwinArchUtility != null;
-assert stdenv.isDarwin -> darwinSwVersUtility != null;
 
 with stdenv.lib;
 
@@ -39,8 +36,7 @@ let
   buildInputs =
     optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
     [ bzip2 openssl ]
-    ++ optional zlibSupport zlib
-    ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
+    ++ optional zlibSupport zlib;
 
   ensurePurity =
     ''
diff --git a/pkgs/development/interpreters/python/3.1/default.nix b/pkgs/development/interpreters/python/3.1/default.nix
index 892af52a9197..92b090bb41ee 100644
--- a/pkgs/development/interpreters/python/3.1/default.nix
+++ b/pkgs/development/interpreters/python/3.1/default.nix
@@ -9,11 +9,8 @@
 , openssl
 , tcl, tk
 , libX11, xproto
-, arch ? null, sw_vers ? null
 }:
 
-assert stdenv.isDarwin -> arch != null;
-assert stdenv.isDarwin -> sw_vers != null;
 assert readline != null -> ncurses != null;
 
 with stdenv.lib;
@@ -23,7 +20,7 @@ let
   version = "${majorVersion}.3";
 
   buildInputs = filter (p: p != null) [
-    zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto arch sw_vers
+    zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
   ];
 in
 stdenv.mkDerivation {
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index 1ab115f04696..6e496e0ea1ad 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -9,11 +9,8 @@
 , openssl
 , tcl, tk
 , libX11, xproto
-, arch ? null, sw_vers ? null
 }:
 
-assert stdenv.isDarwin -> arch != null;
-assert stdenv.isDarwin -> sw_vers != null;
 assert readline != null -> ncurses != null;
 
 with stdenv.lib;
@@ -23,7 +20,7 @@ let
   version = "${majorVersion}";
 
   buildInputs = filter (p: p != null) [
-    zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto arch sw_vers
+    zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
   ];
 in
 stdenv.mkDerivation {
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 55701cf18c96..219dc161761b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
 , libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
 , libXt, udev, enableTextureFloats ? false
-, python, libxml2Python, lipo ? null }:
+, python, libxml2Python }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
 
   buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto
-    libxml2Python libX11 libXext libxcb lipo libXt udev ];
+    libxml2Python libX11 libXext libxcb libXt udev ];
 
   buildNativeInputs = [ pkgconfig python makedepend file flex bison ];
 
diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix
index 221344b91251..e58c6dcba120 100644
--- a/pkgs/development/libraries/yajl/default.nix
+++ b/pkgs/development/libraries/yajl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, ruby, darwinInstallNameToolUtility}:
+{ stdenv, fetchurl, cmake, ruby }:
 
 stdenv.mkDerivation {
   name = "yajl-2.0.1";
@@ -9,8 +9,7 @@ stdenv.mkDerivation {
     sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2";
   };
 
-  buildInputs = [ cmake ruby ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;
+  buildInputs = [ cmake ruby ];
 
   meta = {
     description = "Yet Another JSON Library";
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index d0c5e624d394..a625de6ffdce 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -59,21 +59,5 @@ stdenv.mkDerivation (rec {
         sed -i coregrind/link_tool_exe_darwin.in \
             -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
      '';
-
-   preConfigure =
-     # Shamelessly drag in MIG.
-     '' mkdir -p "$TMPDIR/impure-deps/bin"
-
-        # MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so
-        # let it see the impure directories.
-        cat > "$TMPDIR/impure-deps/bin/mig" <<EOF
-#!/bin/sh
-export PATH="/usr/bin:/bin:\$PATH"
-exec /usr/bin/mig "\$@"
-EOF
-        chmod +x "$TMPDIR/impure-deps/bin/mig"
-
-        export PATH="$TMPDIR/impure-deps/bin:$PATH"
-     '';
  }
  else {}))
diff --git a/pkgs/development/tools/build-managers/cmake/264.nix b/pkgs/development/tools/build-managers/cmake/264.nix
index 42fba148eec5..b2695c2ec87c 100644
--- a/pkgs/development/tools/build-managers/cmake/264.nix
+++ b/pkgs/development/tools/build-managers/cmake/264.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
 , useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c
-, darwinInstallNameToolUtility }:
+}:
 
 with stdenv.lib;
 
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
     optional (stdenv ? glibc) ./search-path-264.patch;
 
   buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ]
-    ++ optional stdenv.isDarwin darwinInstallNameToolUtility
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 51d6d9a74120..cab217fef97d 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
 , useNcurses ? false, ncurses, useQt4 ? false, qt4
-, darwinInstallNameToolUtility }:
+}:
 
 with stdenv.lib;
 
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
     optional (stdenv ? glibc) ./search-path.patch;
 
   buildInputs = [ curl expat zlib bzip2 libarchive ]
-    ++ optional stdenv.isDarwin darwinInstallNameToolUtility
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index e1526c49f3cb..36b9cdf28f20 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8, darwinInstallNameToolUtility }:
+{ stdenv, fetchurl, openssl, python, zlib, v8 }:
 
 stdenv.mkDerivation rec {
   version = "0.6.14";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node
   '';
 
-  buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;
+  buildInputs = [ python openssl v8 zlib ];
 
   meta = with stdenv.lib; {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
diff --git a/pkgs/os-specific/darwin/arch/builder.sh b/pkgs/os-specific/darwin/arch/builder.sh
deleted file mode 100755
index 1fb8be484ba7..000000000000
--- a/pkgs/os-specific/darwin/arch/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source $stdenv/setup
-mkdir -p "$out/bin"
-ln -s /usr/bin/arch "$out/bin/"
diff --git a/pkgs/os-specific/darwin/arch/default.nix b/pkgs/os-specific/darwin/arch/default.nix
deleted file mode 100644
index 59d00eaf2d1c..000000000000
--- a/pkgs/os-specific/darwin/arch/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{stdenv}:
-
-assert stdenv.isDarwin;
-
-stdenv.mkDerivation {
-  name = "darwin-arch-utility";
-  builder = ./builder.sh;
-}
diff --git a/pkgs/os-specific/darwin/install_name_tool/builder.sh b/pkgs/os-specific/darwin/install_name_tool/builder.sh
deleted file mode 100755
index 15e849944977..000000000000
--- a/pkgs/os-specific/darwin/install_name_tool/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source $stdenv/setup
-mkdir -p "$out/bin"
-ln -s /usr/bin/install_name_tool "$out/bin/"
diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix
deleted file mode 100644
index d8ffa6d38cfd..000000000000
--- a/pkgs/os-specific/darwin/install_name_tool/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{stdenv}:
-
-assert stdenv.isDarwin;
-
-stdenv.mkDerivation {
-  name = "darwin-install_name_tool-utility";
-  builder = ./builder.sh;
-}
diff --git a/pkgs/os-specific/darwin/lipo/builder.sh b/pkgs/os-specific/darwin/lipo/builder.sh
deleted file mode 100755
index aea544296775..000000000000
--- a/pkgs/os-specific/darwin/lipo/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source $stdenv/setup
-mkdir -p "$out/bin"
-ln -s /usr/bin/lipo "$out/bin/"
diff --git a/pkgs/os-specific/darwin/lipo/default.nix b/pkgs/os-specific/darwin/lipo/default.nix
deleted file mode 100644
index a4f7cfc1e54c..000000000000
--- a/pkgs/os-specific/darwin/lipo/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{stdenv}:
-
-assert stdenv.isDarwin;
-
-stdenv.mkDerivation {
-  name = "darwin-lipo-utility";
-  builder = ./builder.sh;
-}
diff --git a/pkgs/os-specific/darwin/sw_vers/builder.sh b/pkgs/os-specific/darwin/sw_vers/builder.sh
deleted file mode 100755
index 51e34e79aea3..000000000000
--- a/pkgs/os-specific/darwin/sw_vers/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source $stdenv/setup
-mkdir -p "$out/bin"
-ln -s /usr/bin/sw_vers "$out/bin/"
diff --git a/pkgs/os-specific/darwin/sw_vers/default.nix b/pkgs/os-specific/darwin/sw_vers/default.nix
deleted file mode 100644
index bf99c01686a7..000000000000
--- a/pkgs/os-specific/darwin/sw_vers/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{stdenv}:
-
-assert stdenv.isDarwin;
-
-stdenv.mkDerivation {
-  name = "darwin-sw-vers-utility";
-  builder = ./builder.sh;
-}
diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix
index f105b4daaf6a..3f26ea1f98bf 100644
--- a/pkgs/servers/sql/mysql55/default.nix
+++ b/pkgs/servers/sql/mysql55/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, darwinInstallNameToolUtility, perl}:
+{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl }:
 
 # Note: zlib is not required; MySQL can use an internal zlib.
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
     sha256 = "0sklcz6miff7nb6bi1pqncgjv819255y7if6jxcqgiqs50z319i0";
   };
 
-  buildInputs = [ cmake bison ncurses openssl readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwinInstallNameToolUtility perl ];
-  
+  buildInputs = [ cmake bison ncurses openssl readline zlib ];
+
   cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin -DHAVE_IPV6=yes";
   
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef93ea826c00..c0cdaa5e0abd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2755,15 +2755,9 @@ let
 
   python27 = callPackage ../development/interpreters/python/2.7 { };
 
-  python31 = callPackage ../development/interpreters/python/3.1 {
-    arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null;
-    sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
-  };
+  python31 = callPackage ../development/interpreters/python/3.1 { };
 
-  python32 = callPackage ../development/interpreters/python/3.2 {
-    arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null;
-    sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
-  };
+  python32 = callPackage ../development/interpreters/python/3.2 { };
 
   pythonFull = python27Full;
 
@@ -4387,9 +4381,7 @@ let
     system == "x86_64-darwin" ||
     system == "i686-darwin";
 
-  mesa = callPackage ../development/libraries/mesa {
-    lipo = if stdenv.isDarwin then darwinLipoUtility else null;
-  };
+  mesa = callPackage ../development/libraries/mesa { };
 
   metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
     sdfLibrary    = callPackage ../development/libraries/sdf-library { aterm = aterm28; };
@@ -5401,14 +5393,6 @@ let
 
   cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
 
-  darwinArchUtility = callPackage ../os-specific/darwin/arch { };
-
-  darwinSwVersUtility = callPackage ../os-specific/darwin/sw_vers { };
-
-  darwinLipoUtility = callPackage ../os-specific/darwin/lipo { };
-
-  darwinInstallNameToolUtility = callPackage ../os-specific/darwin/install_name_tool { };
-
   devicemapper = lvm2;
 
   dmidecode = callPackage ../os-specific/linux/dmidecode { };

From 29bc53265d1a51c77320f9f327434c75a4040fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Apr 2012 15:47:37 +0000
Subject: [PATCH 245/293] Darwin: Use GCC 4.6 in `stdenvNix'.

svn path=/nixpkgs/trunk/; revision=33894
---
 .../development/compilers/gcc/4.6/default.nix |  5 ++++
 .../development/libraries/ncurses/default.nix |  6 ++++-
 pkgs/stdenv/nix/default.nix                   |  2 +-
 pkgs/top-level/all-packages.nix               | 24 ++++++++++++++++---
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index bceaf2b44266..f1e4991f6c18 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -28,6 +28,7 @@
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
+, gnused
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -226,6 +227,10 @@ stdenv.mkDerivation ({
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional stdenv.isDarwin gnused)
     ;
 
   configureFlagsArray = stdenv.lib.optionals
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 0278f62f65d8..a6b9a69e6e1f 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -27,7 +27,11 @@ stdenv.mkDerivation (rec {
 
   enableParallelBuilding = true;
 
-  preBuild = ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile'';
+  preBuild =
+    # On Darwin, we end up using the native `sed' during bootstrap, and it
+    # fails to run this command, which isn't needed anyway.
+    stdenv.lib.optionalString (!stdenv.isDarwin)
+    ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile'';
 
   # When building a wide-character (Unicode) build, create backward
   # compatibility links from the the "normal" libraries to the
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index 473bb5af0afd..5e242b6e3a1c 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -28,7 +28,7 @@ import ../generic rec {
         import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;}
       else
         pkgs.binutils;
-    gcc = if stdenv.isDarwin then pkgs.gccApple.gcc else pkgs.gcc.gcc;
+    gcc = pkgs.gcc.gcc;
     coreutils = pkgs.coreutils;
     shell = pkgs.bash + "/bin/sh";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0cdaa5e0abd..bf03cb252fc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1962,8 +1962,12 @@ let
       (if stdenv.system == "i686-darwin"
        then import ../development/compilers/gcc/4.2-apple32
        else import ../development/compilers/gcc/4.2-apple64) {
-         inherit fetchurl stdenv noSysDirs;
+         inherit fetchurl noSysDirs;
          profiledCompiler = true;
+
+         # Since it fails to build with GCC 4.6, build it with the "native"
+         # Apple-GCC.
+         stdenv = allStdenvs.stdenvNative;
        });
 
   gccupc40 = wrapGCCUPC (import ../development/compilers/gcc-upc-4.0 {
@@ -3199,7 +3203,14 @@ let
     target = crossSystem;
   };
 
-  valgrind = callPackage ../development/tools/analysis/valgrind { };
+  valgrind = callPackage ../development/tools/analysis/valgrind {
+    stdenv =
+      # On Darwin, Valgrind 3.7.0 expects Apple's GCC (for
+      # `__private_extern'.)
+      if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
 
   valkyrie = callPackage ../development/tools/analysis/valkyrie { };
 
@@ -4429,8 +4440,15 @@ let
   mysocketw = callPackage ../development/libraries/mysocketw { };
 
   ncurses = makeOverridable (import ../development/libraries/ncurses) {
-    inherit fetchurl stdenv;
+    inherit fetchurl;
     unicode = system != "i686-cygwin";
+    stdenv =
+      # On Darwin, NCurses uses `-no-cpp-precomp', which is specific to
+      # Apple-GCC.  Since NCurses is part of stdenv, always use
+      # `stdenvNative' to build it.
+      if stdenv.isDarwin
+      then allStdenvs.stdenvNative
+      else stdenv;
   };
 
   neon = neon029;

From 6a85ec6abe635cecdf432af1272fd0fd6d8ca33e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Apr 2012 15:47:41 +0000
Subject: [PATCH 246/293] GFortran: Use GFortran 4.6 on Darwin.

svn path=/nixpkgs/trunk/; revision=33895
---
 pkgs/top-level/all-packages.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf03cb252fc7..38e6a34ed084 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1975,13 +1975,7 @@ let
     texinfo = texinfo49;
   });
 
-  gfortran =
-    if stdenv.isDarwin
-    then wrapGCC (gccApple.gcc.override {
-      langF77 = true;
-      inherit gmp mpfr bison flex;
-    })
-    else gfortran46;
+  gfortran = gfortran46;
 
   gfortran40 = wrapGCC (gcc40.gcc.override {
     langFortran = true;

From b53f6b9dd02573090dee8538ab7e88848759882f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Apr 2012 16:28:06 +0000
Subject: [PATCH 247/293] GCC 4.6: Don't bail out when `gnused' isn't provided.

svn path=/nixpkgs/trunk/; revision=33896
---
 pkgs/development/compilers/gcc/4.6/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index f1e4991f6c18..3955455df4c1 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -28,7 +28,7 @@
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
-, gnused
+, gnused ? null
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -40,6 +40,9 @@ assert langVhdl     -> gnat != null;
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
+
 with stdenv.lib;
 with builtins;
 

From d44d30b0ba13244a9ff4a8832d8ab984792db9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Apr 2012 16:28:10 +0000
Subject: [PATCH 248/293] GHC 7.4.2: Remove `darwinInstallNameToolUtility'.

svn path=/nixpkgs/trunk/; revision=33897
---
 pkgs/development/compilers/ghc/7.4.2.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
index 567e6c75def5..1ea9e24a120e 100644
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "7.4.1.20120412";
@@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0hpzd51s5nvlsjk3wza45ji5v6m0szqjzch45fvv7wfzllrm595l";
   };
 
-  buildInputs = [ghc perl gmp ncurses] ++
-    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
+  buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

From daf8c7fcede997d9feaa4b05aaabcf4c80e8b9f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Apr 2012 22:31:39 +0000
Subject: [PATCH 249/293] allStdenvs: Propagate `system'.

svn path=/nixpkgs/trunk/; revision=33898
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38e6a34ed084..e9b26903583b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -195,7 +195,7 @@ let
 
   allStdenvs = import ../stdenv {
     inherit system stdenvType platform;
-    allPackages = args: import ./all-packages.nix ({ inherit config; } // args);
+    allPackages = args: import ./all-packages.nix ({ inherit config system; } // args);
   };
 
   defaultStdenv = allStdenvs.stdenv // { inherit platform; };

From d4f26f65d93be3806382cbf6c8d64e7056acb71b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Apr 2012 23:04:05 +0000
Subject: [PATCH 250/293] GNU Readline 6.x: Build with Apple-GCC on Darwin.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9b26903583b..4c12089795df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4644,7 +4644,14 @@ let
 
   readline5 = callPackage ../development/libraries/readline/readline5.nix { };
 
-  readline6 = callPackage ../development/libraries/readline/readline6.nix { };
+  readline6 = callPackage ../development/libraries/readline/readline6.nix {
+    stdenv =
+      # On Darwin, Readline uses `-arch_only', which is specific to
+      # Apple-GCC.  So give it what it expects.
+      if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
 
   librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
 

From 86232ad5f73a9e0d27d4a3ebd9c449ab0b2338ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 24 Apr 2012 07:54:57 +0000
Subject: [PATCH 251/293] Updating mldonkey. Upstream picked the patch we had.

svn path=/nixpkgs/trunk/; revision=33900
---
 .../networking/p2p/mldonkey/default.nix       |   6 +-
 .../networking/p2p/mldonkey/gcc44mips64.patch | 103 ------------------
 2 files changed, 2 insertions(+), 107 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch

diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index 145414e5c3d3..f86901d5ddec 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/pkgs/applications/networking/p2p/mldonkey/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }:
 
 stdenv.mkDerivation (rec {
-  name = "mldonkey-3.1.0";
+  name = "mldonkey-3.1.1";
   
   src = fetchurl {
     url = "mirror://sourceforge/mldonkey/${name}.tar.bz2";
-    sha256 = "02038nhh6lbb714ariy2xw1vgfycr1w750zplbgwk5pa3cm163zx";
+    sha256 = "1cj0xvfx03jnpifcqxcgfjhkl3f70r86d8zn2flj9wvlnam98qlr";
   };
   
   meta = {
@@ -13,8 +13,6 @@ stdenv.mkDerivation (rec {
     homepage = http://mldonkey.sourceforge.net/;
   };
 
-  patches = [ ./gcc44mips64.patch ];
-
   buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ];
   configureFlags = [ "--disable-gui" ];
 } // (if (stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux") then
diff --git a/pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch b/pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch
deleted file mode 100644
index 41449dcdd05c..000000000000
--- a/pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Patch fixing CryptoPP so:
-- it builds properly in mips64 with gcc 4.4 (gcc 4.4 does not have the 'h' asm constraint)
-- it runs properly in mips64 (where lack of templated *Precision functions gave wrong numbers).
-  An assertion check failed without this.
-
-diff --git a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc
-index 9208e1c..6b12b0a 100644
---- a/src/utils/lib/CryptoPP.cc
-+++ b/src/utils/lib/CryptoPP.cc
-@@ -890,35 +890,6 @@ unsigned int Parity(unsigned long value)
- 	return (unsigned int)value&1;
- }
- 
--unsigned int BytePrecision(unsigned long value)
--{
--	unsigned int i;
--	for (i=sizeof(value); i; --i)
--		if (value >> (i-1)*8)
--			break;
--
--	return i;
--}
--
--unsigned int BitPrecision(unsigned long value)
--{
--	if (!value)
--		return 0;
--
--	unsigned int l=0, h=8*sizeof(value);
--
--	while (h-l > 1)
--	{
--		unsigned int t = (l+h)/2;
--		if (value >> t)
--			l = t;
--		else
--			h = t;
--	}
--
--	return h;
--}
--
- unsigned long Crop(unsigned long value, unsigned int size)
- {
- 	if (size < 8*sizeof(value))
-@@ -1880,7 +1851,10 @@ public:
- 		#elif defined(__x86_64__)
- 			__asm__("mulq %3" : "=d" (r.m_halfs.high), "=a" (r.m_halfs.low) : "a" (a), "rm" (b) : "cc");
- 		#elif defined(__mips64)
--			__asm__("dmultu %2,%3" : "=h" (r.m_halfs.high), "=l" (r.m_halfs.low) : "r" (a), "r" (b));
-+      //typedef unsigned int uint128_t __attribute__((mode(TI)));
-+      __uint128_t tmp = (__uint128_t) a * b;
-+      r.m_halfs.high = tmp >> 64;
-+      r.m_halfs.low = tmp;
- 		#elif defined(_M_IX86)
- 			// for testing
- 			word64 t = (word64)a * b;
-diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
-index d2ec1b2..775a898 100644
---- a/src/utils/lib/CryptoPP.h
-+++ b/src/utils/lib/CryptoPP.h
-@@ -1869,10 +1869,39 @@ template <class T> inline const T& STDMAX(const T& a, const T& b)
- // #define GETBYTE(x, y) (((byte *)&(x))[y])
- 
- CRYPTOPP_DLL unsigned int Parity(unsigned long);
--CRYPTOPP_DLL unsigned int BytePrecision(unsigned long);
--CRYPTOPP_DLL unsigned int BitPrecision(unsigned long);
- CRYPTOPP_DLL unsigned long Crop(unsigned long, unsigned int size);
- 
-+template <typename T>
-+unsigned int BitPrecision(const T &value)
-+{
-+	if (!value)
-+		return 0;
-+
-+	unsigned int l=0, h=8*sizeof(value);
-+
-+	while (h-l > 1)
-+	{
-+		unsigned int t = (l+h)/2;
-+		if (value >> t)
-+			l = t;
-+		else
-+			h = t;
-+	}
-+
-+	return h;
-+}
-+
-+template <typename T>
-+unsigned int BytePrecision(const T &value)
-+{
-+	unsigned int i;
-+	for (i=sizeof(value); i; --i)
-+		if (value >> (i-1)*8)
-+			break;
-+
-+	return i;
-+}
-+
- inline unsigned int BitsToBytes(unsigned int bitCount)
- {
- 	return ((bitCount+7)/(8));

From daaa950c31476b7d68a00450ad83309bc7f06190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 24 Apr 2012 08:49:35 +0000
Subject: [PATCH 252/293] GNU Emacs 22: Use Apple-GCC.

svn path=/nixpkgs/trunk/; revision=33901
---
 pkgs/top-level/all-packages.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c12089795df..16f1e013df2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6543,15 +6543,23 @@ let
   emacs = emacs23;
 
   emacs22 = callPackage ../applications/editors/emacs-22 {
-    /* Using cpp 4.5, we get:
+    stdenv =
+      if stdenv.isDarwin
 
-         make[1]: Entering directory `/tmp/nix-build-dhbj8qqmqxwp3iw6sjcgafsrwlwrix1f-emacs-22.3.drv-0/emacs-22.3/lib-src'
-         Makefile:148: *** recipe commences before first target.  Stop.
+      /* On Darwin, use Apple-GCC, otherwise:
+           configure: error: C preprocessor "cc -E -no-cpp-precomp" fails sanity check */
+      then overrideGCC stdenv gccApple
+
+      /* Using cpp 4.5, we get:
+
+           make[1]: Entering directory `/tmp/nix-build-dhbj8qqmqxwp3iw6sjcgafsrwlwrix1f-emacs-22.3.drv-0/emacs-22.3/lib-src'
+           Makefile:148: *** recipe commences before first target.  Stop.
+
+         Apparently, this is because `lib-src/Makefile' is generated by
+         processing `lib-src/Makefile.in' with cpp, and the escaping rules for
+         literal backslashes have changed.  */
+      else overrideGCC stdenv gcc44;
 
-       Apparently, this is because `lib-src/Makefile' is generated by
-       processing `lib-src/Makefile.in' with cpp, and the escaping rules for
-       literal backslashes have changed.  */
-    stdenv = overrideGCC stdenv gcc44;
     xaw3dSupport = getConfig [ "emacs" "xaw3dSupport" ] false;
     gtkGUI = getConfig [ "emacs" "gtkSupport" ] true;
   };

From 771697634573f07f7e7372e1552b3e8c7a35488b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Apr 2012 13:54:33 +0000
Subject: [PATCH 253/293] * Linux 3.2.16.

svn path=/nixpkgs/trunk/; revision=33908
---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 69f9b5ec38ce..955c04f47e59 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -234,7 +234,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.2.15";
+    version = "3.2.16";
     testing = false;
 
     modDirVersion = version;
@@ -245,7 +245,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "19cqk1da9b1pzwxxj4k1ri38c164160pnjxf4nky2g3xryafl784";
+      sha256 = "0wkfg57xkpnmlcp8g1xkj8jf0x66s3acs9w8snfndcxbw225hqz1";
     };
 
     config = configWithPlatform stdenv.platform;

From 7e70f890c428852f6cda91fcefc0edb84031f370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 24 Apr 2012 16:14:44 +0000
Subject: [PATCH 254/293] Darwin: Change `noSysDirs' to `false' by default.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16f1e013df2b..85148250df8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21,8 +21,12 @@
   # null, the default standard environment is used.
   bootStdenv ? null
 
+, # Darwin is an "impure" platform, with its libc outside of the store.
+  # Thus, GCC, GFortran, & co. must always look for files in standard system
+  # directories (/usr/include, etc.)
+  noSysDirs ? (system != "x86_64-darwin" && system != "i686-darwin")
+
   # More flags for the bootstrapping of stdenv.
-, noSysDirs ? true
 , gccWithCC ? true
 , gccWithProfiling ? true
 

From cdc3fa04620632c30b618d8c0915af5dd0970c36 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 24 Apr 2012 17:14:24 +0000
Subject: [PATCH 255/293] Fix ilbc build

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

diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix
index 4450c6e6ef74..3ab4e7e738c9 100644
--- a/pkgs/development/libraries/ilbc/default.nix
+++ b/pkgs/development/libraries/ilbc/default.nix
@@ -4,8 +4,9 @@ stdenv.mkDerivation rec {
   name = "ilbc-rfc3951";
 
   script = fetchurl {
-    url = http://ilbcfreeware.org/documentation/extract-cfile.awk;
-    sha256 = "155izy7p7azak1h6bgafvh84b1605zyw14k2s4pyl5nd4saap5c6";
+    url = http://ilbcfreeware.org/documentation/extract-cfile.txt;
+    name = "extract-cfile.awk";
+    sha256 = "0md76qlszaras9grrxaq7xfxn1yikmz4qqgnjj6y50jg31yr5wyd";
   };
 
   rfc3951 = fetchurl {

From 3117cc72fbdec075dea5af909a5ef87e22732a40 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Apr 2012 10:12:44 +0000
Subject: [PATCH 256/293] Updated Haskell packages.

 - clientsession: updated to version 0.7.5
 - gloss: updated to version 1.7.4.1
 - haskeline: enable terminfo support and patch to support mtl >= 2.1
 - HaskellForMaths: updated to version 0.4.5
 - HsOpenSSL: updated to version 0.10.3.1
 - language-javascript: updated to version 0.5.3
 - mtl: added version 2.1.1
 - network: updated to version 2.3.0.13
 - repa-algorithms: updated to version 3.1.3.1
 - repa-examples: updated to version 3.1.3.1
 - repa-io: updated to version 3.1.3.1
 - repa: updated to version 3.1.3.2
 - resourcet: updated to version 0.3.2.1
 - RSA: updated to version 1.2.1.0
 - yesod-auth: updated to version 1.0.2
 - yesod-form: updated to version 1.0.0.3
 - yesod: updated to version 1.0.1.3
 - zlib-enum: updated to version 0.2.2

svn path=/nixpkgs/trunk/; revision=33913
---
 .../libraries/haskell/HaskellForMaths/default.nix |  4 ++--
 .../libraries/haskell/HsOpenSSL/default.nix       |  4 ++--
 .../development/libraries/haskell/RSA/default.nix | 12 ++++++++----
 .../libraries/haskell/clientsession/default.nix   |  4 ++--
 .../libraries/haskell/gloss/default.nix           |  4 ++--
 .../libraries/haskell/haskeline/default.nix       |  4 ++++
 .../haskell/language-javascript/default.nix       |  4 ++--
 pkgs/development/libraries/haskell/mtl/2.1.1.nix  | 14 ++++++++++++++
 .../network/{2.3.0.11.nix => 2.3.0.13.nix}        |  4 ++--
 .../libraries/haskell/network/2.3.0.7.nix         | 15 ---------------
 .../libraries/haskell/repa-algorithms/default.nix |  4 ++--
 .../libraries/haskell/repa-examples/default.nix   |  4 ++--
 .../libraries/haskell/repa-io/default.nix         |  4 ++--
 .../libraries/haskell/repa/default.nix            |  4 ++--
 .../libraries/haskell/resourcet/default.nix       |  4 ++--
 .../libraries/haskell/yesod-auth/default.nix      |  4 ++--
 .../libraries/haskell/yesod-form/default.nix      |  4 ++--
 .../libraries/haskell/yesod/default.nix           |  4 ++--
 .../libraries/haskell/zlib-enum/default.nix       |  3 +++
 pkgs/top-level/haskell-packages.nix               | 10 +++++-----
 20 files changed, 62 insertions(+), 52 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/mtl/2.1.1.nix
 rename pkgs/development/libraries/haskell/network/{2.3.0.11.nix => 2.3.0.13.nix} (80%)
 delete mode 100644 pkgs/development/libraries/haskell/network/2.3.0.7.nix

diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
index 8b802e6579a9..417ded6da54f 100644
--- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
+++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HaskellForMaths";
-  version = "0.4.4";
-  sha256 = "1qijaich0jwlii5wdmv0rnr6skbyacxg09nzh0i7dhk86vimz6q8";
+  version = "0.4.5";
+  sha256 = "03j83gvxjjqjwl047j0acsf9j5vs3zpzbap036sw4slq31nza2p9";
   buildDepends = [ random ];
   meta = {
     homepage = "http://haskellformaths.blogspot.com/";
diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index 0d11acb7ce87..202130516948 100644
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HsOpenSSL";
-  version = "0.10.3";
-  sha256 = "1f876xbx0a8xrs4ainmb79nisr6pflslzk26vk4psxgn9a159cvk";
+  version = "0.10.3.1";
+  sha256 = "0dilmaibx18mfg4c8g96c1svhynhkrq4i5zzv3wg0a550g3xc0py";
   buildDepends = [ network time ];
   extraLibraries = [ openssl ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index 3f9b37535952..ed14a3e8d19b 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -1,12 +1,16 @@
-{ cabal, binary, cryptoApi, monadcryptorandom, pureMD5, SHA }:
+{ cabal, binary, cryptoApi, cryptoPubkeyTypes, monadcryptorandom
+, pureMD5, SHA
+}:
 
 cabal.mkDerivation (self: {
   pname = "RSA";
-  version = "1.2.0.0";
-  sha256 = "0x4wa0yq4k43ccdakqcmy0mxvdlvrkfg6kc1j2hv7hh8b4vjisms";
+  version = "1.2.1.0";
+  sha256 = "14x53xjy4rqdgin6kyrm2b16hb0k599gfiwiwrsyri9mx3f3s1ca";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ binary cryptoApi monadcryptorandom pureMD5 SHA ];
+  buildDepends = [
+    binary cryptoApi cryptoPubkeyTypes monadcryptorandom pureMD5 SHA
+  ];
   meta = {
     description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index f52122fb3293..08e81eaa98fd 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.7.4.3";
-  sha256 = "16bnglk2mhjdlcsbp4f470yjpb6dgdf49l9lf9ygfr6g3l6hll9f";
+  version = "0.7.5";
+  sha256 = "1q2zlq06s0d476ywvb1fkxw34aagcaiqw7jrrmr3lj89q3ylhivr";
   buildDepends = [
     base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
     skein tagged
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index c8b8f65bd29c..08e08e29ec04 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.7.3.1";
-  sha256 = "0vylil8jsj7mb14dijrx2ylmsgs1ma3rh2nmiaakr5cmpp4xshf0";
+  version = "1.7.4.1";
+  sha256 = "01mxazdgmz3k8y4s2k2mj11g1m788dykx60i7bqbdwzbzc65hcfw";
   buildDepends = [ bmp GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix
index b29b73309ee1..02f36e962667 100644
--- a/pkgs/development/libraries/haskell/haskeline/default.nix
+++ b/pkgs/development/libraries/haskell/haskeline/default.nix
@@ -8,6 +8,10 @@ cabal.mkDerivation (self: {
   buildDepends = [
     extensibleExceptions filepath mtl terminfo utf8String
   ];
+  configureFlags = "-fterminfo";
+  patchPhase = ''
+    sed -i -e "s|mtl >= 1.1 && < 2.1|mtl|" haskeline.cabal
+  '';
   meta = {
     homepage = "http://trac.haskell.org/haskeline";
     description = "A command-line interface for user input, written in Haskell";
diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index 77f72ecf626e..aad2c0e185cd 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-javascript";
-  version = "0.5.2";
-  sha256 = "0q9xy72z7i2ivqzbjzn9nl5y0x07d2y3a737yw26a4zhbmhwg236";
+  version = "0.5.3";
+  sha256 = "0x0dzh7yffvf949ynpmrz5hsxcc1p87d6c30q73svgdbdym3zmka";
   buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
   buildTools = [ happy ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/mtl/2.1.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.1.nix
new file mode 100644
index 000000000000..b9298325c207
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mtl/2.1.1.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "mtl";
+  version = "2.1.1";
+  sha256 = "143s0c5hygwnd72x14jwinpnd92gx4y9blhmv6086rxijqbq6l4j";
+  buildDepends = [ transformers ];
+  meta = {
+    description = "Monad classes, using functional dependencies";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.11.nix b/pkgs/development/libraries/haskell/network/2.3.0.13.nix
similarity index 80%
rename from pkgs/development/libraries/haskell/network/2.3.0.11.nix
rename to pkgs/development/libraries/haskell/network/2.3.0.13.nix
index db53fef93941..29452da7b2e7 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.11.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.13.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network";
-  version = "2.3.0.11";
-  sha256 = "1ghm8rw0m3x71pnndbmzm9j99yh8bmmrlhz4ykslsk2my7ihmxdk";
+  version = "2.3.0.13";
+  sha256 = "0xw53czvcw8k49aqxmchc1rcd6pyxp4icwgp64625fnm3l4yjiq7";
   buildDepends = [ parsec ];
   meta = {
     homepage = "http://github.com/haskell/network";
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.7.nix b/pkgs/development/libraries/haskell/network/2.3.0.7.nix
deleted file mode 100644
index fa194ae45078..000000000000
--- a/pkgs/development/libraries/haskell/network/2.3.0.7.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.3.0.7";
-  sha256 = "1rlzdacgaq8nv0bwczsrkw47rw4aamf9y4ynm3xjw0r3w1xcg9yv";
-  buildDepends = [ parsec ];
-  meta = {
-    homepage = "http://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
index c938b6eb52ad..ca6059b68b3e 100644
--- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa-algorithms";
-  version = "3.1.0.1";
-  sha256 = "17479hp6x02vdwbn201gvxrqsc6smp5q1ip61qbfsvirjih8f3pz";
+  version = "3.1.3.1";
+  sha256 = "04d0r68k7dhk5ka9hzqf6wy9yyhjwc0rndp1ir1vllc6w6f8k4wl";
   buildDepends = [ repa vector ];
   extraLibraries = [ llvm ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix
index e807a01fe205..9acc949042f9 100644
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ b/pkgs/development/libraries/haskell/repa-examples/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa-examples";
-  version = "3.1.0.1";
-  sha256 = "1zyhq7qd7j0a0rx7j395j6330kybfi0g3whsf25clrg4znd1iwjc";
+  version = "3.1.3.1";
+  sha256 = "15fg356a8sa48vmgn5fxgbj3s48hixsl1x4a8ds0mvvv8m0zlra8";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ random repa repaAlgorithms repaIo vector ];
diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix
index 01325019a709..21844f15fc80 100644
--- a/pkgs/development/libraries/haskell/repa-io/default.nix
+++ b/pkgs/development/libraries/haskell/repa-io/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa-io";
-  version = "3.1.0.1";
-  sha256 = "1il0zsba9qz0560c56f9hn6wks5kk1bvh8bpng46w70c12gxh81w";
+  version = "3.1.3.1";
+  sha256 = "1ah5zqg3699p98820gs39xh1xipqdknlgkwxrdqsblnm33y1bqnb";
   buildDepends = [ binary bmp repa vector ];
   meta = {
     homepage = "http://repa.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index ae65e52168f1..3d0e6df4c1ca 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa";
-  version = "3.1.2.1";
-  sha256 = "15g2l8f5d02jy63ljyvjdd2ymdml072bjylsxvn4xmr0jzmi689x";
+  version = "3.1.3.2";
+  sha256 = "0xz5813q0km8kv50gs6vzp3lgl64xayi9l4zksha4gjb5lq5yn2y";
   buildDepends = [ QuickCheck vector ];
   meta = {
     homepage = "http://repa.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index a01055f47c57..adc6c2b40a84 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.3.2";
-  sha256 = "0vaygw17cfx2y2lv32lmr7x0vch58dh19jmh8j7mcj11qy5v0nz8";
+  version = "0.3.2.1";
+  sha256 = "1gqcqbj9f13b9myrg7nhydrbbqnn80k69s65qsk3rc8wsqyk8i6g";
   buildDepends = [
     liftedBase monadControl transformers transformersBase
   ];
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index d05d4620c574..4ee7f77e5263 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.0.1";
-  sha256 = "0rbpf2fldpd46dbcd77zryb91gh3q86k5xdb07clsy384qx7ynq6";
+  version = "1.0.2";
+  sha256 = "1rbp62phyzlxm458xgqxg3qg5fvivmhcgzd8pprqy9ya0v58wwlr";
   buildDepends = [
     aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail
     persistent persistentTemplate pureMD5 pwstoreFast random SHA
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 99a84fcbe05a..85a6228e7935 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.0.0.2";
-  sha256 = "1jvp0hw9kprwcwdxx1i2aazycf03i1vf8q5vjmdpynhgzyrpkrx1";
+  version = "1.0.0.3";
+  sha256 = "0xqgvmpxv9lrpl06qh3pqn53f5pa02k8v5c4z6brzb8s44ppw1pq";
   buildDepends = [
     blazeBuilder blazeHtml dataDefault emailValidate hamlet network
     persistent shakespeareCss shakespeareJs text time transformers wai
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index ff8318e1fa77..8ceeb03fd947 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.0.1.1";
-  sha256 = "17dg6n37hdyizw3g5jqsg08ax31ilm4nlsvvsiaf6ywr7q0wrylz";
+  version = "1.0.1.3";
+  sha256 = "0pbfvaza4q8znnxpkh9fb1fys09byws9n34lv0rs70nrbdq5yp5r";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix
index 0e1245bca0c7..43e6bdef2605 100644
--- a/pkgs/development/libraries/haskell/zlib-enum/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix
@@ -7,6 +7,9 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ enumerator transformers zlibBindings ];
+  patchPhase = ''
+    sed -i -e "s|transformers  *== 0\.2\.\*|transformers|" zlib-enum.cabal
+  '';
   meta = {
     homepage = "http://github.com/maltem/zlib-enum";
     description = "Enumerator interface for zlib compression";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b52c77b0ef26..03b86feb1543 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -140,7 +140,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     haskellSrc   = self.haskellSrc_1_0_1_5;     # 7.4.1 ok
     html         = self.html_1_0_1_2;           # 7.4.1 ok
     HUnit        = self.HUnit_1_2_4_2;          # 7.4.1 ok
-    network      = self.network_2_3_0_11;       # 7.4.1 ok
+    network      = self.network_2_3_0_13;       # 7.4.1 ok
     OpenGL       = self.OpenGL_2_5_0_0;         # 7.4.1 ok
     parallel     = self.parallel_3_2_0_2;       # 7.4.1 ok
     parsec       = self.parsec_3_1_2;           # 7.4.1 ok
@@ -1018,11 +1018,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {};
   mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {};
   mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {};
-  mtl_2_1 = callPackage ../development/libraries/haskell/mtl/2.1.nix {
+  mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {
     transformers = self.transformers_0_3_0_0;
   };
   mtl1 = self.mtl_1_1_0_2;
-  mtl2 = self.mtl_2_1;
+  mtl2 = self.mtl_2_1_1;
   mtl  = self.mtl2;
 
   mtlparse = callPackage ../development/libraries/haskell/mtlparse {};
@@ -1045,8 +1045,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
   network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {};
   network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {};
-  network_2_3_0_11 = callPackage ../development/libraries/haskell/network/2.3.0.11.nix {};
-  network = self.network_2_3_0_11;
+  network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {};
+  network = self.network_2_3_0_13;
 
   networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
 

From 12130aea67d5e74cc543d5e81a26fb7e7a058fdb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Apr 2012 12:24:16 +0000
Subject: [PATCH 257/293] * Bump nixUnstable.

svn path=/nixpkgs/trunk/; revision=33915
---
 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 f0675398cc39..faac506ce22a 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre2661_9cd3ff1";
+  name = "nix-1.0pre2665_6387830";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/2416959/download/4/${name}.tar.bz2";
-    sha256 = "6341b512f3c48477af50d234311e23d889a4333c865bfb4a2c619196e58dd7bd";
+    url = "http://hydra.nixos.org/build/2449982/download/4/${name}.tar.bz2";
+    sha256 = "eccc818be882addfe54468c2a53c90fc565ea795d61ff986aae0b30f2909eb4d";
   };
 
   buildNativeInputs = [ perl pkgconfig ];

From b222e1b61ff314313c3ac0d0aeaac6c5e053a535 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Apr 2012 13:33:25 +0000
Subject: [PATCH 258/293] * Updated the EC2 API tools to 1.5.3.0.

svn path=/nixpkgs/trunk/; revision=33916
---
 pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
index fbc210c86090..1d146aa449e8 100644
--- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, makeWrapper, jre }:
 
 stdenv.mkDerivation {
-  name = "ec2-api-tools-1.5.2.5";
+  name = "ec2-api-tools-1.5.3.0";
   
   src = fetchurl {
     url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip;
-    sha256 = "1p4126hcxz0c1kcrhdlsgx31klh3kv7kp8dn9sgjivmgxgillyyc";
+    sha256 = "0p0rk3bhk35b3dxdy8wjnbbj5zh1va63yfvdk5jxnzdzplds8v65";
   };
 
   buildInputs = [ unzip makeWrapper ];

From 32d84a23382c114bb6f00587e9048ce938d34771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 25 Apr 2012 13:56:08 +0000
Subject: [PATCH 259/293] Adding a mirror for the pyqt version we use; the
 usual upstream channel does not have the file anymore.

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

diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix
index 5097e95f7e43..7081c28ddd85 100644
--- a/pkgs/development/python-modules/pyqt/default.nix
+++ b/pkgs/development/python-modules/pyqt/default.nix
@@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
   name = "PyQt-x11-gpl-4.8.5";
   
   src = fetchurl {
-    url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz";
+    urls = [
+      "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz"
+      "http://pkgs.fedoraproject.org/lookaside/pkgs/PyQt4/PyQt-x11-gpl-4.8.5.tar.gz/0e4264bb912edfbda319bb236ac84407/PyQt-x11-gpl-4.8.5.tar.gz"
+    ];
     sha256 = "0838nfis6xj92n4gccih7j14yigfm3x7p59yr7qa5jy75wxdzqn9";
   };
   

From 75f636067eb94f46731b1edc4ab82417e027751c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 25 Apr 2012 14:21:41 +0000
Subject: [PATCH 260/293] GNU Emacs 23: Use Apple-GCC on Darwin.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85148250df8f..ea767ac4b9bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6569,6 +6569,13 @@ let
   };
 
   emacs23 = callPackage ../applications/editors/emacs-23 {
+    stdenv =
+      if stdenv.isDarwin
+      /* On Darwin, use Apple-GCC, otherwise:
+           configure: error: C preprocessor "cc -E -no-cpp-precomp" fails sanity check */
+      then overrideGCC stdenv gccApple
+      else stdenv;
+
     # use override to select the appropriate gui toolkit
     libXaw = if stdenv.isDarwin then xlibs.libXaw else null;
     Xaw3d = null;

From 95d60d69384f25e7b0112142b85f6bec2c1a8114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 25 Apr 2012 14:25:34 +0000
Subject: [PATCH 261/293] nixUnstable: Use Apple-GCC on Darwin.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea767ac4b9bf..f52711eaf532 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8512,6 +8512,11 @@ let
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = getConfig [ "nix" "storeDir" ] "/nix/store";
     stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
+    stdenv =
+      if stdenv.isDarwin
+      # When building the Perl bindings, `-no-cpp-precomp' is used.
+      then overrideGCC stdenv gccApple
+      else stdenv;
   };
 
   nixSqlite = nixUnstable;

From f5da2fe9023c74ae4ab85386f1fb90f5c967c59a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 25 Apr 2012 21:31:09 +0000
Subject: [PATCH 262/293] Updating calibre

svn path=/nixpkgs/trunk/; revision=33922
---
 pkgs/applications/misc/calibre/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 9ee87fe30625..d8e69e296399 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.8.32";
+  name = "calibre-0.8.48";
 
   src = fetchurl {
     url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz";
-    sha256 = "0d0zq4sr0qm8jarg0ps24lfizb4hyb57pjsp81y1sb5nzjki7jml";
+    sha256 = "0i2js6d64ribflvcwjj8xbyq2zicj484pl19jl6spprw4ny5im42";
   };
 
   inherit python;
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = { 
+  meta = {
     description = "Comprehensive e-book software";
     homepage = http://calibre-ebook.com;
     license = "GPLv3";

From 9ed244d86ce8737303f3c5dbfffc774311a96132 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 26 Apr 2012 08:01:34 +0000
Subject: [PATCH 263/293] Updated Haskell packages.

 - language-javascript: updated to version 0.5.4
 - syb: updated to version 0.3.6.1
 - yesod: updated to version 1.0.1.5
 - zlib-enum: updated to version 0.2.2.1

svn path=/nixpkgs/trunk/; revision=33923
---
 .../libraries/haskell/language-javascript/default.nix  |  4 ++--
 .../libraries/haskell/syb/{0.3.6.nix => 0.3.6.1.nix}   |  4 ++--
 pkgs/development/libraries/haskell/yesod/default.nix   |  4 ++--
 .../libraries/haskell/zlib-enum/default.nix            |  7 ++-----
 pkgs/top-level/haskell-packages.nix                    | 10 +++++-----
 5 files changed, 13 insertions(+), 16 deletions(-)
 rename pkgs/development/libraries/haskell/syb/{0.3.6.nix => 0.3.6.1.nix} (79%)

diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index aad2c0e185cd..3f04b3a92893 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-javascript";
-  version = "0.5.3";
-  sha256 = "0x0dzh7yffvf949ynpmrz5hsxcc1p87d6c30q73svgdbdym3zmka";
+  version = "0.5.4";
+  sha256 = "0hjx12n3pkxcdkppqalv6sl68vjlib37gby89ksay807ndslvb9q";
   buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
   buildTools = [ happy ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix
similarity index 79%
rename from pkgs/development/libraries/haskell/syb/0.3.6.nix
rename to pkgs/development/libraries/haskell/syb/0.3.6.1.nix
index 6d9393f60c29..7638ab3332f2 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.6.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "syb";
-  version = "0.3.6";
-  sha256 = "1khb5h4gw1f9l9zhb7x1y9rf2qpypbvm9kmpf0b6xgggd2800s25";
+  version = "0.3.6.1";
+  sha256 = "1xyz6ahyvairzb5n1mrmryzrxrkd4m8ywxa6r6x5nqm2xa7zqv34";
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
     description = "Scrap Your Boilerplate";
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 8ceeb03fd947..b8ffdba7c6ed 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.0.1.3";
-  sha256 = "0pbfvaza4q8znnxpkh9fb1fys09byws9n34lv0rs70nrbdq5yp5r";
+  version = "1.0.1.5";
+  sha256 = "1va0pq5gn10anh333fqv8a99gngjip5w5lwl4i5q7lbparz93iji";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix
index 43e6bdef2605..d4ec47410fc8 100644
--- a/pkgs/development/libraries/haskell/zlib-enum/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix
@@ -2,14 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-enum";
-  version = "0.2.2";
-  sha256 = "1fmlvjj1krigj5aqipq5pf0mqnybr7zz50mgqr30kznfg48ry29y";
+  version = "0.2.2.1";
+  sha256 = "02ava6h40bqfmby33683nxasfw5fmrgfvbx6kqgz1gqz5921gjx9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ enumerator transformers zlibBindings ];
-  patchPhase = ''
-    sed -i -e "s|transformers  *== 0\.2\.\*|transformers|" zlib-enum.cabal
-  '';
   meta = {
     homepage = "http://github.com/maltem/zlib-enum";
     description = "Enumerator interface for zlib compression";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 03b86feb1543..4134447eaaad 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -149,7 +149,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     regexCompat  = self.regexCompat_0_95_1;     # 7.4.1 ok
     regexPosix   = self.regexPosix_0_95_1;      # 7.4.1 ok
     stm          = self.stm_2_3;		# 7.4.1 ok
-    syb          = self.syb_0_3_6;              # 7.4.1 ok
+    syb          = self.syb_0_3_6_1;            # 7.4.1 ok
     xhtml        = self.xhtml_3000_2_0_5;       # 7.4.1 ok
     zlib         = self.zlib_0_5_3_3;           # 7.4.1 ok
     HTTP         = self.HTTP_4000_2_3;          # 7.4.1 ok
@@ -1259,11 +1259,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   stringCombinators = callPackage ../development/libraries/haskell/string-combinators {};
 
   syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
-  syb_0_3   = callPackage ../development/libraries/haskell/syb/0.3.nix {};
+  syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {};
   syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {};
-  syb_0_3_6 = callPackage ../development/libraries/haskell/syb/0.3.6.nix {};
-  syb       = null; # by default, we assume that syb ships with GHC, which is
-                    # true for the older GHC versions
+  syb_0_3_6_1 = callPackage ../development/libraries/haskell/syb/0.3.6.1.nix {};
+  syb = null;  # by default, we assume that syb ships with GHC, which is
+               # true for the older GHC versions
 
   sybWithClass = callPackage ../development/libraries/haskell/syb/syb-with-class.nix {};
 

From 2e44afa7bb73732ddc82a6a218830420e99ea7ef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 26 Apr 2012 08:09:31 +0000
Subject: [PATCH 264/293] ikiwiki: updated to version 3.20120419

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

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index e4899bfc463f..51e765bb690a 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -12,14 +12,14 @@ assert monotoneSupport -> (monotone != null);
 
 let
   name = "ikiwiki";
-  version = "3.20120202";
+  version = "3.20120419";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "0bada9a98e0990c6d99e8ca978e42926578aec36d033d6a273e415349a6cbb48";
+    sha256 = "0d4fd709f4b3d33336d2dfa27f08e1473019d87869d9c1ffcb77f3ca9c434eaf";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

From fbd90d21036025b479bf9f74c77c76aa63f3be56 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Apr 2012 13:24:58 +0000
Subject: [PATCH 265/293] * SQLite updated to 3.7.11.

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

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 5d256bc70241..e6f1249ffa27 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert readline != null -> ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.7.9";
+  name = "sqlite-3.7.11";
 
   src = fetchurl {
-    url = http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz;
-    sha1 = "a9da98a4bde4d9dae5c29a969455d11a03600e11";
+    url = http://www.sqlite.org/sqlite-autoconf-3071100.tar.gz;
+    sha256 = "0ss7nd61jmfkz6piw9838c2msa14axjjlkf4d36rn91nqmfwgb9b";
   };
 
   buildInputs = [ readline ncurses ];

From 48b2a26898b70ba69e32ca74b0e0e42ebf6af241 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Apr 2012 13:25:20 +0000
Subject: [PATCH 266/293] * Firefox 12.0.

svn path=/nixpkgs/trunk/; revision=33931
---
 .../browsers/firefox/{9.0.nix => 12.0.nix}           | 11 ++++++-----
 pkgs/top-level/all-packages.nix                      | 12 ++++++------
 pkgs/top-level/release.nix                           |  1 +
 3 files changed, 13 insertions(+), 11 deletions(-)
 rename pkgs/applications/networking/browsers/firefox/{9.0.nix => 12.0.nix} (94%)

diff --git a/pkgs/applications/networking/browsers/firefox/9.0.nix b/pkgs/applications/networking/browsers/firefox/12.0.nix
similarity index 94%
rename from pkgs/applications/networking/browsers/firefox/9.0.nix
rename to pkgs/applications/networking/browsers/firefox/12.0.nix
index 327f454f5781..d4b90d2726f1 100644
--- a/pkgs/applications/networking/browsers/firefox/9.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/12.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "9.0.1";
+  firefoxVersion = "12.0";
   
-  xulVersion = "9.0.1"; # this attribute is used by other packages
+  xulVersion = "12.0"; # this attribute is used by other packages
 
   
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "e0748d86753eead5c0929d74158c601bf33b5db0";
+    sha1 = "0177185e54b7d63dc36bd5bd5c80ba6afd52e199";
   };
   
   commonConfigureFlags =
@@ -35,7 +35,7 @@ rec {
       "--with-system-nspr"
       # "--with-system-nss"
       # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      "--enable-system-cairo"
+      # "--enable-system-cairo" # disabled for the moment because our Cairo is too old
       "--enable-system-sqlite"
       "--disable-crashreporter"
       "--disable-tests"
@@ -139,7 +139,7 @@ rec {
       [ "--enable-application=browser"
         "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
         "--enable-chrome-format=jar"
-	"--disable-elf-hack"
+        "--disable-elf-hack"
       ]
       ++ commonConfigureFlags
       ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
@@ -170,6 +170,7 @@ rec {
     meta = {
       description = "Mozilla Firefox - the browser, reloaded";
       homepage = http://www.mozilla.com/en-US/firefox/;
+      maintainers = [ stdenv.lib.maintainers.eelco ];
     };
 
     passthru = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f52711eaf532..76302a63b8ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6752,12 +6752,6 @@ let
 
   firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
 
-  firefox9Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix {
-    inherit (gnome) libIDL;
-  };
-
-  firefox9Wrapper = wrapFirefox { browser = firefox9Pkgs.firefox; };
-
   firefox10Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix {
     inherit (gnome) libIDL;
   };
@@ -6770,6 +6764,12 @@ let
 
   firefox11Wrapper = wrapFirefox { browser = firefox11Pkgs.firefox; };
 
+  firefox12Pkgs = callPackage ../applications/networking/browsers/firefox/12.0.nix {
+    inherit (gnome) libIDL;
+  };
+
+  firefox12Wrapper = wrapFirefox { browser = firefox12Pkgs.firefox; };
+
   flac = callPackage ../applications/audio/flac { };
 
   flashplayer = flashplayer11;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 1d2551352b8f..67aec37a821b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -362,6 +362,7 @@ with (import ./release-lib.nix);
   firefox36Pkgs.firefox = linux;
   firefox10Pkgs.firefox = linux;
   firefox11Pkgs.firefox = linux;
+  firefox12Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;

From e5fc65ed40fa984d87c40399f51f3e96fc78d619 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Apr 2012 15:01:41 +0000
Subject: [PATCH 267/293] * writeTextFile: don't use the build hook.  NixOS
 uses this function a   lot, and it causes a lot of unnecessary overhead on
 machines with   remote building enabled.

svn path=/nixpkgs/trunk/; revision=33934
---
 pkgs/build-support/trivial-builders.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index c8f0272daf81..474d43c30fff 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -18,7 +18,11 @@ rec {
     , executable ? false # run chmod +x ?
     , destination ? ""   # relative path appended to $out eg "/bin/foo"
     }:
-    runCommand name {inherit text executable; }
+    runCommand name
+      { inherit text executable;
+        # Pointless to do this on a remote machine.
+        preferLocalBuild = true;
+      }
       ''
         n=$out${destination}
         mkdir -p "$(dirname "$n")"

From fa276c45dd0834dff731251c3d4c1fe8bc6a11e0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Apr 2012 15:17:43 +0000
Subject: [PATCH 268/293] * Set preferLocalBuild on a few more trivial
 builders.

svn path=/nixpkgs/trunk/; revision=33935
---
 pkgs/build-support/buildenv/default.nix          | 4 +++-
 pkgs/build-support/substitute/substitute-all.nix | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 1bfada4fb627..63e4481e4e34 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -26,7 +26,9 @@
 }:
 
 runCommand name
-  { inherit manifest paths ignoreCollisions pathsToLink postBuild; }
+  { inherit manifest paths ignoreCollisions pathsToLink postBuild;
+    preferLocalBuild = true;
+  }
   ''
     ${perl}/bin/perl -w ${./builder.pl}
     eval "$postBuild"
diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix
index 6c0f970a392a..fb26894661d9 100644
--- a/pkgs/build-support/substitute/substitute-all.nix
+++ b/pkgs/build-support/substitute/substitute-all.nix
@@ -1,4 +1,4 @@
-{stdenv}:
+{ stdenv }:
 
 args:
 
@@ -6,4 +6,5 @@ stdenv.mkDerivation ({
   name = if args ? name then args.name else baseNameOf (toString args.src);
   builder = ./substitute-all.sh;
   inherit (args) src;
+  preferLocalBuild = true;
 } // args)

From 27de56316468dad84e589540faec91c179f29377 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 27 Apr 2012 08:20:46 +0000
Subject: [PATCH 269/293] Updated Python 3.x.

 - updated to version 3.2.3
 - fixed version numbers in setup-hook.sh
 - sort input variable list alphabetically
 - tk support needs x11 support as well
 - deleted obsolete version 3.1

Furthermore, all CPPFLAGS and LDFLAGS required to find the build inputs are now
explicitly passed to ./configure. The python 3.x build systems tries to ignore
the environment as much as possible to provide deterministic builds. This means
that our magic environment variable stuff won't work, and previously built
python3 binaries lacked all kinds of extensions, such as zlib, etc.

svn path=/nixpkgs/trunk/; revision=33937
---
 .../interpreters/python/3.1/default.nix       | 85 -------------------
 .../interpreters/python/3.1/search-path.patch | 27 ------
 .../interpreters/python/3.1/setup-hook.sh     | 15 ----
 .../interpreters/python/3.2/default.nix       | 35 ++++----
 .../interpreters/python/3.2/setup-hook.sh     |  4 +-
 pkgs/top-level/all-packages.nix               |  2 -
 6 files changed, 19 insertions(+), 149 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/3.1/default.nix
 delete mode 100644 pkgs/development/interpreters/python/3.1/search-path.patch
 delete mode 100644 pkgs/development/interpreters/python/3.1/setup-hook.sh

diff --git a/pkgs/development/interpreters/python/3.1/default.nix b/pkgs/development/interpreters/python/3.1/default.nix
deleted file mode 100644
index 92b090bb41ee..000000000000
--- a/pkgs/development/interpreters/python/3.1/default.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ stdenv, fetchurl
-, zlib
-, bzip2
-, gdbm
-, sqlite
-, db4
-, ncurses
-, readline
-, openssl
-, tcl, tk
-, libX11, xproto
-}:
-
-assert readline != null -> ncurses != null;
-
-with stdenv.lib;
-
-let
-  majorVersion = "3.1";
-  version = "${majorVersion}.3";
-
-  buildInputs = filter (p: p != null) [
-    zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
-  ];
-in
-stdenv.mkDerivation {
-  name = "python3-${version}";
-  inherit majorVersion version;
-
-  src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    sha256 = "1jsqapgwrcqcaskyi2qdn1xj7l8x5340a137hdfshk5ya4dg9xkp";
-  };
-
-  inherit buildInputs;
-  patches = [ ./search-path.patch ];
-
-  C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
-  LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
-  configureFlags = "--enable-shared --with-threads --enable-unicode --with-wctype-functions";
-
-  preConfigure = ''
-    for i in /usr /sw /opt /pkg; do	# improve purity
-      substituteInPlace ./setup.py --replace $i /no-such-path
-    done
-    ${optionalString (ncurses != null) ''export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"''}
-    ${optionalString stdenv.isDarwin   ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  postInstall = ''
-    rm -rf "$out/lib/python${majorVersion}/test"
-  '';
-
-  passthru = {
-    zlibSupport = zlib != null;
-    sqliteSupport = sqlite != null;
-    db4Support = db4 != null;
-    readlineSupport = readline != null;
-    opensslSupport = openssl != null;
-    tkSupport = (tk != null) && (tcl != null);
-    libPrefix = "python${majorVersion}";
-  };
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = "http://python.org";
-    description = "a high-level dynamically-typed programming language";
-    longDescription = ''
-      Python is a remarkably powerful dynamic programming language that
-      is used in a wide variety of application domains. Some of its key
-      distinguishing features include: clear, readable syntax; strong
-      introspection capabilities; intuitive object orientation; natural
-      expression of procedural code; full modularity, supporting
-      hierarchical packages; exception-based error handling; and very
-      high level dynamic data types.
-    '';
-    license = stdenv.lib.licenses.psfl;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
-  };
-
-}
diff --git a/pkgs/development/interpreters/python/3.1/search-path.patch b/pkgs/development/interpreters/python/3.1/search-path.patch
deleted file mode 100644
index 2e7b7526c0ce..000000000000
--- a/pkgs/development/interpreters/python/3.1/search-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py
-*** Python-2.4.4-orig/setup.py	2006-10-08 19:41:25.000000000 +0200
---- Python-2.4.4/setup.py	2007-05-27 16:04:54.000000000 +0200
-***************
-*** 279,288 ****
-          # Check for AtheOS which has libraries in non-standard locations
-          if platform == 'atheos':
-              lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
--             lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-              inc_dirs += ['/system/include', '/atheos/autolnk/include']
--             inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-  
-          # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-          if platform in ['osf1', 'unixware7', 'openunix8']:
-              lib_dirs += ['/usr/ccs/lib']
---- 279,289 ----
-          # Check for AtheOS which has libraries in non-standard locations
-          if platform == 'atheos':
-              lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
-              inc_dirs += ['/system/include', '/atheos/autolnk/include']
-  
-+         lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-+         inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-+         
-          # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-          if platform in ['osf1', 'unixware7', 'openunix8']:
-              lib_dirs += ['/usr/ccs/lib']
diff --git a/pkgs/development/interpreters/python/3.1/setup-hook.sh b/pkgs/development/interpreters/python/3.1/setup-hook.sh
deleted file mode 100644
index 09a086714bb5..000000000000
--- a/pkgs/development/interpreters/python/3.1/setup-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-addPythonPath() {
-    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.1/site-packages
-}
-
-toPythonPath() {
-    local paths="$1"
-    local result=
-    for i in $paths; do
-        p="$i/lib/python3.1/site-packages"
-        result="${result}${result:+:}$p"
-    done
-    echo $result
-}
-
-envHooks=(${envHooks[@]} addPythonPath)
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index 6e496e0ea1ad..64442f2e35b6 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl
-, zlib
 , bzip2
-, gdbm
-, sqlite
 , db4
-, ncurses
-, readline
-, openssl
-, tcl, tk
+, gdbm
 , libX11, xproto
+, ncurses
+, openssl
+, readline
+, sqlite
+, tcl, tk
+, zlib
 }:
 
 assert readline != null -> ncurses != null;
@@ -17,7 +17,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.2";
-  version = "${majorVersion}";
+  version = "${majorVersion}.3";
 
   buildInputs = filter (p: p != null) [
     zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
@@ -29,21 +29,20 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    sha256 = "06awxchnv8gai6415pgzz2x8f1xi38v8a4anz6n39ciwq7v5zzbv";
+    sha256 = "5648ec81f93870fde2f0aa4ed45c8718692b15ce6fd9ed309bfb827ae12010aa";
   };
 
-  inherit buildInputs;
-
-  C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
-  LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
-  configureFlags = "--enable-shared --with-threads --enable-unicode --with-wctype-functions";
-
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
       substituteInPlace ./setup.py --replace $i /no-such-path
     done
-    ${optionalString (ncurses != null) ''export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"''}
-    ${optionalString stdenv.isDarwin   ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
+    ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
+
+    configureFlagsArray=( --enable-shared --with-threads
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+                          LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}"
+                        )
   '';
 
   setupHook = ./setup-hook.sh;
@@ -58,7 +57,7 @@ stdenv.mkDerivation {
     db4Support = db4 != null;
     readlineSupport = readline != null;
     opensslSupport = openssl != null;
-    tkSupport = (tk != null) && (tcl != null);
+    tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
     libPrefix = "python${majorVersion}";
   };
 
diff --git a/pkgs/development/interpreters/python/3.2/setup-hook.sh b/pkgs/development/interpreters/python/3.2/setup-hook.sh
index 09a086714bb5..e6fa34bf54ba 100644
--- a/pkgs/development/interpreters/python/3.2/setup-hook.sh
+++ b/pkgs/development/interpreters/python/3.2/setup-hook.sh
@@ -1,12 +1,12 @@
 addPythonPath() {
-    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.1/site-packages
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages
 }
 
 toPythonPath() {
     local paths="$1"
     local result=
     for i in $paths; do
-        p="$i/lib/python3.1/site-packages"
+        p="$i/lib/python3.2/site-packages"
         result="${result}${result:+:}$p"
     done
     echo $result
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76302a63b8ec..733b758f1058 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2757,8 +2757,6 @@ let
 
   python27 = callPackage ../development/interpreters/python/2.7 { };
 
-  python31 = callPackage ../development/interpreters/python/3.1 { };
-
   python32 = callPackage ../development/interpreters/python/3.2 { };
 
   pythonFull = python27Full;

From 5287bbf3a8cd7bff2bb1207e0d184099d2aa21fe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 27 Apr 2012 09:31:11 +0000
Subject: [PATCH 270/293] * Don't build mysql-workbench on i686-linux since it
 just hangs   (http://hydra.nixos.org/build/2482930).

svn path=/nixpkgs/trunk/; revision=33939
---
 pkgs/applications/misc/mysql-workbench/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index a92e2fd37b02..5a1fa56ddc6d 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -72,6 +72,6 @@ exec 19> $FIFOCTL
     homepage = http://wb.mysql.com/;
     license = licenses.gpl2;
     maintainers = [ maintainers.kkallio ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }

From ce7f9e1d14ccbf5223e358772dbb922c172d78c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 27 Apr 2012 13:18:36 +0000
Subject: [PATCH 271/293] Updated Haskell packages.

 - crypto-api: updated to version 0.10.2
 - hashtables: updated to version 1.0.1.6
 - hjsmin: updated to version 0.1.1
 - repa: updated to version 3.1.3.3

svn path=/nixpkgs/trunk/; revision=33940
---
 pkgs/development/libraries/haskell/crypto-api/default.nix | 4 ++--
 pkgs/development/libraries/haskell/hashtables/default.nix | 4 ++--
 pkgs/development/libraries/haskell/hjsmin/default.nix     | 4 ++--
 pkgs/development/libraries/haskell/repa/default.nix       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
index 742da01b464c..5f71e6222508 100644
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-api";
-  version = "0.10.1";
-  sha256 = "1l73c9pik6109frzyrxh8kpdsfpa9wf6ijnd8zfbnhmk5pn6jaww";
+  version = "0.10.2";
+  sha256 = "06dbvdwyw2hf5cafpjfhasgyzzbigvvg74c47lafvqvgxvn9v4ms";
   buildDepends = [ cereal entropy largeword tagged ];
   meta = {
     homepage = "http://trac.haskell.org/crypto-api/wiki";
diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix
index d6852e7f81b0..1f9e4b418e28 100644
--- a/pkgs/development/libraries/haskell/hashtables/default.nix
+++ b/pkgs/development/libraries/haskell/hashtables/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hashtables";
-  version = "1.0.1.4";
-  sha256 = "1s1xj5x90dz9n85bkmjpdp8zwnvvv13m19aaxzi63n3iyn4jki33";
+  version = "1.0.1.6";
+  sha256 = "071msa15447rk2zc5jbpms8sc1ml8yi1n5pycycrcik8dhsm3slb";
   buildDepends = [ hashable primitive vector ];
   meta = {
     homepage = "http://github.com/gregorycollins/hashtables";
diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index edd5b3afea85..a61d798f429a 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hjsmin";
-  version = "0.1.0";
-  sha256 = "071aa5xvg4arrmphrr6880kmgjifrglnhiabrc7iv0r5ycgav001";
+  version = "0.1.1";
+  sha256 = "0v28z5l5fraf09b65j0fm75b702xp1s4ar8p5g9kigfn1wh8b62k";
   buildDepends = [ blazeBuilder languageJavascript text ];
   meta = {
     homepage = "http://github.com/alanz/hjsmin";
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index 3d0e6df4c1ca..10a9c2414efc 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa";
-  version = "3.1.3.2";
-  sha256 = "0xz5813q0km8kv50gs6vzp3lgl64xayi9l4zksha4gjb5lq5yn2y";
+  version = "3.1.3.3";
+  sha256 = "108zifbgngwd5a3bkvkm4sh2nhds748wqk227mcsxcw9y085da0f";
   buildDepends = [ QuickCheck vector ];
   meta = {
     homepage = "http://repa.ouroborus.net";

From 6c37520d2a0a0a01a066b23e11aaff8bd2b28deb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Apr 2012 14:14:16 +0000
Subject: [PATCH 272/293] numpy: fixed build (patch by Konrad Hinsen)

svn path=/nixpkgs/trunk/; revision=33941
---
 .../numpy/no_default_dirs.patch               | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  5 ++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/numpy/no_default_dirs.patch

diff --git a/pkgs/development/python-modules/numpy/no_default_dirs.patch b/pkgs/development/python-modules/numpy/no_default_dirs.patch
new file mode 100644
index 000000000000..8e1f58974f5c
--- /dev/null
+++ b/pkgs/development/python-modules/numpy/no_default_dirs.patch
@@ -0,0 +1,28 @@
+diff -ur numpy-1.6.1-orig/numpy/distutils/system_info.py numpy-1.6.1/numpy/distutils/system_info.py
+--- numpy-1.6.1-orig/numpy/distutils/system_info.py	2011-07-01 17:31:13.000000000 -0400
++++ numpy-1.6.1/numpy/distutils/system_info.py	2012-04-27 14:10:38.000000000 -0400
+@@ -189,18 +189,12 @@
+     default_x11_lib_dirs = []
+     default_x11_include_dirs = []
+ else:
+-    default_lib_dirs = libpaths(['/usr/local/lib','/opt/lib','/usr/lib',
+-                                 '/opt/local/lib','/sw/lib'], platform_bits)
+-    default_include_dirs = ['/usr/local/include',
+-                            '/opt/include', '/usr/include',
+-                            '/opt/local/include', '/sw/include',
+-                            '/usr/include/suitesparse']
+-    default_src_dirs = ['.','/usr/local/src', '/opt/src','/sw/src']
+-
+-    default_x11_lib_dirs = libpaths(['/usr/X11R6/lib','/usr/X11/lib',
+-                                     '/usr/lib'], platform_bits)
+-    default_x11_include_dirs = ['/usr/X11R6/include','/usr/X11/include',
+-                                '/usr/include']
++    default_lib_dirs = []
++    default_include_dirs = []
++    default_src_dirs = ['.']
++
++    default_x11_lib_dirs = []
++    default_x11_include_dirs = []
+ 
+ if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
+     default_lib_dirs.insert(0,os.path.join(sys.prefix, 'lib'))
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 002fc8daff10..3c9f6bef92ee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1081,9 +1081,10 @@ let pythonPackages = python.modules // rec {
       sha256 = "1pawfmf7j7pd3mjzhmmw9hkglc2qdirrkvv29m5nsmpf2b3ip2vq";
     };
 
-    # TODO: add ATLAS=${pkgs.atlas}
+    patches = [ ../development/python-modules/numpy/no_default_dirs.patch ];
+
     installCommand = ''
-      export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
+      export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} ATLAS=${pkgs.atlas}
       python setup.py build --fcompiler="gnu95"
       python setup.py install --prefix=$out
     '';

From 23506543a4dd6ea7b31feb7646cc498194a43be6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 29 Apr 2012 14:09:58 +0000
Subject: [PATCH 273/293] Add minecraft
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch by Carles Pagès, minor modification (adding in version number, updating
sha256) by me

svn path=/nixpkgs/trunk/; revision=33944
---
 pkgs/games/minecraft/default.nix | 36 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/games/minecraft/default.nix

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
new file mode 100644
index 000000000000..171e73896c65
--- /dev/null
+++ b/pkgs/games/minecraft/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
+, mesa, openal}:
+
+stdenv.mkDerivation {
+  name = "minecraft-1.2.5";
+
+  src = fetchurl {
+    url = "https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft.jar";
+    sha256 = "0yp3wgy93wm746dkv6kbljhmzdqbcg4qhwkvnaaq4ml84mvvjp38";
+  };
+
+  phases = "installPhase";
+
+  installPhase = ''
+    set -x
+    mkdir -pv $out/bin
+    cp -v $src $out/minecraft.jar
+
+    cat > $out/bin/minecraft << EOF
+    #!${stdenv.shell}
+
+    # wrapper for minecraft
+    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
+    ${jre}/bin/java -jar $out/minecraft.jar
+    EOF
+
+    chmod +x $out/bin/minecraft
+  '';
+
+  meta = {
+      description = "A sandbox-building game";
+      homepage = http://www.minecraft.net;
+      maintainers = [ "Carles Pagès <page@cubata.homelinux.net>" stdenv.lib.maintainers.shlevy ];
+      license = "unfree-redistributable";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 733b758f1058..71f3949d3c85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1003,6 +1003,8 @@ let
 
   mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { };
 
+  minecraft = callPackage ../games/minecraft { };
+
   miniupnpc = callPackage ../tools/networking/miniupnpc { };
 
   miniupnpd = callPackage ../tools/networking/miniupnpd { };

From 0eac8bb0847551a0da0411529c309c5039029eda Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 29 Apr 2012 18:17:46 +0000
Subject: [PATCH 274/293] mysql51: update location of mysql-5.1.54.tar.gz

Committed on behalf of Ilja Honkonen <ilja.honkonen@helsinki.fi>.

svn path=/nixpkgs/trunk/; revision=33945
---
 pkgs/servers/sql/mysql51/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/mysql51/default.nix b/pkgs/servers/sql/mysql51/default.nix
index 71c9713e3bbb..c6392589bb6f 100644
--- a/pkgs/servers/sql/mysql51/default.nix
+++ b/pkgs/servers/sql/mysql51/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "mysql-5.1.54";
 
   src = fetchurl {
-    url = ftp://mirror.leaseweb.com/mysql/Downloads/MySQL-5.1/mysql-5.1.54.tar.gz;
+    url = https://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.54.tar.gz;
     sha256 = "07xbnwk7h1xya8s6dw34nrv7ampzag8l0l1szd2pc9zyqkzhydw4";
   };
 

From 5c1b0582d24433b498b902befd1f3cc77544283b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 29 Apr 2012 18:17:50 +0000
Subject: [PATCH 275/293] build-support/fetchurl/mirrors.nix: add funet.fi to
 more mirrors

Committed on behalf of Ilja Honkonen <ilja.honkonen@helsinki.fi>.

svn path=/nixpkgs/trunk/; revision=33946
---
 pkgs/build-support/fetchurl/mirrors.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 9268bd6857ae..0491e4994b6d 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -36,6 +36,7 @@ rec {
     ftp://mirror.cict.fr/gnu/
     ftp://ftp.cs.tu-berlin.de/pub/gnu/
     ftp://ftp.chg.ru/pub/gnu/
+    ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/
   ];
 
   # GCC.
@@ -99,6 +100,7 @@ rec {
     http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/
     http://linux-kernel.uio.no/pub/
     http://kernel.osuosl.org/pub/
+    ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/
   ];
 
   # Mirrors of ftp://ftp.kde.org/pub/kde/.
@@ -107,6 +109,7 @@ rec {
     http://ftp.gwdg.de/pub/x11/kde/
     ftp://ftp.heanet.ie/mirrors/ftp.kde.org/
     ftp://ftp.kde.org/pub/kde/
+    ftp://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/
   ];
 
   # Gentoo files.
@@ -166,6 +169,7 @@ rec {
     ftp://ftp.ru.debian.org/debian/
     ftp://ftp.debian.org/debian/
     http://archive.debian.org/debian-archive/debian/
+    ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/
   ];
 
   # Ubuntu.
@@ -240,6 +244,7 @@ rec {
     http://mirror.cc.columbia.edu/pub/software/apache/
     http://www.apache.org/dist/
     http://archive.apache.org/dist/ # fallback for old releases
+    ftp://ftp.funet.fi/pub/mirrors/apache.org/
   ];
 
   postgresql = [

From 9683cada876bb76b29a58acd5201932aca282b09 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 30 Apr 2012 08:14:19 +0000
Subject: [PATCH 276/293] Update ECL

svn path=/nixpkgs/trunk/; revision=33947
---
 pkgs/development/compilers/ecl/src-for-default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/ecl/src-for-default.nix b/pkgs/development/compilers/ecl/src-for-default.nix
index 4de9821c3a71..1baaf4bbec45 100644
--- a/pkgs/development/compilers/ecl/src-for-default.nix
+++ b/pkgs/development/compilers/ecl/src-for-default.nix
@@ -1,9 +1,7 @@
 rec {
-   version="11.1.1";
-   name="ecl-11.1.1";
-   hash="01rvxpa5cwggq1p39qgjm0sdixx3l6vlnhm2h9qrwji69s3wxb18";
-   url="http://downloads.sourceforge.net/project/ecls/ecls/11.1/ecl-${version}.tar.gz";
-   advertisedUrl="http://downloads.sourceforge.net/project/ecls/ecls/11.1/ecl-11.1.1.tar.gz";
-  
-  
+   version="12.2.1";
+   name="ecl-12.2.1";
+   hash="dbb3f83c27f3d2565ca22c1c6b4ab497bbfdd0d0a7b09dee76338f378621f091";
+   url="http://downloads.sourceforge.net/project/ecls/ecls/12.2/ecl-${version}.tgz";
+   advertisedUrl="http://downloads.sourceforge.net/project/ecls/ecls/12.2/ecl-12.2.1.tgz";
 }

From 506c2ee455e4965f8d9e1c61bc89570fb1943c85 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 30 Apr 2012 12:47:30 +0000
Subject: [PATCH 277/293] Update offlineimap to 6.5.3. Patch by garbas.

svn path=/nixpkgs/trunk/; revision=33948
---
 pkgs/tools/networking/offlineimap/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 007c8f7c6e07..5a8f6b8caaea 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,18 +1,20 @@
 { fetchurl, buildPythonPackage }:
 
-buildPythonPackage {
-  name = "offlineimap-6.2.0.2";
+buildPythonPackage rec {
+  version = "6.5.3";
+  name = "offlineimap-${version}";
 
   src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/o/offlineimap/offlineimap_6.2.0.2.orig.tar.gz";
-    sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c";
+    url = "https://github.com/spaetz/offlineimap/tarball/v${version}";
+    name = "${name}.tar.bz";
+    sha256 = "8717a56e6244b47b908b23b598efb3470d74450ecd881b6d3573d8aec4a5db38";
   };
 
   doCheck = false;
 
   meta = {
-    description = "IMAP to local files bridge";
-    homepage = "http://software.complete.org/software/projects/show/offlineimap";
+    description = "OfflineImap synchronizes emails between two repositories, so that you can read the same mailbox from multiple computers.";
+    homepage = "http://offlineimap.org";
     license = "GPLv2+";
   };
 }

From 191d2e4be6ce0f6550528b62d6470ca60dac4b66 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 30 Apr 2012 13:30:47 +0000
Subject: [PATCH 278/293] Adding i3wm, file 5.11, python packages. Patch by
 garbas.

svn path=/nixpkgs/trunk/; revision=33949
---
 pkgs/top-level/all-packages.nix    |  11 +++
 pkgs/top-level/python-packages.nix | 146 ++++++++++++++++++++++++++++-
 2 files changed, 153 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71f3949d3c85..7a55555fc200 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -674,6 +674,7 @@ let
   figlet = callPackage ../tools/misc/figlet { };
 
   file = callPackage ../tools/misc/file { };
+  file511 = callPackage ../tools/misc/file/511.nix { };
 
   fileschanged = callPackage ../tools/misc/fileschanged { };
 
@@ -6943,6 +6944,14 @@ let
 
   hydrogen = callPackage ../applications/audio/hydrogen { };
 
+  i3 = callPackage ../applications/window-managers/i3 { };
+
+  i3lock = callPackage ../applications/window-managers/i3/lock.nix {
+    cairo = cairo.override { xcbSupport = true; };
+  };
+
+  i3status = callPackage ../applications/window-managers/i3/status.nix { };
+
   i810switch = callPackage ../os-specific/linux/i810switch { };
 
   icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 {
@@ -8428,6 +8437,8 @@ let
 
   darcnes = callPackage ../misc/emulators/darcnes { };
 
+  dbacl = callPackage ../tools/misc/dbacl { };
+
   dblatex = callPackage ../tools/typesetting/tex/dblatex { };
 
   dosbox = callPackage ../misc/emulators/dosbox { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3c9f6bef92ee..f0d297b8837b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32,6 +32,60 @@ let pythonPackages = python.modules // rec {
     ../development/python-modules/generic/wrap.sh;
 
 
+  afew = buildPythonPackage rec {
+    rev = "a3ea63d7048faedb6cc58b4abcb6d4ecfddfb5db";
+    name = "afew-1.0pre${rev}";
+    src = fetchurl {
+      url = "https://github.com/teythoon/afew/tarball/${rev}";
+      name = "${name}.tar.bz";
+      sha256 = "4e8850242a3845602331cabb47299b5a3af21993036a715c83e8dd698ab5d716";
+    };
+
+    propagatedBuildInputs = [ notmuch pkgs.dbacl ];
+
+    doCheck = false;
+
+    postInstall = ''
+      wrapProgram $out/bin/afew \
+        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib
+    '';
+
+    meta = {
+      homepage = https://github.com/teythoon/afew;
+      description = "afew is an initial tagging script for notmuch mail.";
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  };
+
+
+  alot = buildPythonPackage rec {
+    name = "alot-0.3";
+
+    src = fetchurl {
+      url = "https://github.com/pazz/alot/tarball/0.3";
+      name = "${name}.tar.bz";
+      md5 = "fa4944a1a7e9e380da0ee75ea3571a79";
+    };
+
+    doCheck = false;
+
+    propagatedBuildInputs = [ notmuch urwid twisted magic configobj ];
+
+    postInstall = ''
+      wrapProgram $out/bin/alot \
+        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file511}/lib
+    '';
+
+    meta = {
+      homepage = https://github.com/pazz/alot;
+      description = "Terminal MUA using notmuch mail";
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  };
+
+
   anyjson = buildPythonPackage rec {
     name = "anyjson-0.3.1";
 
@@ -292,6 +346,25 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  configobj = buildPythonPackage (rec {
+    name = "configobj-4.7.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/configobj/${name}.tar.gz";
+      md5 = "201dbaa732a9049c839f9bb6c27fc7b5";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "Config file reading, writing and validation.";
+      homepage = http://pypi.python.org/pypi/configobj;
+      license = pkgs.licenses.bsd3;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  });
+
   cssutils = buildPythonPackage (rec {
     name = "cssutils-0.9.7a6";
 
@@ -773,17 +846,20 @@ let pythonPackages = python.modules // rec {
 
 
   magic = pkgs.stdenv.mkDerivation rec {
-    name = "python-${pkgs.file.name}";
+    name = "python-${pkgs.file511.name}";
 
-    src = pkgs.file.src;
+    src = pkgs.file511.src;
 
-    buildInputs = [ python pkgs.file ];
+    patches = [ ../tools/misc/file/python.patch ];
+    buildInputs = [ python pkgs.file511 ];
 
     configurePhase = "cd python";
 
     buildPhase = "python setup.py build";
 
-    installPhase = "python setup.py install --prefix=$out";
+    installPhase = ''
+      python setup.py install --prefix=$out
+    '';
 
     meta = {
       description = "A Python wrapper around libmagic";
@@ -1073,6 +1149,28 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  notmuch = pkgs.stdenv.mkDerivation rec {
+    name = "python-${pkgs.notmuch.name}";
+
+    src = pkgs.notmuch.src;
+
+    buildInputs = [ python pkgs.notmuch ];
+    #propagatedBuildInputs = [ python pkgs.notmuch ];
+
+    configurePhase = "cd bindings/python";
+
+    buildPhase = "python setup.py build";
+
+    installPhase = "python setup.py install --prefix=$out";
+
+    meta = {
+      description = "A Python wrapper around notmuch";
+      homepage = http://notmuchmail.org/;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  };
+
   numpy = buildPythonPackage ( rec {
     name = "numpy-1.6.1";
 
@@ -1311,6 +1409,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+
   pyasn1 = buildPythonPackage ({
     name = "pyasn1-0.0.11a";
 
@@ -1330,6 +1429,26 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  Babel = buildPythonPackage (rec {
+    name = "Babel-0.9.6";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/B/Babel/${name}.tar.gz";
+      sha256 = "4a3a085ecf1fcd2736573538ffa114f1f4331b3bbbdd69381e6e172c49c9750f";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = http://babel.edgewall.org;
+      description = "A collection of tools for internationalizing Python applications.";
+      license = "BSD";
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = stdenv.lib.platforms.linux;
+    };
+  });
+
+
   pycryptopp = buildPythonPackage (rec {
     name = "pycryptopp-0.5.29";
 
@@ -2131,6 +2250,25 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+  urwid = buildPythonPackage (rec {
+    name = "urwid-1.0.1";
+
+    doCheck = false;
+
+    src = fetchurl {
+      url = "http://excess.org/urwid/${name}.tar.gz";
+      md5 = "828f7144b94920205e755c249d2e297f";
+    };
+
+    meta = {
+      description = "A full-featured console (xterm et al.) user interface library";
+      homepage = http://excess.org/urwid;
+      license = pkgs.licenses.lgpl21;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  });
+
   virtualenv = buildPythonPackage rec {
     name = "virtualenv-1.6.4";
     src = fetchurl {

From 0362f55a222a1b857451b29da2c63bdc6cbdba5a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 30 Apr 2012 13:45:50 +0000
Subject: [PATCH 279/293] add missing files from previous commit

svn path=/nixpkgs/trunk/; revision=33950
---
 .../window-managers/i3/default.nix            |  64 ++++++++
 pkgs/applications/window-managers/i3/lock.nix | 150 ++++++++++++++++++
 .../window-managers/i3/status.nix             | 144 +++++++++++++++++
 pkgs/tools/misc/dbacl/default.nix             | 112 +++++++++++++
 pkgs/tools/misc/file/511.nix                  |  17 ++
 pkgs/tools/misc/file/python.patch             |  11 ++
 6 files changed, 498 insertions(+)
 create mode 100644 pkgs/applications/window-managers/i3/default.nix
 create mode 100644 pkgs/applications/window-managers/i3/lock.nix
 create mode 100644 pkgs/applications/window-managers/i3/status.nix
 create mode 100644 pkgs/tools/misc/dbacl/default.nix
 create mode 100644 pkgs/tools/misc/file/511.nix
 create mode 100644 pkgs/tools/misc/file/python.patch

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
new file mode 100644
index 000000000000..11264223285d
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -0,0 +1,64 @@
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison,
+  xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex,
+  libXcursor, coreutils, perl }:
+
+stdenv.mkDerivation rec {
+  name = "i3-4.2";
+
+  src = fetchurl {
+    url = "http://i3wm.org/downloads/${name}.tar.bz2";
+    sha256 = "e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
+    libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
+
+  prePatch = ''
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i generate-command-parser.pl
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-migrate-config-to-v4
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-wsbar
+  '';
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison,
+  xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex,
+  libXcursor, coreutils, perl }:
+
+stdenv.mkDerivation rec {
+  name = "i3-4.2";
+
+  src = fetchurl {
+    url = "http://i3wm.org/downloads/${name}.tar.bz2";
+    sha256 = "e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
+    libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
+
+  prePatch = ''
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i generate-command-parser.pl
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-migrate-config-to-v4
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-wsbar
+  '';
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
new file mode 100644
index 000000000000..08f6585ace9e
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -0,0 +1,150 @@
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
new file mode 100644
index 000000000000..3f0dd1827e5b
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -0,0 +1,144 @@
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix
new file mode 100644
index 000000000000..75868a82ebc6
--- /dev/null
+++ b/pkgs/tools/misc/dbacl/default.nix
@@ -0,0 +1,112 @@
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/tools/misc/file/511.nix b/pkgs/tools/misc/file/511.nix
new file mode 100644
index 000000000000..4e62462b8b35
--- /dev/null
+++ b/pkgs/tools/misc/file/511.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, zlib}:
+ 
+stdenv.mkDerivation rec {
+  name = "file-5.11";
+
+  buildInputs = [ zlib ];
+
+  src = fetchurl {
+    url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
+    sha256 = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7";
+  };
+
+  meta = {
+    description = "A program that shows the type of files";
+    homepage = "http://darwinsys.com/file";
+  };
+}
diff --git a/pkgs/tools/misc/file/python.patch b/pkgs/tools/misc/file/python.patch
new file mode 100644
index 000000000000..8ecbc9a81fdc
--- /dev/null
+++ b/pkgs/tools/misc/file/python.patch
@@ -0,0 +1,11 @@
+--- file-5.11/python/magic.py	2011-09-22 18:57:41.000000000 +0200
++++ file-5.11/python/magic.py.1	2012-04-30 15:00:31.750213810 +0200
+@@ -13,7 +13,7 @@
+     Loads the shared library through ctypes and returns a library
+     L{ctypes.CDLL} instance 
+     """
+-    return ctypes.cdll.LoadLibrary(find_library('magic'))
++    return ctypes.CDLL('libmagic.so')
+ 
+ _libraries = {}
+ _libraries['magic'] = _init()

From 0823167b43f149b2ac2bc39efe44cdc3a39c573d Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 30 Apr 2012 14:28:08 +0000
Subject: [PATCH 280/293] Revert my previous 2 commits.

svn path=/nixpkgs/trunk/; revision=33951
---
 .../window-managers/i3/default.nix            |  64 --------
 pkgs/applications/window-managers/i3/lock.nix | 150 ------------------
 .../window-managers/i3/status.nix             | 144 -----------------
 pkgs/tools/misc/dbacl/default.nix             | 112 -------------
 pkgs/tools/misc/file/511.nix                  |  17 --
 pkgs/tools/misc/file/python.patch             |  11 --
 pkgs/top-level/all-packages.nix               |  11 --
 pkgs/top-level/python-packages.nix            | 146 +----------------
 8 files changed, 4 insertions(+), 651 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/i3/default.nix
 delete mode 100644 pkgs/applications/window-managers/i3/lock.nix
 delete mode 100644 pkgs/applications/window-managers/i3/status.nix
 delete mode 100644 pkgs/tools/misc/dbacl/default.nix
 delete mode 100644 pkgs/tools/misc/file/511.nix
 delete mode 100644 pkgs/tools/misc/file/python.patch

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
deleted file mode 100644
index 11264223285d..000000000000
--- a/pkgs/applications/window-managers/i3/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison,
-  xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex,
-  libXcursor, coreutils, perl }:
-
-stdenv.mkDerivation rec {
-  name = "i3-4.2";
-
-  src = fetchurl {
-    url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b";
-  };
-
-  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
-    libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
-
-  prePatch = ''
-    sed s,/usr/bin/env,${coreutils}/bin/env, -i generate-command-parser.pl
-    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-migrate-config-to-v4
-    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-wsbar
-  '';
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out}";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
-{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison,
-  xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex,
-  libXcursor, coreutils, perl }:
-
-stdenv.mkDerivation rec {
-  name = "i3-4.2";
-
-  src = fetchurl {
-    url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b";
-  };
-
-  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
-    libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
-
-  prePatch = ''
-    sed s,/usr/bin/env,${coreutils}/bin/env, -i generate-command-parser.pl
-    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-migrate-config-to-v4
-    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-wsbar
-  '';
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out}";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
deleted file mode 100644
index 08f6585ace9e..000000000000
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ /dev/null
@@ -1,150 +0,0 @@
-{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
-  pam, libX11, libev, cairo }:
-
-stdenv.mkDerivation rec {
-  name = "i3lock-2.4";
-
-  src = fetchurl {
-    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
-    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
-  };
-
-  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
-    libev cairo ];
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
-{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
-  pam, libX11, libev, cairo }:
-
-stdenv.mkDerivation rec {
-  name = "i3lock-2.4";
-
-  src = fetchurl {
-    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
-    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
-  };
-
-  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
-    libev cairo ];
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
-{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
-  pam, libX11, libev, cairo }:
-
-stdenv.mkDerivation rec {
-  name = "i3lock-2.4";
-
-  src = fetchurl {
-    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
-    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
-  };
-
-  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
-    libev cairo ];
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
-{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
-  pam, libX11, libev, cairo }:
-
-stdenv.mkDerivation rec {
-  name = "i3lock-2.4";
-
-  src = fetchurl {
-    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
-    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
-  };
-
-  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
-    libev cairo ];
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
-{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
-  pam, libX11, libev, cairo }:
-
-stdenv.mkDerivation rec {
-  name = "i3lock-2.4";
-
-  src = fetchurl {
-    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
-    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
-  };
-
-  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
-    libev cairo ];
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
-{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
-  pam, libX11, libev, cairo }:
-
-stdenv.mkDerivation rec {
-  name = "i3lock-2.4";
-
-  src = fetchurl {
-    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
-    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
-  };
-
-  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
-    libev cairo ];
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
deleted file mode 100644
index 3f0dd1827e5b..000000000000
--- a/pkgs/applications/window-managers/i3/status.nix
+++ /dev/null
@@ -1,144 +0,0 @@
-{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
-  }:
-
-stdenv.mkDerivation rec {
-  name = "i3status-2.4";
-
-  src = fetchurl {
-    url = "http://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
-  };
-
-  buildInputs = [ confuse alsaLib wirelesstools ];
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out}";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
-{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
-  }:
-
-stdenv.mkDerivation rec {
-  name = "i3status-2.4";
-
-  src = fetchurl {
-    url = "http://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
-  };
-
-  buildInputs = [ confuse alsaLib wirelesstools ];
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out}";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
-{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
-  }:
-
-stdenv.mkDerivation rec {
-  name = "i3status-2.4";
-
-  src = fetchurl {
-    url = "http://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
-  };
-
-  buildInputs = [ confuse alsaLib wirelesstools ];
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out}";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
-{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
-  }:
-
-stdenv.mkDerivation rec {
-  name = "i3status-2.4";
-
-  src = fetchurl {
-    url = "http://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
-  };
-
-  buildInputs = [ confuse alsaLib wirelesstools ];
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out}";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
-{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
-  }:
-
-stdenv.mkDerivation rec {
-  name = "i3status-2.4";
-
-  src = fetchurl {
-    url = "http://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
-  };
-
-  buildInputs = [ confuse alsaLib wirelesstools ];
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out}";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
-{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
-  }:
-
-stdenv.mkDerivation rec {
-  name = "i3status-2.4";
-
-  src = fetchurl {
-    url = "http://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
-  };
-
-  buildInputs = [ confuse alsaLib wirelesstools ];
-
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out}";
-
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-  };
-
-}
diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix
deleted file mode 100644
index 75868a82ebc6..000000000000
--- a/pkgs/tools/misc/dbacl/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{fetchurl, stdenv}:
-
-stdenv.mkDerivation rec {
-  name = "dbacl-1.14";
-  src = fetchurl {
-    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
-    md5 = "85bfd88bc20f326dc0f31e794948e21c";
-  };
-
-  meta = {
-    homepage = http://dbacl.sourceforge.net/;
-    longDescription = "a digramic Bayesian classifier for text recognition.";
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.gpl3;
-  };
-}
-{fetchurl, stdenv}:
-
-stdenv.mkDerivation rec {
-  name = "dbacl-1.14";
-  src = fetchurl {
-    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
-    md5 = "85bfd88bc20f326dc0f31e794948e21c";
-  };
-
-  meta = {
-    homepage = http://dbacl.sourceforge.net/;
-    longDescription = "a digramic Bayesian classifier for text recognition.";
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.gpl3;
-  };
-}
-{fetchurl, stdenv}:
-
-stdenv.mkDerivation rec {
-  name = "dbacl-1.14";
-  src = fetchurl {
-    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
-    md5 = "85bfd88bc20f326dc0f31e794948e21c";
-  };
-
-  meta = {
-    homepage = http://dbacl.sourceforge.net/;
-    longDescription = "a digramic Bayesian classifier for text recognition.";
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.gpl3;
-  };
-}
-{fetchurl, stdenv}:
-
-stdenv.mkDerivation rec {
-  name = "dbacl-1.14";
-  src = fetchurl {
-    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
-    md5 = "85bfd88bc20f326dc0f31e794948e21c";
-  };
-
-  meta = {
-    homepage = http://dbacl.sourceforge.net/;
-    longDescription = "a digramic Bayesian classifier for text recognition.";
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.gpl3;
-  };
-}
-{fetchurl, stdenv}:
-
-stdenv.mkDerivation rec {
-  name = "dbacl-1.14";
-  src = fetchurl {
-    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
-    md5 = "85bfd88bc20f326dc0f31e794948e21c";
-  };
-
-  meta = {
-    homepage = http://dbacl.sourceforge.net/;
-    longDescription = "a digramic Bayesian classifier for text recognition.";
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.gpl3;
-  };
-}
-{fetchurl, stdenv}:
-
-stdenv.mkDerivation rec {
-  name = "dbacl-1.14";
-  src = fetchurl {
-    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
-    md5 = "85bfd88bc20f326dc0f31e794948e21c";
-  };
-
-  meta = {
-    homepage = http://dbacl.sourceforge.net/;
-    longDescription = "a digramic Bayesian classifier for text recognition.";
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.gpl3;
-  };
-}
-{fetchurl, stdenv}:
-
-stdenv.mkDerivation rec {
-  name = "dbacl-1.14";
-  src = fetchurl {
-    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
-    md5 = "85bfd88bc20f326dc0f31e794948e21c";
-  };
-
-  meta = {
-    homepage = http://dbacl.sourceforge.net/;
-    longDescription = "a digramic Bayesian classifier for text recognition.";
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.gpl3;
-  };
-}
diff --git a/pkgs/tools/misc/file/511.nix b/pkgs/tools/misc/file/511.nix
deleted file mode 100644
index 4e62462b8b35..000000000000
--- a/pkgs/tools/misc/file/511.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl, zlib}:
- 
-stdenv.mkDerivation rec {
-  name = "file-5.11";
-
-  buildInputs = [ zlib ];
-
-  src = fetchurl {
-    url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
-    sha256 = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7";
-  };
-
-  meta = {
-    description = "A program that shows the type of files";
-    homepage = "http://darwinsys.com/file";
-  };
-}
diff --git a/pkgs/tools/misc/file/python.patch b/pkgs/tools/misc/file/python.patch
deleted file mode 100644
index 8ecbc9a81fdc..000000000000
--- a/pkgs/tools/misc/file/python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- file-5.11/python/magic.py	2011-09-22 18:57:41.000000000 +0200
-+++ file-5.11/python/magic.py.1	2012-04-30 15:00:31.750213810 +0200
-@@ -13,7 +13,7 @@
-     Loads the shared library through ctypes and returns a library
-     L{ctypes.CDLL} instance 
-     """
--    return ctypes.cdll.LoadLibrary(find_library('magic'))
-+    return ctypes.CDLL('libmagic.so')
- 
- _libraries = {}
- _libraries['magic'] = _init()
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a55555fc200..71f3949d3c85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -674,7 +674,6 @@ let
   figlet = callPackage ../tools/misc/figlet { };
 
   file = callPackage ../tools/misc/file { };
-  file511 = callPackage ../tools/misc/file/511.nix { };
 
   fileschanged = callPackage ../tools/misc/fileschanged { };
 
@@ -6944,14 +6943,6 @@ let
 
   hydrogen = callPackage ../applications/audio/hydrogen { };
 
-  i3 = callPackage ../applications/window-managers/i3 { };
-
-  i3lock = callPackage ../applications/window-managers/i3/lock.nix {
-    cairo = cairo.override { xcbSupport = true; };
-  };
-
-  i3status = callPackage ../applications/window-managers/i3/status.nix { };
-
   i810switch = callPackage ../os-specific/linux/i810switch { };
 
   icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 {
@@ -8437,8 +8428,6 @@ let
 
   darcnes = callPackage ../misc/emulators/darcnes { };
 
-  dbacl = callPackage ../tools/misc/dbacl { };
-
   dblatex = callPackage ../tools/typesetting/tex/dblatex { };
 
   dosbox = callPackage ../misc/emulators/dosbox { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0d297b8837b..3c9f6bef92ee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32,60 +32,6 @@ let pythonPackages = python.modules // rec {
     ../development/python-modules/generic/wrap.sh;
 
 
-  afew = buildPythonPackage rec {
-    rev = "a3ea63d7048faedb6cc58b4abcb6d4ecfddfb5db";
-    name = "afew-1.0pre${rev}";
-    src = fetchurl {
-      url = "https://github.com/teythoon/afew/tarball/${rev}";
-      name = "${name}.tar.bz";
-      sha256 = "4e8850242a3845602331cabb47299b5a3af21993036a715c83e8dd698ab5d716";
-    };
-
-    propagatedBuildInputs = [ notmuch pkgs.dbacl ];
-
-    doCheck = false;
-
-    postInstall = ''
-      wrapProgram $out/bin/afew \
-        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib
-    '';
-
-    meta = {
-      homepage = https://github.com/teythoon/afew;
-      description = "afew is an initial tagging script for notmuch mail.";
-      maintainers = [ stdenv.lib.maintainers.garbas ];
-      platforms = python.meta.platforms;
-    };
-  };
-
-
-  alot = buildPythonPackage rec {
-    name = "alot-0.3";
-
-    src = fetchurl {
-      url = "https://github.com/pazz/alot/tarball/0.3";
-      name = "${name}.tar.bz";
-      md5 = "fa4944a1a7e9e380da0ee75ea3571a79";
-    };
-
-    doCheck = false;
-
-    propagatedBuildInputs = [ notmuch urwid twisted magic configobj ];
-
-    postInstall = ''
-      wrapProgram $out/bin/alot \
-        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file511}/lib
-    '';
-
-    meta = {
-      homepage = https://github.com/pazz/alot;
-      description = "Terminal MUA using notmuch mail";
-      maintainers = [ stdenv.lib.maintainers.garbas ];
-      platforms = python.meta.platforms;
-    };
-  };
-
-
   anyjson = buildPythonPackage rec {
     name = "anyjson-0.3.1";
 
@@ -346,25 +292,6 @@ let pythonPackages = python.modules // rec {
     };
   });
 
-  configobj = buildPythonPackage (rec {
-    name = "configobj-4.7.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/configobj/${name}.tar.gz";
-      md5 = "201dbaa732a9049c839f9bb6c27fc7b5";
-    };
-
-    doCheck = false;
-
-    meta = {
-      description = "Config file reading, writing and validation.";
-      homepage = http://pypi.python.org/pypi/configobj;
-      license = pkgs.licenses.bsd3;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
-      platforms = python.meta.platforms;
-    };
-  });
-
   cssutils = buildPythonPackage (rec {
     name = "cssutils-0.9.7a6";
 
@@ -846,20 +773,17 @@ let pythonPackages = python.modules // rec {
 
 
   magic = pkgs.stdenv.mkDerivation rec {
-    name = "python-${pkgs.file511.name}";
+    name = "python-${pkgs.file.name}";
 
-    src = pkgs.file511.src;
+    src = pkgs.file.src;
 
-    patches = [ ../tools/misc/file/python.patch ];
-    buildInputs = [ python pkgs.file511 ];
+    buildInputs = [ python pkgs.file ];
 
     configurePhase = "cd python";
 
     buildPhase = "python setup.py build";
 
-    installPhase = ''
-      python setup.py install --prefix=$out
-    '';
+    installPhase = "python setup.py install --prefix=$out";
 
     meta = {
       description = "A Python wrapper around libmagic";
@@ -1149,28 +1073,6 @@ let pythonPackages = python.modules // rec {
     };
   });
 
-  notmuch = pkgs.stdenv.mkDerivation rec {
-    name = "python-${pkgs.notmuch.name}";
-
-    src = pkgs.notmuch.src;
-
-    buildInputs = [ python pkgs.notmuch ];
-    #propagatedBuildInputs = [ python pkgs.notmuch ];
-
-    configurePhase = "cd bindings/python";
-
-    buildPhase = "python setup.py build";
-
-    installPhase = "python setup.py install --prefix=$out";
-
-    meta = {
-      description = "A Python wrapper around notmuch";
-      homepage = http://notmuchmail.org/;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
-      platforms = python.meta.platforms;
-    };
-  };
-
   numpy = buildPythonPackage ( rec {
     name = "numpy-1.6.1";
 
@@ -1409,7 +1311,6 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-
   pyasn1 = buildPythonPackage ({
     name = "pyasn1-0.0.11a";
 
@@ -1429,26 +1330,6 @@ let pythonPackages = python.modules // rec {
     };
   });
 
-  Babel = buildPythonPackage (rec {
-    name = "Babel-0.9.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/B/Babel/${name}.tar.gz";
-      sha256 = "4a3a085ecf1fcd2736573538ffa114f1f4331b3bbbdd69381e6e172c49c9750f";
-    };
-
-    doCheck = false;
-
-    meta = {
-      homepage = http://babel.edgewall.org;
-      description = "A collection of tools for internationalizing Python applications.";
-      license = "BSD";
-      maintainers = [ stdenv.lib.maintainers.garbas ];
-      platforms = stdenv.lib.platforms.linux;
-    };
-  });
-
-
   pycryptopp = buildPythonPackage (rec {
     name = "pycryptopp-0.5.29";
 
@@ -2250,25 +2131,6 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  urwid = buildPythonPackage (rec {
-    name = "urwid-1.0.1";
-
-    doCheck = false;
-
-    src = fetchurl {
-      url = "http://excess.org/urwid/${name}.tar.gz";
-      md5 = "828f7144b94920205e755c249d2e297f";
-    };
-
-    meta = {
-      description = "A full-featured console (xterm et al.) user interface library";
-      homepage = http://excess.org/urwid;
-      license = pkgs.licenses.lgpl21;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
-      platforms = python.meta.platforms;
-    };
-  });
-
   virtualenv = buildPythonPackage rec {
     name = "virtualenv-1.6.4";
     src = fetchurl {

From 97cac0a58cd727f14be10067dae7e9d7c032b113 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 30 Apr 2012 14:34:57 +0000
Subject: [PATCH 281/293] Added i3wm. Added newer version of file. (this time
 tested, I screwed up a patch by garbas)

svn path=/nixpkgs/trunk/; revision=33952
---
 .../window-managers/i3/default.nix            |  32 ++++
 pkgs/applications/window-managers/i3/lock.nix |  25 +++
 .../window-managers/i3/status.nix             |  24 +++
 pkgs/tools/misc/dbacl/default.nix             |  16 ++
 pkgs/tools/misc/file/511.nix                  |  17 ++
 pkgs/tools/misc/file/python.patch             |  11 ++
 pkgs/top-level/all-packages.nix               |  11 ++
 pkgs/top-level/python-packages.nix            | 146 +++++++++++++++++-
 8 files changed, 278 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/window-managers/i3/default.nix
 create mode 100644 pkgs/applications/window-managers/i3/lock.nix
 create mode 100644 pkgs/applications/window-managers/i3/status.nix
 create mode 100644 pkgs/tools/misc/dbacl/default.nix
 create mode 100644 pkgs/tools/misc/file/511.nix
 create mode 100644 pkgs/tools/misc/file/python.patch

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
new file mode 100644
index 000000000000..04e50f808274
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -0,0 +1,32 @@
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison,
+  xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex,
+  libXcursor, coreutils, perl }:
+
+stdenv.mkDerivation rec {
+  name = "i3-4.2";
+
+  src = fetchurl {
+    url = "http://i3wm.org/downloads/${name}.tar.bz2";
+    sha256 = "e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
+    libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
+
+  prePatch = ''
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i generate-command-parser.pl
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-migrate-config-to-v4
+    sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-wsbar
+  '';
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
new file mode 100644
index 000000000000..a1d7409eaf2b
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -0,0 +1,25 @@
+{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
+  pam, libX11, libev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "i3lock-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3lock/${name}.tar.bz2";
+    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+  };
+
+  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+    libev cairo ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
new file mode 100644
index 000000000000..a60db1b38021
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -0,0 +1,24 @@
+{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+  }:
+
+stdenv.mkDerivation rec {
+  name = "i3status-2.4";
+
+  src = fetchurl {
+    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+  };
+
+  buildInputs = [ confuse alsaLib wirelesstools ];
+
+  makeFlags = "all";
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    description = "i3 is a tiling window manager";
+    homepage = http://i3wm.org;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix
new file mode 100644
index 000000000000..f433db68a640
--- /dev/null
+++ b/pkgs/tools/misc/dbacl/default.nix
@@ -0,0 +1,16 @@
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "dbacl-1.14";
+  src = fetchurl {
+    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    md5 = "85bfd88bc20f326dc0f31e794948e21c";
+  };
+
+  meta = {
+    homepage = http://dbacl.sourceforge.net/;
+    longDescription = "a digramic Bayesian classifier for text recognition.";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/tools/misc/file/511.nix b/pkgs/tools/misc/file/511.nix
new file mode 100644
index 000000000000..4e62462b8b35
--- /dev/null
+++ b/pkgs/tools/misc/file/511.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, zlib}:
+ 
+stdenv.mkDerivation rec {
+  name = "file-5.11";
+
+  buildInputs = [ zlib ];
+
+  src = fetchurl {
+    url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
+    sha256 = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7";
+  };
+
+  meta = {
+    description = "A program that shows the type of files";
+    homepage = "http://darwinsys.com/file";
+  };
+}
diff --git a/pkgs/tools/misc/file/python.patch b/pkgs/tools/misc/file/python.patch
new file mode 100644
index 000000000000..8ecbc9a81fdc
--- /dev/null
+++ b/pkgs/tools/misc/file/python.patch
@@ -0,0 +1,11 @@
+--- file-5.11/python/magic.py	2011-09-22 18:57:41.000000000 +0200
++++ file-5.11/python/magic.py.1	2012-04-30 15:00:31.750213810 +0200
+@@ -13,7 +13,7 @@
+     Loads the shared library through ctypes and returns a library
+     L{ctypes.CDLL} instance 
+     """
+-    return ctypes.cdll.LoadLibrary(find_library('magic'))
++    return ctypes.CDLL('libmagic.so')
+ 
+ _libraries = {}
+ _libraries['magic'] = _init()
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71f3949d3c85..7a55555fc200 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -674,6 +674,7 @@ let
   figlet = callPackage ../tools/misc/figlet { };
 
   file = callPackage ../tools/misc/file { };
+  file511 = callPackage ../tools/misc/file/511.nix { };
 
   fileschanged = callPackage ../tools/misc/fileschanged { };
 
@@ -6943,6 +6944,14 @@ let
 
   hydrogen = callPackage ../applications/audio/hydrogen { };
 
+  i3 = callPackage ../applications/window-managers/i3 { };
+
+  i3lock = callPackage ../applications/window-managers/i3/lock.nix {
+    cairo = cairo.override { xcbSupport = true; };
+  };
+
+  i3status = callPackage ../applications/window-managers/i3/status.nix { };
+
   i810switch = callPackage ../os-specific/linux/i810switch { };
 
   icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 {
@@ -8428,6 +8437,8 @@ let
 
   darcnes = callPackage ../misc/emulators/darcnes { };
 
+  dbacl = callPackage ../tools/misc/dbacl { };
+
   dblatex = callPackage ../tools/typesetting/tex/dblatex { };
 
   dosbox = callPackage ../misc/emulators/dosbox { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3c9f6bef92ee..f0d297b8837b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32,6 +32,60 @@ let pythonPackages = python.modules // rec {
     ../development/python-modules/generic/wrap.sh;
 
 
+  afew = buildPythonPackage rec {
+    rev = "a3ea63d7048faedb6cc58b4abcb6d4ecfddfb5db";
+    name = "afew-1.0pre${rev}";
+    src = fetchurl {
+      url = "https://github.com/teythoon/afew/tarball/${rev}";
+      name = "${name}.tar.bz";
+      sha256 = "4e8850242a3845602331cabb47299b5a3af21993036a715c83e8dd698ab5d716";
+    };
+
+    propagatedBuildInputs = [ notmuch pkgs.dbacl ];
+
+    doCheck = false;
+
+    postInstall = ''
+      wrapProgram $out/bin/afew \
+        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib
+    '';
+
+    meta = {
+      homepage = https://github.com/teythoon/afew;
+      description = "afew is an initial tagging script for notmuch mail.";
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  };
+
+
+  alot = buildPythonPackage rec {
+    name = "alot-0.3";
+
+    src = fetchurl {
+      url = "https://github.com/pazz/alot/tarball/0.3";
+      name = "${name}.tar.bz";
+      md5 = "fa4944a1a7e9e380da0ee75ea3571a79";
+    };
+
+    doCheck = false;
+
+    propagatedBuildInputs = [ notmuch urwid twisted magic configobj ];
+
+    postInstall = ''
+      wrapProgram $out/bin/alot \
+        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file511}/lib
+    '';
+
+    meta = {
+      homepage = https://github.com/pazz/alot;
+      description = "Terminal MUA using notmuch mail";
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  };
+
+
   anyjson = buildPythonPackage rec {
     name = "anyjson-0.3.1";
 
@@ -292,6 +346,25 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  configobj = buildPythonPackage (rec {
+    name = "configobj-4.7.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/configobj/${name}.tar.gz";
+      md5 = "201dbaa732a9049c839f9bb6c27fc7b5";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "Config file reading, writing and validation.";
+      homepage = http://pypi.python.org/pypi/configobj;
+      license = pkgs.licenses.bsd3;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  });
+
   cssutils = buildPythonPackage (rec {
     name = "cssutils-0.9.7a6";
 
@@ -773,17 +846,20 @@ let pythonPackages = python.modules // rec {
 
 
   magic = pkgs.stdenv.mkDerivation rec {
-    name = "python-${pkgs.file.name}";
+    name = "python-${pkgs.file511.name}";
 
-    src = pkgs.file.src;
+    src = pkgs.file511.src;
 
-    buildInputs = [ python pkgs.file ];
+    patches = [ ../tools/misc/file/python.patch ];
+    buildInputs = [ python pkgs.file511 ];
 
     configurePhase = "cd python";
 
     buildPhase = "python setup.py build";
 
-    installPhase = "python setup.py install --prefix=$out";
+    installPhase = ''
+      python setup.py install --prefix=$out
+    '';
 
     meta = {
       description = "A Python wrapper around libmagic";
@@ -1073,6 +1149,28 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  notmuch = pkgs.stdenv.mkDerivation rec {
+    name = "python-${pkgs.notmuch.name}";
+
+    src = pkgs.notmuch.src;
+
+    buildInputs = [ python pkgs.notmuch ];
+    #propagatedBuildInputs = [ python pkgs.notmuch ];
+
+    configurePhase = "cd bindings/python";
+
+    buildPhase = "python setup.py build";
+
+    installPhase = "python setup.py install --prefix=$out";
+
+    meta = {
+      description = "A Python wrapper around notmuch";
+      homepage = http://notmuchmail.org/;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  };
+
   numpy = buildPythonPackage ( rec {
     name = "numpy-1.6.1";
 
@@ -1311,6 +1409,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+
   pyasn1 = buildPythonPackage ({
     name = "pyasn1-0.0.11a";
 
@@ -1330,6 +1429,26 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  Babel = buildPythonPackage (rec {
+    name = "Babel-0.9.6";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/B/Babel/${name}.tar.gz";
+      sha256 = "4a3a085ecf1fcd2736573538ffa114f1f4331b3bbbdd69381e6e172c49c9750f";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = http://babel.edgewall.org;
+      description = "A collection of tools for internationalizing Python applications.";
+      license = "BSD";
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = stdenv.lib.platforms.linux;
+    };
+  });
+
+
   pycryptopp = buildPythonPackage (rec {
     name = "pycryptopp-0.5.29";
 
@@ -2131,6 +2250,25 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+  urwid = buildPythonPackage (rec {
+    name = "urwid-1.0.1";
+
+    doCheck = false;
+
+    src = fetchurl {
+      url = "http://excess.org/urwid/${name}.tar.gz";
+      md5 = "828f7144b94920205e755c249d2e297f";
+    };
+
+    meta = {
+      description = "A full-featured console (xterm et al.) user interface library";
+      homepage = http://excess.org/urwid;
+      license = pkgs.licenses.lgpl21;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = python.meta.platforms;
+    };
+  });
+
   virtualenv = buildPythonPackage rec {
     name = "virtualenv-1.6.4";
     src = fetchurl {

From 6b1b79c17225b3dda186f7c9158a3d79116db6e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Apr 2012 15:24:21 +0000
Subject: [PATCH 282/293] * Fix license attributes.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0d297b8837b..5580386bbbd4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -359,7 +359,7 @@ let pythonPackages = python.modules // rec {
     meta = {
       description = "Config file reading, writing and validation.";
       homepage = http://pypi.python.org/pypi/configobj;
-      license = pkgs.licenses.bsd3;
+      license = pkgs.lib.licenses.bsd3;
       maintainers = [ stdenv.lib.maintainers.garbas ];
       platforms = python.meta.platforms;
     };
@@ -2263,7 +2263,7 @@ let pythonPackages = python.modules // rec {
     meta = {
       description = "A full-featured console (xterm et al.) user interface library";
       homepage = http://excess.org/urwid;
-      license = pkgs.licenses.lgpl21;
+      license = pkgs.lib.licenses.lgpl21;
       maintainers = [ stdenv.lib.maintainers.garbas ];
       platforms = python.meta.platforms;
     };

From 83f7c6988e33064a932357aca63930ac7dcfa254 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Apr 2012 15:33:59 +0000
Subject: [PATCH 283/293] * Bump nixUnstable.

svn path=/nixpkgs/trunk/; revision=33954
---
 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 faac506ce22a..ca8ac6052777 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre2665_6387830";
+  name = "nix-1.0pre2668_46cdc6a";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/2449982/download/4/${name}.tar.bz2";
-    sha256 = "eccc818be882addfe54468c2a53c90fc565ea795d61ff986aae0b30f2909eb4d";
+    url = "http://hydra.nixos.org/build/2492261/download/4/${name}.tar.bz2";
+    sha256 = "d9a1cfbee1670bc700593d81211c47eb8d7623aa9699d18a414ecaddccabfa1a";
   };
 
   buildNativeInputs = [ perl pkgconfig ];

From 930185a408c0f59e1770c3397c5dd7aa56992cc5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Apr 2012 15:34:55 +0000
Subject: [PATCH 284/293] * Make Firefox 12 the default.

svn path=/nixpkgs/trunk/; revision=33955
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a55555fc200..5fa79081e29a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6745,7 +6745,7 @@ let
 
   firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
 
-  firefoxPkgs = pkgs.firefox11Pkgs;
+  firefoxPkgs = pkgs.firefox12Pkgs;
 
   firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
     inherit (gnome) libIDL;

From 242e54dab61804d5e5e860af4ff9b88bdb1420f8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 30 Apr 2012 17:31:39 +0000
Subject: [PATCH 285/293] Linux 3.3.4 (not compile tested, sorry

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix
index 94e2d9e0dc64..b08f091014c6 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix
@@ -233,7 +233,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.3.3";
+    version = "3.3.4";
     testing = false;
 
     preConfigure = ''
@@ -242,7 +242,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1i0wxn40iwv4pl3azqq1dhzxi0sxfk4na3lrl9n8k5aip74yqyfb";
+      sha256 = "0c3bayhbvlrmfqqq43s4vp194wc97lss2vwng1dhslll7yady286";
     };
 
     config = configWithPlatform stdenv.platform;

From 304facbf3b763b18113d5f12e4b3c8c3866a2dea Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 May 2012 05:07:39 +0000
Subject: [PATCH 286/293] Adding LCI lambda calculus interpreter

svn path=/nixpkgs/trunk/; revision=33962
---
 pkgs/applications/science/logic/lci/default.nix | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/science/logic/lci/default.nix

diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix
new file mode 100644
index 000000000000..e2aff9313e95
--- /dev/null
+++ b/pkgs/applications/science/logic/lci/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, readline}: 
+stdenv.mkDerivation rec {
+  version = "0.6";
+  name = "lci-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/lci/${name}.tar.gz";
+    sha256="204f1ca5e2f56247d71ab320246811c220ed511bf08c9cb7f305cf180a93948e";
+  };
+  buildInputs = [readline];
+  meta = {
+    description = ''Lambda calculus interpreter'';
+    maintainers = with stdenv.lib.maintainers; [raskin];
+    platforms = with stdenv.lib.platforms; linux;
+    license = with stdenv.lib.licenses; gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fa79081e29a..2d0a394d80a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7054,6 +7054,8 @@ let
     fftw = fftwSinglePrec;
   };
 
+  lci = callPackage ../applications/science/logic/lci {};
+
   ldcpp = callPackage ../applications/networking/p2p/ldcpp {
     inherit (gnome) libglade;
   };

From 6ed169c19df56eb8251e86377ef970000062d18c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 May 2012 11:39:58 +0000
Subject: [PATCH 287/293] Update Clojure to 1.4.0

svn path=/nixpkgs/trunk/; revision=33963
---
 pkgs/development/interpreters/clojure/binary.nix  | 11 +++++++----
 pkgs/development/interpreters/clojure/default.nix |  9 +++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix
index 8cf350e7e972..3902d7f335cb 100644
--- a/pkgs/development/interpreters/clojure/binary.nix
+++ b/pkgs/development/interpreters/clojure/binary.nix
@@ -1,19 +1,22 @@
 {stdenv, fetchurl, unzip}:
 
-stdenv.mkDerivation {
-  name = "clojure-binary-1.2.1";
+stdenv.mkDerivation rec {
+  version = "1.4.0";
+  name = "clojure-binary-${version}";
 
   src = fetchurl {
-    url = https://github.com/downloads/clojure/clojure/clojure-1.2.1.zip;
-    sha256 = "1warps9z2cm3gmp0nlh8plgsr40yccr2vzcsxsq3yawhjkicx7k1";
+    url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
+    sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171";
   };
 
+
   buildInputs = [ unzip ];
 
   phases = "unpackPhase installPhase";
 
   installPhase = "
     mkdir -p $out/lib/java
+    cp clojure-${version}.jar clojure.jar
     install -t $out/lib/java clojure.jar
   ";
 
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index f68b89f03980..6c20ca714069 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, unzip, ant}:
 
-stdenv.mkDerivation {
-  name = "clojure-1.2.1";
+stdenv.mkDerivation rec {
+  version = "1.4.0";
+  name = "clojure-${version}";
 
   src = fetchurl {
-    url = https://github.com/downloads/clojure/clojure/clojure-1.2.1.zip;
-    sha256 = "1warps9z2cm3gmp0nlh8plgsr40yccr2vzcsxsq3yawhjkicx7k1";
+    url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
+    sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171";
   };
 
   buildInputs = [ unzip ant ];

From 424c24d4fc432e5ddcec1c41800210f7ac109466 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Tue, 1 May 2012 12:40:57 +0000
Subject: [PATCH 288/293] updated to a new version

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

diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 06c98411f5b4..4e06c31442a6 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
-  version = "0.141";
+  version = "0.146";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "37cf3aa1ed78a0ded782cc5c692301619dbb2cf4749bccbf059c51707daaf734";
+    sha256 = "55899baf6732e48bfaa36d80974aa135c051d2cbb6fe92fbcffd80440639eedf";
   };
 
   buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost];

From 87693235b841be9fc01c49526e6153cbfd423c90 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 May 2012 16:25:48 +0000
Subject: [PATCH 289/293] * Dropbox updated to 1.4.0.  Patch by Michel
 Alexandre Salim   <michel@sylvestre.me>.

svn path=/nixpkgs/trunk/; revision=33965
---
 pkgs/applications/networking/dropbox/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index f8d97a4f167c..f1a906f92508 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -21,8 +21,8 @@ assert stdenv.system == "x86_64-linux";
 
 let
 
-  version = "1.2.52";
-  sha256 = "72aeaf00727da9f3fe39386dcf883bb303de928ba43c738fcc5bb62b93eca252";
+  version = "1.4.0";
+  sha256 = "93933d95cce5956ed99342fa342d01ce2bde8d2e4339afb97f23e0c0ec98875e";
 
   # relative location where the dropbox libraries are stored
   appdir = "opt/dropbox";
@@ -50,7 +50,10 @@ in stdenv.mkDerivation {
   name = "dropbox-${version}-bin";
   src = fetchurl {
     name = "dropbox-${version}.tar.gz";
-    url = "http://www.dropbox.com/download?plat=lnx.x86_64";
+    # using version-specific URL so if the version is no longer available,
+    # build will fail without having to finish downloading first
+    # url = "http://www.dropbox.com/download?plat=lnx.x86_64";
+    url = "http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-${version}.tar.gz";
     inherit sha256;
   };
 

From 40609ab6d5a57920deeee9ec1bd3340c0db62e1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 May 2012 20:31:01 +0000
Subject: [PATCH 290/293] * Add a hook for running a test after the RPMs have
 been installed.

svn path=/nixpkgs/trunk/; revision=33966
---
 pkgs/build-support/release/rpm-build.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix
index 66a9c42ec041..a3256769762a 100644
--- a/pkgs/build-support/release/rpm-build.nix
+++ b/pkgs/build-support/release/rpm-build.nix
@@ -32,14 +32,19 @@ vmTools.buildRPM (
           
           echo "installing $i..."
           rpm -ip "$i" --excludepath /nix/store
+        fi
+      done
 
+      eval "$postRPMInstall"
+      
+      for i in $out/rpms/*/*.rpm; do
+        if echo $i | grep -vq "\.src\.rpm$"; then
           rpmName="$(rpm -qp "$i")"
-          
           echo "uninstalling $rpmName..."
           rpm -e "$rpmName"
         fi
       done
-      
+
       for i in $out/rpms/*/*.src.rpm; do
         echo "file srpm $i" >> $out/nix-support/hydra-build-products
       done

From 063b03b650b97434e4e861ef2ecc7de470f9843d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2012 03:14:05 +0000
Subject: [PATCH 291/293] Update Julia; a few fixes get included; changes to
 build system

svn path=/nixpkgs/trunk/; revision=33968
---
 pkgs/development/compilers/julia/default.nix | 67 ++++++++++++--------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index ceb75f52c5f7..afef88184058 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, blas, liblapack
  , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
- , ncurses, libunistring, lighttpd
+ , ncurses, libunistring, lighttpd, patchelf
  } :
 let
   liblapackShared = liblapack.override{shared=true;};
@@ -8,12 +8,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "julia";
-  date = "20120410";
+  date = "20120501";
   name = "${pname}-git-${date}";
 
   grisu_ver = "1.1";
   dsfmt_ver = "2.1";
-  arpack_ver = "3.0.2";
+  arpack_ver = "3.1.0";
   clp_ver = "1.14.5";
   lighttpd_ver = "1.4.29";
 
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
     sha256 = "e9d3e04bc984ec3b14033342f5ebdcd5202d8d8e40128dd737f566945612378f";
   };
   arpack_src = fetchurl {
-    url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/353/get/";
-    name = "arpack-ng-${arpack_ver}.tar.gz";
-    sha256 = "4add769386e0f6b0484491bcff129c6f5234190dbf58e07cc068fbd5dc7278bf";
+    url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/376/get/";
+    name = "arpack-ng_${arpack_ver}.tar.gz";
+    sha256 = "65b7856126f06ecbf9ec450d50df92ca9260d4b0d21baf02497554ac230d6feb";
   };
   clp_src = fetchurl {
     url = "http://www.coin-or.org/download/source/Clp/Clp-${clp_ver}.tgz";
@@ -43,12 +43,12 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
-    rev = "73776ba8ed510862b81eb1dd5c70e2055deb5895";
-    sha256 = "e833caeeecedc5603ee71405a8cb3813bf7ace10df8f7b4a43c7beccf0ccaf0d";
+    rev = "990ffabb00f0e51d326911888facdbc473fb634d";
+    sha256 = "dfcf41b2d7b62dd490bfd6f6fb962713c920de3f00afaee47423bd26eba7e3b2";
   };
 
   buildInputs = [ gfortran perl m4 gmp pcre llvm blas liblapackShared readline 
-    fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring
+    fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
     ];
 
   configurePhase = ''
@@ -63,38 +63,51 @@ stdenv.mkDerivation rec {
     }
 
     for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${lighttpd_src}" ; do
-      copy_kill_hash "$i" external
+      copy_kill_hash "$i" deps
     done
-    copy_kill_hash "${dsfmt_src}" external/random
+    copy_kill_hash "${dsfmt_src}" deps/random
 
-    sed -e '/cd SuiteSparse-SYSTEM/,+1s@find /lib /usr/lib /usr/local/lib@find ${suitesparse}/lib@' -i external/Makefile
+    sed -e '/cd SuiteSparse-SYSTEM/,+1s@find /lib /usr/lib /usr/local/lib@find ${suitesparse}/lib@' -i deps/Makefile
 
     ${if realGcc ==null then "" else 
     ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring "''}
 
     sed -e 's@ cpp @ gcc -E @g' -i base/Makefile
-  '';
 
-  preInstall = ''
-    export makeFlags="$makeFlags PREFIX=\"$out\""
+    sed -e '1s@#! */bin/bash@#!${stdenv.shell}@' -i deps/*.sh
+
+    export LDFLAGS="-L${suitesparse}/lib"
+
+    mkdir -p "$out/lib"
+    sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
+    sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
+    
+    sed -e '/libumfpack.a/s@find @find ${suitesparse}/lib @' -i deps/Makefile
+
+    export makeFlags="$makeFlags PREFIX=\"$out\" USR=\"$out\""
+
+    sed -e 's@openblas@blas@' -i base/*.jl
+
+    sed -e '/install -v julia-release-webserver/d' -i Makefile
+
+    export dontPatchELF=1
   '';
 
   postInstall = ''
-    mkdir -p "$out/bin"
-    ln -s "$out/share/julia/julia" "$out/bin"
+   ln -s "$out/share/julia/julia" "$out/bin"
 
-    mkdir -p "$out/share/julia/ui/"
-    cp -r ui/website "$out/share/julia/ui/"
-    cp external/lighttpd.conf "$out/share/julia/ui/"
+   mkdir -p "$out/share/julia/ui/"
+   cp -r ui/website "$out/share/julia/ui/"
+   cp deps/lighttpd.conf "$out/share/julia/ui/"
 
-    mkdir -p "$out/share/julia/ui/webserver/"
-    cp -r ui/webserver/{*.jl,*.h} "$out/share/julia/ui/webserver/"
+   mkdir -p "$out/share/julia/ui/webserver/"
+   cp -r ui/webserver/{*.jl,*.h} "$out/share/julia/ui/webserver/"
 
-    echo -e '#!/bin/sh' >> "$out/bin/julia-webserver"
-    echo -e "cd \"$out/share/julia\"" >> "$out/bin/julia-webserver"
-    echo -e '${lighttpd}/sbin/lighttpd -D -f ./ui/lighttpd.conf &' >> "$out/bin/julia-webserver"
-    echo -e './julia-release-webserver -p 2001' >> "$out/bin/julia-webserver"
-    chmod a+x "$out/bin/julia-webserver"
+   echo -e '#!/bin/sh' >> "$out/bin/julia-webserver"
+   echo -e "cd \"$out/share/julia\"" >> "$out/bin/julia-webserver"
+   echo -e '${lighttpd}/sbin/lighttpd -D -f ./ui/lighttpd.conf &' >> "$out/bin/julia-webserver"
+   echo -e '../../bin/julia-release-webserver -p 2001' >> "$out/bin/julia-webserver"
+   chmod a+x "$out/bin/julia-webserver"
   '';
 
   meta = {

From dec4675e866592dc3e65f44b3cc0dab3bd67d4d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2012 09:25:23 +0000
Subject: [PATCH 292/293] Updated Haskell packages.

 - cpu: added version 0.1.0
 - cryptocipher: updated to version 0.3.1
 - fclabels: updated to version 1.1.3
 - hamlet: updated to version 1.0.1.2
 - highlighting-kate: updated to version 0.5.0.6
 - lifted-base: updated to version 0.1.1
 - monad-control: updated to version 0.3.1.3
 - reactive-banana: updated to version 0.5.0.2
 - test-framework-quickcheck2: updated to version 0.2.12.2
 - test-framework-quickcheck: updated to version 0.2.8.1

svn path=/nixpkgs/trunk/; revision=33969
---
 .../libraries/haskell/cpu/default.nix            | 16 ++++++++++++++++
 .../libraries/haskell/cryptocipher/default.nix   | 10 +++++-----
 .../libraries/haskell/fclabels/default.nix       |  4 ++--
 .../libraries/haskell/hamlet/default.nix         |  4 ++--
 .../haskell/highlighting-kate/default.nix        |  4 ++--
 .../libraries/haskell/lifted-base/default.nix    |  4 ++--
 .../libraries/haskell/monad-control/default.nix  |  4 ++--
 .../haskell/reactive-banana/default.nix          |  4 ++--
 .../test-framework-quickcheck/default.nix        |  4 ++--
 .../test-framework-quickcheck2/default.nix       |  4 ++--
 pkgs/top-level/haskell-packages.nix              |  2 ++
 11 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/cpu/default.nix

diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix
new file mode 100644
index 000000000000..832b7db03690
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cpu/default.nix
@@ -0,0 +1,16 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "cpu";
+  version = "0.1.0";
+  sha256 = "020s1cv3qkhjq0gypxligg2x68izb3z82krv8y1m1k360554nqyg";
+  isLibrary = true;
+  isExecutable = true;
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-cpu";
+    description = "Cpu information and properties helpers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
index 904c33b74311..1b2dc44fbdd9 100644
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@@ -1,15 +1,15 @@
-{ cabal, cereal, cryptoApi, cryptoPubkeyTypes, primitive, tagged
-, vector
+{ cabal, cereal, cpu, cryptoApi, cryptoPubkeyTypes, primitive
+, tagged, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "cryptocipher";
-  version = "0.3.0";
-  sha256 = "17jbzssdbprspadz5ynyam60l5iw7s809irklfg1ii89x26mlyix";
+  version = "0.3.1";
+  sha256 = "14icn1p0mjg4y45q6pbh8qamw5hm1z2z7d424gmiknbf24nq8nmi";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cereal cryptoApi cryptoPubkeyTypes primitive tagged vector
+    cereal cpu cryptoApi cryptoPubkeyTypes primitive tagged vector
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cryptocipher";
diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index 6475d245ed65..5f62315a9727 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.1.1.1";
-  sha256 = "170lsalbak7l52fzdppdvq88ky8y06zzlxy6h18zpd1g18caa0q7";
+  version = "1.1.3";
+  sha256 = "1f8aav4gcpixmnnwcml0aqsqswb8fc0rp986nbyap22gmcw4hflx";
   buildDepends = [ mtl transformers ];
   meta = {
     description = "First class accessor labels";
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 90fbd70fdc52..5a13b3e888ec 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.0.1.1";
-  sha256 = "16a7aym0cpcq9lsiwfh5bvgh1bkyz4j06bhyvnxawsdgzmmsbch4";
+  version = "1.0.1.2";
+  sha256 = "1lb1q2nkih7z63gh1rdwl4656ybmpdqic1d09q5jqgm6bjqrgw53";
   buildDepends = [
     blazeBuilder blazeHtml failure parsec shakespeare text
   ];
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index 4e8d4cb50ed3..7799ae0c3114 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.0.5";
-  sha256 = "005k3yc406h4wz5jk47nk4g5qb409kd7dwyw7n9g31gjqxp73p8v";
+  version = "0.5.0.6";
+  sha256 = "068ksmi8kdjm00279lnnhih4sqs9yh8mnvvn71brwak5r361m056";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ];
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index d2ffc52d28dd..7207c662d53c 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.1.0.4";
-  sha256 = "0xd41nminlrj78l2ggcba6z764c5v6x9w08d6mb0qk3ssj7ldv89";
+  version = "0.1.1";
+  sha256 = "148631zwax809nzm01fqymmgvkscyv1kii36a12phkmg7sx014vm";
   buildDepends = [
     baseUnicodeSymbols monadControl transformersBase
   ];
diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
index 17f351ed9fd5..69c55ba049b4 100644
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-control";
-  version = "0.3.1.2";
-  sha256 = "0nrvz5zc5w7j2payg7ji7dpvkbk4ssg75pwi3pqjq6jrfyf4aw9m";
+  version = "0.3.1.3";
+  sha256 = "0sx0jr8hccqh519sgn428y4xfk6m5jpwfm9201vn8zj1cxlppjv9";
   buildDepends = [
     baseUnicodeSymbols transformers transformersBase
   ];
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 7d0f08a6d2eb..c3a94e03673a 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana";
-  version = "0.5.0.1";
-  sha256 = "04mr1pb0q1ks29q3mzy3apk5ki1sbzlslavbldfnrrq3g2s90366";
+  version = "0.5.0.2";
+  sha256 = "10391b6vwgp5harzmiji66qs4zc5qipagak1mm2j8njhbqi8z0rb";
   buildDepends = [
     fclabels hashable QuickCheck transformers unorderedContainers vault
   ];
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
index 50a794012909..d71e2a034d05 100644
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework-quickcheck";
-  version = "0.2.8";
-  sha256 = "0ca6s7dnrdr9s2gdpfb74lswlj2lj091crk89m3yqjcadchkh3vl";
+  version = "0.2.8.1";
+  sha256 = "042vdq18mqw4rhsj3x51mz1iv9zbxvlz7jg6r9cni2xpw5m7v6dk";
   buildDepends = [
     deepseq extensibleExceptions QuickCheck random testFramework
   ];
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
index 34d5b6ae51f2..1f1a45d42450 100644
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework-quickcheck2";
-  version = "0.2.12.1";
-  sha256 = "03m6kf6lhi9nzymfyfqqimfgs6139bpa0pzbxzvz2nvizdnbmmcw";
+  version = "0.2.12.2";
+  sha256 = "08m8y78qy23imcwyqdqla7syxdf91iqrb0j8g6g7gwsg5asjq6ip";
   buildDepends = [
     extensibleExceptions QuickCheck random testFramework
   ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4134447eaaad..7ae1a202c705 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -591,6 +591,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   curl = callPackage ../development/libraries/haskell/curl { curl = pkgs.curl; };
 
+  cpu = callPackage ../development/libraries/haskell/cpu {};
+
   dataAccessor = callPackage ../development/libraries/haskell/data-accessor/data-accessor.nix {};
 
   dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {};

From e0bd67afd7ea489a130688d20dbd7efe597770b6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2012 09:25:28 +0000
Subject: [PATCH 293/293] git-annex: updated to version 3.20120430

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

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index af5927fd5985..82d333d17830 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -5,14 +5,14 @@
 }:
 
 let
-  version = "3.20120418";
+  version = "3.20120430";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
-    sha256 = "7e429009006ee00f33224b18392433b5b5e0df92c7c62153415a2cea909144e0";
+    sha256 = "74540ef25461b91acc2e1733ade169e54492fa96370f6ec22554524078e0c7dd";
     name = "git-annex-${version}.tar.gz";
   };