From c6a2a1f8851bc3896a824219dfc5545a642fba45 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 18 Jul 2012 13:34:22 +0200
Subject: [PATCH 01/60] ffmpeg: Update to latest version 0.11.1.

This is needed in order to enable x11grab, as it isn't included in 0.10.
---
 pkgs/development/libraries/ffmpeg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 3b5e28a2ee7..9b90d56d4d9 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.10";
+  name = "ffmpeg-0.11.1";
   
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3";
+    sha256 = "b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96";
   };
   
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that

From 05831d3a668361b2948c0185eceb6d7c579c851a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 18 Jul 2012 13:35:16 +0200
Subject: [PATCH 02/60] ffmpeg: Add option to enable x11grab support.

This is especially useful if you want to do screencasts and other sorts of
things like that.
---
 pkgs/development/libraries/ffmpeg/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 9b90d56d4d9..41768c4e313 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -9,6 +9,7 @@
 , vdpauSupport ? true, libvdpau ? null
 , faacSupport ? false, faac ? null
 , dc1394Support ? false, libdc1394 ? null
+, x11grabSupport ? false, libXext ? null, libXfixes ? null
 }:
 
 assert speexSupport -> speex != null;
@@ -19,6 +20,7 @@ assert x264Support -> x264 != null;
 assert xvidSupport -> xvidcore != null;
 assert vdpauSupport -> libvdpau != null;
 assert faacSupport -> faac != null;
+assert x11grabSupport -> libXext != null && libXfixes != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-0.11.1";
@@ -48,7 +50,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
     ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
     ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
-    ++ stdenv.lib.optional dc1394Support "--enable-libdc1394";
+    ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
+    ++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
 
   buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
     ++ stdenv.lib.optional mp3Support lame
@@ -60,7 +63,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional xvidSupport xvidcore
     ++ stdenv.lib.optional vdpauSupport libvdpau
     ++ stdenv.lib.optional faacSupport faac
-    ++ stdenv.lib.optional dc1394Support libdc1394;
+    ++ stdenv.lib.optional dc1394Support libdc1394
+    ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];
 
   enableParallelBuilding = true;
     

From d9f08cf6f26337efd5a3a4142c38a0963aba31c4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 18 Jul 2012 17:27:24 +0200
Subject: [PATCH 03/60] ffmpeg: Add alsaLib to dependencies.

As @cillianderoiste pointed out, it makes sense to have this in, not only to
record audio while grabbing the display. This is not optional in this case, as
it isn't a compile time option either. And on the other hand, having ffmpeg
running with OSS doesn't appear reasonable to me, as ffmpeg will fall back to
OSS if alsa isn't available anyway.
---
 pkgs/development/libraries/ffmpeg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 41768c4e313..ee88fd0145c 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2
+{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib
 , mp3Support ? true, lame ? null
 , speexSupport ? true, speex ? null
 , theoraSupport ? true, libtheora ? null
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
     ++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
 
-  buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
+  buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
     ++ stdenv.lib.optional mp3Support lame
     ++ stdenv.lib.optional speexSupport speex
     ++ stdenv.lib.optional theoraSupport libtheora

From fe42f8add91b1616de94f878351f3dd5b44dbcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 19 Jul 2012 04:37:33 +0200
Subject: [PATCH 04/60] ffmpeg: Add optional Jack audio support.

The author of this commit is @cillianderoiste because he made the patch and I'm
just committing it.

This change adds support for Jack audio "while we're at it", see discussion at
pull request #54.
---
 pkgs/development/libraries/ffmpeg/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index ee88fd0145c..53868950598 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib
+, jackSupport ? false, jackaudio ? null
 , mp3Support ? true, lame ? null
 , speexSupport ? true, speex ? null
 , theoraSupport ? true, libtheora ? null
@@ -12,6 +13,7 @@
 , x11grabSupport ? false, libXext ? null, libXfixes ? null
 }:
 
+assert jackSupport -> jackaudio != null;
 assert speexSupport -> speex != null;
 assert theoraSupport -> libtheora != null;
 assert vorbisSupport -> libvorbis != null;
@@ -54,6 +56,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
 
   buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
+    ++ stdenv.lib.optional jackSupport jackaudio
     ++ stdenv.lib.optional mp3Support lame
     ++ stdenv.lib.optional speexSupport speex
     ++ stdenv.lib.optional theoraSupport libtheora

From 8ded076ac0ff9a76d870d75befb53dbb9d9cf5ce Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 20 Jul 2012 01:45:49 +0200
Subject: [PATCH 05/60] Add new package netrw, version 1.3.2.

The upstream URL unfortunately wasn't available at this time, so I provided an
alternate mirror. I checksummed the file against the hashes from various
distributions in order to make sure it's the right one.
---
 pkgs/tools/networking/netrw/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/networking/netrw/default.nix

diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix
new file mode 100644
index 00000000000..c9054639359
--- /dev/null
+++ b/pkgs/tools/networking/netrw/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "netrw-${version}";
+  version = "1.3.2";
+
+  src = fetchurl {
+    urls = [
+      "http://mamuti.net/files/netrw/netrw-${version}.tar.bz2"
+      "http://www.sourcefiles.org/Networking/FTP/Other/netrw-${version}.tar.bz2"
+    ];
+    sha256 = "1gnl80i5zkyj2lpnb4g0q0r5npba1x6cnafl2jb3i3pzlfz1bndr";
+  };
+
+  meta = {
+    description = "A simple tool for transporting data over the network.";
+    homepage = "http://mamuti.net/netrw/index.en.html";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64d2b986cc1..46ee8c6bbbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1120,6 +1120,8 @@ let
 
   netpbm = callPackage ../tools/graphics/netpbm { };
 
+  netrw = callPackage ../tools/networking/netrw { };
+
   netselect = callPackage ../tools/networking/netselect { };
 
   networkmanager = callPackage ../tools/networking/network-manager { };

From 8bd81bc3d6191b8176f95dd68e9013bc8e02704a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 20 Jul 2012 01:49:47 +0200
Subject: [PATCH 06/60] netrw: Allow to specify checksum hash library.

Within netrw the only checksum algorithm that is available is MD5. We thus make
it possible for users to override this, so algorithms from other libraries such
as OpenSSL and MHash can used.
---
 pkgs/tools/networking/netrw/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix
index c9054639359..eb03377fc52 100644
--- a/pkgs/tools/networking/netrw/default.nix
+++ b/pkgs/tools/networking/netrw/default.nix
@@ -1,9 +1,23 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl
+, checksumType ? "built-in"
+, libmhash ? null
+, openssl ? null
+}:
+
+assert checksumType == "mhash" -> libmhash != null;
+assert checksumType == "openssl" -> openssl != null;
 
 stdenv.mkDerivation rec {
   name = "netrw-${version}";
   version = "1.3.2";
 
+  configureFlags = [
+    "--with-checksum=${checksumType}"
+  ];
+
+  buildInputs = stdenv.lib.optional (checksumType == "mhash") libmhash
+             ++ stdenv.lib.optional (checksumType == "openssl") openssl;
+
   src = fetchurl {
     urls = [
       "http://mamuti.net/files/netrw/netrw-${version}.tar.bz2"

From a2762b5254c9904db67fefba7e574187ef6fc17a Mon Sep 17 00:00:00 2001
From: Daniel Santa Cruz <dstcruz@gmail.com>
Date: Thu, 19 Jul 2012 22:37:21 -0400
Subject: [PATCH 07/60] Haskell libraries required for Snap development

---
 .../haskell/comonad-transformers/default.nix  | 19 +++++++++++++
 .../libraries/haskell/comonad/default.nix     | 14 ++++++++++
 .../haskell/configurator/default.nix          | 18 ++++++++++++
 .../haskell/contravariant/default.nix         | 14 ++++++++++
 .../haskell/data-lens-template/default.nix    | 14 ++++++++++
 .../libraries/haskell/data-lens/default.nix   | 17 +++++++++++
 .../haskell/distributive/default.nix          | 14 ++++++++++
 .../libraries/haskell/heist/default.nix       | 21 ++++++++++++++
 .../haskell/semigroupoids/default.nix         | 14 ++++++++++
 .../libraries/haskell/snap/loader-static.nix  | 13 +++++++++
 .../libraries/haskell/snap/snap.nix           | 28 +++++++++++++++++++
 .../libraries/haskell/xmlhtml/default.nix     | 17 +++++++++++
 pkgs/top-level/haskell-packages.nix           | 24 ++++++++++++++++
 13 files changed, 227 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/comonad-transformers/default.nix
 create mode 100644 pkgs/development/libraries/haskell/comonad/default.nix
 create mode 100644 pkgs/development/libraries/haskell/configurator/default.nix
 create mode 100644 pkgs/development/libraries/haskell/contravariant/default.nix
 create mode 100644 pkgs/development/libraries/haskell/data-lens-template/default.nix
 create mode 100644 pkgs/development/libraries/haskell/data-lens/default.nix
 create mode 100644 pkgs/development/libraries/haskell/distributive/default.nix
 create mode 100644 pkgs/development/libraries/haskell/heist/default.nix
 create mode 100644 pkgs/development/libraries/haskell/semigroupoids/default.nix
 create mode 100644 pkgs/development/libraries/haskell/snap/loader-static.nix
 create mode 100644 pkgs/development/libraries/haskell/snap/snap.nix
 create mode 100644 pkgs/development/libraries/haskell/xmlhtml/default.nix

diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
new file mode 100644
index 00000000000..1dd7c212c71
--- /dev/null
+++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
@@ -0,0 +1,19 @@
+{ cabal, comonad, contravariant, distributive, semigroupoids
+, semigroups, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "comonad-transformers";
+  version = "2.1.2";
+  sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis";
+  buildDepends = [
+    comonad contravariant distributive semigroupoids semigroups
+    transformers
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/comonad-transformers/";
+    description = "Comonad transformers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
new file mode 100644
index 00000000000..53e014fb8ac
--- /dev/null
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -0,0 +1,14 @@
+{ cabal, semigroups, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "comonad";
+  version = "1.1.1.6";
+  sha256 = "1sg0pa7393mzfm27pl52nchplhkls3k0f4ff8vzk76wzrgvhysg5";
+  buildDepends = [ semigroups transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/comonad/";
+    description = "Haskell 98 compatible comonads";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix
new file mode 100644
index 00000000000..0c4c610106e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/configurator/default.nix
@@ -0,0 +1,18 @@
+{ cabal, attoparsec, hashable, text, unixCompat
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "configurator";
+  version = "0.2.0.0";
+  sha256 = "0zkcmziyfq2sm9i75ysi5nxd21fynp88m0safhmn3jld7plj03la";
+  buildDepends = [
+    attoparsec hashable text unixCompat unorderedContainers
+  ];
+  meta = {
+    homepage = "http://github.com/bos/configurator";
+    description = "Configuration management";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
new file mode 100644
index 00000000000..526b9e1f997
--- /dev/null
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "contravariant";
+  version = "0.2.0.2";
+  sha256 = "0142s1c914zbfnvysvcc9s3bv8qs6wimnqcmxca1gxaxqvyfkf3p";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/contravariant/";
+    description = "Haskell 98 contravariant functors";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix
new file mode 100644
index 00000000000..fc058b92e54
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix
@@ -0,0 +1,14 @@
+{ cabal, dataLens }:
+
+cabal.mkDerivation (self: {
+  pname = "data-lens-template";
+  version = "2.1.5";
+  sha256 = "09i9lby5jd2kcg0l7y4hkga7jxixcpqw4dc7h1kngqdz92a1ydxc";
+  buildDepends = [ dataLens ];
+  meta = {
+    homepage = "http://github.com/ekmett/data-lens-template/";
+    description = "Utilities for Data.Lens";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix
new file mode 100644
index 00000000000..42e6c9f1518
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-lens/default.nix
@@ -0,0 +1,17 @@
+{ cabal, comonad, comonadTransformers, semigroupoids, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "data-lens";
+  version = "2.10.0";
+  sha256 = "0y3rl9axakvz6kwmh08aabbz1z7y38wyrygmg4m6xby02cqbq5gk";
+  buildDepends = [
+    comonad comonadTransformers semigroupoids transformers
+  ];
+  meta = {
+    homepage = "http://github.com/roconnor/data-lens/";
+    description = "Haskell 98 Lenses";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix
new file mode 100644
index 00000000000..a8b07c608d8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/distributive/default.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "distributive";
+  version = "0.2.2";
+  sha256 = "13wvr2wb3h2nr1qd3dwjqx0b6g4igjqm3q2cyi4mc41gwihkbhr2";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/distributive/";
+    description = "Haskell 98 Distributive functors -- Dual to Traversable";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
new file mode 100644
index 00000000000..44ba8ba15ee
--- /dev/null
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -0,0 +1,21 @@
+{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree
+, filepath, MonadCatchIOTransformers, mtl, random, text, time
+, transformers, unorderedContainers, vector, xmlhtml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "heist";
+  version = "0.8.1.1";
+  sha256 = "0ad56izskafpc1dx2nq0a8w71ayppwx8dc7kdaw1by972kh3nflh";
+  buildDepends = [
+    aeson attoparsec blazeBuilder blazeHtml directoryTree filepath
+    MonadCatchIOTransformers mtl random text time transformers
+    unorderedContainers vector xmlhtml
+  ];
+  meta = {
+    homepage = "http://snapframework.com/";
+    description = "An (x)html templating system";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
new file mode 100644
index 00000000000..776e452eafe
--- /dev/null
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -0,0 +1,14 @@
+{ cabal, comonad, contravariant, semigroups, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "semigroupoids";
+  version = "1.3.4";
+  sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph";
+  buildDepends = [ comonad contravariant semigroups transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/semigroupoids";
+    description = "Haskell 98 semigroupoids: Category sans id";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/snap/loader-static.nix b/pkgs/development/libraries/haskell/snap/loader-static.nix
new file mode 100644
index 00000000000..a9dcbf10810
--- /dev/null
+++ b/pkgs/development/libraries/haskell/snap/loader-static.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "snap-loader-static";
+  version = "0.9.0";
+  sha256 = "1blchmg0qfng7bw235z1gqkwyi764j78bc29vd5p6xxhmq111ys7";
+  meta = {
+    homepage = "http://snapframework.com/";
+    description = "Snap: A Haskell Web Framework: static loader";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
new file mode 100644
index 00000000000..c20ee0318ed
--- /dev/null
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -0,0 +1,28 @@
+{ cabal, aeson, attoparsec, cereal, clientsession, configurator
+, dataLens, dataLensTemplate, directoryTree, filepath, hashable
+, heist, logict, MonadCatchIOTransformers, mtl, mwcRandom
+, pwstoreFast, snapCore, snapServer, stm, syb, text, time
+, transformers, unorderedContainers, utf8String, vector
+, vectorAlgorithms, xmlhtml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "snap";
+  version = "0.9.0.1";
+  sha256 = "0n3qmyvqqcds3c56ml77d2cr0ghs1c7wwd20m44zzmxxmpbnfmgh";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson attoparsec cereal clientsession configurator dataLens
+    dataLensTemplate directoryTree filepath hashable heist logict
+    MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore
+    snapServer stm syb text time transformers unorderedContainers
+    utf8String vector vectorAlgorithms xmlhtml
+  ];
+  meta = {
+    homepage = "http://snapframework.com/";
+    description = "Snap: A Haskell Web Framework: project starter executable and glue code library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix
new file mode 100644
index 00000000000..654da2e76b5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix
@@ -0,0 +1,17 @@
+{ cabal, blazeBuilder, blazeHtml, blazeMarkup, parsec, text
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "xmlhtml";
+  version = "0.2.0.2";
+  sha256 = "0dqlqx3cnrqap3ficdkmwm8661j8i7qknb8xhjqvfmnb9pwqdks2";
+  buildDepends = [
+    blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
+  ];
+  meta = {
+    description = "XML parser and renderer with HTML 5 quirks mode";
+    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 34144c3237d..d0a4e2e4e93 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -532,18 +532,26 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   colour = callPackage ../development/libraries/haskell/colour {};
 
+  comonad = callPackage ../development/libraries/haskell/comonad {};
+
+  comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {};
+
   compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
 
   conduit = callPackage ../development/libraries/haskell/conduit {};
 
   ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
 
+  configurator = callPackage ../development/libraries/haskell/configurator {};
+
   convertible = callPackage ../development/libraries/haskell/convertible {
     time = self.time_1_1_3;
   };
 
   continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {};
 
+  contravariant = callPackage ../development/libraries/haskell/contravariant {};
+
   converge = callPackage ../development/libraries/haskell/converge {};
 
   cookie = callPackage ../development/libraries/haskell/cookie {};
@@ -588,6 +596,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};
 
+  dataLens = callPackage ../development/libraries/haskell/data-lens {};
+
+  dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {};
+
   dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {};
 
   dataReify = callPackage ../development/libraries/haskell/data-reify {};
@@ -616,6 +628,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
 
+  distributive = callPackage ../development/libraries/haskell/distributive {};
+
   dlist = callPackage ../development/libraries/haskell/dlist {};
 
   dotgen = callPackage ../development/libraries/haskell/dotgen {};
@@ -841,6 +855,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {};
 
+  heist = callPackage ../development/libraries/haskell/heist {};
+
   HFuse = callPackage ../development/libraries/haskell/hfuse {};
 
   HGL = callPackage ../development/libraries/haskell/HGL {};
@@ -1291,6 +1307,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   semigroups = callPackage ../development/libraries/haskell/semigroups {};
 
+  semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {};
+
   shelly = callPackage ../development/libraries/haskell/shelly {};
 
   simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {};
@@ -1299,8 +1317,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
 
+  snap = callPackage ../development/libraries/haskell/snap/snap.nix {};
+
   snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
 
+  snapLoaderStatic = callPackage ../development/libraries/haskell/snap/loader-static.nix {};
+
   snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
 
   socks = callPackage ../development/libraries/haskell/socks {};
@@ -1571,6 +1593,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {};
 
+  xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {};
+
   xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
 
   xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};

From 172f29cc3cd39f4a3ef5bad0d7cb072b08573c02 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 21 Jul 2012 13:39:55 +0200
Subject: [PATCH 08/60] netrw: Add missing license to meta attributes.

---
 pkgs/tools/networking/netrw/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix
index eb03377fc52..23ff6ddba55 100644
--- a/pkgs/tools/networking/netrw/default.nix
+++ b/pkgs/tools/networking/netrw/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A simple tool for transporting data over the network.";
+    license = stdenv.lib.licenses.gpl2;
     homepage = "http://mamuti.net/netrw/index.en.html";
   };
 }

From 8686b20bec1dcdcdb94882f2ce2056c04f188090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 23 Jul 2012 16:09:30 +0200
Subject: [PATCH 09/60] opencv: update from 2.4.1 to 2.4.2

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

diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 009935e14c0..d40b253df2f 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
 , pkgconfig, gstreamer, xineLib, glib }:
 
-let v = "2.4.1"; in
+let v = "2.4.2"; in
 
 stdenv.mkDerivation rec {
   name = "opencv-${v}";
 
   src = fetchurl {
     url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2";
-    sha256 = "1wxijbz1jfsg4695fls83825ppiacxfn5x07al0qkkx5rm7spdi9";
+    sha256 = "0a1c4ys78k670dsk1fapylpf8hwfyzy944r9jvwivqh33s0j6039";
   };
 
   buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer ];

From 113016af86fecd915040b8a5ecb7e8457ec8ca1b Mon Sep 17 00:00:00 2001
From: Phreedom <phreedom.stdin@gmail.com>
Date: Mon, 23 Jul 2012 17:21:25 +0300
Subject: [PATCH 10/60] ClamAV: package.

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

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
new file mode 100644
index 00000000000..bccf0cc77c5
--- /dev/null
+++ b/pkgs/tools/security/clamav/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, zlib, bzip2, libiconv }:
+stdenv.mkDerivation rec {
+  name = "clamav-${version}";
+  version = "0.97.5";
+
+  src = fetchurl {
+    url = "http://tenet.dl.sourceforge.net/project/clamav/clamav/${version}/clamav-${version}.tar.gz";
+    sha256 = "039wm64wl2sx7k019g5ll5dkdlsq64fnd0ng0s00pjn8bqd5wv6v";
+  };
+
+  buildInputs = [ zlib bzip2 libiconv ];
+
+  configureFlags = [
+    "--with-zlib=${zlib}"
+    "--with-libbz2-prefix=${bzip2}"
+    "--with-iconv-dir=${libiconv}"
+    "--disable-clamav" ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.clamav.net;
+    description = "an open source (GPL) antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats.";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7498fb7638c..5c1d630b88b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -529,6 +529,8 @@ let
 
   usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
 
+  clamav = callPackage ../tools/security/clamav { };
+  
   cloog = callPackage ../development/libraries/cloog { };
 
   cloogppl = callPackage ../development/libraries/cloog-ppl { };

From 16d2d9acab99a2132bafea2e28474e73bc1a2c5d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 23 Jul 2012 13:46:50 -0400
Subject: [PATCH 11/60] php: Update to 5.3.15

Includes fixes for CVE-2012-2688 and CVE-2012-3365.
---
 pkgs/development/interpreters/php/5.3.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index 48eb8ac5ee9..b4f00ab1f7d 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -8,7 +8,7 @@ in
 
 composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.3.14";
+  version = "5.3.15";
 
   name = "php-${version}";
 
@@ -149,15 +149,12 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
   installPhase = ''
     unset installPhase; installPhase;
-    cp php.ini-${ if builtins.lessThan (builtins.compareVersions version "5.3") 0
-        then "recommended" /* < PHP 5.3 */
-        else "production" /* >= PHP 5.3 */
-    } $iniFile
+    cp php.ini-production $iniFile
   '';
 
   src = args.fetchurl {
     url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    sha256 = "1cqw0knkrb7wn49ki5kcly4i0hjnd12sf9l4rhk0vny5hdp5n1y8";
+    sha256 = "1vzij845n2akh2lkpacgdc5r0f7nw6pk9l9vi1h8l8k4krjjbdzr";
     name = "php-${version}.tar.bz2";
   };
 

From bcd8fded1aac3382b438ac49208111b716a1acd5 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sun, 15 Jul 2012 21:48:17 +0200
Subject: [PATCH 12/60] In ghc 7.2.2 (and 7.2.1) deepseq is not yet part of the
 core set.

---
 pkgs/top-level/haskell-defaults.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 64291854a03..1c0f065884e 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -27,9 +27,14 @@
       binary = null; # now a core package
     };
 
-  ghc722Prefs = ghc741Prefs;
+  ghc722Prefs =
+    self : self.haskellPlatformArgs_2012_2_0_0 self // {
+      haskellPlatform = self.haskellPlatform_2012_2_0_0;
+      binary = null; # a core package
+      deepseq = self.deepseq_1_1_0_2;
+    };
 
-  ghc721Prefs = ghc741Prefs;
+  ghc721Prefs = ghc722Prefs;
 
   ghc704Prefs =
     self : self.haskellPlatformArgs_2011_4_0_0 self // {

From afada80a4fc43ab257cedb4aa294b44df0d8b2f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Jul 2012 20:29:08 +0200
Subject: [PATCH 13/60] Haskell Platform 2012.2.0.0 mandates deepseq 1.3.x, so
 let's use that for ghc 7.2.x, too.

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

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 1c0f065884e..579b20fcc23 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -31,7 +31,7 @@
     self : self.haskellPlatformArgs_2012_2_0_0 self // {
       haskellPlatform = self.haskellPlatform_2012_2_0_0;
       binary = null; # a core package
-      deepseq = self.deepseq_1_1_0_2;
+      deepseq = self.deepseq_1_3_0_0;
     };
 
   ghc721Prefs = ghc722Prefs;

From e29c284926c2ba3b239c4ee3aaa21aa9396f046a Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Fri, 13 Jul 2012 21:32:32 +0200
Subject: [PATCH 14/60] Update RPM to 4.10.0.

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

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index b35d3b66ad8..8ed7a2daba5 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz }:
 
 stdenv.mkDerivation rec {
-  name = "rpm-4.7.2";
+  name = "rpm-4.10.0";
 
   src = fetchurl {
-    url = "http://rpm.org/releases/rpm-4.7.x/${name}.tar.bz2";
-    sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0";
+    url = "http://rpm.org/releases/rpm-4.10.x/${name}.tar.bz2";
+    sha256 = "1ag4pz51npiwf6vcksipjxaypm5afzmy8lj19bp0fk5n6mr26bhf";
   };
 
   buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz ];

From e1c172ab6b3c787a166a3e345798f10045cabb6a Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 14 Jul 2012 08:20:33 +0200
Subject: [PATCH 15/60] Call rpm -U instead of rpm -i to test package
 installation.

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

diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix
index 9ec9ace0757..241e90f2f4a 100644
--- a/pkgs/build-support/release/rpm-build.nix
+++ b/pkgs/build-support/release/rpm-build.nix
@@ -36,7 +36,7 @@ vmTools.buildRPM (
       done
 
       echo "installing ''${rpms[*]}..."
-      rpm -ip ''${rpms[*]} --excludepath /nix/store
+      rpm -Up ''${rpms[*]} --excludepath /nix/store
 
       eval "$postRPMInstall"
       

From 1eb5450bd4a60ac302f86d7609311c1c096b187f Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 14 Jul 2012 08:27:09 +0200
Subject: [PATCH 16/60] Add --nodeps to rpm when test-uninstalling after a
 rpmBuild.

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

diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix
index 241e90f2f4a..5eace575366 100644
--- a/pkgs/build-support/release/rpm-build.nix
+++ b/pkgs/build-support/release/rpm-build.nix
@@ -41,7 +41,7 @@ vmTools.buildRPM (
       eval "$postRPMInstall"
       
       echo "uninstalling ''${rpmNames[*]}..."
-      rpm -e ''${rpmNames[*]}
+      rpm -e ''${rpmNames[*]} --nodeps
 
       for i in $out/rpms/*/*.src.rpm; do
         echo "file srpm $i" >> $out/nix-support/hydra-build-products

From ce77a5ceec8d4f241bec049a3af9d9626b74b6dc Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Fri, 13 Jul 2012 20:58:39 +0200
Subject: [PATCH 17/60] Factor out repeated scriptlets from
 build-support/release/*.nix.

---
 pkgs/build-support/release/ant-build.nix      |  9 ++-------
 pkgs/build-support/release/binary-tarball.nix |  7 +------
 pkgs/build-support/release/debian-build.nix   | 15 ++++-----------
 pkgs/build-support/release/functions.sh       | 14 ++++++++++++++
 pkgs/build-support/release/nix-build.nix      |  8 ++------
 pkgs/build-support/release/rpm-build.nix      | 14 ++++----------
 6 files changed, 27 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/build-support/release/functions.sh

diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix
index fe15f93a8fe..696f179a2ed 100644
--- a/pkgs/build-support/release/ant-build.nix
+++ b/pkgs/build-support/release/ant-build.nix
@@ -100,15 +100,10 @@ stdenv.mkDerivation (
     postHook = ''
       mkdir -p $out/nix-support
       echo "$system" > $out/nix-support/system
+      . ${./functions.sh}
 
-      # If `src' is the result of a call to `makeSourceTarball', then it
-      # has a subdirectory containing the actual tarball(s).  If there are
-      # multiple tarballs, just pick the first one.
       origSrc=$src
-      if test -d $src/tarballs; then
-          src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1)
-      fi
-
+      src=$(findTarballs $src | head -1)
     ''; 
   }
 )
diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix
index 6901c9f5555..93331707cee 100644
--- a/pkgs/build-support/release/binary-tarball.nix
+++ b/pkgs/build-support/release/binary-tarball.nix
@@ -36,13 +36,8 @@ stdenv.mkDerivation (
       mkdir -p $out/nix-support
       echo "$system" > $out/nix-support/system
 
-      # If `src' is the result of a call to `makeSourceTarball', then it
-      # has a subdirectory containing the actual tarball(s).  If there are
-      # multiple tarballs, just pick the first one.
       origSrc=$src
-      if test -d $src/tarballs; then
-          src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1)
-      fi
+      src=$(findTarballs $src | head -1)
 
       if test -e $origSrc/nix-support/hydra-release-name; then
           releaseName=$(cat $origSrc/nix-support/hydra-release-name)
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 0095a2ff881..feb15267f59 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -30,17 +30,10 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
 
     # !!! cut&paste from rpm-build.nix
     postHook = ''
-      mkdir -p $out/nix-support
-      cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
-
-      # If `src' is the result of a call to `makeSourceTarball', then it
-      # has a subdirectory containing the actual tarball(s).  If there are
-      # multiple tarballs, just pick the first one.
-      echo $src
-      if test -d $src/tarballs; then
-          src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1)
-      fi
-    ''; # */
+      . ${./functions.sh}
+      propagateImageName
+      src=$(findTarballs $src | head -1) # Find a tarball.
+    '';
 
     installExtraDebsPhase = ''
       for i in $extraDebs; do
diff --git a/pkgs/build-support/release/functions.sh b/pkgs/build-support/release/functions.sh
new file mode 100644
index 00000000000..9f2d03519c8
--- /dev/null
+++ b/pkgs/build-support/release/functions.sh
@@ -0,0 +1,14 @@
+findTarballs() {
+    local suffix
+    test -d "$1/tarballs/" && {
+        for suffix in tar.gz tgz tar.bz2 tbz2 tar.xz tar.lzma; do
+            ls $1/tarballs/*.$suffix 2> /dev/null
+        done | sort
+    }
+    echo "$1"
+}
+
+propagateImageName() {
+    ensureDir $out/nix-support
+    cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
+}
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index 8abbca97875..336563ae285 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -58,13 +58,9 @@ stdenv.mkDerivation (
     name = name + (if src ? version then "-" + src.version else "");
   
     postHook = ''
-      # If `src' is the result of a call to `makeSourceTarball', then it
-      # has a subdirectory containing the actual tarball(s).  If there are
-      # multiple tarballs, just pick the first one.
+      . ${./functions.sh}
       origSrc=$src
-      if test -d $src/tarballs; then
-          src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz $src/tarballs/*.tar.xz | sort | head -1)
-      fi
+      src=$(findTarballs $src | head -1)
 
       # Set GCC flags for coverage analysis, if desired.
       if test -n "${toString doCoverageAnalysis}"; then
diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix
index 5eace575366..708b62302d5 100644
--- a/pkgs/build-support/release/rpm-build.nix
+++ b/pkgs/build-support/release/rpm-build.nix
@@ -14,16 +14,10 @@ vmTools.buildRPM (
     name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
 
     preBuild = ''
-      mkdir -p $out/nix-support
-      cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
-
-      # If `src' is the result of a call to `makeSourceTarball', then it
-      # has a subdirectory containing the actual tarball(s).  If there are
-      # multiple tarballs, just pick the first one.
-      if test -d $src/tarballs; then
-          src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1)
-      fi
-    ''; # */
+      . ${./functions.sh}
+      propagateImageName
+      src=$(findTarballs $src | head -1) # Pick the first tarball.
+    '';
 
     postInstall = ''
       declare -a rpms rpmNames

From 8c9bef04a6d8253d48a98880dea51bd3fe914395 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 24 Jul 2012 02:26:04 +0000
Subject: [PATCH 18/60] linux-3.5: Enable XEN_DOM0 support

---
 pkgs/os-specific/linux/kernel/linux-3.5.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix
index 42ebd8c3943..364d0545583 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix
@@ -205,6 +205,7 @@ let
       USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
       X86_CHECK_BIOS_CORRUPTION y
       X86_MCE y
+      XEN_DOM0 y
 
       # Linux Containers
       RT_GROUP_SCHED? y

From 0b112cb4897cc9dea3f5fd2dcd984afff0a15357 Mon Sep 17 00:00:00 2001
From: Phreedom <phreedom.stdin@gmail.com>
Date: Tue, 24 Jul 2012 10:47:37 +0300
Subject: [PATCH 19/60] F-Prot: package

---
 pkgs/tools/security/fprot/default.nix | 41 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/security/fprot/default.nix

diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix
new file mode 100644
index 00000000000..95f7140b918
--- /dev/null
+++ b/pkgs/tools/security/fprot/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl }:
+stdenv.mkDerivation rec {
+
+  name = "f-prot-${version}";
+  version = "6.2.1";
+
+  src = fetchurl {
+    url = http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz;
+    sha256 = "0qlsrkanf0inplwv1i6hqbimdg91syf5ggd1vahsm9lhivmnr0v5";
+  };
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp fpscan $out/bin
+
+    ensureDir $out/opt/f-prot
+    cp fpupdate $out/opt/f-prot
+    cp product.data.default $out/opt/f-prot/product.data
+    cp license.key $out/opt/f-prot/
+    cp f-prot.conf.default $out/opt/f-prot/f-prot.conf
+    ln -s $out/opt/f-prot/fpupdate $out/bin/fpupdate
+
+    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate
+
+    ensureDir $out/share/man/
+    ensureDir $out/share/man/man1
+    cp doc/man/fpscan.1 $out/share/man/man1
+    ensureDir $out/share/man/man5
+    cp doc/man/f-prot.conf.5 $out/share/man/man5
+    ensureDir $out/share/man/man8
+    cp doc/man/fpupdate.8 $out/share/man/man8
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.f-prot.com;
+    description = "a popular proprietary antivirus, Linux workstation edition.";
+    license = licenses.proprietary;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1626ca7802e..7ca671eb59d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -718,6 +718,8 @@ let
 
   fortune = callPackage ../tools/misc/fortune { };
 
+  fprot = callPackage ../tools/security/fprot { };
+
   freeipmi = callPackage ../tools/system/freeipmi {};
 
   freetalk = callPackage ../applications/networking/instant-messengers/freetalk {

From 471a9615a22a420738141c30055483a91e735b9f Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 24 Jul 2012 14:16:22 +0200
Subject: [PATCH 20/60] fix mpich2 and mplayer

---
 pkgs/applications/video/MPlayer/default.nix   | 2 +-
 pkgs/development/libraries/mpich2/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 3c1cd2ff447..566089201cd 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ freetype zlib pkgconfig ]
-    ++ stdenv.lib.optional x11Support [ libX11 libXext mesa ]
+    ++ stdenv.lib.optionals x11Support [ libX11 libXext mesa ]
     ++ stdenv.lib.optional alsaSupport alsaLib
     ++ stdenv.lib.optional xvSupport libXv
     ++ stdenv.lib.optional theoraSupport libtheora
diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix
index 967abe500e2..0ad2d4e4749 100644
--- a/pkgs/development/libraries/mpich2/default.nix
+++ b/pkgs/development/libraries/mpich2/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   configureFlags = "--enable-shared --enable-sharedlib";
 
   buildInputs = [ python perl gfortran ];
-  propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) [ stdenv.glibc ];
+  propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) stdenv.glibc;
 
   patchPhase =
     '' for i in $(find -type f -not -name Makefile.\*)

From bf4c4d7a3627c74c604e26cd6ec4a851d68d1e8f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 11:43:24 -0400
Subject: [PATCH 21/60] Revert "ffmpeg: Add optional Jack audio support."

This reverts commit fe42f8add91b1616de94f878351f3dd5b44dbcdd.
---
 pkgs/development/libraries/ffmpeg/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 53868950598..ee88fd0145c 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib
-, jackSupport ? false, jackaudio ? null
 , mp3Support ? true, lame ? null
 , speexSupport ? true, speex ? null
 , theoraSupport ? true, libtheora ? null
@@ -13,7 +12,6 @@
 , x11grabSupport ? false, libXext ? null, libXfixes ? null
 }:
 
-assert jackSupport -> jackaudio != null;
 assert speexSupport -> speex != null;
 assert theoraSupport -> libtheora != null;
 assert vorbisSupport -> libvorbis != null;
@@ -56,7 +54,6 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
 
   buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
-    ++ stdenv.lib.optional jackSupport jackaudio
     ++ stdenv.lib.optional mp3Support lame
     ++ stdenv.lib.optional speexSupport speex
     ++ stdenv.lib.optional theoraSupport libtheora

From 605f9bec529f0fd2e8458883a3be2633b07c9aa8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 11:43:29 -0400
Subject: [PATCH 22/60] Revert "ffmpeg: Add alsaLib to dependencies."

This reverts commit d9f08cf6f26337efd5a3a4142c38a0963aba31c4.
---
 pkgs/development/libraries/ffmpeg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index ee88fd0145c..41768c4e313 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib
+{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2
 , mp3Support ? true, lame ? null
 , speexSupport ? true, speex ? null
 , theoraSupport ? true, libtheora ? null
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
     ++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
 
-  buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
+  buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
     ++ stdenv.lib.optional mp3Support lame
     ++ stdenv.lib.optional speexSupport speex
     ++ stdenv.lib.optional theoraSupport libtheora

From bb8ac70291bd7a936bcac1db1ff898de4e964289 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 11:43:30 -0400
Subject: [PATCH 23/60] Revert "ffmpeg: Add option to enable x11grab support."

This reverts commit 05831d3a668361b2948c0185eceb6d7c579c851a.
---
 pkgs/development/libraries/ffmpeg/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 41768c4e313..9b90d56d4d9 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -9,7 +9,6 @@
 , vdpauSupport ? true, libvdpau ? null
 , faacSupport ? false, faac ? null
 , dc1394Support ? false, libdc1394 ? null
-, x11grabSupport ? false, libXext ? null, libXfixes ? null
 }:
 
 assert speexSupport -> speex != null;
@@ -20,7 +19,6 @@ assert x264Support -> x264 != null;
 assert xvidSupport -> xvidcore != null;
 assert vdpauSupport -> libvdpau != null;
 assert faacSupport -> faac != null;
-assert x11grabSupport -> libXext != null && libXfixes != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-0.11.1";
@@ -50,8 +48,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
     ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
     ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
-    ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
-    ++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
+    ++ stdenv.lib.optional dc1394Support "--enable-libdc1394";
 
   buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
     ++ stdenv.lib.optional mp3Support lame
@@ -63,8 +60,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional xvidSupport xvidcore
     ++ stdenv.lib.optional vdpauSupport libvdpau
     ++ stdenv.lib.optional faacSupport faac
-    ++ stdenv.lib.optional dc1394Support libdc1394
-    ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];
+    ++ stdenv.lib.optional dc1394Support libdc1394;
 
   enableParallelBuilding = true;
     

From 63b257e0e1a910ce187028b9af6d26184d5b1958 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 11:43:31 -0400
Subject: [PATCH 24/60] Revert "ffmpeg: Update to latest version 0.11.1."

This reverts commit c6a2a1f8851bc3896a824219dfc5545a642fba45.
---
 pkgs/development/libraries/ffmpeg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 9b90d56d4d9..3b5e28a2ee7 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.11.1";
+  name = "ffmpeg-0.10";
   
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96";
+    sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3";
   };
   
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that

From e198f4b237c1fcd77608c53c8bfc52316da2e3dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Jul 2012 21:57:18 +0200
Subject: [PATCH 25/60] Revert "Update RPM to 4.10.0."

Commit e29c284926c2ba3b239c4ee3aaa21aa9396f046a breaks some builds, i.e.
<http://hydra.nixos.org/build/2890636>.
---
 pkgs/tools/package-management/rpm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 8ed7a2daba5..b35d3b66ad8 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz }:
 
 stdenv.mkDerivation rec {
-  name = "rpm-4.10.0";
+  name = "rpm-4.7.2";
 
   src = fetchurl {
-    url = "http://rpm.org/releases/rpm-4.10.x/${name}.tar.bz2";
-    sha256 = "1ag4pz51npiwf6vcksipjxaypm5afzmy8lj19bp0fk5n6mr26bhf";
+    url = "http://rpm.org/releases/rpm-4.7.x/${name}.tar.bz2";
+    sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0";
   };
 
   buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz ];

From 912440dae8952f36b17f993f2770fc8e3d2a84e4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 24 Jul 2012 18:34:19 -0400
Subject: [PATCH 26/60] dovecot2: Bump to 2.1.8

---
 pkgs/servers/mail/dovecot/2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/2.x.nix b/pkgs/servers/mail/dovecot/2.x.nix
index 294a58b4f24..d500e5c9bd5 100644
--- a/pkgs/servers/mail/dovecot/2.x.nix
+++ b/pkgs/servers/mail/dovecot/2.x.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, openssl, pam, bzip2, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.1.7";
+  name = "dovecot-2.1.8";
 
   buildInputs = [openssl pam bzip2 zlib];
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.1/${name}.tar.gz";
-    sha256 = "0lpldhs0nvy6rxabqkp14wzcwf1cx4jvnbp1xcm74izrzxhvrdym";
+    sha256 = "03801f4agcwdpqyg6dfxlga3750pnhk4gaf8m7sjq1qmz2277028";
   };
 
   # It will hardcode this for /var/lib/dovecot.

From 99413d3e3c25b57b96353ac7edb5863b9812fcf7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 13:10:53 -0400
Subject: [PATCH 27/60] kbd: Hard-code the path to gzip/bzip2

This is necessary for systemd-vconsole-setup.service in systemd.
---
 pkgs/os-specific/linux/kbd/default.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index da45b39cee1..c9ca75b563d 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, flex, autoconf, automake }:
+{ stdenv, fetchurl, bison, flex, autoconf, automake, gzip, bzip2 }:
 
 stdenv.mkDerivation rec {
   name = "kbd-1.15.2";
@@ -10,13 +10,19 @@ stdenv.mkDerivation rec {
 
   buildNativeInputs = [ bison flex autoconf automake ];
 
-  # We get a warning in armv5tel-linux and the fuloong2f,
-  # so we disable -Werror in it
-  patchPhase = if (stdenv.isArm ||
-    stdenv.system == "mips64el-linux")
-    then ''
-      sed -i s/-Werror// src/Makefile.am
-    '' else "";
+  patchPhase =
+    ''
+      # Fix the path to gzip/bzip2.
+      substituteInPlace src/findfile.c \
+        --replace gzip ${gzip}/bin/gzip \
+        --replace bzip2 ${bzip2}/bin/bzip2 \
+    
+      # We get a warning in armv5tel-linux and the fuloong2f, so we
+      # disable -Werror in it.
+      ${stdenv.lib.optionalString (stdenv.isArm || stdenv.system == "mips64el-linux") ''
+        sed -i s/-Werror// src/Makefile.am
+      ''}
+    '';
 
   # Grrr, kbd 1.15.1 doesn't include a configure script.
   preConfigure = "autoreconf";

From ddb5bd38bb637673a162ede04e96cf7486a936e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 15:18:21 -0400
Subject: [PATCH 28/60] kbd: Update to 1.15.3

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

diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index c9ca75b563d..4d04b75b3b0 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, bison, flex, autoconf, automake, gzip, bzip2 }:
+{ stdenv, fetchurl, gzip, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "kbd-1.15.2";
+  name = "kbd-1.15.3";
 
   src = fetchurl {
     url = "ftp://ftp.altlinux.org/pub/people/legion/kbd/${name}.tar.gz";
-    sha256 = "0ff674y6d3b6ix08b9l2yzv8igns768biyp5y92vip7iz4xv2p2j";
+    sha256 = "1vcl2791xshjdpi4w88iy87gkb7zv0dbvi83f98v30dvqc9mfl46";
   };
 
-  buildNativeInputs = [ bison flex autoconf automake ];
+  configureFlags = "--disable-nls";  
 
   patchPhase =
     ''
@@ -24,9 +24,6 @@ stdenv.mkDerivation rec {
       ''}
     '';
 
-  # Grrr, kbd 1.15.1 doesn't include a configure script.
-  preConfigure = "autoreconf";
-
   makeFlags = "setowner= ";
 
   meta = {

From 6262db94a91a83e1154c4f675f2983edb84ab5d9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 22:27:36 -0400
Subject: [PATCH 29/60] grub: Update to 2.00

---
 pkgs/tools/misc/grub/{1.9x.nix => 2.0x.nix} | 18 +++++++++++-------
 pkgs/top-level/all-packages.nix             |  6 ++----
 2 files changed, 13 insertions(+), 11 deletions(-)
 rename pkgs/tools/misc/grub/{1.9x.nix => 2.0x.nix} (88%)

diff --git a/pkgs/tools/misc/grub/1.9x.nix b/pkgs/tools/misc/grub/2.0x.nix
similarity index 88%
rename from pkgs/tools/misc/grub/1.9x.nix
rename to pkgs/tools/misc/grub/2.0x.nix
index 49cc4884e63..ef9d939ed47 100644
--- a/pkgs/tools/misc/grub/1.9x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -2,12 +2,16 @@
 , EFIsupport ? false }:
 
 let
-    prefix = "grub${if EFIsupport then "-efi" else ""}";
-    version = "1.99";
-    unifont_bdf = fetchurl {
-      url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
-      sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
-    };
+
+  prefix = "grub${if EFIsupport then "-efi" else ""}";
+  
+  version = "2.00";
+  
+  unifont_bdf = fetchurl {
+    url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
+    sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
+  };
+  
 in
 
 stdenv.mkDerivation rec {
@@ -15,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/grub/grub-${version}.tar.xz";
-    sha256 = "06q2a7bg1mbsms604a89fkdnwrc1jg9hr2mmfdmg3il39j6i827k";
+    sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq";
   };
 
   buildNativeInputs = [ flex bison ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ca671eb59d..0712efad828 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -830,11 +830,9 @@ let
     buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true;
   };
 
-  grub19x = callPackage ../tools/misc/grub/1.9x.nix { };
+  grub2 = callPackage ../tools/misc/grub/2.0x.nix { };
 
-  grub2 = grub19x;
-
-  grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; };
+  grub2_efi = grub2.override { EFIsupport = true; };
 
   gssdp = callPackage ../development/libraries/gssdp {
     inherit (gnome) libsoup;

From 0d5f1fd833b8856ff90babb31a1b88d043c1c41a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 22:45:26 -0400
Subject: [PATCH 30/60] upower: Update to 0.9.17

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

diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 4a8cfbdbc51..71a05486b48 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -4,11 +4,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "upower-0.9.16";
+  name = "upower-0.9.17";
 
   src = fetchurl {
     url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "eb9a3d39a8cb62970fd612e333bc7a43437ab0e7890303578b0a7e3c67c8c212";
+    sha256 = "0a1j2pg44r6ljj9jgzlw8i5fzabpm2b2jk058kxsr77ciz96i7yg";
   };
 
   buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ];

From 96fd0e446ae701ea48a6a8f1f3889d4e07f35da2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Jul 2012 15:48:10 +0200
Subject: [PATCH 31/60] haskell-HsOpenSSL: update to version 0.10.3.2

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

diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index 20213051694..3a4c94e33a2 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.1";
-  sha256 = "0dilmaibx18mfg4c8g96c1svhynhkrq4i5zzv3wg0a550g3xc0py";
+  version = "0.10.3.2";
+  sha256 = "15mlllzw8ahvrx259bz5vwisdig7bvkany1qjhmz6y8v2rcplr7f";
   buildDepends = [ network time ];
   extraLibraries = [ openssl ];
   meta = {

From acd0cdbe727dd8d6293e3af5d3b0d6383e4e93ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Jul 2012 15:48:10 +0200
Subject: [PATCH 32/60] haskell-comonad-transformers: update to version 3.0

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

diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
index 1dd7c212c71..bc378235b91 100644
--- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "comonad-transformers";
-  version = "2.1.2";
-  sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis";
+  version = "3.0";
+  sha256 = "1bjix61rdzmqcd1irh6p91jwy4sz1617sj4zic07p7ng9h7fsz24";
   buildDepends = [
     comonad contravariant distributive semigroupoids semigroups
     transformers

From 1d5c4851a0bd51bb3fb28a8080ae43faf46471b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Jul 2012 15:48:10 +0200
Subject: [PATCH 33/60] haskell-comonad: update to version 3.0.0.1

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

diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
index 53e014fb8ac..b73e29fc1e0 100644
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "comonad";
-  version = "1.1.1.6";
-  sha256 = "1sg0pa7393mzfm27pl52nchplhkls3k0f4ff8vzk76wzrgvhysg5";
+  version = "3.0.0.1";
+  sha256 = "03xslpfil96v1qgk2g29vi46mb7l0fafy446ng1p4xgq9ddb2yaz";
   buildDepends = [ semigroups transformers ];
   meta = {
     homepage = "http://github.com/ekmett/comonad/";

From 2cadf555b09e924910b08acb57287c00c13a8b53 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Jul 2012 15:48:11 +0200
Subject: [PATCH 34/60] haskell-data-lens: update to version 2.10.1

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

diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix
index 42e6c9f1518..48d49324bb5 100644
--- a/pkgs/development/libraries/haskell/data-lens/default.nix
+++ b/pkgs/development/libraries/haskell/data-lens/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-lens";
-  version = "2.10.0";
-  sha256 = "0y3rl9axakvz6kwmh08aabbz1z7y38wyrygmg4m6xby02cqbq5gk";
+  version = "2.10.1";
+  sha256 = "01n5lsq8nbn2lqsyz6y3md47zwpmdpfvhhlwn4fdpcl2d4hdh6xh";
   buildDepends = [
     comonad comonadTransformers semigroupoids transformers
   ];

From 6d7f1e10adde61abe482b395ee94575376a5a8a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Jul 2012 15:48:11 +0200
Subject: [PATCH 35/60] haskell-semigroupoids: update to version 3.0

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

diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
index 776e452eafe..4ffc3c2badc 100644
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroupoids";
-  version = "1.3.4";
-  sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph";
+  version = "3.0";
+  sha256 = "0wsax14ck363nby0xrhcpvdzf0pzspayl7gsm0br0lr6ipmpcrag";
   buildDepends = [ comonad contravariant semigroups transformers ];
   meta = {
     homepage = "http://github.com/ekmett/semigroupoids";

From 99903896a8aab74dbbe978ca3d0ca7a0ef43fcb7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Jul 2012 15:48:11 +0200
Subject: [PATCH 36/60] haskell-snap: update to version 0.9.1.1

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

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index c20ee0318ed..505c9bcb0cc 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap";
-  version = "0.9.0.1";
-  sha256 = "0n3qmyvqqcds3c56ml77d2cr0ghs1c7wwd20m44zzmxxmpbnfmgh";
+  version = "0.9.1.1";
+  sha256 = "1g8jvnwrhna5g064dmv4v4khrpwwn0vcqw8l7rcpkp75l46fq29z";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 076d0635b3e20d6c2fcae1f94d7f4bf0f2e895e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Jul 2012 15:48:12 +0200
Subject: [PATCH 37/60] haskell-tls: update to version 0.9.8

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

diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 60fa129d9d4..3a225361fb3 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.7";
-  sha256 = "0px34l6lw6nv3cbnrgf8ajwja7ifd1pckddmbvrbwk6q459w1pjh";
+  version = "0.9.8";
+  sha256 = "022hak5wy47j4zpf2f89zvz4j2586s3d0a5jkxvz54dkqimy63r6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 2302e45632424aae16c780d8ca7211fd0e91f778 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Jul 2012 15:48:12 +0200
Subject: [PATCH 38/60] haskell-vector-space: update to version 0.8.2

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

diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix
index d24dc536da1..2957959f005 100644
--- a/pkgs/development/libraries/haskell/vector-space/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vector-space";
-  version = "0.8.1";
-  sha256 = "0khbi46i9q585nhxhf842wsdifcj1i1dqm84hj0r36474rfh55z5";
+  version = "0.8.2";
+  sha256 = "09gndxxscyc9w85fih370gag8yd1xbfg94nxkwdvhzvbkns9k2ad";
   buildDepends = [ Boolean MemoTrie NumInstances ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/vector-space";

From a9cd20e601a7bccc4c19434bc7dc379cf9a78e39 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 25 Jul 2012 10:26:34 -0400
Subject: [PATCH 39/60] v8: Update to 3.11.10.15

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

diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index a7630ee5d69..de1c9074208 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.25";
+  version = "3.11.10.15";
 in
 assert arch != "";
 stdenv.mkDerivation rec {
     name = "v8-${version}";
     src = fetchsvn {
       url = "http://v8.googlecode.com/svn/tags/${version}";
-      sha256 = "2a097cbea29a8488419840245bf7bf85513941ceb22c5ef0a3825bfe5edaa045";
+      sha256 = "0pdw4r6crsb07gshww4kbfbavxgkal8yaxkaggnkz62lrwbcwrwi";
     };
 
     buildInputs = [python scons readline makeWrapper];

From 6a3ea47c4e7515e4d7469b1af3ea4060f5531597 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 25 Jul 2012 10:45:04 -0400
Subject: [PATCH 40/60] node: Update to 0.8.3

---
 pkgs/development/web/nodejs/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index ef45825a584..98042359857 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, linkV8Headers ? false }:
+{ stdenv, fetchurl, openssl, python, zlib, v8, linkV8Headers ? false, utillinux }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.19";
+  version = "0.8.3";
   name = "nodejs-${version}";
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "1frgnl7i111b8x3fr43lh3zybwsszn0daa661gszq7dhfwj2jcsf";
+    sha256 = "0dgcw6qpgvsxcvcbkmvpjz2i9f2r286zcrcg0jnxnds9fj41s2k0";
   };
 
   configureFlags = [
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;
 
   prePatch = ''
-    sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf}
+    sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure
   '';
 
   postInstall = ''
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node
   '';
 
-  buildInputs = [ python openssl v8 zlib ];
+  buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isLinux utillinux;
 
   meta = with stdenv.lib; {
     description = "Event-driven I/O framework for the V8 JavaScript engine";

From 7f4b27f46416f7a7cc68d43ac5869ed643443be6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 25 Jul 2012 10:55:49 -0400
Subject: [PATCH 41/60] Add gyp python package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b8327ddaaae..0b2139a8c68 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -848,6 +848,27 @@ let pythonPackages = python.modules // rec {
   };
 
 
+  gyp = buildPythonPackage rec {
+    rev = "1435";
+    name = "gyp-r${rev}";
+
+    src = fetchsvn {
+      url = "http://gyp.googlecode.com/svn/trunk";
+      inherit rev;
+      sha256 = "1wmd1svx5344alb8ff9vzdam1ccqdl0h7shp1xnsk843hqwc0fz0";
+    };
+
+    doCheck = false;
+
+    postUnpack = "find . -print0 | xargs -0 touch";
+
+    meta = {
+      homepage = http://code.google.com/p/gyp;
+      description = "Generate Your Projects";
+    };
+  };
+
+
   httplib2 = buildPythonPackage rec {
     name = "httplib2-0.6.0";
 

From 3a37f47fd41763dd405482ba04b759ebe36a6660 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 25 Jul 2012 11:42:15 -0400
Subject: [PATCH 42/60] v8: build with gyp.

The scons build has been deprecated
---
 pkgs/development/libraries/v8/default.nix | 32 ++++++++++++++---------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index de1c9074208..d8518f3bb4d 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, python, scons, readline, makeWrapper }:
+{ stdenv, fetchsvn, gyp, readline, python }:
 
 assert readline != null;
 
@@ -7,7 +7,9 @@ let
   arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else "";
   version = "3.11.10.15";
 in
+
 assert arch != "";
+
 stdenv.mkDerivation rec {
     name = "v8-${version}";
     src = fetchsvn {
@@ -15,22 +17,26 @@ stdenv.mkDerivation rec {
       sha256 = "0pdw4r6crsb07gshww4kbfbavxgkal8yaxkaggnkz62lrwbcwrwi";
     };
 
-    buildInputs = [python scons readline makeWrapper];
-
-    buildPhase = ''
-      export CXX=`type -p g++`
-      export CPPPATH=${readline}/include
-      export LIBPATH=${readline}/lib
-      scons snapshot=on console=readline library=shared importenv=PATH arch=${arch} library d8
+    configurePhase = ''
+      mkdir build/gyp
+      ln -sv ${gyp}/bin/gyp build/gyp/gyp
     '';
 
+    buildInputs = [ readline python ];
+
+    buildFlags = [
+      "library=shared"
+      "console=readline"
+      "${arch}.release"
+    ];
+
+    enableParallelBuilding = true;
+
     installPhase = ''
       mkdir -p $out/bin
       mkdir -p $out/lib
-
-      cp -v libv8.* $out/lib
-      cp -v d8 $out/bin/d8
-      cp -vR include $out/
-      wrapProgram $out/bin/d8 --set ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} $out/lib
+      mv -v out/${arch}.release/d8 $out/bin
+      mv -v out/${arch}.release/lib.target/libv8.so $out/lib
+      mv -v include $out/
     '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0712efad828..4f3d4b4c0d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5004,7 +5004,7 @@ let
     inherit (gnome) libsoup;
   };
 
-  v8 = callPackage ../development/libraries/v8 { };
+  v8 = callPackage ../development/libraries/v8 { inherit (pythonPackages) gyp; };
 
   xalanj = xalanJava;
   xalanJava = callPackage ../development/libraries/java/xalanj {

From 003ea37724749c813d500f7e0145040119fdd04a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 25 Jul 2012 18:03:09 +0200
Subject: [PATCH 43/60] ipython: Update to 0.13.

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

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

From beb64d1bea51719fb3e592e9c4a0cf9ac2a1db67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 25 Jul 2012 18:12:59 +0200
Subject: [PATCH 44/60] readline: picking more patches from upstream

I'm particularly interested in 003, which solves a copy-paste trouble I have
copying matrices into octave, having enabled fltk.
---
 pkgs/development/libraries/readline/readline-6.2-patches.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/readline/readline-6.2-patches.nix b/pkgs/development/libraries/readline/readline-6.2-patches.nix
index 4e0ff213527..719face2135 100644
--- a/pkgs/development/libraries/readline/readline-6.2-patches.nix
+++ b/pkgs/development/libraries/readline/readline-6.2-patches.nix
@@ -3,4 +3,6 @@
 patch: [
 (patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q")
 (patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy")
+(patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb")
+(patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89")
 ]

From 830aa1a2f063593fe799f17846ee2d7bd67c818a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 14:31:21 -0400
Subject: [PATCH 45/60] ipw2100-fw: Drop runtime dependency on binutils etc.

---
 pkgs/os-specific/linux/firmware/ipw2100/default.nix | 5 +++--
 pkgs/os-specific/linux/firmware/ipw2200/default.nix | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/ipw2100/default.nix b/pkgs/os-specific/linux/firmware/ipw2100/default.nix
index 617a6cc38dd..abc6bf08dac 100644
--- a/pkgs/os-specific/linux/firmware/ipw2100/default.nix
+++ b/pkgs/os-specific/linux/firmware/ipw2100/default.nix
@@ -1,7 +1,8 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "ipw2100-fw-1.3";
+  
   src = fetchurl {
     url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2100-firmware/ipw2100-fw-1.3.tgz/46aa75bcda1a00efa841f9707bbbd113/ipw2100-fw-1.3.tgz;
     sha256 = "18m7wgd062qwfdr6y0kjrvf1715wjcjn4yml2sk29ls8br2pq471";
@@ -13,7 +14,7 @@ stdenv.mkDerivation {
   # says: "Your rights to redistribute the Software shall be
   # contingent upon your installation of this Agreement in its
   # entirety in the same directory as the Software."
-  installPhase = "mkdir -p $out; cp * $out";
+  installPhase = "mkdir -p $out; cp ipw* LICENSE $out";
   
   meta = {
     # "... you may transfer a copy of the Software ... provided such
diff --git a/pkgs/os-specific/linux/firmware/ipw2200/default.nix b/pkgs/os-specific/linux/firmware/ipw2200/default.nix
index ec1607ff2f7..5c4989b878a 100644
--- a/pkgs/os-specific/linux/firmware/ipw2200/default.nix
+++ b/pkgs/os-specific/linux/firmware/ipw2200/default.nix
@@ -1,7 +1,8 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "ipw2200-fw-3.1";
+  
   src = fetchurl {
     url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-3.1.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-3.1.tgz;
     sha256 = "1gaqc8d827d6ji7zhhkpbr4fzznqpar68gzqbzak1h4cq48qr0f6";

From 7bfdeb102bdeadb683e583275a9c71b7bc13d936 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 14:49:16 -0400
Subject: [PATCH 46/60] kde-workspace: Disable parallel building

Maybe this fixes this build failure:

In file included from /tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner.h:28:0,
                 from /tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner.cpp:20:
/tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner_config.h:24:34: fatal error: ui_killrunner_config.h: No such file or directory
compilation terminated.

http://hydra.nixos.org/build/2837527
---
 pkgs/desktops/kde-4.7/kde-workspace.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix
index 20fc5b56455..8116f4bb6b5 100644
--- a/pkgs/desktops/kde-4.7/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.7/kde-workspace.nix
@@ -27,6 +27,8 @@ kde {
        --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
    '';
 
+  enableParallelBuilding = false;
+  
   meta = {
     description = "KDE workspace components such as Plasma, Kwin and System Settings";
     license = "GPLv2";

From c516517656064e21404385b1dd3ca3856abaa013 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 25 Jul 2012 17:46:21 -0400
Subject: [PATCH 47/60] Add empty node-packages.nix using
 build-node-package.nix from npm2nix.

buildNodePackage is a function to build npm packages.

npm2nix (https://bitbucket.org/shlevy/npm2nix) can be used to generate subexpressions to go in node-packages.nix
---
 .../web/nodejs/build-node-package.nix         | 35 +++++++++++++++++++
 pkgs/top-level/node-packages.nix              | 12 +++++++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/web/nodejs/build-node-package.nix
 create mode 100644 pkgs/top-level/node-packages.nix

diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
new file mode 100644
index 00000000000..56941ddf27e
--- /dev/null
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -0,0 +1,35 @@
+{ stdenv, nodejs }:
+
+args @ { src, deps, ... }:
+
+stdenv.mkDerivation ({
+  unpackPhase = "true";
+
+  configurePhase = ''
+    runHook preConfigure
+    mkdir node_modules
+    ${stdenv.lib.concatStrings (map (dep: ''
+      ln -sv ${dep}/node_modules/${(builtins.parseDrvName dep.name).name} node_modules/
+    '') deps)}
+    export HOME=$(pwd)
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    ${nodejs}/bin/npm --registry http://www.example.com install ${src}    
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir $out
+    mv node_modules $out
+    if [ -d "$out/node_modules/.bin" ]; then
+      ln -sv node_modules/.bin $out/bin
+      find -L $out/node_modules/.bin/* -type f -print0 | \
+        xargs -0 sed --follow-symlinks -i 's@#!/usr/bin/env node@#!${nodejs}/bin/node@'
+    fi
+    runHook postInstall
+  '';
+} // args)
diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
new file mode 100644
index 00000000000..ae9ddad09ef
--- /dev/null
+++ b/pkgs/top-level/node-packages.nix
@@ -0,0 +1,12 @@
+{ pkgs, stdenv, nodejs }:
+
+let buildNodePackage = import ../development/web/nodejs/build-node-package.nix {
+  inherit stdenv nodejs;
+}; in
+
+with pkgs;
+
+let self = {
+};
+
+in self

From e2576899c16f389d27410f47db79d3340a04140a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 25 Jul 2012 17:51:19 -0400
Subject: [PATCH 48/60] Add coffee-script node package

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

diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index ae9ddad09ef..1787b2e31d8 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -7,6 +7,18 @@ let buildNodePackage = import ../development/web/nodejs/build-node-package.nix {
 with pkgs;
 
 let self = {
+  "coffee-script" = self."coffee-script-1.3.3";
+
+  "coffee-script-1.3.3" = buildNodePackage rec {
+    name = "coffee-script-1.3.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz";
+      sha256 = "deedd2cf9d5abe2bad724e6809bec40efa07215dae85f44d78cd37736bb50bc5";
+    };
+    deps = [
+
+    ];
+  };
 };
 
 in self

From 6a4887475b4917e4a803a2acbc9596fd6e945cd3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 25 Jul 2012 17:51:33 -0400
Subject: [PATCH 49/60] Add nodePackages attr to all-packages

---
 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 4f3d4b4c0d7..1ceb8dceb34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -973,6 +973,10 @@ let
 
   nodejs = callPackage ../development/web/nodejs {};
 
+  nodePackages = recurseIntoAttrs (import ./node-packages.nix {
+    inherit pkgs stdenv nodejs;
+  });
+
   ldns = callPackage ../development/libraries/ldns { };
 
   lftp = callPackage ../tools/networking/lftp { };
@@ -5020,7 +5024,6 @@ let
 
   jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { };
 
-
   ### DEVELOPMENT / PERL MODULES
 
   buildPerlPackage = import ../development/perl-modules/generic perl;

From 42da3759a21c64306fc17b658cf7052a5fca97a6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 25 Jul 2012 17:53:02 -0400
Subject: [PATCH 50/60] Remove the 'with pkgs;' from node-packages.nix.

Packages depending on non-node packages should refer to their deps with pkgs.name
---
 pkgs/top-level/all-packages.nix  | 2 +-
 pkgs/top-level/node-packages.nix | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ceb8dceb34..fe8604fbed0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -974,7 +974,7 @@ let
   nodejs = callPackage ../development/web/nodejs {};
 
   nodePackages = recurseIntoAttrs (import ./node-packages.nix {
-    inherit pkgs stdenv nodejs;
+    inherit pkgs stdenv nodejs fetchurl;
   });
 
   ldns = callPackage ../development/libraries/ldns { };
diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index 1787b2e31d8..d263e68981a 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -1,11 +1,9 @@
-{ pkgs, stdenv, nodejs }:
+{ pkgs, stdenv, nodejs, fetchurl }:
 
 let buildNodePackage = import ../development/web/nodejs/build-node-package.nix {
   inherit stdenv nodejs;
 }; in
 
-with pkgs;
-
 let self = {
   "coffee-script" = self."coffee-script-1.3.3";
 

From b0552eb9ca9b3b3097087271a8b60f8e49ae72b1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 25 Jul 2012 18:11:57 -0400
Subject: [PATCH 51/60] Add npm2nix

---
 .../tools/node/npm2nix/default.nix            | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/tools/node/npm2nix/default.nix

diff --git a/pkgs/development/tools/node/npm2nix/default.nix b/pkgs/development/tools/node/npm2nix/default.nix
new file mode 100644
index 00000000000..8300a7e2bc3
--- /dev/null
+++ b/pkgs/development/tools/node/npm2nix/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, coffeescript }:
+
+let version = "0.1"; in
+
+stdenv.mkDerivation rec {
+  name = "npm2nix-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/shlevy/npm2nix/get/${version}.tar.bz2";
+    sha256 = "14rfs114k02yc9gx0bcjqy67f9cqgkrr1dccwlzl09q9b6qs1k3k";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    sed 's|#!/usr/bin/env coffee|#!${coffeescript}/bin/coffee|' npm2nix.coffee \
+      > $out/bin/npm2nix
+    chmod +x $out/bin/npm2nix
+  '';
+
+  meta = {
+    description = "A tool to generate nix expressions from npm packages";
+    maintainer = stdenv.lib.maintainers.shlevy;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe8604fbed0..292900b242b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -977,6 +977,10 @@ let
     inherit pkgs stdenv nodejs fetchurl;
   });
 
+  npm2nix = callPackage ../development/tools/node/npm2nix {
+    coffeescript = nodePackages."coffee-script";
+  };
+
   ldns = callPackage ../development/libraries/ldns { };
 
   lftp = callPackage ../tools/networking/lftp { };

From 403e59420710d8221a3d3ce47be1d15b4d9dcb3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 15:35:51 -0400
Subject: [PATCH 52/60] ec2-ami-tools: Update to 1.6.0.0

---
 .../{amazon-ec2-ami-tools => ec2-ami-tools}/default.nix   | 4 ++--
 .../writable.patch                                        | 0
 .../{amazon-ec2-api-tools => ec2-api-tools}/default.nix   | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/tools/virtualization/{amazon-ec2-ami-tools => ec2-ami-tools}/default.nix (93%)
 rename pkgs/tools/virtualization/{amazon-ec2-ami-tools => ec2-ami-tools}/writable.patch (100%)
 rename pkgs/tools/virtualization/{amazon-ec2-api-tools => ec2-api-tools}/default.nix (75%)

diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
similarity index 93%
rename from pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
rename to pkgs/tools/virtualization/ec2-ami-tools/default.nix
index b05596ed50a..1420ab5eeeb 100644
--- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ec2-ami-tools-1.4.0.7";
   
   buildInputs = [ unzip makeWrapper ];
   
   src = fetchurl {
-    url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
+    url = "http://nixos.org/tarballs/${name}.zip";
     sha256 = "0l8c623i1w30bh9k622cdjj5f57rlfc1zs0i01ya016ijyr08qip";
   };
 
diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch b/pkgs/tools/virtualization/ec2-ami-tools/writable.patch
similarity index 100%
rename from pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch
rename to pkgs/tools/virtualization/ec2-ami-tools/writable.patch
diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix
similarity index 75%
rename from pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
rename to pkgs/tools/virtualization/ec2-api-tools/default.nix
index a85d4223b71..22669c67b12 100644
--- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, makeWrapper, jre }:
 
-stdenv.mkDerivation {
-  name = "ec2-api-tools-1.5.3.0";
+stdenv.mkDerivation rec {
+  name = "ec2-api-tools-1.6.0.0";
   
   src = fetchurl {
-    url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip;
-    sha256 = "15mxjay8pr6cvlmp9hdsg5z7zc15bicjrc30f27rknq72zyhxi8h";
+    url = "http://nixos.org/tarballs/${name}.zip";
+    sha256 = "1j9isvi6g68zhk7zxs29yad2d0rpnbqx8fz25yn5paqx9c8pzqcl";
   };
 
   buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 292900b242b..bf3e058b30d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -383,9 +383,9 @@ let
     };
   };
 
-  ec2apitools = callPackage ../tools/virtualization/amazon-ec2-api-tools { };
+  ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 
-  ec2amitools = callPackage ../tools/virtualization/amazon-ec2-ami-tools { };
+  ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };
 
   altermime = callPackage ../tools/networking/altermime {};
 

From 03f9026ac5ce7568c4b5c28d30552f869e229c63 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 16:24:18 -0400
Subject: [PATCH 53/60] buildEnv: don't warn about collisions in propagated
 packages

This mimicks buildenv in Nix more closely.
---
 pkgs/build-support/buildenv/builder.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 71502c9f668..08331b178f4 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -66,7 +66,7 @@ sub findFiles {
 
     unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
         if ($ignoreCollisions) {
-            warn "collision between `$target' and `$oldTarget'";
+            warn "collision between `$target' and `$oldTarget'" if $ignoreCollisions == 1;
             return;
         } else {
             die "collision between `$target' and `$oldTarget'";
@@ -122,7 +122,7 @@ while (scalar(keys %postponed) > 0) {
     my @pkgDirs = keys %postponed;
     %postponed = ();
     foreach my $pkgDir (sort @pkgDirs) {
-        addPkg($pkgDir, 1);
+        addPkg($pkgDir, 2);
     }
 }
 

From d3fb3157d125cdf9ca107d36b632c84060c32e6e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 16:28:58 -0400
Subject: [PATCH 54/60] autossh: Fix indentation and add to the channel

---
 pkgs/tools/networking/autossh/default.nix | 43 +++++++++++++----------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix
index 2cf17f29603..0c32b1c1240 100644
--- a/pkgs/tools/networking/autossh/default.nix
+++ b/pkgs/tools/networking/autossh/default.nix
@@ -1,23 +1,28 @@
 {stdenv, fetchurl, openssh}:
 
 stdenv.mkDerivation {
-	name="autossh-1.4b";
-	src = fetchurl {
-		url = "http://www.harding.motd.ca/autossh/autossh-1.4b.tgz";
-		md5 = "8f9aa006f6f69e912d3c2f504622d6f7";
-	};
-	buildInputs = [ openssh ];
-	installPhase = ''
-install -D -m755 autossh      $out/bin/autossh                          || return 1
-install -D -m644 CHANGES      $out/share/doc/autossh/CHANGES            || return 1
-install -D -m644 README       $out/share/doc/autossh/README             || return 1
-install -D -m644 autossh.host $out/share/autossh/examples/autossh.host  || return 1
-install -D -m644 rscreen      $out/share/autossh/examples/rscreen       || return 1
-install -D -m644 autossh.1    $out/man/man1/autossh.1                   || return 1
-	'';
-	meta = {
-		homepage = http://www.harding.motd.ca/autossh/;
-		description = "Automatically restart SSH sessions and tunnels";
-	};
+  name = "autossh-1.4b";
+  
+  src = fetchurl {
+    url = "http://www.harding.motd.ca/autossh/autossh-1.4b.tgz";
+    md5 = "8f9aa006f6f69e912d3c2f504622d6f7";
+  };
+  
+  buildInputs = [ openssh ];
+  
+  installPhase =
+    ''
+      install -D -m755 autossh      $out/bin/autossh                          || return 1
+      install -D -m644 CHANGES      $out/share/doc/autossh/CHANGES            || return 1
+      install -D -m644 README       $out/share/doc/autossh/README             || return 1
+      install -D -m644 autossh.host $out/share/autossh/examples/autossh.host  || return 1
+      install -D -m644 rscreen      $out/share/autossh/examples/rscreen       || return 1
+      install -D -m644 autossh.1    $out/man/man1/autossh.1                   || return 1
+    '';
+    
+  meta = {
+    homepage = http://www.harding.motd.ca/autossh/;
+    description = "Automatically restart SSH sessions and tunnels";
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
-

From 732ea6382ae159971c1ce23352555f7b8f6fbe87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 17:30:01 -0400
Subject: [PATCH 55/60] shadow: Update to 4.1.5.1

Fixes CVE-2005-4890 and CVE-2011-0721.
---
 pkgs/os-specific/linux/shadow/default.nix     | 16 ++++++++------
 pkgs/os-specific/linux/shadow/keep-path.patch | 21 ++++++++-----------
 .../linux/shadow/no-sanitize-env.patch        | 16 --------------
 pkgs/os-specific/linux/shadow/su-name.patch   | 20 ------------------
 4 files changed, 19 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/shadow/no-sanitize-env.patch
 delete mode 100644 pkgs/os-specific/linux/shadow/su-name.patch

diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index f14b249d514..e673a7e3088 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -1,21 +1,25 @@
 { stdenv, fetchurl, pam ? null, glibcCross ? null }:
 
 let
-  glibc = if stdenv ? cross
-          then glibcCross
-          else assert stdenv ? glibc; stdenv.glibc;
+
+  glibc =
+    if stdenv ? cross
+    then glibcCross
+    else assert stdenv ? glibc; stdenv.glibc;
+
 in
+
 stdenv.mkDerivation rec {
-  name = "shadow-4.1.4.2";
+  name = "shadow-4.1.5.1";
 
   src = fetchurl {
     url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2";
-    sha256 = "1449ny7pdnwkavg92wvibapnkgdq5pas38nvl1m5xa37g5m7z64p";
+    sha256 = "1yvqx57vzih0jdy3grir8vfbkxp0cl0myql37bnmi2yn90vk6cma";
   };
 
   buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
 
-  patches = [ ./no-sanitize-env.patch ./su-name.patch ./keep-path.patch ];
+  patches = [ ./keep-path.patch ];
 
   # Assume System V `setpgrp (void)', which is the default on GNU variants
   # (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
diff --git a/pkgs/os-specific/linux/shadow/keep-path.patch b/pkgs/os-specific/linux/shadow/keep-path.patch
index 4b8406b53b0..99fd17c27bc 100644
--- a/pkgs/os-specific/linux/shadow/keep-path.patch
+++ b/pkgs/os-specific/linux/shadow/keep-path.patch
@@ -1,18 +1,15 @@
-Don't reset $PATH to /bin:/usr/bin.  This is consistent with `su' in
-coreutils and important on NixOS.
-
-diff -ru -x '*~' shadow-4.1.4.2-orig/src/su.c shadow-4.1.4.2/src/su.c
---- shadow-4.1.4.2-orig/src/su.c	2009-07-23 22:38:56.000000000 +0200
-+++ shadow-4.1.4.2/src/su.c	2010-06-04 13:23:11.000000000 +0200
-@@ -827,6 +827,7 @@
- 	(void) signal (SIGINT, SIG_DFL);
- 	(void) signal (SIGQUIT, SIG_DFL);
+diff -ru shadow-4.1.5.1-orig/src/su.c shadow-4.1.5.1/src/su.c
+--- shadow-4.1.5.1-orig/src/su.c	2012-05-25 07:51:55.000000000 -0400
++++ shadow-4.1.5.1/src/su.c	2012-07-25 17:22:57.013547930 -0400
+@@ -879,6 +879,7 @@
+ 		}
+ 	}
  
 +#if 0
- 	cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
+ 	cp = getdef_str ((pw->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
  	if (NULL == cp) {
- 		addenv ("PATH=/bin:/usr/bin", NULL);
-@@ -835,6 +836,7 @@
+ 		addenv ((pw->pw_uid == 0) ? "PATH=/sbin:/bin:/usr/sbin:/usr/bin" : "PATH=/bin:/usr/bin", NULL);
+@@ -887,6 +888,7 @@
  	} else {
  		addenv ("PATH", cp);
  	}
diff --git a/pkgs/os-specific/linux/shadow/no-sanitize-env.patch b/pkgs/os-specific/linux/shadow/no-sanitize-env.patch
deleted file mode 100644
index 902706d137e..00000000000
--- a/pkgs/os-specific/linux/shadow/no-sanitize-env.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Don't remove environment variables such as PATH or SHELL.
-
-http://bugs.gentoo.org/show_bug.cgi?id=301957
-https://alioth.debian.org/scm/browser.php?group_id=30580
-
---- a/src/su.c
-+++ b/src/su.c
-@@ -342,7 +342,7 @@
- #endif
- #endif				/* !USE_PAM */
- 
--	sanitize_env ();
-+	/* sanitize_env (); */
- 
- 	(void) setlocale (LC_ALL, "");
- 	(void) bindtextdomain (PACKAGE, LOCALEDIR);
diff --git a/pkgs/os-specific/linux/shadow/su-name.patch b/pkgs/os-specific/linux/shadow/su-name.patch
deleted file mode 100644
index 5873c934274..00000000000
--- a/pkgs/os-specific/linux/shadow/su-name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-When su is invoked with command line arguments for the shell (e.g. "su
-- -c 'cmd'"), set argv[0] in the shell to "-su" or "-<basename>" (as
-determined by the SU_NAME option in /etc/login.defs).  This is
-necessary to make Bash compiled with the NON_INTERACTIVE_LOGIN_SHELLS
-option to read startup files.  It is also consistent with the
-behaviour of `su' in coreutils, and with the case where there are no
-arguments ("su -").
-
-diff -ru -x '*~' shadow-4.1.4.2-orig/src/su.c shadow-4.1.4.2/src/su.c
---- shadow-4.1.4.2-orig/src/su.c	2009-07-23 22:38:56.000000000 +0200
-+++ shadow-4.1.4.2/src/su.c	2010-06-04 13:02:24.000000000 +0200
-@@ -983,7 +983,7 @@
- 		 * Use the shell and create an argv
- 		 * with the rest of the command line included.
- 		 */
--		argv[-1] = shellstr;
-+		argv[-1] = cp;
- #ifndef USE_PAM
- 		execve_shell (shellstr, &argv[-1], environ);
- 		err = errno;

From 60a63886f037d29dcd2d1850aa50a42c45d95c9d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 17:36:34 -0400
Subject: [PATCH 56/60] =?UTF-8?q?shadow:=20Don't=20install=20=E2=80=98grou?=
 =?UTF-8?q?ps=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Coreutils already provides this command.
---
 pkgs/os-specific/linux/shadow/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index e673a7e3088..d401a04e6b9 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -30,6 +30,12 @@ stdenv.mkDerivation rec {
       substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd
     '';
 
+  # Don't install ‘groups’, since coreutils already provides it.
+  postInstall =
+    ''
+      rm $out/bin/groups $out/share/man/man1/groups.*
+    '';
+
   meta = {
     homepage = http://pkg-shadow.alioth.debian.org/;
     description = "Suite containing authentication-related tools such as passwd and su";

From b044cac2fc360740f9d11f01257b6d7986e06513 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 17:43:50 -0400
Subject: [PATCH 57/60] sysvinit: Don't install mountpoint and wall

These are already provided by util-linux.
---
 pkgs/os-specific/linux/sysvinit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index c088d3c5b1b..7b3ea62ea2d 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation {
       rm -rf $out/include
       rm -rf $out/share/man/man5
       rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5')
+      rm $out/bin/{mountpoint,wall} $out/share/man/man1/{mountpoint.1,wall.1}
     '';
     
   meta = {

From 7bd3cf21a5cb77d4f4aa8767b59b9ad29862752f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 22:04:43 -0400
Subject: [PATCH 58/60] ntfs-3g: Update to 2012.1.15

---
 pkgs/tools/filesystems/ntfs-3g/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index 2a8bef6c6ed..cedb8df39d1 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ntfs-3g_ntfsprogs";
-  version = "2011.4.12";
+  version = "2012.1.15";
   name = "${pname}-${version}";
 
   buildInputs = [libuuid] ++ stdenv.lib.optionals crypto [gnutls libgcrypt];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://tuxera.com/opensource/${name}.tgz";
-    sha256 = "01gfn94f4fdrl1rjhhxjvjbarr1mipdi4pmhhwirp0gy1dzp935a";
+    sha256 = "09gvfgvqm4dswzxmwvg3r23bv39cp8y8b6qs2jcwmrqd032i25kg";
   };
 
   patchPhase = ''

From 1d44578b48e7a9afe1ecc982bc3bf94fc28bd591 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 23:16:57 -0400
Subject: [PATCH 59/60] Add ciopfs

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

diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix
new file mode 100644
index 00000000000..f944e591a12
--- /dev/null
+++ b/pkgs/tools/filesystems/ciopfs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, fuse, glib, attr }:
+
+stdenv.mkDerivation rec {
+  name = "ciopfs-0.4";
+
+  src = fetchurl {
+    url = "http://www.brain-dump.org/projects/ciopfs/${name}.tar.gz";
+    sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l";
+  };
+
+  buildInputs = [ pkgconfig fuse glib attr ];
+
+  makeFlags = "DESTDIR=$(out) PREFIX=";
+
+  meta = {
+    homepage = http://www.brain-dump.org/projects/ciopfs/;
+    description = "A case-insensitive filesystem layered on top of any other filesystem";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf3e058b30d..88d62eb5ffa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -519,6 +519,8 @@ let
 
   cksfv = callPackage ../tools/networking/cksfv { };
 
+  ciopfs = callPackage ../tools/filesystems/ciopfs { };
+
   colordiff = callPackage ../tools/text/colordiff { };
 
   convertlit = callPackage ../tools/text/convertlit { };

From da63b3d2e7da3e21c4dccefa5bf6c580c1372318 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 26 Jul 2012 11:06:46 +0200
Subject: [PATCH 60/60] haskell-benchpress: update to version 0.2.2.6

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

diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix
index 4d4b145bb08..c80f04f966d 100644
--- a/pkgs/development/libraries/haskell/benchpress/default.nix
+++ b/pkgs/development/libraries/haskell/benchpress/default.nix
@@ -2,12 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "benchpress";
-  version = "0.2.2.5";
-  sha256 = "0md66nnn9ad8f3y0dd411plnza59fvhfd6nibag3a556bpfa0kgs";
+  version = "0.2.2.6";
+  sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg";
   buildDepends = [ mtl time ];
-  patchPhase = ''
-    sed -i -e 's|mtl .*,|mtl,|' benchpress.cabal
-  '';
   meta = {
     homepage = "http://github.com/tibbe/benchpress";
     description = "Micro-benchmarking with detailed statistics";