From 3a83df3438b51028eca5d9322001369ac2ddd83a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 9 Jan 2012 23:44:44 +0000
Subject: [PATCH 01/88] conky-1.8.1, fix FTBFS

svn path=/nixpkgs/trunk/; revision=31460
---
 .../linux/conky/curl-types-h.patch            | 25 +++++++++++++++++++
 pkgs/os-specific/linux/conky/default.nix      | 14 +++++++----
 2 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/os-specific/linux/conky/curl-types-h.patch

diff --git a/pkgs/os-specific/linux/conky/curl-types-h.patch b/pkgs/os-specific/linux/conky/curl-types-h.patch
new file mode 100644
index 000000000000..ba99da23b46c
--- /dev/null
+++ b/pkgs/os-specific/linux/conky/curl-types-h.patch
@@ -0,0 +1,25 @@
+curl removed <curl/types.h> header
+diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c
+index 10e73a6..9bea299 100644
+--- a/src/ccurl_thread.c
++++ b/src/ccurl_thread.c
+@@ -33,7 +33,6 @@
+ #endif /* DEBUG */
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ /*
+diff --git a/src/eve.c b/src/eve.c
+index dc07264..f62a5f6 100644
+--- a/src/eve.c
++++ b/src/eve.c
+@@ -37,7 +37,6 @@
+ #include <libxml/xmlwriter.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <time.h>
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 29a81592c147..fda361d6c742 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -1,15 +1,19 @@
 {stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl}:
 
-stdenv.mkDerivation {
-  name = "conky-1.7.2";
+stdenv.mkDerivation rec {
+  name = "conky-1.8.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/conky/conky-1.7.2.tar.bz2";
-    sha256 = "0p375id2saxm2bp6c33ddn9d6rxymmq60ajlvx49smwhzyqa3h5k";
+    url = "mirror://sourceforge/conky/${name}.tar.bz2";
+    sha256 = "0hsybra4qzaqzny6n66m7768vbwkikajcvcbsqgnnnb9527jfnpq";
   };
 
   buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ];
-  configureFlags = "--disable-x11 --disable-xdamage --disable-own-window --disable-xft --disable-lua --enable-mpd --enable-double-buffer --enable-proc-uptime --enable-seti --enable-wlan --enable-rss";
+  configureFlags =
+    (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ])
+    ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]);
+
+  patches = [ ./curl-types-h.patch ];
 
   meta = {
     homepage = http://conky.sourceforge.net/;

From 8b66ae590f1bc5abc96a9ec6fc33cdbe7dac9ed2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 9 Jan 2012 23:44:48 +0000
Subject: [PATCH 02/88] kde48.kdelibs: use kerberos

svn path=/nixpkgs/trunk/; revision=31461
---
 pkgs/desktops/kde-4.8/kdelibs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.8/kdelibs.nix b/pkgs/desktops/kde-4.8/kdelibs.nix
index d4383b3e93a2..106909ac3dbb 100644
--- a/pkgs/desktops/kde-4.8/kdelibs.nix
+++ b/pkgs/desktops/kde-4.8/kdelibs.nix
@@ -11,7 +11,7 @@ kde {
     [
       acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
       libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
-      shared_desktop_ontologies udev xz libxml2 libjpeg
+      shared_desktop_ontologies udev xz libxml2 libjpeg kerberos
     ];
 
   propagatedBuildInputs = [ qt4 soprano strigi phonon ];

From 080c0b2f38acbaaafb0caea407349419c47d6252 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 10 Jan 2012 06:41:44 +0000
Subject: [PATCH 03/88] prefer local builds for fetchhg

svn path=/nixpkgs/trunk/; revision=31462
---
 pkgs/build-support/fetchhg/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 5424c87ded79..bc27516f46d5 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -14,4 +14,5 @@ stdenv.mkDerivation {
   outputHash = if (md5 != null) then md5 else sha256;
   
   inherit url tag;
+  preferLocalBuild = true;
 }

From 9dca11bc331a7ef7095bd9d7f3d570dbb483a4db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 10 Jan 2012 09:43:46 +0000
Subject: [PATCH 04/88] Updating tmux to 1.5. Patch sent to nix-dev by Phil
 Hagelberg.

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

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index da54c1854102..2e26fb7ddbac 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "tmux";
-  version = "1.3";
+  version = "1.5";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "72c2d6f1c30fb4ccbd29b530a7d8a08e67c9c2d87ac8d67e3806561670fc0362";
+    sha256 = "eb8215b57c05b765d2446d9acb2bc5edcdb3eb4ea31af89ee127a27e90056306";
   };
 
   makeFlags = "PREFIX=\${out}";

From 6733613253897aecfacae740a6562cb4a61849e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 10 Jan 2012 13:28:58 +0000
Subject: [PATCH 05/88] Updating sysstat

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

diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index dd3d585c0dd6..3f464dbd6560 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
    
 stdenv.mkDerivation rec {
-  name = "sysstat-9.0.6.1";
+  name = "sysstat-10.0.3";
    
   src = fetchurl {
     url = "http://perso.orange.fr/sebastien.godard/${name}.tar.bz2";
-    sha256 = "061r616cc0wfjkrk5ywqcwh5gwvm3gw92phfkj9bhlzxhi9srkr7";
+    sha256 = "0z7zr1b4xg9k8rbk2rnghjcycdfi0vb55f117d46ygcdym9ks0i2";
   };
 
   buildInputs = [ gettext ];

From 79c34b96e1dfbb9efd6c4c6b46686d7a20590b97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Jan 2012 15:20:23 +0000
Subject: [PATCH 06/88] haskell-failure: updated to version 0.1.2

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

diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix
index b481fb39e543..fc5c9488e596 100644
--- a/pkgs/development/libraries/haskell/failure/default.nix
+++ b/pkgs/development/libraries/haskell/failure/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "failure";
-  version = "0.1.0.1";
-  sha256 = "15zkhnxkfsd3qf4wmcp6kcfip9ahb4s3ywnh14whmhicp9mkm3q0";
+  version = "0.1.2";
+  sha256 = "14pwj0zb5kk2wadpddanxv3kr0hzklxhzbprmkh40yn1dbwgdas4";
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Failure";
     description = "A simple type class for success/failure computations";

From 3be3fe0828dde5a40d98dbb5f4e9950856d98f7b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Jan 2012 15:20:26 +0000
Subject: [PATCH 07/88] haskell-primitive: updated to version 0.4.1

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

diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/default.nix
index 62693a6d0965..ab8dc18ad0ae 100644
--- a/pkgs/development/libraries/haskell/primitive/default.nix
+++ b/pkgs/development/libraries/haskell/primitive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "primitive";
-  version = "0.4.0.1";
-  sha256 = "08j7js5y2vk3ywfhs260fxngd725xkvhrp20dcwb67fk8qgxh4bz";
+  version = "0.4.1";
+  sha256 = "06999i59xhvjwfdbnr1n09zkvg7lnim64nqxqlvk0x6slkidb7f6";
   meta = {
     homepage = "http://code.haskell.org/primitive";
     description = "Wrappers for primitive operations";

From 9663bdebde5ec7a2d6ec1a73ff83432cd5a68078 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Tue, 10 Jan 2012 15:23:05 +0000
Subject: [PATCH 08/88] Advance version of Ur/Web compiler to 20120110

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

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 2c197a1be573..7dbbe3752839 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20111127";
+  version = "20120110";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "1mhicigbi434fdr4gim4dswnmff9dldszh93g2w2542nlxvn9lbj";
+    sha256 = "1f67nj2akji9dh3n2hwmcrrwd61zlrnb0xh841fpb3n20ycjzg6j";
   };
 
   buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];

From 97d48a5426074c0d2401eebd60fc9700cdf3b350 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 10 Jan 2012 16:12:11 +0000
Subject: [PATCH 09/88] Update HOL Light to rev 118

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

diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 793d5c9452aa..4961bbeabfd1 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -9,11 +9,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "hol_light-20111224";
+  name = "hol_light-20120109";
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "116";
-    sha256 = "c840cc2dfeb2088484692cb0073e6a7bb85e3e44e95aee1e0f5a8e223f7ccae6";
+    rev = "118";
+    sha256 = "97e72dad731338328c031421512c26d440a989ea083f3ae34820eb8413aff495";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];

From b61e32f19da6e74caa975e682d7dc40e37965715 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Tue, 10 Jan 2012 20:04:37 +0000
Subject: [PATCH 10/88] google-talk-plugin: Updated x86_64 hash.

svn path=/nixpkgs/trunk/; revision=31470
---
 .../browsers/mozilla-plugins/google-talk-plugin/default.nix     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 1ea41d644656..eae84d9c3a6d 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm";
-        sha256 = "14cf9bef6f70ff850b773dbb92833bbe45645db2636b7e17720fdc6b60e76d63";
+        sha256 = "1jdcnz4iwnjmrr5xyqgam1yd0dc2vyd9iij5imnir4r88l5fc9wh";
       }
     else
       throw "Google Talk does not support your platform.";

From fedda96beef394f5e766238b5d54c210e0b245a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Jan 2012 20:12:25 +0000
Subject: [PATCH 11/88] xf86-video-ati: updated to version 6.14.3

svn path=/nixpkgs/trunk/; revision=31471
---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.6.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 17f0afadef46..8342c4f7d229 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1468,11 +1468,11 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
-    name = "xf86-video-ati-6.14.2";
+    name = "xf86-video-ati-6.14.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2;
-      sha256 = "1p18lfw7ii8k1vam75wv9a2piwf6n2988dh56i4b98zf4av78y81";
+      url = mirror://xorg/individual/driver/xf86-video-ati-6.14.3.tar.bz2;
+      sha256 = "1d1ph7xvgcr7rdf5sgibhas625aghvm3f61yzwmfk8znxx4jcjl4";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
index b90f4780cfac..250faabfa177 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@@ -127,7 +127,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-6.14.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2

From f5bd12aa80b36185fda85ed05c6eeac7f1cbf0a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Jan 2012 20:32:25 +0000
Subject: [PATCH 12/88] asymptote: enable off-screen rendering (and configure
 build to find boehmgc)

svn path=/nixpkgs/trunk/; revision=31472
---
 pkgs/tools/graphics/asymptote/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index b314da4a3ed0..f03025f45033 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -20,7 +20,7 @@ rec {
 
   inherit (s) name;
   inherit buildInputs;
-  configureFlags = [];
+  configureFlags = "--enable-gc=${a.boehmgc} --enable-offscreen";
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["setVars" "doUnpack" "fixPaths" "extractTexinfoTex"

From f685f874a7159b5c3219367f7b6a60b4e2979db4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Jan 2012 20:34:45 +0000
Subject: [PATCH 13/88] asymptote: dropped old code to find boehmgc

svn path=/nixpkgs/trunk/; revision=31473
---
 pkgs/tools/graphics/asymptote/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index f03025f45033..bdde709c2c22 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -28,7 +28,6 @@ rec {
     "fixInfoDir"];
 
   setVars = a.noDepEntry ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.boehmgc}/include/gc"
     export HOME="$PWD"
   '';
 

From 73fda38d0a61901afa2b2f8df281d7a66bc0a91f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Jan 2012 23:06:23 +0000
Subject: [PATCH 14/88] * Enable libyaml support in Ruby by default.  Libyaml
 is very small so   this shouldn't hurt much.

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

diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix
index 5e406509a8cf..f47d0e524f72 100644
--- a/pkgs/development/interpreters/ruby/ruby-19.nix
+++ b/pkgs/development/interpreters/ruby/ruby-19.nix
@@ -4,7 +4,7 @@
 , gdbm, gdbmSupport ? true
 , ncurses, readline, cursesSupport ? false
 , groff, docSupport ? false
-, libyaml, yamlSupport ? false
+, libyaml, yamlSupport ? true
 }:
 
 let

From 061fe164be1a3141a627f3f8f26d3ce0b41ae676 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Jan 2012 23:23:15 +0000
Subject: [PATCH 15/88] Added linux rtl8168e-2 firmware.

svn path=/nixpkgs/trunk/; revision=31475
---
 .../linux/firmware/rtl8168e-2/default.nix     | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix

diff --git a/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix b/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix
new file mode 100644
index 000000000000..a73ae9785976
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+let
+  src = fetchurl {
+    url = "http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=rtl_nic/rtl8168e-2.fw";
+    sha256 = "11lkwc6r6f5pi8clxajp43j6dzapydgxaxaschribpvhn8lrjj0a";
+    name = "rtl8168e-2.fw";
+  };
+in
+stdenv.mkDerivation {
+  name = "rtl8168e-2-firmware-2012.01.10";
+
+  unpackPhase = "true";
+
+  buildPhase = "true";
+
+  installPhase = "install -v -D ${src} $out/rtl_nic/${src.name}";
+
+  meta = {
+    description = "Firmware for the Realtek Gigabit Ethernet controllers";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13d15bc0538d..effce9f4ce5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6028,6 +6028,8 @@ let
 
   rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { };
 
+  rtl8168e2fw = callPackage ../os-specific/linux/firmware/rtl8168e-2 { };
+
   sdparm = callPackage ../os-specific/linux/sdparm { };
 
   shadow = callPackage ../os-specific/linux/shadow { };

From acf6a9c5e4f4b2f6c11812364e93fe9cd5d1ce1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Jan 2012 23:49:24 +0000
Subject: [PATCH 16/88] * Cleanup.

svn path=/nixpkgs/trunk/; revision=31476
---
 .../development/interpreters/ruby/patches.nix | 46 +++++++++++--------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index abcb1d0dfe4a..f4552b839ecb 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -1,46 +1,56 @@
-{fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi, zlib,
-  libuuid, gems}:
+{ fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi
+, zlib, libuuid, gems, jdk }:
 
 let
+
   patchUsrBinEnv = writeScript "path-usr-bin-env" ''
     #!/bin/sh
-    set -x
     echo "==================="
     find "$1" -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
     find "$1" -type f -name "*.mk" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
   '';
+  
 in
+
 {
   sup = { buildInputs = [ gems.ncursesw ]; };
+  
   sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
+  
   rails = { gemFlags = "--no-ri --no-rdoc"; };
+  
   ncurses = { propagatedBuildInputs = [ ncurses ]; };
+  
   ncursesw = { propagatedBuildInputs = [ ncurses ]; };
+  
   nokogiri = {
-    buildFlags=["--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2"
-                "--with-xslt-dir=${libxslt}" ];
+    buildFlags =
+      [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2"
+        "--with-xslt-dir=${libxslt}"
+      ];
   };
 
   ffi = {
     postUnpack = "onetuh";
-    buildFlags=["--with-ffi-dir=${libffi}"];
+    buildFlags = ["--with-ffi-dir=${libffi}"];
     NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv;
   };
 
   xrefresh_server =
-  let patch = fetchurl {
-      url = "http://mawercer.de/~nix/xrefresh.diff.gz";
-      sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq";
-    };
-  in {
-    propagatedBuildInputs = [ gems.rb_inotify ];
+    let
+      patch = fetchurl {
+        url = "http://mawercer.de/~nix/xrefresh.diff.gz";
+        sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq";
+      };
+    in {
+      propagatedBuildInputs = [ gems.rb_inotify ];
 
-    # monitor implementation for Linux
-    postInstall = ''
-      cd $out/${ruby.gemPath}/gems/*
-      zcat ${patch} | patch -p 1
-    '';
-  };
+      # monitor implementation for Linux
+      postInstall = ''
+        cd $out/${ruby.gemPath}/gems/*
+        zcat ${patch} | patch -p 1
+      ''; # */
+    };
 
   xapian_full = {
     buildInputs = [ gems.rake zlib libuuid ];

From 66da14b77c475029fe235258f5baf25a30c1eee0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Jan 2012 23:50:31 +0000
Subject: [PATCH 17/88] * Added buildr and its dependencies.

svn path=/nixpkgs/trunk/; revision=31477
---
 .../interpreters/ruby/generated.nix           | 404 +++++++++++++++++-
 .../development/interpreters/ruby/patches.nix |   5 +
 2 files changed, 388 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 1c286aa2ce4f..f2c32cda877f 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -10,18 +10,27 @@ g: # Get dependencies from patched gems
     activeresource = g.activeresource_3_1_3;
     activesupport = g.activesupport_3_1_3;
     arel = g.arel_2_2_1;
+    atoulme_Antwrap = g.atoulme_Antwrap_0_7_1;
     builder = g.builder_3_0_0;
+    buildr = g.buildr_1_4_6;
     bundler = g.bundler_1_0_21;
+    diff_lcs = g.diff_lcs_1_1_3;
     erubis = g.erubis_2_7_0;
+    highline = g.highline_1_5_1;
     hike = g.hike_1_2_1;
+    hoe = g.hoe_2_3_3;
     i18n = g.i18n_0_6_0;
-    json = g.json_1_6_3;
+    json = g.json_1_6_4;
+    json_pure = g.json_pure_1_6_4;
     mail = g.mail_2_3_0;
     mime_types = g.mime_types_1_17_2;
+    minitar = g.minitar_0_5_3;
     multi_json = g.multi_json_1_0_4;
+    net_sftp = g.net_sftp_2_0_4;
+    net_ssh = g.net_ssh_2_2_2;
     nix = g.nix_0_1_1;
     polyglot = g.polyglot_0_3_3;
-    rack = g.rack_1_3_5;
+    rack = g.rack_1_4_0;
     rack_cache = g.rack_cache_1_1;
     rack_mount = g.rack_mount_0_8_3;
     rack_ssl = g.rack_ssl_1_3_2;
@@ -30,15 +39,23 @@ g: # Get dependencies from patched gems
     railties = g.railties_3_1_3;
     rake = g.rake_0_9_2_2;
     rb_fsevent = g.rb_fsevent_0_4_3_1;
-    rdoc = g.rdoc_3_11;
-    sass = g.sass_3_1_11;
+    rdoc = g.rdoc_3_12;
+    rjb = g.rjb_1_3_8;
+    rspec = g.rspec_2_1_0;
+    rspec_core = g.rspec_core_2_1_0;
+    rspec_expectations = g.rspec_expectations_2_1_0;
+    rspec_mocks = g.rspec_mocks_2_1_0;
+    rubyforge = g.rubyforge_2_0_4;
+    rubyzip = g.rubyzip_0_9_4;
+    sass = g.sass_3_1_12;
     sprockets = g.sprockets_2_0_3;
     thor = g.thor_0_14_6;
     tilt = g.tilt_1_3_3;
     treetop = g.treetop_1_4_10;
     tzinfo = g.tzinfo_0_3_31;
+    xml_simple = g.xml_simple_1_0_12;
   };
