From 9457c15f418d0892a49a7842c069a7274ee65c44 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 28 Sep 2011 15:22:58 +0000
Subject: [PATCH 01/19] icu4c-4.8.1

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

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index c15bbe2491c..0474b79a847 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "icu4c";
-  version = "4.6";
+  version = "4.8.1";
 in
 
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
       + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
-    sha256 = "1z6zklqdf6pq7fckk8ar4vmfrnw79bih6yc8gwc7k2vx2alav8dm";
+    sha256 = "13zq190gl54zr84f0k48w9knarjsb966jkailyy06yhqjipcv90r";
   };
 
   postUnpack = "

From e2c4af0946a31d830ce7bd88952e8d845b16b540 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 28 Sep 2011 15:23:28 +0000
Subject: [PATCH 02/19] Update opera to the latest version

Also add missing dependencies (KDE, cups, gstreamer)

svn path=/nixpkgs/trunk/; revision=29527
---
 .../networking/browsers/opera/builder.sh      | 39 ---------
 .../networking/browsers/opera/default.nix     | 87 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 64 insertions(+), 66 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/opera/builder.sh

diff --git a/pkgs/applications/networking/browsers/opera/builder.sh b/pkgs/applications/networking/browsers/opera/builder.sh
deleted file mode 100644
index de4a413e4ac..00000000000
--- a/pkgs/applications/networking/browsers/opera/builder.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-source $stdenv/setup
-
-buildPhase() {
-    true
-}
-
-installPhase() {
-    substituteInPlace install --replace /bin/pwd pwd
-    substituteInPlace install --replace /usr/local "$out"
-    
-    # Note: the "no" is because the install scripts asks whether we
-    # want to install icons in some system-wide directories.
-    
-    ensureDir "$out"
-
-    ./install --text --system
-
-    [ -z ${system##*64*} ] && suf=64
-
-    find $out -type f | while read f; do
-      echo testing "$f"
-      # patch all executables
-      if readelf -h "$f" | grep 'EXEC (Executable file)' &> /dev/null; then
-        echo "patching $f <<"
-        patchelf \
-            --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-            --set-rpath "$libPath" \
-            "$f"
-      fi
-    done
-    
-    # Substitute pwd as late as possible so that the md5 checksum check of opera passes.
-    substituteInPlace $out/bin/opera --replace /bin/pwd pwd
-
-    ensureDir $out/share/applications
-    cp $desktopItem/share/applications/* $out/share/applications
-}
-
-genericBuild
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 8b7ef628044..3dddc856963 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -1,46 +1,81 @@
-{ stdenv, fetchurl, qt, zlib, libX11, libXext, libSM, libICE, libXt, glibc
-, makeDesktopItem, freetype, fontconfig, libXft, libXrender
+{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libXt
+, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
+, libuuid, cups, xz
+, gstreamer, gstPluginsBase, libxml2
+, gtkSupport ? true, glib, gtk, pango, gdk_pixbuf, cairo, atk
+, kdeSupport ? false, qt4, kdelibs
 }:
 
-assert stdenv.isLinux && stdenv.gcc.gcc != null;
+assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null;
+
+let
+  mirror = ftp://ftp.ussg.iu.edu/pub/opera;
+in
 
 stdenv.mkDerivation rec {
-  name = "opera-10.63";
+  name = "opera-11.51-1087";
 
-  builder = ./builder.sh;
+  buildNativeInputs = [ xz ];
   
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "http://mirror.liteserver.nl/pub/opera/linux/1063/opera-10.63-6450.i386.linux.tar.bz2";
-        sha256 = "dd105d602a4b8897749a4cb9610f8bfe2d07d4f4cc9bf3905930c65592737259";
+        url = "${mirror}/linux/1151/${name}.i386.linux.tar.bz2";
+        sha256 = "1baaim404g8nwd7knbl1p1ardpx36ib5159nkvqfnnavfyhkinp2";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://mirror.liteserver.nl/pub/opera/linux/1063/opera-10.63-6450.x86_64.linux.tar.bz2";
-        sha256 = "da8ae14cf317364ab0295102220246b205bf30c59c00cadb571395c90dda7c74";
+        url = "${mirror}/linux/1151/${name}.x86_64.linux.tar.xz";
+        sha256 = "1bciqyfhhdywaasj717by1a975ywf672r3pv9cw9bn0b90pgp933";
       }
     else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
 
   dontStrip = 1;
-  
-  # `operapluginwrapper' requires libXt. Adding it makes startup faster
-  # and omits error messages (on x86).
-  libPath =
-    let list = [ stdenv.gcc.gcc glibc qt zlib libX11 libXt libXext libSM libICE libXft freetype fontconfig
-       libXrender];
-    in stdenv.lib.makeLibraryPath list
-        + ":" + (if stdenv.system == "x86_64-linux" then stdenv.lib.makeSearchPath "lib64" list else "");
 
-  desktopItem = makeDesktopItem {
-    name = "Opera";
-    exec = "opera";
-    icon = "opera";
-    comment = "Opera Web Browser";
-    desktopName = "Opera";
-    genericName = "Web Browser";
-    categories = "Application;Network;";
-  };
+  phases = "unpackPhase installPhase fixupPhase";
+
+  installPhase = ''
+    ./install --unattended --prefix $out
+    '';
+
+  buildInputs =
+    [ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE
+      libXft freetype fontconfig libXrender libuuid expat
+      gstreamer libxml2 gstPluginsBase
+    ]
+    ++ stdenv.lib.optionals gtkSupport [ glib gtk pango gdk_pixbuf cairo atk ]
+    ++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ];
+
+  libPath = stdenv.lib.makeLibraryPath buildInputs
+    + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+      (":" + stdenv.lib.makeSearchPath "lib64" buildInputs);
+
+  preFixup =
+    ''
+    find $out/lib/opera -type f | while read f; do
+      type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/')
+      if [ -z "$type" ]; then
+        :
+      elif [ $type == "EXEC" ]; then
+        echo "patching $f executable <<"
+        patchelf \
+            --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+            --set-rpath "${libPath}" \
+            "$f"
+      elif [ $type == "DYN" ]; then
+        echo "patching $f library <<"
+        patchelf --set-rpath "${libPath}" "$f"
+      else
+        echo "Unknown type $type"
+        exit 1
+      fi
+    done
+    '';
+
+  postFixup = ''
+    oldRPATH=`patchelf --print-rpath $out/lib/opera/opera`
+    patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera
+    '';
 
   meta = {
     homepage = http://www.opera.com;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9a15a34301..d40589ade43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7059,7 +7059,9 @@ let
   };
 
   opera = callPackage ../applications/networking/browsers/opera {
-    qt = qt3;
+    inherit (pkgs.gtkLibs) gdk_pixbuf atk;
+    inherit (pkgs.kde4) kdelibs;
+    inherit (pkgs.gst_all) gstreamer gstPluginsBase;
   };
 
   pan = callPackage ../applications/networking/newsreaders/pan {

From 9e6178ed744bf8135a0fe8015c9014f5d4f81637 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Sep 2011 16:48:06 +0000
Subject: [PATCH 03/19] haskell-criterion: updated to version 0.5.1.0

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

diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index 0a7f23a38ac..f567569a6f6 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -1,13 +1,13 @@
-{ cabal, deepseq, mtl, mwcRandom, parsec, statistics, time, vector
-, vectorAlgorithms
+{ cabal, aeson, deepseq, mtl, mwcRandom, parsec, statistics, time
+, vector, vectorAlgorithms
 }:
 
 cabal.mkDerivation (self: {
   pname = "criterion";
-  version = "0.5.0.10";
-  sha256 = "0sd289s7wnyg0p37j327hv55aw4a18bdv56z26v4qi3j8p2fbpbj";
+  version = "0.5.1.0";
+  sha256 = "0v43dm1d84zvn32q89dq0nh4dvqr4r6fjdzwcjac0mjics3iy29d";
   buildDepends = [
-    deepseq mtl mwcRandom parsec statistics time vector
+    aeson deepseq mtl mwcRandom parsec statistics time vector
     vectorAlgorithms
   ];
   meta = {

From 5048bc7f21544f5b5f0798289157aaa217aaa918 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Sep 2011 16:48:13 +0000
Subject: [PATCH 04/19] haskell-happstack-util: updated to version 6.0.2

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

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
index de4c1b9990c..faeb174f251 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-util";
-  version = "6.0.0";
-  sha256 = "06qla74kb58q0rvlfa9k16s4crnylq99hm80xx4phlddyzn0cy4z";
+  version = "6.0.2";
+  sha256 = "03qlnclpg72iflry1xlkd0sxqm6nybvx113la9r0cmsnz17y546a";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 4cdafb258c230ffbe815f95e2f6114761f465557 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Sep 2011 16:48:17 +0000
Subject: [PATCH 05/19] haskell-hlint: updated to version 1.8.16

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

diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index da117157f22..be66cfc0680 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.15";
-  sha256 = "1hi2qapi8lb7cawjzvpknp8qvsnfw3glxyyd5m2lbp3rvkx0d6kr";
+  version = "1.8.16";
+  sha256 = "0crahq7fvhf0qvjcpjnmv5yh29l52cv7rgfwrc6ka4q0dm9r49vb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 60b155479dda13aebe5bd431e031b1ce86cf90a4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Sep 2011 20:48:08 +0000
Subject: [PATCH 06/19] linux-3.0: Add aufs3 patch

svn path=/nixpkgs/trunk/; revision=29532
---
 pkgs/os-specific/linux/kernel/patches.nix | 46 ++++++++++++++++++++++-
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 2b0d76d76ed..98e8b41d22d 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchgit }:
 
 let
 
@@ -36,6 +36,38 @@ let
       };
     };
 
+    makeAufs3StandalonePatch =  {kernelSrc, version, rev, sha256}:
+
+      stdenv.mkDerivation {
+        name = "aufs3-standalone-${version}.patch";
+
+        src = fetchgit {
+          url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git;
+          inherit sha256 rev;
+        };
+
+        #Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4
+        buildPhase = ''
+          tar xvf ${kernelSrc}
+          mv -v linux* a
+          cp -av a b
+          cd b
+          patch -Np1 -i ../aufs3-kbuild.patch
+          patch -Np1 -i ../aufs3-base.patch
+          patch -Np1 -i ../aufs3-proc_map.patch
+          patch -Np1 -i ../aufs3-standalone.patch
+          cp -av ../{Documentation,fs} .
+          cp -av ../include/linux/aufs_type.h include/linux/aufs_type.h
+        '';
+
+        installPhase = ''
+          cd ..
+          set +e
+          diff -Naur a b > $out
+          set -e
+        '';
+      };
+
 in
 
 rec {
@@ -272,6 +304,18 @@ rec {
       features.aufs2_1 = true;
     };
 
+  aufs3_0 = kernelSrc:
+    { name = "aufs3.0";
+      patch = makeAufs3StandalonePatch {
+        inherit kernelSrc;
+        version = "3.0";
+        rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4";
+        sha256 = "b508cab5987a623f057ae5fdc006c909a6bae6151af6e12fe672bf97b1a7549d";
+      };
+      features.aufsBase = true;
+      features.aufs3 = true;
+    };
+
   # Increase the timeout on CIFS requests from 15 to 120 seconds to
   # make CIFS more resilient to high load on the CIFS server.
   cifs_timeout_2_6_15 =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d40589ade43..3fd09b0b6f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5550,6 +5550,7 @@ let
     kernelPatches =
       [ #kernelPatches.fbcondecor_2_6_38
         kernelPatches.sec_perm_2_6_24
+        (kernelPatches.aufs3_0 linux_3_0.src)
         #kernelPatches.aufs2_1_3_0
         #kernelPatches.mips_restart_2_6_36
       ];

From 2e012018bb4a457fde7d660a8c195db4c247da72 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Sep 2011 21:09:54 +0000
Subject: [PATCH 07/19] makeAufs3StandalonePatch: Don't unpack the kernel
 source

svn path=/nixpkgs/trunk/; revision=29533
---
 pkgs/os-specific/linux/kernel/patches.nix | 25 +++++------------------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 98e8b41d22d..3f66fcb8850 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -36,7 +36,7 @@ let
       };
     };
 
-    makeAufs3StandalonePatch =  {kernelSrc, version, rev, sha256}:
+    makeAufs3StandalonePatch =  {version, rev, sha256}:
 
       stdenv.mkDerivation {
         name = "aufs3-standalone-${version}.patch";
@@ -46,25 +46,11 @@ let
           inherit sha256 rev;
         };
 
-        #Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4
-        buildPhase = ''
-          tar xvf ${kernelSrc}
-          mv -v linux* a
-          cp -av a b
-          cd b
-          patch -Np1 -i ../aufs3-kbuild.patch
-          patch -Np1 -i ../aufs3-base.patch
-          patch -Np1 -i ../aufs3-proc_map.patch
-          patch -Np1 -i ../aufs3-standalone.patch
-          cp -av ../{Documentation,fs} .
-          cp -av ../include/linux/aufs_type.h include/linux/aufs_type.h
-        '';
+        phases = [ "unpackPhase" "installPhase" ];
 
+        #Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4
         installPhase = ''
-          cd ..
-          set +e
-          diff -Naur a b > $out
-          set -e
+          cat aufs3-base.patch aufs3-proc_map.patch aufs3-standalone.patch > $out
         '';
       };
 
@@ -304,10 +290,9 @@ rec {
       features.aufs2_1 = true;
     };
 
-  aufs3_0 = kernelSrc:
+  aufs3_0 =
     { name = "aufs3.0";
       patch = makeAufs3StandalonePatch {
-        inherit kernelSrc;
         version = "3.0";
         rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4";
         sha256 = "b508cab5987a623f057ae5fdc006c909a6bae6151af6e12fe672bf97b1a7549d";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fd09b0b6f0..1c93b070c08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5550,7 +5550,7 @@ let
     kernelPatches =
       [ #kernelPatches.fbcondecor_2_6_38
         kernelPatches.sec_perm_2_6_24
-        (kernelPatches.aufs3_0 linux_3_0.src)
+        kernelPatches.aufs3_0
         #kernelPatches.aufs2_1_3_0
         #kernelPatches.mips_restart_2_6_36
       ];

From 4add420a480265b7185896ca0aadb394d1da383c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Sep 2011 21:46:07 +0000
Subject: [PATCH 08/19] aufs3 kernelPackage

svn path=/nixpkgs/trunk/; revision=29534
---
 pkgs/os-specific/linux/aufs3/default.nix  | 41 +++++++++++++++++++++++
 pkgs/os-specific/linux/kernel/generic.nix |  2 +-
 pkgs/os-specific/linux/kernel/patches.nix | 19 ++++++-----
 pkgs/top-level/all-packages.nix           |  4 +++
 4 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/os-specific/linux/aufs3/default.nix

diff --git a/pkgs/os-specific/linux/aufs3/default.nix b/pkgs/os-specific/linux/aufs3/default.nix
new file mode 100644
index 00000000000..a47dd9cb445
--- /dev/null
+++ b/pkgs/os-specific/linux/aufs3/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, kernel, perl }:
+
+let
+
+  aufsPredicate = x:
+    if x ? features then
+      (if x.features ? aufs3 then x.features.aufs3 else false)
+    else false;
+  featureAbort = abort "This kernel does not have aufs 3 support";
+  patch = stdenv.lib.findFirst aufsPredicate featureAbort kernel.kernelPatches;
+
+in
+
+stdenv.mkDerivation {
+  name = "aufs3-${patch.version}";
+
+  src = patch.patch.src;
+
+  buildInputs = [ perl ];
+
+  makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build";
+
+  installPhase =
+    ''
+      ensureDir $out/lib/modules/${kernel.modDirVersion}/misc
+      cp -v aufs.ko $out/lib/modules/${kernel.modDirVersion}/misc
+
+      # Install the headers because aufs3-util requires them.
+      ensureDir $out/include/linux
+      cp -v usr/include/linux/aufs_type.h $out/include/linux
+    '';
+
+  meta = {
+    description = "Another Unionfs implementation for Linux (third generation)";
+    homepage = http://aufs.sourceforge.net/;
+    maintainers = [ stdenv.lib.maintainers.eelco
+                    stdenv.lib.maintainers.raskin
+                    stdenv.lib.maintainers.shlevy ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index a86aef1af8e..af62125eb75 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   passthru = {
-    inherit version modDirVersion;
+    inherit version modDirVersion kernelPatches;
     # Combine the `features' attribute sets of all the kernel patches.
     features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches;
   };
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 3f66fcb8850..79e02753f32 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -290,16 +290,17 @@ rec {
       features.aufs2_1 = true;
     };
 
-  aufs3_0 =
-    { name = "aufs3.0";
-      patch = makeAufs3StandalonePatch {
-        version = "3.0";
-        rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4";
-        sha256 = "b508cab5987a623f057ae5fdc006c909a6bae6151af6e12fe672bf97b1a7549d";
-      };
-      features.aufsBase = true;
-      features.aufs3 = true;
+  aufs3_0 = rec {
+    name = "aufs3.0";
+    version = "3.0";
+    patch = makeAufs3StandalonePatch {
+      inherit version;
+      rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4";
+      sha256 = "b508cab5987a623f057ae5fdc006c909a6bae6151af6e12fe672bf97b1a7549d";
     };
+    features.aufsBase = true;
+    features.aufs3 = true;
+  };
 
   # Increase the timeout on CIFS requests from 15 to 120 seconds to
   # make CIFS more resilient to high load on the CIFS server.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c93b070c08..ece8cfe76b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5588,6 +5588,10 @@ let
       callPackage ../os-specific/linux/aufs2.1 { }
       else null;
 
+    aufs3 = if kernel.features ? aufs3 then
+      callPackage ../os-specific/linux/aufs3 { }
+      else null;
+
     aufs2_1_util = if kernel.features ? aufs2_1 then
       callPackage ../os-specific/linux/aufs2.1-util { }
       else null;

From ed38cc3545a028bb4e019084cb26012e801cf017 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Sep 2011 21:59:07 +0000
Subject: [PATCH 09/19] aufs3-util

svn path=/nixpkgs/trunk/; revision=29535
---
 pkgs/os-specific/linux/aufs3-util/default.nix | 39 +++++++++++++++++++
 pkgs/os-specific/linux/aufs3/default.nix      |  1 +
 pkgs/os-specific/linux/kernel/patches.nix     |  2 +
 pkgs/top-level/all-packages.nix               |  4 ++
 4 files changed, 46 insertions(+)
 create mode 100644 pkgs/os-specific/linux/aufs3-util/default.nix

diff --git a/pkgs/os-specific/linux/aufs3-util/default.nix b/pkgs/os-specific/linux/aufs3-util/default.nix
new file mode 100644
index 00000000000..00c3e99c457
--- /dev/null
+++ b/pkgs/os-specific/linux/aufs3-util/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchgit, kernel, aufs3 }:
+
+stdenv.mkDerivation {
+  name = "aufs3-util-${aufs3.patch.version}";
+
+  src = fetchgit {
+    url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git;
+    rev = aufs3.patch.utilRev;
+    sha256 = aufs3.patch.utilHash;
+  };
+
+  buildInputs = [ aufs3 ];
+
+  makeFlags =
+    [ "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build"
+      "Install=install"
+      "DESTDIR=$(out)"
+    ];
+
+  postInstall =
+    ''
+      mv $out/usr/* $out
+      rmdir $out/usr
+
+      cp aufs.shlib $out/lib/
+
+      substituteInPlace $out/bin/aubrsync \
+        --replace /sbin/mount $out/sbin/mount \
+        --replace /usr/lib/aufs.shlib $out/lib/aufs.shlib
+    '';
+
+  meta = {
+    description = "Utilities for AUFS3";
+    homepage = http://aufs.sourceforge.net/;
+    maintainers = [ stdenv.lib.maintainers.eelco 
+                    stdenv.lib.maintainers.shlevy ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/aufs3/default.nix b/pkgs/os-specific/linux/aufs3/default.nix
index a47dd9cb445..bf73e6510f7 100644
--- a/pkgs/os-specific/linux/aufs3/default.nix
+++ b/pkgs/os-specific/linux/aufs3/default.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation {
       cp -v usr/include/linux/aufs_type.h $out/include/linux
     '';
 
+  passthru = { inherit patch; };
   meta = {
     description = "Another Unionfs implementation for Linux (third generation)";
     homepage = http://aufs.sourceforge.net/;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 79e02753f32..32a29af148e 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -293,6 +293,8 @@ rec {
   aufs3_0 = rec {
     name = "aufs3.0";
     version = "3.0";
+    utilRev = "a08d17d433567c7c2586c5fc2625a714b20fe155";
+    utilHash = "4772c1c6a36da7bbd448057c227a9cd1856ccf72748765cf85421ab0c4e34535";
     patch = makeAufs3StandalonePatch {
       inherit version;
       rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ece8cfe76b8..128daf26d16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5598,6 +5598,10 @@ let
 
     aufs2_util = callPackage ../os-specific/linux/aufs2-util { };
 
+    aufs3_util = if kernel.features ? aufs3 then
+      callPackage ../os-specific/linux/aufs3-util { }
+      else null;
+
     blcr = callPackage ../os-specific/linux/blcr {
       #libtool = libtool_1_5; # libtool 2 causes a fork bomb
     };

From f979d3de4ef5ad83b5da4a0883fa540145c5a6b7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Sep 2011 22:13:59 +0000
Subject: [PATCH 10/19] Add features.aufs2 to old kernels

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 32a29af148e..672464e8965 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -211,6 +211,7 @@ rec {
       name = "aufs2";
       patch = ./aufs2.patch;
       features.aufsBase = true;
+      features.aufs2 = true;
     };
 
   aufs2_2_6_33 =
@@ -220,6 +221,7 @@ rec {
       name = "aufs2";
       patch = ./aufs2-33.patch;
       features.aufsBase = true;
+      features.aufs2 = true;
     };
 
   aufs2_2_6_34 =
@@ -229,6 +231,7 @@ rec {
       name = "aufs2";
       patch = ./aufs2-34.patch;
       features.aufsBase = true;
+      features.aufs2 = true;
     };
 
   aufs2_2_6_35 =
@@ -238,6 +241,7 @@ rec {
       name = "aufs2";
       patch = ./aufs2-35.patch;
       features.aufsBase = true;
+      features.aufs2 = true;
     };
 
   aufs2_2_6_36 =

From 5143705396fed28d82ea70ecb6cf12a2888ba56b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Sep 2011 22:34:46 +0000
Subject: [PATCH 11/19] Get Theme-GNU directly from spock while kernel.org is
 down

svn path=/nixpkgs/trunk/; revision=29537
---
 pkgs/data/misc/themes/theme-gnu.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/themes/theme-gnu.nix b/pkgs/data/misc/themes/theme-gnu.nix
index f04c820e0e9..32d1a9256ac 100644
--- a/pkgs/data/misc/themes/theme-gnu.nix
+++ b/pkgs/data/misc/themes/theme-gnu.nix
@@ -1,5 +1,5 @@
 {fetchurl, ...}:
 fetchurl {
-  url = http://mirrors.kernel.org/gentoo/distfiles/Theme-GNU.tar.bz2;
-  md5 = "61969309d23c631e57b0a311102ef034";
+  url = http://dev.gentoo.org/~spock/repos/bootsplash/Theme-GNU.tar.bz2;
+  sha256 = "1pj91nxvwjphc8r6idl4ih3ldyk34j1w9c4p8gzmwnwg3w34xha0";
 }

From 107e39b2142c487b6d3f1dc647ea384442ee98b6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Sep 2011 23:15:30 +0000
Subject: [PATCH 12/19] linux-3.1: rc8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix
index a87554ae71a..ae78de1e476 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix
@@ -200,13 +200,13 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.1-rc7";
+    version = "3.1-rc8";
 
-    modDirVersion = "3.1.0-rc7";
+    modDirVersion = "3.1.0-rc8";
   
     src = fetchurl {
       url = "https://github.com/torvalds/linux/tarball/v${version}";
-      sha256 = "05zlg522svyym6cab7lrqpihzrk8j356dyahyc321nd8yw0qfv2x";
+      sha256 = "1sz6snv2wavzasrswaprkjpzpll4247v4br0x2i6sndl2nqa6jz7";
       name = "v${version}.tar.gz";
     };
 

From cba02ddc3c814ec1f9b84337f7e05ddcbf6fa899 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Sep 2011 23:38:39 +0000
Subject: [PATCH 13/19] aufs2: Only build if the kernel supports it

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 128daf26d16..9c7e4435e13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5582,7 +5582,9 @@ let
 
     aufs = callPackage ../os-specific/linux/aufs { };
 
-    aufs2 = callPackage ../os-specific/linux/aufs2 { };
+    aufs2 = if kernel.features ? aufs2 then
+      callPackage ../os-specific/linux/aufs2 { }
+      else null;
 
     aufs2_1 = if kernel.features ? aufs2_1 then
       callPackage ../os-specific/linux/aufs2.1 { }
@@ -5592,12 +5594,14 @@ let
       callPackage ../os-specific/linux/aufs3 { }
       else null;
 
+    aufs2_util = if kernel.features ? aufs2 then
+      callPackage ../os-specific/linux/aufs2-util { }
+      else null;
+
     aufs2_1_util = if kernel.features ? aufs2_1 then
       callPackage ../os-specific/linux/aufs2.1-util { }
       else null;
 
-    aufs2_util = callPackage ../os-specific/linux/aufs2-util { };
-
     aufs3_util = if kernel.features ? aufs3 then
       callPackage ../os-specific/linux/aufs3-util { }
       else null;

From 9f3fb4b1aee8f76095dcdd1bb4638b3f434d1f56 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 29 Sep 2011 20:57:47 +0000
Subject: [PATCH 14/19] Add a working kernel.org mirror

svn path=/nixpkgs/trunk/; revision=29541
---
 pkgs/build-support/fetchurl/mirrors.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 713e7db0e3c..b8925f89303 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -98,6 +98,7 @@ rec {
     http://www.eu.kernel.org/pub/
     http://www.de.kernel.org/pub/
     http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/
+    http://linux-kernel.uio.no/pub/
   ];
 
   # Mirrors of ftp://ftp.kde.org/pub/kde/.

From a54473bc5d50b55e87742aaa9125e23f53879cda Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 29 Sep 2011 21:55:12 +0000
Subject: [PATCH 15/19] Use ruby 1.9 as the default

svn path=/nixpkgs/trunk/; revision=29543
---
 pkgs/development/interpreters/ruby/default.nix         | 10 +++++-----
 .../interpreters/ruby/{ruby-19.nix => ruby-18.nix}     | 10 +++++-----
 pkgs/development/interpreters/ruby/rubygems.nix        |  4 ----
 pkgs/top-level/all-packages.nix                        |  6 +++---
 4 files changed, 13 insertions(+), 17 deletions(-)
 rename pkgs/development/interpreters/ruby/{ruby-19.nix => ruby-18.nix} (84%)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index fcd57205dcf..d5ccb19caec 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   name = "ruby-${version}";
   
   src = fetchurl {
-    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz";
-    sha256 = "0qf50wa1ziziagnxarj8z6yrsivrhchq1j9017ff3z2z7d31l9kc";
+    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz";
+    sha256 = "0zmxdqzprbdc5mvmba1i94mpqnqxxlh460jri7bx6i29bibigj0w";
   };
 
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@@ -43,9 +43,9 @@ stdenv.mkDerivation rec {
   };
 
   passthru = rec {
-    majorVersion = "1.8";
-    minorVersion = "7";
-    patchLevel = "330";
+    majorVersion = "1.9";
+    minorVersion = "2";
+    patchLevel = "290";
     libPath = "lib/ruby/${majorVersion}";
     gemPath = "lib/ruby/gems/${majorVersion}";
   };
diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-18.nix
similarity index 84%
rename from pkgs/development/interpreters/ruby/ruby-19.nix
rename to pkgs/development/interpreters/ruby/ruby-18.nix
index d5ccb19caec..fcd57205dcf 100644
--- a/pkgs/development/interpreters/ruby/ruby-19.nix
+++ b/pkgs/development/interpreters/ruby/ruby-18.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   name = "ruby-${version}";
   
   src = fetchurl {
-    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz";
-    sha256 = "0zmxdqzprbdc5mvmba1i94mpqnqxxlh460jri7bx6i29bibigj0w";
+    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz";
+    sha256 = "0qf50wa1ziziagnxarj8z6yrsivrhchq1j9017ff3z2z7d31l9kc";
   };
 
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@@ -43,9 +43,9 @@ stdenv.mkDerivation rec {
   };
 
   passthru = rec {
-    majorVersion = "1.9";
-    minorVersion = "2";
-    patchLevel = "290";
+    majorVersion = "1.8";
+    minorVersion = "7";
+    patchLevel = "330";
     libPath = "lib/ruby/${majorVersion}";
     gemPath = "lib/ruby/gems/${majorVersion}";
   };
diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix
index 60e83332c08..0d93b330ca0 100644
--- a/pkgs/development/interpreters/ruby/rubygems.nix
+++ b/pkgs/development/interpreters/ruby/rubygems.nix
@@ -1,16 +1,12 @@
 args : with args; 
 rec {
 
-  # some packages (eg ruby-debug) still require 1.8. So let's stick to that for
-  # now if nobody has different requirements
-
   version = "1.8.10";
   src = fetchurl {
     url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
     sha256 = "0ll5swf4mi4nbgnr5jcyzmnlwb1zr2md9kvsgy3d1f485bb1n59q";
   };
 
-
   buildInputs = [ruby makeWrapper];
   configureFlags = [];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c7e4435e13..21881994ac7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2601,9 +2601,9 @@ let
 
   regina = callPackage ../development/interpreters/regina {};
 
-  ruby18 = callPackage ../development/interpreters/ruby { };
-  ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
-  ruby = ruby18;
+  ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
+  ruby19 = callPackage ../development/interpreters/ruby { };
+  ruby = ruby19;
 
   rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { });
 

From 8e02768459674b6d7478b5d39d732fc8a989a13e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 30 Sep 2011 07:10:47 +0000
Subject: [PATCH 16/19] Firefox  7.0 release

svn path=/nixpkgs/trunk/; revision=29544
---
 pkgs/applications/networking/browsers/firefox/7.0.nix | 6 +++---
 pkgs/top-level/all-packages.nix                       | 4 ++--
 pkgs/top-level/release.nix                            | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/7.0.nix b/pkgs/applications/networking/browsers/firefox/7.0.nix
index d9e94ead33a..c14386e5f9e 100644
--- a/pkgs/applications/networking/browsers/firefox/7.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/7.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "7.0b1";
+  firefoxVersion = "7.0";
   
   xulVersion = "7.0"; # this attribute is used by other packages
 
   
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha256 = "0s8lv07nggdf8ad2yx7sgq1mfy1dvzir0f6x4km911yc9qyhwmwk";
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    sha256 = "1fpadlsdc8d739cz52dicn68v2ilv044hxivilgy9jnrazznrm42";
   };
   
   commonConfigureFlags =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21881994ac7..7528fb7264e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6576,12 +6576,12 @@ let
 
   firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox "firefox" "";
 
-  firefox70b1Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix {
+  firefox70Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix {
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
   };
 
-  firefox70b1Wrapper = lowPrio (wrapFirefox firefox70b1Pkgs.firefox "firefox" "");
+  firefox70Wrapper = lowPrio (wrapFirefox firefox70Pkgs.firefox "firefox" "");
 
   flac = callPackage ../applications/audio/flac { };
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 1e189d06242..247b9be61ad 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -387,6 +387,7 @@ with (import ./release-lib.nix);
   firefox36Pkgs.firefox = linux;
   firefox50Pkgs.firefox = linux;
   firefox60Pkgs.firefox = linux;
+  firefox70Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;

From a8a3ede5e9023a214ceafc79527a35786f4de5e4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 30 Sep 2011 15:44:22 +0000
Subject: [PATCH 17/19] Adding Firefox 8.0beta1

svn path=/nixpkgs/trunk/; revision=29549
---
 .../networking/browsers/firefox/8.0.nix       | 180 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   5 +
 2 files changed, 185 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/firefox/8.0.nix

diff --git a/pkgs/applications/networking/browsers/firefox/8.0.nix b/pkgs/applications/networking/browsers/firefox/8.0.nix
new file mode 100644
index 00000000000..f6807056529
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/8.0.nix
@@ -0,0 +1,180 @@
+{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
+, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
+, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
+, yasm, mesa, sqlite, unzip
+
+, # If you want the resulting program to call itself "Firefox" instead
+  # of "Shiretoko" or whatever, enable this option.  However, those
+  # binaries may not be distributed without permission from the
+  # Mozilla Foundation, see
+  # http://www.mozilla.org/foundation/trademarks/.
+  enableOfficialBranding ? false
+}:
+
+assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
+
+rec {
+
+  firefoxVersion = "8.0b1";
+  
+  xulVersion = "8.0"; # this attribute is used by other packages
+
+  
+  src = fetchurl {
+    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
+    sha256 = "1sdahpawgngvjh4cap2vdg00ngiwji5nkb40dh5kd393wa6c8mpm";
+  };
+  
+  commonConfigureFlags =
+    [ "--enable-optimize"
+      "--disable-debug"
+      "--enable-strip"
+      "--with-system-jpeg"
+      "--with-system-zlib"
+      "--with-system-bz2"
+      "--with-system-nspr"
+      # "--with-system-nss"
+      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
+      "--enable-system-cairo"
+      "--enable-system-sqlite"
+      "--disable-crashreporter"
+      "--disable-tests"
+      "--disable-necko-wifi" # maybe we want to enable this at some point
+      "--disable-installer" 
+      "--disable-updater"
+    ];
+
+
+  xulrunner = stdenv.mkDerivation rec {
+    name = "xulrunner-${xulVersion}";
+    
+    inherit src;
+
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
+        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
+        alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
+        xlibs.libXScrnSaver xlibs.scrnsaverproto
+        xlibs.libXext xlibs.xextproto sqlite unzip
+      ];
+
+    configureFlags =
+      [ "--enable-application=xulrunner"
+        "--disable-javaxpcom"
+      ] ++ commonConfigureFlags;
+
+    enableParallelBuilding = true;
+      
+    # Hack to work around make's idea of -lbz2 dependency
+    preConfigure =
+      ''
+        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
+          stdenv.lib.concatStringsSep ":" 
+            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
+        }' ';'
+
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
+      '';
+
+    # !!! Temporary hack.
+    preBuild =
+      ''
+        export NIX_ENFORCE_PURITY=
+      '';
+
+    installFlags = "SKIP_GRE_REGISTRATION=1";
+
+    postInstall = ''
+      # Fix some references to /bin paths in the Xulrunner shell script.
+      substituteInPlace $out/bin/xulrunner \
+          --replace /bin/pwd "$(type -tP pwd)" \
+          --replace /bin/ls "$(type -tP ls)"
+
+      # Fix run-mozilla.sh search
+      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
+      echo libDir: $libDir
+      test -n "$libDir"
+      cd $out/bin
+      mv xulrunner ../lib/$libDir/
+
+      for i in $out/lib/$libDir/*; do 
+          file $i;
+          if file $i | grep executable &>/dev/null; then 
+              echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
+              chmod a+x "$out/bin/$(basename "$i")";
+          fi;
+      done;
+      for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do
+              patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
+      done;
+      rm -f $out/bin/run-mozilla.sh
+    ''; # */
+
+    meta = {
+      description = "Mozilla Firefox XUL runner";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+    };
+
+    passthru = { inherit gtk; version = xulVersion; };
+  };
+
+
+  firefox = stdenv.mkDerivation rec {
+    name = "firefox-${firefoxVersion}";
+
+    inherit src;
+
+    enableParallelBuilding = true;
+      
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
+        dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
+        xlibs.pixman yasm mesa sqlite file unzip
+      ];
+
+    propagatedBuildInputs = [xulrunner];
+
+    configureFlags =
+      [ "--enable-application=browser"
+        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
+        "--enable-chrome-format=jar"
+	"--disable-elf-hack"
+      ]
+      ++ commonConfigureFlags
+      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
+
+    # Hack to work around make's idea of -lbz2 dependency
+    preConfigure =
+      ''
+        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
+          stdenv.lib.concatStringsSep ":" 
+            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
+        }' ';'
+      '';
+
+    postInstall =
+      ''
+        ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
+        for j in $out/bin/*; do 
+	    i="$(readlink "$j")";
+            file $i;
+            if file $i | grep executable &>/dev/null; then 
+	        rm "$out/bin/$(basename "$i")"
+                echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
+                chmod a+x "$out/bin/$(basename "$i")"
+            fi;
+        done;
+      ''; # */
+
+    meta = {
+      description = "Mozilla Firefox - the browser, reloaded";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+    };
+
+    passthru = {
+      inherit gtk xulrunner nspr;
+      isFirefox3Like = true;
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7528fb7264e..913bbba51c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6583,6 +6583,11 @@ let
 
   firefox70Wrapper = lowPrio (wrapFirefox firefox70Pkgs.firefox "firefox" "");
 
+  firefox80bPkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix {
+    inherit (gtkLibs) gtk pango;
+    inherit (gnome) libIDL;
+  };
+
   flac = callPackage ../applications/audio/flac { };
 
   flashplayer = flashplayer10;

From c85c8c9d015f2ec62784143ff6e69e5a82bf7de5 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 30 Sep 2011 17:26:38 +0000
Subject: [PATCH 18/19] update jinja2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b50028f47be..edf38bff72a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -614,11 +614,11 @@ let pythonPackages = python.modules // rec {
 
 
   jinja2 = buildPythonPackage {
-    name = "jinja2-2.2.1";
+    name = "jinja2-2.6";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.2.1.tar.gz";
-      md5 = "fea849d68891218eb0b21c170f1c32d5";
+      url = "http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.6.tar.gz";
+      md5 = "1c49a8825c993bfdcf55bb36897d28a2";
     };
 
     meta = {

From 4c3642403ce2909bd2aa2508776852d96376a780 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 1 Oct 2011 14:15:47 +0000
Subject: [PATCH 19/19] Adding attr as a buildInput to enable support for
 VirtFS (Plan 9 folder sharing over Virtio - I/O virtualization framework)

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

diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index 745d6900e90..3f35d3304ce 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
+{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
 , libjpeg, libpng, ncurses, python, glib }:
 
 assert stdenv.isLinux;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs =
-    [ zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
+    [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
       ncurses python glib
     ];