From 39ba8d06ec1341ee9203e7eaba8aac2afc9db8a9 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 9 Apr 2009 14:29:19 +0000
Subject: [PATCH 01/50] pkgs/build-support/vm/default.nix: added ubuntu 904

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

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 42bc2f5652d..82f69e2afaa 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -817,7 +817,7 @@ rec {
       };
       urlPrefix = mirror://ubuntu;
     } // args);
-         
+ 
     ubuntu810x86_64 = args: makeImageFromDebDist ({
       name = "ubuntu-8.10-intrepid-amd64";
       fullName = "Ubuntu 8.10 Intrepid (amd64)";
@@ -827,7 +827,27 @@ rec {
       };
       urlPrefix = mirror://ubuntu;
     } // args);
-         
+
+    ubuntu904i386 = args: makeImageFromDebDist ({
+      name = "ubuntu-8.10-jaunty-i386";
+      fullName = "Ubuntu 8.10 Jaunty (i386)";
+      packagesList = fetchurl {
+        url = mirror://ubuntu/dists/jaunty/main/binary-i386/Packages.bz2;
+        sha256 = "7a82d30716a96a98eaa56843f3dfc1a0e706f26c9ea2e1d1dc1cbaadfa352e1f";
+      };
+      urlPrefix = mirror://ubuntu;
+    } // args);
+ 
+    ubuntu904x86_64 = args: makeImageFromDebDist ({
+      name = "ubuntu-8.10-jaunty-amd64";
+      fullName = "Ubuntu 8.10 Jaunty (amd64)";
+      packagesList = fetchurl {
+        url = mirror://ubuntu/dists/jaunty/main/binary-amd64/Packages.bz2;
+        sha256 = "794e080413580f6b94318d495672c8f7e54cf087d08d1fd748a612da0f2e4538";
+      };
+      urlPrefix = mirror://ubuntu;
+    } // args);
+
     debian40i386 = args: makeImageFromDebDist ({
       name = "debian-4.0r7-etch-i386";
       fullName = "Debian 4.0r7 Etch (i386)";
@@ -998,6 +1018,8 @@ rec {
     ubuntu804x86_64 = diskImageFuns.ubuntu804x86_64 { packages = commonDebianPackages; };
     ubuntu810i386 = diskImageFuns.ubuntu810i386 { packages = commonDebianPackages; };
     ubuntu810x86_64 = diskImageFuns.ubuntu810x86_64 { packages = commonDebianPackages; };
+    ubuntu904i386 = diskImageFuns.ubuntu904i386 { packages = commonDebianPackages; };
+    ubuntu904x86_64 = diskImageFuns.ubuntu904x86_64 { packages = commonDebianPackages; };
     debian40i386 = diskImageFuns.debian40i386 { packages = commonDebianPackages; };
     debian40x86_64 = diskImageFuns.debian40x86_64 { packages = commonDebianPackages; };
     debian50i386 = diskImageFuns.debian50i386 { packages = commonDebianPackages; };

From 518eab2313267e63401c87ed9848d46bef420ecf Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 9 Apr 2009 14:38:08 +0000
Subject: [PATCH 02/50] pkgs/build-support/vm/default.nix typo

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

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 82f69e2afaa..f7058277120 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -829,8 +829,8 @@ rec {
     } // args);
 
     ubuntu904i386 = args: makeImageFromDebDist ({
-      name = "ubuntu-8.10-jaunty-i386";
-      fullName = "Ubuntu 8.10 Jaunty (i386)";
+      name = "ubuntu-9.04-jaunty-i386";
+      fullName = "Ubuntu 9.04 Jaunty (i386)";
       packagesList = fetchurl {
         url = mirror://ubuntu/dists/jaunty/main/binary-i386/Packages.bz2;
         sha256 = "7a82d30716a96a98eaa56843f3dfc1a0e706f26c9ea2e1d1dc1cbaadfa352e1f";
@@ -839,8 +839,8 @@ rec {
     } // args);
  
     ubuntu904x86_64 = args: makeImageFromDebDist ({
-      name = "ubuntu-8.10-jaunty-amd64";
-      fullName = "Ubuntu 8.10 Jaunty (amd64)";
+      name = "ubuntu-9.04-jaunty-amd64";
+      fullName = "Ubuntu 9.04 Jaunty (amd64)";
       packagesList = fetchurl {
         url = mirror://ubuntu/dists/jaunty/main/binary-amd64/Packages.bz2;
         sha256 = "794e080413580f6b94318d495672c8f7e54cf087d08d1fd748a612da0f2e4538";

From 415150d99ca499b07da810666097edcde0402241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 10 Apr 2009 09:42:22 +0000
Subject: [PATCH 03/50] Adding panomatic.

svn path=/nixpkgs/trunk/; revision=14981
---
 pkgs/tools/graphics/panomatic/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 ++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/graphics/panomatic/default.nix

diff --git a/pkgs/tools/graphics/panomatic/default.nix b/pkgs/tools/graphics/panomatic/default.nix
new file mode 100644
index 00000000000..1a7c3317cf9
--- /dev/null
+++ b/pkgs/tools/graphics/panomatic/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, boost, zlib}:
+
+stdenv.mkDerivation {
+  name = "panomatic-0.9.4";
+
+  src = fetchurl {
+    url = http://aorlinsk2.free.fr/panomatic/bin/panomatic-0.9.4-src.tar.bz2;
+    sha256 = "0vfkj3k3y8narwwijh996q2zzprjxbr2fhym15nm4fkq14yw4wwn";
+  };
+
+  buildInputs = [ boost zlib ];
+
+  meta = {
+    homepage = http://aorlinsk2.free.fr/panomatic/;
+    description = "Tool that automates the creation of control points in Hugin";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d1471f3124..17c2b95f975 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1068,6 +1068,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  panomatic = import ../tools/graphics/panomatic {
+    inherit fetchurl stdenv boost zlib;
+  };
+
   par2cmdline = import ../tools/networking/par2cmdline {
     inherit fetchurl stdenv;
   };

From d52ec14cb441191b1785a8c6b4004cb3caca811d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 10 Apr 2009 15:36:55 +0000
Subject: [PATCH 04/50] Updating the kqemu src url.

svn path=/nixpkgs/trunk/; revision=14982
---
 pkgs/os-specific/linux/kqemu/1.3.0pre11.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
index d2f26cab8a3..f3bfe1a5c7b 100644
--- a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
+++ b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
@@ -2,7 +2,7 @@ args : with args;
 rec {
   name = "kqemu-"+version;
   src = fetchurl {
-    url = http://bellard.org/qemu/kqemu-1.3.0pre11.tar.gz;
+    url = http://www.nongnu.org/qemu/kqemu-1.3.0pre11.tar.gz;
     sha256 = "03svg2x52ziglf9r9irf6ziiz8iwa731fk1mdskwdip5jxbyy6jl";
   };
 

From e5831a409f611ce0342cfd0cfcfff0db72d9a467 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 12 Apr 2009 08:42:04 +0000
Subject: [PATCH 05/50] Updated mrxvt

svn path=/nixpkgs/trunk/; revision=14993
---
 pkgs/applications/misc/mrxvt/default.nix | 30 +++++++++++++++++++-----
 pkgs/top-level/all-packages.nix          |  5 ++--
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix
index 346ae2b50cd..e7d83fd828e 100644
--- a/pkgs/applications/misc/mrxvt/default.nix
+++ b/pkgs/applications/misc/mrxvt/default.nix
@@ -1,19 +1,37 @@
 args: with args;
 stdenv.mkDerivation {
 
-  name = "mrxvt-0.5.3";
+  name = "mrxvt-0.5.4";
 
-  buildInputs = [libX11];
+  buildInputs = [libX11 libXft libXi inputproto libSM libICE
+    freetype pkgconfig which];
 
-  configureFlags="--with-x";
+  configureFlags=[
+    "--with-x"
+    "--enable-frills"
+    "--enable-xft"
+    "--enable-xim"
+    # "--with-term=xterm"
+    "--with-max-profiles=100"
+    "--with-max-term=100"
+    "--with-save-lines=10000"
+  ];
+
+  preConfigure=''
+    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2";
+  '';
 
   src = fetchurl {
-    url = mirror://sourceforge/materm/mrxvt-0.5.3.tar.gz;
-    sha256 = "04flnn58hp4qvvk6jzyipsj13v1qyrjabgbw5laz5cqxvxzpncp2";
+    url = mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz;
+    sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl";
   };
 
   meta = { 
-    description = "multitabbed lightweight terminal emulator basd on rxvt supporting transparency, backgroundimages, freetype fonts,..";
+    description = "lightweight multitabbed feature-rich X11 terminal emulator";
+    longDescription = "
+    	Multitabbed lightweight terminal emulator based on rxvt. 
+	Supports transparency, backgroundimages, freetype fonts,..
+    ";
     homepage = http://sourceforge.net/projects/materm;
     license = "GPL";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17c2b95f975..1274e5148f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8589,8 +8589,9 @@ let
     };
 
   mrxvt = import ../applications/misc/mrxvt {
-    inherit lib fetchurl stdenv;
-    inherit (xlibs) libXaw xproto libXt libX11 libSM libICE;
+    inherit lib fetchurl stdenv freetype pkgconfig which;
+    inherit (xlibs) libXaw xproto libXt libX11 libSM libICE libXft
+      libXi inputproto;
   };
 
   multisync = import ../applications/misc/multisync {

From 3f01bd4b06cd05981e7aa749296f642d3a78c7f9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 12 Apr 2009 15:51:58 +0000
Subject: [PATCH 06/50] Added krusader for KDE4

svn path=/nixpkgs/trunk/; revision=14995
---
 pkgs/desktops/kde-4.2/default.nix                    |  6 ++++++
 pkgs/desktops/kde-4.2/extragear/krusader/default.nix | 10 ++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.2/extragear/krusader/default.nix

diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix
index 7b444690e40..7e059f44855 100644
--- a/pkgs/desktops/kde-4.2/default.nix
+++ b/pkgs/desktops/kde-4.2/default.nix
@@ -191,6 +191,12 @@ rec {
     inherit automoc4 phonon;
   };
   
+  krusader = import ./extragear/krusader {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
+    inherit kdelibs;
+    inherit automoc4 phonon;
+  };
+  
   ktorrent = import ./extragear/ktorrent {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp taglib boost gettext;
     inherit kdelibs kdepimlibs kdebase_workspace;
diff --git a/pkgs/desktops/kde-4.2/extragear/krusader/default.nix b/pkgs/desktops/kde-4.2/extragear/krusader/default.nix
new file mode 100644
index 00000000000..35933a01523
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/extragear/krusader/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "krusader-2.0.0";
+  src = fetchurl {
+    url = mirror://sourceforge/krusader/krusader-2.0.0.tar.gz;
+    sha256 = "dc74c47d6eaf1c28165a74750e5a1b0341fa1c0d436658d0d5f85a6149f4852c";
+  };
+  buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ];
+}

From c6553fcd3d2bba18c7bacf68c49651654be0dc2e Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 12 Apr 2009 15:52:35 +0000
Subject: [PATCH 07/50] Added krusader to the build farm

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1274e5148f8..a11762b4113 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7212,9 +7212,9 @@ let
     };
 
     # Broken build, still. The install step fails, and I never tried to run that compiled.
-    virtualbox = import ../applications/virtualization/virtualbox/2.1.2.nix {
+    virtualbox = import ../applications/virtualization/virtualbox/2.2.0.nix {
       inherit stdenv fetchurl iasl dev86 libxslt libxml2 qt3 qt4 SDL hal
-          libcap libpng zlib kernel;
+          libcap libpng zlib kernel python;
       inherit (gtkLibs) glib;
       inherit (xlibs) xproto libX11 libXext libXcursor;
       inherit (gnome) libIDL;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 34c31f56942..31a06ff713c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -351,6 +351,7 @@ in {
     kdewebdev = linux;
     ktorrent = linux;
     kdesvn = linux;
+    krusader = linux;
   };
 
   kernelPackages_2_6_26 = {

From 6c3c5448d671b97660b0f758aa39b10dd3ee454b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 12 Apr 2009 16:08:13 +0000
Subject: [PATCH 08/50] Upgraded kile to 2.0.3

svn path=/nixpkgs/trunk/; revision=14997
---
 pkgs/applications/editors/kile/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index 1f8f73f3b74..51c58c11cf8 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -1,12 +1,21 @@
-{stdenv, fetchurl, perl, arts, qt, kdelibs, libX11, libXt, libXext, libXrender, libXft, zlib, libpng, libjpeg, freetype, expat }:
+{stdenv, fetchurl, perl, arts, qt, kdelibs,
+ libX11, libXt, libXext, libXrender, libXft,
+ zlib, libpng, libjpeg, freetype, expat }:
 
 stdenv.mkDerivation {
-  name = "kile-2.0";
+  name = "kile-2.0.3";
 
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/kile/kile-2.0.tar.bz2;
-    sha256 = "14a7e4605a3ee486b9a7c11e9bd3236bdbd34955d5522eac5da1e511dea6c7e2";
+    url = mirror://sourceforge/kile/kile-2.0.3.tar.bz2;
+    md5 = "f0296547d3e916dd385e0b8913918852";
   };
 
-  buildInputs = [ perl arts qt kdelibs libX11 libXt libXext libXrender libXft zlib libpng libjpeg freetype expat ];
+  buildInputs = [ perl arts qt kdelibs libX11 libXt libXext libXrender libXft
+                  zlib libpng libjpeg freetype expat ];
+
+  meta = {
+    description = "An integrated LaTeX editor for KDE";
+    homepage = http://kile.sourceforge.net;
+    license = "GPLv2";
+  };
 }

From 74a6563fa11bff1fd1c2cf67bae5c792cb1a8de2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 12 Apr 2009 16:11:04 +0000
Subject: [PATCH 09/50] Added kile to buildfarm

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 31a06ff713c..685efe2c430 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -163,6 +163,7 @@ in {
   kbd = linux;
   kcachegrind = linux;
   keen4 = ["i686-linux"];
+  kile = linux;
   klibc = linux;
   ktorrent = linux;
   kvm = linux;

From db2d658c41ccc85104dbc0c86a7f91be0eacfddd Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 12 Apr 2009 16:54:10 +0000
Subject: [PATCH 10/50] Updated konversation to version 1.1

svn path=/nixpkgs/trunk/; revision=14999
---
 .../networking/irc/konversation/default.nix      | 16 +++++++++-------
 pkgs/top-level/all-packages.nix                  |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 0e200482834..3cce3f02cfe 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,16 +1,18 @@
-{stdenv, fetchurl, libX11, libXt, libXext, arts, qt, kdelibs, zlib, libpng, libjpeg, perl, expat}:
+{stdenv, fetchurl, libX11, libXt, libXext, libXrender, libXft,
+ arts, qt, kdelibs, zlib, libpng, libjpeg, perl, expat}:
 
 stdenv.mkDerivation {
-  name = "konversation-1.0.1";
+  name = "konversation-1.1";
   src = fetchurl {
-    url = http://download.berlios.de/konversation/konversation-1.0.1.tar.bz2;
-    sha256 = "8be736289c52c21fe5ada7dd153767abd5155424a510ab9781b9d2f585cc00fd";
+    url = http://download.berlios.de/konversation/konversation-1.1.tar.bz2;
+    sha256 = "3ef15e7a46c10a11aa369ff80dd33b3e2feb54834dfc036d3609c1ed94476d33";
   };
-  buildInputs = [arts qt kdelibs libX11 libXt libXext zlib libpng libjpeg perl expat];
-  postConfigure = '' for i in `find . -name Makefile`; do echo $i; sed -i -e "s|-L/usr/lib||g" -e "s|\-R \$(x_libraries)||g" $i; done '';
+  buildInputs = [ arts qt kdelibs libX11 libXt libXext libXrender libXft
+                  zlib libpng libjpeg perl expat ];
 
   meta = {
+    description = "An IRC client for KDE";
     homepage = http://www.konversation.org;
-    license = "GPL";
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a11762b4113..d8877129096 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8476,7 +8476,7 @@ let
 
   konversation = import ../applications/networking/irc/konversation {
     inherit fetchurl stdenv perl arts kdelibs zlib libpng libjpeg expat;
-    inherit (xlibs) libX11 libXt libXext;
+    inherit (xlibs) libX11 libXt libXext libXrender libXft;
     qt = qt3;
   };
 

From 7ce7e06811312393a4d99774af942c4e5747b4a9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 12 Apr 2009 16:54:42 +0000
Subject: [PATCH 11/50] Added konversation to buildfarm

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 685efe2c430..b7392fdff73 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -165,6 +165,7 @@ in {
   keen4 = ["i686-linux"];
   kile = linux;
   klibc = linux;
+  konversation = linux;
   ktorrent = linux;
   kvm = linux;
   less = all;

From 3d5d7388955f46c8773dc3a5cea03447b5f38967 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 12 Apr 2009 19:34:20 +0000
Subject: [PATCH 12/50] Added Gajim XMPP client in nearly full-feature
 configuration with all dependencies

svn path=/nixpkgs/trunk/; revision=15001
---
 .../instant-messengers/gajim/default.nix      | 36 +++++++++++++++++++
 .../python-modules/dbus/default.nix           | 29 +++++++++++++++
 .../python-modules/libsexy/default.nix        | 32 +++++++++++++++++
 .../python-modules/pygtk/default.nix          |  7 ++--
 .../python-modules/pyopenssl/default.nix      | 26 ++++++++++++++
 .../tools/documentation/docutils/default.nix  | 27 ++++++++++++++
 pkgs/top-level/all-packages.nix               | 35 ++++++++++++++++++
 7 files changed, 190 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/gajim/default.nix
 create mode 100644 pkgs/development/python-modules/dbus/default.nix
 create mode 100644 pkgs/development/python-modules/libsexy/default.nix
 create mode 100644 pkgs/development/python-modules/pyopenssl/default.nix
 create mode 100644 pkgs/development/tools/documentation/docutils/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
new file mode 100644
index 00000000000..d9f19a375a0
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -0,0 +1,36 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.12.1" a; 
+  buildInputs = with a; [
+    python pyGtkGlade gtk perl intltool dbus gettext
+    pkgconfig makeWrapper libglade pyopenssl libXScrnSaver
+    libXt xproto libXext xextproto libX11 gtkspell aspell
+    scrnsaverproto pycrypto pythonDBus pythonSexy 
+    docutils
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://www.gajim.org/downloads/gajim-${version}.tar.gz";
+    sha256 = "1iglh0i819m1a8qjkbyv2ydzbzhjgnaxyyq1jnikrwlbah5mjpbv";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  preConfigure = a.FullDepEntry (''
+    export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pyGtkGlade})/gtk-2.0"
+    export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pygobject})/gtk-2.0"
+    sed -e '/-L[$]x_libraries/d' -i configure
+  '') ["addInputs" "doUnpack"];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall" "wrapBinContentsPython"];
+
+  name = "gajim-" + version;
+  meta = {
+    description = "Jabber client with meta-contacts";
+  };
+}
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
new file mode 100644
index 00000000000..167f1f471ee
--- /dev/null
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -0,0 +1,29 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.83.0" a; 
+  buildInputs = with a; [
+    pkgconfig
+  ];
+  propagatedBuildInputs = with a; [
+    dbus python dbus_glib
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz";
+    sha256 = "14b1fwq9jyvg9qbbrmpk1264s9shm9n638hsgmkh9fn2lmd1vpc9";
+  };
+
+  inherit buildInputs propagatedBuildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  name = "python-dbus-" + version;
+  meta = {
+    description = "Python DBus bindings";
+  };
+}
diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix
new file mode 100644
index 00000000000..e6bd1b9e5a1
--- /dev/null
+++ b/pkgs/development/python-modules/libsexy/default.nix
@@ -0,0 +1,32 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.1.9" a; 
+  buildInputs = with a; [
+    pkgconfig pygtk
+  ];
+  propagatedBuildInputs = with a; [
+    libsexy python gtk glib pango libxml2
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://releases.chipx86.com/libsexy/sexy-python/sexy-python-${version}.tar.gz";
+    sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d";
+  };
+
+  inherit buildInputs propagatedBuildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
+  postInstall = a.FullDepEntry (''
+    ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/
+  '') ["minInit"];
+
+  name = "python-libsexy-" + version;
+  meta = {
+    description = "Python libsexy bindings";
+  };
+}
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index 9d487db5dd0..a0d4eba644b 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo}:
+{stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo
+  , libglade ? null}:
 
 stdenv.mkDerivation {
   name = "pygtk-2.10.4";
@@ -8,7 +9,9 @@ stdenv.mkDerivation {
     sha256 = "1xg8vng42lql29aa5ryva8icc8dwdc7h2y3yn96qjdgl394d96mb";
   };
   
-  buildInputs = [python pkgconfig glib gtk];
+  buildInputs = [python pkgconfig glib gtk]
+    ++ (if libglade != null then [libglade] else [])
+  ;
 
   propagatedBuildInputs = [pygobject pycairo];
 }
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
new file mode 100644
index 00000000000..b2aedf7c508
--- /dev/null
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -0,0 +1,26 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.8" a; 
+  propagatedBuildInputs = with a; [
+    openssl python
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://prdownloads.sourceforge.net/sourceforge/pyopenssl/pyOpenSSL-${version}.tar.gz";
+    sha256 = "1qzzycjyp1qsw87msj9kg2q3h7il1bf4jkrwy841y0zi44fl3112";
+  };
+
+  inherit propagatedBuildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["installPythonPackage"];
+      
+  name = "pyOpenSSL-" + version;
+  meta = {
+    description = "Python OpenSSL wrapper capable of checking certificates";
+  };
+}
diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix
new file mode 100644
index 00000000000..f032a94b153
--- /dev/null
+++ b/pkgs/development/tools/documentation/docutils/default.nix
@@ -0,0 +1,27 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.5" a; 
+  buildInputs = with a; [
+    python pil makeWrapper 
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz";
+    sha256 = "03k1dakb5j1xi1xd62vqqy7dkgd1fhr4ahmvvmd5g87wxn2gjz3l";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
+      
+  name = "python-docutils-" + version;
+  meta = {
+    description = "Processor of ReStructured Text";
+  };
+}
+  
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8877129096..4e602c79722 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1156,6 +1156,16 @@ let
     inherit stdenv fetchurl python antlr;
   };
 
+  pythonDBus = builderDefsPackage (import ../development/python-modules/dbus) {
+    inherit python pkgconfig dbus_glib;
+    dbus = dbus.libs;
+  };
+
+  pythonSexy = builderDefsPackage (import ../development/python-modules/libsexy) {
+    inherit python libsexy pkgconfig libxml2 pygtk;
+    inherit (gtkLibs) pango gtk glib; 
+  };
+
   qhull = import ../development/libraries/qhull {
     inherit stdenv fetchurl;
   };
@@ -2426,6 +2436,10 @@ let
     inherit (xlibs) libX11 libXt;
   };
 
+  docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {
+    inherit python pil makeWrapper;
+  };
+
   doxygen = import ../development/tools/documentation/doxygen {
     inherit fetchurl stdenv graphviz perl flex bison gnumake;
     inherit (xlibs) libX11 libXext;
@@ -6414,10 +6428,20 @@ let
     inherit (gtkLibs) glib gtk;
   };
 
+  pyGtkGlade = import ../development/python-modules/pygtk {
+    inherit fetchurl stdenv python pkgconfig pygobject pycairo;
+    inherit (gtkLibs) glib gtk;
+    inherit (gnome) libglade;
+  };
+
   pyopengl = import ../development/python-modules/pyopengl {
     inherit fetchurl stdenv setuptools mesa freeglut pil python;
   };
 
+  pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) {
+    inherit python openssl;
+  };
+
   pysqlite = import ../development/python-modules/pysqlite {
     inherit stdenv fetchurl python sqlite;
   };
@@ -9611,6 +9635,17 @@ let
     inherit stdenv python;
   };
 
+  gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) {
+    inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject
+      pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy 
+      docutils;
+    dbus = dbus.libs;
+    inherit (gnome) gtk libglade;
+    inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 
+      scrnsaverproto;
+    python = pythonFull;
+  };
+
   generator = import ../misc/emulators/generator {
     inherit fetchurl stdenv SDL nasm zlib bzip2 libjpeg;
     inherit (gtkLibs1x) gtk;

From a452680a319abe227493ff6c55b7980133269c30 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 12 Apr 2009 20:15:37 +0000
Subject: [PATCH 13/50] Updated OpenFire

svn path=/nixpkgs/trunk/; revision=15002
---
 pkgs/servers/xmpp/openfire/3.5.2.nix          | 32 -------------------
 .../xmpp/openfire/{3.4.5.nix => default.nix}  | 12 ++++---
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/servers/xmpp/openfire/3.5.2.nix
 rename pkgs/servers/xmpp/openfire/{3.4.5.nix => default.nix} (71%)

diff --git a/pkgs/servers/xmpp/openfire/3.5.2.nix b/pkgs/servers/xmpp/openfire/3.5.2.nix
deleted file mode 100644
index 30e44b5771f..00000000000
--- a/pkgs/servers/xmpp/openfire/3.5.2.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-args : with args; with builderDefs;
-  let localDefs = builderDefs.passthru.function (rec {
-    src = /* put a fetchurl here */
-    fetchurl {
-      url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_5_2.tar.gz;
-      sha256 = "13xzwl8kc8i8xgdv7fpwgkj1wjhzagx4b03fkkj2hcfgdkp1978q";
-    };
-
-    buildInputs = [jre];
-    configureFlags = [];
-
-    installPhase = FullDepEntry (''
-      sed -e 's@\(common_jvm_locations\)=.*@\1${jre}@' -i bin/openfire
-      cp -r . $out
-      rm -r $out/logs
-      mv $out/conf $out/conf.inst
-      ln -s /var/log/openfire $out/logs
-      ln -s /etc/openfire $out/conf
-    '') 
-    ["minInit" "doUnpack" "addInputs"];
-  });
-  in with localDefs;
-stdenv.mkDerivation rec {
-  name = "openfire-"+version;
-  builder = writeScript (name + "-builder")
-    (textClosure localDefs 
-      [ installPhase doForceShare doPropagate]);
-  meta = {
-    description = "XMPP server in Java";
-    inherit src;
-  };
-}
diff --git a/pkgs/servers/xmpp/openfire/3.4.5.nix b/pkgs/servers/xmpp/openfire/default.nix
similarity index 71%
rename from pkgs/servers/xmpp/openfire/3.4.5.nix
rename to pkgs/servers/xmpp/openfire/default.nix
index a8d7360d8d6..5319e7ce231 100644
--- a/pkgs/servers/xmpp/openfire/3.4.5.nix
+++ b/pkgs/servers/xmpp/openfire/default.nix
@@ -1,10 +1,12 @@
 args : with args; with builderDefs;
-  let localDefs = builderDefs.passthru.function (rec {
+  let 
+    version="3_6_3";
+    localDefs = builderDefs.passthru.function (rec {
     src = /* put a fetchurl here */
-    fetchurl {
-      url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_4_5.tar.gz;
-      sha256 = "0j1ddk0wiqxhbi3872vf2mqx0jynswrvbfbabrp73zqhz3mdvsal";
-    };
+      fetchurl {
+        url = "http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_${version}.tar.gz";
+        sha256 = "0ibzhmh9qw4lmx45ir1i280p30npgwnj7vrkl432kj3zi7hp79q2";
+      };
 
     buildInputs = [jre];
     configureFlags = [];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e602c79722..d21c65d9cc8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6630,7 +6630,7 @@ let
     inherit fetchurl stdenv openssh;
   };
 
-  openfire = composedArgsAndFun (selectVersion ../servers/xmpp/openfire "3.5.2") {
+  openfire = composedArgsAndFun (import ../servers/xmpp/openfire) {
     inherit builderDefs jre;
   };
 

From 34a1bb38abd917ca980c959b597937820be70892 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 12 Apr 2009 21:59:40 +0000
Subject: [PATCH 14/50] Added Nix expression for VirtualBox 2.2.0 which also
 installs and compiles the kernel module

svn path=/nixpkgs/trunk/; revision=15003
---
 .../virtualization/virtualbox/2.2.0.nix       | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 pkgs/applications/virtualization/virtualbox/2.2.0.nix

diff --git a/pkgs/applications/virtualization/virtualbox/2.2.0.nix b/pkgs/applications/virtualization/virtualbox/2.2.0.nix
new file mode 100644
index 00000000000..accee6eb28a
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/2.2.0.nix
@@ -0,0 +1,61 @@
+{stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel, python}:
+
+stdenv.mkDerivation {
+  name = "virtualbox-2.2.0";
+
+  src = fetchurl {
+    url = http://download.virtualbox.org/virtualbox/2.2.0/VirtualBox-2.2.0-OSE.tar.bz2;
+    sha256 = "8bf621cfcb61f2b0a71be53f072e58c3fb4f3183324faa3947346ff973314c71";
+  };
+
+  buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt3 qt4 libIDL SDL hal libcap glib kernel python];
+
+  patchPhase = "
+    set -x
+    MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
+    sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\
+        -i configure
+    ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 
+    export USER=nix
+    set +x
+  ";
+
+  configurePhase = ''
+    # It wants the qt utils from qt3, and it takes them from QTDIR
+    export QTDIR=${qt3}
+    ./configure --with-qt-dir=${qt3} --with-qt4-dir=${qt4} --disable-python --disable-alsa --disable-pulse --disable-hardening
+    sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
+        -i AutoConfig.kmk
+    sed -e 's@arch/x86/@@' \
+        -i Config.kmk
+    cat >> AutoConfig.kmk << END_PATHS
+    VBOX_PATH_APP_PRIVATE := $out
+    VBOX_PATH_APP_DOCS := $out/doc
+    END_PATHS
+  '';
+
+  buildPhase = "
+    source env.sh
+    kmk
+    cd out/linux.*/release/bin/src
+    export KERN_DIR=${kernel}/lib/modules/*/build
+    make
+    cd ../../../../..
+  ";
+    
+  installPhase = ''
+    cd out/linux.*/release/bin
+    ensureDir $out/virtualbox
+    cp -av * $out/virtualbox
+    cd src
+    kernelVersion=$(cd ${kernel}/lib/modules; ls)
+    export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
+    ensureDir $MODULE_DIR
+    make install
+  '';
+  
+  meta = {
+    description = "PC emulator";
+    homepage = http://www.virtualbox.org/;
+  };
+}

From 327d8f4862fe9372f92e4e37fb83f1540507841b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 12 Apr 2009 22:12:52 +0000
Subject: [PATCH 15/50] Removed virtualbox notice, since it is working now

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d21c65d9cc8..69340850699 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7235,7 +7235,6 @@ let
       inherit (gnome) gtk glib pango libglade;
     };
 
-    # Broken build, still. The install step fails, and I never tried to run that compiled.
     virtualbox = import ../applications/virtualization/virtualbox/2.2.0.nix {
       inherit stdenv fetchurl iasl dev86 libxslt libxml2 qt3 qt4 SDL hal
           libcap libpng zlib kernel python;

From 9619e184cff6e779807a1eb555e23260ed636fb3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 12 Apr 2009 23:27:55 +0000
Subject: [PATCH 16/50] Added xmpppy - python XMPP library and pyIRCt - python
 IRC transport

svn path=/nixpkgs/trunk/; revision=15005
---
 .../python-modules/irclib/default.nix         | 32 +++++++++++++++
 .../python-modules/xmpppy/default.nix         | 30 ++++++++++++++
 pkgs/servers/xmpp/pyIRCt/default.nix          | 38 ++++++++++++++++++
 pkgs/servers/xmpp/pyMAILt/default.nix         | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 16 ++++++++
 5 files changed, 156 insertions(+)
 create mode 100644 pkgs/development/python-modules/irclib/default.nix
 create mode 100644 pkgs/development/python-modules/xmpppy/default.nix
 create mode 100644 pkgs/servers/xmpp/pyIRCt/default.nix
 create mode 100644 pkgs/servers/xmpp/pyMAILt/default.nix

diff --git a/pkgs/development/python-modules/irclib/default.nix b/pkgs/development/python-modules/irclib/default.nix
new file mode 100644
index 00000000000..c709308b7af
--- /dev/null
+++ b/pkgs/development/python-modules/irclib/default.nix
@@ -0,0 +1,32 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.4.8" a; 
+  buildInputs = with a; [
+    python
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://prdownloads.sourceforge.net/sourceforge/python-irclib/python-irclib-${version}.tar.gz";
+    sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1";
+  };
+  patches = [(fetchurl {
+    url = "http://trac.uwc.ac.za/trac/python_tools/browser/xmpp/resources/irc-transport/irclib.py.diff?rev=387&format=raw";
+    name = "irclib.py.diff";
+    sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e";
+  })];
+  patchFlags = "irclib.py";
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doPatch" "installPythonPackage"];
+      
+  name = "python-irclib-" + version;
+  meta = {
+    description = "Python IRC library";
+  };
+}
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
new file mode 100644
index 00000000000..9afa28011de
--- /dev/null
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -0,0 +1,30 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.5.0rc1" a; 
+  buildInputs = with a; [
+    python setuptools
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://prdownloads.sourceforge.net/sourceforge/xmpppy/xmpppy-${version}.tar.gz";
+    sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["mkDirs" "installPythonPackage"];
+  mkDirs = a.FullDepEntry(''
+    ensureDir $out/bin $out/lib $out/share $(toPythonPath $out)
+    export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
+  '') ["defEnsureDir" "addInputs"];
+      
+  name = "xmpp.py-" + version;
+  meta = {
+    description = "XMPP python library";
+  };
+}
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix
new file mode 100644
index 00000000000..b8a7379070c
--- /dev/null
+++ b/pkgs/servers/xmpp/pyIRCt/default.nix
@@ -0,0 +1,38 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.4" a; 
+  buildInputs = with a; [
+    xmpppy pythonIRClib python makeWrapper
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://prdownloads.sourceforge.net/sourceforge/xmpppy/irc-transport-${version}.tar.gz";
+    sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
+  deploy = a.FullDepEntry (''
+    ensureDir $out/bin $out/share/${name}
+    sed -e 's@/usr/bin/@${a.python}/bin/@' -i irc.py
+    sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py
+    sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py
+    sed -e '/configFiles/iimport os' -i config.py
+    cp * $out/share/$name
+    echo "#! /bin/sh" > $out/bin/pyIRCt
+    echo "cd $out/share/${name}" >> $out/bin/pyIRCt
+    echo "./irc.py \"$@\"" >> $out/bin/pyIRCt
+    chmod a+rx  $out/bin/pyIRCt $out/share/${name}/irc.py
+  '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
+      
+  name = "pyIRCt-" + version;
+  meta = {
+    description = "IRC transport module for XMPP";
+  };
+}
diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix
new file mode 100644
index 00000000000..5a2c4c5484c
--- /dev/null
+++ b/pkgs/servers/xmpp/pyMAILt/default.nix
@@ -0,0 +1,40 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  buildInputs = with a; [
+    xmpppy python makeWrapper
+  ];
+in
+rec {
+  src = a.fetchcvs {
+		cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy";
+		module = "xmpppy/mail-transport";
+		date = "2009-01-01";
+		sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e";
+	};
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/mail.py" a.pythonWrapperArguments)];
+  deploy = a.FullDepEntry (''
+    cd mail-transport
+    ensureDir $out/bin $out/share/${name}
+    sed -e 's@/usr/bin/@${a.python}/bin/@' -i mail.py
+    sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py
+    sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py
+    sed -e '/configFiles/iimport os' -i config.py
+    cp * $out/share/$name
+    echo "#! /bin/sh" > $out/bin/pyMAILt
+    echo "cd $out/share/${name}" >> $out/bin/pyMAILt
+    echo "./mail.py \"$@\"" >> $out/bin/pyMAILt
+    chmod a+rx  $out/bin/pyMAILt $out/share/${name}/mail.py
+  '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
+      
+  name = "pyMAILt";
+  meta = {
+    description = "Email transport module for XMPP";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69340850699..228df732d98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1161,6 +1161,10 @@ let
     dbus = dbus.libs;
   };
 
+  pythonIRClib = builderDefsPackage (import ../development/python-modules/irclib) {
+    inherit python;
+  };
+
   pythonSexy = builderDefsPackage (import ../development/python-modules/libsexy) {
     inherit python libsexy pkgconfig libxml2 pygtk;
     inherit (gtkLibs) pango gtk glib; 
@@ -1450,6 +1454,10 @@ let
       perlURI perlLWP;
   };
 
+  xmpppy = builderDefsPackage (import ../development/python-modules/xmpppy) {
+    inherit python setuptools;
+  };
+
   xpf = import ../tools/text/xml/xpf {
     inherit fetchurl stdenv python;
 
@@ -6642,6 +6650,14 @@ let
     inherit fetchurl stdenv ant;
   };
 
+  pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) {
+    inherit xmpppy pythonIRClib python makeWrapper;
+  };
+
+  pyMAILt = builderDefsPackage (import ../servers/xmpp/pyMAILt) {
+    inherit xmpppy python makeWrapper fetchcvs;
+  };
+
   samba = import ../servers/samba {
     inherit stdenv fetchurl readline openldap pam kerberos popt iniparser
   libunwind acl fam;

From 60dceccc9f74738e6f00859a66341f7feb9833dd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 13 Apr 2009 09:36:07 +0000
Subject: [PATCH 17/50] Use PAM in ejabberd

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

diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 27d5bf034a6..7cc13bb8184 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, expat, erlang, zlib, openssl}:
+{stdenv, fetchurl, expat, erlang, zlib, openssl, pam}:
 
 stdenv.mkDerivation {
   name = "ejabberd-2.0.0";
@@ -6,13 +6,14 @@ stdenv.mkDerivation {
     url = http://www.process-one.net/downloads/ejabberd/2.0.0/ejabberd-2.0.0.tar.gz;
     sha256 = "086e105cb402ef868e3187277db1486807e1b34a2e3e3679f0ee6de1e5fd2e54";
   };
-  buildInputs = [ expat erlang zlib openssl ];
+  buildInputs = [ expat erlang zlib openssl pam ];
   patchPhase = ''
     sed -i -e "s|erl \\\|${erlang}/bin/erl \\\|" src/ejabberdctl.template
   '';
   preConfigure = ''
     cd src
   '';  
+  configureFlags = ["--enable-pam"];
   
   meta = {
     description = "Open-source XMPP application server written in Erlang";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 228df732d98..76ae48f3993 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6551,7 +6551,8 @@ let
   };
 
   ejabberd = import ../servers/xmpp/ejabberd {
-    inherit fetchurl stdenv expat erlang zlib openssl;
+    inherit fetchurl stdenv expat erlang zlib openssl 
+      pam;
   };
 
   fingerd_bsd = import ../servers/fingerd/bsd-fingerd {

From 5e9c1113ba06d54910079625a2088a75a4f7b4d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Apr 2009 12:18:04 +0000
Subject: [PATCH 18/50] * Firefox 3.0.8.

svn path=/nixpkgs/trunk/; revision=15013
---
 pkgs/applications/networking/browsers/firefox-3/default.nix   | 4 ++--
 pkgs/applications/networking/browsers/firefox-3/xulrunner.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-3/default.nix b/pkgs/applications/networking/browsers/firefox-3/default.nix
index 95bbceaaee7..4eff865a01e 100644
--- a/pkgs/applications/networking/browsers/firefox-3/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-3/default.nix
@@ -13,12 +13,12 @@
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
   
-  version = "3.0.7";
+  version = "3.0.8";
 
   src = fetchurl {
     # Don't forget to update xulrunner.nix as well!
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}-source.tar.bz2";
-    sha1 = "03c078d9c2d047d7cdc25f7823c6e647cb8d8f8b";
+    sha1 = "93f82c64ae9c805964fb6459223a1061e2d328fd";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix b/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix
index 2e9c4a4a80e..4edc8de06e7 100644
--- a/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix
+++ b/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
   name = "xulrunner-${version}";
 
   src = fetchurl {
-    url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.7/source/firefox-3.0.7-source.tar.bz2;
-    sha1 = "03c078d9c2d047d7cdc25f7823c6e647cb8d8f8b";
+    url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.8/source/firefox-3.0.8-source.tar.bz2;
+    sha1 = "93f82c64ae9c805964fb6459223a1061e2d328fd";
   };
 
   buildInputs = [

From 06a957ecf67da1e139c1161ca7cfb6a50eccac59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 13 Apr 2009 15:40:51 +0000
Subject: [PATCH 19/50] Adding google earth.

svn path=/nixpkgs/trunk/; revision=15014
---
 .../applications/misc/googleearth/default.nix | 75 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 ++
 2 files changed, 82 insertions(+)
 create mode 100644 pkgs/applications/misc/googleearth/default.nix

diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
new file mode 100644
index 00000000000..6232b7f5cf5
--- /dev/null
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -0,0 +1,75 @@
+{ stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv,
+libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11 }:
+
+stdenv.mkDerivation {
+  name = "googleearth-5.11337.1968";
+
+/*
+  src = fetchurl {
+    url = http://dl.google.com/earth/client/ge4/release_4_3/googleearth-linux-plus-4.3.7284.3916.bin;
+    sha256 = "0zi7d1708ni6vgm2vy9q0y8w7dxl8qinnpplkrlb7x0x3671rdxf";
+  };
+*/
+  src = fetchurl {
+    url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin;
+    sha256 = "1h090rbdkp3pa97xkkjzj71k343ic8dlngj2cihw5cd1hh3f9idc";
+  };
+
+  buildInputs = [
+    glibc
+    glib
+    stdenv.gcc.gcc
+    libSM 
+    libICE 
+    libXi 
+    libXv
+    mesa
+    libXrender 
+    libXrandr 
+    libXfixes 
+    libXcursor 
+    libXinerama 
+    freetype 
+    libXext 
+    libX11 
+  ];
+
+  phases = "unpackPhase installPhase";
+  unpackPhase = ''
+    bash $src --noexec --target unpacked
+    cd unpacked
+  '';
+  installPhase =''
+    ensureDir $out/{opt/googleearth/,bin};
+    tar xf googleearth-data.tar -C $out/opt/googleearth
+    tar xf googleearth-linux-x86.tar -C $out/opt/googleearth
+    rm $out/opt/googleearth/libstdc+*
+    rm $out/opt/googleearth/libgcc*
+    cp bin/googleearth $out/opt/googleearth
+    cat > $out/bin/googleearth << EOF
+    #!/bin/sh
+    export GOOGLEEARTH_DATA_PATH=$out/opt/googleearth
+    exec $out/opt/googleearth/googleearth
+    EOF
+    chmod +x $out/bin/googleearth
+
+    fullPath=
+    for i in $buildInputs; do
+      fullPath=$fullPath:$i/lib
+    done
+          
+    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      --set-rpath $fullPath \
+      $out/opt/googleearth/googleearth-bin
+
+    for a in $out/opt/googleearth/*.so* ; do
+      patchelf --set-rpath $fullPath $a
+    done
+  '';
+
+  meta = {
+      description = "A world sphere viewer";
+      homepage = http://earth.google.com;
+      license = "Google";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76ae48f3993..35e5a780af6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8387,6 +8387,13 @@ let
     inherit (gtkLibs) gtk;
   };
 
+  googleearth = import ../applications/misc/googleearth {
+    inherit stdenv fetchurl glibc mesa freetype;
+    inherit (gtkLibs) glib;
+    inherit (xlibs) libSM libICE libXi libXv libXrender libXrandr libXfixes
+      libXcursor libXinerama libXext libX11 ;
+  };
+
   gv = import ../applications/misc/gv {
     inherit fetchurl stdenv Xaw3d ghostscriptX;
   };

From a899bfc687909d73796cc997bda437d9cc3179ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 13 Apr 2009 15:41:00 +0000
Subject: [PATCH 20/50] Adding libgpod, for a future gtkpod.

svn path=/nixpkgs/trunk/; revision=15015
---
 pkgs/development/libraries/libgpod/default.nix | 11 +++++++++++
 pkgs/top-level/all-packages.nix                |  5 +++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/libgpod/default.nix

diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
new file mode 100644
index 00000000000..0f7e5f76019
--- /dev/null
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, gettext, perl, perlXMLParser, pkgconfig, glib, libxml2 }:
+
+stdenv.mkDerivation {
+  name = "libgpod-0.7";
+  src = fetchurl {
+    url = mirror://sourceforge/gtkpod/libgpod-0.7.0.tar.gz;
+    sha256 = "07jfxf4v6wd33aps9ry8kmp0k7lg1k933bag4f9vnpns3j5l63g1";
+  };
+
+  buildInputs = [ gettext perl perlXMLParser pkgconfig glib libxml2 ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35e5a780af6..7fd44032ceb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3443,6 +3443,11 @@ let
     inherit fetchurl stdenv pkgconfig libusb libtool libexif libjpeg gettext;
   };
 
+  libgpod = import ../development/libraries/libgpod {
+    inherit fetchurl stdenv gettext perl perlXMLParser pkgconfig libxml2;
+    inherit (gtkLibs) glib;
+  };
+
   libical = import ../development/libraries/libical {
     inherit stdenv fetchurl perl;
   };

From 8e09a9bb3dbb30fa392086ec7bd44c5c4a407683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 13 Apr 2009 15:41:10 +0000
Subject: [PATCH 21/50] Adding gtkpod, and fixing libgpod meta info.

svn path=/nixpkgs/trunk/; revision=15016
---
 pkgs/applications/audio/gtkpod/default.nix     | 17 +++++++++++++++++
 pkgs/development/libraries/libgpod/default.nix |  6 ++++++
 pkgs/top-level/all-packages.nix                |  6 ++++++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/audio/gtkpod/default.nix

diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
new file mode 100644
index 00000000000..962c0c7ba87
--- /dev/null
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser, libglade, flex, libid3tag }:
+
+stdenv.mkDerivation {
+  name = "gtkpod-0.99.14";
+
+  src = fetchurl {
+    url = mirror://sourceforge/gtkpod/gtkpod-0.99.14.tar.gz;
+    sha256 = "0ggcfyhcdlf3br88csdki215k4clxixa192afz6f16k7h8s2iqbk";
+  };
+  buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex libid3tag];
+
+  meta = {
+    description = "GTK Manager for an Apple ipod";
+    homepage = http://gtkpod.sourceforge.net;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index 0f7e5f76019..725d1befcac 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -8,4 +8,10 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ gettext perl perlXMLParser pkgconfig glib libxml2 ];
+
+  meta = {
+    homepage = http://gtkpod.sourceforge.net/;
+    description = "Library used by gtkpod to access the contents of an ipod";
+    license = "LGPL";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fd44032ceb..2c959d2fca2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8379,6 +8379,12 @@ let
       libjpeg readline libtool;
   };
 
+  gtkpod = import ../applications/audio/gtkpod {
+    inherit stdenv fetchurl pkgconfig libgpod gettext perl perlXMLParser flex libid3tag;
+    inherit (gtkLibs) gtk glib;
+    inherit (gnome) libglade;
+  };
+
   qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
     inherit libpng libcv;
   };

From edca05ee301e3f5c4e0d3915f5ab0757e18dcc0c Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 14 Apr 2009 08:05:10 +0000
Subject: [PATCH 22/50] build-support/vm/default.nix: updated debian hashes

svn path=/nixpkgs/trunk/; revision=15020
---
 pkgs/build-support/vm/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index f7058277120..6a7f049cb47 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -833,7 +833,7 @@ rec {
       fullName = "Ubuntu 9.04 Jaunty (i386)";
       packagesList = fetchurl {
         url = mirror://ubuntu/dists/jaunty/main/binary-i386/Packages.bz2;
-        sha256 = "7a82d30716a96a98eaa56843f3dfc1a0e706f26c9ea2e1d1dc1cbaadfa352e1f";
+        sha256 = "6378e8707f9f1324aac8bbc67daf56eee27f2e0a4a4c96792be032d1ca706a38";
       };
       urlPrefix = mirror://ubuntu;
     } // args);
@@ -843,7 +843,7 @@ rec {
       fullName = "Ubuntu 9.04 Jaunty (amd64)";
       packagesList = fetchurl {
         url = mirror://ubuntu/dists/jaunty/main/binary-amd64/Packages.bz2;
-        sha256 = "794e080413580f6b94318d495672c8f7e54cf087d08d1fd748a612da0f2e4538";
+        sha256 = "adc46fec04a5d87571c60fa1a29dfb73ca69ad6eb0276615b28595a3f06988e1";
       };
       urlPrefix = mirror://ubuntu;
     } // args);
@@ -853,7 +853,7 @@ rec {
       fullName = "Debian 4.0r7 Etch (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/etch/main/binary-i386/Packages.bz2;
-        sha256 = "155c1d1b4ce54de6c8134ab0154c2a476ae40cc5899109f3f95fecd5e002c50d";
+        sha256 = "80ea57a7f106086c74470229998b07885d185dc62fe4a3200d2fffc5b2371f3d";
       };
       urlPrefix = mirror://debian;
     } // args);
@@ -863,7 +863,7 @@ rec {
       fullName = "Debian 4.0r7 Etch (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/etch/main/binary-amd64/Packages.bz2;
-        sha256 = "3ab73a45781651a78c824b4f281de91b1aa6974d63470f40525933d848183e44";
+        sha256 = "d00114ef5e0c287273eebff7e7c4ca1aa0388a56c7d980a0a031e7782741e5ba";
       };
       urlPrefix = mirror://debian;
     } // args);
@@ -873,7 +873,7 @@ rec {
       fullName = "Debian 5.0 Lenny (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
-        sha256 = "afbead64fb4820e50294686cd3ccdff91026b214aabec3f212f9001482001061";
+        sha256 = "a8257890a83302ebe8e4413cbec83bea1ac6b7345646465566d625d70558aeb6";
       };
       urlPrefix = mirror://debian;
     } // args);
@@ -883,7 +883,7 @@ rec {
       fullName = "Debian 5.0 Lenny (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
-        sha256 = "73d74454d687dfbdfef1abbe4bd9c251119f38ab8d371a593aa271bfa227ed2b";
+        sha256 = "6812c7462f4b2b767c157d01139e0fc9e17f99c492dcc59361dbd48ed8ec0e63";
       };
       urlPrefix = mirror://debian;
     } // args);

From f94f76b2f48b460c9a5f3dfa1cf2c1b5a1e4b5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 14 Apr 2009 08:47:51 +0000
Subject: [PATCH 23/50] GnuTLS 2.6.5.

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

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 0506695a089..41b9ef1319f 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-2.6.3";
+  name = "gnutls-2.6.5";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.bz2";
-    sha256 = "1rs0a9d5ag17ws7d442ywlsdm6nb8fdmxkpj5hv9byfwb7k7xpgd";
+    sha256 = "1jq1alccg4fzr3xnq5j3igwsyypw855jqx7iri4bf2ic0wvfd2z7";
   };
 
   patches = [ ./tmpdir.patch ];

From 4951b598a2e38e3d7e6cc72af2606608506f0db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 14 Apr 2009 11:13:13 +0000
Subject: [PATCH 24/50] Avahi 0.6.25.

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

diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 0db32ec6858..89e1104f3d8 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -5,10 +5,10 @@
 assert qt4Support -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "avahi-0.6.24";
+  name = "avahi-0.6.25";
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "0l5rsi4s7az7cs9p4aqs77v7jrh95iiwwx0ivksmivc8c7a70016";
+    sha256 = "0ndsrd357igp0m2cd8vwr16gmh6axlndf34hlg7qqnsiymsdj84j";
   };
 
   buildInputs = [

From 7901f7635561194b760085656122be458edc7231 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 14 Apr 2009 12:27:42 +0000
Subject: [PATCH 25/50] adding ttf2pt1-3.4.4

svn path=/nixpkgs/trunk/; revision=15024
---
 pkgs/applications/msic/ttf2pt1/default.nix    | 28 ++++++
 .../msic/ttf2pt1/gentoo-makefile.patch        | 98 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 3 files changed, 130 insertions(+)
 create mode 100644 pkgs/applications/msic/ttf2pt1/default.nix
 create mode 100644 pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch

diff --git a/pkgs/applications/msic/ttf2pt1/default.nix b/pkgs/applications/msic/ttf2pt1/default.nix
new file mode 100644
index 00000000000..870c5b1e121
--- /dev/null
+++ b/pkgs/applications/msic/ttf2pt1/default.nix
@@ -0,0 +1,28 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "ttf2pt1-3.4.4";
+
+  src = fetchurl {
+    url = http://prdownloads.sourceforge.net/ttf2pt1/ttf2pt1-3.4.4.tgz;
+    sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf";
+  };
+
+  preConfigure = ''
+    find -type f | xargs sed -i 's@/usr/bin/perl@${perl}/bin/perl@'
+    ensureDir $out
+    sed -e 's/chown/true/' \
+        -e 's/chgrp/true/' \
+        -e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype}/include/freetype2@' \
+        -i scripts/{inst_dir,inst_file} Makefile
+    makeFlags="INSTDIR=$out OWNER=`id -u`"
+  '';
+
+  buildInputs = [freetype];
+  patches = ./gentoo-makefile.patch; # also contains the freetype patch
+
+  meta = { 
+      description = "True Type to Postscript Type 3 converter, fpdf";
+      homepage = "http://ttf2pt1.sourceforge.net/index.html";
+      license = "ttf2pt1";
+  };
+}
diff --git a/pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch b/pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch
new file mode 100644
index 00000000000..84854606131
--- /dev/null
+++ b/pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch
@@ -0,0 +1,98 @@
+diff -Naur ttf2pt1-3.4.4-orig/Makefile ttf2pt1-3.4.4/Makefile
+--- ttf2pt1-3.4.4-orig/Makefile	2007-07-15 20:06:50.000000000 -0600
++++ ttf2pt1-3.4.4/Makefile	2007-07-15 20:12:40.000000000 -0600
+@@ -9,7 +9,7 @@
+ #
+ # Use GNU C even if it's not the default compiler
+ #
+-#CC=gcc
++CC=gcc
+ #
+ # Use the standard ANSI C compiler on HP-UX even if it's not default
+ #
+@@ -60,18 +60,18 @@
+ # (if the include and lib directory do not match your installation,
+ # modify them), also uncomment LIBS_FT
+ #
+-#CFLAGS_FT = -DUSE_FREETYPE -I/usr/local/include/freetype2 -I/usr/local/include
++CFLAGS_FT = -DUSE_FREETYPE -I/usr/include/freetype2 -I/usr/include
+ 
+ # 
+ # The FreeType-2 library flags (disabled by default)
+ 
+-LIBS_FT=
++#LIBS_FT=
+ 
+ # To enable use of the FreeType-2 library
+ # (if the include and lib directory do not match your installation,
+ # modify them), also uncomment CFLAGS_FT
+ #
+-#LIBS_FT= -L/usr/local/lib -lfreetype
++LIBS_FT= -L/usr/lib -lfreetype
+ 
+ #
+ # The flags for C compiler for the Autotrace library (disabled by default). 
+@@ -120,18 +120,18 @@
+ # Installation-related stuff
+ # 
+ # The base dir for installation and subdirs in it
+-INSTDIR = /usr/local
++INSTDIR = /usr
+ # for binaries
+ BINDIR = $(INSTDIR)/bin
+ # for binaries of little general interest
+ LIBXDIR = $(INSTDIR)/libexec/ttf2pt1
+ # for scripts, maps/encodings etc.
+ SHAREDIR = $(INSTDIR)/share/ttf2pt1
+-MANDIR = $(INSTDIR)/man
++MANDIR = $(INSTDIR)/share/man
+ 
+ # owner and group of installed files
+ OWNER = root
+-GROUP = bin
++GROUP = root
+ 
+ # After you have configured the Makefile, comment out the following
+ # definition:
+@@ -244,17 +244,19 @@
+ 	chmod -R go-w $(SHAREDIR)
+ 	scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
+ 	[ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
+-	sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
+-		s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
+-		s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
++	sed -e 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|' \
++		-e 's|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|' \
++		-e 's|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|' \
++		<scripts/convert >cvt.tmp
+ 	scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
+ 	scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
+ 	rm cvt.tmp
+ 	scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
+ 	for i in $(MANS1); do { \
+-		sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
+-			s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
+-			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
++		sed -e 's|TTF2PT1_BINDIR|$(BINDIR)|' \
++			-e 's|TTF2PT1_LIBXDIR|$(LIBXDIR)|' \
++			-e 's|TTF2PT1_SHAREDIR|$(SHAREDIR)|' \
++			<$$i >$(MANDIR)/man1/$$i \
+ 		&& chown $(OWNER) $(MANDIR)/man1/$$i \
+ 		&& chgrp $(GROUP) $(MANDIR)/man1/$$i \
+ 		&& chmod 0644 $(MANDIR)/man1/$$i \
+
+
+
+
+
+diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
+--- ttf2pt1-3.4.4-orig/ft.c	2007-07-15 20:23:43.000000000 -0600
++++ ttf2pt1-3.4.4/ft.c	2007-07-15 20:24:02.000000000 -0600
+@@ -12,6 +12,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <sys/types.h>
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include <freetype/ftglyph.h>
+ #include <freetype/ftsnames.h>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c959d2fca2..1f2bdfe74e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1385,6 +1385,10 @@ let
     wxGTK = wxGTK28;
   };
 
+  ttf2pt1 = import ../applications/msic/ttf2pt1 {
+    inherit fetchurl stdenv perl freetype;
+  };
+
   ttmkfdir = import ../tools/misc/ttmkfdir {
     inherit debPackage freetype fontconfig libunwind libtool bison;
     flex = flex2534;

From 6d538fc6aad9fc8517d3ad73b6d906ca4d5339f5 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 14 Apr 2009 12:58:53 +0000
Subject: [PATCH 26/50] downgrade selenium-rc to rev 2450. The newer one is
 buggy (Neither allows using a FirefoxProfile nor launches Opera)

svn path=/nixpkgs/trunk/; revision=15027
---
 pkgs/development/tools/selenium/remote-control/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix
index 83d81133a28..a5d7ea84ebf 100644
--- a/pkgs/development/tools/selenium/remote-control/default.nix
+++ b/pkgs/development/tools/selenium/remote-control/default.nix
@@ -28,10 +28,10 @@ in stdenv.mkDerivation {
     # this snapshot version starts a firefox from a script file. It only issues a warning about it
     # you still have to pass -DfirefoxDefaultPath=/home/marc/.nix-profile/bin/firefox or such..
     name = "selenium-remote-control-${version}-dist";
-    # this dist file has been created using  mvn package  -Dmaven.test.skip=true based on svn rev 2639 
+    # this dist file has been created using  mvn package  -Dmaven.test.skip=true based on svn rev 2450
     src = fetchurl {
       url = "http://mawercer.de/~nix/selenium-server-1.0-SNAPSHOT-standalone.jar";
-      sha256 = "1g59g5y8lyjjj3fda30cm9gmjncdz70slrp03rqmnrkzp7z6khnc";
+      sha256 = "1lqr72a3lmmww1psl19pzp91c9q1dm0314b7y7mz1gnfpwc49y38";
     };
     phases = "buildPhase";
     buildPhase = ''

From 5951e31121cad1f9335f315839fcad29abca8973 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 14 Apr 2009 13:03:43 +0000
Subject: [PATCH 27/50] updating unifdef source location

Why did the hash change as well?

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

diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix
index 7ba421b14a4..30afee4586b 100644
--- a/pkgs/development/tools/misc/unifdef/default.nix
+++ b/pkgs/development/tools/misc/unifdef/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "unifdef-1.0";
 
   src = fetchurl {
-    url = http://freshmeat.net/redir/unifdef/10933/url_tgz/unifdef-1.0.tar.gz;
-    sha256 = "d14c30b1e2e9745e4b067ab86337c93ad907b4e9ee1c414d45291bf7f0c19dad";
+    url = http://www.cs.cmu.edu/~ajw/public/dist/unifdef-1.0.tar.gz;
+    sha256 = "1bcxq7qgf6r98m6l277fx6s0gn9sr4vn7f3s0r5mwx79waqk0k6i";
   };
 
   buildPhase = ''

From 140a3d416fef83765c15f0cbaa1175c133246b3f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 14 Apr 2009 13:29:19 +0000
Subject: [PATCH 28/50] Added wrapper script and desktop item support to
 VirtualBox

svn path=/nixpkgs/trunk/; revision=15030
---
 .../virtualization/virtualbox/2.2.0.nix       | 24 +++++--
 .../virtualization/virtualbox/VBox.sh         | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/virtualization/virtualbox/VBox.sh

diff --git a/pkgs/applications/virtualization/virtualbox/2.2.0.nix b/pkgs/applications/virtualization/virtualbox/2.2.0.nix
index accee6eb28a..8931d61e564 100644
--- a/pkgs/applications/virtualization/virtualbox/2.2.0.nix
+++ b/pkgs/applications/virtualization/virtualbox/2.2.0.nix
@@ -1,5 +1,7 @@
-{stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel, python}:
+{stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel, python, which}:
 
+let vboxScript = ./VBox.sh;
+in
 stdenv.mkDerivation {
   name = "virtualbox-2.2.0";
 
@@ -34,14 +36,14 @@ stdenv.mkDerivation {
     END_PATHS
   '';
 
-  buildPhase = "
+  buildPhase = ''
     source env.sh
     kmk
     cd out/linux.*/release/bin/src
     export KERN_DIR=${kernel}/lib/modules/*/build
     make
     cd ../../../../..
-  ";
+  '';
     
   installPhase = ''
     cd out/linux.*/release/bin
@@ -50,8 +52,22 @@ stdenv.mkDerivation {
     cd src
     kernelVersion=$(cd ${kernel}/lib/modules; ls)
     export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
-    ensureDir $MODULE_DIR
+    ensureDir $MODULE_DIR    
     make install
+    ensureDir $out/bin
+    cp -v ${vboxScript} $out/bin/VBox.sh
+    sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \
+           -e "s|@QT4_PATH@|${qt4}/lib|" \
+	   -e "s|which|${which}/bin/which|" \
+	   -e "s|gawk|${stdenv.gawk}/bin/gawk|" \
+	   $out/bin/VBox.sh
+    chmod 755 $out/bin/VBox.sh
+    for file in VirtualBox VBoxManage VBoxSDL
+    do
+        [ -f "$out/virtualbox/$file" ] && ln -sfv $out/bin/VBox.sh $out/bin/$file
+    done
+    ensureDir $out/share/applications
+    ln -sfv $out/virtualbox/VirtualBox.desktop $out/share/applications
   '';
   
   meta = {
diff --git a/pkgs/applications/virtualization/virtualbox/VBox.sh b/pkgs/applications/virtualization/virtualbox/VBox.sh
new file mode 100644
index 00000000000..407f376cc70
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/VBox.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+INSTALL_PATH="@INSTALL_PATH@"
+export LD_LIBRARY_PATH="@INSTALL_PATH@:@QT4_PATH@"
+
+export USER=$(whoami)
+
+if [ ! -c /dev/vboxdrv ]; then
+  echo "/dev/vboxdrv does not exist. Load the kernel module then try again."
+  exit 1
+fi
+if [ ! -r /dev/vboxdrv -o ! -w /dev/vboxdrv ]; then
+  echo "User $USER can not read and/or write to /dev/vboxdrv."
+  exit 1
+fi
+
+echo "/dev/vboxdrv exists and $USER can access it."
+
+SERVER_PID=$(ps -U $USER | grep VBoxSVC | awk '{ print $1 }')
+if [ "$1" = "shutdown" ]; then
+  if [ -n "$SERVER_PID" ]; then
+    echo "Terminating VBoxSVC with PID $SERVER_PID."
+    kill -TERM $SERVER_PID
+  else
+    echo "VBoxSVC Not Currently Running."
+  fi
+  exit 0
+fi
+
+if [ ! -x "$INSTALL_PATH/VBoxSVC" ]; then
+  echo "$INSTALL_PATH/VBoxSVC does not exist! Can not continue."
+  exit 1
+fi
+
+APP=$(which $0)
+APP=${APP##/*/}
+
+if [ ! -x "$INSTALL_PATH/$APP" ]; then
+  echo "$INSTALL_PATH/$APP does not exist!"
+  exit 1
+fi
+case "$APP" in
+  VirtualBox|VBoxManage|VBoxSDL|VBoxVRDP)
+    EXEC_APP="$INSTALL_PATH/$APP"
+  ;;
+  *)
+    echo "Unknown application - $APP."
+  ;;
+esac
+
+if [ -z "$SERVER_PID" ]; then
+  rm -rf /tmp/.vbox-$USER-ipc
+  echo "Starting VBoxSVC for $USER."
+  "$INSTALL_PATH/VBoxSVC" --daemonize
+fi
+
+SERVER_PID=$(ps -U $USER | grep VBoxSVC | awk '{ print $1 }')
+if [ -z "$SERVER_PID" ]; then
+  echo "VBoxSVC failed to start! Can not continue"
+  exit 1
+fi
+
+echo "VBoxSVC is running for user $USER with PID $SERVER_PID."
+
+echo "Starting $EXEC_APP."
+exec "$EXEC_APP" "$@"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f2bdfe74e4..8c3f53472cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7263,7 +7263,7 @@ let
 
     virtualbox = import ../applications/virtualization/virtualbox/2.2.0.nix {
       inherit stdenv fetchurl iasl dev86 libxslt libxml2 qt3 qt4 SDL hal
-          libcap libpng zlib kernel python;
+          libcap libpng zlib kernel python which;
       inherit (gtkLibs) glib;
       inherit (xlibs) xproto libX11 libXext libXcursor;
       inherit (gnome) libIDL;

From c5197de22d5afae0ed7bcd772017efec864a3ecb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Apr 2009 13:36:16 +0000
Subject: [PATCH 29/50] * Bump the names as well.

svn path=/nixpkgs/trunk/; revision=15031
---
 pkgs/build-support/vm/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 6a7f049cb47..53cd5b3172e 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -849,8 +849,8 @@ rec {
     } // args);
 
     debian40i386 = args: makeImageFromDebDist ({
-      name = "debian-4.0r7-etch-i386";
-      fullName = "Debian 4.0r7 Etch (i386)";
+      name = "debian-4.0r8-etch-i386";
+      fullName = "Debian 4.0r8 Etch (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/etch/main/binary-i386/Packages.bz2;
         sha256 = "80ea57a7f106086c74470229998b07885d185dc62fe4a3200d2fffc5b2371f3d";
@@ -859,8 +859,8 @@ rec {
     } // args);
         
     debian40x86_64 = args: makeImageFromDebDist ({
-      name = "debian-4.0r7-etch-amd64";
-      fullName = "Debian 4.0r7 Etch (amd64)";
+      name = "debian-4.0r8-etch-amd64";
+      fullName = "Debian 4.0r8 Etch (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/etch/main/binary-amd64/Packages.bz2;
         sha256 = "d00114ef5e0c287273eebff7e7c4ca1aa0388a56c7d980a0a031e7782741e5ba";
@@ -869,8 +869,8 @@ rec {
     } // args);
 
     debian50i386 = args: makeImageFromDebDist ({
-      name = "debian-5.0-lenny-i386";
-      fullName = "Debian 5.0 Lenny (i386)";
+      name = "debian-5.0.1-lenny-i386";
+      fullName = "Debian 5.0.1 Lenny (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
         sha256 = "a8257890a83302ebe8e4413cbec83bea1ac6b7345646465566d625d70558aeb6";
@@ -879,8 +879,8 @@ rec {
     } // args);
         
     debian50x86_64 = args: makeImageFromDebDist ({
-      name = "debian-5.0-lenny-amd64";
-      fullName = "Debian 5.0 Lenny (amd64)";
+      name = "debian-5.0.1-lenny-amd64";
+      fullName = "Debian 5.0.1 Lenny (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
         sha256 = "6812c7462f4b2b767c157d01139e0fc9e17f99c492dcc59361dbd48ed8ec0e63";

From ce358d750da9b9a796da30a4cc771dbf7944765d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Apr 2009 13:47:45 +0000
Subject: [PATCH 30/50] * Urgh.

svn path=/nixpkgs/trunk/; revision=15033
---
 pkgs/applications/networking/browsers/firefox-3/xulrunner.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix b/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix
index 4edc8de06e7..b3951a59b1e 100644
--- a/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix
+++ b/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix
@@ -11,7 +11,7 @@
 
 let
 
-  version = "1.9.0.7"; # this attribute is used by other packages
+  version = "1.9.0.8"; # this attribute is used by other packages
 
 in  
 

From f5505f2e357e51c03e47477a1be82e692350fcff Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 14 Apr 2009 13:52:27 +0000
Subject: [PATCH 31/50] Added virtualbox packages to buildfarm

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b7392fdff73..304e87d73a7 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -356,18 +356,26 @@ in {
     krusader = linux;
   };
 
+  kernelPackages_2_6_25 = {
+    kernel = linux;
+    virtualbox = linux;
+  };
+
   kernelPackages_2_6_26 = {
     kernel = linux;
+    virtualbox = linux;
   };
   
   kernelPackages_2_6_27 = {
     # aufs = linux; # kernel seems to be too old for that package 
     kernel = linux;
+    virtualbox = linux;
   };
   
   kernelPackages_2_6_28 = {
     aufs = linux;
     kernel = linux;
+    virtualbox = linux;
   };
   
   xorg = {

From a322df61326e8ee1cb849000de236b71d17fb34f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Apr 2009 13:56:33 +0000
Subject: [PATCH 32/50] * Add the full Boost build to Hydra.

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 304e87d73a7..47d6aacf3d1 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -74,6 +74,7 @@ in {
   bitlbee = linux; 
   bittorrent = linux;
   boost = all;
+  boostFull = all;
   bsdiff = all;
   bzip2 = all;
   cabextract = all;

From a579a5503b7091683a8c297bc0f4d09c67fda26d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Apr 2009 13:59:45 +0000
Subject: [PATCH 33/50] * __XXX primops are deprecated.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c3f53472cb..ef130f70a25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9,7 +9,7 @@
 
 
 { # The system (e.g., `i686-linux') for which to build the packages.
-  system ? __currentSystem
+  system ? builtins.currentSystem
 
   # Usually, the system type uniquely determines the stdenv and thus
   # how to build the packages.  But on some platforms we have

From ec2802e690041a1bc3c2f3ba49671a5f75d189d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Apr 2009 14:02:23 +0000
Subject: [PATCH 34/50] * Thunderbird 2.0.0.21.

svn path=/nixpkgs/trunk/; revision=15037
---
 .../networking/mailreaders/thunderbird-2.x/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
index db051fc026f..47cc4a93001 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
@@ -11,13 +11,13 @@
 }:
 
 stdenv.mkDerivation {
-  name = "thunderbird-2.0.0.19";
+  name = "thunderbird-2.0.0.21";
 
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/source/thunderbird-2.0.0.19-source.tar.bz2;
-    sha1 = "4d2e0f8b405bb0ceab20a9f570ce91cf4640f456";
+    url = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.21/source/thunderbird-2.0.0.21-source.tar.bz2;
+    sha1 = "8bb2f7ce60635f6082c3c4542fff10c4b7445dc0";
   };
 
   buildInputs = [

From 6a18dcab449496c47e8d920e568eceb4a6101994 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Apr 2009 14:57:31 +0000
Subject: [PATCH 35/50] * checkinstall: don't include directories in the Debian
 `conffiles'   file.  This caused the Nix Debian build to fail (because it
 installs   a file /etc/profile.d/nix.sh).

svn path=/nixpkgs/trunk/; revision=15038
---
 .../checkinstall/default.nix                  |  3 +++
 .../checkinstall/etc-dirs.patch               | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/package-management/checkinstall/etc-dirs.patch

diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix
index fe8f20bb456..818d4e836d8 100644
--- a/pkgs/tools/package-management/checkinstall/default.nix
+++ b/pkgs/tools/package-management/checkinstall/default.nix
@@ -20,6 +20,9 @@ stdenv.mkDerivation {
     # Implement the getxattr(), lgetxattr(), __open_2() and
     # __open64_2() functions.  Needed for doing builds on Ubuntu 8.10.
     ./missing-functions.patch
+
+    # Don't include directories in the Debian `conffiles' file.
+    ./etc-dirs.patch
   ];
 
   buildInputs = [gettext];
diff --git a/pkgs/tools/package-management/checkinstall/etc-dirs.patch b/pkgs/tools/package-management/checkinstall/etc-dirs.patch
new file mode 100644
index 00000000000..a811e4afbb9
--- /dev/null
+++ b/pkgs/tools/package-management/checkinstall/etc-dirs.patch
@@ -0,0 +1,25 @@
+diff -rc checkinstall-orig/checkinstall checkinstall/checkinstall
+*** checkinstall-orig/checkinstall	2009-03-27 17:07:26.000000000 +0100
+--- checkinstall/checkinstall	2009-04-14 16:34:08.000000000 +0200
+***************
+*** 2607,2615 ****
+     chmod 755 $BUILD_DIR/DEBIAN/postrm
+  fi
+  
+! # Tag files in /etc to be conffiles
+  find $BUILD_DIR/etc 2> /dev/null | sed -e "s,$BUILD_DIR,," | \
+! 	grep -v '^/etc$' > $BUILD_DIR/DEBIAN/conffiles
+  
+  # The package will be saved here (ignores <epoch>: prefix):
+  DEBPKG="${DIRECTORIO_FUENTE}/${NAME}_`echo ${VERSION} | sed -e 's/^[0123456789]*://'`-${RELEASE}_${ARCHITECTURE}.deb"
+--- 2607,2616 ----
+     chmod 755 $BUILD_DIR/DEBIAN/postrm
+  fi
+  
+! # Tag non-directory files in /etc to be conffiles
+  find $BUILD_DIR/etc 2> /dev/null | sed -e "s,$BUILD_DIR,," | \
+!         (while read fn; do test ! -d "$BUILD_DIR/$fn" && echo "$fn"; done) \
+!         > $BUILD_DIR/DEBIAN/conffiles
+  
+  # The package will be saved here (ignores <epoch>: prefix):
+  DEBPKG="${DIRECTORIO_FUENTE}/${NAME}_`echo ${VERSION} | sed -e 's/^[0123456789]*://'`-${RELEASE}_${ARCHITECTURE}.deb"

From b8969ff4aecc1e354a1235168d92cc360d6a209d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 14 Apr 2009 21:01:16 +0000
Subject: [PATCH 36/50] Making mplayer compile with mesa, so it gets 'gl'
 output.

svn path=/nixpkgs/trunk/; revision=15041
---
 pkgs/applications/video/MPlayer/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index e8fb187e049..06135d2e1ef 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -4,6 +4,7 @@
 , alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null
 , libXinerama ? null, libXrandr ? null, libdvdnav ? null
 , cdparanoia ? null, cddaSupport ? true
+, mesa
 }:
 
 assert alsaSupport -> alsa != null;
@@ -36,7 +37,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs =
-    [x11 libXv freetype zlib]
+    [x11 libXv freetype zlib mesa]
     ++ stdenv.lib.optional alsaSupport alsa
     ++ stdenv.lib.optional xvSupport libXv
     ++ stdenv.lib.optional theoraSupport libtheora
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef130f70a25..22baf3139ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8631,7 +8631,7 @@ let
 
   MPlayer = import ../applications/video/MPlayer {
     inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav
-      cdparanoia;
+      cdparanoia mesa;
     inherit (xlibs) libX11 libXv libXinerama libXrandr;
     alsaSupport = true;
     alsa = alsaLib;

From 182513d1c534ffa1b75d897b45bbf36fba275f00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 14 Apr 2009 21:01:23 +0000
Subject: [PATCH 37/50] Making neverball not complain on libgcc_s.so.1.

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

diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix
index 3e1d10b3acb..519936fcb28 100644
--- a/pkgs/games/neverball/default.nix
+++ b/pkgs/games/neverball/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   patchPhase = ''
     sed -i -e 's@\./data@'$out/data@ share/base_config.h
     sed -i -e 's@\./locale@'$out/locale@ share/base_config.h
-    sed -i -e 's@-lvorbisfile@-lvorbisfile -lX11@' Makefile
+    sed -i -e 's@-lvorbisfile@-lvorbisfile -lX11 -lgcc_s@' Makefile
   '';
 
   installPhase = ''

From 90655e741492475a37e3b998580facf40f0b74e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 14 Apr 2009 21:01:29 +0000
Subject: [PATCH 38/50] Updating supertuxkart, and making it install the binary
 to /bin instead of /games

svn path=/nixpkgs/trunk/; revision=15043
---
 pkgs/games/super-tux-kart/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index b2552bd9dc8..a70fdb0bc40 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -2,17 +2,21 @@
 , libvorbis, libogg, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "supertuxkart-0.5";
+  name = "supertuxkart-0.6.1a";
 
   src = fetchurl {
     url = "mirror://sourceforge/supertuxkart/${name}.tar.bz2";
-    sha256 = "1c9gdfcsygsflbrsar38p6gm17kxnna70s9mw4bsixyg45aghii9";
+    sha256 = "1p4jl4v74f7ff7qkw10k48fvyg247wqzc097ds07y3pvn9a696w4";
   };
 
   buildInputs = [
     plib SDL openal freealut mesa libvorbis libogg gettext
   ];
 
+  postInstall = ''
+    mv $out/games $out/bin
+  '';
+
   meta = {
     description = "SuperTuxKart is a Free 3D kart racing game";
 

From 9c827683d9bbbb0567cbc9b3d9e0c6a284d149d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 14 Apr 2009 22:24:52 +0000
Subject: [PATCH 39/50] Updating neverball version.

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

diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix
index 519936fcb28..1e31ad30387 100644
--- a/pkgs/games/neverball/default.nix
+++ b/pkgs/games/neverball/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, SDL, mesa, libpng, libjpeg, SDL_ttf, libvorbis, gettext} :
 
 stdenv.mkDerivation {
-  name = "neverball-1.5.0";
+  name = "neverball-1.5.1";
   src = fetchurl {
-    url = http://neverball.org/neverball-1.5.0.tar.gz;
-    sha256 = "8e6f6946cf2b08c13e4956a14f46d74c5a40735965f8fa876668c52d1877ec6a";
+    url = http://neverball.org/neverball-1.5.1.tar.gz;
+    sha256 = "0cqi6q829p1wx4471ab74xd7hmcvjg4fvj40rdc3342rvfqpijv5";
   };
 
   buildInputs = [ SDL mesa libpng libjpeg SDL_ttf libvorbis gettext ];

From 035b95a4dee8ae00ba897fc6b8e87fdcdccc300b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 14 Apr 2009 22:25:03 +0000
Subject: [PATCH 40/50] Adding Kobo Deluxe.

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

diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix
new file mode 100644
index 00000000000..1d700d5cf03
--- /dev/null
+++ b/pkgs/games/kobodeluxe/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, SDL, SDL_image} :
+
+stdenv.mkDerivation {
+  name = "kobodeluxe-0.5.1";
+  src = fetchurl {
+    url = http://olofson.net/kobodl/download/KoboDeluxe-0.5.1.tar.bz2;
+    sha256 = "0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c";
+  };
+
+  buildInputs = [ SDL SDL_image];
+
+  meta = {
+    homepage = http://olofson.net/kobodl/;
+    description = "Enhanced version of Akira Higuchi's game XKobo  for Un*x systems with X11";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22baf3139ad..819b4a2d237 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9366,6 +9366,10 @@ let
     flex = flex2535;
   };
 
+  kobodeluxe = import ../games/kobodeluxe {
+    inherit stdenv fetchurl SDL SDL_image;
+  };
+
   lincity = builderDefsPackage (import ../games/lincity) {
     inherit (xlibs) libX11 libXext xextproto
       libICE libSM xproto;

From 9471c2f7db86f517b495c2d07682b9d98c63d065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 14 Apr 2009 22:25:14 +0000
Subject: [PATCH 41/50] Adding the simple port of hexen.

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

diff --git a/pkgs/games/hexen/default.nix b/pkgs/games/hexen/default.nix
new file mode 100644
index 00000000000..c97ba4d5bf4
--- /dev/null
+++ b/pkgs/games/hexen/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, SDL} :
+
+stdenv.mkDerivation {
+  name = "hexen-0.2.3";
+  src = fetchurl {
+    url = http://www.libsdl.org/projects/hexen/src/hexen-0.2.3.tar.gz;
+    sha256 = "c1433e930f2003c5f817f935406bb28ba15298a15b1c11f83f42df3e9f1f3bc4";
+  };
+
+  buildInputs = [ SDL ];
+
+  meta = {
+    homepage = http://www.libsdl.org/projects/hexen/;
+    description = "Port of Raven Software's popular Hexen 3-D shooter game";
+    license = "free";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 819b4a2d237..b56b7d61da5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9366,6 +9366,10 @@ let
     flex = flex2535;
   };
 
+  hexen = import ../games/hexen {
+    inherit stdenv fetchurl SDL;
+  };
+
   kobodeluxe = import ../games/kobodeluxe {
     inherit stdenv fetchurl SDL SDL_image;
   };

From ec9e431b076c1a64b6acc4ff663296d472673480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 15 Apr 2009 07:00:26 +0000
Subject: [PATCH 42/50] Updating the nvidia x86_64 src (I don't know what's new
 - I simply saw a new package available)

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 77d6d306c01..ecd064cc74b 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run";
-        sha256 = "1x1pa8w8v4vciinr5ismp7zfl3nsn7x0k5n8m6r1cql6i0rxxgsy";
+        url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg2.run";
+        sha256 = "0d3zxvfl3aav7h692yarc3rf04hpg972zkxv7a941wmqx08f66xp";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From 67763e7c163953d67557c7ee924f9da766bc2491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 15 Apr 2009 08:24:37 +0000
Subject: [PATCH 43/50] Fixing netpbm for x86_64 (and adding a hash for
 fetchsvn)

svn path=/nixpkgs/trunk/; revision=15049
---
 pkgs/tools/graphics/netpbm/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index dc4b3ce95bb..c2e85564e66 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -6,8 +6,11 @@ stdenv.mkDerivation {
   src = fetchsvn {
     url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced;
     rev = 844;
+    sha256 = "8729e63bb5cc9fd500a68d5aed91fa4b973ebc068e3014b47390ba7b4d85968e";
   };
 
+  NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
+
   buildInputs = [ flex zlib perl libpng libjpeg libxml2 ];
 
   configurePhase = "cp config.mk.in config.mk";

From 77d98fd0a3723440c91b86b1631c3ef00b322b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 15 Apr 2009 08:24:41 +0000
Subject: [PATCH 44/50] Revert "Updating the nvidia x86_64 src (I don't know
 what's new - I simply saw a new package available)" Eelco told me they only
 increase the number of prebuild modules in each higher pkg number, which we
 don't use, so we better use the smallest pkg0.

This reverts commit r15048

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index ecd064cc74b..77d6d306c01 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg2.run";
-        sha256 = "0d3zxvfl3aav7h692yarc3rf04hpg972zkxv7a941wmqx08f66xp";
+        url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run";
+        sha256 = "1x1pa8w8v4vciinr5ismp7zfl3nsn7x0k5n8m6r1cql6i0rxxgsy";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From 17e7e8be97bbf15b1ddb070d780490de37ec45e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 15 Apr 2009 09:09:45 +0000
Subject: [PATCH 45/50] Marking google earth as i686-linux only.

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

diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index 6232b7f5cf5..bd51a15c891 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -1,15 +1,12 @@
 { stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv,
 libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11 }:
 
+/* I haven't found any x86_64 package from them */
+assert stdenv.system == "i686-linux";
+
 stdenv.mkDerivation {
   name = "googleearth-5.11337.1968";
 
-/*
-  src = fetchurl {
-    url = http://dl.google.com/earth/client/ge4/release_4_3/googleearth-linux-plus-4.3.7284.3916.bin;
-    sha256 = "0zi7d1708ni6vgm2vy9q0y8w7dxl8qinnpplkrlb7x0x3671rdxf";
-  };
-*/
   src = fetchurl {
     url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin;
     sha256 = "1h090rbdkp3pa97xkkjzj71k343ic8dlngj2cihw5cd1hh3f9idc";

From 6917fa229d6b80e1d2abc78540b0c048780a1147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 15 Apr 2009 09:09:48 +0000
Subject: [PATCH 46/50] Fixing the license of google earth according to ludo
 advices: "There is no google license, we can use the general 'unfree' license
 metainfo"

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

diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index bd51a15c891..4aeb03ff6d7 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -67,6 +67,6 @@ stdenv.mkDerivation {
   meta = {
       description = "A world sphere viewer";
       homepage = http://earth.google.com;
-      license = "Google";
+      license = "unfree";
   };
 }

From 96010823a7e8c5872c27cef39cbe2f8a5fdefa21 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 15 Apr 2009 09:36:17 +0000
Subject: [PATCH 47/50] Stole a patch from the cross-lfs project in order to
 compile dev86 on x86-64 linux

svn path=/nixpkgs/trunk/; revision=15056
---
 pkgs/development/compilers/dev86/default.nix  |  2 ++
 .../dev86/dev86-0.16.17-noelks-1.patch        | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/compilers/dev86/dev86-0.16.17-noelks-1.patch

diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix
index 867eeeddfc9..aa44b14d844 100644
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/pkgs/development/compilers/dev86/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation {
     md5 = "e7bbfdbe61c2fb964994a087e29b0087";
   };
 
+  patches = [ ./dev86-0.16.17-noelks-1.patch ];
+  
   preBuild = "
     makeFlags=\"PREFIX=$out\"
   ";
diff --git a/pkgs/development/compilers/dev86/dev86-0.16.17-noelks-1.patch b/pkgs/development/compilers/dev86/dev86-0.16.17-noelks-1.patch
new file mode 100644
index 00000000000..fd0d9dfae31
--- /dev/null
+++ b/pkgs/development/compilers/dev86/dev86-0.16.17-noelks-1.patch
@@ -0,0 +1,22 @@
+Submitted By: Andrew "Weibullguy" Rowland <darowland_at_ieee_dot_org>
+Date: 2007-10-23
+Initial Package Version: 0.16.17
+Origin: Fedora Project
+Description: Suppresses elksemu
+Upstream Status: Unknown
+
+--- dev86-0.16.17/makefile.in.noelks	2006-01-25 17:03:02.000000000 -0500
++++ dev86-0.16.17/makefile.in	2006-01-25 17:03:19.000000000 -0500
+@@ -89,10 +89,10 @@
+ 
+ #ifdef GNUMAKE
+ all: check_config bcc86 cpp unproto copt as86 ar86 ld86 objdump86 \
+-     library lib-bsd alt-libs elksemu
++     library lib-bsd alt-libs 
+ 
+ install: check_config install-bcc install-man \
+-     install-lib install-emu
++     install-lib
+ 
+ install-all: install install-other
+ 

From 2773c38d333f224f8a401c824a8de70feda2c8bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Apr 2009 10:12:51 +0000
Subject: [PATCH 48/50] * Updated AUFS to the final revision of the aufs1
 codeline.  This   seems to work fine on Linux 2.6.28.

svn path=/nixpkgs/trunk/; revision=15060
---
 pkgs/os-specific/linux/aufs/default.nix | 13 +++----------
 pkgs/top-level/release.nix              |  4 +++-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/aufs/default.nix b/pkgs/os-specific/linux/aufs/default.nix
index e8361a7265d..b49f2e43fbd 100644
--- a/pkgs/os-specific/linux/aufs/default.nix
+++ b/pkgs/os-specific/linux/aufs/default.nix
@@ -1,20 +1,13 @@
 {stdenv, fetchurl, kernel}:
 
 stdenv.mkDerivation {
-  name = "aufs-20080508-${kernel.version}";
+  name = "aufs-20090414-${kernel.version}";
 
   src = fetchurl {
-    url = http://nixos.org/tarballs/aufs-20080508.tar.bz2;
-    sha256 = "1b7y6klk2fc6hf8w2la4k3yvxdvjibsnhv7d6mb12a7h13msjci6";
+    url = http://nixos.org/tarballs/aufs-20090414.tar.bz2;
+    sha256 = "1jhf3kccx0m84frlgx2d0ysn1c4272dgci59dsk7vsfrf7yik526";
   };
 
-  patches = [
-    (fetchurl {
-      url = http://www.mail-archive.com/aufs-users@lists.sourceforge.net/msg01091/04_sec_perm.dpatch;
-      sha256 = "0b51dpks4d5qgysrakv2c1v076d9hc8ln2cbh012zi75b45gn4ir";
-    })
-  ];
-
   buildPhase = ''
     kernelVersion=$(cd ${kernel}/lib/modules && ls)
     kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/source)
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 47d6aacf3d1..3fae71484ce 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -358,17 +358,19 @@ in {
   };
 
   kernelPackages_2_6_25 = {
+    aufs = linux;
     kernel = linux;
     virtualbox = linux;
   };
 
   kernelPackages_2_6_26 = {
+    aufs = linux;
     kernel = linux;
     virtualbox = linux;
   };
   
   kernelPackages_2_6_27 = {
-    # aufs = linux; # kernel seems to be too old for that package 
+    aufs = linux;
     kernel = linux;
     virtualbox = linux;
   };

From dd3608c0de388f729883cca729635236feebe946 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 15 Apr 2009 12:16:50 +0000
Subject: [PATCH 49/50] Added patchelf instruction in order to compile
 virtualbox on x86-64

svn path=/nixpkgs/trunk/; revision=15063
---
 pkgs/applications/virtualization/virtualbox/2.2.0.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/virtualization/virtualbox/2.2.0.nix b/pkgs/applications/virtualization/virtualbox/2.2.0.nix
index 8931d61e564..c2a75c1c173 100644
--- a/pkgs/applications/virtualization/virtualbox/2.2.0.nix
+++ b/pkgs/applications/virtualization/virtualbox/2.2.0.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation {
     sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\
         -i configure
     ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 
+    ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 
     export USER=nix
     set +x
   ";

From 871717cd5ad48843a54e40aa95618b100a8d9ed7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 15 Apr 2009 12:37:57 +0000
Subject: [PATCH 50/50] Enabled 32 bit stdenv for virtualbox

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b56b7d61da5..95d92fe15a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7262,7 +7262,8 @@ let
     };
 
     virtualbox = import ../applications/virtualization/virtualbox/2.2.0.nix {
-      inherit stdenv fetchurl iasl dev86 libxslt libxml2 qt3 qt4 SDL hal
+      stdenv = stdenv_32bit;
+      inherit fetchurl iasl dev86 libxslt libxml2 qt3 qt4 SDL hal
           libcap libpng zlib kernel python which;
       inherit (gtkLibs) glib;
       inherit (xlibs) xproto libX11 libXext libXcursor;