From c3863358efde1a37092c3e9002fc4cffc25864c7 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 10 Oct 2011 21:48:21 +0000
Subject: [PATCH 01/59] libgnomeui-2.24.5; add libtool to deps

svn path=/nixpkgs/trunk/; revision=29746
---
 .../gnome-2/platform/libgnomeui/default.nix   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
index d3edee3ffd3..04bac7f4164 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
@@ -1,16 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango
-, intltool, libgnome, libgnomecanvas, libbonoboui, GConf
+{ stdenv, fetchurl_gnome, pkgconfig, libxml2, xlibs, glib, pango
+, intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
 , gnome_vfs, gnome_keyring, libglade }:
 
-stdenv.mkDerivation {
-  name = "libgnomeui-2.24.2";
+stdenv.mkDerivation rec {
+  name = src.pkgname;
   
-  src = fetchurl {
-    url = mirror://gnome/sources/libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2;
-    sha256 = "04296nf6agg8zsbw6pzl3mzn890bkcczs6fnna5jay7fvnrmjx5f";
+  src = fetchurl_gnome {
+    project = "libgnomeui";
+    major = "2"; minor = "24"; patchlevel = "5";
+    sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
   };
   
-  buildInputs = [ pkgconfig intltool xlibs.xlibs libxml2 GConf pango glib gnome_keyring libglade ];
+  buildNativeInputs = [ pkgconfig intltool ];
+  buildInputs =
+    [ xlibs.xlibs libxml2 GConf pango glib gnome_keyring libglade libtool ];
 
   propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
 }

From 57b11967c8e4657653492c6851ace2d3d5f5de83 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 10 Oct 2011 22:10:18 +0000
Subject: [PATCH 02/59] Remove already packaged packages from gnome-3/TODO.txt

svn path=/nixpkgs/trunk/; revision=29747
---
 pkgs/desktops/gnome-3/TODO.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/TODO.txt b/pkgs/desktops/gnome-3/TODO.txt
index d3a04425cfb..c3991805ab2 100644
--- a/pkgs/desktops/gnome-3/TODO.txt
+++ b/pkgs/desktops/gnome-3/TODO.txt
@@ -1,6 +1,5 @@
 ## CORE
 core:NetworkManager:0.9.1.90:
-core:atk:2.2.0:
 core:atkmm:2.22.5:
 core:brasero:3.2.0:
 core:cantarell-fonts:0.0.6:
@@ -16,12 +15,9 @@ core:evince:3.2.0:
 core:evolution-data-server:3.2.0:
 core:folks:0.6.3.2:
 core:gcalctool:6.2.0:
-core:gdk-pixbuf:2.24.0:
 core:gdm:3.2.0:
 core:gjs:1.30.0:
-core:glib:2.30.0:
 core:glib-networking:2.30.0:
-core:glibmm:2.30.0:
 core:gnome-backgrounds:3.2.0:
 core:gnome-bluetooth:3.2.0:
 core:gnome-contacts:3.2.0.1:
@@ -54,7 +50,6 @@ core:gsettings-desktop-schemas:3.2.0:
 core:gst-plugins-base:0.10.35:
 core:gst-plugins-good:0.10.30:
 core:gstreamer:0.10.35:
-core:gtk+:3.2.0:
 core:gtk+:2.24.6:
 core:gtk-doc:1.18:
 core:gtkmm:3.2.0:
@@ -75,7 +70,6 @@ core:mutter:3.2.0:
 core:nautilus:3.2.0:
 core:network-manager-applet:0.9.1.90:
 core:notification-daemon:0.7.2:
-core:pango:1.29.4:
 core:pangomm:2.28.3:
 core:polkit-gnome:0.103:
 core:sushi:0.2.0:

From b5861542dd50ef4acf4a24a2235a9199b688c407 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 10 Oct 2011 22:26:41 +0000
Subject: [PATCH 03/59] gtkLibs3x.atkmm

svn path=/nixpkgs/trunk/; revision=29748
---
 pkgs/desktops/gnome-3/TODO.txt  | 1 -
 pkgs/top-level/all-packages.nix | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/TODO.txt b/pkgs/desktops/gnome-3/TODO.txt
index c3991805ab2..eaffb5d3092 100644
--- a/pkgs/desktops/gnome-3/TODO.txt
+++ b/pkgs/desktops/gnome-3/TODO.txt
@@ -1,6 +1,5 @@
 ## CORE
 core:NetworkManager:0.9.1.90:
-core:atkmm:2.22.5:
 core:brasero:3.2.0:
 core:cantarell-fonts:0.0.6:
 core:caribou:0.4.0:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55aa9984ae7..2be53875fd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3588,6 +3588,8 @@ let
 
     atk = callPackage ../development/libraries/atk/2.2.x.nix { };
 
+    atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
+
     cairo = callPackage ../development/libraries/cairo { };
 
     pango = callPackage ../development/libraries/pango/1.29.x.nix { };

From a1f9b6f7b63e3571efdb332c8cf2a6a0094cb910 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Oct 2011 09:13:31 +0000
Subject: [PATCH 04/59] * Enable "make check" for checkinstall-based Debian
 builds.  I always   assumed this was enabled...

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

diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index c2a194a042f..52924d2c42c 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -14,7 +14,7 @@
 vmTools.runInLinuxImage (stdenv.mkDerivation (
 
   {
-    #doCheck = true;
+    doCheck = true;
 
     prefix = "/usr";
 

From 40f1e4e289c19b9a8deafa77ad8e450f0f93f753 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 11 Oct 2011 13:22:09 +0000
Subject: [PATCH 05/59] * rpm-closure.pl: add possibility to use multiple
 repositories * default.nix: do not assume fixed filesystem type when
 mounting, to allow using other filesystems

svn path=/nixpkgs/trunk/; revision=29757
---
 pkgs/build-support/vm/default.nix        | 40 ++++++++-------
 pkgs/build-support/vm/rpm/rpm-closure.pl | 64 +++++++++++++++---------
 2 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index aaeeef12a69..d3487be717c 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -127,7 +127,7 @@ rec {
     if test -z "$mountDisk"; then
       mount -t tmpfs none /fs
     else
-      mount -t ext2 /dev/${hd} /fs
+      mount /dev/${hd} /fs
     fi
 
     mkdir -p /fs/dev
@@ -166,7 +166,6 @@ rec {
     halt -d -p -f
   '';
 
-  
   initrd = makeInitrd {
     contents = [
       { object = stage1Init;
@@ -303,7 +302,7 @@ rec {
   '';
 
 
-  createRootFS = ''
+  defaultCreateRootFS = ''
     mkdir /mnt
     ${e2fsprogs}/sbin/mke2fs -F /dev/${hd}
     ${utillinux}/bin/mount -t ext2 /dev/${hd} /mnt
@@ -486,12 +485,12 @@ rec {
     
   fillDiskWithRPMs =
     { size ? 4096, rpms, name, fullName, preInstall ? "", postInstall ? ""
-    , runScripts ? true
+    , runScripts ? true, createRootFS ? defaultCreateRootFS
     }:
     
     runInLinuxVM (stdenv.mkDerivation {
       inherit name preInstall postInstall rpms;
-
+      memSize = 512;
       preVM = createEmptyImage {inherit size fullName;};
 
       buildCommand = ''
@@ -526,10 +525,10 @@ rec {
         eval "$postInstall"
         
         rm /mnt/.debug
-        
-        ${utillinux}/bin/umount /mnt/nix/store
-        ${utillinux}/bin/umount /mnt/tmp
-        ${utillinux}/bin/umount /mnt
+
+        ${utillinux}/bin/umount /mnt/nix/store 
+        ${utillinux}/bin/umount /mnt/tmp 
+        ${utillinux}/bin/umount /mnt 
       '';
 
       passthru = { inherit fullName; };
@@ -631,7 +630,7 @@ rec {
      strongly connected components.  See deb/deb-closure.nix. */
 
   fillDiskWithDebs =
-    { size ? 4096, debs, name, fullName, postInstall ? null }:
+    { size ? 4096, debs, name, fullName, postInstall ? null, createRootFS ? defaultCreateRootFS }:
     
     runInLinuxVM (stdenv.mkDerivation {
       inherit name postInstall;
@@ -712,12 +711,15 @@ rec {
      `primary.xml.gz' file of a Fedora or openSUSE distribution. */
      
   rpmClosureGenerator =
-    {name, packagesList, urlPrefix, packages, archs ? []}:
-    
+    {name, packagesLists, urlPrefixes, packages, archs ? []}:
+    assert (builtins.length packagesLists) == (builtins.length urlPrefixes) ;
     runCommand "${name}.nix" {buildInputs = [perl perlPackages.XMLSimple]; inherit archs;} ''
-      gunzip < ${packagesList} > ./packages.xml
+      ${lib.concatImapStrings (i: pl: ''
+        gunzip < ${pl} > ./packages_${toString i}.xml
+      '') packagesLists}
       perl -w ${rpm/rpm-closure.pl} \
-        ./packages.xml ${urlPrefix} ${toString packages} > $out
+        ${lib.concatImapStrings (i: pl: "./packages_${toString i}.xml ${pl.snd} " ) (lib.zipLists packagesLists urlPrefixes)} \
+        ${toString packages} > $out
     '';
 
 
@@ -726,15 +728,17 @@ rec {
      names. */
      
   makeImageFromRPMDist =
-    { name, fullName, size ? 4096, urlPrefix, packagesList
+    { name, fullName, size ? 4096
+    , urlPrefix ? "", urlPrefixes ? [urlPrefix]
+    , packagesList ? "", packagesLists ? [packagesList]
     , packages, extraPackages ? []
     , preInstall ? "", postInstall ? "", archs ? ["noarch" "i386"]
-    , runScripts ? true }:
+    , runScripts ? true, createRootFS ? defaultCreateRootFS }:
 
     fillDiskWithRPMs {
-      inherit name fullName size preInstall postInstall runScripts;
+      inherit name fullName size preInstall postInstall runScripts createRootFS;
       rpms = import (rpmClosureGenerator {
-        inherit name packagesList urlPrefix archs;
+        inherit name packagesLists urlPrefixes archs;
         packages = packages ++ extraPackages;
       }) { inherit fetchurl; };
     };
diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl
index 5f333fdfe80..5efc162784a 100644
--- a/pkgs/build-support/vm/rpm/rpm-closure.pl
+++ b/pkgs/build-support/vm/rpm/rpm-closure.pl
@@ -1,34 +1,52 @@
 use strict;
 use XML::Simple;
 
-my $packagesFile = shift @ARGV;
-my $urlPrefix = shift @ARGV;
+my @packagesFiles = ();
+my @urlPrefixes = ();
+
+# rpm-closure.pl (<package-file> <url-prefix>)+ <toplevel-pkg>+
+
+while(-f $ARGV[0]) {
+    my $packagesFile = shift @ARGV;
+    my $urlPrefix = shift @ARGV;
+    push(@packagesFiles, $packagesFile);
+    push(@urlPrefixes, $urlPrefix);
+}
+
 my @toplevelPkgs = @ARGV;
 
 my @archs = split ' ', ($ENV{'archs'} or "");
 
-print STDERR "parsing packages...\n";
-
-my $xml = XMLin($packagesFile, ForceArray => ['package', 'rpm:entry', 'file'], KeyAttr => []) or die;
-
-print STDERR "file contains $xml->{packages} packages\n";
-
-
 my %pkgs;
-foreach my $pkg (@{$xml->{'package'}}) {
-    if (scalar @archs > 0) {
-        my $arch = $pkg->{arch};
-        my $found = 0;
-        foreach my $a (@archs) { $found = 1 if $arch eq $a; }
-        next if !$found;
-    }
-    if (defined $pkgs{$pkg->{name}}) {
-        print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n";
-        next;
-    }
-    $pkgs{$pkg->{name}} = $pkg;
-}
+for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
+    my $packagesFile = $packagesFiles[$i];
+    print STDERR "parsing packages in $packagesFile...\n";
 
+    my $xml = XMLin($packagesFile, ForceArray => ['package', 'rpm:entry', 'file'], KeyAttr => []) or die;
+
+    print STDERR "$packagesFile contains $xml->{packages} packages\n";
+
+    foreach my $pkg (@{$xml->{'package'}}) {
+        if (scalar @archs > 0) {
+            my $arch = $pkg->{arch};
+            my $found = 0;
+            foreach my $a (@archs) { $found = 1 if $arch eq $a; }
+            next if !$found;
+        }
+        if (defined $pkgs{$pkg->{name}}) {
+            my $earlierPkg = $pkgs{$pkg->{name}};
+            print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n";
+            if ($earlierPkg->{'time'}->{file} <= $pkg->{'time'}->{file}) {
+                print STDERR "WARNING: replaced package $pkg->{name} with newer one\n";
+                $pkg->{urlPrefix} = $urlPrefixes[$i];
+                $pkgs{$pkg->{name}} = $pkg;
+            }
+            next;
+        }
+        $pkg->{urlPrefix} = $urlPrefixes[$i];
+        $pkgs{$pkg->{name}} = $pkg;
+    }
+}
 
 my %provides;
 foreach my $pkgName (keys %pkgs) {
@@ -104,7 +122,7 @@ print "[\n\n";
 foreach my $pkgName (@needed) {
     my $pkg = $pkgs{$pkgName};
     print "  (fetchurl {\n";
-    print "    url = $urlPrefix/$pkg->{location}->{href};\n";
+    print "    url = $pkg->{urlPrefix}/$pkg->{location}->{href};\n";
     if ($pkg->{checksum}->{type} eq "sha") {
         print "    sha1 = \"$pkg->{checksum}->{content}\";\n";
     } elsif ($pkg->{checksum}->{type} eq "sha256") {

From 0d62f0418c82438c99977af9f0e25be80f66893d Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 11 Oct 2011 14:47:56 +0000
Subject: [PATCH 06/59] nix-build.nix: also recognize xz tarballs

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

diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index 5c569f97ccf..a32f0e07a0c 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (
       # 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)
+          src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz $src/tarballs/*.tar.xz | sort | head -1)
       fi
 
       # Set GCC flags for coverage analysis, if desired.

From 64eda35d0f4575f6090beedc75584621bc58725f Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Tue, 11 Oct 2011 15:20:46 +0000
Subject: [PATCH 07/59] Switch to mirror; ftp.gimp.org unavailable for about a
 week.

svn path=/nixpkgs/trunk/; revision=29762
---
 pkgs/development/libraries/babl/default.nix | 2 +-
 pkgs/development/libraries/gegl/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 77ddecd71c0..3449314a381 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "babl-0.1.4";
 
   src = fetchurl {
-    url = "ftp://ftp.gimp.org/pub/babl/0.1/${name}.tar.bz2";
+    url = "http://ftp.snt.utwente.nl/pub/software/gimp/babl/0.1/${name}.tar.bz2";
     sha256 = "0cz7zw206bb87c0n0h54h4wlkaa3hx3wsia30mgq316y50jk2djv";
   };
 
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 8fa87d90be2..3e7f29ecb6f 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "gegl-0.1.6";
 
   src = fetchurl {
-    url = "ftp://ftp.gimp.org/pub/gegl/0.1/${name}.tar.bz2";
+    url = "http://ftp.snt.utwente.nl/pub/software/gimp/gegl/0.1/${name}.tar.bz2";
     sha256 = "1l966ygss2zkksyw62nm139v2abfzbqqrj0psizvbgzf4mb24rm1";
   };
 

From 57dfcfed606f0ee4075f609a466f655189e4cdd5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Oct 2011 16:47:56 +0000
Subject: [PATCH 08/59] haskell-asn1-data: updated to version 0.6.0

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

diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix
index 01229fe3f07..73ee535f959 100644
--- a/pkgs/development/libraries/haskell/asn1-data/default.nix
+++ b/pkgs/development/libraries/haskell/asn1-data/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "asn1-data";
-  version = "0.5.1";
-  sha256 = "10ci77pf0y8g7i1fwksv5na32jsy3brfdv6nzrnwih1brq6l5fn4";
+  version = "0.6.0";
+  sha256 = "0gk34x2frkk2s7d0i7ahwnjv9jcqdgx2sd1kp3d854548k171z3f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 2c1c739890b30205de4bb9ec5fbca209e22ed463 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Oct 2011 16:48:01 +0000
Subject: [PATCH 09/59] haskell-authenticate: updated to version 0.10.2.2

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

diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index ed91c9d4dd9..ca178c3fa36 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "0.10.2.1";
-  sha256 = "1bi46bls57wzmd90grrp6rpvgzsz064yi804b6pavq0pxiz1yaj9";
+  version = "0.10.2.2";
+  sha256 = "10w13wcd8cwaf4ifxllsiijwza2ys4a5zyhjcbl4938609p60hi8";
   buildDepends = [
     aesonNative attoparsec base64Bytestring blazeBuilder
     caseInsensitive enumerator failure httpEnumerator httpTypes network

From 86b454d4b0d2c11df5bc329f9065295431d14380 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Oct 2011 16:48:05 +0000
Subject: [PATCH 10/59] haskell-certificate: updated to version 0.9.3

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

diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
index 41646034aa0..09d44e07222 100644
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ b/pkgs/development/libraries/haskell/certificate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "certificate";
-  version = "0.9.1";
-  sha256 = "0hq9a0vz72kk1n3hdza36rji8vc95y667iwcsmsh5habyh6q8228";
+  version = "0.9.3";
+  sha256 = "1gg26d1arf588zjhdzs8r26k40v6m679l8k2vw28l8j3q5m11p71";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ asn1Data base64Bytestring mtl time ];

From 6e5a99dadff892901081d8f99b9cb68da3dac62d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Oct 2011 16:48:09 +0000
Subject: [PATCH 11/59] haskell-http-enumerator: updated to version 0.7.1.1

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

diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix
index 22b6e6370f3..5aa02f5dea4 100644
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-enumerator";
-  version = "0.7.1";
-  sha256 = "0d8zfgj41jdg6k9ny717xy1ca2jxnmr7aliqlq2arf4900lxjlwd";
+  version = "0.7.1.1";
+  sha256 = "0b26gvwpnv851x1v5qix7mp0wliff9klqc2pfp2ig54l77s15y36";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 764bfaafb4b8a8e0229932da7e98dffdb1d7e6c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Oct 2011 16:48:15 +0000
Subject: [PATCH 12/59] haskell-tls-extra: updated to version 0.4.0

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

diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index 7b7517b0d42..7409d9d1b94 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls-extra";
-  version = "0.3.1";
-  sha256 = "1zj8l5nglfaarbbzb1icil6cp6rjqfs33nryxc34akz22zwwmln4";
+  version = "0.4.0";
+  sha256 = "1incrrkvzhq7gdcrrqka0l50a7fj7nccdrin00wplm7ljl129d87";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 52987e278dfab1d5480fdb25803217dbda279b8e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Oct 2011 16:48:19 +0000
Subject: [PATCH 13/59] haskell-tls: updated to version 0.8.0

svn path=/nixpkgs/trunk/; revision=29769
---
 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 8da9fbbf4b5..ad5e80b2be9 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.7.2";
-  sha256 = "0x24jf83sfsnpvfm645lng5bc21zsbv6mbagr6q1q71zhfzfyb74";
+  version = "0.8.0";
+  sha256 = "05c7bizwkwcp83idsa5cjb53lvm9f44iaypp9yiqv4ly9q3h315q";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From dd4305c67af890be2fed986e16df29980b8e911e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Oct 2011 16:48:24 +0000
Subject: [PATCH 14/59] haskell-uniplate: updated to version 1.6.3

svn path=/nixpkgs/trunk/; revision=29770
---
 pkgs/development/libraries/haskell/uniplate/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix
index c9320595e55..020fc6408f3 100644
--- a/pkgs/development/libraries/haskell/uniplate/default.nix
+++ b/pkgs/development/libraries/haskell/uniplate/default.nix
@@ -1,10 +1,10 @@
-{ cabal, syb }:
+{ cabal, hashable, syb, unorderedContainers }:
 
 cabal.mkDerivation (self: {
   pname = "uniplate";
-  version = "1.6.2";
-  sha256 = "1lns0llhszk68jnq5if3xrk997idzszqc267q63kkdwp1zxdicrd";
-  buildDepends = [ syb ];
+  version = "1.6.3";
+  sha256 = "14p10zhsa9ws0rn2nm0gi25bdyhhs83b6qv8bjyywb02sh15xhkw";
+  buildDepends = [ hashable syb unorderedContainers ];
   meta = {
     homepage = "http://community.haskell.org/~ndm/uniplate/";
     description = "Help writing simple, concise and fast generic operations";

From 51fea45a1b4ea92eaa410ff9cc9d9a8868b26e0f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Oct 2011 16:48:28 +0000
Subject: [PATCH 15/59] haskell-vacuum: updated to version 1.0.0.1

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

diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
index 960e90d645d..1c3c1df5a00 100644
--- a/pkgs/development/libraries/haskell/vacuum/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "vacuum";
-  version = "1.0.0";
-  sha256 = "2229948ce801052c5ffb70ffc07e301d87d60740b053df8a7b7851ad02c01d9f";
+  version = "1.0.0.1";
+  sha256 = "172py7nvyv66hvqmhigfm59rjb328bfzv0z11q8qdpf5w1fpvmc5";
   extraLibraries = [ ghcPaths ];
   meta = {
-    homepage = "http://moonpatio.com/vacuum/";
+    homepage = "http://web.archive.org/web/20100410115820/http://moonpatio.com/vacuum/";
     description = "Extract graph representations of ghc heap values";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;

From 2c6200c02551ab1b873e39b8e1cb7cea27023c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 11 Oct 2011 19:30:11 +0000
Subject: [PATCH 16/59] Updating veracity

svn path=/nixpkgs/trunk/; revision=29772
---
 .../version-management/veracity/src-for-default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index 504d260204c..85bc00db713 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.0.0.10517";
-   name="veracity-1.0.0.10517";
-   hash="08bka5zzn7i7c3dm3xp57n3szvm9msmi7mq1zynqb6i210qix79g";
-   url="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-1.0.0.10517.tar.gz";
+   version="1.1.0.10565";
+   name="veracity-1.1.0.10565";
+   hash="0sx12zzc60pdvzhf8ax2lisnw0rsrvnrk2500y1vfqhwxh2r04id";
+   url="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-${version}.tar.gz";
+   advertisedUrl="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-1.1.0.10565.tar.gz";
   
   
 }

From 2ed828052e8eca4e57baf84c59fc99c2b103313f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 11 Oct 2011 19:46:31 +0000
Subject: [PATCH 17/59] Remove wxPython26 since it is not used

svn path=/nixpkgs/trunk/; revision=29773
---
 .../python-modules/wxPython/2.6.nix            | 18 ------------------
 pkgs/top-level/all-packages.nix                |  1 -
 pkgs/top-level/python-packages.nix             |  8 --------
 3 files changed, 27 deletions(-)
 delete mode 100644 pkgs/development/python-modules/wxPython/2.6.nix

diff --git a/pkgs/development/python-modules/wxPython/2.6.nix b/pkgs/development/python-modules/wxPython/2.6.nix
deleted file mode 100644
index 362f52bf44f..00000000000
--- a/pkgs/development/python-modules/wxPython/2.6.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages }:
-
-assert wxGTK.unicode;
-
-stdenv.mkDerivation {
-  name = "wxPython-2.6.3.3";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = mirror://sourceforge/wxpython/wxPython-src-2.6.3.3.tar.bz2;
-    md5 = "66b9c5f8e20a9505c39dab1a1234daa9";
-  };
-  
-  buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python pythonPackages.wrapPython ];
-  
-  passthru = { inherit wxGTK; };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2be53875fd6..64032e899ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4807,7 +4807,6 @@ let
   setuptools = pythonPackages.setuptools;
 
   wxPython = pythonPackages.wxPython;
-  wxPython26 = pythonPackages.wxPython26;
   wxPython28 = pythonPackages.wxPython28;
 
   twisted = pythonPackages.twisted;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index edf38bff72a..828f88aac44 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2024,20 +2024,12 @@ let pythonPackages = python.modules // rec {
   wxPython = wxPython28;
 
 
-  wxPython26 = import ../development/python-modules/wxPython/2.6.nix {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit pythonPackages;
-    wxGTK = pkgs.wxGTK26;
-  };
-
-
   wxPython28 = import ../development/python-modules/wxPython/2.8.nix {
     inherit (pkgs) stdenv fetchurl pkgconfig;
     inherit pythonPackages;
     wxGTK = pkgs.wxGTK28;
   };
 
-
   zbase32 = buildPythonPackage (rec {
     name = "zbase32-1.1.2";
 

From 4289cff0c29e4bd777729369985301480d5b3199 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 11 Oct 2011 20:47:30 +0000
Subject: [PATCH 18/59] Remove gtkLibs216.*mm

svn path=/nixpkgs/trunk/; revision=29774
---
 pkgs/development/libraries/glibmm/2.18.x.nix  | 21 -------------
 pkgs/development/libraries/gtkmm/2.14.x.nix   | 31 -------------------
 pkgs/development/libraries/pangomm/2.14.x.nix | 28 -----------------
 pkgs/top-level/all-packages.nix               |  6 ----
 4 files changed, 86 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibmm/2.18.x.nix
 delete mode 100644 pkgs/development/libraries/gtkmm/2.14.x.nix
 delete mode 100644 pkgs/development/libraries/pangomm/2.14.x.nix

diff --git a/pkgs/development/libraries/glibmm/2.18.x.nix b/pkgs/development/libraries/glibmm/2.18.x.nix
deleted file mode 100644
index b5f8ebf7eb1..00000000000
--- a/pkgs/development/libraries/glibmm/2.18.x.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
-
-stdenv.mkDerivation rec {
-  name = "glibmm-2.18.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/glibmm/2.18/${name}.tar.bz2";
-    sha256 = "0jg65hv6pwxqk4fabsjjz2zwn5hb6rgy3szj956avliarbliyr3r";
-  };
-
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [glib libsigcxx];
-
-  meta = {
-    description = "C++ interface to the GLib library";
-
-    homepage = http://gtkmm.org/;
-
-    license = "LGPLv2+";
-  };
-}
diff --git a/pkgs/development/libraries/gtkmm/2.14.x.nix b/pkgs/development/libraries/gtkmm/2.14.x.nix
deleted file mode 100644
index 74b234d8e4b..00000000000
--- a/pkgs/development/libraries/gtkmm/2.14.x.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, cairomm, pangomm }:
-
-stdenv.mkDerivation rec {
-  name = "gtkmm-2.14.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtkmm/2.14/${name}.tar.bz2";
-    sha256 = "18jral2lv9jv02d3balh0mi0wgbqhrz5y2laclri1skccc2q3c94";
-  };
-
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [ glibmm gtk atk cairomm pangomm ];
-
-  meta = {
-    description = "C++ interface to the GTK+ graphical user interface library";
-
-    longDescription = ''
-      gtkmm is the official C++ interface for the popular GUI library
-      GTK+.  Highlights include typesafe callbacks, and a
-      comprehensive set of widgets that are easily extensible via
-      inheritance.  You can create user interfaces either in code or
-      with the Glade User Interface designer, using libglademm.
-      There's extensive documentation, including API reference and a
-      tutorial.
-    '';
-
-    homepage = http://gtkmm.org/;
-
-    license = "LGPLv2+";
-  };
-}
diff --git a/pkgs/development/libraries/pangomm/2.14.x.nix b/pkgs/development/libraries/pangomm/2.14.x.nix
deleted file mode 100644
index 346962c5eaa..00000000000
--- a/pkgs/development/libraries/pangomm/2.14.x.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }:
-
-stdenv.mkDerivation rec {
-  name = "pangomm-2.14.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/pangomm/2.14/${name}.tar.bz2";
-    sha256 = "0mrm5hv8kb84qzb97lqbipzzc8g0b97pfgz2hqq33xs2ha3lswnp";
-  };
-
-  buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ pango glibmm cairomm libpng ];
-
-  meta = {
-    description = "C++ interface to the Pango text rendering library";
-
-    longDescription = ''
-      Pango is a library for laying out and rendering of text, with an
-      emphasis on internationalization.  Pango can be used anywhere
-      that text layout is needed, though most of the work on Pango so
-      far has been done in the context of the GTK+ widget toolkit.
-      Pango forms the core of text and font handling for GTK+-2.x.
-    '';
-
-    homepage = http://www.pango.org/;
-    license = "LGPLv2+";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64032e899ce..fbc27330614 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3537,20 +3537,14 @@ let
 
     glib = callPackage ../development/libraries/glib/2.20.x.nix { };
 
-    glibmm = callPackage ../development/libraries/glibmm/2.18.x.nix { };
-
     atk = callPackage ../development/libraries/atk/1.24.x.nix { };
 
     cairo = callPackage ../development/libraries/cairo { };
 
     pango = callPackage ../development/libraries/pango/1.24.x.nix { };
 
-    pangomm = callPackage ../development/libraries/pangomm/2.14.x.nix { };
-
     gtk = callPackage ../development/libraries/gtk+/2.16.x.nix { };
 
-    gtkmm = callPackage ../development/libraries/gtkmm/2.14.x.nix { };
-
   });
 
   gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in {

From 1d70839b229e8b78c00deee392a7dc6e16b7894e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 11 Oct 2011 22:18:21 +0000
Subject: [PATCH 19/59] Added haskell-Zwaluw-0.1

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

diff --git a/pkgs/development/libraries/haskell/Zwaluw/default.nix b/pkgs/development/libraries/haskell/Zwaluw/default.nix
new file mode 100644
index 00000000000..125da2a795e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Zwaluw/default.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "Zwaluw";
+  version = "0.1";
+  sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1";
+  meta = {
+    homepage = "https://github.com/MedeaMelana/Zwaluw";
+    description = "Combinators for bidirectional URL routing";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index aa14f2360bd..f42761c93cb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1340,6 +1340,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {};
 
+  Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {};
+
   # Compilers.
 
   AgdaExecutable = callPackage ../development/compilers/Agda-executable {};

From 70b8d1e6830df242ad4aec244c81d6895bc5bfd3 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 12 Oct 2011 09:44:20 +0000
Subject: [PATCH 20/59] Update BLCR to version 0.8.4.

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

diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
index afe627f7886..5377b404582 100644
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "blcr-0.8.3-${kernel.version}";
+  name = "blcr-0.8.4-${kernel.version}";
 
   src = fetchurl {
-    url = https://ftg.lbl.gov/assets/projects/CheckpointRestart/downloads/blcr-0.8.3.tar.gz;
-    sha256 = "c8243c9a7a215d4fc4e8f2199045711cf711a6f2e0b39a94413478ffae110eac";
+    url = https://ftg.lbl.gov/assets/projects/CheckpointRestart/downloads/blcr-0.8.4.tar.gz;
+    sha256 = "d851da66627d9212ac37bc9ea2aba40008ff2dc51d45dbd395ca2e403c3d78cf";
   };
 
   buildInputs = [ perl makeWrapper ];

From f8dfbd4a43ca404b8639a425a25634d80a4a7210 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 12 Oct 2011 12:10:26 +0000
Subject: [PATCH 21/59] BLCR: Add myself as mantainer.  Add platforms.

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

diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
index 5377b404582..cc7f3934734 100644
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -31,5 +31,9 @@ stdenv.mkDerivation {
     description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)";
     homepage = https://ftg.lbl.gov/projects/CheckpointRestart/;
     license = "GPL2";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [
+      z77z
+    ];
   };
 }

From e1a97996f732f63e5c022b99108c854ff8f91533 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 12 Oct 2011 18:01:28 +0000
Subject: [PATCH 22/59] Rails 3.1.1

svn path=/nixpkgs/trunk/; revision=29793
---
 .../interpreters/ruby/generated.nix           | 153 +++++++++---------
 1 file changed, 75 insertions(+), 78 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index b6ec049f9f7..9615c30ff65 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -3,106 +3,106 @@
 g: # Get dependencies from patched gems
 {
   aliases = {
-    actionmailer = g.actionmailer_3_1_0;
-    actionpack = g.actionpack_3_1_0;
-    activemodel = g.activemodel_3_1_0;
-    activerecord = g.activerecord_3_1_0;
-    activeresource = g.activeresource_3_1_0;
-    activesupport = g.activesupport_3_1_0;
+    actionmailer = g.actionmailer_3_1_1;
+    actionpack = g.actionpack_3_1_1;
+    activemodel = g.activemodel_3_1_1;
+    activerecord = g.activerecord_3_1_1;
+    activeresource = g.activeresource_3_1_1;
+    activesupport = g.activesupport_3_1_1;
     arel = g.arel_2_2_1;
-    bcrypt_ruby = g.bcrypt_ruby_3_0_0;
     builder = g.builder_3_0_0;
-    bundler = g.bundler_1_0_18;
+    bundler = g.bundler_1_0_21;
     erubis = g.erubis_2_7_0;
     hike = g.hike_1_2_1;
     i18n = g.i18n_0_6_0;
+    json = g.json_1_6_1;
     mail = g.mail_2_3_0;
     mime_types = g.mime_types_1_16;
     multi_json = g.multi_json_1_0_3;
     nix = g.nix_0_1_1;
     polyglot = g.polyglot_0_3_2;
-    rack = g.rack_1_3_2;
-    rack_cache = g.rack_cache_1_0_3;
+    rack = g.rack_1_3_4;
+    rack_cache = g.rack_cache_1_1;
     rack_mount = g.rack_mount_0_8_3;
     rack_ssl = g.rack_ssl_1_3_2;
     rack_test = g.rack_test_0_6_1;
-    rails = g.rails_3_1_0;
-    railties = g.railties_3_1_0;
+    rails = g.rails_3_1_1;
+    railties = g.railties_3_1_1;
     rake = g.rake_0_9_2;
-    rdoc = g.rdoc_3_9_4;
-    sprockets = g.sprockets_2_0_0;
+    rdoc = g.rdoc_3_10;
+    sprockets = g.sprockets_2_0_2;
     thor = g.thor_0_14_6;
     tilt = g.tilt_1_3_3;
     treetop = g.treetop_1_4_10;
-    tzinfo = g.tzinfo_0_3_29;
+    tzinfo = g.tzinfo_0_3_30;
   };
   gem_nix_args = [ ''nix'' ''rails'' ''rake'' ];
   gems = {
-    actionmailer_3_1_0 = {
+    actionmailer_3_1_1 = {
       basename = ''actionmailer'';
       meta = {
         description = ''Email composition, delivery, and receiving framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
       };
-      name = ''actionmailer-3.1.0'';
+      name = ''actionmailer-3.1.1'';
       requiredGems = [ g.mail_2_3_0 ];
-      sha256 = ''1730ky434qhbqnwnvbj9r57i4s6lcmwvnfhv6i91iif7anmjl22p'';
+      sha256 = ''0aa5vpaw8kr7id21wgslxjyxy9bygl5mjkjyn9mqg8qg7182dp0d'';
     };
-    actionpack_3_1_0 = {
+    actionpack_3_1_1 = {
       basename = ''actionpack'';
       meta = {
         description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
       };
-      name = ''actionpack-3.1.0'';
-      requiredGems = [ g.activemodel_3_1_0 g.rack_cache_1_0_3 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_0 g.erubis_2_7_0 ];
-      sha256 = ''0igy1dp8zdh653v4wz7vxdjmz681k8653n0xan9ng1qgsk9b7wlh'';
+      name = ''actionpack-3.1.1'';
+      requiredGems = [ g.activemodel_3_1_1 g.rack_cache_1_1 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_2 g.erubis_2_7_0 ];
+      sha256 = ''0hh4ndbi9kvkp1srad324vd9i7nhi8vqc0vhfh044jzwq1dvbqc6'';
     };
-    activemodel_3_1_0 = {
+    activemodel_3_1_1 = {
       basename = ''activemodel'';
       meta = {
         description = ''A toolkit for building modeling frameworks (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
       };
-      name = ''activemodel-3.1.0'';
-      requiredGems = [ g.builder_3_0_0 g.i18n_0_6_0 g.bcrypt_ruby_3_0_0 ];
-      sha256 = ''1hpppp54v05ci4l7nx79i9lcnf6z00lhi5wpn8sgyr5869xihvq6'';
+      name = ''activemodel-3.1.1'';
+      requiredGems = [ g.builder_3_0_0 g.i18n_0_6_0 ];
+      sha256 = ''0r7zlzswf1vdhk97lll6kv64l0nya2li9gai19vd4qclh4m2n9n1'';
     };
-    activerecord_3_1_0 = {
+    activerecord_3_1_1 = {
       basename = ''activerecord'';
       meta = {
         description = ''Object-relational mapper framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
       };
-      name = ''activerecord-3.1.0'';
-      requiredGems = [ g.arel_2_2_1 g.tzinfo_0_3_29 ];
-      sha256 = ''1dq5k2r6a85wmzgv5gv0rrxf43agzzcj6z4az6w034nxarv7ccml'';
+      name = ''activerecord-3.1.1'';
+      requiredGems = [ g.arel_2_2_1 g.tzinfo_0_3_30 ];
+      sha256 = ''1zab48wj04nyl01kkmmj23l5lwjid5mkhd92hpr3qf1r82zcj983'';
     };
-    activeresource_3_1_0 = {
+    activeresource_3_1_1 = {
       basename = ''activeresource'';
       meta = {
         description = ''REST modeling framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
       };
-      name = ''activeresource-3.1.0'';
+      name = ''activeresource-3.1.1'';
       requiredGems = [  ];
-      sha256 = ''1vd4mmfxk1zmqxv44q0wxhg74yc7qah17im44qjv0b850522vavg'';
+      sha256 = ''04wk4s5a5iiyhd90m6bfs0vl92h3yf85vypfp79y3n0ybq7hd27w'';
     };
-    activesupport_3_1_0 = {
+    activesupport_3_1_1 = {
       basename = ''activesupport'';
       meta = {
         description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
       };
-      name = ''activesupport-3.1.0'';
+      name = ''activesupport-3.1.1'';
       requiredGems = [ g.multi_json_1_0_3 ];
-      sha256 = ''0hrnak4rpaxxb34918d9yjvcgz2jv7mnbsf3a7nz6dvqf6gw7110'';
+      sha256 = ''1d9c0iqsngp7sib5jjvs2zlq8xwzi2yfc0kp6s9a7y6rm9k5f9f2'';
     };
     arel_2_2_1 = {
       basename = ''arel'';
@@ -122,20 +122,6 @@ database compatibility and query generation.'';
       requiredGems = [  ];
       sha256 = ''19pz68pr9l8h2j2v3vqzhjvs94s0hwqwpb6m9sd6ncj18gaci8jy'';
     };
-    bcrypt_ruby_3_0_0 = {
-      basename = ''bcrypt_ruby'';
-      meta = {
-        description = ''OpenBSD's bcrypt() password hashing algorithm.'';
-        homepage = ''http://bcrypt-ruby.rubyforge.org'';
-        longDescription = ''    bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project
-    for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for safely handling
-    passwords.
-'';
-      };
-      name = ''bcrypt-ruby-3.0.0'';
-      requiredGems = [  ];
-      sha256 = ''0chw0hh2vkb0nc4x1g350wzplf7kas6fddfa976c6gwvjgrbd7fw'';
-    };
     builder_3_0_0 = {
       basename = ''builder'';
       meta = {
@@ -152,16 +138,16 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''13k12jii9z1hma4xxk2dl74wsx985idl3cs9svvla8p0bmgf3lzv'';
     };
-    bundler_1_0_18 = {
+    bundler_1_0_21 = {
       basename = ''bundler'';
       meta = {
         description = ''The best way to manage your application's dependencies'';
         homepage = ''http://gembundler.com'';
         longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
       };
-      name = ''bundler-1.0.18'';
+      name = ''bundler-1.0.21'';
       requiredGems = [  ];
-      sha256 = ''0rz1qibmvydkfx0akq97rlihvf20jl51dxh8x0xivb1i0zkykb5b'';
+      sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6'';
     };
     erubis_2_7_0 = {
       basename = ''erubis'';
@@ -208,6 +194,17 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0'';
     };
+    json_1_6_1 = {
+      basename = ''json'';
+      meta = {
+        description = ''JSON Implementation for Ruby'';
+        homepage = ''http://flori.github.com/json'';
+        longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
+      };
+      name = ''json-1.6.1'';
+      requiredGems = [  ];
+      sha256 = ''0xxqr491s2xrxy76551jby4fcwdqa222wwhfhxhgwj7prf35sqc4'';
+    };
     mail_2_3_0 = {
       basename = ''mail'';
       meta = {
@@ -266,7 +263,7 @@ augments 'require' to find and load matching files.'';
       requiredGems = [  ];
       sha256 = ''0m2ni5bcwfmhjwndhy115zgcvq0wdf3hk0hal1sfidfz9vbd0hyz'';
     };
-    rack_1_3_2 = {
+    rack_1_3_4 = {
       basename = ''rack'';
       meta = {
         description = ''a modular Ruby webserver interface'';
@@ -280,20 +277,20 @@ middleware) into a single method call.
 Also see http://rack.rubyforge.org.
 '';
       };
-      name = ''rack-1.3.2'';
+      name = ''rack-1.3.4'';
       requiredGems = [  ];
-      sha256 = ''1qrs4ryj8a4c3f9raz8mvcl82dinzyiy7rcp7i3jd2xjra75dz7k'';
+      sha256 = ''17wil1sf8pinmbzlf05sfw48ry6x1hmgxq1im8fagjrf3p2rnzrl'';
     };
-    rack_cache_1_0_3 = {
+    rack_cache_1_1 = {
       basename = ''rack_cache'';
       meta = {
         description = ''HTTP Caching for Rack'';
         homepage = ''http://tomayko.com/src/rack-cache/'';
         longDescription = ''HTTP Caching for Rack'';
       };
-      name = ''rack-cache-1.0.3'';
-      requiredGems = [ g.rack_1_3_2 ];
-      sha256 = ''188q2sf44380zqq8kpqb6d4gl7fh5bimkcn8khpri64n6lmqd42w'';
+      name = ''rack-cache-1.1'';
+      requiredGems = [ g.rack_1_3_4 ];
+      sha256 = ''08jlym48qwfj7wddv0vpjj3vlc03q8wvbya24zbrjj8grgfgrvrl'';
     };
     rack_mount_0_8_3 = {
       basename = ''rack_mount'';
@@ -333,27 +330,27 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0'';
     };
-    rails_3_1_0 = {
+    rails_3_1_1 = {
       basename = ''rails'';
       meta = {
         description = ''Full-stack web application framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
-      name = ''rails-3.1.0'';
-      requiredGems = [ g.activesupport_3_1_0 g.actionpack_3_1_0 g.activerecord_3_1_0 g.activeresource_3_1_0 g.actionmailer_3_1_0 g.railties_3_1_0 g.bundler_1_0_18 ];
-      sha256 = ''1ki0jnq40kvfdp3kvnzvnrl9j09n9gql77pbl6jz565siqnvikms'';
+      name = ''rails-3.1.1'';
+      requiredGems = [ g.activesupport_3_1_1 g.actionpack_3_1_1 g.activerecord_3_1_1 g.activeresource_3_1_1 g.actionmailer_3_1_1 g.railties_3_1_1 g.bundler_1_0_21 ];
+      sha256 = ''0w8ab71f4b78mq8q7kbb5bfwsbzy4mnp82jckzwndkhxf9141js2'';
     };
-    railties_3_1_0 = {
+    railties_3_1_1 = {
       basename = ''railties'';
       meta = {
         description = ''Tools for creating, working with, and running Rails applications.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
       };
-      name = ''railties-3.1.0'';
-      requiredGems = [ g.rake_0_9_2 g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_9_4 ];
-      sha256 = ''155snh4hwflxqylyqlsyqpdm5f80qk2lqn9jhksx85m1sz99mxym'';
+      name = ''railties-3.1.1'';
+      requiredGems = [ g.rake_0_9_2 g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_10 ];
+      sha256 = ''0xvspkv63xvm47daw13dn7p1nzhmlk0zmyw4mznazp44zvzkli63'';
     };
     rake_0_9_2 = {
       basename = ''rake'';
@@ -368,7 +365,7 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''1348lm18j0rki4zjgb4rgplai32j0izkvbbi66lk7n0z89dm4ny5'';
     };
-    rdoc_3_9_4 = {
+    rdoc_3_10 = {
       basename = ''rdoc'';
       meta = {
         description = ''RDoc produces HTML and command-line documentation for Ruby projects'';
@@ -379,20 +376,20 @@ documentation.
 
 See RDoc for a description of RDoc's markup and basic use.'';
       };
-      name = ''rdoc-3.9.4'';
-      requiredGems = [  ];
-      sha256 = ''0znp5xssql3pmk38s58b0dvvcv5d3r28gx6jrzyb9158jz98jmf5'';
+      name = ''rdoc-3.10'';
+      requiredGems = [ g.json_1_6_1 ];
+      sha256 = ''16cx357w9s9ijyl8pzd947dr6n7wnmm6cd0yxm4cy0hbjqafpn1k'';
     };
-    sprockets_2_0_0 = {
+    sprockets_2_0_2 = {
       basename = ''sprockets'';
       meta = {
         description = ''Rack-based asset packaging system'';
         homepage = ''http://getsprockets.org/'';
         longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
       };
-      name = ''sprockets-2.0.0'';
+      name = ''sprockets-2.0.2'';
       requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ];
-      sha256 = ''1b3yih9mzpbn6w1kymwrcd606yw8nds5h3ig4ky5g65qwl7gk75c'';
+      sha256 = ''1wwpixlql2p9jq497g97iv0iw2fni7sldcxvfzz65df07pi54624'';
     };
     thor_0_14_6 = {
       basename = ''thor'';
@@ -426,16 +423,16 @@ See RDoc for a description of RDoc's markup and basic use.'';
       requiredGems = [ g.polyglot_0_3_2 ];
       sha256 = ''01f4w7fm6phhdbkx7bp0b58hrk3x4b0a63p2vvjbxm5gi2gv9ap2'';
     };
-    tzinfo_0_3_29 = {
+    tzinfo_0_3_30 = {
       basename = ''tzinfo'';
       meta = {
         description = ''Daylight-savings aware timezone library'';
         homepage = ''http://tzinfo.rubyforge.org/'';
         longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.'';
       };
-      name = ''tzinfo-0.3.29'';
+      name = ''tzinfo-0.3.30'';
       requiredGems = [  ];
-      sha256 = ''10504cr141vgg12nqbd920xj0q2b07gbjjdwdrwjj35pp97ymrij'';
+      sha256 = ''13zzcbbwkz5h9v7ik1xmwlp1bwnn5qpm37b3h2p2csa2j2n7nbaj'';
     };
   };
 }

From a6db3d5723301c641377fd987f5b2355fdd1a230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 12 Oct 2011 19:16:15 +0000
Subject: [PATCH 23/59] Fixing package naming in wesnoth broken by r27666

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

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 000fa02b8ab..f9f1ddebc1d 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -3,20 +3,20 @@
 , fribidi, asciidoc }:
 
 stdenv.mkDerivation rec {
-  name = "wesnoth";
+  pname = "wesnoth";
   version = "1.8.6";
 
-  pname = "${name}-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sourceforge/${name}/${pname}.tar.bz2";
+    url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
     sha256 = "10c01ys846zsy831gprdy2nx3qlzv65s4jy99lw6misak3x07rjg";
   };
 
   buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
                   automake autoconf freetype libpng pkgconfig lua dbus fontconfig libtool ];
 
-  # The preInstall sed substitution fix errors which I 
+  # The preInstall sed substitution fix errors which I
   # believe arise from autotools version mismatches.  Rather than
   # hunt for the correct automake and autoconf versions these changes
   # make the build work with the versions current in Nixpkgs.
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     ./autogen.sh --prefix=$out --with-boost=${boost} \
-                 --with-preferences-dir=.${name} \
-                 --with-datadir-name=${name}
+                 --with-preferences-dir=.${pname} \
+                 --with-datadir-name=${pname}
   '';
 
   # Make the package build with the gcc currently available in Nixpkgs.
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       reclaim the throne of Wesnoth, or take hand in any number of other
       adventures.
     '';
-    
+
     homepage = http://www.wesnoth.org/;
     license = licenses.gpl2;
     maintainers = [ maintainers.kkallio ];

From 14e951e6d59c4bf2ecf3386c7a18eb019531e803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 12 Oct 2011 20:43:44 +0000
Subject: [PATCH 24/59] GNU RCS 5.8.

svn path=/nixpkgs/trunk/; revision=29795
---
 .../version-management/rcs/default.nix        | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index 38c1d38e349..4be4c0c5f69 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -1,23 +1,28 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "rcs-5.7";
+stdenv.mkDerivation rec {
+  name = "rcs-5.8";
 
   src = fetchurl {
-    url = ftp://ftp.cs.purdue.edu/pub/RCS/rcs-5.7.tar;
-    md5 = "f7b3f106bf87ff6344df38490f6a02c5";
+    url = "mirror://gnu/rcs/${name}.tar.gz";
+    sha256 = "0q12nlghv4khxw5lk0y4949caghzg4jg0ripddi2h3q75vmfh6vh";
   };
 
-  patches = [ ./no-root.patch ];
-
-  preConfigure = ''
-    makeFlags="man1dir=$out/share/man/man1 man5dir=$out/share/man/man5";
-  '';
+  doCheck = true;
 
   meta = {
-    homepage = http://www.cs.purdue.edu/homes/trinkle/RCS/;
-    description = "Revision Control System, a version management system";
-    maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ];
+    homepage = http://www.gnu.org/software/rcs/;
+    description = "GNU RCS, a revision control system";
+    longDescription =
+      '' The GNU Revision Control System (RCS) manages multiple revisions of
+         files. RCS automates the storing, retrieval, logging,
+         identification, and merging of revisions.  RCS is useful for text
+         that is revised frequently, including source code, programs,
+         documentation, graphics, papers, and form letters.
+      '';
+
+    license = "GPLv3+";
+    maintainers = with stdenv.lib.maintainers; [ eelco simons ludo ];
     platforms = stdenv.lib.platforms.all;
   };
 }

From ce2bceeeaca56391e71afa3baf92df0343c0ff96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 12 Oct 2011 21:25:05 +0000
Subject: [PATCH 25/59] Updating feh.

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

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index c36e79fbc3a..eedf797c1c7 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -2,11 +2,11 @@
 , libXinerama, curl }:
 
 stdenv.mkDerivation {
-  name = "feh-1.14.2";
+  name = "feh-2.0";
 
   src = fetchurl {
-    url = http://feh.finalrewind.org/feh-1.14.2.tar.bz2;
-    sha256 = "117g1caihil88a3q0qy9gqj521l3illlsk56cgxhpc2am6ch5nwr";
+    url = http://feh.finalrewind.org/feh-2.0.tar.bz2;
+    sha256 = "0ilrabi0i4gads6b5r4d7svdav00n5vxjcn6h4kbd05d2hz0mjf5";
   };
 
   buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl];

From 18bd78f116a3be3576dacd3e66cdd7dc70ec394a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Oct 2011 21:59:36 +0000
Subject: [PATCH 26/59] * Get k3b to build again.

svn path=/nixpkgs/trunk/; revision=29801
---
 pkgs/applications/misc/k3b/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index ff2451761dc..cff71a6a00e 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -1,21 +1,25 @@
 { stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
-, ffmpeg, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
-, kdelibs, kdemultimedia, automoc4, phonon, makeWrapper
+, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
+, kdelibs, kdemultimedia, automoc4, phonon
 }:
 
 stdenv.mkDerivation rec {
   name = "k3b-2.0.2";
+  
   src = fetchurl {
     url = "mirror://sourceforge/k3b/${name}.tar.bz2";
     sha256 = "1kdpylz3w9bg02jg4mjhqz8bq1yb4xi4fqfl9139qcyjq4lny5xg";
   };
 
-  buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib
-                  ffmpeg flac libsamplerate libdvdread lame libsndfile
-                  libmad gettext stdenv.gcc.libc
-                  kdelibs kdemultimedia automoc4 phonon
-                  makeWrapper ];
+  buildInputs =
+    [ cmake qt4 perl shared_mime_info libvorbis taglib
+      flac libsamplerate libdvdread lame libsndfile
+      libmad gettext stdenv.gcc.libc
+      kdelibs kdemultimedia automoc4 phonon
+    ];
 
+  enableParallelBuilding = true;
+                  
   meta = with stdenv.lib; {
     description = "CD/DVD Burning Application for KDE";
     license = licenses.gpl2Plus;

From 2feeeacb7b603569bd90aaae760bc976561ccc18 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Oct 2011 07:26:44 +0000
Subject: [PATCH 27/59] nbd: we don't generate statically linked binaries for
 that package anymore, so it's no longer necessary to pass a special version
 of glib to the expression.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbc27330614..490e7cbf879 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1003,11 +1003,7 @@ let
 
   namazu = callPackage ../tools/text/namazu { };
 
-  nbd = callPackage ../tools/networking/nbd {
-    glib = gtkLibs.glib.override {
-      stdenv = makeStaticBinaries stdenv;
-    };
-  };
+  nbd = callPackage ../tools/networking/nbd { };
 
   netcdf = callPackage ../development/libraries/netcdf { };
 

From ee2fdfb00df8cc281dde26cd698f28f1eeb96a60 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Oct 2011 07:38:44 +0000
Subject: [PATCH 28/59] mscgen: added version 0.20

svn path=/nixpkgs/trunk/; revision=29803
---
 pkgs/tools/graphics/mscgen/default.nix | 42 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/graphics/mscgen/default.nix

diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix
new file mode 100644
index 00000000000..63e6afaa803
--- /dev/null
+++ b/pkgs/tools/graphics/mscgen/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, flex, bison, gd, libpng, freetype, zlib }:
+
+let
+  version = "0.20";
+in
+stdenv.mkDerivation {
+  name = "mscgen-${version}";
+
+  src = fetchurl {
+    url = "www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz";
+    sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23";
+  };
+
+  buildInputs = [ flex bison gd libpng freetype zlib ];
+
+  doCheck = true;
+  preCheck = ''
+    sed -i -e "s|#!/bin/bash|#!${stdenv.shell}|" test/renderercheck.sh
+  '';
+
+  meta = {
+    homepage = "http://www.mcternan.me.uk/mscgen/";
+    description = "convert Message Sequence Chart descriptions into PNG, SVG, or EPS images";
+    license = "GPLv2";
+
+    longDescription = ''
+      Mscgen is a small program that parses Message Sequence Chart
+      descriptions and produces PNG, SVG, EPS or server side image maps
+      (ismaps) as the output. Message Sequence Charts (MSCs) are a way
+      of representing entities and interactions over some time period
+      and are often used in combination with SDL. MSCs are popular in
+      Telecoms to specify how protocols operate although MSCs need not
+      be complicated to create or use. Mscgen aims to provide a simple
+      text language that is clear to create, edit and understand, which
+      can also be transformed into common image formats for display or
+      printing.
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 490e7cbf879..24147b4f2eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -969,6 +969,8 @@ let
 
   mpage = callPackage ../tools/text/mpage { };
 
+  mscgen = callPackage ../tools/graphics/mscgen { };
+
   msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) {
     inherit ruby makeWrapper;
   };

From 3850bb86baef6ace53ddbc04e51164bb688aa21c Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 13 Oct 2011 08:47:49 +0000
Subject: [PATCH 29/59] linux_2_6_39_powertop

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24147b4f2eb..ab0fc4ccb61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5537,6 +5537,7 @@ let
 
   linux_2_6_38_ati = linux_2_6_38.override { extraConfig="DRM_RADEON_KMS y"; };
 
+  # Please keep in sync with linux_2_6_39_powertop, except for extraConfig
   linux_2_6_39 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.39.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5547,6 +5548,30 @@ let
       ];
   };
 
+  # Please keep in sync with linux_2_6_39, except for extraConfig
+  linux_2_6_39_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.39.nix) {
+    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    extraConfig = ''
+        CPU_FREQ_GOV_ONDEMAND y
+        CPU_FREQ_STAT y
+        DEBUG_KERNEL y
+        HIGH_RES_TIMERS y
+        HPET_TIMER y
+        NO_HZ y
+        PM_ADVANCED_DEBUG y
+        PM_RUNTIME y
+        SND_AC97_POWER_SAVE y
+        TIMER_STATS y
+        USB_SUSPEND y
+    '';
+    kernelPatches =
+      [ #kernelPatches.fbcondecor_2_6_38
+        kernelPatches.sec_perm_2_6_24
+        kernelPatches.aufs2_1_2_6_39
+        #kernelPatches.mips_restart_2_6_36
+      ];
+  };
+
   linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5713,6 +5738,7 @@ let
   linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38);
   linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38);
   linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39);
+  linuxPackages_2_6_39_powertop = recurseIntoAttrs (linuxPackagesFor linux_2_6_39_powertop pkgs.linuxPackages_2_6_39_powertop);
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0);
   linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1);
   linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);

From 0989227b08fd53e391d4fde3bd67be34abce8eef Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 13 Oct 2011 08:47:58 +0000
Subject: [PATCH 30/59] fix powertop-1.13.patch

svn path=/nixpkgs/trunk/; revision=29806
---
 pkgs/os-specific/linux/powertop/powertop-1.13.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/powertop/powertop-1.13.patch b/pkgs/os-specific/linux/powertop/powertop-1.13.patch
index d8a7d546c54..cf66b297190 100644
--- a/pkgs/os-specific/linux/powertop/powertop-1.13.patch
+++ b/pkgs/os-specific/linux/powertop/powertop-1.13.patch
@@ -1,7 +1,7 @@
 diff -ru powertop-1.13/Makefile powertop-1.13.new/Makefile
 --- powertop-1.13/Makefile
 +++ powertop-1.13.new/Makefile
-@@ -1,6 +1,6 @@
+@@ -1,8 +1,8 @@
  VERSION = 1.13
  
 -BINDIR=/usr/bin
@@ -10,6 +10,6 @@ diff -ru powertop-1.13/Makefile powertop-1.13.new/Makefile
 +BINDIR=${out}/bin
 +LOCALESDIR=${out}/share/locale
 +MANDIR=${out}/share/man/man8
- WARNFLAGS=-Wall  -W -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int
+ WARNFLAGS=-Wall -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int
  CFLAGS?=-Os -g ${WARNFLAGS}
  CC?=gcc

From dfd9a5906da6aad5e96818874e3009bce16b9df6 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 13 Oct 2011 08:53:47 +0000
Subject: [PATCH 31/59] powertop meta info

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

diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index aaa7d6f04e0..e0575b33c49 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -8,4 +8,10 @@ stdenv.mkDerivation {
   };
   patches = [./powertop-1.13.patch];
   buildInputs = [ncurses gettext];
+  meta = {
+    description = "Analyze power consumption on Intel-based laptops";
+    license = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.chaoflow ];
+    platforms = stdenv.lib.platforms.linux;
+  };
 }

From 58e9385e704fc22cb6bc0c364465c73df13fd022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 13 Oct 2011 08:58:45 +0000
Subject: [PATCH 32/59] Downgrading boinc to the last stable version.

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

diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 460355b274f..5cc79469b76 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -3,12 +3,12 @@ mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK,
 sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "boinc-6.13.6";
+  name = "boinc-6.12.39";
 
   src = fetchsvn {
-    url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_13_6";
+    url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_12_39";
     rev = 24341;
-    sha256 = "17312g4mhxigka1rafxxw46a4mbdlfj1wh1nlp1cbg43hv2rf7bq";
+    sha256 = "158fkm4mr7wljsy8gav20km8jamf00mxjk1wsiqw6kx62bih37yb";
   };
 
   buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi

From 19503ac12a97d18f28bc4733de55522edff8d387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 13 Oct 2011 08:59:56 +0000
Subject: [PATCH 33/59] Updating task spooler

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

diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index be41b88c9e3..ef3fa7ec706 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
 
-  name = "ts-0.7.0";
+  name = "ts-0.7.1";
 
   installPhase=''make install "PREFIX=$out"'';
 
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.0.tar.gz;
-    sha256 = "1m9nf0299idkh355afk2c9v9qqpxm4ram3gyf8a9qv4f9gg6hprp";
+    url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.1.tar.gz;
+    sha256 = "0s1hrgw99jn6ar01lcvhdgqsw0jzfnbpdayp0pydr6ikx1zwz70v";
   };
 
   meta = {

From abd410f804fce1e71f0de46543b79c8412b51da9 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 13 Oct 2011 09:06:52 +0000
Subject: [PATCH 34/59] fix powertop INOTIFY suggestion

INOTIFY_USER exists since 2.6.18

svn path=/nixpkgs/trunk/; revision=29810
---
 ...OTIFY_USER-instead-of-CONFIG_INOTIFY.patch | 28 +++++++++++++++++++
 pkgs/os-specific/linux/powertop/default.nix   |  5 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch

diff --git a/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch b/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch
new file mode 100644
index 00000000000..46caed050f4
--- /dev/null
+++ b/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch
@@ -0,0 +1,28 @@
+From 89e46f3270e3b6d704959c4d0f44ae6bab8f7616 Mon Sep 17 00:00:00 2001
+From: Florian Friesdorf <flo@chaoflow.net>
+Date: Thu, 13 Oct 2011 10:14:34 +0200
+Subject: [PATCH] CONFIG_INOTIFY_USER instead of CONFIG_INOTIFY
+
+since 2.6.36 the former fully replaced the latter
+---
+ powertop.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/powertop.c b/powertop.c
+index 74eb328..8df3652 100644
+--- a/powertop.c
++++ b/powertop.c
+@@ -1191,8 +1191,8 @@ int main(int argc, char **argv)
+ 		suggest_kernel_config("CONFIG_CPU_FREQ_STAT", 1,
+ 				    _("Suggestion: Enable the CONFIG_CPU_FREQ_STAT kernel configuration option.\n"
+ 				      "This option allows PowerTOP to show P-state percentages \n" "P-states correspond to CPU frequencies."), 2);
+-		suggest_kernel_config("CONFIG_INOTIFY", 1,
+-				    _("Suggestion: Enable the CONFIG_INOTIFY kernel configuration option.\n"
++		suggest_kernel_config("CONFIG_INOTIFY_USER", 1,
++				    _("Suggestion: Enable the CONFIG_INOTIFY_USER kernel configuration option.\n"
+ 				      "This option allows programs to wait for changes in files and directories\n"
+ 				      "instead of having to poll for these changes"), 5);
+ 
+-- 
+1.7.6
+
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index e0575b33c49..7c66556df29 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -6,7 +6,10 @@ stdenv.mkDerivation {
     url = http://www.lesswatts.org/projects/powertop/download/powertop-1.13.tar.gz;
     sha256 = "164dqp6msdaxpi2bmvwawasyrf1sfvanlc9ddp97v1wnjh46dj1b";
   };
-  patches = [./powertop-1.13.patch];
+  patches = [
+    ./powertop-1.13.patch
+    ./0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch
+  ];
   buildInputs = [ncurses gettext];
   meta = {
     description = "Analyze power consumption on Intel-based laptops";

From 805a4c0261d2c33d62a47af0cc89869e6e1c4e2e Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 13 Oct 2011 09:23:22 +0000
Subject: [PATCH 35/59] linux/kernel - added myself to maintainers

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

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index eaa90ac0eec..dbfdf86f9c9 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -139,7 +139,10 @@ stdenv.mkDerivation {
         + ")");
     license = "GPLv2";
     homepage = http://www.kernel.org/;
-    maintainers = [ lib.maintainers.eelco ];
+    maintainers = [
+      lib.maintainers.eelco
+      lib.maintainers.chaoflow
+    ];
     platforms = lib.platforms.linux;
   } // extraMeta;
 }

From 843ed0c33924250a79141c02e53d3bd9596687d7 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Thu, 13 Oct 2011 12:37:15 +0000
Subject: [PATCH 36/59] Update OpenAFS client to version 1.6.0.  Also enable
 Hydra build.

svn path=/nixpkgs/trunk/; revision=29819
---
 pkgs/lib/licenses.nix                         |  6 ++
 pkgs/servers/openafs-client/default.nix       | 68 +++++++-----------
 pkgs/servers/openafs-client/replace-usrbinenv | 72 -------------------
 .../servers/openafs-client/replace-usrbinperl | 16 -----
 .../servers/openafs-client/replace-usrinclude | 42 -----------
 pkgs/servers/openafs-client/replace-usrsrc    | 11 ---
 6 files changed, 32 insertions(+), 183 deletions(-)
 delete mode 100644 pkgs/servers/openafs-client/replace-usrbinenv
 delete mode 100644 pkgs/servers/openafs-client/replace-usrbinperl
 delete mode 100644 pkgs/servers/openafs-client/replace-usrinclude
 delete mode 100644 pkgs/servers/openafs-client/replace-usrsrc

diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 1d6b1ca58e2..293bf59ec5d 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -82,6 +82,12 @@
     url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
   };
 
+  ipl10 = {
+    shortName = "IPL 1.0";
+    fullName = "IBM Public License Version 1.0";
+    url = http://www.ibm.com/developerworks/opensource/library/os-i18n2/os-ipl.html;
+  };
+
   ijg = {
     shortName = "IJG";
     fullName = "Independent JPEG Group License";
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index 330bcc2e863..ba7de83d939 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -1,63 +1,47 @@
-{ stdenv, fetchurl, autoconf, automake, flex, yacc,
+{ stdenv, fetchurl, which, autoconf, automake, flex, yacc,
   kernel, glibc, ncurses, perl, krb5 }:
 
 assert stdenv.isLinux;
 
-let
-  pname = "openafs";
-  version = "1.4.11";
-  name = "${pname}-${version}-${kernel.version}";
-  webpage = http://www.openafs.org;
-in
-
-stdenv.mkDerivation rec {
-  inherit name;
+stdenv.mkDerivation {
+  name = "openafs-1.6.0-${kernel.version}";
 
   src = fetchurl {
-    url = "${webpage}/dl/${pname}/${version}/${pname}-${version}-src.tar.gz";
-    sha256 = "ea5377119fd7b5317428644fa427066b9edbde395d997943a448426742d2c5c9";
+    url = http://www.openafs.org/dl/openafs/1.6.0/openafs-1.6.0-src.tar.bz2;
+    sha256 = "1rj40qp30hswr08p69jigya78ggbn4dc7qnnw2sfjpv52ywa68p7";
   };
 
-  buildInputs = [ autoconf automake flex yacc ncurses perl ];
+  buildInputs = [ autoconf automake flex yacc ncurses perl which ];
 
-  replace_usrbinenv = ./replace-usrbinenv;
-  replace_usrinclude = ./replace-usrinclude;
-  replace_usrbinperl = ./replace-usrbinperl;
-  replace_usrsrc = ./replace-usrsrc;
-
-  configurePhase = ''
+  preConfigure = ''
     ln -s ${kernel}/lib/modules/*/build $TMP/linux
 
-    echo "Replace ..."
-    for i in `cat ${replace_usrbinenv}`; do
-      substituteInPlace $i --replace "/usr/bin/env" $(type -tp env)
+    patchShebangs .
+    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
+      echo "Patch /usr/include and /usr/src in $i"
+      substituteInPlace $i \
+        --replace "/usr/include" "${glibc}/include" \
+        --replace "/usr/src" "$TMP"
     done
-    for i in `cat ${replace_usrinclude}`; do
-      substituteInPlace $i --replace "/usr/include" "${glibc}/include"
-    done
-    for i in `cat ${replace_usrbinperl}`; do
-      substituteInPlace $i --replace "/usr/bin/perl" $(type -tp perl)
-    done
-    for i in `cat ${replace_usrsrc}`; do
-      substituteInPlace $i --replace "/usr/src" "$TMP"
-    done
-    echo "... done"
 
     ./regen.sh
 
-    ./configure \
-       --prefix=$out \
-       --with-linux-kernel-build=$TMP/linux \
-       --with-krb5-conf=${krb5}/bin/krb5-config \
-       --sysconfdir=/etc/static
-       #--with-afs-sysname=amd64_linux26 \
+    export KRB5_CONFIG=${krb5}/bin/krb5-config
 
-    substituteInPlace src/pinstall/install.c --replace "/bin/cp" $(type -tp cp)
+    configureFlagsArray=(
+      "--with-linux-kernel-build=$TMP/linux"
+      "--with-krb5"
+      "--sysconfdir=/etc/static"
+    )
   '';
 
   meta = {
-      description = "Open AFS client for Linux";
-      homepage = webpage;
-      license = "IPL";
+    description = "Open AFS client";
+    homepage = http://www.openafs.org;
+    license = stdenv.lib.licenses.ipl10;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [
+      z77z
+    ];
   };
 }
diff --git a/pkgs/servers/openafs-client/replace-usrbinenv b/pkgs/servers/openafs-client/replace-usrbinenv
deleted file mode 100644
index b014e899272..00000000000
--- a/pkgs/servers/openafs-client/replace-usrbinenv
+++ /dev/null
@@ -1,72 +0,0 @@
-src/tests/ptsmembersuser.pl
-src/tests/bossalvagevolume.pl
-src/tests/bosstop.pl
-src/tests/baduniq.pl
-src/tests/voslistvol.pl
-src/tests/aclremoveuser.pl
-src/tests/vosbackup.pl
-src/tests/bosaddhost.pl
-src/tests/vosremove.pl
-src/tests/bosexec.pl
-src/tests/boscreate.pl
-src/tests/bosremovehost.pl
-src/tests/reauth.pl
-src/tests/ptsexamineuser.pl
-src/tests/ptsmembersgroup.pl
-src/tests/bosremovekey.pl
-src/tests/voslistvldb.pl
-src/tests/bosshutdown.pl
-src/tests/bosadduser.pl
-src/tests/aclclearnegrights.pl
-src/tests/boslisthosts.pl
-src/tests/ptslistmax.pl
-src/tests/vosrestore.pl
-src/tests/acladdrights.pl
-src/tests/ptslistown.pl
-src/tests/bosstart.pl
-src/tests/vospartinfo.pl
-src/tests/bosrestartstopped.pl
-src/tests/voszap.pl
-src/tests/vosexamine.pl
-src/tests/acladdnegrights.pl
-src/tests/ptsdeletegroup.pl
-src/tests/bosdelete.pl
-src/tests/bosstatus.pl
-src/tests/aclcopy.pl
-src/tests/ptscreateuser.pl
-src/tests/vosrelease.pl
-src/tests/bosremoveuser.pl
-src/tests/ptsexaminegroup.pl
-src/tests/voslock.pl
-src/tests/vossyncserv.pl
-src/tests/ptsadduser.pl
-src/tests/bossalvagepart.pl
-src/tests/ptsdeleteuser.pl
-src/tests/voslistpart.pl
-src/tests/vosunlock.pl
-src/tests/boslistkeys.pl
-src/tests/voscreate.pl
-src/tests/vosunlockall.pl
-src/tests/vosdump.pl
-src/tests/vosaddsite.pl
-src/tests/acladdgroup.pl
-src/tests/acladduser.pl
-src/tests/afs-newcell.pl
-src/tests/bosaddkey.pl
-src/tests/ptsremove.pl
-src/tests/aclremovegroup.pl
-src/tests/vosremsite.pl
-src/tests/ptschown.pl
-src/tests/ptssetf.pl
-src/tests/afs-rmcell.pl
-src/tests/bosinstall.pl
-src/tests/boslistusers.pl
-src/tests/vossyncvldb.pl
-src/tests/vosdelentry.pl
-src/tests/vosmove.pl
-src/tests/run-suite.pl
-src/tests/vosrename.pl
-src/tests/ptscreategroup.pl
-src/tests/bosdeleterunning.pl
-src/tests/ptssetmax.pl
-src/tests/bossalvageserver.pl
diff --git a/pkgs/servers/openafs-client/replace-usrbinperl b/pkgs/servers/openafs-client/replace-usrbinperl
deleted file mode 100644
index d0742adf06b..00000000000
--- a/pkgs/servers/openafs-client/replace-usrbinperl
+++ /dev/null
@@ -1,16 +0,0 @@
-src/libafs/make_kbuild_makefile.pl
-src/mkdest.pl
-src/tools/install/write_fstab.pl
-src/tools/install/write_pam.pl
-src/tools/install/check_udebug.pl
-src/config/make_libafs_tree.pl
-src/config/make_vnode.pl
-src/packaging/Debian/afs-newcell
-src/packaging/Debian/afs-rootvol
-src/packaging/Debian/kernel-version
-src/packaging/MacOS/csrvdbmerge.pl
-src/packaging/MacOS/decode-panic
-src/packaging/MacOS/Uninstall
-src/packaging/RedHat/mockbuild.pl
-src/packaging/RedHat/openafs-buildfedora.pl
-src/packaging/RedHat/makesrpm.pl
diff --git a/pkgs/servers/openafs-client/replace-usrinclude b/pkgs/servers/openafs-client/replace-usrinclude
deleted file mode 100644
index 65cd5394912..00000000000
--- a/pkgs/servers/openafs-client/replace-usrinclude
+++ /dev/null
@@ -1,42 +0,0 @@
-acinclude.m4
-config.guess
-configure
-configure-libafs
-src/libafs/MakefileProto.NBSD.in
-src/libafs/MakefileProto.HPUX.in
-src/libafs/MakefileProto.FBSD.in
-src/libafs/MakefileProto.OBSD.in
-src/libafs/MakefileProto.DFBSD.in
-src/libafs/MakefileProto.AIX.in
-src/libafs/MakefileProto.DARWIN.in
-src/libafs/MakefileProto.SOLARIS.in
-src/libafs/Makefile.common.in
-src/libafs/MakefileProto.IRIX.in
-src/WINNT/kfw/inc/krb4/conf.h
-src/JAVA/libjafs/Makefile.in
-src/splint.cfg
-src/util/vice.h
-src/cf/osconf.m4
-src/vfsck/dir.c
-src/vfsck/main.c
-src/vfsck/utilities.c
-src/vfsck/vprintf.c
-src/vfsck/pass2.c
-src/vfsck/inode.c
-src/afsweb/apache_includes/1.2/buff.h
-src/afsweb/apache_includes/1.2/conf.h
-src/afsweb/apache_includes/1.3.1/buff.h
-src/afsweb/apache_includes/1.3.1/ap_config.h
-src/afsweb/apache_includes/buff.h
-src/afsweb/apache_includes/1.3.6/buff.h
-src/afsweb/apache_includes/1.3.6/ap_config.h
-src/afsweb/apache_includes/conf.h
-src/des/conf.h
-src/tests/OpenAFS/errtrans.pm
-src/wsadmin.lib/rt_r4.generic
-src/wsadmin.lib/pmax_31.generic
-src/wsadmin.lib/rt_r4.generic.dkload
-src/libuafs/Makefile.common.in
-src/afs/afs.h
-src/afs/IRIX/osi_vfs.h
-src/lwp/process.s
diff --git a/pkgs/servers/openafs-client/replace-usrsrc b/pkgs/servers/openafs-client/replace-usrsrc
deleted file mode 100644
index 42f2c270952..00000000000
--- a/pkgs/servers/openafs-client/replace-usrsrc
+++ /dev/null
@@ -1,11 +0,0 @@
-acinclude.m4
-configure
-configure-libafs
-src/libafs/MakefileProto.NBSD.in
-src/tools/install/make_rpm_source
-src/tools/install/openafs-tools-cmd-1.2.5-1.spec
-src/tools/install/openafs-tools-cmd-1.2.2-1.spec
-src/config/make_vnode.pl
-src/config/linux-version
-src/wsadmin.lib/pmax_31.generic
-src/afs/OBSD/osi_vfsops.c

From 50a5f9f0e89d6c838a1b6fa1c57a44b08bec8648 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 13 Oct 2011 13:04:45 +0000
Subject: [PATCH 37/59] linux_3_0_powertop

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab0fc4ccb61..1c6cd5847d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5572,6 +5572,7 @@ let
       ];
   };
 
+  # Please keep in sync with linux_3_0_powertop, except for extraConfig
   linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5583,6 +5584,31 @@ let
       ];
   };
 
+  # Please keep in sync with linux_3_0, except for extraConfig
+  linux_3_0_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
+    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    extraConfig = ''
+        CPU_FREQ_GOV_ONDEMAND y
+        CPU_FREQ_STAT y
+        DEBUG_KERNEL y
+        HIGH_RES_TIMERS y
+        HPET_TIMER y
+        NO_HZ y
+        PM_ADVANCED_DEBUG y
+        PM_RUNTIME y
+        SND_AC97_POWER_SAVE y
+        TIMER_STATS y
+        USB_SUSPEND y
+    '';
+    kernelPatches =
+      [ #kernelPatches.fbcondecor_2_6_38
+        kernelPatches.sec_perm_2_6_24
+        kernelPatches.aufs3_0
+        #kernelPatches.aufs2_1_3_0
+        #kernelPatches.mips_restart_2_6_36
+      ];
+  };
+
   linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5740,6 +5766,7 @@ let
   linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39);
   linuxPackages_2_6_39_powertop = recurseIntoAttrs (linuxPackagesFor linux_2_6_39_powertop pkgs.linuxPackages_2_6_39_powertop);
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0);
+  linuxPackages_3_0_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_0_powertop pkgs.linuxPackages_3_0_powertop);
   linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1);
   linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
   linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);

From 1a54d4bbd64921ee36e46d45552f8c3eba06c449 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 13 Oct 2011 13:05:22 +0000
Subject: [PATCH 38/59] powertop: renamed inotify patch

svn path=/nixpkgs/trunk/; revision=29821
---
 pkgs/os-specific/linux/powertop/default.nix                     | 2 +-
 ..._USER-instead-of-CONFIG_INOTIFY.patch => inotify_user.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/os-specific/linux/powertop/{0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch => inotify_user.patch} (100%)

diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index 7c66556df29..ae23e165178 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   };
   patches = [
     ./powertop-1.13.patch
-    ./0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch
+    ./inotify_user.patch
   ];
   buildInputs = [ncurses gettext];
   meta = {
diff --git a/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch b/pkgs/os-specific/linux/powertop/inotify_user.patch
similarity index 100%
rename from pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch
rename to pkgs/os-specific/linux/powertop/inotify_user.patch

From 9d1255778313b9adc1a2f7f906aeb23a88377c82 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 13 Oct 2011 13:05:58 +0000
Subject: [PATCH 39/59] powertop: modprobe configs if /proc/config.gz is
 missing

svn path=/nixpkgs/trunk/; revision=29822
---
 pkgs/os-specific/linux/powertop/default.nix   |  1 +
 .../linux/powertop/modprobe_configs.patch     | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/os-specific/linux/powertop/modprobe_configs.patch

diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index ae23e165178..3d8ca36c3ed 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation {
   patches = [
     ./powertop-1.13.patch
     ./inotify_user.patch
+    ./modprobe_configs.patch
   ];
   buildInputs = [ncurses gettext];
   meta = {
diff --git a/pkgs/os-specific/linux/powertop/modprobe_configs.patch b/pkgs/os-specific/linux/powertop/modprobe_configs.patch
new file mode 100644
index 00000000000..3d6e2a28761
--- /dev/null
+++ b/pkgs/os-specific/linux/powertop/modprobe_configs.patch
@@ -0,0 +1,28 @@
+From 0002a70b83221a8a831d776836d13105ac886323 Mon Sep 17 00:00:00 2001
+From: Florian Friesdorf <flo@chaoflow.net>
+Date: Thu, 13 Oct 2011 14:57:02 +0200
+Subject: [PATCH] powertop tries to load configs, if /proc/config.gz is
+ missing
+
+---
+ config.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/config.c b/config.c
+index b2567f2..62ac978 100644
+--- a/config.c
++++ b/config.c
+@@ -44,6 +44,10 @@ static void read_kernel_config(void)
+ 	char filename[100];
+ 	if (configcount)
+ 		return;
++	if (access("/proc/config.gz", R_OK) != 0) {
++		file = popen("modprobe configs >/dev/null 2>&1", "r");
++		pclose(file);
++	}
+ 	if (access("/proc/config.gz", R_OK) == 0) {
+ 		file = popen("zcat /proc/config.gz 2> /dev/null", "r");
+ 		while (file && !feof(file)) {
+-- 
+1.7.6
+

From 41a5209ccff7586b29e06ff25f13e0675d164189 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 13 Oct 2011 13:51:33 +0000
Subject: [PATCH 40/59] linux_3_1_powertop

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c6cd5847d8..16015543ba7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5620,6 +5620,30 @@ let
       ];
   };
 
+  linux_3_1_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) {
+    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    extraConfig = ''
+        CPU_FREQ_GOV_ONDEMAND y
+        CPU_FREQ_STAT y
+        DEBUG_KERNEL y
+        HIGH_RES_TIMERS y
+        HPET_TIMER y
+        NO_HZ y
+        PM_ADVANCED_DEBUG y
+        PM_RUNTIME y
+        SND_AC97_POWER_SAVE y
+        TIMER_STATS y
+        USB_SUSPEND y
+    '';
+    kernelPatches =
+      [ #kernelPatches.fbcondecor_2_6_38
+        kernelPatches.sec_perm_2_6_24
+        kernelPatches.efi_stub
+        #kernelPatches.aufs2_1_2_6_38
+        #kernelPatches.mips_restart_2_6_36
+      ];
+  };
+
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages
@@ -5768,6 +5792,7 @@ let
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0);
   linuxPackages_3_0_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_0_powertop pkgs.linuxPackages_3_0_powertop);
   linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1);
+  linuxPackages_3_1_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_1_powertop pkgs.linuxPackages_3_1_powertop);
   linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
   linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
   linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);

From 2d511f724671ae33a291d17c10a1667d8ff1a755 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 13 Oct 2011 13:51:39 +0000
Subject: [PATCH 41/59] use override for powertop kernels

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16015543ba7..f9522366d50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5537,7 +5537,6 @@ let
 
   linux_2_6_38_ati = linux_2_6_38.override { extraConfig="DRM_RADEON_KMS y"; };
 
-  # Please keep in sync with linux_2_6_39_powertop, except for extraConfig
   linux_2_6_39 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.39.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5548,9 +5547,7 @@ let
       ];
   };
 
-  # Please keep in sync with linux_2_6_39, except for extraConfig
-  linux_2_6_39_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.39.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+  linux_2_6_39_powertop = linux_2_6_39.override {
     extraConfig = ''
         CPU_FREQ_GOV_ONDEMAND y
         CPU_FREQ_STAT y
@@ -5564,15 +5561,8 @@ let
         TIMER_STATS y
         USB_SUSPEND y
     '';
-    kernelPatches =
-      [ #kernelPatches.fbcondecor_2_6_38
-        kernelPatches.sec_perm_2_6_24
-        kernelPatches.aufs2_1_2_6_39
-        #kernelPatches.mips_restart_2_6_36
-      ];
   };
 
-  # Please keep in sync with linux_3_0_powertop, except for extraConfig
   linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5584,9 +5574,7 @@ let
       ];
   };
 
-  # Please keep in sync with linux_3_0, except for extraConfig
-  linux_3_0_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+  linux_3_0_powertop = linux_3_0.override {
     extraConfig = ''
         CPU_FREQ_GOV_ONDEMAND y
         CPU_FREQ_STAT y
@@ -5600,13 +5588,6 @@ let
         TIMER_STATS y
         USB_SUSPEND y
     '';
-    kernelPatches =
-      [ #kernelPatches.fbcondecor_2_6_38
-        kernelPatches.sec_perm_2_6_24
-        kernelPatches.aufs3_0
-        #kernelPatches.aufs2_1_3_0
-        #kernelPatches.mips_restart_2_6_36
-      ];
   };
 
   linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) {
@@ -5620,8 +5601,7 @@ let
       ];
   };
 
-  linux_3_1_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+  linux_3_1_powertop = linux_3_1.override {
     extraConfig = ''
         CPU_FREQ_GOV_ONDEMAND y
         CPU_FREQ_STAT y
@@ -5635,13 +5615,6 @@ let
         TIMER_STATS y
         USB_SUSPEND y
     '';
-    kernelPatches =
-      [ #kernelPatches.fbcondecor_2_6_38
-        kernelPatches.sec_perm_2_6_24
-        kernelPatches.efi_stub
-        #kernelPatches.aufs2_1_2_6_38
-        #kernelPatches.mips_restart_2_6_36
-      ];
   };
 
   /* Linux kernel modules are inherently tied to a specific kernel.  So

From b76071a0964c3a83f1ab2ed25fb01646e374bfb1 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 13 Oct 2011 13:51:46 +0000
Subject: [PATCH 42/59] remove redundant/conflicting config (y vs m) from
 powertop kernels

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9522366d50..4680183b84a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5549,15 +5549,9 @@ let
 
   linux_2_6_39_powertop = linux_2_6_39.override {
     extraConfig = ''
-        CPU_FREQ_GOV_ONDEMAND y
-        CPU_FREQ_STAT y
         DEBUG_KERNEL y
-        HIGH_RES_TIMERS y
-        HPET_TIMER y
-        NO_HZ y
         PM_ADVANCED_DEBUG y
         PM_RUNTIME y
-        SND_AC97_POWER_SAVE y
         TIMER_STATS y
         USB_SUSPEND y
     '';
@@ -5576,15 +5570,9 @@ let
 
   linux_3_0_powertop = linux_3_0.override {
     extraConfig = ''
-        CPU_FREQ_GOV_ONDEMAND y
-        CPU_FREQ_STAT y
         DEBUG_KERNEL y
-        HIGH_RES_TIMERS y
-        HPET_TIMER y
-        NO_HZ y
         PM_ADVANCED_DEBUG y
         PM_RUNTIME y
-        SND_AC97_POWER_SAVE y
         TIMER_STATS y
         USB_SUSPEND y
     '';
@@ -5603,15 +5591,9 @@ let
 
   linux_3_1_powertop = linux_3_1.override {
     extraConfig = ''
-        CPU_FREQ_GOV_ONDEMAND y
-        CPU_FREQ_STAT y
         DEBUG_KERNEL y
-        HIGH_RES_TIMERS y
-        HPET_TIMER y
-        NO_HZ y
         PM_ADVANCED_DEBUG y
         PM_RUNTIME y
-        SND_AC97_POWER_SAVE y
         TIMER_STATS y
         USB_SUSPEND y
     '';

From 69f3a67710a816927706698cef30154d4547c14b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Oct 2011 15:01:44 +0000
Subject: [PATCH 43/59] * Upstart updated to 1.3.

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

diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix
index fba83235475..4e440770ef9 100644
--- a/pkgs/os-specific/linux/upstart/default.nix
+++ b/pkgs/os-specific/linux/upstart/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus, libnih }:
 
 stdenv.mkDerivation rec {
-  name = "upstart-0.6.7";
+  name = "upstart-1.3";
   
   src = fetchurl {
-    url = "http://upstart.ubuntu.com/download/0.6/${name}.tar.gz";
-    sha256 = "1f1pds27cadi6ycii1fkn5bbs1brjqxa2b45wfn03ikc2azqxlr9";
+    url = "http://upstart.ubuntu.com/download/1.3/${name}.tar.gz";
+    md5 = "7820797b64878c27115fff6a7398a6a9";
   };
 
   buildInputs = [ pkgconfig dbus libnih ];

From 85c97efc50fd7d88e1e92273ba126ede9fb84a43 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Oct 2011 17:00:46 +0000
Subject: [PATCH 44/59] nbd: updated to version 2.9.24

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

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 28ca2f3d3ed..ef032eee390 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 let
-  name = "nbd-2.9.23";
+  name = "nbd-2.9.24";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "0ab44fe9e80c3f41bb1025ecda351a874affd46bf56ba4033ea03700c3b83803";
+    sha256 = "025cqsx6cwbr62javdvm5vx675ai0b1absbx4if1v5pp9hzrpxmq";
   };
 
   buildInputs = [pkgconfig glib];

From dbdcb3fad435fc531e0bfc71e1b93cc0ff5b0882 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 13 Oct 2011 18:30:55 +0000
Subject: [PATCH 45/59] powertop kernels: re-disable debug flags enabled by
 default

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4680183b84a..d4dc2123778 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5554,6 +5554,14 @@ let
         PM_RUNTIME y
         TIMER_STATS y
         USB_SUSPEND y
+        BACKTRACE_SELF_TEST n
+        CPU_NOTIFIER_ERROR_INJECT n
+        DEBUG_DEVRES n
+        DEBUG_NX_TEST n
+        DEBUG_STACK_USAGE n
+        DEBUG_STACKOVERFLOW n
+        RCU_TORTURE_TEST n
+        SCHEDSTATS n
     '';
   };
 
@@ -5575,6 +5583,14 @@ let
         PM_RUNTIME y
         TIMER_STATS y
         USB_SUSPEND y
+        BACKTRACE_SELF_TEST n
+        CPU_NOTIFIER_ERROR_INJECT n
+        DEBUG_DEVRES n
+        DEBUG_NX_TEST n
+        DEBUG_STACK_USAGE n
+        DEBUG_STACKOVERFLOW n
+        RCU_TORTURE_TEST n
+        SCHEDSTATS n
     '';
   };
 
@@ -5596,6 +5612,14 @@ let
         PM_RUNTIME y
         TIMER_STATS y
         USB_SUSPEND y
+        BACKTRACE_SELF_TEST n
+        CPU_NOTIFIER_ERROR_INJECT n
+        DEBUG_DEVRES n
+        DEBUG_NX_TEST n
+        DEBUG_STACK_USAGE n
+        DEBUG_STACKOVERFLOW n
+        RCU_TORTURE_TEST n
+        SCHEDSTATS n
     '';
   };
 

From dbdfb3d11cb6ea5f3cc5d5ea776d703d51827ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 14 Oct 2011 07:47:20 +0000
Subject: [PATCH 46/59] Adding cbrowser. Have cscope on the path to use it
 (which you should already have, because otherwise how would you have created
 the database for cbrowser?)

svn path=/nixpkgs/trunk/; revision=29831
---
 .../misc/cbrowser/backslashes-quotes.diff     | 49 +++++++++++++++++++
 .../tools/misc/cbrowser/default.nix           | 34 +++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 85 insertions(+)
 create mode 100644 pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
 create mode 100644 pkgs/development/tools/misc/cbrowser/default.nix

diff --git a/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff b/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
new file mode 100644
index 00000000000..cc42f0745da
--- /dev/null
+++ b/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
@@ -0,0 +1,49 @@
+Based on this:
+http://sourceforge.net/tracker/?func=detail&aid=1493886&group_id=5152&atid=305152
+fix the infinite loops in quote highlight - ID: 1493886
+
+--- cbrowser-0.8-2/ftcllib.tcl	2000-07-04 01:17:43.000000000 +0200
++++ cbrowser-0.8/ftcllib.tcl	2006-05-24 00:39:18.833762522 +0200
+@@ -1290,13 +1290,39 @@
+   foreach {start end} [concat 1.0 [$widget tag ranges comment] end] {
+ 
+     while {[set temp [$widget search -regexp -- $pattern $start $end]] != ""} {
++      set startquote [$widget index "$temp + 1chars"]
+ 
+-      set endquote [$widget search -regexp -- {[^\\]\"} "$temp + 1chars" $end]
++      set temp [$widget index "$startquote + 1chars"]
++      while {1==1} {
++        set endquote [$widget search -regexp -- {\"} $temp $end]
++
++	# The program will not break if a /*C comment*/ is between C quotes.
++	if { $endquote == "" } {
++	  set endquote $startquote
++	  break
++	}
++
++        # look for double backslashes
++	if {[set temp2 [$widget search -regexp -- {\\\\} $temp $endquote]] != ""} {
++	  set temp "$temp2 + 2chars"
++	  continue
++	}
++        
++        # look for \"
++	if {[set temp2 [$widget search -regexp -- {\\\"} $temp $endquote]] != ""} {
++	  set temp "$temp2 + 2chars"
++	  continue
++	}
++
++	break
++      }
+ 
+       if {[strlen $endquote] > 0} {
+-        set start [$widget index "$endquote + 2chars"]
++        set start [$widget index "$endquote + 1chars"]
+ 
+-        $widget tag add quote "$temp + 1chars" $start
++        $widget tag add quote $startquote $start
++      } else {
++        set start [$widget index "$start + 1chars"]
+       }
+     }
+   }
diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix
new file mode 100644
index 00000000000..50dc907a780
--- /dev/null
+++ b/pkgs/development/tools/misc/cbrowser/default.nix
@@ -0,0 +1,34 @@
+{ fetchurl, stdenv, cscope, tk, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "cbrowser-0.8";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cbrowser/cbrowser-0.8.tar.gz";
+    sha256 = "1050mirjab23qsnq3lp3a9vwcbavmh9kznzjm7dr5vkx8b7ffcji";
+  };
+
+  patches = [ ./backslashes-quotes.diff ];
+
+  buildInputs = [ tk makeWrapper ];
+
+  installPhase = ''
+    ensureDir $out/bin $out/share/${name}
+    cp -R * $out/share/${name}/
+
+    makeWrapper $out/share/${name}/cbrowser $out/bin/cbrowser \
+      --prefix PATH : ${tk}/bin
+  '';
+
+  meta = {
+    description = "Tcl/Tk GUI front-end to cscope";
+
+    license = "GPLv2+";
+
+    homepage = http://sourceforge.net/projects/cbrowser/;
+
+    maintainers = with stdenv.lib.maintainers; [viric];
+
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4dc2123778..1551ff9aba1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2764,6 +2764,8 @@ let
 
   byacc = callPackage ../development/tools/parsing/byacc { };
 
+  cbrowser = callPackage ../development/tools/misc/cbrowser { };
+
   ccache = callPackage ../development/tools/misc/ccache { };
 
   complexity = callPackage ../development/tools/misc/complexity { };

From 7a2cb5bc64fb5d415cddc4d58d676700db776fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 14 Oct 2011 07:55:02 +0000
Subject: [PATCH 47/59] Updating dmenu

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

diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index 2a55512ff26..32af65f924a 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libX11, libXinerama}:
 
 stdenv.mkDerivation rec {
-  name = "dmenu-4.4";
+  name = "dmenu-4.4.1";
 
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "016hfnmk4kb2n3slxrg4z27p2l8x1awqsig961syssw4p1zybpav";
+    sha256 = "0l25vdnzlslk0r4m6hjkzxdygh3wpq04b9mr8zc9h3b1md2icr3d";
   };
 
   buildInputs = [ libX11 libXinerama ];

From d6e22c9b4a7151435986a484d780c339a10cb999 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 14 Oct 2011 09:47:30 +0000
Subject: [PATCH 48/59] python26Full and explicit python27Full

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1551ff9aba1..63579d4519e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2586,8 +2586,16 @@ let
     sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
   };
 
-  pythonFull = callPackage ../development/interpreters/python/wrapper.nix {
-    extraLibs = lib.attrValues python.modules;
+  pythonFull = python27Full;
+
+  python26Full = callPackage ../development/interpreters/python/wrapper.nix {
+    extraLibs = lib.attrValues python26.modules;
+    python = python26;
+  };
+
+  python27Full = callPackage ../development/interpreters/python/wrapper.nix {
+    extraLibs = lib.attrValues python27.modules;
+    python = python27;
   };
 
   pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { };

From d2b089cc0bbd2fb10961d1cbc41d9f6796ccb4e6 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 14 Oct 2011 10:30:14 +0000
Subject: [PATCH 49/59] notmuch - simplify expression

svn path=/nixpkgs/trunk/; revision=29834
---
 .../mailreaders/notmuch/default.nix           | 92 +++++++------------
 1 file changed, 33 insertions(+), 59 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index a9456a30ecc..dcaaf01c336 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -10,66 +10,40 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian ];
 
-  # XXX: Make me a loop
   patchPhase = ''
-    # substituteInPlace "test/atomicity" \
-    #   --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/aggregate-results.sh" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/author-order" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/basic" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/crypto" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/dump-restore" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/emacs" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/emacs-large-search-buffer" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/encoding" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/from-guessing" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/json" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/long-id" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/maildir-sync" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/new" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/notmuch-test" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/raw" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/reply" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/search" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/search-by-folder" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/search-insufficient-from-quoting" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/search-folder-coherence" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/search-output" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/search-position-overlap-bug" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/symbol-hiding" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/test-lib.sh" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/test-verbose" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/thread-naming" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/thread-order" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
-    substituteInPlace "test/uuencode" \
-      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+    (cd test && for prg in \
+        aggregate-results.sh \
+        author-order \
+        basic \
+        crypto \
+        dump-restore \
+        emacs \
+        emacs-large-search-buffer \
+        encoding \
+        from-guessing \
+        json \
+        long-id \
+        maildir-sync \
+        new \
+        notmuch-test \
+        raw \
+        reply \
+        search \
+        search-by-folder \
+        search-insufficient-from-quoting \
+        search-folder-coherence \
+        search-output \
+        search-position-overlap-bug \
+        symbol-hiding \
+        test-lib.sh \
+        test-verbose \
+        thread-naming \
+        thread-order \
+        uuencode \
+    ;do
+      substituteInPlace "$prg" \
+        --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+    done)
   '';
 
   postBuild = ''

From 1fc00185f498704af62eb33c392bac559ca4a918 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 14 Oct 2011 13:24:55 +0000
Subject: [PATCH 50/59] Updated Axis2 to version 1.6.1

svn path=/nixpkgs/trunk/; revision=29836
---
 pkgs/servers/http/tomcat/axis2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
index 66e0f78f5ca..0208420d132 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, apacheAnt, jdk, unzip}:
 
 stdenv.mkDerivation {
-  name = "axis2-1.5.4";
+  name = "axis2-1.6.1";
 
   src = fetchurl {
-    url = http://apache.mirror.easycolocate.nl/axis/axis2/java/core/1.5.4/axis2-1.5.4-bin.zip;
-    sha256 = "0mqnsj14g8aqmh3gjxgys6kwa7q8jkjgczb0hlcr4v2par0hdfng";
+    url = http://apache.mirror.versatel.nl//axis/axis2/java/core/1.6.1/axis2-1.6.1-bin.zip;
+    sha256 = "1a0p85qh9924dv3y7zivf62hy1jzdaxnndqh93g6lndmacfhkk64";
   };
 
   buildInputs = [ unzip apacheAnt jdk ];

From 39df2ce05ed7d703b55e4bd262099e2527c059f1 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Fri, 14 Oct 2011 14:00:50 +0000
Subject: [PATCH 51/59] Add yaml - Yet Another JSON Library

svn path=/nixpkgs/trunk/; revision=29837
---
 pkgs/development/libraries/yajl/default.nix | 23 +++++++++++++++++++++
 pkgs/lib/licenses.nix                       |  6 ++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/yajl/default.nix

diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix
new file mode 100644
index 00000000000..05f2919b7cf
--- /dev/null
+++ b/pkgs/development/libraries/yajl/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, cmake, ruby}:
+
+stdenv.mkDerivation {
+  name = "yajl-2.0.1";
+
+  src = fetchurl {
+    url = http://github.com/lloyd/yajl/tarball/2.0.1;
+    name = "yajl-2.0.1.tar.gz";
+    sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2";
+  };
+
+  buildInputs = [ cmake ruby ];
+
+  meta = {
+    description = "Yet Another JSON Library";
+    longDescription = ''
+      YAJL is a small event-driven (SAX-style) JSON parser written in ANSI
+      C, and a small validating JSON generator.
+    '';
+    homepage = http://lloyd.github.com/yajl/;
+    license = stdenv.lib.license.isc;
+  };
+}
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 293bf59ec5d..edfa057be7b 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -82,6 +82,12 @@
     url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
   };
 
+  isc = {
+    shortName = "ISC";
+    fullName = "Internet Systems Consortium License";
+    url = http://www.opensource.org/licenses/ISC;
+  };
+
   ipl10 = {
     shortName = "IPL 1.0";
     fullName = "IBM Public License Version 1.0";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63579d4519e..b5fae908580 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4640,6 +4640,8 @@ let
 
   xvidcore = callPackage ../development/libraries/xvidcore { };
 
+  yajl = callPackage ../development/libraries/yajl { };
+
   zangband = builderDefsPackage (import ../games/zangband) {
     inherit ncurses flex bison autoconf automake m4 coreutils;
   };

From c8e061945cfeacb9cb0366f3ef6afadccadeda73 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Fri, 14 Oct 2011 14:14:36 +0000
Subject: [PATCH 52/59] yajl: enable Hydra build

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

diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix
index 05f2919b7cf..cedc9cd5810 100644
--- a/pkgs/development/libraries/yajl/default.nix
+++ b/pkgs/development/libraries/yajl/default.nix
@@ -19,5 +19,9 @@ stdenv.mkDerivation {
     '';
     homepage = http://lloyd.github.com/yajl/;
     license = stdenv.lib.license.isc;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [
+      z77z
+    ];
   };
 }

From c8529df9a9228c3c56b9b4713282f3db9f82f6a2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Oct 2011 17:26:12 +0000
Subject: [PATCH 53/59] haskell-Hipmunk: updated to version 5.2.0.4

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

diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index d1fb880ed1f..ab3fe660cfa 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Hipmunk";
-  version = "5.2.0.3";
-  sha256 = "1as00372hz0ngy6pc5l0w7qgw5flcyag07zk3dxkbj5kv24xk49m";
+  version = "5.2.0.4";
+  sha256 = "0sa0a4hg0xp8l64dy8hnfkhvy2miv79b5550v8gkvrbqcci0qfay";
   buildDepends = [ StateVar transformers ];
   noHaddock = true;
   meta = {

From e0528d4078beaad1f61250260434eb480286a010 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Oct 2011 17:26:16 +0000
Subject: [PATCH 54/59] haskell-asn1-data: updated to version 0.6.1

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

diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix
index 73ee535f959..6337ab40890 100644
--- a/pkgs/development/libraries/haskell/asn1-data/default.nix
+++ b/pkgs/development/libraries/haskell/asn1-data/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "asn1-data";
-  version = "0.6.0";
-  sha256 = "0gk34x2frkk2s7d0i7ahwnjv9jcqdgx2sd1kp3d854548k171z3f";
+  version = "0.6.1";
+  sha256 = "1kj1h1z4ix8kdxq5838xk70sgz9rq0vdii5nli1rcycx3y2ipi84";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 65d9c62ac8d5fe4715d9678ebe6107eff15f7302 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Oct 2011 17:26:22 +0000
Subject: [PATCH 55/59] haskell-certificate: updated to version 0.9.4

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

diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
index 09d44e07222..94a9e6fb17a 100644
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ b/pkgs/development/libraries/haskell/certificate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "certificate";
-  version = "0.9.3";
-  sha256 = "1gg26d1arf588zjhdzs8r26k40v6m679l8k2vw28l8j3q5m11p71";
+  version = "0.9.4";
+  sha256 = "0apv2paxlp12ksn28bn4lb1mg05cs7sjygfarxacwmz43jy6ld9v";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ asn1Data base64Bytestring mtl time ];

From c7aca7221ba1b6b52f3d92a5a84913a614187cba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Oct 2011 17:26:27 +0000
Subject: [PATCH 56/59] haskell-http-enumerator: updated to version 0.7.1.2

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

diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix
index 5aa02f5dea4..8b868d15a82 100644
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-enumerator";
-  version = "0.7.1.1";
-  sha256 = "0b26gvwpnv851x1v5qix7mp0wliff9klqc2pfp2ig54l77s15y36";
+  version = "0.7.1.2";
+  sha256 = "1jxy017vhmzwq4480r6g45mg3x1d48zckbcyqhsk40bw5i32dfmv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From e4199791316a41ee0c02c8ae3dac9e4862f44baa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Oct 2011 17:26:32 +0000
Subject: [PATCH 57/59] haskell-tls: updated to version 0.8.1

svn path=/nixpkgs/trunk/; revision=29843
---
 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 ad5e80b2be9..de1027dbef1 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.8.0";
-  sha256 = "05c7bizwkwcp83idsa5cjb53lvm9f44iaypp9yiqv4ly9q3h315q";
+  version = "0.8.1";
+  sha256 = "1qgjzsp9f0mrkwrqzs69279q1dkz72hpazq6qp49p2xfsfzdp7dj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From b27823bfaca9c9b5777e8f6acd4ca7c3715e3173 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Oct 2011 17:26:38 +0000
Subject: [PATCH 58/59] haskell-cpphs: updated to version 1.13.2

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

diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 702c88d2ddb..620cb8149a2 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cpphs";
-  version = "1.13.1";
-  sha256 = "0k5p9gqnalll3w1962dwydnygk25h777bic2gvdh8i8hhyz5fsx2";
+  version = "1.13.2";
+  sha256 = "1q3pzfcgrl9nka1gdl84c4fqc1ql83idlbb8fghqsjp0ijzcxk3s";
   isLibrary = true;
   isExecutable = true;
   meta = {

From c7cea676ce58f7c0ecb45c612492c1127d9d6962 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 14 Oct 2011 18:04:34 +0000
Subject: [PATCH 59/59] add disper

svn path=/nixpkgs/trunk/; revision=29845
---
 pkgs/tools/misc/disper/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/misc/disper/default.nix

diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix
new file mode 100644
index 00000000000..cc11427f65a
--- /dev/null
+++ b/pkgs/tools/misc/disper/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, python}:
+
+stdenv.mkDerivation rec {
+  name = "disper-0.3.0";
+
+  buildInputs = [python];
+
+  preConfigure = ''
+    export makeFlags="PREFIX=$out"
+  '';
+
+  src = fetchurl {
+    url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.0.tar.gz;
+    sha256 = "1mfqidm5c89nknzksabqgjygdp57xpszz7hy2dxh39hpgrsk3l58";
+  };
+
+  meta = {
+    description = "Disper is an on-the-fly display switch utility.";
+    homepage = http://willem.engen.nl/projects/disper/;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5fae908580..d33ba31d5c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -581,6 +581,8 @@ let
 
   dirmngr = callPackage ../tools/security/dirmngr { };
 
+  disper = callPackage ../tools/misc/disper { };
+
   dmg2img = callPackage ../tools/misc/dmg2img { };
 
   docbook2x = callPackage ../tools/typesetting/docbook2x {