From bb1edcae8d22bb23fe631b735ec1eb827d08c8d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Feb 2011 14:41:03 +0000
Subject: [PATCH 01/40] pkgs/development/interpreters/maude: updated to version
 2.6

svn path=/nixpkgs/trunk/; revision=25904
---
 pkgs/development/interpreters/maude/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index 8fdad7bbc55..f5d4fd09015 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -1,25 +1,23 @@
 { stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "maude-2.5";
+  name = "maude-2.6";
 
   src = fetchurl {
-    url = "http://maude.cs.uiuc.edu/download/current/Maude-2.5.tar.gz";
-    sha256 = "16bvnbyi257z87crzkw9gx2kz13482hnjnik22c2p2ml4rj4lpfw";
+    url = "http://maude.cs.uiuc.edu/download/current/Maude-2.6.tar.gz";
+    sha256 = "182abzhvjvlaa21aqv7802v3bs57a4dm7cw09s3mqmih7nzpkfm5";
   };
 
   fullMaude = fetchurl {
-    url = "http://maude.cs.uiuc.edu/download/current/FM2.5/full-maude25.maude";
-    sha256 = "1d0izdbmhpifb2plnkk3cp7li2z60r8a8ppxhifmfpzi6x6pfvrd";
+    url = "http://maude.cs.uiuc.edu/download/current/FM2.6/full-maude26.maude";
+    sha256 = "1382hjwwrsdgd5yjn3ph1b5i1bhrhzvqx0v369bmcjkly9k96v6q";
   };
 
   buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper];
 
   configurePhase = ''./configure --disable-dependency-tracking --prefix=$out --datadir=$out/share/maude TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"'';
 
-  # The test suite is known to fail on Darwin. If maude is ever updated to a
-  # new version, this exception ought to be removed again.
-  doCheck = !stdenv.isDarwin;
+  doCheck = true;
 
   postInstall =
   ''

From cb41a67c476b108883687e623e1c901549cb5cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 11 Feb 2011 15:56:29 +0000
Subject: [PATCH 02/40] Building mumble a bit further.

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

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index c29b0ec7446..3b9673a294f 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile,
  avahi }:
         
-throw "It does not build still. It wants dns_sd.h"
+throw "It does not build still. It wants a g15daemon header file or so"
 
 stdenv.mkDerivation rec {
   name = "mumble-" + version;
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 525175c0d83..709ea3583dc 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,6 +1,7 @@
 { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
 , expat, gettext, intltool, glib, gtk, qt4 ? null, lib
-, qt4Support ? false }:
+, qt4Support ? false
+, withLibdnsCompat ? false }:
 
 assert qt4Support -> qt4 != null;
 
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
       "--${if qt4Support then "enable" else "disable"}-qt4"
       "--disable-python"
       "--with-distro=none" "--localstatedir=/var"
-    ];
+    ] ++ stdenv.lib.optional withLibdnsCompat "--enable-compat-libdns_sd";
 
   meta = {
     description = "Avahi, an mDNS/DNS-SD implementation";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87f08e0d29b..2785dd53ac5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6369,8 +6369,7 @@ let
 
   mumble = callPackage ../applications/networking/mumble {
     avahi = avahi.override {
-      qt4Support = true;
-      inherit qt4;
+      withLibdnsCompat = true;
     };
   };
 

From ad303411cc8ef26b0856a18dedb22fb2aab6f23f Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Fri, 11 Feb 2011 18:05:35 +0000
Subject: [PATCH 03/40] Advance lftp to current release version 4.1.3

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

diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index c0e4f61b702..dbef588f370 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl, readline}:
+{stdenv, fetchurl, gnutls, libtasn1, pkgconfig, readline, zlib}:
 stdenv.mkDerivation {
-  name = "lftp-3.5.14";
+  name = "lftp-4.1.3";
 
   src = fetchurl {
-    url = ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/lftp-3.5.14.tar.bz2;
-    sha256 = "0hzrbhpgvndpd4wd08whfv1iqzbcijs1nxz40rhn651xabhiasrv";
+    url = ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/lftp-4.1.3.tar.bz2;
+    sha256 = "1nbgbql8kkhdvai0glwgkq8l9ik09l5lb8znpjrv26hfzl15dvv1";
   };
 
-  buildInputs = [readline];
+  buildInputs = [gnutls libtasn1 pkgconfig readline zlib];
 }

From 98bda5c728580e64d894670865d7a370463dc3c2 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Fri, 11 Feb 2011 22:49:27 +0000
Subject: [PATCH 04/40] Adding ropemacs, a plugin for refactoring python in
 emacs

svn path=/nixpkgs/trunk/; revision=25913
---
 pkgs/top-level/python-packages.nix | 32 +++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 96631271225..a9284524b7a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -481,12 +481,12 @@ rec {
 
   nose = buildPythonPackage {
     name = "nose-0.11.3";
-    
+
     src = fetchurl {
       url = http://python-nose.googlecode.com/files/nose-0.11.3.tar.gz;
       sha256 = "1hl3lbwdfl2a64q3dxc73kbiks4iwx5cixlbavyryd8xdr7iziww";
     };
-    
+
     meta = {
       description = "A unittest-based testing framework for python that makes writing and running tests easier";
     };
@@ -853,6 +853,24 @@ rec {
     };
   });
 
+  ropemacs = buildPythonPackage (rec {
+    version = "0.6";
+    name = "ropemacs-${version}";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/rope/${name}.tar.gz";
+      sha256 = "1afqybmjn7fqkwx8y8kx1kfx181ix73cbq3a0d5n7ryjm7k1r0s4";
+    };
+
+    doCheck = false;
+    meta = with stdenv.lib; {
+      description = "a plugin for performing python refactorings in emacs";
+      homepage = http://rope.sf.net/ropemacs.html;
+      maintainers = [ maintainers.goibhniu ];
+      license = licenses.gpl2;
+    };
+  });
+
   pysvn = pkgs.stdenv.mkDerivation {
     name = "pysvn-1.7.2";
 
@@ -917,19 +935,19 @@ rec {
       homepage = http://www.darwinsys.com/file/;
     };
   };
-  
+
   MySQL_python = buildPythonPackage {
     name = "MySQL-python-1.2.3";
-    
+
     doCheck = false;
-    
+
     src = fetchurl {
       url = mirror://sourceforge/mysql-python/MySQL-python-1.2.3.tar.gz;
       sha256 = "0vkyg9dmj29hzk7fy77f42p7bfj28skyzsjsjry4wqr3z6xnzrkx";
     };
-    
+
     propagatedBuildInputs = [ pkgs.mysql pkgs.zlib nose ];
-    
+
     meta = {
       description = "MySQL database binding for Python";
 

From dd0f90b302c19e85b7fbf5129bdce7d56a16b9e5 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Fri, 11 Feb 2011 23:06:54 +0000
Subject: [PATCH 05/40] Adding rope, a python refactoring library

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a9284524b7a..34a5b04e03d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -853,6 +853,24 @@ rec {
     };
   });
 
+  rope = buildPythonPackage (rec {
+    version = "0.9.3";
+    name = "rope-${version}";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/rope/${name}.tar.gz";
+      sha256 = "1092rlsfna7rm1jkdanilsmw7rr3hlkgyji02xfd02wfcm8xa2i7";
+    };
+
+    doCheck = false;
+    meta = with stdenv.lib; {
+      description = "python refactoring library";
+      homepage = http://rope.sf.net;
+      maintainers = [ maintainers.goibhniu ];
+      license = licenses.gpl2;
+    };
+  });
+
   ropemacs = buildPythonPackage (rec {
     version = "0.6";
     name = "ropemacs-${version}";

From 93a6c31a9a1e1a19cc14f12d5a307b1b853ec679 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 12 Feb 2011 12:50:02 +0000
Subject: [PATCH 06/40] Avoiding easy_install in order to get rope and ropemacs
 working for now.

svn path=/nixpkgs/trunk/; revision=25917
---
 pkgs/top-level/python-packages.nix | 34 +++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 34a5b04e03d..aa1d4ce65f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -853,7 +853,7 @@ rec {
     };
   });
 
-  rope = buildPythonPackage (rec {
+  rope = pkgs.stdenv.mkDerivation rec {
     version = "0.9.3";
     name = "rope-${version}";
 
@@ -862,16 +862,21 @@ rec {
       sha256 = "1092rlsfna7rm1jkdanilsmw7rr3hlkgyji02xfd02wfcm8xa2i7";
     };
 
-    doCheck = false;
+    buildInputs = [ python ];
+
+    installPhase = ''
+      python setup.py install --prefix=$out
+    '';
+
     meta = with stdenv.lib; {
       description = "python refactoring library";
       homepage = http://rope.sf.net;
       maintainers = [ maintainers.goibhniu ];
       license = licenses.gpl2;
     };
-  });
+  };
 
-  ropemacs = buildPythonPackage (rec {
+  ropemacs = pkgs.stdenv.mkDerivation rec {
     version = "0.6";
     name = "ropemacs-${version}";
 
@@ -880,14 +885,19 @@ rec {
       sha256 = "1afqybmjn7fqkwx8y8kx1kfx181ix73cbq3a0d5n7ryjm7k1r0s4";
     };
 
-    doCheck = false;
-    meta = with stdenv.lib; {
-      description = "a plugin for performing python refactorings in emacs";
-      homepage = http://rope.sf.net/ropemacs.html;
-      maintainers = [ maintainers.goibhniu ];
-      license = licenses.gpl2;
-    };
-  });
+    buildInputs = [ python ];
+
+    installPhase = ''
+      python setup.py install --prefix=$out
+    '';
+
+     meta = with stdenv.lib; {
+       description = "a plugin for performing python refactorings in emacs";
+       homepage = http://rope.sf.net/ropemacs.html;
+       maintainers = [ maintainers.goibhniu ];
+       license = licenses.gpl2;
+     };
+  };
 
   pysvn = pkgs.stdenv.mkDerivation {
     name = "pysvn-1.7.2";

From 65e3a1b21cb60c3f7253c0e7c969fd928614a7d9 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 12 Feb 2011 13:38:23 +0000
Subject: [PATCH 07/40] Adding pymacs, an Emacs Lisp to Python interface

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa1d4ce65f2..82be2783a2b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -699,6 +699,34 @@ rec {
     };
   });
 
+  pymacs = pkgs.stdenv.mkDerivation rec {
+    version = "v0.24-beta2";
+    name = "Pymacs-${version}";
+
+    src = fetchurl {
+      url = "https://github.com/pinard/Pymacs/tarball/${version}";
+      name = "${name}.tar.gz";
+      sha256 = "0nzb3wrxwy0cmmj087pszkwgj2v22x0y5m4vxb6axz94zfl02r8j";
+    };
+
+    buildInputs = [ python ];
+
+    configurePhase = ''
+      python p4 -C p4config.py *.in Pymacs contrib tests
+    '';
+
+    installPhase = ''
+      python setup.py install --prefix=$out
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Emacs Lisp to Python interface";
+      homepage = http://pymacs.progiciels-bpi.ca;
+      license = licenses.gpl2;
+      maintainers = [ maintainers.goibhniu ];
+    };
+  };
+
   pyopengl =
     let version = "3.0.0b5";
     in

From 36c45a06dd32eead318c406363ffff258b8704fb Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 12 Feb 2011 18:47:28 +0000
Subject: [PATCH 08/40] Updating chromium, I've added myself as a maintainer
 since I'm happy to keep it updated in the future

svn path=/nixpkgs/trunk/; revision=25921
---
 .../networking/browsers/chromium/default.nix      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index e7d4074c3d0..3f3aeaaf297 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -8,17 +8,17 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
 
 stdenv.mkDerivation rec {
   name = "chrome-${version}";
-  version = "70357";
+  version = "74731";
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = http://build.chromium.org/f/chromium/continuous/linux64/2011-01-02/70375/chrome-linux.zip;
-        sha256 = "0zz9pl1ksiwk5kcsa5isviacg8awzs2gmirg8n36qni07dj5wiq8";
+        url = "http://build.chromium.org/f/chromium/continuous/linux64/2011-02-12/${version}/chrome-linux.zip";
+        sha256 = "1g1xi8l02mv53r7g3x6w93i0rqdx09k8x7bypm9g51w315k6yssj";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
-        url = http://build.chromium.org/f/chromium/continuous/linux/2011-01-02/70375/chrome-linux.zip;
-        sha256 = "1i7sb6wgf19zr97r2s5n0p4543i736n8c2hnhk483hjzikg2j55i";
+        url = "http://build.chromium.org/f/chromium/continuous/linux/2011-02-12/${version}/chrome-linux.zip";
+        sha256 = "163z2b7c7plf0ys18mj0g5ppkdfw9sr8i089hy2h7l0xscp18s11";
       }
     else throw "Chromium is not supported on this platform.";
 