-  gem_nix_args = [ ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ];
+  gem_nix_args = [ ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ];
   gems = {
     actionmailer_3_1_3 = {
       basename = ''actionmailer'';
@@ -59,7 +76,7 @@ g: # Get dependencies from patched gems
         longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
       };
       name = ''actionpack-3.1.3'';
-      requiredGems = [ g.activemodel_3_1_3 g.rack_cache_1_1 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_3 g.erubis_2_7_0 ];
+      requiredGems = [ g.activemodel_3_1_3 g.rack_cache_1_1 g.rack_1_3_6 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_3 g.erubis_2_7_0 ];
       sha256 = ''1awhqxdfg2zcb0b34jwq3sm2favay94n4glqywqzrn85wkf47a2q'';
     };
     activemodel_3_1_3 = {
@@ -124,6 +141,39 @@ database compatibility and query generation.'';
       requiredGems = [  ];
       sha256 = ''19pz68pr9l8h2j2v3vqzhjvs94s0hwqwpb6m9sd6ncj18gaci8jy'';
     };
+    atoulme_Antwrap_0_7_1 = {
+      basename = ''atoulme_Antwrap'';
+      meta = {
+        description = ''A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.'';
+        homepage = ''http://rubyforge.org/projects/antwrap/'';
+        longDescription = ''	A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.
+
+== FEATURES/PROBLEMS:
+
+	Antwrap runs on the native Ruby interpreter via the RJB (Ruby Java Bridge gem) and on the JRuby interpreter. Antwrap is compatible with Ant versions 1.5.4, 
+	1.6.5 and 1.7.0. For more information, 	see the Project Info (http://rubyforge.org/projects/antwrap/) page. 
+	 
+== SYNOPSIS:
+
+	Antwrap is a Ruby library that can be used to invoke Ant tasks. It is being used in the Buildr (http://incubator.apache.org/buildr/) project to execute 
+	Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to 
+	check out Buildr!'';
+      };
+      name = ''atoulme-Antwrap-0.7.1'';
+      requiredGems = [ g.rjb_1_3_8 ];
+      sha256 = ''0r9jy2asyma8h0878nhjfbi00qvb4yapc8glngvmkkj21zbx2mfy'';
+    };
+    builder_2_1_2 = {
+      basename = ''builder'';
+      meta = {
+        description = ''Builders for MarkUp.'';
+        homepage = ''http://onestepback.org'';
+        longDescription = ''Builder provides a number of builder objects that make creating structured data simple to do.  Currently the following builder objects are supported:  * XML Markup * XML Events'';
+      };
+      name = ''builder-2.1.2'';
+      requiredGems = [  ];
+      sha256 = ''0hp5gsvp63mqqvi7dl95zwci916vj6l1slgz4crip1rijk3v2806'';
+    };
     builder_3_0_0 = {
       basename = ''builder'';
       meta = {
@@ -140,6 +190,22 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''13k12jii9z1hma4xxk2dl74wsx985idl3cs9svvla8p0bmgf3lzv'';
     };
+    buildr_1_4_6 = {
+      basename = ''buildr'';
+      meta = {
+        description = ''Build like you code'';
+        homepage = ''http://buildr.apache.org/'';
+        longDescription = ''Apache Buildr is a build system for Java-based applications, including support
+for Scala, Groovy and a growing number of JVM languages and tools.  We wanted
+something that's simple and intuitive to use, so we only need to tell it what
+to do, and it takes care of the rest.  But also something we can easily extend
+for those one-off tasks, with a language that's a joy to use.
+'';
+      };
+      name = ''buildr-1.4.6'';
+      requiredGems = [ g.rake_0_8_7 g.builder_2_1_2 g.net_ssh_2_0_23 g.net_sftp_2_0_4 g.rubyzip_0_9_4 g.highline_1_5_1 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_3_3 g.atoulme_Antwrap_0_7_1 g.diff_lcs_1_1_2 g.rspec_expectations_2_1_0 g.rspec_mocks_2_1_0 g.rspec_core_2_1_0 g.rspec_2_1_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ];
+      sha256 = ''11qwqrdnmzzi4zhgajfq1f1ckvd4kpfm9gyqrfjfalphs4gi0vxz'';
+    };
     bundler_1_0_21 = {
       basename = ''bundler'';
       meta = {
@@ -151,6 +217,42 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6'';
     };
+    diff_lcs_1_1_2 = {
+      basename = ''diff_lcs'';
+      meta = {
+        description = ''Provides a list of changes that represent the difference between two sequenced collections.'';
+        homepage = ''http://rubyforge.org/projects/ruwiki/'';
+        longDescription = ''Diff::LCS is a port of Algorithm::Diff that uses the McIlroy-Hunt longest common subsequence (LCS) algorithm to compute intelligent differences between two sequenced enumerable containers. The implementation is based on Mario I. Wolczko's Smalltalk version (1.2, 1993) and Ned Konz's Perl version (Algorithm::Diff).'';
+      };
+      name = ''diff-lcs-1.1.2'';
+      requiredGems = [  ];
+      sha256 = ''1i5bfxh77whaasajhzd2qkm5zwy7ryb7pfc96m1fv9afwn6cg3yp'';
+    };
+    diff_lcs_1_1_3 = {
+      basename = ''diff_lcs'';
+      meta = {
+        description = ''Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt longest common subsequence (LCS) algorithm to compute intelligent differences between two sequenced enumerable containers'';
+        longDescription = ''Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt
+longest common subsequence (LCS) algorithm to compute intelligent differences
+between two sequenced enumerable containers. The implementation is based on
+Mario I. Wolczko's {Smalltalk version 1.2}[ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st]
+(1993) and Ned Konz's Perl version
+{Algorithm::Diff 1.15}[http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/].
+
+This is release 1.1.3, fixing several small bugs found over the years. Version
+1.1.0 added new features, including the ability to #patch and #unpatch changes
+as well as a new contextual diff callback, Diff::LCS::ContextDiffCallbacks,
+that should improve the context sensitivity of patching.
+
+This library is called Diff::LCS because of an early version of Algorithm::Diff
+which was restrictively licensed. This version has seen a minor license change:
+instead of being under Ruby's license as an option, the third optional license
+is the MIT license.'';
+      };
+      name = ''diff-lcs-1.1.3'';
+      requiredGems = [  ];
+      sha256 = ''15wqs3md9slif6ag43vp6gw63r3a2zdqiyfapnnzkb7amgg930pv'';
+    };
     erubis_2_7_0 = {
       basename = ''erubis'';
       meta = {
@@ -174,6 +276,17 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3'';
     };
+    highline_1_5_1 = {
+      basename = ''highline'';
+      meta = {
+        description = ''HighLine is a high-level command-line IO library.'';
+        homepage = ''http://highline.rubyforge.org'';
+        longDescription = ''A high-level IO library that provides validation, type conversion, and more for command-line interfaces. HighLine also includes a complete menu system that can crank out anything from simple list selection to complete shells with just minutes of work.'';
+      };
+      name = ''highline-1.5.1'';
+      requiredGems = [  ];
+      sha256 = ''0sawb011sc1i5glr80a4iflr0vvn3s5c97a4jmrhj3palv4df19i'';
+    };
     hike_1_2_1 = {
       basename = ''hike'';
       meta = {
@@ -185,6 +298,36 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''1c78gja9i9nj76gdj65czhvwam6550l0w9ilnn8vysj9cwv0rg7b'';
     };
+    hoe_2_3_3 = {
+      basename = ''hoe'';
+      meta = {
+        description = ''Hoe is a rake/rubygems helper for project Rakefiles'';
+        homepage = ''http://rubyforge.org/projects/seattlerb/'';
+        longDescription = ''Hoe is a rake/rubygems helper for project Rakefiles. It helps generate
+rubygems and includes a dynamic plug-in system allowing for easy
+extensibility. Hoe ships with plug-ins for all your usual project
+tasks including rdoc generation, testing, packaging, and deployment.
+
+Plug-ins Provided:
+
+* Hoe::Clean
+* Hoe::Debug
+* Hoe::Deps
+* Hoe::Flay
+* Hoe::Flog
+* Hoe::Inline
+* Hoe::Package
+* Hoe::Publish
+* Hoe::RCov
+* Hoe::Signing
+* Hoe::Test
+
+See class rdoc for help. Hint: ri Hoe'';
+      };
+      name = ''hoe-2.3.3'';
+      requiredGems = [ g.rubyforge_2_0_4 g.rake_0_9_2_2 ];
+      sha256 = ''06jlnbhimrn6znimaaxm7kh2269lapkbmnp3wssrjmw06ms7lq9m'';
+    };
     i18n_0_6_0 = {
       basename = ''i18n'';
       meta = {
@@ -196,16 +339,38 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0'';
     };
-    json_1_6_3 = {
+    json_1_6_4 = {
       basename = ''json'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
       };
-      name = ''json-1.6.3'';
+      name = ''json-1.6.4'';
       requiredGems = [  ];
-      sha256 = ''0bcl6r04b0r5c0n1y47c7d29r50rl2rzd2hsc23832kgfrc1488m'';
+      sha256 = ''1adka4y7z9v4lmd2zqyap21ghqdnjaivr1ghnqcnw3dmsdrgf39l'';
+    };
+    json_pure_1_4_3 = {
+      basename = ''json_pure'';
+      meta = {
+        description = ''JSON Implementation for Ruby'';
+        homepage = ''http://flori.github.com/json'';
+        longDescription = ''This is a JSON implementation in pure Ruby.'';
+      };
+      name = ''json_pure-1.4.3'';
+      requiredGems = [  ];
+      sha256 = ''1xw357gkmk6712c94lhpsrq8j9v91mgc2nxlr1m6n20yl6sz2g9r'';
+    };
+    json_pure_1_6_4 = {
+      basename = ''json_pure'';
+      meta = {
+        description = ''JSON Implementation for Ruby'';
+        homepage = ''http://flori.github.com/json'';
+        longDescription = ''This is a JSON implementation in pure Ruby.'';
+      };
+      name = ''json_pure-1.6.4'';
+      requiredGems = [  ];
+      sha256 = ''12i95k265gx4vy2cpxrb3z4slc4czsh3srgky2a6d5h3q6c1kvbf'';
     };
     mail_2_3_0 = {
       basename = ''mail'';
@@ -243,6 +408,17 @@ Copyright:: 2002 - 2011, Austin Ziegler
       requiredGems = [  ];
       sha256 = ''0i4pmx86xbnlrhbbm9znnyfglmb21vwjvh262c6qw3m19w6ifs6p'';
     };
+    minitar_0_5_3 = {
+      basename = ''minitar'';
+      meta = {
+        description = ''Provides POSIX tarchive management from Ruby programs.'';
+        homepage = ''http://rubyforge.org/projects/ruwiki/'';
+        longDescription = ''Archive::Tar::Minitar is a pure-Ruby library and command-line utility that provides the ability to deal with POSIX tar(1) archive files. The implementation is based heavily on Mauricio Ferna'ndez's implementation in rpa-base, but has been reorganised to promote reuse in other projects.'';
+      };
+      name = ''minitar-0.5.3'';
+      requiredGems = [  ];
+      sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
+    };
     multi_json_1_0_4 = {
       basename = ''multi_json'';
       meta = {
@@ -254,6 +430,39 @@ Copyright:: 2002 - 2011, Austin Ziegler
       requiredGems = [  ];
       sha256 = ''0f2yrlxcdhdskkm4q11p2didwl26wikxycysb7i49ndp94rklvcr'';
     };
+    net_sftp_2_0_4 = {
+      basename = ''net_sftp'';
+      meta = {
+        description = ''A pure Ruby implementation of the SFTP client protocol'';
+        homepage = ''http://net-ssh.rubyforge.org/sftp'';
+        longDescription = ''A pure Ruby implementation of the SFTP client protocol'';
+      };
+      name = ''net-sftp-2.0.4'';
+      requiredGems = [ g.net_ssh_2_2_2 ];
+      sha256 = ''1f0ml1z7kjnd79avn42fmys8j0w2995j5lk30ak5n40bq805yvky'';
+    };
+    net_ssh_2_0_23 = {
+      basename = ''net_ssh'';
+      meta = {
+        description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
+        homepage = ''http://github.com/net-ssh/net-ssh'';
+        longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
+      };
+      name = ''net-ssh-2.0.23'';
+      requiredGems = [  ];
+      sha256 = ''1fllf6mgwc213m5mn266qwhl65zc84wl8rq9m3lvbggw9mh5ynrr'';
+    };
+    net_ssh_2_2_2 = {
+      basename = ''net_ssh'';
+      meta = {
+        description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
+        homepage = ''http://github.com/net-ssh/net-ssh'';
+        longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
+      };
+      name = ''net-ssh-2.2.2'';
+      requiredGems = [  ];
+      sha256 = ''11rlcb6w534g21x1g1jz1v1lvyj3zv6s621pf9cwl1aqbl6zh711'';
+    };
     nix_0_1_1 = {
       basename = ''nix'';
       meta = {
@@ -279,7 +488,7 @@ augments 'require' to find and load matching files.'';
       requiredGems = [  ];
       sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v'';
     };
-    rack_1_3_5 = {
+    rack_1_3_6 = {
       basename = ''rack'';
       meta = {
         description = ''a modular Ruby webserver interface'';
@@ -293,9 +502,27 @@ middleware) into a single method call.
 Also see http://rack.rubyforge.org.
 '';
       };
-      name = ''rack-1.3.5'';
+      name = ''rack-1.3.6'';
       requiredGems = [  ];
-      sha256 = ''1qg5nqd3a8v52hfcr9885vyfc9sscykp72by1xb1c090l5pc68hp'';
+      sha256 = ''1qkhwsr1gz4k5rlf9d6ga4cwkw4lbxpcywxy0bkg92js413hy2fl'';
+    };
+    rack_1_4_0 = {
+      basename = ''rack'';
+      meta = {
+        description = ''a modular Ruby webserver interface'';
+        homepage = ''http://rack.rubyforge.org'';
+        longDescription = ''Rack provides a minimal, modular and adaptable interface for developing
+web applications in Ruby.  By wrapping HTTP requests and responses in
+the simplest way possible, it unifies and distills the API for web
+servers, web frameworks, and software in between (the so-called
+middleware) into a single method call.
+
+Also see http://rack.rubyforge.org.
+'';
+      };
+      name = ''rack-1.4.0'';
+      requiredGems = [  ];
+      sha256 = ''15mqryky86fhx0h3kiab5x1lamq62hq6kc3knl6v10p1az4zpcq9'';
     };
     rack_cache_1_1 = {
       basename = ''rack_cache'';
@@ -305,7 +532,7 @@ Also see http://rack.rubyforge.org.
         longDescription = ''HTTP Caching for Rack'';
       };
       name = ''rack-cache-1.1'';
-      requiredGems = [ g.rack_1_3_5 ];
+      requiredGems = [ g.rack_1_4_0 ];
       sha256 = ''08jlym48qwfj7wddv0vpjj3vlc03q8wvbya24zbrjj8grgfgrvrl'';
     };
     rack_mount_0_8_3 = {
@@ -365,9 +592,20 @@ request helpers feature.'';
         longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
       };
       name = ''railties-3.1.3'';
-      requiredGems = [ g.rake_0_9_2_2 g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_11 ];
+      requiredGems = [ g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_12 ];
       sha256 = ''07kgr9nzvgwpjqwssiknlqds1a9mj74g1hqpwsj6720x4pk9r13h'';
     };
+    rake_0_8_7 = {
+      basename = ''rake'';
+      meta = {
+        description = ''Ruby based make-like utility.'';
+        homepage = ''http://rake.rubyforge.org'';
+        longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.'';
+      };
+      name = ''rake-0.8.7'';
+      requiredGems = [  ];
+      sha256 = ''03z1zm7xwl2r9v945ambwbd9sn2smbi34xldmac7qjcmsvd7pcqh'';
+    };
     rake_0_9_2_2 = {
       basename = ''rake'';
       meta = {
@@ -390,7 +628,7 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''043w4695j7f9n0hawy9y0yci36linivsbp23v52v2qg64ji7hsiw'';
     };
-    rdoc_3_11 = {
+    rdoc_3_12 = {
       basename = ''rdoc'';
       meta = {
         description = ''RDoc produces HTML and command-line documentation for Ruby projects'';
@@ -401,11 +639,125 @@ documentation.
 
 See RDoc for a description of RDoc's markup and basic use.'';
       };
-      name = ''rdoc-3.11'';
-      requiredGems = [ g.json_1_6_3 ];
-      sha256 = ''0wq8525v21pxcnwgn5ypblcsb0xasnicjnqqd7mrrfqm2g3k2frm'';
+      name = ''rdoc-3.12'';
+      requiredGems = [ g.json_1_6_4 ];
+      sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp'';
     };
-    sass_3_1_11 = {
+    rjb_1_3_3 = {
+      basename = ''rjb'';
+      meta = {
+        description = ''Ruby Java bridge'';
+        homepage = ''http://rjb.rubyforge.org/'';
+        longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
+'';
+      };
+      name = ''rjb-1.3.3'';
+      requiredGems = [  ];
+      sha256 = ''0jhj1y84yzdr11li784m255jvc191vs8d3zck21rfqv4z4zpifz6'';
+    };
+    rjb_1_3_8 = {
+      basename = ''rjb'';
+      meta = {
+        description = ''Ruby Java bridge'';
+        homepage = ''http://rjb.rubyforge.org/'';
+        longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
+'';
+      };
+      name = ''rjb-1.3.8'';
+      requiredGems = [  ];
+      sha256 = ''0cwc3zh9ydwzvc176vjin7jpf8riisyjdwbywrmvc426kjyrrwwr'';
+    };
+    rspec_2_1_0 = {
+      basename = ''rspec'';
+      meta = {
+        description = ''rspec-2.1.0'';
+        homepage = ''http://github.com/rspec/rspec'';
+        longDescription = ''Meta-gem that depends on the other rspec gems'';
+      };
+      name = ''rspec-2.1.0'';
+      requiredGems = [  ];
+      sha256 = ''16h7s8wr969wiig4qahr03ln144pz39jindlc3z11d064zvzhiza'';
+    };
+    rspec_core_2_1_0 = {
+      basename = ''rspec_core'';
+      meta = {
+        description = ''rspec-core-2.1.0'';
+        homepage = ''http://github.com/rspec/rspec-core'';
+        longDescription = ''RSpec runner and example groups'';
+      };
+      name = ''rspec-core-2.1.0'';
+      requiredGems = [  ];
+      sha256 = ''1fs9c8dafg7v948wzxjhhzf0djr1rjva7lymah32rlj3x5xm9zmh'';
+    };
+    rspec_expectations_2_1_0 = {
+      basename = ''rspec_expectations'';
+      meta = {
+        description = ''rspec-expectations-2.1.0'';
+        homepage = ''http://github.com/rspec/rspec-expectations'';
+        longDescription = ''rspec expectations (should[_not] and matchers)'';
+      };
+      name = ''rspec-expectations-2.1.0'';
+      requiredGems = [ g.diff_lcs_1_1_3 ];
+      sha256 = ''0p7gs3zsj70fz30209961fzdgia1qyrpg54v0ywhqmvc5kl0q8lc'';
+    };
+    rspec_mocks_2_1_0 = {
+      basename = ''rspec_mocks'';
+      meta = {
+        description = ''rspec-mocks-2.1.0'';
+        homepage = ''http://github.com/rspec/rspec-mocks'';
+        longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking'';
+      };
+      name = ''rspec-mocks-2.1.0'';
+      requiredGems = [  ];
+      sha256 = ''1qhznpj0wq08z31i1rcv99dwx2abl4rlx2338ly0dcql54s8mma4'';
+    };
+    rubyforge_2_0_3 = {
+      basename = ''rubyforge'';
+      meta = {
+        description = ''A script which automates a limited set of rubyforge operations'';
+        homepage = ''http://codeforpeople.rubyforge.org/rubyforge/'';
+        longDescription = ''A script which automates a limited set of rubyforge operations.
+
+* Run 'rubyforge help' for complete usage.
+* Setup: For first time users AND upgrades to 0.4.0:
+  * rubyforge setup (deletes your username and password, so run sparingly!)
+  * edit ~/.rubyforge/user-config.yml
+  * rubyforge config
+* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
+      };
+      name = ''rubyforge-2.0.3'';
+      requiredGems = [ g.json_pure_1_6_4 ];
+      sha256 = ''1ck9hkad55dy25819v4gd1nmnpvcrb3i4np3hc03h1j6q8qpxg5p'';
+    };
+    rubyforge_2_0_4 = {
+      basename = ''rubyforge'';
+      meta = {
+        description = ''A script which automates a limited set of rubyforge operations'';
+        homepage = ''http://codeforpeople.rubyforge.org/rubyforge/'';
+        longDescription = ''A script which automates a limited set of rubyforge operations.
+
+* Run 'rubyforge help' for complete usage.
+* Setup: For first time users AND upgrades to 0.4.0:
+  * rubyforge setup (deletes your username and password, so run sparingly!)
+  * edit ~/.rubyforge/user-config.yml
+  * rubyforge config
+* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
+      };
+      name = ''rubyforge-2.0.4'';
+      requiredGems = [  ];
+      sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1'';
+    };
+    rubyzip_0_9_4 = {
+      basename = ''rubyzip'';
+      meta = {
+        description = ''rubyzip is a ruby module for reading and writing zip files'';
+        homepage = ''http://rubyzip.sourceforge.net/'';
+      };
+      name = ''rubyzip-0.9.4'';
+      requiredGems = [  ];
+      sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41'';
+    };
+    sass_3_1_12 = {
       basename = ''sass'';
       meta = {
         description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@@ -416,9 +768,9 @@ See RDoc for a description of RDoc's markup and basic use.'';
       command line tool or a web-framework plugin.
 '';
       };
-      name = ''sass-3.1.11'';
+      name = ''sass-3.1.12'';
       requiredGems = [  ];
-      sha256 = ''0ksbvvc210yd3fjk7gzsj25qzcd5ahw5rsh3bx94w53ylq60af2g'';
+      sha256 = ''10n2aic53290xsa3y3d63523s8xc78w5q5gqpns6cbljkdwb0ndy'';
     };
     sprockets_2_0_3 = {
       basename = ''sprockets'';
@@ -474,5 +826,15 @@ See RDoc for a description of RDoc's markup and basic use.'';
       requiredGems = [  ];
       sha256 = ''1kwc25c1x8cvryjhpp8sx20vrd8h9g9gsl7p5393a88544qy41hb'';
     };
+    xml_simple_1_0_12 = {
+      basename = ''xml_simple'';
+      meta = {
+        description = ''A simple API for XML processing.'';
+        homepage = ''http://xml-simple.rubyforge.org'';
+      };
+      name = ''xml-simple-1.0.12'';
+      requiredGems = [  ];
+      sha256 = ''0m7z3l8ccm3zd22gyx40fnfl0nah61jaigb4bkmplq0hdazyj60y'';
+    };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index f4552b839ecb..37f103f7772d 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -56,4 +56,9 @@ in
     buildInputs = [ gems.rake zlib libuuid ];
     gemFlags = "--no-rdoc --no-ri";
   };
+
+  rjb = {
+    buildInputs = [ jdk ];
+    JAVA_HOME = jdk;
+  };
 }

From 415ef893932286a7f4e18d4d7d2686ba06b8eb74 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Jan 2012 14:40:44 +0000
Subject: [PATCH 18/88] haskell-conduit: updated to version 0.0.2

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index fa210279ec02..509f6316cc53 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "0.0.1.1";
-  sha256 = "1144l40x8xvr3dkkhbg33fnajn9ggavxqa094zan0bdqljh48ips";
+  version = "0.0.2";
+  sha256 = "0apjwl0ypv2bmg5yy76jsb3z6wnaws5kgx9z3f92c5chpfm5mdqh";
   buildDepends = [
     liftedBase monadControl text transformers transformersBase
   ];

From 0eeb206fb58252581ef78b9f60fb962754d901bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Jan 2012 14:40:49 +0000
Subject: [PATCH 19/88] haskell-irc: updated to version 0.5.0.0

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

diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix
index be3818cb7d85..c7e222e1d14c 100644
--- a/pkgs/development/libraries/haskell/irc/default.nix
+++ b/pkgs/development/libraries/haskell/irc/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "irc";
-  version = "0.4.4.2";
-  sha256 = "1bbxlmb6jzz0zw18nr3d6lgd83vi9hrjahfcf1dswc946wi31s97";
+  version = "0.5.0.0";
+  sha256 = "0bid9iqgrppkl7hl1cd2m1pvvk5qva53fqfl0v5ld52j904c50sr";
   buildDepends = [ parsec ];
   meta = {
     description = "A small library for parsing IRC messages";

From 25b5e5e5ddaeb2f130f0f000e6371f95def03cda Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Jan 2012 18:52:43 +0000
Subject: [PATCH 20/88] pkgs/top-level/all-packages.nix: build texLive with
 ruby18

The latest version of Ruby can't interpret the "epspdf.rb" script.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index effce9f4ce5d..57fb7a2844f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8562,11 +8562,12 @@ let
 
   texLive = builderDefsPackage (import ../misc/tex/texlive) {
     inherit builderDefs zlib bzip2 ncurses libpng ed
-      gd t1lib freetype icu perl ruby expat curl
+      gd t1lib freetype icu perl expat curl
       libjpeg bison python fontconfig flex;
     inherit (xlibs) libXaw libX11 xproto libXt libXpm
       libXmu libXext xextproto libSM libICE;
     ghostscript = ghostscriptX;
+    ruby = ruby18;
   };
 
   /* Look in configurations/misc/raskin.nix for usage example (around revisions

From 9cea0dd1c69a149f8e0353d0b90a5bfe3f95c6ba Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Wed, 11 Jan 2012 22:32:17 +0000
Subject: [PATCH 21/88] Update of XChat to 2.8.8; old version 2.8.4 does not
 compile.

svn path=/nixpkgs/trunk/; revision=31485
---
 pkgs/applications/networking/irc/xchat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/irc/xchat/default.nix b/pkgs/applications/networking/irc/xchat/default.nix
index f7e4395e5309..88ba5b9193e5 100644
--- a/pkgs/applications/networking/irc/xchat/default.nix
+++ b/pkgs/applications/networking/irc/xchat/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, tcl, gtk}:
 
 stdenv.mkDerivation {
-  name = "xchat-2.8.4";
+  name = "xchat-2.8.8";
   src = fetchurl {
-    url = http://www.xchat.org/files/source/2.8/xchat-2.8.4.tar.bz2;
-    sha256 = "0qyx6rdvnjwy52amcmkjj134sysfkzbyv7b66vjsla3i8yg9lnpr";
+    url = http://www.xchat.org/files/source/2.8/xchat-2.8.8.tar.bz2;
+    sha256 = "0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0";
   };
   buildInputs = [pkgconfig tcl gtk];
   configureFlags = "--disable-nls";

From 1aaf70f4d74fcdc255b62b659c5d38f80694eb12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Jan 2012 23:14:07 +0000
Subject: [PATCH 22/88] ghostscript: CUPS support is no longer enabled by
 default in version 9.x

We must explicitly give the "--with-install-cups" option at configure time to
get the gstoraster filter installed.

svn path=/nixpkgs/trunk/; revision=31487
---
 pkgs/misc/ghostscript/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index c29f7c4456f8..bcb4614674cd 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -85,7 +85,9 @@ stdenv.mkDerivation rec {
     makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups)
   '';
 
-  configureFlags = if x11Support then [ "--with-x" ] else [ "--without-x" ];
+  configureFlags =
+    (if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++
+    (if cupsSupport then [ "--enable-cups" "--with-install-cups" ] else [ "--disable-cups" ]);
 
   doCheck = true;
 

From 0d69e2a9d0e6e51b6e042fdfdc2dbb074326f36b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Jan 2012 23:14:12 +0000
Subject: [PATCH 23/88] ghostscript: cosmetic change to simplify the DLL build
 and install procedure

svn path=/nixpkgs/trunk/; revision=31488
---
 pkgs/misc/ghostscript/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index bcb4614674cd..af82a45c0fab 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -91,11 +91,9 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  preBuild = "make so";
+  installTargets="install soinstall";
 
   postInstall = ''
-    make soinstall
-
     for i in $fonts; do
       (cd $out/share/ghostscript && tar xvfz $i)
     done

From 0a2ad94a0ef57b6b1800dcf637beeace06ab5c07 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Thu, 12 Jan 2012 10:17:29 +0000
Subject: [PATCH 24/88] Fixed rtl8192cfw firmware package.

Also, added a package that fetches all firmware from dwmw2's repo on kernel.org.
Specific firmware can then simply copy the driver out of this repo. Perhaps it
would actually be useful to write some abstraction for that.

Anyway, I'm not sure if fetching the git repo is a good idea to start with. The
repo does not have tags, so I'm forced to either take the HEAD or a particular
commit (chose the last option). However, this is likely to need ongoing
maintenance.

svn path=/nixpkgs/trunk/; revision=31492
---
 .../linux/firmware/dwmw2/default.nix          | 14 +++++++++
 .../linux/firmware/rtl8192c/default.nix       | 31 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/os-specific/linux/firmware/dwmw2/default.nix

diff --git a/pkgs/os-specific/linux/firmware/dwmw2/default.nix b/pkgs/os-specific/linux/firmware/dwmw2/default.nix
new file mode 100644
index 000000000000..ba8c724890c7
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/dwmw2/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchgit}:
+
+let
+  repo = "git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git";
+  src  = fetchgit {
+      url  = repo;
+      rev  = "15888a2eab052ac3d3f49334e4f6f05f347a516e";
+      sha256 = "df63b71dd56ad85f97784076eeced76849e95cb30a9909e8322f7fdd54f227b4";
+    };
+  meta = {
+    description = "GIT repo of the linux firmware binaries";
+    homepage = repo;
+  };
+in stdenv.lib.setName "linux-firmware" (stdenv.lib.addMetaAttrs meta src)
diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
index 877784d4b583..d19d26d5cba6 100644
--- a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
+++ b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
@@ -1,23 +1,18 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "rtl8192c-fw";
-  src = fetchurl {
-    url = "ftp://WebUser:AxPL9s3k@202.134.71.21/cn/wlan/92ce_se_de_linux_mac80211_0004.0816.2011.tar.gz";
-    sha256 = "1kg63h5rj4kja2csmqsrxjipb1wpznfbrvn9cla9d9byksy5fn64";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  # Installation copies the firmware AND the license.  The license
-  # says: "Your rights to redistribute the Software shall be
-  # contingent upon your installation of this Agreement in its
-  # entirety in the same directory as the Software."
-  installPhase = "ensureDir $out; cp -a firmware/* $out";
-  
+{stdenv, linuxFirmware}:
+let
+  src  = linuxFirmware;
+  dir  = "rtlwifi";
+  file = "rtl8192cfw.bin";
   meta = {
     description = "Firmware for the Realtek RTL8192c wireless cards";
     homepage = "http://www.realtek.com";
     license = "non-free";
-  };
+  };  
+in stdenv.mkDerivation {
+  name = "rtl8192c-fw";
+  inherit src meta dir file;
+
+  phases = [ "installPhase" ];
+
+  installPhase = "ensureDir $out/$dir && cp $src/$dir/$file $out/$dir/$file";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57fb7a2844f6..2ef33a44e026 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6026,6 +6026,8 @@ let
 
   rtkit = callPackage ../os-specific/linux/rtkit { };
 
+  linuxFirmware = callPackage ../os-specific/linux/firmware/dwmw2 { };
+
   rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { };
 
   rtl8168e2fw = callPackage ../os-specific/linux/firmware/rtl8168e-2 { };

From b6dc8c87d8046cf5dbabd7b56d40d6551657fece Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Jan 2012 15:20:50 +0000
Subject: [PATCH 25/88] haskell-conduit: updated to version 0.0.3

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 509f6316cc53..40bef100607f 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "0.0.2";
-  sha256 = "0apjwl0ypv2bmg5yy76jsb3z6wnaws5kgx9z3f92c5chpfm5mdqh";
+  version = "0.0.3";
+  sha256 = "149xj6i2whpjf6jqsgfgvpbwni5r0v3qrg7g42i78bd6n40xma72";
   buildDepends = [
     liftedBase monadControl text transformers transformersBase
   ];

From 867fb191cc8bd42c62e14bcb3f7c9eee3bada9eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Jan 2012 15:21:08 +0000
Subject: [PATCH 26/88] haskell-haskell-src-meta: updated to version 0.5.0.3

svn path=/nixpkgs/trunk/; revision=31495
---
 .../libraries/haskell/haskell-src-meta/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index 5271176a5cfd..fc377e554a6b 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-meta";
-  version = "0.5.0.2";
-  sha256 = "059zvr91bnajql19c76vwivvy6sbca83ky8ja91bf8xv1p3jfz3w";
+  version = "0.5.0.3";
+  sha256 = "0c270088b5p3drr3f75ln210py2h4dfkkfgvly3ry42yl6xkvm2j";
   buildDepends = [ haskellSrcExts syb thLift ];
   meta = {
     description = "Parse source to template-haskell abstract syntax";

From c9fc73ae45c1ca5e17444857f5a8987acf6f0a32 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Jan 2012 15:21:11 +0000
Subject: [PATCH 27/88] haskell-hxt-charproperties: updated to version 9.1.1

svn path=/nixpkgs/trunk/; revision=31496
---
 .../libraries/haskell/hxt-charproperties/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
index c466d8774882..9e2b9a21bb38 100644
--- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt-charproperties";
-  version = "9.1.0";
-  sha256 = "1a227czzbbw8pigc2dk5fyyc4x1rpx82mb5c4hpjjz97l0sdlc23";
+  version = "9.1.1";
+  sha256 = "14xv0q1hh0k8lgispc4fa49cvyg9s7936kp42vr9b0pyd1q4zid8";
   meta = {
     homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
     description = "Character properties and classes for XML and Unicode";

From de7bd112f1cab20b193a1d6c03654bb981a63063 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Jan 2012 15:21:15 +0000
Subject: [PATCH 28/88] haskell-hxt-regex-xmlschema: updated to version 9.0.4

svn path=/nixpkgs/trunk/; revision=31497
---
 .../libraries/haskell/hxt-regex-xmlschema/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
index 94e144299660..c18bdea38753 100644
--- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt-regex-xmlschema";
-  version = "9.0.1";
-  sha256 = "1mg22fa0f0cbj9gkl5zaq0xh94ljkmzrc019h3cxv728chpgby0c";
+  version = "9.0.4";
+  sha256 = "0jl89p9sb76zb6j2b9ssxaai6jq3jbnnpv4v05wfvlmk8apckwgf";
   buildDepends = [ hxtCharproperties parsec ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";

From 7bcb27653d403367dda1780056ba6626b28370b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Jan 2012 15:21:18 +0000
Subject: [PATCH 29/88] haskell-hxt-unicode: updated to version 9.0.2

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

diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
index 452a38c79c8c..6584a69b4bae 100644
--- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt-unicode";
-  version = "9.0.1";
-  sha256 = "0g8qz7waip7zsdi35idj9db6qd7lqbv88l0c4rz8q7nh85jsp6ym";
+  version = "9.0.2";
+  sha256 = "1ri3198j0bavgam861yiiisl43rh4pbkmji7g6v3jnnch7834hdd";
   buildDepends = [ hxtCharproperties ];
   meta = {
     homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";

From c3cf936ff12d174720830aa0aa78ebaa9de95449 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Jan 2012 15:21:22 +0000
Subject: [PATCH 30/88] haskell-hxt: updated to version 9.1.6

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

diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index 979fa3c11e9e..c8871f423c00 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt";
-  version = "9.1.5";
-  sha256 = "0w0l86y8q2391dvqn112f2s0infm1zzqnlp9hhwcx8jg2slsxbcm";
+  version = "9.1.6";
+  sha256 = "1ir1az8zpi9adkwpm3m4gjrwrn9cbmwd1dbqz4lrwi82i54c9bpb";
   buildDepends = [
     binary deepseq HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode
     network parsec

From d62848cd2c4bf3d20c92782b89d90739df5e9e8c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Jan 2012 16:59:58 +0000
Subject: [PATCH 31/88] * eval-release.nix: force nix-instantiate to include
 nested attribute   sets.

svn path=/nixpkgs/trunk/; revision=31500
---
 maintainers/scripts/eval-release.nix | 21 ++++++++++++++-------
 pkgs/top-level/all-packages.nix      |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix
index 3d4458699c74..836e4312c448 100644
--- a/maintainers/scripts/eval-release.nix
+++ b/maintainers/scripts/eval-release.nix
@@ -2,23 +2,30 @@
 # attribute with the expected `system' argument).  Too bad
 # nix-instantiate can't to do this.
 
-let
+with import ../../pkgs/lib;
 
-  lib = (import ../.. {}).lib;
+let
 
   rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ];
 
-  seqList = xs: res: lib.fold (x: xs: lib.seq x xs) res xs;
+  seqList = xs: res: fold (x: xs: seq x xs) res xs;
   
-  strictAttrs = as: seqList (lib.attrValues as) as;
+  strictAttrs = as: seqList (attrValues as) as;
 
   maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" null;
 
-  call = attrs: lib.flip lib.mapAttrs attrs
-    (n: v: builtins.trace n (
+  call = attrs: flip mapAttrs attrs
+    (n: v: /* builtins.trace n */ (
       if builtins.isFunction v then maybe (v { system = "i686-linux"; })
       else if builtins.isAttrs v then call v
       else null
     ));
 
-in call rel
+  # Add the ‘recurseForDerivations’ attribute to ensure that
+  # nix-instantiate recurses into nested attribute sets.
+  recurse = attrs:
+    if isDerivation attrs
+    then attrs
+    else { recurseForDerivations = true; } // mapAttrs (n: v: recurse v) attrs;
+
+in recurse (call rel)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ef33a44e026..556f6afc04aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -177,7 +177,7 @@ let
 
   # Applying this to an attribute set will cause nix-env to look
   # inside the set for derivations.
-  recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;};
+  recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };
 
   builderDefs = lib.composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) {
     inherit stringsWithDeps lib stdenv writeScript

From 0fa0da35ef96cc9a3c8895ab9858e579358dd604 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Thu, 12 Jan 2012 17:16:11 +0000
Subject: [PATCH 32/88] Added firmware-linux-nonfree and directly also the free
 variant.

Todo for later: take the files from the various .deb files instead of the source distribution.
This version already improves upon my previous implementation, hence I commit it.

svn path=/nixpkgs/trunk/; revision=31501
---
 .../linux/firmware/dwmw2/default.nix          | 14 -----------
 .../firmware/firmware-linux-free/default.nix  | 21 ++++++++++++++++
 .../firmware-linux-nonfree/default.nix        | 24 +++++++++++++++++++
 .../linux/firmware/rtl8192c/default.nix       | 22 +++++++----------
 pkgs/top-level/all-packages.nix               |  5 ++--
 5 files changed, 57 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/firmware/dwmw2/default.nix
 create mode 100644 pkgs/os-specific/linux/firmware/firmware-linux-free/default.nix
 create mode 100644 pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix

diff --git a/pkgs/os-specific/linux/firmware/dwmw2/default.nix b/pkgs/os-specific/linux/firmware/dwmw2/default.nix
deleted file mode 100644
index ba8c724890c7..000000000000
--- a/pkgs/os-specific/linux/firmware/dwmw2/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchgit}:
-
-let
-  repo = "git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git";
-  src  = fetchgit {
-      url  = repo;
-      rev  = "15888a2eab052ac3d3f49334e4f6f05f347a516e";
-      sha256 = "df63b71dd56ad85f97784076eeced76849e95cb30a9909e8322f7fdd54f227b4";
-    };
-  meta = {
-    description = "GIT repo of the linux firmware binaries";
-    homepage = repo;
-  };
-in stdenv.lib.setName "linux-firmware" (stdenv.lib.addMetaAttrs meta src)
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-free/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-free/default.nix
new file mode 100644
index 000000000000..73f8c4f1d7db
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-free/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "firmware-linux-free-3";
+
+  src = fetchurl {
+      url = "mirror://debian/pool/main/f/firmware-free/firmware-free_3.tar.gz";
+      sha256 = "8363230e56365dd6b5e8ae9fd6cefab83472f4842f7221ffc2d890eaf7d7f1ef";
+    };
+ 
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''ensureDir $out && cp -ra * $out/'';
+
+  meta = {
+    description = "Free kernel firmware (packaged by Debian)";
+    homepage = "http://packages.debian.org/sid/firmware-linux-nonfree";
+    license = "free";
+    priority = "10";
+  };
+}
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
new file mode 100644
index 000000000000..d501891d2a12
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "firmware-linux-nonfree-0.34";
+
+  src = fetchurl {
+      url = "mirror://debian/pool/non-free/f/firmware-nonfree/firmware-nonfree_0.34.tar.gz";
+      sha256 = "94fe856d00f63559486b7684c0fae9b30bee599c6d7dea8c7e00d2dcb548ee8a";
+    };
+ 
+  phases = [ "unpackPhase" "installPhase" "postInstall" ];
+
+  installPhase = "ensureDir $out && cp -ra * $out/";
+
+  postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi";
+
+  meta = {
+    description = "Non-free kernel firmware (packaged by Debian)";
+    homepage = "http://packages.debian.org/sid/firmware-linux-nonfree";
+    license = "unfree-redistributable-firmware";
+    priority = "10";
+  };
+}
+
diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
index d19d26d5cba6..85bbb27c67f0 100644
--- a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
+++ b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
@@ -1,18 +1,14 @@
-{stdenv, linuxFirmware}:
-let
-  src  = linuxFirmware;
-  dir  = "rtlwifi";
-  file = "rtl8192cfw.bin";
+{stdenv, firmwareLinuxNonfree}:
+stdenv.mkDerivation {
+  name = "rtl8192c-fw";
+  src = firmwareLinuxNonfree;
+
+  phases = [ "installPhase" ];
+  installPhase = "ensureDir $out/rtlwifi && cp $src/realtek/rtlwifi/rtl8192cfw.bin $out/rtlwifi/rtl8192cfw.bin";
+
   meta = {
     description = "Firmware for the Realtek RTL8192c wireless cards";
     homepage = "http://www.realtek.com";
     license = "non-free";
-  };  
-in stdenv.mkDerivation {
-  name = "rtl8192c-fw";
-  inherit src meta dir file;
-
-  phases = [ "installPhase" ];
-
-  installPhase = "ensureDir $out/$dir && cp $src/$dir/$file $out/$dir/$file";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 556f6afc04aa..65618f55f521 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6006,6 +6006,9 @@ let
 
   qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { };
 
+  firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };
+  firmwareLinuxFree = callPackage ../os-specific/linux/firmware/firmware-linux-free { };
+
   radeontools = callPackage ../os-specific/linux/radeontools { };
 
   radeonR700 = callPackage ../os-specific/linux/firmware/radeon-r700 { };
@@ -6026,8 +6029,6 @@ let
 
   rtkit = callPackage ../os-specific/linux/rtkit { };
 
-  linuxFirmware = callPackage ../os-specific/linux/firmware/dwmw2 { };
-
   rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { };
 
   rtl8168e2fw = callPackage ../os-specific/linux/firmware/rtl8168e-2 { };

From 72aa6f5ffcda099ae0c5dee4c547eae9df294d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 12 Jan 2012 18:55:08 +0000
Subject: [PATCH 33/88] Adding centerim.

svn path=/nixpkgs/trunk/; revision=31503
---
 .../instant-messengers/centerim/default.nix   | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/centerim/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix
new file mode 100644
index 000000000000..524b206059fe
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, openssl, curl, ncurses, gpgme, libjpeg }:
+
+stdenv.mkDerivation rec {
+  name = "centerim-4.22.10";
+
+  src = fetchurl {
+    url = "http://centerim.org/download/releases/${name}.tar.gz";
+    sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk";
+  };
+
+  buildInputs = [ openssl curl ncurses gpgme libjpeg ];
+
+  configureFlags = [ "--with-openssl=${openssl}" ];
+
+  meta = {
+    homepage = http://www.centerim.org/;
+    description = "Fork of CenterICQ, a curses instant messaging program";
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65618f55f521..67d9ee233971 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6448,6 +6448,8 @@ let
 
   cdrtools = callPackage ../applications/misc/cdrtools { };
 
+  centerim = callPackage ../applications/networking/instant-messengers/centerim { };
+
   chatzilla = callPackage ../applications/networking/irc/chatzilla {
     xulrunner = firefox36Pkgs.xulrunner;
   };

From 1c186a3207845119e1faf2a166510aee6785d301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 12 Jan 2012 19:00:35 +0000
Subject: [PATCH 34/88] Making 'withGpg' optional in centerim.

svn path=/nixpkgs/trunk/; revision=31504
---
 .../networking/instant-messengers/centerim/default.nix      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix
index 524b206059fe..6a608e8d9502 100644
--- a/pkgs/applications/networking/instant-messengers/centerim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, openssl, curl, ncurses, gpgme, libjpeg }:
+{stdenv, fetchurl, openssl, curl, ncurses, libjpeg
+, withGpg ? true, gpgme ? null}:
 
 stdenv.mkDerivation rec {
   name = "centerim-4.22.10";
@@ -8,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk";
   };
 
-  buildInputs = [ openssl curl ncurses gpgme libjpeg ];
+  buildInputs = [ openssl curl ncurses libjpeg ]
+    ++ stdenv.lib.optional withGpg gpgme;
 
   configureFlags = [ "--with-openssl=${openssl}" ];
 

From 4238637b4083add55e3ac33224e3a4e4386bbd6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 12 Jan 2012 19:23:47 +0000
Subject: [PATCH 35/88] Adding GNU archimedes.

svn path=/nixpkgs/trunk/; revision=31505
---
 .../science/electronics/archimedes/default.nix  | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/science/electronics/archimedes/default.nix

diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix
new file mode 100644
index 000000000000..f22ef09a9839
--- /dev/null
+++ b/pkgs/applications/science/electronics/archimedes/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "archimedes-2.0.0";
+
+  src = fetchurl {
+    url = "mirror://gnu/archimedes/${name}.tar.gz";
+    sha256 = "1ajg4xvk5slv05fsbikrina9g4bmhx8gykk249yz21pir67sdk4x";
+  };
+
+  meta = {
+    description = "GNU package for semiconductor device simulations";
+    homepage = http://www.gnu.org/software/archimedes;
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67d9ee233971..ed7a818aafdb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8209,6 +8209,8 @@ let
     stdenv = overrideGCC stdenv gcc42;
   };
 
+  archimedes = callPackage ../applications/science/electronics/archimedes { };
+
   biolib = callPackage ../development/libraries/science/biology/biolib { };
 
   emboss = callPackage ../applications/science/biology/emboss { };

From 37fe977ad8d29490483bf0c286f68581772412e2 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Fri, 13 Jan 2012 08:26:45 +0000
Subject: [PATCH 36/88] Fixed the hash of the multitouch package.

Note: the specified rev is still the latest in the master branch,
so it's actually odd that the computed hash is not correct.

svn path=/nixpkgs/trunk/; revision=31506
---
 pkgs/os-specific/linux/xf86-input-multitouch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
index b8f88216dfa5..f04297096d2f 100644
--- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = http://bitmath.org/git/multitouch.git;
     rev = "4d87c041f6a232aa30528d70d4b9946d1824b4ed";
-    sha256 = "de705e34bc75654139dfcbedfe43a3d182d140b198fcd57ab190d549471305ca";
+    sha256 = "79397c8f99deb2a415e8c9008a2847d973ad19ea004e732613baed707df46fc9";
   };
 
   # Configuration from http://bitmath.org/code/multitouch/

From 6f5294ec94efe77791f079aa8f0c759b68371dfc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 09:27:05 +0000
Subject: [PATCH 37/88] ikiwiki: updated to version 3.20120109

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

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 4b3f57d0dc87..fc800dc22225 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null);
 
 let
   name = "ikiwiki";
-  version = "3.20111229";
+  version = "3.20120109";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "6470d40c77ae055cfe8c5bbe2f64c765fc84f1ed2dcdd7dcc7577ae190414b89";
+    sha256 = "0a47135c039f3dfd62162dd3b250397fcdab2dbb4bf4cf0433099f6e48d6f3e8";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

From bae5b8dabb14aab64ee6b7a0a324fe07c30d259a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 09:27:08 +0000
Subject: [PATCH 38/88] git-annex: updated to version 3.20120106

svn path=/nixpkgs/trunk/; revision=31509
---
 .../version-management/git-and-tools/git-annex/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 905db2dc68ba..32b30bc32420 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "3.20111231";
+  version = "3.20120106";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
-    sha256 = "4f53e7fc9560838be7efd0c90543c93ce1c7d2ba36b7754200586d845ec114f5";
+    sha256 = "60735d8b036aa8ac44e1838724d9b4da1fceb2f1547ce7f39b2069a8c3605438";
   };
 
   buildInputs = [

From 9f4723abd5fca6f9ecb970c8a0795ea9264771c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 09:27:10 +0000
Subject: [PATCH 39/88] haskell-attoparsec-conduit: updated to version 0.0.0.1

svn path=/nixpkgs/trunk/; revision=31510
---
 .../libraries/haskell/attoparsec-conduit/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index fd11df199053..48f9ce492c2f 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-conduit";
-  version = "0.0.0";
-  sha256 = "1cwmi86faisg10l15w8mz3619phvrn2hl10blr6pziv1k8c3ncj7";
+  version = "0.0.0.1";
+  sha256 = "1z6v2j08j3fl329npiz9klbz5gbcl0q8vgz3drmrmyhn31a6cvsf";
   buildDepends = [ attoparsec conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From 9b408f567dbc3f07dd780f3702b44d332317bf61 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 09:27:13 +0000
Subject: [PATCH 40/88] haskell-vty: updated to version 4.7.0.8

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

diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix
index 85c3a32930d3..368c29017cea 100644
--- a/pkgs/development/libraries/haskell/vty/default.nix
+++ b/pkgs/development/libraries/haskell/vty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vty";
-  version = "4.7.0.6";
-  sha256 = "1jb7c4wh8pjb5salh725vxjbx29wy6ph5gvdp177piq40v3zvbg3";
+  version = "4.7.0.8";
+  sha256 = "1wh94m2i0ivdkf8hhl9qrsfs7z3mk0xrzgwdfgqw7lhq321i2bnm";
   buildDepends = [
     deepseq mtl parallel parsec terminfo utf8String vector
   ];

From 4ae7c66bc0e524983c716e71870b827dd9a63eff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 09:27:15 +0000
Subject: [PATCH 41/88] haskell-xml-conduit: updated to version 0.5.0.1

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

diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 79f10512b46e..f406dcbb105f 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "0.5.0";
-  sha256 = "008rrqglxajihcf3yp9cwif67dnabyjjiymxvssznrl8ljz4yn8y";
+  version = "0.5.0.1";
+  sha256 = "0n30mk3dmdwxjw4vgfmlj7dzbiah9vj4hlg258qkvy5likzz1j5n";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     conduit dataDefault failure systemFilepath text transformers

From d7985d419fbbf9ffe942965359181531d2700be6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 10:31:52 +0000
Subject: [PATCH 42/88] pkgs/development/libraries/wxGTK-2.9: renamed Nix files
 for consistency

svn path=/nixpkgs/trunk/; revision=31513
---
 .../libraries/wxGTK-2.9/{default.nix => 2.9.1.nix}            | 0
 pkgs/top-level/all-packages.nix                               | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/wxGTK-2.9/{default.nix => 2.9.1.nix} (100%)

diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
similarity index 100%
rename from pkgs/development/libraries/wxGTK-2.9/default.nix
rename to pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed7a818aafdb..9777f7cbfcd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4686,11 +4686,11 @@ let
     inherit (gtkLibs) gtk;
   };
 
-  wxGTK29 = callPackage ../development/libraries/wxGTK-2.9 {
+  wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
     inherit (gtkLibs) gtk;
   };
 
-  wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
+  wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix {
     inherit (gtkLibs) gtk;
   };
 

From 1585c62857a97ef006a37b79148203cf45f42d2c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 10:31:56 +0000
Subject: [PATCH 43/88] pkgs/development/libraries/wxGTK-2.8: strip trailing
 whitespace

svn path=/nixpkgs/trunk/; revision=31514
---
 pkgs/development/libraries/wxGTK-2.8/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index 0bfe4c2335ca..55964269e4c0 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
   ";
 
   postBuild = "(cd contrib/src && make)";
-  
+
   postInstall = "
     (cd contrib/src && make install)
     (cd $out/include && ln -s wx-*/* .)

From 6284c83b1570e71d8f64dd23a5587a1a123a40a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 10:31:58 +0000
Subject: [PATCH 44/88] wxGTK-2.x: enable parallel building

svn path=/nixpkgs/trunk/; revision=31515
---
 pkgs/development/libraries/wxGTK-2.8/default.nix | 2 ++
 pkgs/development/libraries/wxGTK-2.9/2.9.0.nix   | 2 ++
 pkgs/development/libraries/wxGTK-2.9/2.9.1.nix   | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index 55964269e4c0..8f87aa89b968 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -46,4 +46,6 @@ stdenv.mkDerivation {
   ";
 
   passthru = {inherit gtk compat24 compat26 unicode;};
+
+  enableParallelBuilding = true;
 }
diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
index 0520adef4dcd..ca1d8212cac4 100644
--- a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
@@ -36,4 +36,6 @@ stdenv.mkDerivation {
   ";
 
   passthru = {inherit gtk compat24 compat26 unicode;};
+
+  enableParallelBuilding = true;
 }
diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
index 2f83d3cc03fb..7fa571704c3e 100644
--- a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
@@ -36,4 +36,6 @@ stdenv.mkDerivation {
   ";
 
   passthru = {inherit gtk compat24 compat26 unicode;};
+
+  enableParallelBuilding = true;
 }

From dd90ec0d929c4a6f5dad6e14a7e66e4213066cfd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 10:32:02 +0000
Subject: [PATCH 45/88] wxGTK-2.x: enable support for media control

svn path=/nixpkgs/trunk/; revision=31516
---
 pkgs/development/libraries/wxGTK-2.8/default.nix | 4 +++-
 pkgs/development/libraries/wxGTK-2.9/2.9.0.nix   | 4 +++-
 pkgs/development/libraries/wxGTK-2.9/2.9.1.nix   | 4 +++-
 pkgs/top-level/all-packages.nix                  | 6 ++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index 8f87aa89b968..824c35876551 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
+, gstreamer, gstPluginsBase, GConf
 , mesa, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -10,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk";
   };
 
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ];
 
   buildNativeInputs = [ pkgconfig ];
 
@@ -21,6 +22,7 @@ stdenv.mkDerivation {
     "--disable-precomp-headers"
     (if unicode then "--enable-unicode" else "")
     "--with-opengl"
+    "--enable-mediactrl"
   ];
 
   # This variable is used by configure to find some dependencies.
diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
index ca1d8212cac4..1a614fada906 100644
--- a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
+, gstreamer, gstPluginsBase, GConf
 , mesa, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -10,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
   };
 
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ];
 
   buildNativeInputs = [ pkgconfig ];
 
@@ -21,6 +22,7 @@ stdenv.mkDerivation {
     "--disable-precomp-headers"
     (if unicode then "--enable-unicode" else "")
     "--with-opengl"
+    "--enable-mediactrl"
   ];
 
   SEARCH_LIB = "${mesa}/lib";
diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
index 7fa571704c3e..c1056bb9ef1d 100644
--- a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
+, gstreamer, gstPluginsBase, GConf
 , mesa, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -10,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
   };
 
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ];
 
   buildNativeInputs = [ pkgconfig ];
 
@@ -21,6 +22,7 @@ stdenv.mkDerivation {
     "--disable-precomp-headers"
     (if unicode then "--enable-unicode" else "")
     "--with-opengl"
+    "--enable-mediactrl"
   ];
 
   SEARCH_LIB = "${mesa}/lib";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9777f7cbfcd0..f10723cf0269 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4684,14 +4684,20 @@ let
 
   wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
     inherit (gtkLibs) gtk;
+    inherit (gst_all) gstreamer gstPluginsBase;
+    inherit (gnome) GConf;
   };
 
   wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
     inherit (gtkLibs) gtk;
+    inherit (gst_all) gstreamer gstPluginsBase;
+    inherit (gnome) GConf;
   };
 
   wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix {
     inherit (gtkLibs) gtk;
+    inherit (gst_all) gstreamer gstPluginsBase;
+    inherit (gnome) GConf;
   };
 
   wtk = callPackage ../development/libraries/wtk { };

From e495d3345f39e00793d391f6b000d93c349a2fdb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 10:32:06 +0000
Subject: [PATCH 46/88] haskell-wx: updated to version 0.13.2

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

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
index ec4511ee481e..9b7f94d1cbd2 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "wx";
-  version = "0.12.1.6";
-  sha256 = "1p0gn46gk1abin095va22n9bycxhm2cq1vyvwiypcdq7jq541lhk";
+  version = "0.13.2";
+  sha256 = "19k0sa16dr63bgl9j37zrxnknlnq3c2927xccwc2vq19vl7n52nd";
   buildDepends = [ stm wxcore ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "wxHaskell";
-    license = "LGPL";
+    license = "unknown";
     platforms = self.ghc.meta.platforms;
     maintainers = [
       self.stdenv.lib.maintainers.andres

From c334c8b54759228de9e3e903e7ee7d14be0a0385 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 10:32:08 +0000
Subject: [PATCH 47/88] haskell-wxcore: updated to version 0.13.2

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

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index c2fbdaeffa67..647f715d3ce1 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -2,14 +2,14 @@
 
 cabal.mkDerivation (self: {
   pname = "wxcore";
-  version = "0.12.1.7";
-  sha256 = "12vs449xg2xjp503ywjwxadan3v7dq38ph66292szwj1vmhl07v4";
+  version = "0.13.2";
+  sha256 = "1kzgqmh0vjm1qcskkfdyjbbq276nhd76w7bgxgdq67zl48bfc09g";
   buildDepends = [ parsec stm time wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "wxHaskell core";
-    license = "LGPL";
+    license = "unknown";
     platforms = self.ghc.meta.platforms;
     maintainers = [
       self.stdenv.lib.maintainers.andres

From 5331d4e98b3c39aae8dd85afa6142b6b92212c83 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 10:32:11 +0000
Subject: [PATCH 48/88] haskell-wxdirect: updated to version 0.13.1.1

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

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
index 3cbd616353b9..8430c1fa59d1 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
@@ -1,12 +1,12 @@
-{ cabal, parsec, time }:
+{ cabal, parsec, strict, time }:
 
 cabal.mkDerivation (self: {
   pname = "wxdirect";
-  version = "0.12.1.4";
-  sha256 = "0v1blh3l02h58cvsngfax5knmg51lil1kj6pr5iqrbcrivp2nh7f";
+  version = "0.13.1.1";
+  sha256 = "00zij92hm7rbl8sx6f625cqzwgi72c8qn1dj6d1q4zg14dszarad";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ parsec time ];
+  buildDepends = [ parsec strict time ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "helper tool for building wxHaskell";

From e3796d59a674ca427ff33c440be1307e7d40cadb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 13 Jan 2012 13:43:15 +0000
Subject: [PATCH 49/88] * Mark chrome as low priority so that the chrome
 wrapper gets   installed.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f10723cf0269..792588c9fa9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6460,10 +6460,10 @@ let
     xulrunner = firefox36Pkgs.xulrunner;
   };
 
-  chrome = callPackage ../applications/networking/browsers/chromium {
+  chrome = lowPrio (callPackage ../applications/networking/browsers/chromium {
     inherit (gnome) GConf;
     patchelf = patchelf06;
-  };
+  });
 
   chromeWrapper = wrapFirefox
     { browser = chrome; browserName = "chrome"; desktopName = "Chrome";

From 0368987722779f2ecec93befb355e27ddc638656 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Fri, 13 Jan 2012 22:21:48 +0000
Subject: [PATCH 50/88] Desktopitem for the Skype package.

svn path=/nixpkgs/trunk/; revision=31522
---
 pkgs/applications/networking/skype/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix
index 98cbfdb7c57d..39ed744a120a 100644
--- a/pkgs/applications/networking/skype/default.nix
+++ b/pkgs/applications/networking/skype/default.nix
@@ -53,6 +53,18 @@ stdenv.mkDerivation rec {
     EOF
 
     chmod +x $out/bin/skype
+
+    # Desktop icon for Skype
+    patch skype.desktop << EOF
+    5c5
+    < Icon=skype.png
+    ---
+    > Icon=$out/opt/skype/icons/SkypeBlue_48x48.png
+    EOF
+    echo hi
+    cat skype.desktop
+    ensureDir $out/share/applications
+    mv skype.desktop $out/share/applications
   '';
 
   meta = {

From edc1c525ba5c49341c2b798d4dccd3f49f2bcdb8 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Fri, 13 Jan 2012 22:31:42 +0000
Subject: [PATCH 51/88] Removed some debugging info that I forgot to remove
 *oops*.

svn path=/nixpkgs/trunk/; revision=31525
---
 pkgs/applications/networking/skype/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix
index 39ed744a120a..8d3645e38195 100644
--- a/pkgs/applications/networking/skype/default.nix
+++ b/pkgs/applications/networking/skype/default.nix
@@ -61,8 +61,6 @@ stdenv.mkDerivation rec {
     ---
     > Icon=$out/opt/skype/icons/SkypeBlue_48x48.png
     EOF
-    echo hi
-    cat skype.desktop
     ensureDir $out/share/applications
     mv skype.desktop $out/share/applications
   '';

From 32327df9187e580711ec5f78871fd57c44637a8f Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Sat, 14 Jan 2012 09:31:12 +0000
Subject: [PATCH 52/88] Removed the now obsolete firmware-linux-free package.

svn path=/nixpkgs/trunk/; revision=31528
---
 .../firmware/firmware-linux-free/default.nix  | 21 -------------------
 .../firmware-linux-nonfree/default.nix        | 10 ++++++++-
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 9 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/firmware/firmware-linux-free/default.nix

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-free/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-free/default.nix
deleted file mode 100644
index 73f8c4f1d7db..000000000000
--- a/pkgs/os-specific/linux/firmware/firmware-linux-free/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "firmware-linux-free-3";
-
-  src = fetchurl {
-      url = "mirror://debian/pool/main/f/firmware-free/firmware-free_3.tar.gz";
-      sha256 = "8363230e56365dd6b5e8ae9fd6cefab83472f4842f7221ffc2d890eaf7d7f1ef";
-    };
- 
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''ensureDir $out && cp -ra * $out/'';
-
-  meta = {
-    description = "Free kernel firmware (packaged by Debian)";
-    homepage = "http://packages.debian.org/sid/firmware-linux-nonfree";
-    license = "free";
-    priority = "10";
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index d501891d2a12..6ad2227ee69e 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -1,3 +1,8 @@
+# TODO: some files are not at the right place.
+# For now, we take the strategy of adding symlinks to fix this,
+# however it is probably better to extract the files from
+# the appropriate debian binary packages.
+
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
@@ -8,10 +13,13 @@ stdenv.mkDerivation {
       sha256 = "94fe856d00f63559486b7684c0fae9b30bee599c6d7dea8c7e00d2dcb548ee8a";
     };
  
-  phases = [ "unpackPhase" "installPhase" "postInstall" ];
+  phases = [ "unpackPhase" "patchPhase" "installPhase" "postInstall" ];
+
+  patchPhase = "rm -rf debian defines TODO";
 
   installPhase = "ensureDir $out && cp -ra * $out/";
 
+  # repeat the same trick for radeon, 3com, etc.
   postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi";
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 792588c9fa9f..8d6884a4b9dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6013,7 +6013,6 @@ let
   qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { };
 
   firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };
-  firmwareLinuxFree = callPackage ../os-specific/linux/firmware/firmware-linux-free { };
 
   radeontools = callPackage ../os-specific/linux/radeontools { };
 

From ef343ed3aba1ef74d5070c03534da39f57ff347a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Jan 2012 11:41:06 +0000
Subject: [PATCH 53/88] subversion: add sasl support

svn path=/nixpkgs/trunk/; revision=31530
---
 .../applications/version-management/subversion/default.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix                            | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index a1a6a3fcd7fb..ad93550161ff 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -6,8 +6,10 @@
 , pythonBindings ? false
 , perlBindings ? false
 , javahlBindings ? false
+, saslSupport ? false
 , stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite
 , httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
+, sasl ? null
 }:
 
 assert bdbSupport -> aprutil.bdbSupport;
@@ -31,7 +33,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib apr aprutil sqlite ]
     ++ stdenv.lib.optional httpSupport neon
     ++ stdenv.lib.optional pythonBindings python
-    ++ stdenv.lib.optional perlBindings perl;
+    ++ stdenv.lib.optional perlBindings perl
+    ++ stdenv.lib.optional saslSupport sasl;
 
   configureFlags = ''
     ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
@@ -39,8 +42,10 @@ stdenv.mkDerivation rec {
     ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
     ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
     ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"}
+    ${if saslSupport then "--enable-sasl" else "--disable-sasl"}
     --with-zlib=${zlib}
     --with-sqlite=${sqlite}
+    --with-sasl=${sasl}
   '';
 
   preBuild = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d6884a4b9dd..d6aaaa7edf8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7418,8 +7418,10 @@ let
     pythonBindings = false;
     perlBindings = false;
     javahlBindings = false;
+    saslSupport = false;
     compressionSupport = true;
     httpd = apacheHttpd;
+    sasl = cyrus_sasl;
   };
 
   subversionClient = lowPrio (appendToName "client" (subversion.override {

From a11fda4b4b054c9468be6702349d730647852ee5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 14 Jan 2012 11:58:29 +0000
Subject: [PATCH 54/88] mysql51: enable building on darwin

svn path=/nixpkgs/trunk/; revision=31531
---
 pkgs/servers/sql/mysql51/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/mysql51/default.nix b/pkgs/servers/sql/mysql51/default.nix
index ddf5c16bef19..71c9713e3bbb 100644
--- a/pkgs/servers/sql/mysql51/default.nix
+++ b/pkgs/servers/sql/mysql51/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "07xbnwk7h1xya8s6dw34nrv7ampzag8l0l1szd2pc9zyqkzhydw4";
   };
 
-  buildInputs = [ps ncurses zlib perl openssl];
+  buildInputs = [ncurses zlib perl openssl] ++ stdenv.lib.optional stdenv.isLinux ps;
 
   configureFlags = "--enable-thread-safe-client --with-ssl=${openssl} --with-embedded-server --with-plugins=max-no-ndb" +
     (if stdenv.system == "x86_64-linux" then " --with-lib-ccflags=-fPIC" else "");
@@ -30,5 +30,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.mysql.com/;
     description = "The world's most popular open source database";
+    platforms = stdenv.lib.platforms.all;
   };
 }

From 9ddd08512998cd96ddd6bc906da242171896ef8c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Jan 2012 12:05:18 +0000
Subject: [PATCH 55/88] subversion: instantiate SASL only when it's actually
 enabled

svn path=/nixpkgs/trunk/; revision=31532
---
 pkgs/applications/version-management/subversion/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index ad93550161ff..9e31e9906c62 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -42,10 +42,9 @@ stdenv.mkDerivation rec {
     ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
     ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
     ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"}
-    ${if saslSupport then "--enable-sasl" else "--disable-sasl"}
+    ${if saslSupport then "--enable-sasl --with-sasl=${sasl}" else "--disable-sasl"}
     --with-zlib=${zlib}
     --with-sqlite=${sqlite}
-    --with-sasl=${sasl}
   '';
 
   preBuild = ''

From 0819c85d91b004e30c1cb0e83240094b9ccd62e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Jan 2012 12:09:09 +0000
Subject: [PATCH 56/88] mesa: updated to version 7.11.2

svn path=/nixpkgs/trunk/; revision=31533
---
 pkgs/development/libraries/mesa/default.nix | 26 ++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 6a1de4d95e4a..5e7fdb5ed161 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,37 +1,37 @@
-{ stdenv, fetchurl, flex, bison, pkgconfig, x11, xlibs, libdrm, file, expat
+{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
+, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
+, libXt, udev
 , python, libxml2Python, lipo ? null }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
 else
 
-let version = "7.10.3"; in
+let version = "7.11.2"; in
 
 stdenv.mkDerivation {
   name = "mesa-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1h451vgsfsp0h0wig66spqgxmjalsy28gvd9viynfwmq7741yw0y";
+    sha256 = "0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p";
   };
 
   patches = [ ./swrast-settexbuffer.patch ];
 
-  postPatch = ''
-    find . -name "*.py" -exec sed -i -e "s|#! */usr/bin/env python|#! ${python}/bin/python|" {} +
-  '';
+  prePatch = "patchShebangs .";
 
+# r300
   configureFlags =
       " --with-driver=dri --enable-gl-osmesa --enable-gles1"
-    + " --enable-gallium --enable-gallium-r600 --enable-gles2"
-    + " --enable-gallium-swrast --enable-gallium-egl --disable-glx-tls"
+    + " --with-gallium-drivers=i915,i965,nouveau,r600,svga,swrast"
+    + " --enable-gles2 --enable-gallium-egl --disable-glx-tls"
     + " --enable-xcb --enable-egl --disable-glut";
 
-  buildInputs =
-    [ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto
-      xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
-      lipo file python libxml2Python flex bison
-    ];
+  buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto
+    libxml2Python libX11 libXext libxcb lipo libXt udev ];
+
+  buildNativeInputs = [ pkgconfig python makedepend file flex bison ];
 
   enableParallelBuilding = true;
 

From 736b039b3f10bac1cee640760d3d9bd543e66c9a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Jan 2012 12:09:15 +0000
Subject: [PATCH 57/88] libdrm: updated to version 2.4.29

svn path=/nixpkgs/trunk/; revision=31534
---
 pkgs/development/libraries/libdrm/default.nix | 29 ++++++++++---------
 .../libraries/libdrm/libdrm-apple.patch       |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index d37b7dd0b7fb..7c0127bf7100 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,28 +1,31 @@
-{stdenv, fetchurl, pkgconfig, libpthreadstubs}:
+{stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, cairo, udev}:
 
-stdenv.mkDerivation (rec {
-  name = "libdrm-2.4.24";
+stdenv.mkDerivation rec {
+  name = "libdrm-2.4.29";
   
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "19dnzy7g6jqfjz38dp187b97vb4a8h4k748x56gsyn24ys0j60f7";
+    sha256 = "0bj5ihmnzpbbgdrvp5f8bgsk0k19haixr893449pjd4k7v4jshz2";
   };
 
-  buildInputs = [ pkgconfig libpthreadstubs ];
+  buildNativeInputs = [ pkgconfig ];
+  buildInputs = [ libpthreadstubs libpciaccess cairo udev ];
 
-  patches = [ ./libdrm-apple.patch ];
+  patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
 
-  preConfigure = ''
-    # General case: non intel.
-    if test -n "$crossConfig"; then
-      configureFlags="$configureFlags --disable-intel";
-    fi
-  '' + stdenv.lib.optionalString stdenv.isDarwin
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin
   "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
+  configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "-C";
+
+  crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
+
   meta = {
     homepage = http://dri.freedesktop.org/libdrm/;
     description = "Library for accessing the kernel's Direct Rendering Manager";
     license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.linux;
   };
-} // (stdenv.lib.optionalAttrs stdenv.isDarwin { configureFlags = [ "-C" ]; }))
+}
diff --git a/pkgs/development/libraries/libdrm/libdrm-apple.patch b/pkgs/development/libraries/libdrm/libdrm-apple.patch
index e9fd63c5faec..17b447789c2f 100644
--- a/pkgs/development/libraries/libdrm/libdrm-apple.patch
+++ b/pkgs/development/libraries/libdrm/libdrm-apple.patch
@@ -2,9 +2,9 @@ diff -Naur libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c libdrm-2.4.26/intel/intel
 --- libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c	2011-04-01 10:30:51.000000000 -0400
 +++ libdrm-2.4.26/intel/intel_bufmgr_gem.c	2011-08-29 02:17:20.000000000 -0400
 @@ -51,6 +51,7 @@
- #include <sys/mman.h>
  #include <sys/stat.h>
  #include <sys/types.h>
+ #include <stdbool.h>
 +#include <sys/time.h>
  
  #include "errno.h"

From 61ad4a1b2bd1c87018a4648786a1ef107814d68a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Jan 2012 12:09:20 +0000
Subject: [PATCH 58/88] haskell-streamproc: updated to version 1.6

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

diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix
index 5e327ac78a5a..fef81d92212f 100755
--- a/pkgs/development/libraries/haskell/streamproc/default.nix
+++ b/pkgs/development/libraries/haskell/streamproc/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "streamproc";
-  version = "1.4";
-  sha256 = "fbff569d7b294850998e9a6b6a14bf81484b1adb312801ea15d1d890faff12cf";
+  version = "1.6";
+  sha256 = "0bb1rdzzpjggw7dk4q3hwa1j1bvkfqhz6vrd45shcp57ixqlp6ws";
   meta = {
     homepage = "http://gitorious.org/streamproc";
     description = "Stream Processer Arrow";

From 729162873e341135aa36dc23dca2c3fdcf4e86b6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Jan 2012 12:13:51 +0000
Subject: [PATCH 59/88] Revert "mesa: updated to version 7.11.2"

This reverts commit b18ddb0ac8bc232df2cfd2980bd22ee9beae7b12.

svn path=/nixpkgs/trunk/; revision=31536
---
 pkgs/development/libraries/mesa/default.nix | 26 ++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 5e7fdb5ed161..6a1de4d95e4a 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,37 +1,37 @@
-{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
-, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
-, libXt, udev
+{ stdenv, fetchurl, flex, bison, pkgconfig, x11, xlibs, libdrm, file, expat
 , python, libxml2Python, lipo ? null }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
 else
 
-let version = "7.11.2"; in
+let version = "7.10.3"; in
 
 stdenv.mkDerivation {
   name = "mesa-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p";
+    sha256 = "1h451vgsfsp0h0wig66spqgxmjalsy28gvd9viynfwmq7741yw0y";
   };
 
   patches = [ ./swrast-settexbuffer.patch ];
 
-  prePatch = "patchShebangs .";
+  postPatch = ''
+    find . -name "*.py" -exec sed -i -e "s|#! */usr/bin/env python|#! ${python}/bin/python|" {} +
+  '';
 
-# r300
   configureFlags =
       " --with-driver=dri --enable-gl-osmesa --enable-gles1"
-    + " --with-gallium-drivers=i915,i965,nouveau,r600,svga,swrast"
-    + " --enable-gles2 --enable-gallium-egl --disable-glx-tls"
+    + " --enable-gallium --enable-gallium-r600 --enable-gles2"
+    + " --enable-gallium-swrast --enable-gallium-egl --disable-glx-tls"
     + " --enable-xcb --enable-egl --disable-glut";
 
-  buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto
-    libxml2Python libX11 libXext libxcb lipo libXt udev ];
-
-  buildNativeInputs = [ pkgconfig python makedepend file flex bison ];
+  buildInputs =
+    [ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto
+      xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
+      lipo file python libxml2Python flex bison
+    ];
 
   enableParallelBuilding = true;
 

From 4e5092d0c646ea49a0bccbe921fa72e645be0af4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Jan 2012 12:13:53 +0000
Subject: [PATCH 60/88] Revert "libdrm: updated to version 2.4.29"

This reverts commit ebe85f30fa075507313fc9dfa6ceb96501c6e332.

svn path=/nixpkgs/trunk/; revision=31537
---
 pkgs/development/libraries/libdrm/default.nix | 29 +++++++++----------
 .../libraries/libdrm/libdrm-apple.patch       |  2 +-
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 7c0127bf7100..d37b7dd0b7fb 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,31 +1,28 @@
-{stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, cairo, udev}:
+{stdenv, fetchurl, pkgconfig, libpthreadstubs}:
 
-stdenv.mkDerivation rec {
-  name = "libdrm-2.4.29";
+stdenv.mkDerivation (rec {
+  name = "libdrm-2.4.24";
   
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "0bj5ihmnzpbbgdrvp5f8bgsk0k19haixr893449pjd4k7v4jshz2";
+    sha256 = "19dnzy7g6jqfjz38dp187b97vb4a8h4k748x56gsyn24ys0j60f7";
   };
 
-  buildNativeInputs = [ pkgconfig ];
-  buildInputs = [ libpthreadstubs libpciaccess cairo udev ];
+  buildInputs = [ pkgconfig libpthreadstubs ];
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
+  patches = [ ./libdrm-apple.patch ];
 
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin
+  preConfigure = ''
+    # General case: non intel.
+    if test -n "$crossConfig"; then
+      configureFlags="$configureFlags --disable-intel";
+    fi
+  '' + stdenv.lib.optionalString stdenv.isDarwin
   "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
-  configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "-C";
-
-  crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
-
   meta = {
     homepage = http://dri.freedesktop.org/libdrm/;
     description = "Library for accessing the kernel's Direct Rendering Manager";
     license = "bsd";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    platforms = stdenv.lib.platforms.linux;
   };
-}
+} // (stdenv.lib.optionalAttrs stdenv.isDarwin { configureFlags = [ "-C" ]; }))
diff --git a/pkgs/development/libraries/libdrm/libdrm-apple.patch b/pkgs/development/libraries/libdrm/libdrm-apple.patch
index 17b447789c2f..e9fd63c5faec 100644
--- a/pkgs/development/libraries/libdrm/libdrm-apple.patch
+++ b/pkgs/development/libraries/libdrm/libdrm-apple.patch
@@ -2,9 +2,9 @@ diff -Naur libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c libdrm-2.4.26/intel/intel
 --- libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c	2011-04-01 10:30:51.000000000 -0400
 +++ libdrm-2.4.26/intel/intel_bufmgr_gem.c	2011-08-29 02:17:20.000000000 -0400
 @@ -51,6 +51,7 @@
+ #include <sys/mman.h>
  #include <sys/stat.h>
  #include <sys/types.h>
- #include <stdbool.h>
 +#include <sys/time.h>
  
  #include "errno.h"

From cf207c3e83b98681ed7a5a7c94be5bbf23d41c27 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:02:46 +0000
Subject: [PATCH 61/88] libical-0.48

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

diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 3774d0993c66..54dfc1aecc62 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation rec {
-  name = "libical-0.47";
+  name = "libical-0.48";
   src = fetchurl {
     url = "mirror://sourceforge/freeassociation/${name}.tar.gz";
-    sha256 = "1218vaaks9lvx31mrc8212kyngw2k68xm0914vrd77ixn55vnk5g";
+    sha256 = "1w6znkh0xxhbcm717mbzfva9ycrqs2lajhng391i7pghaw3qprra";
   };
   buildNativeInputs = [ perl ];
 }

From e7dccbfcb813b055d45634e850774775c3e8791b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:02:54 +0000
Subject: [PATCH 62/88] openbabel-2.3.1, depend on cairo

svn path=/nixpkgs/trunk/; revision=31540
---
 pkgs/development/libraries/openbabel/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index d1fa607c7341..455dbceff23c 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -1,19 +1,19 @@
-{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python }:
+{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "openbabel-2.3.0";
-  
-  src = fetchurl { 
+  name = "openbabel-2.3.1";
+
+  src = fetchurl {
     url = "mirror://sourceforge/openbabel/${name}.tar.gz";
-    sha256 = "1yv1z04il8q6nhcc3l9019aj7nzs3bfm667s2vkg5cc3dljwpbbd";
+    sha256 = "18yprqsk0fi1ri4fmvpx2ym6gx9fp3by681pl3jffpjqmz4qnbly";
   };
-  
+
   # TODO : perl & python bindings;
   # TODO : wxGTK: I have no time to compile
   # TODO : separate lib and apps
-  buildInputs = [ zlib libxml2 eigen python ];
+  buildInputs = [ zlib libxml2 eigen python cairo ];
 
-  buildNativeInputs = [ cmake ];
+  buildNativeInputs = [ cmake pkgconfig ];
 
   meta = {
     platforms = stdenv.lib.platforms.all;

From c2e38f32c0dac14e6c86f6622fb9f1c0e73f3e79 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:01 +0000
Subject: [PATCH 63/88] avogadro: explicitly depend on pkg-config

svn path=/nixpkgs/trunk/; revision=31541
---
 pkgs/applications/science/chemistry/avogadro/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix
index 702f4c28912f..b3e2e2101004 100644
--- a/pkgs/applications/science/chemistry/avogadro/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel }:
+{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "avogadro-1.0.3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qt4 eigen zlib openbabel ];
 
-  buildNativeInputs = [ cmake ];
+  buildNativeInputs = [ cmake pkgconfig ];
 
   meta = {
     maintainers = [ stdenv.lib.maintainers.urkud ];

From b891f159b58cd09234f22a1f977b056f3a93a527 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:05 +0000
Subject: [PATCH 64/88] grantlee-0.2.0

svn path=/nixpkgs/trunk/; revision=31542
---
 pkgs/development/libraries/grantlee/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index 39170dd1ca78..47d3d22f043c 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -1,16 +1,15 @@
 { stdenv, fetchurl, qt4, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "grantlee-0.1.9";
+  name = "grantlee-0.2.0";
 
-# Upstream download server has country code firewall, so I made a mirror. The
-# URL of the mirror may change in the future, so don't publish it yet.
+# Upstream download server has country code firewall, so I made a mirror.
   src = fetchurl {
     urls = [
       "http://downloads.grantlee.org/${name}.tar.gz"
       "http://www.loegria.net/grantlee/${name}.tar.gz"
     ];
-    sha256 = "112rynnd10sxw5yqbv33g7yxs79d6clfbs2xbwflsrgkbyk5iw37";
+    sha256 = "0x6lvn5i9025vdbs6sybs2mm5ay5y40f7nvb58mc2k518rmjb9j3";
   };
 
   buildInputs = [ cmake qt4 ];

From 94af5f0664c4d6c10d94e5d69bdbf8d1bd2bbb66 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:08 +0000
Subject: [PATCH 65/88] kde48.kactivities: depend on SDO

svn path=/nixpkgs/trunk/; revision=31543
---
 pkgs/desktops/kde-4.8/kactivities.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kactivities.nix b/pkgs/desktops/kde-4.8/kactivities.nix
index 67ff8cd89846..8f726577ef89 100644
--- a/pkgs/desktops/kde-4.8/kactivities.nix
+++ b/pkgs/desktops/kde-4.8/kactivities.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs }:
+{ kde, kdelibs, shared_desktop_ontologies }:
 
 kde {
-  propagatedBuildInputs = [ kdelibs ];
+  propagatedBuildInputs = [ kdelibs shared_desktop_ontologies ];
 
   meta = {
     description = "KDE activities library and daemon";

From 8133e47172d4b93966c34e319a581c04c08b7e23 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:12 +0000
Subject: [PATCH 66/88] Fix output hash

svn path=/nixpkgs/trunk/; revision=31544
---
 pkgs/desktops/kde-4.8/kde-wallpapers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix
index 60298e567fbc..97bfc1bfabf5 100644
--- a/pkgs/desktops/kde-4.8/kde-wallpapers.nix
+++ b/pkgs/desktops/kde-4.8/kde-wallpapers.nix
@@ -6,7 +6,7 @@ kde {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "29f4e8b24435ee8c64affdc6250f59ed9f78445118fe0a4e216d89969dd2006b";
+  outputHash = "101v30x8sw96mq43hs7wzppjc8xhh2wn4qpqbi3nxrb16fw6svad";
 
   meta = {
     description = "Wallpapers for KDE";

From 5df14ab40ffb79cc252a0e9f6c7967039f4f4d19 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:17 +0000
Subject: [PATCH 67/88] konsole: depend on kde-baseapps for libkonq

svn path=/nixpkgs/trunk/; revision=31545
---
 pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix b/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix
index 87ac24972bdb..0db47fb2d7c4 100644
--- a/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix
+++ b/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix
@@ -1,8 +1,8 @@
-{ kde, kdelibs }:
+{ kde, kdelibs, kde_baseapps }:
 
 kde {
 
-  buildInputs = [ kdelibs ];
+  buildInputs = [ kdelibs kde_baseapps ];
 
   meta = {
     description = "Konsole, the KDE terminal emulator";

From 4024d3346940f0d07a4b884dd780ce60c443b953 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:20 +0000
Subject: [PATCH 68/88] kde48.kdepim: depend on prison

svn path=/nixpkgs/trunk/; revision=31546
---
 pkgs/desktops/kde-4.8/kdepim.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdepim.nix b/pkgs/desktops/kde-4.8/kdepim.nix
index 9b95d491a447..6d99a801d1c1 100644
--- a/pkgs/desktops/kde-4.8/kdepim.nix
+++ b/pkgs/desktops/kde-4.8/kdepim.nix
@@ -1,11 +1,11 @@
 { kde, boost, gpgme, libassuan, libxml2, libxslt, kdepimlibs, kdepim_runtime
-, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee }:
+, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison }:
 
 kde {
 
   buildInputs =
     [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
-      libxslt cyrus_sasl gpgme libassuan grantlee
+      libxslt cyrus_sasl gpgme libassuan grantlee prison
     ];
 
   passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];

From dab22380e024d5f7010f24d4cf53cdef8d231f1f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:24 +0000
Subject: [PATCH 69/88] KDE4.8.kdemultimedia: depend on pulseaudio

svn path=/nixpkgs/trunk/; revision=31547
---
 pkgs/desktops/kde-4.8/kdemultimedia.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdemultimedia.nix b/pkgs/desktops/kde-4.8/kdemultimedia.nix
index b4ca7a8d2da7..09efeb336dce 100644
--- a/pkgs/desktops/kde-4.8/kdemultimedia.nix
+++ b/pkgs/desktops/kde-4.8/kdemultimedia.nix
@@ -1,13 +1,12 @@
 { kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg,
-  libmusicbrainz3, libtunepimp }:
+  libmusicbrainz3, libtunepimp, pulseaudio }:
 
 kde {
 
   buildInputs =
-    # Note: kdemultimedia can use xine-lib, but it doesn't seem useful
-    # without the Phonon Xine backend.
     [ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg
-    flac lame ];
+      flac lame pulseaudio
+    ];
 
   meta = {
     description = "KDE multimedia programs such as a movie player and volume utility";

From 4675c738e629b24e63161a7f6f4db81a22fa369e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:27 +0000
Subject: [PATCH 70/88] PyKDE4: one part of purity patch fixed upstream

svn path=/nixpkgs/trunk/; revision=31548
---
 pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch
index dfc2c886bba3..2f6e078f256b 100644
--- a/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch
+++ b/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch
@@ -2,15 +2,6 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index c853e38..5df3253 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -73,7 +73,7 @@ INCLUDE_DIRECTORIES(
-     ${QT_QTWEBKIT_INCLUDE_DIR}
-     ${KDE4_INCLUDE_DIR}
-     ${KDE4_INCLUDE_DIR}/solid
--    ${KDE4_INCLUDE_DIR}/phonon
-+	${PHONON_INCLUDE_DIR}/phonon
-     ${KDE4_INCLUDE_DIR}/kio
-     ${KDE4_INCLUDE_DIR}/kdeprint
-     ${KDE4_INCLUDE_DIR}/kdeprint/lpr
 @@ -232,7 +232,7 @@ _pkg_config = {
      'pykde_kde_sip_flags':  '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}',
      'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4',

From bbee586d14fd9c490a36a5bf21023a3fd5e989f6 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:31 +0000
Subject: [PATCH 71/88] kde48.kalgebra: depend on kde48.analitza

svn path=/nixpkgs/trunk/; revision=31549
---
 pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix
index f1a190332cdc..3675c3a225f4 100644
--- a/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix
+++ b/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix
@@ -1,6 +1,6 @@
-{ kde, kdelibs, libkdeedu, readline }:
+{ kde, kdelibs, libkdeedu, analitza }:
 kde {
-  buildInputs = [ kdelibs libkdeedu readline ];
+  buildInputs = [ kdelibs libkdeedu analitza ];
 
   meta = {
     description = "2D and 3D Graph Calculator";

From 51956f085ddec9ca03bd8d7af483abf617aae54a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:34 +0000
Subject: [PATCH 72/88] ntrack-016, add meta

svn path=/nixpkgs/trunk/; revision=31550
---
 pkgs/development/libraries/ntrack/default.nix | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index bd1c97c30432..95bde495c0ef 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python, automake
-, autoconf }:
+{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python }:
 
 let
-  version = "014";
+  version = "016";
 in
 
 stdenv.mkDerivation rec {
@@ -10,32 +9,21 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz";
-    sha256 = "1aqn3q0dj2kk0j9rf02qgbfghlykaas7q0g8wxyz7nd6zg4qhyj2";
+    sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w";
   };
 
   buildInputs = [ libnl qt4 ];
 
-  buildNativeInputs = [ pkgconfig python automake autoconf ];
+  buildNativeInputs = [ pkgconfig python ];
 
   configureFlags = "--without-gobject CFLAGS=--std=gnu99";
 
-  patchP0 = fetchurl {
-    url = http://bazaar.launchpad.net/~asac/ntrack/main/diff/312/309;
-    name = "ntrack-bzr-309-to-312.patch";
-    sha256 = "1bpjpikln2i7nsmd2gl82g08yzaqac311sgsva7z7pqccxz0vsj5";
+  patchPhase = ''sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c'';
+
+  meta = {
+    description = "Network Connectivity Tracking library for Desktop Applications";
+    homepage = https://launchpad.net/ntrack;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
   };
-
-  patchP1 = fetchurl {
-    url = "https://bugs.launchpad.net/ntrack/+bug/750554/+attachment/2291609/+files/ntrack_libnl_link.diff";
-    sha256 = "1al6wfjph7nmck1q2q2z98cnzcrwpln2wwh45xynsxr6wgczwck6";
-  };
-
-  patchPhase =
-    ''
-      patch -p0 < ${patchP0}
-      patch -p1 < ${patchP1}
-      sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
-    '';
-
-  preConfigure = "automake"; # The second patch changes Makefile.am files
 }

From 77c66485355b8868171237cecbb82e6878b86e28 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:38 +0000
Subject: [PATCH 73/88] Propagate zlib

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

diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix
index ef8439b8b88c..98324c184c66 100644
--- a/pkgs/development/libraries/libgadu/default.nix
+++ b/pkgs/development/libraries/libgadu/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "045a0bd395k3ramdvlzyfx3878p42fv4r04rgasmdsm2n33wgm38";
   };
 
-  buildInputs = [ zlib ];
+  propagatedBuildInputs = [ zlib ];
 
   meta = {
     description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)";

From cced3d2b8640bb24beb9ea212ead8e33b802d98e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:41 +0000
Subject: [PATCH 74/88] Fix compilation with qt-4.8

- Explicitly depend on libX11 and mesa
- Include GL/glu.h

svn path=/nixpkgs/trunk/; revision=31552
---
 pkgs/applications/science/chemistry/avogadro/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix
index b3e2e2101004..b444783ba21d 100644
--- a/pkgs/applications/science/chemistry/avogadro/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig }:
+{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "avogadro-1.0.3";
@@ -8,10 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "0s44r78vm7hf4cs13d2qki3gf178gjj1ihph6rs04g6s4figvdpg";
   };
 
-  buildInputs = [ qt4 eigen zlib openbabel ];
+  buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ];
 
   buildNativeInputs = [ cmake pkgconfig ];
 
+  NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h";
+
   meta = {
     maintainers = [ stdenv.lib.maintainers.urkud ];
     inherit (qt4.meta) platforms;

From 4dfdbed3181a096916baa91ce20b3ad33f4be12b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:45 +0000
Subject: [PATCH 75/88] Fix kde48.kde_workspace FTBFS

svn path=/nixpkgs/trunk/; revision=31553
---
 pkgs/desktops/kde-4.8/kde-workspace.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kde-workspace.nix b/pkgs/desktops/kde-4.8/kde-workspace.nix
index 55c243f60dd9..31937d4f1d56 100644
--- a/pkgs/desktops/kde-4.8/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.8/kde-workspace.nix
@@ -1,20 +1,23 @@
 { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
   lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
   consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
-  pykde4
+  pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities
 }:
 
 kde {
 
   buildInputs =
-    [ kdelibs qimageblitz libdbusmenu_qt pykde4
+    [ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc
       xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
       xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
       xorg.libpthreadstubs
       boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
       libusb python libqalculate consolekit kdepimlibs pam prison akonadi
+      kactivities
     ];
 
+  buildNativeInputs = [ pkgconfig ];
+
   preConfigure =
    ''
      # Fix incorrect path to kde4-config.

From e36b7005ccd4091e987b345e0ce9e9d806eb75d0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:48 +0000
Subject: [PATCH 76/88] Pass sqlite and pkgconfig to kdegames

svn path=/nixpkgs/trunk/; revision=31554
---
 pkgs/desktops/kde-4.8/kdegames.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdegames.nix b/pkgs/desktops/kde-4.8/kdegames.nix
index 3378a99d9e79..03ecfbd88b4b 100644
--- a/pkgs/desktops/kde-4.8/kdegames.nix
+++ b/pkgs/desktops/kde-4.8/kdegames.nix
@@ -1,12 +1,14 @@
 { kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4,
-  openal, libsndfile, qhull }:
+  openal, libsndfile, qhull, sqlite, pkgconfig }:
 
 kde rec {
   buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython
-    openal libsndfile qhull ] ++ pythonPath;
+    openal libsndfile qhull sqlite ] ++ pythonPath;
 
   pythonPath = [ pythonPackages.twisted pykde4 ];
 
+  buildNativeInputs = [ pkgconfig ];
+
   # TODO: ggz
 
   postInstall = "wrapPythonPrograms";

From 893994372f0ffe08e1658c09c026434a7ba50e45 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:53 +0000
Subject: [PATCH 77/88] Depend on libjpeg

svn path=/nixpkgs/trunk/; revision=31555
---
 pkgs/desktops/kde-4.8/kde-runtime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix
index 96b6c3a1c784..d827802bb090 100644
--- a/pkgs/desktops/kde-4.8/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.8/kde-runtime.nix
@@ -1,11 +1,11 @@
 { kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
-, libcanberra, virtuoso, samba, ntrack
+, libcanberra, virtuoso, samba, ntrack, libjpeg
 }:
 
 kde {
   buildInputs =
     [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica
-      samba (libcanberra.override { gtk = null; }) ntrack
+      samba (libcanberra.override { gtk = null; }) ntrack libjpeg
     ];
 
   passthru.propagatedUserEnvPackages = [ virtuoso ];

From 269b6961129f0c7445c0f5eb3fe078f925b94401 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:03:56 +0000
Subject: [PATCH 78/88] libkdcraw: depend o libjpeg and lcms1

svn path=/nixpkgs/trunk/; revision=31556
---
 pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix
index 9d31cc763f21..9810a98551ed 100644
--- a/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix
+++ b/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs }:
+{ kde, kdelibs, libjpeg, lcms1 }:
 
 kde {
-  buildInputs = [ kdelibs ];
+  buildInputs = [ kdelibs libjpeg lcms1 ];
 
   meta = {
     description = "Library for decoding RAW images";

From 547827b73b90df36779113b09b9654ab0b574de4 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:04:00 +0000
Subject: [PATCH 79/88] kmousetool depends on libXt

svn path=/nixpkgs/trunk/; revision=31557
---
 pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix
index 42306049c5d5..8e0caa76ed9c 100644
--- a/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix
+++ b/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, libXtst }:
+{ kde, kdelibs, libXtst, libXt }:
 
 kde {
-  buildInputs = [ kdelibs libXtst ];
+  buildInputs = [ kdelibs libXtst libXt ];
 
   meta = {
     description = "A program that clicks the mouse for you";

From 50e898b904cb04a31cc7c2c093f5a4df974d02ec Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:04:03 +0000
Subject: [PATCH 80/88] kscreensaver depends on libXt and needs pkg-config at
 build time

svn path=/nixpkgs/trunk/; revision=31558
---
 pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix
index cc195c8de903..72676e35f715 100644
--- a/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix
+++ b/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix
@@ -1,7 +1,9 @@
-{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2 }:
+{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
 
 kde {
-  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 ];
+  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
+
+  buildNativeInputs = [ pkgconfig ];
 
   preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
 

From 84d691d520333ed87b357f2a62277392581f7f2c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:04:07 +0000
Subject: [PATCH 81/88] kget depends on sqlite

svn path=/nixpkgs/trunk/; revision=31559
---
 pkgs/desktops/kde-4.8/kdenetwork/kget.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kget.nix b/pkgs/desktops/kde-4.8/kdenetwork/kget.nix
index 33d9ec1ca012..2381a2459e60 100644
--- a/pkgs/desktops/kde-4.8/kdenetwork/kget.nix
+++ b/pkgs/desktops/kde-4.8/kdenetwork/kget.nix
@@ -1,10 +1,10 @@
-{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs,
-  shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
+{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite
+, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
 
 kde {
   buildInputs =
     [ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs
-      kde_baseapps gpgme boost libmms qca2
+      kde_baseapps gpgme boost libmms qca2 sqlite
     ];
 
   KDEDIRS = libktorrent;

From 3d8668b71341c4771e4a9fa9e8141e94680e7fca Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:04:10 +0000
Subject: [PATCH 82/88] Fix ksecrets build

svn path=/nixpkgs/trunk/; revision=31560
---
 .../kde-4.8/kdeutils/ksecrets-ftbfs.patch     | 43 +++++++++++++++++++
 pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix   |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch

diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch b/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch
new file mode 100644
index 000000000000..24a68e114406
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch
@@ -0,0 +1,43 @@
+diff --git a/ksecrets/CMakeLists.txt b/ksecrets/CMakeLists.txt
+index 040b55f..a1e04c3 100644
+--- a/ksecrets/CMakeLists.txt
++++ b/ksecrets/CMakeLists.txt
+@@ -5,7 +5,6 @@ PROJECT (ksecrets)
+ 
+ include(MacroLibrary)
+ include(KDE4Defaults)
+-include(PkgConfigGetVar)
+ 
+ INCLUDE_DIRECTORIES (
+     ${KDE4_INCLUDES}
+diff --git a/ksecretsserviced/CMakeLists.txt b/ksecretsserviced/CMakeLists.txt
+index d2feb41..339225b 100644
+--- a/ksecretsserviced/CMakeLists.txt
++++ b/ksecretsserviced/CMakeLists.txt
+@@ -2,7 +2,6 @@ PROJECT (ksecretsserviced)
+ 
+ include(MacroLibrary)
+ include(KDE4Defaults)
+-include(PkgConfigGetVar)
+ 
+ INCLUDE_DIRECTORIES (
+     ${KDE4_INCLUDES}
+@@ -38,4 +37,5 @@ TARGET_LINK_LIBRARIES (ksecretsserviced
+ 
+ install( TARGETS ksecretsserviced ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install( FILES ksecretsserviced.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+-dbus_add_activation_service(org.kde.ksecretsserviced.service.in)
++configure_file(org.kde.ksecretsserviced.service.in org.kde.ksecretsserviced.service)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ksecretsserviced.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR} )
+diff --git a/kwl2kss/CMakeLists.txt b/kwl2kss/CMakeLists.txt
+index 41d8ec0..4cedb0e 100644
+--- a/kwl2kss/CMakeLists.txt
++++ b/kwl2kss/CMakeLists.txt
+@@ -3,7 +3,6 @@ project(kwl2kss)
+ 
+ include(MacroLibrary)
+ include(KDE4Defaults)
+-include(PkgConfigGetVar)
+ 
+ ########### Configure checks for kwalletbackend ###############
+ 
diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix b/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix
index be562db92772..da9b7f0861cd 100644
--- a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix
+++ b/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix
@@ -3,6 +3,8 @@
 kde {
   buildInputs = [ kdelibs qca2 ];
 
+  patches = [ ./ksecrets-ftbfs.patch ];
+
   meta = {
     description = "KDE implementation of SecretsService";
   };

From abcc1e56dbc0c809d7fcaa5a5e3dfcb9131b9f90 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:04:14 +0000
Subject: [PATCH 83/88] Fix gwenview build

svn path=/nixpkgs/trunk/; revision=31561
---
 pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix
index efc2707e7d69..b6b659c39474 100644
--- a/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix
+++ b/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix
@@ -1,9 +1,12 @@
-{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi }:
+{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi
+, libjpeg, pkgconfig }:
 
 kde {
 
   buildInputs =
-    [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi ];
+    [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ];
+
+  buildNativeInputs = [ pkgconfig ];
 
   meta = {
     description = "Gwenview, the KDE image viewer";

From cd62169a203cc710717f05772ff9ff2c92ec509e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:04:18 +0000
Subject: [PATCH 84/88] kopete: depend on sqlite, fix FindJasper

svn path=/nixpkgs/trunk/; revision=31562
---
 .../kde-4.8/kdenetwork/FindJasper.cmake       | 35 +++++++++++++++++++
 pkgs/desktops/kde-4.8/kdenetwork/kopete.nix   | 10 ++++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake

diff --git a/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake b/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake
new file mode 100644
index 000000000000..bb06a7bd8d30
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake
@@ -0,0 +1,35 @@
+# - Try to find the Jasper JPEG2000 library
+# Once done this will define
+#
+#  JASPER_FOUND - system has Jasper
+#  JASPER_INCLUDE_DIR - the Jasper include directory
+#  JASPER_LIBRARIES - The libraries needed to use Jasper
+
+#=============================================================================
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+FIND_PACKAGE(JPEG)
+
+FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h)
+
+FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper)
+
+SET(JASPER_LIBRARIES ${JASPER_LIBRARY})
+
+# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARIES JASPER_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY)
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
index a4b01c5f9a63..27b36ba6d1b2 100644
--- a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
+++ b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
@@ -1,17 +1,21 @@
 { kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
   jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib,
-  libgadu, boost, qca2, gpgme }:
+  libgadu, boost, qca2, gpgme, sqlite }:
 
 kde {
   buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent
     jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2
-    gpgme ];
+    gpgme sqlite ];
 
   buildNativeInputs = [ pkgconfig ];
 
   KDEDIRS = libktorrent;
 
-  patchPhase = "cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake";
+  patchPhase =
+    ''
+      cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
+      cp -v ${./FindJasper.cmake} kopete/cmake/modules/FindJasper.cmake
+    '';
 
   cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
 

From 810ab36e2469eea13c8203a2814ef9e94ba19417 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:04:21 +0000
Subject: [PATCH 85/88] kde48.krdc depends on libjpeg

svn path=/nixpkgs/trunk/; revision=31563
---
 pkgs/desktops/kde-4.8/kdenetwork/krdc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix
index 664b1bc45a73..40ef91d54339 100644
--- a/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix
+++ b/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, libvncserver }:
+{ kde, kdelibs, libvncserver, libjpeg }:
 
 kde {
-  buildInputs = [ kdelibs libvncserver ];
+  buildInputs = [ kdelibs libvncserver libjpeg ];
 
   patches = [ ./kdenetwork.patch ];
 }

From d5b73eadeb26b88694ce2d87addcf17c65fda434 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:04:25 +0000
Subject: [PATCH 86/88] Fix kalzium build

svn path=/nixpkgs/trunk/; revision=31564
---
 .../kde-4.8/kdeedu/FindLibfacile.cmake        | 32 -------
 .../kde-4.8/kdeedu/kalzium-feature-log.patch  | 15 ----
 .../kdeedu/kalzium-find-libfacile.patch       | 88 +++++++++++++++++++
 pkgs/desktops/kde-4.8/kdeedu/kalzium.nix      |  7 +-
 4 files changed, 89 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/FindLibfacile.cmake
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kalzium-feature-log.patch
 create mode 100644 pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch

diff --git a/pkgs/desktops/kde-4.8/kdeedu/FindLibfacile.cmake b/pkgs/desktops/kde-4.8/kdeedu/FindLibfacile.cmake
deleted file mode 100644
index 617eb4b24676..000000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/FindLibfacile.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# - Try to find Libfacile
-# Once done this will define
-#
-#  LIBFACILE_FOUND - system has Libfacile
-#  LIBFACILE_INCLUDE_DIR - the Libfacile include directory
-#  LIBFACILE_LIBRARIES - Link these to use Libfacile
-#
-# Copyright (c) 2006, Carsten Niehaus, <cniehaus@gmx.de>
-# Copyright (c) 2006, Montel Laurent, <montel@kde.org>
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-find_package(OCaml)
-
-if( OCAML_FOUND )
-   find_library(LIBFACILE_LIBRARIES NAMES facile.a
-       HINTS ${OCAMLC_DIR}
-       PATH_SUFFIXES facile ocaml/facile
-   )
-   find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi
-       HINTS ${OCAMLC_DIR}
-       PATH_SUFFIXES facile lib/ocaml/facile
-   )
-endif(OCAML_FOUND)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR
-	LIBFACILE_LIBRARIES OCAML_FOUND)
-
-# show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view
-mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES )
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium-feature-log.patch b/pkgs/desktops/kde-4.8/kdeedu/kalzium-feature-log.patch
deleted file mode 100644
index 3c054e8d60ab..000000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/kalzium-feature-log.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-commit d96c6e70400dcd4e3514065e607388b80f96d6a1
-Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
-Date:   Mon Aug 15 00:53:16 2011 +0400
-
-    Display feature log
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 132934c..eec6942 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,3 +47,4 @@ add_subdirectory(src)
- add_subdirectory(data)
- add_subdirectory(plasmoid)
- add_subdirectory(libscience)
-+macro_display_feature_log()
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch b/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch
new file mode 100644
index 000000000000..0324ee74eabe
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch
@@ -0,0 +1,88 @@
+diff --git a/cmake/modules/FindLibfacile.cmake b/cmake/modules/FindLibfacile.cmake
+index bef726e..043c65f 100644
+--- a/cmake/modules/FindLibfacile.cmake
++++ b/cmake/modules/FindLibfacile.cmake
+@@ -4,7 +4,6 @@
+ #  LIBFACILE_FOUND - system has Libfacile
+ #  LIBFACILE_INCLUDE_DIR - the Libfacile include directory
+ #  LIBFACILE_LIBRARIES - Link these to use Libfacile
+-#  LIBFACILE_DEFINITIONS - Compiler switches required for using Libfacile
+ #
+ # Copyright (c) 2006, Carsten Niehaus, <cniehaus@gmx.de>
+ # Copyright (c) 2006, Montel Laurent, <montel@kde.org>
+@@ -14,35 +13,20 @@
+ 
+ find_package(OCaml)
+ 
+-set(LIBFACILE_FOUND FALSE)
+-
+ if( OCAML_FOUND )
+-   find_file(LIBFACILE_LIBRARIES NAMES facile.a
+-             PATHS
+-             ${OCAMLC_DIR}/facile/
++   find_library(LIBFACILE_LIBRARIES NAMES facile.a
++       HINTS ${OCAMLC_DIR}
++       PATH_SUFFIXES facile ocaml/facile
+    )
+-   #message(STATUS "LIBFACILE_LIBRARIES :<${LIBFACILE_LIBRARIES}>") 
+-   find_path(LIBFACILE_INCLUDE_DIR NAMES facile.a
+-             PATHS
+-             ${OCAMLC_DIR}/
+-             PATH_SUFFIXES facile
++   find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi
++       HINTS ${OCAMLC_DIR}
++       PATH_SUFFIXES facile lib/ocaml/facile
+    )
+-   #message(STATUS "LIBFACILE_INCLUDE_DIR <${LIBFACILE_INCLUDE_DIR}>")
+-   if(LIBFACILE_INCLUDE_DIR AND LIBFACILE_LIBRARIES)
+-      set(LIBFACILE_FOUND TRUE)
+-   endif(LIBFACILE_INCLUDE_DIR AND LIBFACILE_LIBRARIES)
+ endif(OCAML_FOUND)
+ 
+-
+-if(LIBFACILE_FOUND)
+-   if(NOT Libfacile_FIND_QUIETLY)
+-      message(STATUS "Found Libfacile: ${LIBFACILE_LIBRARIES}")
+-   endif(NOT Libfacile_FIND_QUIETLY)
+-else(LIBFACILE_FOUND)
+-   if(Libfacile_FIND_REQUIRED)
+-      message(FATAL_ERROR "Could not find Libfacile")
+-   endif(Libfacile_FIND_REQUIRED)
+-endif(LIBFACILE_FOUND)
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR
++	LIBFACILE_LIBRARIES OCAML_FOUND)
+ 
+ # show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view
+ mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES )
+diff --git a/src/CMakeOCamlInstructions.cmake b/src/CMakeOCamlInstructions.cmake
+index 40b6755..de89253 100644
+--- a/src/CMakeOCamlInstructions.cmake
++++ b/src/CMakeOCamlInstructions.cmake
+@@ -2,7 +2,7 @@ link_directories (${OCAMLC_DIR})
+ 
+ macro(OCAML_MLI_TO_CMI _cmi _mli)
+    add_custom_command(OUTPUT ${_cmi}
+-                      COMMAND ${OCAML_OCAMLC_EXECUTABLE} ARGS -o ${_cmi} -I +facile -c ${_mli} 
++                      COMMAND ${OCAML_OCAMLC_EXECUTABLE} ARGS -o ${_cmi} -I ${LIBFACILE_INCLUDE_DIR} -c ${_mli} 
+                       DEPENDS ${_mli} ${ARGN}
+                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_cmi})
+@@ -10,7 +10,7 @@ endmacro(OCAML_MLI_TO_CMI)
+ 
+ macro(OCAML_ML_TO_CMX _cmx _ml)
+    add_custom_command(OUTPUT ${_cmx}
+-                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} ARGS -o ${_cmx} -I +facile -c ${_ml} 
++                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} ARGS -o ${_cmx} -I ${LIBFACILE_INCLUDE_DIR} -c ${_ml} 
+                    DEPENDS ${_ml} ${ARGN}
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_cmx})
+@@ -58,7 +58,7 @@ ocaml_ml_to_cmx(${CMAKE_CURRENT_BINARY_DIR}/lexer.cmx ${CMAKE_CURRENT_SOURCE_DIR
+ # object files
+ 
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
+-                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I +facile -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
++                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
+                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c ${CMAKE_CURRENT_BINARY_DIR}/solver.o
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o)
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
index d7d9b403b1a4..298aba06c8ef 100644
--- a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
+++ b/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
@@ -2,12 +2,7 @@
 kde {
   buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
 
-  prePatch = ''
-    cp -v ${./FindLibfacile.cmake} cmake/modules/FindLibfacile.cmake
-    sed -e 's/\+facile/''${LIBFACILE_INCLUDE_DIR}/' -i src/CMakeOCamlInstructions.cmake
-    '';
-
-  patches = [ ./kalzium-feature-log.patch ];
+  patches = [ ./kalzium-find-libfacile.patch ];
 
   meta = {
     description = "Periodic Table of Elements";

From 6232b9129d58e8288ec6476c503720c517d1ea99 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:04:28 +0000
Subject: [PATCH 87/88] cairo: propagate more dependencies

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

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index ca3e53e64f40..fe3fe1e251ca 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -21,15 +21,15 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig x11 fontconfig pixman xlibs.libXrender ]
+    [ pkgconfig x11 fontconfig xlibs.libXrender ]
     ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
-    ++ stdenv.lib.optional gobjectSupport glib
 
     # On non-GNU systems we need GNU Gettext for libintl.
     ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
 
   propagatedBuildInputs =
-    [ freetype ] ++
+    [ freetype pixman ] ++
+    stdenv.lib.optional gobjectSupport glib ++
     stdenv.lib.optional postscriptSupport zlib ++
     stdenv.lib.optional pngSupport libpng;
     

From 5fe8b64ceadac39a9badbd4afe6120d7157456c8 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 14 Jan 2012 18:04:34 +0000
Subject: [PATCH 88/88] SDO: add meta.homepage

svn path=/nixpkgs/trunk/; revision=31566
---
 pkgs/data/misc/shared-desktop-ontologies/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix
index 313f8a9b1c93..39fcc6d1a68e 100644
--- a/pkgs/data/misc/shared-desktop-ontologies/default.nix
+++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake ];
   
   meta = with stdenv.lib; {
+    homepage = http://oscaf.sourceforge.net/;
     description = "Ontologies necessary for the Nepomuk semantic desktop";
     longDescription = ''
       The shared-desktop-ontologies package brings the semantic web to the