@@ -51,7 +51,10 @@ stdenv.mkDerivation rec {
     ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
   '';
 
-  meta = {
+  meta =  with stdenv.lib; {
     description = "Chromium, an open source web browser";
+    homepage = http://www.chromium.org/;
+    maintainers = [ maintainers.goibhniu ];
+    license = licenses.bsd3;
   };
 }

From 489b0e2fe5d4ca1b8eb2fa6c66cdc414be3d3524 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Sat, 12 Feb 2011 20:18:41 +0000
Subject: [PATCH 09/40] libebml: 1.0.0

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

diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix
new file mode 100644
index 00000000000..5cd17abc43e
--- /dev/null
+++ b/pkgs/development/libraries/libebml/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libebml-1.0.0";
+
+  src = fetchurl {
+    url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2";
+    sha256 = "0y5ip30nr96wjlh1pzw35ia1axyib158dhz8r5dxzmbcfgn0sj3j";
+  };
+
+  configurePhase = "cd make/linux";
+  makeFlags = "prefix=$(out)";
+
+  meta = {
+    description = "Extensible Binary Meta Language library";
+    homepage = http://dl.matroska.org/downloads/libebml/;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2785dd53ac5..cf83e263f93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3451,6 +3451,8 @@ let
 
   libdvdread = callPackage ../development/libraries/libdvdread { };
 
+  libebml = callPackage ../development/libraries/libebml { };
+
   libedit = callPackage ../development/libraries/libedit { };
 
   libelf = callPackage ../development/libraries/libelf { };

From 188b3c00baa94c9694c55daf0963a507f73e8488 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Sat, 12 Feb 2011 20:18:46 +0000
Subject: [PATCH 10/40] libmatroska: 1.0.0

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

diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix
new file mode 100644
index 00000000000..b851077a6f1
--- /dev/null
+++ b/pkgs/development/libraries/libmatroska/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libebml }:
+
+stdenv.mkDerivation rec {
+  name = "libmatroska-1.0.0";
+
+  src = fetchurl {
+    url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2";
+    sha256 = "123v2dhvv6yijqxc30spabzznjf5lbcv4iv4mmz4b3jhvwiha06w";
+  };
+
+  configurePhase = "cd make/linux";
+  makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib";
+  propagatedBuildInputs = [ libebml ];
+
+  meta = {
+    description = "Matroska library";
+    homepage = http://dl.matroska.org/downloads/libmatroska;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf83e263f93..143de3f3980 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3575,6 +3575,8 @@ let
 
   libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { };
 
+  libmatroska = callPackage ../development/libraries/libmatroska { };
+
   libmcs = callPackage ../development/libraries/libmcs { };
 
   libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { };

From 87418d034b9775ab564c6f62ab3aadf7bf83bd2c Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Sat, 12 Feb 2011 20:18:53 +0000
Subject: [PATCH 11/40] mkvtoolnix: 4.4.0

svn path=/nixpkgs/trunk/; revision=25925
---
 .../applications/video/mkvtoolnix/default.nix | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/video/mkvtoolnix/default.nix

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
new file mode 100644
index 00000000000..69876b91e75
--- /dev/null
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl
+, libmatroska
+, flac
+, libvorbis
+, file
+, boost
+, lzo
+, xdg_utils
+, expat
+, wxGTK
+, zlib
+, ruby
+, gettext
+}:
+
+stdenv.mkDerivation rec {
+  name = "mkvtoolnix-4.4.0";
+
+  src = fetchurl {
+    url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.bz2";
+    sha256 = "0apgmah1d4dh5x1phr4n5vgwmy0w1nym9pydzh4kdgcs167l8n6l";
+  };
+
+  buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext ];
+
+  configureFlags = "--with-boost-libdir=${boost}/lib";
+  buildPhase = ''
+    ruby ./drake
+  '';
+
+  installPhase = ''
+    ruby ./drake install
+  '';
+
+  meta = {
+    description = "Matroska library";
+    homepage = http://dl.matroska.org/downloads/libmatroska;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 143de3f3980..8332f2e361b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3806,6 +3806,8 @@ let
 
   ming = callPackage ../development/libraries/ming { };
 
+  mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
+
   mlt = callPackage ../development/libraries/mlt {
     qt = qt4;
   };

From ed85acac61a7baebad9329becbbe198db21f1441 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Sat, 12 Feb 2011 20:22:55 +0000
Subject: [PATCH 12/40] fix mkvtoolnix description and homepage

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

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 69876b91e75..7355266b934 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Matroska library";
-    homepage = http://dl.matroska.org/downloads/libmatroska;
+    description = "Cross-platform tools for Matroska";
+    homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
   };
 }
 

From af7a77aca6866b08dae12b1b43076a14865b59b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 12 Feb 2011 20:31:25 +0000
Subject: [PATCH 13/40] Mumble builds

svn path=/nixpkgs/trunk/; revision=25927
---
 pkgs/applications/networking/mumble/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 3b9673a294f..4befca2f606 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,8 +1,6 @@
 { stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile,
- avahi }:
+ avahi, dbus, libcap }:
         
-throw "It does not build still. It wants a g15daemon header file or so"
-
 stdenv.mkDerivation rec {
   name = "mumble-" + version;
   version = "1.2.2";
@@ -17,9 +15,13 @@ stdenv.mkDerivation rec {
     sed -e /qt_ja_JP.qm/d -i src/mumble/mumble_qt.qrc src/mumble11x/mumble_qt.qrc
   '';
 
-  configurePhase = "qmake PREFIX=$out";
+  configurePhase = ''
+    qmake PREFIX=$out CONFIG+=no-g15 CONFIG+=no-update \
+      CONFIG+=no-embed-qt-translations CONFIG+=no-ice
+  '';
 
-  buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi ];
+  buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi dbus
+    libcap ];
 
   meta = { 
     homepage = http://mumble.sourceforge.net/;

From db47cdae9d6e3c974bdc646def498f6bffd4c387 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sun, 13 Feb 2011 00:49:07 +0000
Subject: [PATCH 14/40] xapian(-bindings)-1.0.23 from 1.0.14

svn path=/nixpkgs/trunk/; revision=25928
---
 pkgs/development/libraries/xapian/bindings/default.nix | 8 ++++----
 pkgs/development/libraries/xapian/default.nix          | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix
index b2c172a4d57..10128788aff 100644
--- a/pkgs/development/libraries/xapian/bindings/default.nix
+++ b/pkgs/development/libraries/xapian/bindings/default.nix
@@ -3,13 +3,13 @@
 
 let inherit (composableDerivation) wwf; in
 
-composableDerivation.composableDerivation {} {
+composableDerivation.composableDerivation {} rec {
 
-  name = "xapian-bindings-1.0.14";
+  name = "xapian-bindings-1.0.23";
 
   src = fetchurl {
-    url = http://oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz;
-    sha256 = "060jjwddv6ws8iy3jkpl4zcrzzinkjvdblkl0gcja90qzl2j81q5";
+    url = "http://oligarchy.co.uk/xapian/1.0.23/${name}.tar.gz";
+    sha256 = "6028123c3cd9bfc380b672b89f5420f7d5c063fc3511dee4dd5d34033ccb6911";
   };
 
   buildInputs = [ xapian pkgconfig ];
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 6b2966ee7e2..e8a8e39e062 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation {
-  name = "xapian-1.0.14";
+  name = "xapian-1.0.23";
 
   src = fetchurl {
-    url = http://oligarchy.co.uk/xapian/1.0.14/xapian-core-1.0.14.tar.gz;
-    sha256 = "0d51p6210059dbf0vn6zh2iyg4i5pynmhyh0gphnph2b317a1dcx";
+    url = http://oligarchy.co.uk/xapian/1.0.23/xapian-core-1.0.23.tar.gz;
+    sha256 = "0aed7296bd56b4b49aba944cc744e1e76fff8cfb0a70fd5b1f49d4c62a97ecc6";
   };
 
   buildInputs = [zlib];

From f4dc1b73f2f33f171f3e873d120e8b829631c332 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sun, 13 Feb 2011 01:34:44 +0000
Subject: [PATCH 15/40] added myself to list of maintainers

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

diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 552427bb9f9..f35e557145a 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -8,6 +8,7 @@
   andres = "Andres Loeh <andres@cs.uu.nl>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   bjg = "Brian Gough <bjg@gnu.org>";
+  chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   eelco = "Eelco Dolstra <e.dolstra@tudelft.nl>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   guibert = "David Guibert <david.guibert@gmail.com>";

From f03892655be76ca1da736bcfc483289d1f3bb56c Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sun, 13 Feb 2011 01:34:49 +0000
Subject: [PATCH 16/40] notmuch -- The mail indexer

configure fails so far:
Checking for Xapian development files... Yes (1.0.23).
Checking for GMime development files... No.
Checking for talloc development files... No.
Checking for valgrind development files... No (but that's fine).
Checking if emacs is available... Yes.

svn path=/nixpkgs/trunk/; revision=25930
---
 .../mailreaders/notmuch/default.nix           | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/notmuch/default.nix

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
new file mode 100644
index 00000000000..789aada3929
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -0,0 +1,23 @@
+{ fetchurl, stdenv, emacs, gmime, talloc, xapian }:
+
+stdenv.mkDerivation rec {
+  name = "notmuch-0.5";
+
+  src = fetchurl {
+    url = "http://notmuchmail.org/releases/${name}.tar.gz";
+    sha256 = "c7eeb95c89c5b9cb22cc0b90abce5f923c20c982d607bf32829c989e905ff1a9";
+  };
+
+  buildInputs = [ emacs gmime talloc xapian ];
+
+  meta = {
+    description = "Notmuch -- The mail indexer";
+
+    longDescription = "";
+
+    license = "GPLv3";
+
+    maintainers = [ stdenv.lib.maintainers.chaoflow ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8332f2e361b..6a33048b1dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6404,6 +6404,8 @@ let
   netsurfBrowser = netsurf.browser;
   netsurf = recurseIntoAttrs (import ../applications/networking/browsers/netsurf { inherit pkgs; });
 
+  notmuch = callPackage ../applications/networking/mailreaders/notmuch { };
+
   nvi = callPackage ../applications/editors/nvi { };
 
   ocrad = callPackage ../applications/graphics/ocrad { };

From 4b603776af6f99e4cef0bc46359ffdc8c19d763b Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sun, 13 Feb 2011 01:56:32 +0000
Subject: [PATCH 17/40] notmuch-0.5 build successful

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

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 789aada3929..4a457093f7b 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, emacs, gmime, talloc, xapian }:
+{ fetchurl, stdenv, emacs, glib, gmime, pkgconfig, talloc, xapian }:
 
 stdenv.mkDerivation rec {
   name = "notmuch-0.5";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "c7eeb95c89c5b9cb22cc0b90abce5f923c20c982d607bf32829c989e905ff1a9";
   };
 
-  buildInputs = [ emacs gmime talloc xapian ];
+  buildInputs = [ emacs glib gmime pkgconfig talloc xapian ];
 
   meta = {
     description = "Notmuch -- The mail indexer";

From 5e7c026c22070e1a2a7206e792abc6deb3582683 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 13 Feb 2011 04:34:37 +0000
Subject: [PATCH 18/40] kde-x.y/utils is for kdeutils-x.y.z, not for apps from
 kde-apps.org

svn path=/nixpkgs/trunk/; revision=25932
---
 .../misc/kde-wacomtablet/default.nix}                  | 10 +++++-----
 pkgs/desktops/kde-4.5/default.nix                      |  1 -
 pkgs/top-level/all-packages.nix                        |  2 ++
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename pkgs/{desktops/kde-4.5/utils/wacomtablet.nix => applications/misc/kde-wacomtablet/default.nix} (68%)

diff --git a/pkgs/desktops/kde-4.5/utils/wacomtablet.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix
similarity index 68%
rename from pkgs/desktops/kde-4.5/utils/wacomtablet.nix
rename to pkgs/applications/misc/kde-wacomtablet/default.nix
index b9545a7b0ed..6da0b8410a0 100644
--- a/pkgs/desktops/kde-4.5/utils/wacomtablet.nix
+++ b/pkgs/applications/misc/kde-wacomtablet/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, automoc4, cmake, kdelibs, qt4 }:
+{ stdenv, fetchurl, automoc4, cmake, kdelibs }:
 
 stdenv.mkDerivation rec {
-  name = "wacomtablet";
-  version = "1.2.5";
+  name = "wacomtablet-1.2.5";
 
   src = fetchurl {
-    url = "http://kde-apps.org/CONTENT/content-files/114856-${name}-${version}.tar.gz";
+    url = "http://kde-apps.org/CONTENT/content-files/114856-${name}.tar.gz";
     sha256 = "11hfab6sqmhvd0m1grc9m9yfi0p7rk0bycj9wqgkgbc8cwgps6sf";
   };
 
-  buildInputs = [ automoc4 cmake kdelibs qt4 ];
+  buildInputs = [ automoc4 cmake kdelibs ];
 
   meta = with stdenv.lib; {
     description = "KDE Wacom graphic tablet configuration tool";
     license = "GPLv2";
     homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856;
     platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu maintainers.urkud ];
   };
 }
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 7beaf800999..fc8cab37aef 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -140,7 +140,6 @@ recurseIntoAttrs rec {
     printer_applet = callPackage ./utils/printer-applet.nix { };
     superkaramba = callPackage ./utils/superkaramba.nix { };
     sweeper = callPackage ./utils/sweeper.nix { };
-    wacomtablet = callPackage ./utils/wacomtablet.nix { };
   };
 
   kdewebdev = combinePkgs "kdewebdev" {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a33048b1dd..ab78642b186 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6193,6 +6193,8 @@ let
 
   kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
 
+  kde_wacomtablet = newScope pkgs.kde4 ../applications/misc/kde-wacomtablet { };
+
   kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { };
 
   kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { };

From ab4967929240f376b83dceb29e590fc7dbd34f6f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 13 Feb 2011 04:36:41 +0000
Subject: [PATCH 19/40] KDE-4.6.0 (not ready yet!!)

Mostly automatic changes. Will fix evaluation/compilation later.

svn path=/nixpkgs/trunk/; revision=25933
---
 pkgs/desktops/kde-4.6/admin/default.nix       |   5 +-
 .../desktops/kde-4.6/base-runtime/default.nix |   5 +-
 .../kde-4.6/base-workspace/default.nix        |   5 +-
 pkgs/desktops/kde-4.6/base/default.nix        |   5 +-
 pkgs/desktops/kde-4.6/bindings/default.nix    |   5 +-
 pkgs/desktops/kde-4.6/default.nix             |  12 +-
 pkgs/desktops/kde-4.6/edu/default.nix         |   5 +-
 pkgs/desktops/kde-4.6/games/default.nix       |   5 +-
 pkgs/desktops/kde-4.6/graphics/default.nix    |   5 +-
 pkgs/desktops/kde-4.6/kde-package/default.nix |  36 +--
 .../kde-4.6/kde-package/manifest-4.6.0.nix    |  85 ++++++
 pkgs/desktops/kde-4.6/l10n/default.nix        |  44 +--
 pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh   |   1 +
 pkgs/desktops/kde-4.6/l10n/manifest-4.6.0.nix | 267 ++++++++++++++++++
 pkgs/desktops/kde-4.6/libs/default.nix        |   5 +-
 pkgs/desktops/kde-4.6/multimedia/default.nix  |   5 +-
 pkgs/desktops/kde-4.6/network/default.nix     |   5 +-
 .../{support => }/oxygen-icons/default.nix    |   7 +-
 pkgs/desktops/kde-4.6/pim-runtime/default.nix |   7 +-
 pkgs/desktops/kde-4.6/pim/default.nix         |   7 +-
 pkgs/desktops/kde-4.6/pimlibs/default.nix     |   5 +-
 .../kde-4.6/plasma-addons/default.nix         |   5 +-
 22 files changed, 404 insertions(+), 127 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.6/kde-package/manifest-4.6.0.nix
 create mode 100644 pkgs/desktops/kde-4.6/l10n/manifest-4.6.0.nix
 rename pkgs/desktops/kde-4.6/{support => }/oxygen-icons/default.nix (68%)

diff --git a/pkgs/desktops/kde-4.6/admin/default.nix b/pkgs/desktops/kde-4.6/admin/default.nix
index c4b30643ea0..8b91430ddd9 100644
--- a/pkgs/desktops/kde-4.6/admin/default.nix
+++ b/pkgs/desktops/kde-4.6/admin/default.nix
@@ -18,9 +18,6 @@ kde.package {
   meta = {
     description = "KDE Administration Utilities";
     license = "GPL";
-    kde = {
-      name = "kdeadmin";
-      version = "4.5.90";
-    };
+    kde.module = "kdeadmin";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/base-runtime/default.nix b/pkgs/desktops/kde-4.6/base-runtime/default.nix
index 15f065f09d3..3bafa9a8cde 100644
--- a/pkgs/desktops/kde-4.6/base-runtime/default.nix
+++ b/pkgs/desktops/kde-4.6/base-runtime/default.nix
@@ -19,9 +19,6 @@ kde.package {
     description = "KDE runtime";
     longDescription = "Libraries and tools which supports running KDE desktop applications";
     license = "LGPL";
-    kde = {
-      name = "kdebase-runtime";
-      version = "4.5.90";
-    };
+    kde.module = "kdebase-runtime";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/base-workspace/default.nix b/pkgs/desktops/kde-4.6/base-workspace/default.nix
index b7f3dd47488..0d7de80085f 100644
--- a/pkgs/desktops/kde-4.6/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.6/base-workspace/default.nix
@@ -19,9 +19,6 @@ kde.package {
     description = "KDE base platform-specific components";
     longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
     license = "GPL";
-    kde = {
-      name = "kdebase-workspace";
-      version = "4.5.90";
-    };
+    kde.module = "kdebase-workspace";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/base/default.nix b/pkgs/desktops/kde-4.6/base/default.nix
index 973d2cf562d..58ec6948580 100644
--- a/pkgs/desktops/kde-4.6/base/default.nix
+++ b/pkgs/desktops/kde-4.6/base/default.nix
@@ -11,9 +11,6 @@ kde.package {
     description = "KDE Base components";
     longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole";
     license = "GPL";
-    kde = {
-      name = "kdebase";
-      version = "4.5.90";
-    };
+    kde.module = "kdebase";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/bindings/default.nix b/pkgs/desktops/kde-4.6/bindings/default.nix
index 74b59926cf7..8c615ac3a7b 100644
--- a/pkgs/desktops/kde-4.6/bindings/default.nix
+++ b/pkgs/desktops/kde-4.6/bindings/default.nix
@@ -28,10 +28,7 @@ kde.package rec {
     description = "KDE bindings";
     longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
     license = "LGPL";
-    kde = {
-      name = "kdebindings";
-      version = "4.5.90";
-    };
+    kde.module = "kdebindings";
   };
 }
 
diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix
index 3335584a7ef..db464b11c6e 100644
--- a/pkgs/desktops/kde-4.6/default.nix
+++ b/pkgs/desktops/kde-4.6/default.nix
@@ -2,14 +2,14 @@
 
 let
 
-  version = "4.5.90";
+  release = "4.6.0";
 
   # Various packages (e.g. kdesdk) have been split up into many
   # smaller packages.  Some people may want to install the entire
   # package, so provide a wrapper package that recombines them.
   combinePkgs = name: pkgs:
     let pkgs' = stdenv.lib.attrValues pkgs; in
-    runCommand "${name}-${version}" ({ passthru = pkgs // { inherit pkgs; }; })
+    runCommand "${name}-${release}" ({ passthru = pkgs // { inherit pkgs; }; })
       ''
         mkdir -p $out/nix-support
         echo ${toString pkgs'} > $out/nix-support/propagated-user-env-packages
@@ -18,13 +18,14 @@ let
 in
 
 rec {
+  recurseForRelease = true;
   inherit callPackage stdenv;
 
   qt4 = qt47;
 
   phonon = null;
 
-  kde = callPackage ./kde-package { };
+  kde = callPackage ./kde-package { inherit release; };
 
 ### SUPPORT
   akonadi = callPackage ./support/akonadi { };
@@ -35,7 +36,7 @@ rec {
 
   eigen = callPackage ./support/eigen { };
 
-  oxygen_icons = callPackage ./support/oxygen-icons { };
+  oxygen_icons = callPackage ./oxygen-icons { };
 
   polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
 
@@ -138,6 +139,7 @@ rec {
     printer_applet = callPackage ./utils/printer-applet.nix { };
     superkaramba = callPackage ./utils/superkaramba.nix { };
     sweeper = callPackage ./utils/sweeper.nix { };
+    wacomtablet = callPackage ./utils/wacomtablet.nix { };
   };
 
   kdewebdev = combinePkgs "kdewebdev" {
@@ -154,7 +156,7 @@ rec {
 
   kdebindings = callPackage ./bindings { };
 
-  l10n = callPackage ./l10n { };
+  l10n = callPackage ./l10n { inherit release; };
 
   # Make the split packages visible to `nix-env -q'.
   misc = recurseIntoAttrs
diff --git a/pkgs/desktops/kde-4.6/edu/default.nix b/pkgs/desktops/kde-4.6/edu/default.nix
index 62565a1d2fe..2227975a955 100644
--- a/pkgs/desktops/kde-4.6/edu/default.nix
+++ b/pkgs/desktops/kde-4.6/edu/default.nix
@@ -27,9 +27,6 @@ kde.package {
   meta = {
     description = "KDE Educative software";
     license = "GPL";
-    kde = {
-      name = "kdeedu";
-      version = "4.5.90";
-    };
+    kde.module = "kdeedu";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/games/default.nix b/pkgs/desktops/kde-4.6/games/default.nix
index d3836ccf507..74bb1c57ddd 100644
--- a/pkgs/desktops/kde-4.6/games/default.nix
+++ b/pkgs/desktops/kde-4.6/games/default.nix
@@ -14,9 +14,6 @@ kde.package {
   meta = {
     description = "KDE Games";
     license = "GPL";
-    kde = {
-      name = "kdegames";
-      version = "4.5.90";
-    };
+    kde.module = "kdegames";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/graphics/default.nix b/pkgs/desktops/kde-4.6/graphics/default.nix
index 78442145c9f..ed6527373eb 100644
--- a/pkgs/desktops/kde-4.6/graphics/default.nix
+++ b/pkgs/desktops/kde-4.6/graphics/default.nix
@@ -15,9 +15,6 @@ kde.package {
       Okular  document reader.
     '';
     license = "GPL";
-    kde = {
-      name = "kdegraphics";
-      version = "4.5.90";
-    };
+    kde.module = "kdegraphics";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/kde-package/default.nix b/pkgs/desktops/kde-4.6/kde-package/default.nix
index 81fd75e8f44..de3cf05b70d 100644
--- a/pkgs/desktops/kde-4.6/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.6/kde-package/default.nix
@@ -1,39 +1,25 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, release }:
 
 rec {
-  defaultArgs = {name, stable ? null, version,
-    module ? name, release ? version, ... }:
+  inherit release;
 
-    assert (name == module) -> (release == version);
+  manifest = import (./manifest + "-${release}.nix");
+
+  defaultArgs = { module, name ? module, ... }:
 
     (
       {
-        name = "${name}-${version}";
+        name = "${name}-${release}";
 
-        src =
-          let
-            manifest = (import (./manifest + "-${release}.nix"));
-            _stable = if stable == null then manifest.stable else stable;
-            stableString = if _stable then "stable" else "unstable";
-          in
-          fetchurl {
-            url = "mirror://kde/${stableString}/${release}/src/${module}-${release}.tar.bz2";
-            sha256 = stdenv.lib.maybeAttr
-              module
-              (throw "No module ${module} in release ${release}!")
-              manifest.packages;
-          };
+        src = fetchurl {
+          url = "mirror://kde/" + (if manifest.stable then "" else "un")
+            + "stable/${release}/src/${module}-${release}.tar.bz2";
+          sha256 = builtins.getAttr module manifest.packages;
+        };
 
         meta = {
           maintainers = with stdenv.lib.maintainers; [ sander urkud ];
           platforms = stdenv.lib.platforms.linux;
-          homepage = if name == module
-            then http://www.kde.org
-            else assert builtins.substring 0 3 module == "kde";
-              "http://"
-              + builtins.substring 3
-                (builtins.sub (builtins.stringLength module) 3) module
-              + ".kde.org/projects/${name}";
         };
       } // (if module == name then { } else {
         cmakeFlags = ''
diff --git a/pkgs/desktops/kde-4.6/kde-package/manifest-4.6.0.nix b/pkgs/desktops/kde-4.6/kde-package/manifest-4.6.0.nix
new file mode 100644
index 00000000000..a3d83513bb8
--- /dev/null
+++ b/pkgs/desktops/kde-4.6/kde-package/manifest-4.6.0.nix
@@ -0,0 +1,85 @@
+{
+  stable = true;
+  packages = builtins.listToAttrs [
+    {
+      name = "kdeaccessibility";
+      value = "06b1w7gnfga4nd0spx48s5cx5jfsc9mxzc5yncns0471ia98ww92";
+    }
+    {
+      name = "kdeadmin";
+      value = "0nl3smhlsa4f68qq6p1kjbai2v5lbji2v84k96jfqvpjbkygkq27";
+    }
+    {
+      name = "kdeartwork";
+      value = "1qy0qwl3p0k5myd2f2ky400r5wvaq8gbvgb7mq6093amq0fghxlx";
+    }
+    {
+      name = "kdebase";
+      value = "095k83i1wd3cpk1pyc451gc4fajjynfknf83jsb6vxqisvm2mjn2";
+    }
+    {
+      name = "kdebase-runtime";
+      value = "1vwjly7p28sbhkg1vvnm0l94l2kwcs64jfh9hxlrgfz2bqp48b87";
+    }
+    {
+      name = "kdebase-workspace";
+      value = "10jkv4si6v12m9gspb7yk6x34lanwrnwfdw68jr59wp1ibcpkzzl";
+    }
+    {
+      name = "kdebindings";
+      value = "1xggvgryadi93hn3223614z4qajvypllxjscixv5zc9mvyh9z3ng";
+    }
+    {
+      name = "kdeedu";
+      value = "1x3s0dz8kyd8x7parzks434ifr8mj3w3lwaw30np4khgva258r2n";
+    }
+    {
+      name = "kdegames";
+      value = "1p8d9sy9mafza428wkj5g8hnfl8d06wqf74pdd39yr1ilmw0w1rb";
+    }
+    {
+      name = "kdegraphics";
+      value = "0j28aa2bglhpi9ck6a7334q603k7lfmfsr47grab81ic9aw6x38n";
+    }
+    {
+      name = "kdelibs";
+      value = "1pfydrdi4zwyxpygfmvk2jnfjal747kpf1m2az4fhvv91kx4clpd";
+    }
+    {
+      name = "kdemultimedia";
+      value = "1dhi7m5f22pz7sdrcl9g8zwf0mqcxzcys8hgbxzjfwjkg6h8mz28";
+    }
+    {
+      name = "kdenetwork";
+      value = "0d37db21nz3kjrr1swqykdbzwq3x4kapy3b9pbjic38phfnxksrs";
+    }
+    {
+      name = "kdepimlibs";
+      value = "1377lhlkfadfsqylkjm8hs8csak2cr6lwgimv97wxmp3x8v3lddq";
+    }
+    {
+      name = "kdeplasma-addons";
+      value = "0p8vzvnf0alk9yfv2ynawfbb33h68yhgc3f2ibgm1sdyg4gqx615";
+    }
+    {
+      name = "kdesdk";
+      value = "12hm20pzxj1k42l52dvjl64xda2r2gnvzlmf9kx9c5ccc0p8ch9z";
+    }
+    {
+      name = "kdetoys";
+      value = "0qaxy74n9g0vd6vqqwj3avbi3zhxikxk5aghdy2ynininmwzvqd9";
+    }
+    {
+      name = "kdeutils";
+      value = "1nv2fk8i77vc4jz9cbg4hvw5azw7ncvs3ircj74xy3ndw5b3fhxa";
+    }
+    {
+      name = "kdewebdev";
+      value = "0yl21qixd2ch6jxxccy03qnwnrws4lhbzj5hiv9pkw8w6zm16503";
+    }
+    {
+      name = "oxygen-icons";
+      value = "0a56q2d6nz3nsh8l5cycjiw7dq6ffkgyg3gyqql5iszcp6hrif3b";
+    }
+  ];
+}
diff --git a/pkgs/desktops/kde-4.6/l10n/default.nix b/pkgs/desktops/kde-4.6/l10n/default.nix
index f3b384ad91d..22acca2d1cf 100644
--- a/pkgs/desktops/kde-4.6/l10n/default.nix
+++ b/pkgs/desktops/kde-4.6/l10n/default.nix
@@ -1,26 +1,18 @@
-{ stdenv, fetchurl, cmake, kdelibs, gettext, perl, automoc4 }:
+{ stdenv, fetchurl, cmake, kdelibs, gettext, perl, automoc4, release }:
 
 let
-  overrides = { };
 
-  defaultRelease = "4.5.90";
-  releases = [ "4.5.90" ];
+  inherit (stdenv.lib) attrByPath singleton;
 
-  sanitizeString = replaceChars [ "@" "." ] [ "_" "_" ];
-  getOverride = name: attrByPath [name] {} overrides;
+  kdeL10nDerivation =
+    { lang, saneName, sha256 }:
 
-  inherit (stdenv.lib) replaceChars attrByPath singleton;
+    stdenv.mkDerivation rec {
+      name = "kde-l10n-${saneName}-${release}";
 
-  kdeL10nDerivation = {lang, sha256, release} :
-    let
-      name = "kde-l10n-${lang}-${release}";
-      saneName = "kde-l10n-${sanitizeString lang}-${release}";
-    in
-    stdenv.mkDerivation ({
-      name = saneName;
       src = fetchurl {
-        url = "mirror://kde/unstable/${release}/src/kde-l10n/${name}.tar.bz2";
-        name = "${saneName}.tar.bz2";
+        url = "mirror://kde/stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
+        name = "${name}.tar.bz2";
         inherit sha256;
       };
 
@@ -31,19 +23,14 @@ let
         license = "GPL";
         inherit (kdelibs.meta) maintainers platforms homepage;
       };
-    }
-    // (getOverride lang) // (getOverride name)
-  );
+    };
 
-  kdeL10nRelease = release:
-    let
-      releaseStr = sanitizeString release;
-    in
+  kdeL10nRelease =
     builtins.listToAttrs (
-      map ({lang, sha256}:
+      map ({lang, saneName, sha256}:
         {
-          name = "${sanitizeString lang}";
-          value = kdeL10nDerivation { inherit lang release sha256;};
+          name = saneName;
+          value = kdeL10nDerivation { inherit lang saneName sha256; };
         }
       ) (import (./manifest + "-${release}.nix"))
     );
@@ -52,7 +39,4 @@ in
 {
   inherit kdeL10nDerivation;
   recurseForDerivations = true;
-}
-// builtins.listToAttrs (map (r : { name = sanitizeString r; value =
-kdeL10nRelease r; }) releases)
-// (kdeL10nRelease defaultRelease)
+} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh
index baa235e0f75..cc0eec20aaa 100755
--- a/pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh
+++ b/pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh
@@ -24,6 +24,7 @@ for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do
   hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
   echo "{"
   echo "  lang = \"${lang}\";"
+  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
   echo "  sha256 = \"${hash}\";"
   echo "}"
   echo $hash >&2
diff --git a/pkgs/desktops/kde-4.6/l10n/manifest-4.6.0.nix b/pkgs/desktops/kde-4.6/l10n/manifest-4.6.0.nix
new file mode 100644
index 00000000000..6922427b502
--- /dev/null
+++ b/pkgs/desktops/kde-4.6/l10n/manifest-4.6.0.nix
@@ -0,0 +1,267 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "1dadlmd3s3752hcssnpzagly18yx7bj3r9pkc5qcb8nn9h91a92x";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "1nhqxdllfsljfnpw6ii78nfbv4rqncha1jjz9x9mz59qw4671a6n";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "1siha5sihazjdp7r26isi2m1s6nhzg4f7z2qqghh64lj3pw4xbzc";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "1d977lm78s1jq49ss5k6a6ixz1wiaq03i6pdjpl09jyirmlkg7dw";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "193xk5xsqq81xqcwmpix4dcz4l3qbwnvk1bc6awapcr8g56cgxbx";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "1y3b36y6w3ca238bnyvfvbkvpadbyvch40p4g82fg16ifnqpxrc7";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "1h38dxq6ggrvmc6b2w825xk7sf1032m9psfpg04gzarq6qicskdw";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "0ngs7k9nd7vz54804jnbvm10d8iiajvkiz01g9pimkiwlid325d3";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "12fr4npqcrsnndlz8qvbca5v6r0da53phxa1mks8ka603gh76hg3";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "1mf034ha0n27f82cx20cfr1jsbiapz4zs8bwwhjbdbiizsxivanj";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "1x1b8kn8fnv6dvg6f2j6h8kg1g4z3j9zb16likiwb6rp7fy0a859";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "1y2gwi2x5qx04yfqhn21asgsc67kn895l4npi8nhzv2pa0w8mif6";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0lfw1s7ryl5fmrj07390ldayxkfsrc3haxfi8987pg8vxwsicb7n";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "00i2ziid18c5hz468rv1mljzpyky84r03bmszy8hlakd2jmsbm9r";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "0qg200sqbnq00qpcmgw10xl6hyjk50m1zks5nly5lxpfxqkmpqzh";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "0mivdn6hq7icl41pkaim6rc4z3ilsiqlaj84s8q46f8dmh9hdvnv";
+}
+{
+  lang = "gu";
+  saneName = "gu";
+  sha256 = "1h2df76bqhnxmgwgbck69f58p616fra7jqwdi91n5zdga975y4ag";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "1gfq82666x3rvrd84qfy51638gbi6r081fxd19av52k00npkrgi5";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "1k8916yv4bs5h40dvh9p4vgpyk1ylyckliazkwaldqdhghzfkzp3";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "011pkb42m0arlkkcmlj2r353k7ybglhfsb2hjh5b3bg2sq8cmpcm";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "124x73ag3nhs9ghfn4lpw29zjyycbj9zxin2d5rb2zdj8r9p2dcw";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "1j592k8z7d08sngazjqv6fpym4863s0hg1swcvnmys5ighm69dvh";
+}
+{
+  lang = "id";
+  saneName = "id";
+  sha256 = "01h3ax0dqca05qn2vm9v12wd4iyhk2q69lwa6zic6maqnj47s50s";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "0qgwfr9k2zqqcxwh82bf0x58h9wd03l9j87hz4xpw2k3jc82fpbk";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "1rmqp0v018na4s60cq5j5nqpvz94fyvhklwb1zjhdlfd2lfwcjrc";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "1qhibkrm2qmra6ib1973dqwz43w1sd87ys8hnnnjn52fwshpcm5z";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "1si8kfsw0h1jr4grgy6b7q3gnlv6pxpr7rlgl3g9b2f62zc1xaxd";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "1gs09hxd66qxl5kwg1rd9xfqvy8l1s49lc09971rr9qw9kxy43ks";
+}
+{
+  lang = "kn";
+  saneName = "kn";
+  sha256 = "13jgfbac3b5zsjgfw7zqk5l7wxnhsnf1kpa5ski002jcxb354n7q";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "0k0jgf6w94fd21ah609axqdgwn8rmx3j09cn95i0g258f8mvibhg";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "0nh57snn8ar077k6fj9j2fza9wpwc7j8lvwzfab7i5gka7js9vj5";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "0a2w06gvgxzh312fqnagp7r8hcbry61mvy9d4lh3kvd13gkgzi9z";
+}
+{
+  lang = "mai";
+  saneName = "mai";
+  sha256 = "1l8y0ck50h4wmirk3vkmj5lbcv0h8pir1wlfs15mbsk93r89fyys";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1qw29p7w4ik8wnipsmiyfgp3k438ndr8c4m3c4p2gwx6v06vfynx";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1gp0bqmrzpi0fsp919sj057q8c4zzyi7hxanrns6kc4q42x17xd2";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "1k6694lxp0szkqdb68zsvpq15zlvi51zxz9samgd7z4ng99hvv12";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "19sp5zaccvlkfjh29dz7i9d6whxa3ap6ji0g3dxkfix76xjchlir";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "09x53m297jiqv1qclp532c6g0d9d9z5k7kdaivhi69vj2bikf63p";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "0ygajy6mmdkxidq72qhbacn8hfq8rjvc0frz0jrvv2s2ywawknpn";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "1333564qpzvdx6qv9hs6n4yssh3lakskdr69hmbjyvnmjdx07f1y";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "1p378b8nncr55vkk9sfry6zj1zhjrvswwsb5az9q1yk14wgc050a";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "15lpmdidf3as9pbw7qgryvwk26sjb9lw9v3bvxx34aq299ifb6hf";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "1n8zwhlkn9sf256jdp7fh9qazwvn95qmr789ndg1xr7xm87y87fw";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "1q3bg2kw5fghzjx6a9j0029f11w7hir67ll8pl8xi4dpw4fxdqy1";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "17xr2p3nwx3sswc3qq6qqh671h6i3rvvprhnv86axddj369dhaai";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "0kflgcbw17flk9qyk631qqkw74v7k9cyrdag3v15rpcrmvvyzxmk";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "056i52sv5zml6c9wciqbh3v6ghgvmwq8s5wzpqx7nwnl5m9cb2x8";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "0bk31gady68rp650a4d0w3zx0cz095sjqmg2j09pjsc0j29dfsf9";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "0y3vk3csx3z54lqncpcyr31ivldbn6wkhsgycghrzg7yb3n6w5pa";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "0jqsqakz2xniw9bh0dz7w1vslvkwgpibhny7yb01g604l1zz1znn";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "0jbmgh1sbfkqxim7wkn29kl5m22k105daz2ypih4f31vzdsqzn9h";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "1l4slrz0bhbhsarf4pcr86qph1ry1477y7w1956a22p8a4a4ywr3";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "11harkdwzl328b3m25l8fkc77g0mbpprgaw41bdq3pf0j6wjmd3m";
+}
+]
diff --git a/pkgs/desktops/kde-4.6/libs/default.nix b/pkgs/desktops/kde-4.6/libs/default.nix
index 88d7391def2..d9cf8b5e240 100644
--- a/pkgs/desktops/kde-4.6/libs/default.nix
+++ b/pkgs/desktops/kde-4.6/libs/default.nix
@@ -34,9 +34,6 @@ kde.package {
   meta = {
     description = "KDE libraries";
     license = "LGPL";
-    kde = {
-      name = "kdelibs";
-      version = "4.5.90";
-    };
+    kde.module = "kdelibs";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/multimedia/default.nix b/pkgs/desktops/kde-4.6/multimedia/default.nix
index d3bb8a99a66..ca9c290f692 100644
--- a/pkgs/desktops/kde-4.6/multimedia/default.nix
+++ b/pkgs/desktops/kde-4.6/multimedia/default.nix
@@ -12,9 +12,6 @@ kde.package {
       Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer.
     '';
     license = "GPL";
-    kde = {
-      name = "kdemultimedia";
-      version = "4.5.90";
-    };
+    kde.module = "kdemultimedia";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/network/default.nix b/pkgs/desktops/kde-4.6/network/default.nix
index 48ce55eed6f..c7c38611731 100644
--- a/pkgs/desktops/kde-4.6/network/default.nix
+++ b/pkgs/desktops/kde-4.6/network/default.nix
@@ -28,9 +28,6 @@ kde.package {
     description = "KDE network utilities";
     longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
     license = "GPL";
-    kde = {
-      name = "kdenetwork";
-      version = "4.5.90";
-    };
+    kde.module = "kdenetwork";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.6/oxygen-icons/default.nix
similarity index 68%
rename from pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix
rename to pkgs/desktops/kde-4.6/oxygen-icons/default.nix
index fdd3786077e..bed192f2609 100644
--- a/pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix
+++ b/pkgs/desktops/kde-4.6/oxygen-icons/default.nix
@@ -3,16 +3,13 @@
 kde.package {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0yl5clp4dyxk6pg8lp3w3z44ayjhn7i47ww8n952mam5il6mlfl1";
+  outputHash = "1qqdmg4q145gac23b0kyarslfwnlkngcxm6x37b03vr1srccycmx";
 
   buildInputs = [ cmake ];
   meta = {
     description = "KDE Oxygen theme icons";
     longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3";
     license = "GPL";
-    kde = {
-      name = "oxygen-icons";
-      version = "4.5.90";
-    };
+    kde.module = "oxygen-icons";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/pim-runtime/default.nix b/pkgs/desktops/kde-4.6/pim-runtime/default.nix
index d92f1eecc73..38f115e66e7 100644
--- a/pkgs/desktops/kde-4.6/pim-runtime/default.nix
+++ b/pkgs/desktops/kde-4.6/pim-runtime/default.nix
@@ -11,7 +11,7 @@ kde.package rec {
   '';
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
+    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.module}-${meta.kde.version}.tar.bz2";
     sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n";
   };
 
@@ -19,9 +19,6 @@ kde.package rec {
     description = "KDE PIM runtime";
     homepage = http://www.kde.org;
     license = "GPL";
-    kde = {
-      name = "kdepim-runtime";
-      version = "4.4.8";
-    };
+    kde.module = "kdepim-runtime";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/pim/default.nix b/pkgs/desktops/kde-4.6/pim/default.nix
index cdcc3dc023d..55712ae5a72 100644
--- a/pkgs/desktops/kde-4.6/pim/default.nix
+++ b/pkgs/desktops/kde-4.6/pim/default.nix
@@ -15,7 +15,7 @@ kde.package rec {
   '';
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
+    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.module}-${meta.kde.version}.tar.bz2";
     sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh";
   };
 
@@ -26,9 +26,6 @@ kde.package rec {
     '';
     license = "GPL";
     homepage = http://pim.kde.org;
-    kde = {
-      name = "kdepim";
-      version = "4.4.8";
-    };
+    kde.module = "kdepim";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/pimlibs/default.nix b/pkgs/desktops/kde-4.6/pimlibs/default.nix
index 7de75e9425b..173b00ff036 100644
--- a/pkgs/desktops/kde-4.6/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.6/pimlibs/default.nix
@@ -10,9 +10,6 @@ kde.package {
   meta = {
     description = "KDE PIM libraries";
     license = "LGPL";
-    kde = {
-      name = "kdepimlibs";
-      version = "4.5.90";
-    };
+    kde.module = "kdepimlibs";
   };
 }
diff --git a/pkgs/desktops/kde-4.6/plasma-addons/default.nix b/pkgs/desktops/kde-4.6/plasma-addons/default.nix
index 4b478e8f2e1..65e4e3a9772 100644
--- a/pkgs/desktops/kde-4.6/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.6/plasma-addons/default.nix
@@ -15,9 +15,6 @@ kde.package {
   meta = {
     description = "KDE Plasma Addons";
     license = "GPL";
-    kde = {
-      name = "kdeplasma-addons";
-      version = "4.5.90";
-    };
+    kde.module = "kdeplasma-addons";
   };
 }

From c1e48180f824c66f2c3a04b8ebd782bd2bc33c6f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 13 Feb 2011 04:36:47 +0000
Subject: [PATCH 20/40] soprano-2.6.0

svn path=/nixpkgs/trunk/; revision=25934
---
 pkgs/desktops/kde-4.6/support/soprano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.6/support/soprano/default.nix b/pkgs/desktops/kde-4.6/support/soprano/default.nix
index dc23762f2b5..2ebadacc228 100644
--- a/pkgs/desktops/kde-4.6/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.6/support/soprano/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.5.63";
+  name = "soprano-2.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/soprano/${name}.tar.bz2";
-    sha256 = "1i69pbfykgn2bp36hn1qk9sbw1yx4fnaa31bfxfdssfxli7ik6c4";
+    sha256 = "0dfdc4hcv25kwmv3wp13qjw2jg2fax4gcy79yia7sdgz5ik59xq2";
   };
 
   # We disable the Java backend, since we do not need them and they make the closure size much bigger

From 424c73794d2009ab972a841af09c97771c2c5a16 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 13 Feb 2011 04:36:51 +0000
Subject: [PATCH 21/40] kde-4.6/akonadi-1.5.0

svn path=/nixpkgs/trunk/; revision=25935
---
 pkgs/desktops/kde-4.6/support/akonadi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.6/support/akonadi/default.nix b/pkgs/desktops/kde-4.6/support/akonadi/default.nix
index ff4f1c15d59..e3a5b34a24c 100644
--- a/pkgs/desktops/kde-4.6/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.6/support/akonadi/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}:
 
 stdenv.mkDerivation rec {
-  name = "akonadi-1.4.90";
+  name = "akonadi-1.5.0";
   src = fetchurl {
     url = "http://download.akonadi-project.org/${name}.tar.bz2";
-    sha256 = "0am4m81zhq343a42s1ig5jxx47i6g1d97r546qqzdm5w542r6c00";
+    sha256 = "1azk2g7vb2sampxlys1hkgf9jvzpv92afsjdl31ikqbckaqnbfqc";
   };
   buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
   meta = with stdenv.lib; {

From 33e30b86019ce8ec4d367863d95c17c96f0cacbc Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 13 Feb 2011 04:36:55 +0000
Subject: [PATCH 22/40] libdbusmenu-qt-0.7.0

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

diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 1a9d6697438..aed051a446b 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -2,14 +2,14 @@
 
 let
   baseName = "libdbusmenu-qt";
-  v = "0.5.1";
+  v = "0.7.0";
 in
 stdenv.mkDerivation rec {
   name = "${baseName}-${v}";
 
   src = fetchurl {
     url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2";
-    sha256 = "0ipz1f08d2wgg18l12wssv9lhm66xhj31a1dbikg2rzw7c6bvjvk";
+    sha256 = "0zn3w57xjk34j08fx4n757kakkd4y07halrnaj4a0x0c9dhyjf14";
   };
 
   buildInputs = [ cmake qt4 ];

From 87c534b7d0c5941a3c572343802f0784eb2baa79 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 13 Feb 2011 04:37:00 +0000
Subject: [PATCH 23/40] Fix evaluation

svn path=/nixpkgs/trunk/; revision=25937
---
 .../kde-4.6/support/polkit-qt-1/default.nix        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
index 2d528c84542..05a3e7b3dc9 100644
--- a/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
+++ b/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
@@ -1,19 +1,19 @@
-{ kde, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
+
+stdenv.mkDerivation rec {
+  name = "polkit-qt-1-0.99.0";
 
-kde.package rec {
   buildInputs = [ cmake qt4 automoc4 ];
   propagatedBuildInputs = [ polkit glib ];
 
   src = fetchurl {
-    url = with meta.kde;
-      "mirror://kde/stable/apps/KDE4.x/admin/${name}-${version}.tar.bz2";
+    url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
     sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r";
   };
 
   patches = [ ./policy-files.patch ];
 
-  meta.kde = {
-    name = "polkit-qt-1";
-    version = "0.99.0";
+  meta = {
+    maintainers = with stdenv.lib.maintainers; [ urkud sander ];
   };
 }

From 96636f07799dfde81e61abd606162f0761cb58e9 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 13 Feb 2011 04:37:04 +0000
Subject: [PATCH 24/40] kdepimlibs-4.6.0: add libxslt

svn path=/nixpkgs/trunk/; revision=25938
---
 pkgs/desktops/kde-4.6/pimlibs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.6/pimlibs/default.nix b/pkgs/desktops/kde-4.6/pimlibs/default.nix
index 173b00ff036..4f58b04c68a 100644
--- a/pkgs/desktops/kde-4.6/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.6/pimlibs/default.nix
@@ -1,9 +1,9 @@
 { kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
-, kdelibs, automoc4, akonadi, soprano}:
+, kdelibs, automoc4, akonadi, soprano, libxslt}:
 
 kde.package {
 
-  buildInputs = [ cmake automoc4 perl shared_mime_info ];
+  buildInputs = [ cmake automoc4 perl shared_mime_info libxslt ];
   propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs
     akonadi soprano ];
 

From 0c7c2c5c30670cb0eedd7f0c60633e0a79b55fe2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 13 Feb 2011 04:37:08 +0000
Subject: [PATCH 25/40] kdepim{,runtime}-4.5.94.1

svn path=/nixpkgs/trunk/; revision=25939
---
 pkgs/desktops/kde-4.6/default.nix             |  1 -
 pkgs/desktops/kde-4.6/pim-runtime/default.nix | 21 ++++++++++---------
 pkgs/desktops/kde-4.6/pim/default.nix         | 17 ++++++++-------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix
index db464b11c6e..7c1cb65d9aa 100644
--- a/pkgs/desktops/kde-4.6/default.nix
+++ b/pkgs/desktops/kde-4.6/default.nix
@@ -139,7 +139,6 @@ rec {
     printer_applet = callPackage ./utils/printer-applet.nix { };
     superkaramba = callPackage ./utils/superkaramba.nix { };
     sweeper = callPackage ./utils/sweeper.nix { };
-    wacomtablet = callPackage ./utils/wacomtablet.nix { };
   };
 
   kdewebdev = combinePkgs "kdewebdev" {
diff --git a/pkgs/desktops/kde-4.6/pim-runtime/default.nix b/pkgs/desktops/kde-4.6/pim-runtime/default.nix
index 38f115e66e7..ccdecd46f38 100644
--- a/pkgs/desktops/kde-4.6/pim-runtime/default.nix
+++ b/pkgs/desktops/kde-4.6/pim-runtime/default.nix
@@ -1,24 +1,25 @@
 { kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info
-, kdelibs, kdepimlibs
+, kdelibs, kdepimlibs, gettext
 , automoc4, phonon, akonadi, soprano, strigi}:
 
 kde.package rec {
-  buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info
-                  kdelibs kdepimlibs
-		  automoc4 phonon akonadi soprano strigi ];
-  prePatch = ''
-      find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
-  '';
+  name = with meta.kde; "${module}-${release}";
+
+  buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info kdelibs
+    kdepimlibs automoc4 phonon akonadi soprano strigi gettext ];
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.module}-${meta.kde.version}.tar.bz2";
-    sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n";
+    url = "mirror://kde/unstable/kdepim/${meta.kde.release}/src/${name}.tar.bz2";
+    sha256 = "0gsp1yycjb7a3p285yqhs6v9rsrpbq0wfq3jhz7ky306692lrxig";
   };
 
   meta = {
     description = "KDE PIM runtime";
     homepage = http://www.kde.org;
     license = "GPL";
-    kde.module = "kdepim-runtime";
+    kde = {
+      release = "4.5.94.1";
+      module = "kdepim-runtime";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/pim/default.nix b/pkgs/desktops/kde-4.6/pim/default.nix
index 55712ae5a72..72734ff9c34 100644
--- a/pkgs/desktops/kde-4.6/pim/default.nix
+++ b/pkgs/desktops/kde-4.6/pim/default.nix
@@ -1,22 +1,20 @@
 { kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt
 , shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime
-, automoc4, akonadi, qca2}:
+, automoc4, akonadi, qca2, gettext, grantlee}:
 
 kde.package rec {
 
   buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt
-    shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi ];
-  prePatch = ''
-      find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
-  '';
+    shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi gettext
+    grantlee ];
   postInstall = ''
       mkdir -p $out/nix-support/
       echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages
   '';
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.module}-${meta.kde.version}.tar.bz2";
-    sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh";
+    url = "mirror://kde/unstable/kdepim/${meta.kde.release}/src/${meta.kde.module}-${meta.kde.release}.tar.bz2";
+    sha256 = "1bnlyrflcjy7lj4c2jag212ws2gzzpqyn5g2p97x8y936dza7ic3";
   };
 
   meta = {
@@ -26,6 +24,9 @@ kde.package rec {
     '';
     license = "GPL";
     homepage = http://pim.kde.org;
-    kde.module = "kdepim";
+    kde = {
+      release = "4.5.94.1";
+      module = "kdepim";
+    };
   };
 }

From 9fd9a343165a234d28c2b13a233f20dd80151926 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 13 Feb 2011 11:37:29 +0000
Subject: [PATCH 26/40] Optionally enable pulseaudio support for MPlayer

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab78642b186..1b0848dd511 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6359,7 +6359,9 @@ let
 
   mpg321 = callPackage ../applications/audio/mpg321 { };
 
-  MPlayer = callPackage ../applications/video/MPlayer { };
+  MPlayer = callPackage ../applications/video/MPlayer { 
+    pulseSupport = getConfig [ "pulseaudio" ] false;
+  };
 
   MPlayerPlugin = browser:
     import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {

From 19a516c68dbe0e9160fbe0d87d951fa03f2610ba Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 13 Feb 2011 12:35:23 +0000
Subject: [PATCH 27/40] Reverting the pulseSupport configuration option, I
 believe this is meant to be configured via packageOverrides instead

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b0848dd511..ab78642b186 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6359,9 +6359,7 @@ let
 
   mpg321 = callPackage ../applications/audio/mpg321 { };
 
-  MPlayer = callPackage ../applications/video/MPlayer { 
-    pulseSupport = getConfig [ "pulseaudio" ] false;
-  };
+  MPlayer = callPackage ../applications/video/MPlayer { };
 
   MPlayerPlugin = browser:
     import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {

From 5526aa13e8262fcd4de7b8be6705778f30e5553e Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Mon, 14 Feb 2011 05:01:33 +0000
Subject: [PATCH 28/40] notmuch-0.5 -> notmuch-0.5-20110203 (git)

svn path=/nixpkgs/trunk/; revision=25946
---
 .../networking/mailreaders/notmuch/default.nix        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 4a457093f7b..ce35ad4c578 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -1,11 +1,12 @@
-{ fetchurl, stdenv, emacs, glib, gmime, pkgconfig, talloc, xapian }:
+{ fetchgit, stdenv, emacs, glib, gmime, pkgconfig, talloc, xapian }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-0.5";
+  name = "notmuch-0.5-20110203";
 
-  src = fetchurl {
-    url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "c7eeb95c89c5b9cb22cc0b90abce5f923c20c982d607bf32829c989e905ff1a9";
+  src = fetchgit {
+    url = "git://notmuchmail.org/git/notmuch";
+    rev = "62725a5b59625c164512465af5b3912396b61e8b";
+    sha256 = "39b339f47cee1938d76e046cccfd7c3e5e5d37a578e40007a5d43adfc4cd41ce";
   };
 
   buildInputs = [ emacs glib gmime pkgconfig talloc xapian ];

From 167c520570d0c67534656ec47a8e20fe4e5ab27d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Feb 2011 16:52:32 +0000
Subject: [PATCH 29/40] * Added Debian 6.0 and Ubuntu 10.10.

svn path=/nixpkgs/trunk/; revision=25968
---
 pkgs/build-support/release/debian-build.nix |  1 +
 pkgs/build-support/vm/default.nix           | 68 +++++++++++++++++----
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 75e26efa0b3..c2a194a042f 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -47,6 +47,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
     '';
 
     sysInfoPhase = ''
+      [ ! -f /etc/lsb-release ] || (source /etc/lsb-release; echo "OS release: $DISTRIB_DESCRIPTION")
       echo "System/kernel: $(uname -a)"
       if test -e /etc/debian_version; then echo "Debian release: $(cat /etc/debian_version)"; fi
       header "installed Debian packages"
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index e19919fb555..8442d8bd1b1 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -680,7 +680,7 @@ rec {
           done
           chroot=$(type -tP chroot)
           PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
-            /usr/bin/dpkg --install --force-all $debs < /dev/null
+            /usr/bin/dpkg --install --force-all $debs < /dev/null || true
         done
         
         echo "running post-install script..."
@@ -1105,7 +1105,7 @@ rec {
         sha256 = "6e3e813857496f2af6cd7e6ada06b3398fa067a7992c5fd7e8bd8fa92e3548b7";
       };
       urlPrefix = mirror://ubuntu;
-      packages = commonDebPackages ++ [ "diff" ];
+      packages = commonDebPackages ++ [ "diff" "mktemp" ];
     };
  
     ubuntu910x86_64 = {
@@ -1116,7 +1116,7 @@ rec {
         sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40";
       };
       urlPrefix = mirror://ubuntu;
-      packages = commonDebPackages ++ [ "diff" ];
+      packages = commonDebPackages ++ [ "diff" "mktemp" ];
     };
 
     ubuntu1004i386 = {
@@ -1127,7 +1127,7 @@ rec {
         sha256 = "0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa";
       };
       urlPrefix = mirror://ubuntu;
-      packages = commonDebPackages ++ [ "diffutils" ];
+      packages = commonDebPackages ++ [ "diffutils" "mktemp" ];
     };
  
     ubuntu1004x86_64 = {
@@ -1138,6 +1138,28 @@ rec {
         sha256 = "74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0";
       };
       urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" "mktemp" ];
+    };
+
+    ubuntu1010i386 = {
+      name = "ubuntu-10.04-maverick-i386";
+      fullName = "Ubuntu 10.04 Maverick (i386)";
+      packagesList = fetchurl {
+        url = mirror://ubuntu/dists/maverick/main/binary-i386/Packages.bz2;
+        sha256 = "1qjs4042y03bxbxwjs3pgrs99ba6vqvjaaz6zhaxxaqj1r12dwa0";
+      };
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" ];
+    };
+ 
+    ubuntu1010x86_64 = {
+      name = "ubuntu-10.04-maverick-amd64";
+      fullName = "Ubuntu 10.04 Maverick (amd64)";
+      packagesList = fetchurl {
+        url = mirror://ubuntu/dists/maverick/main/binary-amd64/Packages.bz2;
+        sha256 = "1p0i4gp1bxd3zvckgnh1hx4vfc23rfgzd19dk5rmi61lzbzzqbgc";
+      };
+      urlPrefix = mirror://ubuntu;
       packages = commonDebPackages ++ [ "diffutils" ];
     };
 
@@ -1164,22 +1186,44 @@ rec {
     };
 
     debian50i386 = {
-      name = "debian-5.0.5-lenny-i386";
-      fullName = "Debian 5.0.5 Lenny (i386)";
+      name = "debian-5.0.8-lenny-i386";
+      fullName = "Debian 5.0.8 Lenny (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
-        sha256 = "1nzd0r44lnvw2bmshqpbhghs84fxbcr1jkg55d37v4d09gsdmln0";
+        sha256 = "0dcvd8ivn71dwln7mx5dbqj30v4cqmc61lj21ry05karkglb5scg";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
         
     debian50x86_64 = {
-      name = "debian-5.0.5-lenny-amd64";
-      fullName = "Debian 5.0.5 Lenny (amd64)";
+      name = "debian-5.0.8-lenny-amd64";
+      fullName = "Debian 5.0.8 Lenny (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
-        sha256 = "04hab4ybjilppr1hwnl4k50vr5y88w7zn6v22phfrsrxf23nrlv3";
+        sha256 = "1wrqjfcqfs7q5i7jnr8115zsjlhzxxm2x41agp546d3wpj68k938";
+      };
+      urlPrefix = mirror://debian;
+      packages = commonDebianPackages;
+    };
+
+    debian60i386 = {
+      name = "debian-6.0-squeeze-i386";
+      fullName = "Debian 6.0 Squeeze (i386)";
+      packagesList = fetchurl {
+        url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2;
+        sha256 = "1c1faz7ig9jvx3a2d2crp6fx0gynh5s4xw1vv1mn14rzkx86l59i";
+      };
+      urlPrefix = mirror://debian;
+      packages = commonDebianPackages;
+    };
+        
+    debian60x86_64 = {
+      name = "debian-6.0-squeeze-amd64";
+      fullName = "Debian 6.0 Squeeze (amd64)";
+      packagesList = fetchurl {
+        url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2;
+        sha256 = "1c1n16q0hrimrnmv6shrr0z82xjqfjhm17salry8xi984c5fprwd";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
@@ -1262,11 +1306,9 @@ rec {
     # Needed because it provides /etc/login.defs, whose absence causes
     # the "passwd" post-installs script to fail.
     "login"
-    # For shutting up some messages during some post-install scripts:
-    "mktemp"
   ];
 
-  commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" ];
+  commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ];
   
 
   /* A set of functions that build the Linux distributions specified

From 4621178b75ca1c49b6ea7541e41386e77d72353b Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Mon, 14 Feb 2011 22:40:51 +0000
Subject: [PATCH 30/40] aircrack-1.0-rc2 -> 1.1-1859 (current trunk)

latest stable does not compile with gcc 4.5

svn path=/nixpkgs/trunk/; revision=25972
---
 pkgs/tools/networking/aircrack-ng/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index a83506efa1c..394022c2d08 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -1,11 +1,15 @@
-{stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools}:
+{stdenv, fetchsvn, libpcap, openssl, zlib, wirelesstools}:
 
-stdenv.mkDerivation {
-  name = "aircrack-ng-1.0-rc2";
+let
+  rev = "1859";
+in
+stdenv.mkDerivation rec {
+  name = "aircrack-ng-1.1-${rev}";
 
-  src = fetchurl {
-    url = http://download.aircrack-ng.org/aircrack-ng-1.0-rc2.tar.gz;
-    sha256 = "9d52f15f3fca52775ecb9cfc1f0aeb04c3c3bd3101665d5760d395f7d2a87d8b";
+  src = fetchsvn {
+    url = "http://trac.aircrack-ng.org/svn/trunk";
+    inherit rev;
+    sha256 = "6ca98321ef3f14af9c78b2fe25091c4e79e3c28679f240b80f8aeda71b84ab4a";
   };
 
   buildInputs = [libpcap openssl zlib];

From bcb46affc2e07dd20317d462b453400c7f114f74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 15 Feb 2011 09:47:36 +0000
Subject: [PATCH 31/40] Version bump for Haskell libs: HaXml and json.

svn path=/nixpkgs/trunk/; revision=25973
---
 pkgs/development/libraries/haskell/HaXml/default.nix | 7 ++++---
 pkgs/development/libraries/haskell/json/default.nix  | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix
index 00a5cba60ef..188377b8e94 100644
--- a/pkgs/development/libraries/haskell/HaXml/default.nix
+++ b/pkgs/development/libraries/haskell/HaXml/default.nix
@@ -1,9 +1,10 @@
-{cabal}:
+{cabal, polyparse}:
 
 cabal.mkDerivation (self : {
   pname = "HaXml";
-  version = "1.13.3";
-  sha256 = "08d9wy0rg9m66dd10x0zvkl74l25vxdakz7xp3j88s2gd31jp1v0";
+  version = "1.20.2";
+  sha256 = "05kmr2ablinnrg3x1xr19g5kzzby322lblvcvhwbkv26ajwi0b63";
+  propagatedBuildInputs = [polyparse];
   meta = {
     description = "Haskell utilities for parsing, filtering, transforming and generating XML documents.";
   };
diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix
index 5a59e94396b..08cc6e0ee3d 100644
--- a/pkgs/development/libraries/haskell/json/default.nix
+++ b/pkgs/development/libraries/haskell/json/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "json";
-  version = "0.4.3";
-  sha256 = "56192d1e922cc71ad1aaf31baea8ee7e1f1b862f95bc72f60548caee4a484a87";
+  version = "0.4.4";
+  sha256 = "102qmz55b2mgcca3q1c2pkcr6hz7kmpldad3f6blhmp1cz15f081";
   propagatedBuildInputs = [mtl];
   meta = {
     description = "Support for serialising Haskell to and from JSON";

From 0a69fe9898a8342940c0453b5d428e0ec820a713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 15 Feb 2011 10:36:52 +0000
Subject: [PATCH 32/40] Restored HaXml-1.13.3 to keep happstack and gitit
 working.

svn path=/nixpkgs/trunk/; revision=25974
---
 pkgs/development/libraries/haskell/HaXml/1.13.3.nix | 11 +++++++++++
 pkgs/top-level/haskell-packages.nix                 | 13 ++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/HaXml/1.13.3.nix

diff --git a/pkgs/development/libraries/haskell/HaXml/1.13.3.nix b/pkgs/development/libraries/haskell/HaXml/1.13.3.nix
new file mode 100644
index 00000000000..00a5cba60ef
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HaXml/1.13.3.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "HaXml";
+  version = "1.13.3";
+  sha256 = "08d9wy0rg9m66dd10x0zvkl74l25vxdakz7xp3j88s2gd31jp1v0";
+  meta = {
+    description = "Haskell utilities for parsing, filtering, transforming and generating XML documents.";
+  };
+})
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c6ee56df536..60cba412f38 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -252,13 +252,15 @@ rec {
 
   HAppSState = callPackage ../development/libraries/haskell/HAppS/HAppS-State.nix {};
 
-  /* cannot yet get this to work with 6.12.1 */
-  happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {};
+  happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {
+    HaXml = HaXml_1_13_3;
+  };
 
   happstackUtil = callPackage ../development/libraries/haskell/happstack/happstack-util.nix {};
 
   happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix {
     network = network_2_2_1_7;
+    HaXml = HaXml_1_13_3;
   };
 
   hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {};
@@ -349,12 +351,17 @@ rec {
 
   HTTP_3001 = callPackage ../development/libraries/haskell/HTTP/3001.nix {};
 
-  haxr = callPackage ../development/libraries/haskell/haxr {};
+  haxr = callPackage ../development/libraries/haskell/haxr {
+    HTTP = HTTP_4000_0_9;
+    HaXml = HaXml_1_13_3;
+  };
 
   haxr_th = callPackage ../development/libraries/haskell/haxr-th {};
 
   HaXml = callPackage ../development/libraries/haskell/HaXml {};
 
+  HaXml_1_13_3 = callPackage ../development/libraries/haskell/HaXml/1.13.3.nix {};
+
   HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {};
 
   HDBCPostgresql = callPackage ../development/libraries/haskell/HDBC/HDBC-postgresql.nix {

From 9bc101679ab18d26726e74d8b08af318f1e15e05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 15 Feb 2011 13:14:29 +0000
Subject: [PATCH 33/40] Prepare for the Guile 2.0 switchover.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab78642b186..09dcc66b8f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -388,7 +388,9 @@ let
 
   at = callPackage ../tools/system/at { };
 
-  autogen = callPackage ../development/tools/misc/autogen { };
+  autogen = callPackage ../development/tools/misc/autogen {
+    guile = guile_1_8;
+  };
 
   autojump = callPackage ../tools/misc/autojump { };
 
@@ -866,7 +868,9 @@ let
 
   lzop = callPackage ../tools/compression/lzop { };
 
-  mailutils = callPackage ../tools/networking/mailutils { };
+  mailutils = callPackage ../tools/networking/mailutils {
+    guile = guile_1_8;
+  };
 
   man = callPackage ../tools/misc/man { };
 
@@ -878,7 +882,9 @@ let
 
   mcabber = callPackage ../applications/networking/instant-messengers/mcabber { };
 
-  mcron = callPackage ../tools/system/mcron { };
+  mcron = callPackage ../tools/system/mcron {
+    guile = guile_1_8;
+  };
 
   mdbtools = callPackage ../tools/misc/mdbtools { };
 
@@ -1288,6 +1294,7 @@ let
   texmacs = callPackage ../applications/editors/texmacs {
     tex = texLive; /* tetex is also an option */
     extraFonts = true;
+    guile = guile_1_8;
   };
 
   tmux = callPackage ../tools/misc/tmux { };
@@ -2234,10 +2241,12 @@ let
 
   groovy = callPackage ../development/interpreters/groovy { };
 
-  guile = callPackage ../development/interpreters/guile { };
+  guile_1_8 = callPackage ../development/interpreters/guile { };
 
   guile_1_9 = callPackage ../development/interpreters/guile/1.9.nix { };
 
+  guile = guile_1_8;
+
   io = builderDefsPackage (import ../development/interpreters/io) {
     inherit sqlite zlib gmp libffi cairo ncurses freetype mesa
       libpng libtiff libjpeg readline libsndfile libxml2
@@ -5300,6 +5309,7 @@ let
 
   trackballs = callPackage ../games/trackballs {
     debug = false;
+    guile = guile_1_8;
   };
 
   tunctl = callPackage ../os-specific/linux/tunctl { };
@@ -5606,6 +5616,7 @@ let
 
   beast = callPackage ../applications/audio/beast {
     inherit (gnome) libgnomecanvas libart_lgpl;
+    guile = guile_1_8;
   };
 
   bibletime = newScope pkgs.kde45 ../applications/misc/bibletime {
@@ -6016,6 +6027,7 @@ let
     inherit (gnome) gtk glib libglade libgnomeui libgtkhtml gtkhtml
       libgnomeprint;
     gconf = gnome.GConf;
+    guile = guile_1_8;
   };
 
   qcad = callPackage ../applications/misc/qcad { };
@@ -6574,7 +6586,8 @@ let
   };
 
   snd = sndBase.passthru.function {
-    inherit guile mesa libtool jackaudio alsaLib;
+    inherit mesa libtool jackaudio alsaLib;
+    guile = guile_1_8;
   };
 
   sonicVisualizer = callPackage ../applications/audio/sonic-visualizer {
@@ -6911,7 +6924,9 @@ let
 
   atanks = callPackage ../games/atanks {};
 
-  ballAndPaddle = callPackage ../games/ball-and-paddle { };
+  ballAndPaddle = callPackage ../games/ball-and-paddle {
+    guile = guile_1_8;
+  };
 
   blackshades = callPackage ../games/blackshades { };
 
@@ -7210,6 +7225,7 @@ let
   drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
     inherit (gnome) libglade gtk;
     inherit libxml2 guile perl intltool libtool pkgconfig;
+    guile = guile_1_8;
   };
 
   tetgen = callPackage ../applications/science/geometry/tetgen { };

From 10f6eb70f13a1e2e07294628613e18f651480590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 15 Feb 2011 13:14:33 +0000
Subject: [PATCH 34/40] Add more cross-MinGW and cross-GNU jobs.

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

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index fd865419487..040a4df2fc0 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -154,6 +154,13 @@ let
   };
 in {
   crossMingw32 = mapTestOnCross crossSystem {
+    coreutils.hostDrv = nativePlatforms;
+    boehmgc.hostDrv = nativePlatforms;
+    gmp.hostDrv = nativePlatforms;
+    guile_1_8.hostDrv = nativePlatforms;
+    libffi.hostDrv = nativePlatforms;
+    libtool.hostDrv = nativePlatforms;
+    libunistring.hostDrv = nativePlatforms;
     windows.wxMSW.hostDrv = nativePlatforms;
   };
 }) // (
@@ -179,6 +186,12 @@ in {
     ed.hostDrv = nativePlatforms;
     grub2.hostDrv = nativePlatforms;
     inetutils.hostDrv = nativePlatforms;
+    boehmgc.hostDrv = nativePlatforms;
+    gmp.hostDrv = nativePlatforms;
+    guile_1_8.hostDrv = nativePlatforms;
+    libffi.hostDrv = nativePlatforms;
+    libtool.hostDrv = nativePlatforms;
+    libunistring.hostDrv = nativePlatforms;
     nixUnstable.hostDrv = nativePlatforms;
     patch.hostDrv = nativePlatforms;
     zile.hostDrv = nativePlatforms;

From 46d18d183d4c1b41b9d98d3a66608b4ed55629f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 15 Feb 2011 13:15:55 +0000
Subject: [PATCH 35/40] "coreutils_real" -> "coreutils".

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

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 040a4df2fc0..cacc5f100c4 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -182,7 +182,7 @@ in {
     hurdCross = nativePlatforms;
     mach.hostDrv = nativePlatforms;
 
-    coreutils_real.hostDrv = nativePlatforms;
+    coreutils.hostDrv = nativePlatforms;
     ed.hostDrv = nativePlatforms;
     grub2.hostDrv = nativePlatforms;
     inetutils.hostDrv = nativePlatforms;
@@ -226,7 +226,7 @@ let
 in {
   fuloongminipc = mapTestOnCross crossSystem {
 
-    coreutils_real.hostDrv = nativePlatforms;
+    coreutils.hostDrv = nativePlatforms;
     ed.hostDrv = nativePlatforms;
     grub2.hostDrv = nativePlatforms;
     inetutils.hostDrv = nativePlatforms;
@@ -286,7 +286,7 @@ let
 in {
   nanonote = mapTestOnCross crossSystem {
 
-    coreutils_real.hostDrv = nativePlatforms;
+    coreutils.hostDrv = nativePlatforms;
     ed.hostDrv = nativePlatforms;
     inetutils.hostDrv = nativePlatforms;
     nixUnstable.hostDrv = nativePlatforms;

From 8dba6683ad9606eb2b078ba7d22a3f91e5c0614f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 15 Feb 2011 13:23:34 +0000
Subject: [PATCH 36/40] Fix typo.

svn path=/nixpkgs/trunk/; revision=25979
---
 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 09dcc66b8f8..35fe920abf3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7224,7 +7224,7 @@ let
 
   drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
     inherit (gnome) libglade gtk;
-    inherit libxml2 guile perl intltool libtool pkgconfig;
+    inherit libxml2 perl intltool libtool pkgconfig;
     guile = guile_1_8;
   };
 

From db25406910cf8497f2e2211a9f6edfb28b95009e Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Wed, 16 Feb 2011 00:48:58 +0000
Subject: [PATCH 37/40] Advance racket to latest release version 5.1

svn path=/nixpkgs/trunk/; revision=25984
---
 .../interpreters/racket/default.nix           | 47 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  5 +-
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 2568d3e50fe..833f0d1c157 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -1,34 +1,35 @@
-{ stdenv, fetchurl, cairo, file, libjpeg
-, libpng, libtool, libXaw, libXext, libXft, libXrender
-, libXt, libXmu, mesa, pkgconfig, which } :
+{ stdenv, fetchurl, cairo, file, pango, glib, gtk
+, which, libtool, makeWrapper, libjpeg, libpng
+, fontconfig, liberation_ttf } :
 
 stdenv.mkDerivation rec {
   pname = "racket";
-  version = "5.0.2";
+  version = "5.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
-    sha256 = "1xx0gc935mvh9b1nch7p4xscx9hjd0401rl1sdpf291nj9vmpb3k";
+    sha256 = "0k53jdsz0qf8jvydw29gnz1z8d9vs9ycfgilgqa6rcyp8i0f468k";
   };
 
-  buildInputs = [ cairo
-                  file
-                  libjpeg
-                  libpng
-                  libtool
-                  libXaw
-                  libXext
-                  libXft
-                  libXrender
-                  libXt
-                  libXmu
-                  mesa
-                  pkgconfig
-                  which
-                ];
+  # Various racket executables do run-time searches for these.
+  ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib";
+
+  buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf ];
 
   preConfigure = ''
+    export LD_LIBRARY_PATH=${ffiSharedLibs}:$LD_LIBRARY_PATH
+
+    # Chroot builds do not have access to /etc/fonts/fonts.conf, but the Racket bootstrap
+    # needs a working fontconfig, so here a simple standin is used.
+    mkdir chroot-fontconfig
+    cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf
+    sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf
+    echo "<dir>${liberation_ttf}</dir>" >> chroot-fontconfig/fonts.conf
+    echo "</fontconfig>" >> chroot-fontconfig/fonts.conf
+   
+    export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf
+
     cd src
     sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure
     sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure 
@@ -36,6 +37,12 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ];
 
+  postInstall = ''
+    for p in $(ls $out/bin/) ; do
+      wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}" ;
+    done
+  '';
+
   meta = {
     description = "Racket (formerly called PLT Scheme) is a programming language derived from Scheme.";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35fe920abf3..1b60b9a84f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2362,7 +2362,10 @@ let
 
   qi = callPackage ../development/compilers/qi { };
 
-  racket = callPackage ../development/interpreters/racket { };
+  racket = callPackage ../development/interpreters/racket {
+    inherit (gtkLibs) pango glib gtk;
+    libjpeg = libjpeg62;
+  };
 
   ruby18 = callPackage ../development/interpreters/ruby { };
   #ruby19 = import ../development/interpreters/ruby/ruby-19.nix { inherit ruby18 fetchurl; };

From a74d449daf0f23b6a6bdc2f2b6fd12a6d40f63a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Feb 2011 11:49:08 +0000
Subject: [PATCH 38/40] * nixSqlite expects another integer (denoting the size
 of the NAR) in   `nix-store --load-db'.

svn path=/nixpkgs/trunk/; revision=25988
---
 pkgs/build-support/kernel/paths-from-graph.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/kernel/paths-from-graph.pl b/pkgs/build-support/kernel/paths-from-graph.pl
index 43ce4e68db4..f1866237210 100644
--- a/pkgs/build-support/kernel/paths-from-graph.pl
+++ b/pkgs/build-support/kernel/paths-from-graph.pl
@@ -53,6 +53,7 @@ elsif ($ENV{"printRegistration"} eq "1") {
     foreach my $storePath (sort (keys %storePaths)) {
         print "$storePath\n";
         print "0000000000000000000000000000000000000000000000000000000000000000\n"; # !!! fix
+        print "0\n"; # !!! fix	
         print "\n"; # don't care about preserving the deriver
         print scalar(@{$refs{$storePath}}), "\n";
         foreach my $ref (@{$refs{$storePath}}) {

From 59904446e44ab3f194a528997a2b8caff97f8fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 16 Feb 2011 13:18:08 +0000
Subject: [PATCH 39/40] GNU Guile 2.0.0!

svn path=/nixpkgs/trunk/; revision=25990
---
 pkgs/development/interpreters/guile/1.8.nix   | 55 +++++++++++++
 pkgs/development/interpreters/guile/1.9.nix   | 68 ----------------
 .../interpreters/guile/default.nix            | 78 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  6 +-
 4 files changed, 104 insertions(+), 103 deletions(-)
 create mode 100644 pkgs/development/interpreters/guile/1.8.nix
 delete mode 100644 pkgs/development/interpreters/guile/1.9.nix

diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
new file mode 100644
index 00000000000..7cb5d3e5364
--- /dev/null
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -0,0 +1,55 @@
+{ fetchurl, stdenv, libtool, readline, gmp
+, gawk, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "guile-1.8.8";
+
+  src = fetchurl {
+    url = "mirror://gnu/guile/" + name + ".tar.gz";
+    sha256 = "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3";
+  };
+
+  patches = [ ./cpp-4.5.patch ];
+
+  buildNativeInputs = [ makeWrapper gawk ];
+  propagatedBuildInputs = [ readline gmp libtool ];
+  selfBuildNativeInput = true;
+
+  postInstall = ''
+    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
+  '';
+
+  preBuild = ''
+    sed -e '/lt_dlinit/a  lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
+  '';
+
+  # Guile needs patching to preset results for the configure tests
+  # about pthreads, which work only in native builds.
+  preConfigure = ''
+    if test -n "$crossConfig"; then
+      configureFlags="--with-threads=no $configureFlags"
+    fi
+  '';
+
+  # One test fails.
+  # ERROR: file: "libtest-asmobs", message: "file not found"
+  # This is fixed here:
+  # <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>.
+  doCheck = false;
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    description = "GNU Guile, an embeddable Scheme interpreter";
+    longDescription = ''
+      GNU Guile is an interpreter for the Scheme programming language,
+      packaged as a library that can be embedded into programs to make
+      them extensible.  It supports many SRFIs.
+    '';
+
+    homepage = http://www.gnu.org/software/guile/;
+    license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/development/interpreters/guile/1.9.nix b/pkgs/development/interpreters/guile/1.9.nix
deleted file mode 100644
index 91eed38d2ea..00000000000
--- a/pkgs/development/interpreters/guile/1.9.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
-, libffi, gawk, makeWrapper, coverageAnalysis ? null }:
-
-# Do either a coverage analysis build or a standard build.
-(if coverageAnalysis != null
- then coverageAnalysis
- else stdenv.mkDerivation)
-
-rec {
-  name = "guile-1.9.15";  # This is a beta release!
-
-  src = fetchurl {
-    url = "ftp://alpha.gnu.org/gnu/guile/${name}.tar.gz";
-    sha256 = "0b6sd2a9s2ccdcr84d16ryk08sqqxgcw8bxisdz9z5b53dvpmh0p";
-  };
-
-  buildInputs =
-    [ makeWrapper gawk readline libtool libunistring
-      libffi pkgconfig
-    ];
-  propagatedBuildInputs = [ gmp boehmgc ]
-
-    # XXX: These ones aren't normally needed here, but since
-    # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
-    # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
-    # see below.
-    ++ [ libtool libunistring ];
-
-  patches =
-    stdenv.lib.optionals (coverageAnalysis != null)
-      [ ./gcov-file-name.patch ./disable-gc-sensitive-tests.patch ];
-
-  postInstall = ''
-    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
-
-    # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
-    # why `--with-libunistring-prefix' and similar options coming from
-    # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
-    sed -i "$out/lib/pkgconfig/guile-2.0.pc"    \
-        -e 's|-lunistring|-L${libunistring}/lib -lunistring|g ;
-            s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
-            s|-lltdl|-L${libtool}/lib -lltdl|g'
-  '';
-
-  doCheck = true;
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    description = "GNU Guile 1.9 (beta), an embeddable Scheme implementation";
-
-    longDescription = ''
-      GNU Guile is an implementation of the Scheme programming language, with
-      support for many SRFIs, packaged for use in a wide variety of
-      environments.  In addition to implementing the R5RS Scheme standard,
-      Guile includes a module system, full access to POSIX system calls,
-      networking support, multiple threads, dynamic linking, a foreign
-      function call interface, and powerful string processing.
-    '';
-
-    homepage = http://www.gnu.org/software/guile/;
-    license = "LGPLv3+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 7cb5d3e5364..c990c7bcc12 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,55 +1,69 @@
-{ fetchurl, stdenv, libtool, readline, gmp
-, gawk, makeWrapper }:
+{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
+, libffi, gawk, makeWrapper, coverageAnalysis ? null }:
 
-stdenv.mkDerivation rec {
-  name = "guile-1.8.8";
+# Do either a coverage analysis build or a standard build.
+(if coverageAnalysis != null
+ then coverageAnalysis
+ else stdenv.mkDerivation)
+
+rec {
+  name = "guile-2.0.0"
 
   src = fetchurl {
-    url = "mirror://gnu/guile/" + name + ".tar.gz";
-    sha256 = "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3";
+    url = "mirror://gnu/guile/${name}.tar.gz";
+    sha256 = "0yy6iqlgqaav0nszldlkv8dq4xhcs6r18ahp4h2885jv9payp93v";
   };
 
-  patches = [ ./cpp-4.5.patch ];
+  buildInputs =
+    [ makeWrapper gawk readline libtool libunistring
+      libffi pkgconfig
+    ];
+  propagatedBuildInputs = [ gmp boehmgc ]
 
-  buildNativeInputs = [ makeWrapper gawk ];
-  propagatedBuildInputs = [ readline gmp libtool ];
-  selfBuildNativeInput = true;
+    # XXX: These ones aren't normally needed here, but since
+    # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
+    # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
+    # see below.
+    ++ [ libtool libunistring ];
+
+  patches =
+    stdenv.lib.optionals (coverageAnalysis != null)
+      [ ./gcov-file-name.patch ./disable-gc-sensitive-tests.patch ];
 
   postInstall = ''
     wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
+
+    # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
+    # why `--with-libunistring-prefix' and similar options coming from
+    # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+    sed -i "$out/lib/pkgconfig/guile-2.0.pc"    \
+        -e 's|-lunistring|-L${libunistring}/lib -lunistring|g ;
+            s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
+            s|-lltdl|-L${libtool}/lib -lltdl|g'
   '';
 
-  preBuild = ''
-    sed -e '/lt_dlinit/a  lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
-  '';
-
-  # Guile needs patching to preset results for the configure tests
-  # about pthreads, which work only in native builds.
-  preConfigure = ''
-    if test -n "$crossConfig"; then
-      configureFlags="--with-threads=no $configureFlags"
-    fi
-  '';
-
-  # One test fails.
-  # ERROR: file: "libtest-asmobs", message: "file not found"
-  # This is fixed here:
-  # <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>.
-  doCheck = false;
+  doCheck = true;
 
   setupHook = ./setup-hook.sh;
 
   meta = {
-    description = "GNU Guile, an embeddable Scheme interpreter";
+    description = "GNU Guile 2.0, an embeddable Scheme implementation";
+
     longDescription = ''
-      GNU Guile is an interpreter for the Scheme programming language,
-      packaged as a library that can be embedded into programs to make
-      them extensible.  It supports many SRFIs.
+      GNU Guile is an implementation of the Scheme programming language, with
+      support for many SRFIs, packaged for use in a wide variety of
+      environments.  In addition to implementing the R5RS Scheme standard
+      and a large subset of R6RS, Guile includes a module system, full access
+      to POSIX system calls, networking support, multiple threads, dynamic
+      linking, a foreign function call interface, and powerful string
+      processing.
     '';
 
     homepage = http://www.gnu.org/software/guile/;
-    license = "LGPLv2+";
+    license = "LGPLv3+";
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
+
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b60b9a84f4..8e9ede404bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2241,11 +2241,11 @@ let
 
   groovy = callPackage ../development/interpreters/groovy { };
 
-  guile_1_8 = callPackage ../development/interpreters/guile { };
+  guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
 
-  guile_1_9 = callPackage ../development/interpreters/guile/1.9.nix { };
+  guile_2_0 = callPackage ../development/interpreters/guile { };
 
-  guile = guile_1_8;
+  guile = guile_2_0;
 
   io = builderDefsPackage (import ../development/interpreters/io) {
     inherit sqlite zlib gmp libffi cairo ncurses freetype mesa

From 7c339958f993831c812b01eacc75d2f769832251 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Wed, 16 Feb 2011 15:11:58 +0000
Subject: [PATCH 40/40] Fix missing semicolon

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

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index c990c7bcc12..e8521bda2ff 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -7,7 +7,7 @@
  else stdenv.mkDerivation)
 
 rec {
-  name = "guile-2.0.0"
+  name = "guile-2.0.0";
 
   src = fetchurl {
     url = "mirror://gnu/guile/${name}.tar.gz";