From 2593b6cd6e2c51b22de2cc5f1d9754aafb47b57a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Mar 2011 10:37:58 +0000
Subject: [PATCH 001/143] * Remove bmp, which has been unmaintained and
 obsolete for > 5 years.

svn path=/nixpkgs/trunk/; revision=26352
---
 .../audio/bmp-plugins/musepack/builder.sh     |  6 ------
 .../audio/bmp-plugins/musepack/default.nix    | 11 ----------
 .../audio/bmp-plugins/wma/default.nix         | 19 -----------------
 pkgs/applications/audio/bmp/default.nix       | 21 -------------------
 pkgs/top-level/all-packages.nix               |  8 -------
 5 files changed, 65 deletions(-)
 delete mode 100644 pkgs/applications/audio/bmp-plugins/musepack/builder.sh
 delete mode 100644 pkgs/applications/audio/bmp-plugins/musepack/default.nix
 delete mode 100644 pkgs/applications/audio/bmp-plugins/wma/default.nix
 delete mode 100644 pkgs/applications/audio/bmp/default.nix

diff --git a/pkgs/applications/audio/bmp-plugins/musepack/builder.sh b/pkgs/applications/audio/bmp-plugins/musepack/builder.sh
deleted file mode 100644
index 4b78abf73ac..00000000000
--- a/pkgs/applications/audio/bmp-plugins/musepack/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-ensureDir "$out/lib/bmp/Input"
-installFlags="install libdir=$out/lib/bmp/Input"
-
-genericBuild
diff --git a/pkgs/applications/audio/bmp-plugins/musepack/default.nix b/pkgs/applications/audio/bmp-plugins/musepack/default.nix
deleted file mode 100644
index 141476642de..00000000000
--- a/pkgs/applications/audio/bmp-plugins/musepack/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl, pkgconfig, bmp, libmpcdec, taglib}:
-
-stdenv.mkDerivation {
-  name = "bmp-plugin-musepack-1.2";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://files2.musepack.net/linux/plugins/bmp-musepack-1.2.tar.bz2;
-    md5 = "5fe0c9d341ca37d05c780a478f829a5f";
-  };
-  buildInputs = [pkgconfig bmp libmpcdec taglib];
-}
diff --git a/pkgs/applications/audio/bmp-plugins/wma/default.nix b/pkgs/applications/audio/bmp-plugins/wma/default.nix
deleted file mode 100644
index 617db6232a7..00000000000
--- a/pkgs/applications/audio/bmp-plugins/wma/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, pkgconfig, bmp}:
-
-stdenv.mkDerivation {
-  name = "bmp-plugin-wma-1.0.5";
-  
-  src = fetchurl {
-    url = http://mcmcc.bat.ru/xmms-wma/xmms-wma-1.0.5.tar.bz2;
-    md5 = "5d62a0f969617aeb40096362c7a8a506";
-  };
-  
-  buildInputs = [pkgconfig bmp];
-
-  buildFlags = "-f Makefile.bmp";
-  
-  installPhase = ''
-    ensureDir "$out/lib/bmp/Input"
-    cp libwma.so "$out/lib/bmp/Input"
-  '';
-}
diff --git a/pkgs/applications/audio/bmp/default.nix b/pkgs/applications/audio/bmp/default.nix
deleted file mode 100644
index bb3c9d6d43b..00000000000
--- a/pkgs/applications/audio/bmp/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, alsaLib, esound, libogg, libvorbis, id3lib
-, glib, gtk, libglade
-}:
-
-stdenv.mkDerivation {
-  name = "bmp-0.9.7.1";
-  src = fetchurl {
-    url = mirror://sourceforge/beepmp/bmp-0.9.7.1.tar.gz;
-    md5 = "c25d5a8d49cc5851d13d525a20023c4c";
-  };
-
-  buildInputs = [
-    pkgconfig alsaLib esound libogg libvorbis id3lib libglade
-  ];
-
-  meta = {
-    description = "Beep Media Player, an XMMS fork";
-  };
-
-  propagatedBuildInputs = [glib gtk];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9ef10c43ca..1c6bba9fe08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5650,14 +5650,6 @@ let
     python = python3;
   });
 
-  bmp = callPackage ../applications/audio/bmp {
-    inherit (gnome) esound libglade;
-  };
-
-  bmp_plugin_musepack = callPackage ../applications/audio/bmp-plugins/musepack { };
-
-  bmp_plugin_wma = callPackage ../applications/audio/bmp-plugins/wma { };
-
   bvi = callPackage ../applications/editors/bvi { };
 
   calibre = callPackage ../applications/misc/calibre {

From e1dcf1c3dffee2e2411dd48ca684f0ef06a88d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 16 Mar 2011 10:39:04 +0000
Subject: [PATCH 002/143] Updating homebank; the previous homebank did not
 build since the new xorg merge.

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

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index cfea3a2cb4e..2994ba729e6 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,7 +2,7 @@
 
 let
    download_root = "http://homebank.free.fr/public/";
-   name = "homebank-4.3";
+   name = "homebank-4.4";
    lastrelease = download_root + name + ".tar.gz";
    oldrelease = download_root + "old/" + name + ".tar.gz";
 in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     urls = [ lastrelease oldrelease ];
-    sha256 = "1r4bvyc2wnizjjc27hap6b4b01zjfp1x0rygylvi5n29jy6r2fn6";
+    sha256 = "1lp7vhimn7aa2b4ik857w7d7rbbqcwlsffk8s8lw4fjyaxrr7f0k";
   };
 
   buildInputs = [ pkgconfig gtk libofx intltool ];

From 0c4dbef366f2eb85ada6c0538a017878471b4f03 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Thu, 17 Mar 2011 04:18:59 +0000
Subject: [PATCH 003/143] Update mysql Workbench to latest release 5.2.33

Also remove autotools as the tarball is now distributed ready
for configure.

svn path=/nixpkgs/trunk/; revision=26377
---
 pkgs/applications/misc/mysql-workbench/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index f69fa1660e8..28f463278d8 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext
+{ stdenv, fetchurl, makeWrapper, boost, file, gettext
 , glib, glibc, gnome_keyring, gtk, gtkmm, intltool, libctemplate, libglade
 , libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
 , pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite
@@ -6,22 +6,20 @@
 
 stdenv.mkDerivation rec {
   pname = "mysql-workbench";
-  version = "5.2.31a";
+  version = "5.2.33";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
-    sha256 = "0mvjpin2qmnr8ksiknpcmlqjh5r3mafjcjdrnzbccyxc6r55xiy3";
+    sha256 = "193iikz0wfm3yvazficxfiqb84f34psq0bcasp3l41n9dygbgldc";
   };
 
-  buildInputs = [ autoconf automake boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
+  buildInputs = [ boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
     libctemplate libglade libgnome libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
     mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
 
   preConfigure = ''
     substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"
-
-    ./autogen.sh --prefix=$out
   '';
 
   postInstall = ''
@@ -58,7 +56,7 @@ mkfifo $FIFOCTL
 ) &
 
 exec 19> $FIFOCTL
-            ' 
+            '
   '';
 
   meta = with stdenv.lib; {

From 9f59956b41e0d2f7cc64fb54f11661b1ab11a930 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 17 Mar 2011 10:14:16 +0000
Subject: [PATCH 004/143] update perlPackages.nixPerl

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2f9234db348..29ca541ecb7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2039,11 +2039,11 @@ rec {
   };
 
   nixPerl = buildPerlPackage {
-    name = "Nix-0.15";
+    name = "Nix-1.0pre26388";
     src = fetchsvn {
       url = https://svn.nixos.org/repos/nix/nix-perl/trunk;
-      rev = 24774;
-      sha256 = "1akj695gpnbrjlnwd1gdnnnk7ppvpp1qsinjn04az7q6hjqzbm6p";
+      rev = 26388;
+      sha256 = "0780q2hgklv841za0w2swkxbyks2h6693ab2vd617s38bjm7bppa";
     };
     NIX_PREFIX = pkgs.nixSqlite;
     doCheck = false; # tests currently don't work

From c2090d1be3501f6c9cdc8d315127d618014a0251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 17 Mar 2011 14:45:36 +0000
Subject: [PATCH 005/143] Added JAGS.

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

diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix
new file mode 100644
index 00000000000..3043df15da7
--- /dev/null
+++ b/pkgs/applications/science/math/jags/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, gfortran, liblapack, blas}:
+
+stdenv.mkDerivation rec {
+  name = "JAGS-2.2.0";
+  src = fetchurl {
+    url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz";
+    sha256 = "016xml4k99lmdwwjiabxin95k9p3q2zh4pcci8wwcqwlq5y205b6";
+  };
+  buildInputs = [gfortran liblapack blas];
+
+  meta = {
+    description = "JAGS: Just Another Gibbs Sampler";
+    license     = "GPL2";
+    homepage    = http://www-ice.iarc.fr/~martyn/software/jags/;
+    maintainers = [stdenv.lib.maintainers.andres];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c6bba9fe08..1c0bafa1f69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7281,6 +7281,8 @@ let
       libXmu libXext libXcursor;
   };
 
+  jags = callPackage ../applications/science/math/jags { };
+
   liblapack = callPackage ../development/libraries/science/math/liblapack { };
 
 

From 69e649b1c8bb5b317c758bd41e88cf71e4cc11e8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Mar 2011 15:35:59 +0000
Subject: [PATCH 006/143] Fix firefox 4.0 evaluation

svn path=/nixpkgs/trunk/; revision=26397
---
 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 1c0bafa1f69..0325c2000d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5961,8 +5961,8 @@ let
   };
 
   firefox40Pkgs = callPackage ../applications/networking/browsers/firefox/4.0.nix {
-    inherit (p.gtkLibs) gtk pango;
-    inherit (p.gnome) libIDL;
+    inherit (gtkLibs) gtk pango;
+    inherit (gnome) libIDL;
   };
 
   firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";

From 4aacdee4e191d08809fb5f9ad308947fd3d2edd1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Mar 2011 15:36:38 +0000
Subject: [PATCH 007/143] Adding J language

svn path=/nixpkgs/trunk/; revision=26398
---
 pkgs/development/interpreters/j/default.nix | 81 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 83 insertions(+)
 create mode 100644 pkgs/development/interpreters/j/default.nix

diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
new file mode 100644
index 00000000000..3be0e8aa117
--- /dev/null
+++ b/pkgs/development/interpreters/j/default.nix
@@ -0,0 +1,81 @@
+x@{builderDefsPackage
+  , readline
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="j";
+    version="701_b";
+    name="${baseName}-${version}";
+    url="http://www.jsoftware.com/download/${baseName}${version}_source.tar.gz";
+    hash="1gmjlpxcd647x690c4dxnf8h6ays8ndir6cib70h3zfnkrc34cys";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doUnpack" "doBuildJ" "doDeploy"];
+
+  bits = if a.stdenv.system == "i686-linux" then 
+    "32"
+  else if a.stdenv.system == "x86_64-linux" then
+    "64"
+  else 
+    throw "Oops, unknown system: ${a.stdenv.system}";
+
+  doBuildJ = a.fullDepEntry ''
+    sed -i bin/jconfig -e 's@bits=32@bits=${bits}@g; s@readline=0@readline=1@; s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@'
+    sed -i bin/build_libj -e 's@>& make.txt@ 2>\&1 | tee make.txt@'
+
+    touch *.c *.h
+    sh bin/build_jconsole
+    sh bin/build_libj
+    sh bin/build_defs
+    sh bin/build_tsdll
+
+    sed -i j/bin/profile.ijs -e "s@userx=[.] *'.j'@userx=. '/.j'@; 
+        s@bin,'/profilex.ijs'@user,'/profilex.ijs'@ ;
+	/install=./ainstall=. install,'/share/j'
+	"
+  '' ["doUnpack" "addInputs" "minInit"];
+
+  doDeploy = a.fullDepEntry ''
+    ensureDir "$out"
+    cp -r j/bin "$out/bin"
+    rm "$out/bin/profilex_template.ijs"
+    
+    ensureDir "$out/share/j"
+
+    cp -r docs j/addons j/system "$out/share/j"
+  '' ["doUnpack" "doBuildJ" "minInit" "defEnsureDir"];
+      
+  meta = {
+    description = "J programming language, an ASCII-based APL successor";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = a.lib.licenses.gpl3Plus;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://jsoftware.com/source.htm";
+    };
+  };
+}) x
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0325c2000d9..d59cbb19a23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2219,6 +2219,8 @@ let
       freeglut e2fsprogs libsamplerate pcre libevent libedit;
   };
 
+  j = callPackage ../development/interpreters/j {};
+
   kaffe = callPackage ../development/interpreters/kaffe { };
 
   lua4 = callPackage ../development/interpreters/lua-4 { };

From 3fa36ea4a18825e64610be2a1128960829621c1f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Mar 2011 15:51:13 +0000
Subject: [PATCH 008/143] Fix TWM build

svn path=/nixpkgs/trunk/; revision=26399
---
 pkgs/servers/x11/xorg/overrides.nix | 4 ++++
 pkgs/top-level/all-packages.nix     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f1b0f64f02e..eb32b83a53e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -186,4 +186,8 @@ in
     '';
   };
 
+  twm = attrs: attrs // {
+    buildNativeInputs = [args.bison args.flex];
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d59cbb19a23..1fa16d5ccfb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4577,7 +4577,7 @@ let
     inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa
       xkeyboard_config dbus hal libuuid openssl gperf m4
-      autoconf libtool xmlto asciidoc udev;
+      autoconf libtool xmlto asciidoc udev bison flex;
 
     # XXX: Update to newer Automake on the next big rebuild; better yet:
     # remove the dependency on Automake.

From 1d999331417b682da8ac683e807f3cc6e0e419c8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Mar 2011 18:46:25 +0000
Subject: [PATCH 009/143] Fix xbacklight

svn path=/nixpkgs/trunk/; revision=26402
---
 pkgs/servers/x11/xorg/overrides.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index eb32b83a53e..118642d045c 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -190,4 +190,8 @@ in
     buildNativeInputs = [args.bison args.flex];
   };
 
+  xbacklight = attrs: attrs // {
+    buildInputs = attrs.buildInputs ++ [xorg.libXrender];
+  };
+
 }

From 3677d79b6324c08989251464a1676203252095a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 17 Mar 2011 19:02:20 +0000
Subject: [PATCH 010/143] Removing the dependencies in k3b on cdrkit, cdrdao,
 dvdrwplustools and growisofs, because at the end it needs all setuid for it
 to record anything.

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

diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index d0e5d401658..a059df2b826 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
 , ffmpeg, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
-, kdelibs, kdemultimedia, cdrdao, cdrtools, dvdplusrwtools
-, automoc4, phonon, makeWrapper
+, kdelibs, kdemultimedia, automoc4, phonon, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -13,14 +12,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib
                   ffmpeg flac libsamplerate libdvdread lame libsndfile
-                  libmad gettext stdenv.gcc.libc cdrdao cdrtools
-                  kdelibs kdemultimedia automoc4 phonon dvdplusrwtools
+                  libmad gettext stdenv.gcc.libc
+                  kdelibs kdemultimedia automoc4 phonon
                   makeWrapper ];
 
-  postInstall = ''
-    wrapProgram $out/bin/k3b --suffix PATH : "${cdrdao}/bin:${dvdplusrwtools}/bin:${cdrtools}/bin"
-  '';
-
   meta = with stdenv.lib; {
     description = "CD/DVD Burning Application for KDE";
     license = licenses.gpl2Plus;

From 39dc794d4a5bd2757d9c3b5e3302632e935e53ed Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Mar 2011 19:21:26 +0000
Subject: [PATCH 011/143] Fix JWM build

svn path=/nixpkgs/trunk/; revision=26404
---
 pkgs/applications/window-managers/jwm/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index e52cb91ec4b..57e6ecf1749 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft }:
+{ stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft, freetype,
+  fontconfig }:
 
 stdenv.mkDerivation {
   name = "jwm-2.0.1";
@@ -8,7 +9,13 @@ stdenv.mkDerivation {
      sha256 = "1ix5y00cmg3cyazl0adzgv49140zxaf2dpngyg1dyy4ma6ysdmnw";
   };
 
-  buildInputs = [ libX11 libXext libXinerama libXpm libXft ];
+  buildInputs = [ libX11 libXext libXinerama libXpm libXft freetype 
+    fontconfig ];
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2 "
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lXft -lfreetype -lfontconfig "
+  '';
 
   postInstall =
     ''

From 23f8f4d7b62a2bfaf36d6f9051fb7fa6374d3bc2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Mar 2011 21:08:01 +0000
Subject: [PATCH 012/143] Update x11vnc

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

diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index f51d3c2f290..ceb3798f6de 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib, libjpeg, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "x11vnc-0.9.10";
+  name = "x11vnc-0.9.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/libvncserver/${name}.tar.gz";
-    sha256 = "04g0da04g4iw0qwvn43a8vh2im4wx9rwl1w41acsbdi8b0amhlck";
+    sha256 = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79";
   };
 
   buildInputs =

From 92a26c823c43e358a285aa6dedb2474db0d16de4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Mar 2011 22:00:22 +0000
Subject: [PATCH 013/143] Comment about incomplete set of propagatedBuildInputs

svn path=/nixpkgs/trunk/; revision=26406
---
 pkgs/servers/x11/xorg/overrides.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 118642d045c..2d070302828 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -91,6 +91,7 @@ in
   libXft = attrs: attrs // {
     buildInputs = attrs.buildInputs ++
       [ xorg.xproto xorg.libX11 xorg.renderproto ];
+    # probably, fontconfig and freetype could be added
     propagatedBuildInputs = [ xorg.libXrender ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };

From 36af24fc0551f46a3483a8be6d22cb9e18debb9b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Mar 2011 22:09:22 +0000
Subject: [PATCH 014/143] Fix SWI-Prolog build

svn path=/nixpkgs/trunk/; revision=26407
---
 pkgs/development/compilers/swi-prolog/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index 255ea1495d6..49498c2fc81 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib, libXinerama, libXft, libXpm, libSM, libXt }:
+{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib, 
+   libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig,
+   fontconfig }:
 
 stdenv.mkDerivation rec {
   version = "5.10.2";
@@ -9,10 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1a3ebbcd649f429a41b64561d38423692e00524c29227432d0eb5a0e24e2a4c9";
   };
 
-  buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama libXft libXpm libSM libXt zlib];
+  buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama 
+    libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig];
   configureFlags = "--with-world --enable-gmp --enable-shared";
   makeFlags = "world";
 
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
+  '';
+
   meta = {
     homepage = http://www.swi-prolog.org/;
     description = "A Prolog compiler and interpreter";

From 0585ca6b8bc54a0a1faafafc524fd4ec2173f197 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Mar 2011 22:15:53 +0000
Subject: [PATCH 015/143] Adding Firefox-4.0RC1 - fails to start on my notebook
 currently, though

svn path=/nixpkgs/trunk/; revision=26408
---
 .../networking/browsers/firefox/4.0-rc1.nix   | 158 ++++++++++++++++++
 1 file changed, 158 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/firefox/4.0-rc1.nix

diff --git a/pkgs/applications/networking/browsers/firefox/4.0-rc1.nix b/pkgs/applications/networking/browsers/firefox/4.0-rc1.nix
new file mode 100644
index 00000000000..62d403a50e6
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/4.0-rc1.nix
@@ -0,0 +1,158 @@
+{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
+, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
+, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
+, libvpx, yasm, mesa, wirelesstools
+
+, # If you want the resulting program to call itself "Firefox" instead
+  # of "Shiretoko" or whatever, enable this option.  However, those
+  # binaries may not be distributed without permission from the
+  # Mozilla Foundation, see
+  # http://www.mozilla.org/foundation/trademarks/.
+  enableOfficialBranding ? false
+}:
+
+rec {
+
+  firefoxVersion = "4.0rc1";
+  
+  xulVersion = "2.0"; # this attribute is used by other packages
+
+  
+  src = fetchurl {
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    sha256 = "8bae4af5d364c6caa624ad106f532f046f23e6187281cf87d8d4ed5d899f100f";
+  };
+
+  commonConfigureFlags =
+    [ "--enable-optimize"
+      "--disable-debug"
+      "--enable-strip"
+      "--with-system-jpeg"
+      "--with-system-zlib"
+      "--with-system-bz2"
+      "--with-system-nspr"
+      #"--with-system-nss"
+      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
+      "--enable-system-cairo"
+      #"--enable-system-sqlite" # <-- this seems to be discouraged
+      "--disable-crashreporter"
+      "--disable-tests"
+      "--disable-necko-wifi" # maybe we want to enable this at some point
+    ];
+
+
+  xulrunner = stdenv.mkDerivation rec {
+    name = "xulrunner-${xulVersion}";
+    
+    inherit src;
+
+    buildInputs =
+    [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
+        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
+        alsaLib nspr /* nss */ libnotify xlibs.pixman libvpx yasm mesa
+	wirelesstools xlibs.libXScrnSaver xlibs.scrnsaverproto
+	xlibs.libXext xlibs.xextproto
+      ];
+
+    configureFlags =
+      [ "--enable-application=xulrunner"
+        "--disable-javaxpcom"
+      ] ++ commonConfigureFlags;
+
+    # !!! Temporary hack.
+    preBuild = ''
+     export NIX_ENFORCE_PURITY=
+    '';
+
+    # Hack to work around make's idea of -lbz2 dependency
+    preConfigure = ''
+     find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
+       stdenv.lib.concatStringsSep ":" 
+         (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
+     }' ';'
+    '';
+
+    installFlags = "SKIP_GRE_REGISTRATION=1";
+
+    postInstall = ''
+      # Fix some references to /bin paths in the Xulrunner shell script.
+      substituteInPlace $out/bin/xulrunner \
+          --replace /bin/pwd "$(type -tP pwd)" \
+          --replace /bin/ls "$(type -tP ls)"
+
+      # Fix run-mozilla.sh search
+      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
+      echo libDir: $libDir
+      test -n "$libDir"
+      cd $out/bin
+      mv xulrunner ../lib/$libDir/
+
+      for i in $out/lib/$libDir/*; do 
+          file $i;
+          if file $i | grep executable &>/dev/null; then 
+              ln -s $i $out/bin
+          fi;
+      done;
+      rm -f $out/bin/run-mozilla.sh
+    ''; # */
+
+    meta = {
+      description = "Mozilla Firefox XUL runner";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+    };
+
+    passthru = { inherit gtk; version = xulVersion; };
+  };
+
+
+  firefox = stdenv.mkDerivation rec {
+    name = "firefox-${firefoxVersion}";
+
+    inherit src;
+
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
+        dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
+        xlibs.pixman libvpx yasm mesa wirelesstools
+      ];
+
+    propagatedBuildInputs = [xulrunner];
+
+    configureFlags =
+      [ "--enable-application=browser"
+        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
+      ]
+      ++ commonConfigureFlags
+      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
+
+    postInstall = ''
+      libDir=$(cd $out/lib && ls -d firefox-[0-9]*)
+      test -n "$libDir"
+
+      ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner
+
+      # Register extensions etc. !!! is this needed anymore?
+      echo "running firefox -register..."
+      $out/bin/firefox -register
+    ''; # */
+
+    # Hack to work around make's idea of -lbz2 dependency
+    preConfigure = ''
+     find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
+       stdenv.lib.concatStringsSep ":" 
+         (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
+     }' ';'
+    '';
+
+    meta = {
+      description = "Mozilla Firefox - the browser, reloaded";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+    };
+
+    passthru = {
+      inherit gtk xulrunner nspr;
+      isFirefox3Like = true;
+    };
+  };
+}

From ee75c32a3b6597862fe22815004382dd0bb1bc71 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Mar 2011 05:32:14 +0000
Subject: [PATCH 016/143] More needed propagations noted for future big update

svn path=/nixpkgs/trunk/; revision=26409
---
 pkgs/servers/x11/xorg/overrides.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 2d070302828..a768ea19244 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -92,6 +92,7 @@ in
     buildInputs = attrs.buildInputs ++
       [ xorg.xproto xorg.libX11 xorg.renderproto ];
     # probably, fontconfig and freetype could be added
+    # pkgconfig seems to be nice, too...
     propagatedBuildInputs = [ xorg.libXrender ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };

From 9c5c5b49816ff815fac57cb81199986898be5e8c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Mar 2011 05:55:37 +0000
Subject: [PATCH 017/143] Fix and update urxvt

svn path=/nixpkgs/trunk/; revision=26410
---
 pkgs/applications/misc/rxvt_unicode/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 029d8675ddf..89bce3ff99f 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl }:
+{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl,
+  fontconfig, freetype, pkgconfig, libXrender }:
 
 let 
   name = "rxvt-unicode";
-  version = "9.07";
+  version = "9.10";
   n = "${name}-${version}";
 in
 
@@ -11,18 +12,21 @@ stdenv.mkDerivation (rec {
   name = "${n}${if perlSupport then "-with-perl" else ""}";
 
   src = fetchurl {
-    url = "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.07.tar.bz2";
-    sha256 = "18y5mb3cm1gawjm723q5r7yk37s9drzg39kna036i694m2667865";
+    url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
+    sha256 = "1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a";
   };
 
   buildInputs =
-    [ libX11 libXt libXft ncurses /* required to build the terminfo file */ ]
+    [ libX11 libXt libXft ncurses /* required to build the terminfo file */ 
+      fontconfig freetype pkgconfig libXrender ]
     ++ stdenv.lib.optional perlSupport perl;
 
   preConfigure =
     ''
       configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
       export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
+      NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
+      NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender "
     ''
     # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
     + stdenv.lib.optionalString perlSupport ''

From 19253151fe2a6bee35d9908caa90a2cbf9266146 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Mar 2011 07:51:22 +0000
Subject: [PATCH 018/143] Source for Linux 2.6.38

svn path=/nixpkgs/trunk/; revision=26411
---
 .../os-specific/linux/kernel/linux-2.6.38.nix | 208 ++++++++++++++++++
 1 file changed, 208 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.38.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.38.nix b/pkgs/os-specific/linux/kernel/linux-2.6.38.nix
new file mode 100644
index 00000000000..778ce700a0d
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.38.nix
@@ -0,0 +1,208 @@
+args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
+, ... }:
+
+let
+  configWithPlatform = kernelPlatform :
+    ''
+      # Don't include any debug features.
+      DEBUG_KERNEL n
+
+      # Support drivers that need external firmware.
+      STANDALONE n
+
+      # Make /proc/config.gz available.
+      IKCONFIG_PROC y
+
+      # Optimize with -O2, not -Os.
+      CC_OPTIMIZE_FOR_SIZE n
+
+      # Enable the kernel's built-in memory tester.
+      MEMTEST y
+
+      # Disable some expensive (?) features.
+      FTRACE n
+      KPROBES n
+      NUMA? n
+      PM_TRACE_RTC n
+
+      # Enable various subsystems.
+      ACCESSIBILITY y # Accessibility support
+      AUXDISPLAY y # Auxiliary Display support
+      DONGLE y # Serial dongle support
+      HIPPI y
+      MTD_COMPLEX_MAPPINGS y # needed for many devices
+      NET_POCKET y # enable pocket and portable adapters
+      SCSI_LOWLEVEL y # enable lots of SCSI devices
+      SCSI_LOWLEVEL_PCMCIA y
+      SPI y # needed for many devices
+      SPI_MASTER y
+      WAN y
+
+      # Networking options.
+      IP_PNP n
+      IPV6_PRIVACY y
+      NETFILTER_ADVANCED y
+      IP_VS_PROTO_TCP y
+      IP_VS_PROTO_UDP y
+      IP_VS_PROTO_ESP y
+      IP_VS_PROTO_AH y
+      IP_DCCP_CCID3 n # experimental
+      CLS_U32_PERF y
+      CLS_U32_MARK y
+
+      # Wireless networking.
+      IPW2100_MONITOR y # support promiscuous mode
+      IPW2200_MONITOR y # support promiscuous mode
+      IWL4965 y # Intel Wireless WiFi 4965AGN
+      IWL5000 y # Intel Wireless WiFi 5000AGN
+      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
+      HOSTAP_FIRMWARE_NVRAM y
+
+      # Some settings to make sure that fbcondecor works - in particular,
+      # disable tileblitting and the drivers that need it.
+
+      # Enable various FB devices.
+      FB y
+      FB_EFI y
+      FB_NVIDIA_I2C y # Enable DDC Support
+      FB_RIVA_I2C y
+      FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
+      FB_ATY_GX y # Mach64 GX support
+      FB_SAVAGE_I2C y
+      FB_SAVAGE_ACCEL y
+      FB_SIS_300 y
+      FB_SIS_315 y
+      FB_3DFX_ACCEL y
+      FB_GEODE y
+
+      # Video configuration
+      # The intel drivers already require KMS
+      DRM_I915_KMS y
+      # Hybrid graphics support
+      VGA_SWITCHEROO y
+
+      # Sound.
+      SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
+      SND_HDA_INPUT_BEEP y # Support digital beep via input layer
+      SND_USB_CAIAQ_INPUT y
+      PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+
+      # USB serial devices.
+      USB_SERIAL_GENERIC y # USB Generic Serial Driver
+      USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
+      USB_SERIAL_KEYSPAN_USA28 y
+      USB_SERIAL_KEYSPAN_USA28X y
+      USB_SERIAL_KEYSPAN_USA28XA y
+      USB_SERIAL_KEYSPAN_USA28XB y
+      USB_SERIAL_KEYSPAN_USA19 y
+      USB_SERIAL_KEYSPAN_USA18X y
+      USB_SERIAL_KEYSPAN_USA19W y
+      USB_SERIAL_KEYSPAN_USA19QW y
+      USB_SERIAL_KEYSPAN_USA19QI y
+      USB_SERIAL_KEYSPAN_USA49W y
+      USB_SERIAL_KEYSPAN_USA49WLC y
+
+      # Filesystem options - in particular, enable extended attributes and
+      # ACLs for all filesystems that support them.
+      EXT2_FS_XATTR y # Ext2 extended attributes
+      EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
+      EXT2_FS_SECURITY y # Ext2 Security Labels
+      EXT2_FS_XIP y # Ext2 execute in place support
+      EXT4_FS_POSIX_ACL y
+      EXT4_FS_SECURITY y
+      REISERFS_FS_XATTR y
+      REISERFS_FS_POSIX_ACL y
+      REISERFS_FS_SECURITY y
+      JFS_POSIX_ACL y
+      JFS_SECURITY y
+      XFS_QUOTA y
+      XFS_POSIX_ACL y
+      XFS_RT y # XFS Realtime subvolume support
+      OCFS2_DEBUG_MASKLOG n
+      BTRFS_FS_POSIX_ACL y
+      UBIFS_FS_XATTR y
+      UBIFS_FS_ADVANCED_COMPR y
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
+      CIFS_XATTR y
+      CIFS_POSIX y
+
+      # Security related features.
+      STRICT_DEVMEM y # Filter access to /dev/mem
+      SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
+
+      # Misc. options.
+      8139TOO_8129 y
+      8139TOO_PIO n # PIO is slower
+      AIC79XX_DEBUG_ENABLE n
+      AIC7XXX_DEBUG_ENABLE n
+      AIC94XX_DEBUG n
+      B43_PCMCIA y
+      BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
+      BLK_DEV_IDEACPI y # IDE ACPI support
+      BLK_DEV_INTEGRITY y
+      BSD_PROCESS_ACCT_V3 y
+      BT_HCIUART_BCSP y
+      BT_HCIUART_H4 y # UART (H4) protocol support
+      BT_HCIUART_LL y
+      BT_RFCOMM_TTY y # RFCOMM TTY support
+      CPU_FREQ_DEBUG n
+      CRASH_DUMP n
+      DMAR? n # experimental
+      DVB_DYNAMIC_MINORS y # we use udev
+      FUSION y # Fusion MPT device support
+      IDE_GD_ATAPI y # ATAPI floppy support
+      IRDA_ULTRA y # Ultra (connectionless) protocol
+      JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
+      JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
+      JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
+      JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
+      KALLSYMS_EXTRA_PASS n
+      LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
+      LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
+      LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
+      LOGO n # not needed
+      MEDIA_ATTACH y
+      MEGARAID_NEWGEN y
+      MICROCODE_AMD y
+      MODVERSIONS y
+      MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
+      MTRR_SANITIZER y
+      NET_FC y # Fibre Channel driver support
+      PPP_MULTILINK y # PPP multilink support
+      REGULATOR y # Voltage and Current Regulator Support
+      SCSI_LOGGING y # SCSI logging facility
+      SERIAL_8250 y # 8250/16550 and compatible serial support
+      SLIP_COMPRESSED y # CSLIP compressed headers
+      SLIP_SMART y
+      THERMAL_HWMON y # Hardware monitoring support
+      USB_DEBUG n
+      USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
+      X86_CHECK_BIOS_CORRUPTION y
+      X86_MCE y
+
+      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
+      ${extraConfig}
+    '';
+in
+
+import ./generic.nix (
+
+  rec {
+    version = "2.6.38";
+  
+    src = fetchurl {
+      url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
+      sha256 = "014kgc9f4n1ivnxgbggc85v64cjk6z82sx2sklhnpj4dzfpczw3j";
+    };
+
+    config = configWithPlatform stdenv.platform;
+    configCross = configWithPlatform stdenv.cross.platform;
+
+    features.iwlwifi = true;
+  }
+
+  // removeAttrs args ["extraConfig"]
+)

From 80f5df945d0c1ef268a92bd8bd039595b6add836 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Mar 2011 08:02:48 +0000
Subject: [PATCH 019/143] Add libsoup 2.33

svn path=/nixpkgs/trunk/; revision=26412
---
 pkgs/desktops/gnome-2.28/desktop/libsoup/2.33.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 pkgs/desktops/gnome-2.28/desktop/libsoup/2.33.nix

diff --git a/pkgs/desktops/gnome-2.28/desktop/libsoup/2.33.nix b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.33.nix
new file mode 100644
index 00000000000..34d185bfe02
--- /dev/null
+++ b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.33.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl, 
+  glib, GConf, gnome_keyring}:
+
+stdenv.mkDerivation rec {
+  name = "libsoup-2.33.6";
+  src = fetchurl {
+    url = "mirror://gnome/sources/libsoup/2.33/${name}.tar.bz2";
+    sha256 = "988f7897fe125a77a5946b2fd6d47d7374fd94a1406e810482cfff6a52a6a923";
+  };
+  buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl 
+    glib GConf gnome_keyring ];
+}

From 4c8bf75b3059e8d5612da3d237a1e4c92df29c0a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Mar 2011 08:06:36 +0000
Subject: [PATCH 020/143] Update Vacuum-IM

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

diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index a08cc2795bb..41658be08a9 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , qt4, openssl
-  , xproto, libX11
+  , xproto, libX11, libXScrnSaver, scrnsaverproto
   , ...}:
 builderDefsPackage
 (a :  
@@ -11,11 +11,11 @@ let
   buildInputs = map (n: builtins.getAttr n x)
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
-    version="1.0.2";
+    version="1.1.0";
     baseName="vacuum";
     name="${baseName}-${version}";
-    url="http://vacuum-im.googlecode.com/files/${name}-source.tar.gz";
-    hash="01ndwxpgr8911f2nfyb6i7avmmlwfikn031q1s60js4lgbqdq3b7";
+    url="http://vacuum-im.googlecode.com/files/${name}.tar.gz";
+    hash="c956b0cf5cc0a1acee47a96f0b0e7ab5d716e48cac4a7fcbca496f901a219dcc";
   };
 in
 rec {
@@ -35,8 +35,6 @@ rec {
     sed -re 's/qHash[(][a-z ]*QUrl/vacuum_obsolete_&/' -i src/plugins/dataforms/dataforms.cpp
   '') ["minInit" "doUnpack"];
 
-  goSrcDir = ''cd vacuum-*/'';
-
   doQMake = a.fullDepEntry (''
     qmake INSTALL_PREFIX=$out -recursive vacuum.pro
   '') ["doUnpack" "addInputs"];

From 975f93ffc92b42f39bf0e913026fe73a454572df Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Mar 2011 08:25:02 +0000
Subject: [PATCH 021/143] Update veracity

svn path=/nixpkgs/trunk/; revision=26414
---
 pkgs/applications/version-management/veracity/default.nix | 2 +-
 .../version-management/veracity/src-for-default.nix       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix
index 88ab7d08bca..db2aefaedfa 100644
--- a/pkgs/applications/version-management/veracity/default.nix
+++ b/pkgs/applications/version-management/veracity/default.nix
@@ -27,7 +27,7 @@ rec {
     sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
     mkdir pseudo-home
     export HOME=$PWD/pseudo-home
-    echo make test
+    make test || true
   '' ["doMake" "minInit"];
 
   prepare_sgneeds = a.fullDepEntry (''
diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index 9fb27df0757..946b28b3f65 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.5.7.10397";
-   name="veracity-0.5.7.10397";
-   hash="09w1qj4wklaf7mw0vavzyqpagcd0cwqppdl8vaqqi0irddgivnq8";
+   version="0.7.0.10414";
+   name="veracity-0.7.0.10414";
+   hash="0kaqh2d1zh2vskwz9fw2yrx396knhbjq63h4r72y7cc2izgly21j";
    url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.7.10397.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.7.0.10414.tar.gz";
   
   
 }

From ac108080c2787029917ac2aca207b15df6e8ef9f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Mar 2011 08:25:46 +0000
Subject: [PATCH 022/143] libsoup 2.33

svn path=/nixpkgs/trunk/; revision=26415
---
 pkgs/desktops/gnome-2.28/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix
index 7e8c4192052..20118724e0c 100644
--- a/pkgs/desktops/gnome-2.28/default.nix
+++ b/pkgs/desktops/gnome-2.28/default.nix
@@ -189,6 +189,12 @@ pkgs.makeOverridable
     inherit GConf gnome_keyring;
   };
 
+  libsoup_2_33 = import ./desktop/libsoup/2.33.nix {
+    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl;
+    inherit (pkgs.gtkLibs) glib;
+    inherit GConf gnome_keyring;
+  };
+
   libwnck = import ./desktop/libwnck {
     inherit (pkgs) stdenv fetchurl pkgconfig;
     inherit (pkgs.xlibs) libX11;

From 6879f1e3b1ade9a7eaf0998e33a2765feac8b85d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Mar 2011 08:26:11 +0000
Subject: [PATCH 023/143] Update NSPR

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

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index d835ee56b75..c259a30441a 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.8.6"; in
+let version = "4.8.7"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "0vcz39784bw42kv9f81dnfb9ciga66l4yg223j467yin2nq0n16r";
+    sha256 = "eb9459c31d43d1000fb1304f1e0cedab0bdac3c54c71988259c1ac10c1fe16a3";
   };
 
   preConfigure = "cd mozilla/nsprpub";

From 5382f8e9347cd4b7b8d61bf5bd7694d75148f81e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Mar 2011 09:07:46 +0000
Subject: [PATCH 024/143] * xorg-server updated to 1.9.5.

svn path=/nixpkgs/trunk/; revision=26417
---
 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 dd90aedc4e2..49bfdd9a8b2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2018,11 +2018,11 @@ let
   })) // {inherit ;};
     
   xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
-    name = "xorg-server-1.9.4";
+    name = "xorg-server-1.9.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.9.4.tar.bz2;
-      sha256 = "0n14xjw7gaqk4xhx7lhr387wr81yvf3cjw1wn0vjx3x5pdz084dd";
+      url = mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2;
+      sha256 = "1p19w1s840jb1ah6na0c9k23gbh9wwz1il272irqy3jggh4pbirz";
     };
     buildInputs = [pkgconfig bigreqsproto damageproto fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ];
   })) // {inherit bigreqsproto damageproto fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
index 6a745887ca4..5b6059cd575 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@@ -182,7 +182,7 @@ mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.9.4.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2

From 04d5aed6d0787bd913be214c78613ed6ac99f66f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Mar 2011 09:10:53 +0000
Subject: [PATCH 025/143] Add intel driver prerelease

svn path=/nixpkgs/trunk/; revision=26418
---
 pkgs/servers/x11/xorg/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 49bfdd9a8b2..ae56e00762b 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1537,6 +1537,16 @@ let
     buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ];
   })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;};
     
+  xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
+    name = "xf86-video-intel-2.14.901";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2;
+      sha256 = "1hm3zn96ahmirvx1iv87sk7fl7g8a6h1j7560gyw7y5b3l1zmg5r";
+    };
+    buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ];
+  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;};
+    
   xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
     name = "xf86-video-mach64-6.8.2";
     builder = ./builder.sh;

From 9701661f247c267934c9a8e71e2f9439d25d2fa5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Mar 2011 09:48:27 +0000
Subject: [PATCH 026/143] Now WebKit requires libsoup 2.33

svn path=/nixpkgs/trunk/; revision=26419
---
 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 1fa16d5ccfb..dbfa8e6de57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4144,9 +4144,9 @@ let
   vxl = callPackage ../development/libraries/vxl { };
 
   webkit = let p = applyGlobalOverrides (x : {
-    libsoup = x.gnome28.libsoup_2_31;
+    libsoup = x.gnome28.libsoup_2_33;
     gnome28 = x.gnome28 // {
-      libsoup = x.gnome28.libsoup_2_31;
+      libsoup = x.gnome28.libsoup_2_33;
     };
   });
   in

From b8c18bd6c3d14c837f8b7d88abb8d2ba32cb8ef4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Mar 2011 12:23:36 +0000
Subject: [PATCH 027/143] Adding Linux 2.6.38

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbfa8e6de57..95e1ac97e3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5023,6 +5023,16 @@ let
       ];
   };
 
+  linux_2_6_38 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.38.nix) {
+    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    kernelPatches =
+      [ #kernelPatches.fbcondecor_2_6_35
+        kernelPatches.sec_perm_2_6_24
+        #kernelPatches.aufs2_2_6_35
+        #kernelPatches.mips_restart_2_6_36
+      ];
+  };
+
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages

From 83f99d0c386a250b981ddd6ce6e9f627e22ad15c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Fri, 18 Mar 2011 15:03:01 +0000
Subject: [PATCH 028/143] lhs2tex version bump.

svn path=/nixpkgs/trunk/; revision=26425
---
 pkgs/tools/typesetting/lhs2tex/default.nix | 11 ++++-------
 pkgs/top-level/haskell-packages.nix        |  4 +---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index 012c98f6887..68f2347bb65 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -1,14 +1,11 @@
-{cabal, tetex, polytable, regexCompat}:
-
-#assert tetex == polytable.tetex;
+{cabal, texLive, regexCompat}:
 
 cabal.mkDerivation (self : {
   pname = "lhs2tex";
-  version = "1.16";
+  version = "1.17";
   name = self.fname;
-  sha256 = "aa43ec92e8d7c94213365a7211d605314476977155e36420caa3cfb394f7c76f";
-  extraBuildInputs = [tetex regexCompat];
-  propagatedBuildInputs = [polytable]; # automatically in user-env now with cabal
+  sha256 = "1x49316m5xm4f6hw5q7kia9rpfpygxhk5gnifd54ai0zjmdlkxrc";
+  extraBuildInputs = [regexCompat texLive];
 
   postInstall = ''
     ensureDir "$out/share/doc/$name"
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 55d2e42e206..af6036ed45f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1018,9 +1018,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
   cabalInstall = self.cabalInstall_0_6_2;
 
-  lhs2tex = callPackage ../tools/typesetting/lhs2tex {
-    inherit (pkgs) tetex polytable;
-  };
+  lhs2tex = callPackage ../tools/typesetting/lhs2tex {};
 
   myhasktags = callPackage ../tools/misc/myhasktags {};
 

From af3e5b5050b216d967711e0d940c4ee68d97ea3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 18 Mar 2011 20:44:35 +0000
Subject: [PATCH 029/143] Updating powertop.

svn path=/nixpkgs/trunk/; revision=26426
---
 pkgs/os-specific/linux/powertop/default.nix       |  8 ++++----
 .../linux/powertop/powertop-1.13.patch            | 15 +++++++++++++++
 .../os-specific/linux/powertop/powertop-1.8.patch | 13 -------------
 3 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/os-specific/linux/powertop/powertop-1.13.patch
 delete mode 100644 pkgs/os-specific/linux/powertop/powertop-1.8.patch

diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index ca04fc49d14..aaa7d6f04e0 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses, gettext}:
 
 stdenv.mkDerivation {
-  name = "powertop-1.11";
+  name = "powertop-1.13";
   src = fetchurl {
-    url = http://www.lesswatts.org/projects/powertop/download/powertop-1.11.tar.gz;
-    sha256 = "1wl0c7sav5rf7andnx704vs3n5gj2b5g1adx8zjfbbgvwm9wrrvh";
+    url = http://www.lesswatts.org/projects/powertop/download/powertop-1.13.tar.gz;
+    sha256 = "164dqp6msdaxpi2bmvwawasyrf1sfvanlc9ddp97v1wnjh46dj1b";
   };
-  patches = [./powertop-1.8.patch];
+  patches = [./powertop-1.13.patch];
   buildInputs = [ncurses gettext];
 }
diff --git a/pkgs/os-specific/linux/powertop/powertop-1.13.patch b/pkgs/os-specific/linux/powertop/powertop-1.13.patch
new file mode 100644
index 00000000000..d8a7d546c54
--- /dev/null
+++ b/pkgs/os-specific/linux/powertop/powertop-1.13.patch
@@ -0,0 +1,15 @@
+diff -ru powertop-1.13/Makefile powertop-1.13.new/Makefile
+--- powertop-1.13/Makefile
++++ powertop-1.13.new/Makefile
+@@ -1,6 +1,6 @@
+ VERSION = 1.13
+ 
+-BINDIR=/usr/bin
+-LOCALESDIR=/usr/share/locale
+-MANDIR=/usr/share/man/man8
++BINDIR=${out}/bin
++LOCALESDIR=${out}/share/locale
++MANDIR=${out}/share/man/man8
+ WARNFLAGS=-Wall  -W -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int
+ CFLAGS?=-Os -g ${WARNFLAGS}
+ CC?=gcc
diff --git a/pkgs/os-specific/linux/powertop/powertop-1.8.patch b/pkgs/os-specific/linux/powertop/powertop-1.8.patch
deleted file mode 100644
index 0a0d0e55382..00000000000
--- a/pkgs/os-specific/linux/powertop/powertop-1.8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru powertop-1.8/Makefile powertop-1.8.new/Makefile
---- powertop-1.8/Makefile	2007-08-19 19:43:08.000000000 +0200
-+++ powertop-1.8.new/Makefile	2007-09-23 12:54:59.000000000 +0200
-@@ -1,6 +1,6 @@
--BINDIR=/usr/bin
--LOCALESDIR=/usr/share/locale
--MANDIR=/usr/share/man/man1
-+BINDIR=${out}/bin
-+LOCALESDIR=${out}/share/locale
-+MANDIR=${out}/share/man/man1
- WARNFLAGS=-Wall  -W -Wshadow
- CFLAGS?=-Os -g ${WARNFLAGS}
- CC?=gcc

From 8ab38a2828f1ff411186aad39c816a0b5c0dfa8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 19 Mar 2011 20:44:45 +0000
Subject: [PATCH 030/143] Adding the fbcondecor patch for 2.6.37, by Shea Levy

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 860dfaeef70..8c2942bfdfc 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -101,6 +101,17 @@ in
       features.fbConDecor = true;
     };
 
+  fbcondecor_2_6_37 =
+    rec {
+      name = "fbcondecor-0.9.6-2.6.37";
+      patch = fetchurl {
+        url = "http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${name}.patch";
+        sha256 = "1yap9q6mp15jhsysry4x17cpm5dj35g8l2d0p0vn1xq25x3jfkqk";
+      };
+      extraConfig = fbcondecorConfig;
+      features.fbConDecor = true;
+    };
+
   # From http://patchwork.kernel.org/patch/19495/
   ext4_softlockups_2_6_28 =
     { name = "ext4-softlockups-fix";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95e1ac97e3f..ad22863b4ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5016,7 +5016,7 @@ let
   linux_2_6_37 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.37.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
-      [ #kernelPatches.fbcondecor_2_6_35
+      [ kernelPatches.fbcondecor_2_6_37
         kernelPatches.sec_perm_2_6_24
         #kernelPatches.aufs2_2_6_35
         #kernelPatches.mips_restart_2_6_36

From bff378c9659a997f9a20200c7fd20584f40340ef Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 20 Mar 2011 07:29:32 +0000
Subject: [PATCH 031/143] Update liquidwar

svn path=/nixpkgs/trunk/; revision=26429
---
 pkgs/games/liquidwar/src-for-default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/liquidwar/src-for-default.nix b/pkgs/games/liquidwar/src-for-default.nix
index 885a4a4499c..d676adfdb14 100644
--- a/pkgs/games/liquidwar/src-for-default.nix
+++ b/pkgs/games/liquidwar/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.0.8beta";
-   name="liquidwar-0.0.8beta";
-   hash="1qcwms44i9x2s38hy64w7xxjkb2j0bh7ril9hldkjy3z208s3wff";
+   version="0.0.9beta";
+   name="liquidwar-0.0.9beta";
+   hash="1a4yqh79y6s3f6dv5kkwjdqzi62y3qbwrx6420fqpvdn1694ycr9";
    url="http://download.savannah.gnu.org/releases/liquidwar6/${version}/liquidwar6-${version}.tar.gz";
-   advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.8beta/liquidwar6-0.0.8beta.tar.gz";
+   advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.9beta/liquidwar6-0.0.9beta.tar.gz";
   
   
 }

From 19b237579926d5c6c3ac609a993f2e98675b8d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 20 Mar 2011 13:23:53 +0000
Subject: [PATCH 032/143] Fix Haskell x11-xft package.

svn path=/nixpkgs/trunk/; revision=26430
---
 pkgs/development/libraries/haskell/X11-xft/default.nix | 5 +++--
 pkgs/top-level/haskell-packages.nix                    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix
index 95327cb5288..3a8a7face7c 100644
--- a/pkgs/development/libraries/haskell/X11-xft/default.nix
+++ b/pkgs/development/libraries/haskell/X11-xft/default.nix
@@ -1,10 +1,11 @@
-{ ghc, cabal, X11, utf8String, pkgconfig, libXft }:
+{ ghc, cabal, X11, utf8String, pkgconfig, libXft, freetype, fontconfig }:
 cabal.mkDerivation (self : {
   pname = "X11-xft";
   version = "0.3";
   sha256 = "48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d";
-  buildInputs = [ ghc pkgconfig libXft ];
+  buildInputs = [ ghc pkgconfig libXft freetype fontconfig ];
   propagatedBuildInputs = [ X11 utf8String ];
+  configureFlags=["--extra-include-dirs=${freetype}/include/freetype2"];
   meta = {
     homepage = http://hackage.haskell.org/package/X11-xft;
     description = "Haskell bindings to the Xft and some Xrender parts";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index af6036ed45f..7c589d9113d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -902,7 +902,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   };
 
   X11Xft = callPackage ../development/libraries/haskell/X11-xft {
-    inherit (pkgs) pkgconfig;
+    inherit (pkgs) pkgconfig freetype fontconfig;
     inherit (pkgs.xlibs) libXft;
   };
 

From 4cbc38255fc7397705cb7b3d56318f5b362bd88e Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Sun, 20 Mar 2011 14:54:39 +0000
Subject: [PATCH 033/143] development/libraries/fribidi: Updated to 0.19.2.

svn path=/nixpkgs/trunk/; revision=26431
---
 pkgs/development/libraries/fribidi/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index c29900582c6..71e5b91a26f 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "fribidi-0.10.9";
+stdenv.mkDerivation rec {
+  name = "fribidi-${version}";
+  version = "0.19.2";
   
   src = fetchurl {
-    url = http://fribidi.org/download/fribidi-0.10.9.tar.gz;
-    sha256 = "1d479wbygqmxcsyg3g7d6nmzlaa3wngy21ci5qcc5nhbyn97bz5q";
+    url = "http://fribidi.org/download/${name}.tar.gz";
+    sha256 = "0xs1yr22zw9a1qq9ygsrqam0vzqdvb0ndzvjb3i2zda8drc93ks9";
   };
 
   meta = {

From 7e62d8736c03f5108bd677eb98bc2fc16afad7dc Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sun, 20 Mar 2011 16:54:49 +0000
Subject: [PATCH 034/143] upgrading flash player on i686.

svn path=/nixpkgs/trunk/; revision=26432
---
 .../browsers/mozilla-plugins/flashplayer-10/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
index c20848eb2da..3dd24af8d59 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@@ -52,9 +52,9 @@ let
         url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz;
         sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc";
       } else {
-        version = "10.1.102.64";
+        version = "10.2.152.7";
         url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
-        sha256 = "1jfk9va3id0m6q6csg6gfycmryvi7kylbb7dswpsh6zh1zv00s62";
+        sha256 = "1xfa0m1h02lvl5an225z4n2l4rv4s35x7a4w3rc413jbggbd0f6k";
       }
     else throw "flashplayer is not supported on this platform";
 

From e54a964632a89371959af21d52abff7aefa50441 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Sun, 20 Mar 2011 18:21:37 +0000
Subject: [PATCH 035/143] development/libraries/sfml: New nixpkg.

svn path=/nixpkgs/trunk/; revision=26433
---
 pkgs/development/libraries/sfml/default.nix | 23 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/sfml/default.nix

diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
new file mode 100644
index 00000000000..a04f5caabe2
--- /dev/null
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchsvn, cmake, mesa, libX11, freetype, libjpeg, openal, libsndfile
+, glew, libXrandr, libXrender
+}:
+stdenv.mkDerivation rec {
+  name = "sfml-svn-${version}";
+  version = "1808";
+  src = fetchsvn {
+    url = "https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2";
+    rev = version;
+  };
+  buildInputs = [ cmake mesa libX11 freetype libjpeg openal libsndfile glew
+                  libXrandr libXrender
+                ];
+  patchPhase = "
+    substituteInPlace CMakeLists.txt --replace '\${CMAKE_ROOT}/Modules' 'share/cmake-2.8/Modules'
+  ";
+  meta = with stdenv.lib; {
+    homepage = http://www.sfml-dev.org/;
+    description = "A multimedia C++ API that provides access to graphics, input, audio, etc.";
+    license = licenses.zlib;
+    maintainers = [ maintainers.astsmtl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad22863b4ff..b8aba541e9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4048,6 +4048,8 @@ let
 
   SDL_ttf = callPackage ../development/libraries/SDL_ttf { };
 
+  sfml_svn = callPackage ../development/libraries/sfml { };
+
   slang = callPackage ../development/libraries/slang { };
 
   slibGuile = callPackage ../development/libraries/slib {

From 880d3c108fa92a8f66afde57e1290ef909a86fb3 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Sun, 20 Mar 2011 18:24:39 +0000
Subject: [PATCH 036/143] games/mars: New nixpkg.

svn path=/nixpkgs/trunk/; revision=26434
---
 pkgs/games/mars/default.nix     | 30 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/games/mars/default.nix

diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix
new file mode 100644
index 00000000000..7b9d423d65a
--- /dev/null
+++ b/pkgs/games/mars/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, cmake, mesa, sfml_svn, fribidi, taglib }:
+stdenv.mkDerivation rec {
+  name = "mars-${version}";
+  version = "0.7.1";
+  src = fetchurl {
+    url = "mirror://sourceforge/mars-game/mars_source_${version}.tar.gz";
+    sha256 = "050li9adkkr2br5b4r5iq4prg4qklxnmf1i34aw6qkpw89qafzha";
+  };
+  buildInputs = [ cmake mesa sfml_svn fribidi taglib ];
+  installPhase = ''
+    cd ..
+    find -name '*.svn' -exec rm -rf {} \;
+    ensureDir "$out/share/mars/"
+    ensureDir "$out/bin/"
+    cp -rv data resources credits.txt license.txt "$out/share/mars/"
+    cp -v mars "$out/bin/mars.bin"
+    cat << EOF > "$out/bin/mars"
+    #! /bin/sh
+    cd "$out/share/mars/"
+    exec "$out/bin/mars.bin" "\$@"
+    EOF
+    chmod +x "$out/bin/mars"
+  '';
+  meta = with stdenv.lib; {
+    homepage = http://mars-game.sourceforge.net/;
+    description = "A game about fighting with ships in a 2D space setting";
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.astsmtl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8aba541e9c..7b8b4f9ead0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7019,6 +7019,8 @@ let
     inherit libpng zlib;
   };
 
+  mars = callPackage ../games/mars { };
+
   micropolis = callPackage ../games/micropolis { };
 
   openttd = callPackage ../games/openttd {

From 9a14edb62f783401754c576c273224479665d0a6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 20 Mar 2011 19:37:06 +0000
Subject: [PATCH 037/143] FF 4.0rc2. Still fails to run

svn path=/nixpkgs/trunk/; revision=26435
---
 .../networking/browsers/firefox/4.0-rc2.nix   | 158 ++++++++++++++++++
 1 file changed, 158 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/firefox/4.0-rc2.nix

diff --git a/pkgs/applications/networking/browsers/firefox/4.0-rc2.nix b/pkgs/applications/networking/browsers/firefox/4.0-rc2.nix
new file mode 100644
index 00000000000..4fb3114577f
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/4.0-rc2.nix
@@ -0,0 +1,158 @@
+{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
+, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
+, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
+, libvpx, yasm, mesa, wirelesstools
+
+, # If you want the resulting program to call itself "Firefox" instead
+  # of "Shiretoko" or whatever, enable this option.  However, those
+  # binaries may not be distributed without permission from the
+  # Mozilla Foundation, see
+  # http://www.mozilla.org/foundation/trademarks/.
+  enableOfficialBranding ? false
+}:
+
+rec {
+
+  firefoxVersion = "4.0rc2";
+  
+  xulVersion = "2.0"; # this attribute is used by other packages
+
+  
+  src = fetchurl {
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    sha256 = "d38d94b66568c549bd4046838e61da783a7d4f53eb040a10fbad3e4811ce9c54";
+  };
+
+  commonConfigureFlags =
+    [ "--enable-optimize"
+      "--disable-debug"
+      "--enable-strip"
+      "--with-system-jpeg"
+      "--with-system-zlib"
+      "--with-system-bz2"
+      "--with-system-nspr"
+      #"--with-system-nss"
+      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
+      "--enable-system-cairo"
+      #"--enable-system-sqlite" # <-- this seems to be discouraged
+      "--disable-crashreporter"
+      "--disable-tests"
+      "--disable-necko-wifi" # maybe we want to enable this at some point
+    ];
+
+
+  xulrunner = stdenv.mkDerivation rec {
+    name = "xulrunner-${xulVersion}";
+    
+    inherit src;
+
+    buildInputs =
+    [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
+        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
+        alsaLib nspr /* nss */ libnotify xlibs.pixman libvpx yasm mesa
+	wirelesstools xlibs.libXScrnSaver xlibs.scrnsaverproto
+	xlibs.libXext xlibs.xextproto
+      ];
+
+    configureFlags =
+      [ "--enable-application=xulrunner"
+        "--disable-javaxpcom"
+      ] ++ commonConfigureFlags;
+
+    # !!! Temporary hack.
+    preBuild = ''
+     export NIX_ENFORCE_PURITY=
+    '';
+
+    # Hack to work around make's idea of -lbz2 dependency
+    preConfigure = ''
+     find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
+       stdenv.lib.concatStringsSep ":" 
+         (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
+     }' ';'
+    '';
+
+    installFlags = "SKIP_GRE_REGISTRATION=1";
+
+    postInstall = ''
+      # Fix some references to /bin paths in the Xulrunner shell script.
+      substituteInPlace $out/bin/xulrunner \
+          --replace /bin/pwd "$(type -tP pwd)" \
+          --replace /bin/ls "$(type -tP ls)"
+
+      # Fix run-mozilla.sh search
+      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
+      echo libDir: $libDir
+      test -n "$libDir"
+      cd $out/bin
+      mv xulrunner ../lib/$libDir/
+
+      for i in $out/lib/$libDir/*; do 
+          file $i;
+          if file $i | grep executable &>/dev/null; then 
+              ln -s $i $out/bin
+          fi;
+      done;
+      rm -f $out/bin/run-mozilla.sh
+    ''; # */
+
+    meta = {
+      description = "Mozilla Firefox XUL runner";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+    };
+
+    passthru = { inherit gtk; version = xulVersion; };
+  };
+
+
+  firefox = stdenv.mkDerivation rec {
+    name = "firefox-${firefoxVersion}";
+
+    inherit src;
+
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
+        dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
+        xlibs.pixman libvpx yasm mesa wirelesstools
+      ];
+
+    propagatedBuildInputs = [xulrunner];
+
+    configureFlags =
+      [ "--enable-application=browser"
+        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
+      ]
+      ++ commonConfigureFlags
+      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
+
+    postInstall = ''
+      libDir=$(cd $out/lib && ls -d firefox-[0-9]*)
+      test -n "$libDir"
+
+      ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner
+
+      # Register extensions etc. !!! is this needed anymore?
+      echo "running firefox -register..."
+      $out/bin/firefox -register
+    ''; # */
+
+    # Hack to work around make's idea of -lbz2 dependency
+    preConfigure = ''
+     find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
+       stdenv.lib.concatStringsSep ":" 
+         (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
+     }' ';'
+    '';
+
+    meta = {
+      description = "Mozilla Firefox - the browser, reloaded";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+    };
+
+    passthru = {
+      inherit gtk xulrunner nspr;
+      isFirefox3Like = true;
+    };
+  };
+}

From 884eadd81c266390c7a1652919de7ecc175542fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 20 Mar 2011 22:16:32 +0000
Subject: [PATCH 038/143] Adding xbindkeys

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b8b4f9ead0..26f5c1bfba0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6820,6 +6820,8 @@ let
 
   xawtv = callPackage ../applications/video/xawtv { };
 
+  xbindkeys = callPackage ../tools/X11/xbindkeys { };
+
   xchat = callPackage ../applications/networking/irc/xchat { };
 
   xchm = callPackage ../applications/misc/xchm { };

From 981c8e94d4c1af2d4cb9d83d4191152a6fba246b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 21 Mar 2011 12:07:42 +0000
Subject: [PATCH 039/143] Bumped Apache Tomcat connectors to 1.2.31

svn path=/nixpkgs/trunk/; revision=26437
---
 .../http/apache-modules/tomcat-connectors/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
index 8ddadf3f05f..96fd594aacb 100644
--- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
+++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, apacheHttpd, jdk}:
 
 stdenv.mkDerivation {
-  name = "tomcat-connectors-1.2.28";
+  name = "tomcat-connectors-1.2.31";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://mirror.hostfuss.com/apache/tomcat/tomcat-connectors/jk/source/jk-1.2.28/tomcat-connectors-1.2.28-src.tar.gz;
-    sha256 = "0vzy864ky5374fwsxm9kcyybwc8asb8r4civnlhl2x90sg7dv3w9";
+    url = http://apache.hippo.nl//tomcat/tomcat-connectors/jk/source/jk-1.2.31/tomcat-connectors-1.2.31-src.tar.gz;
+    sha256 = "0604mcxj7zdzdl2f8krpj8ig1r5qkga3hia28pijdpvy9n6pxij8";
   };
 
   inherit apacheHttpd;

From dd96ccf6c61830f08488493125647d4d7e9281be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 21 Mar 2011 13:17:04 +0000
Subject: [PATCH 040/143] Disabling the xbindkeys reference until I'm able to
 commit its default.nix

svn path=/nixpkgs/trunk/; revision=26444
---
 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 26f5c1bfba0..6181667eb09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6820,7 +6820,8 @@ let
 
   xawtv = callPackage ../applications/video/xawtv { };
 
-  xbindkeys = callPackage ../tools/X11/xbindkeys { };
+  /* Commented until I can commit the default.nix I forgot
+  xbindkeys = callPackage ../tools/X11/xbindkeys { };*/
 
   xchat = callPackage ../applications/networking/irc/xchat { };
 

From daff9c4bbf53a85675c736c4e0b909be20dcd802 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 Mar 2011 14:49:36 +0000
Subject: [PATCH 041/143] * Add gdk_pixbuf and pam to Chrome's library path.

svn path=/nixpkgs/trunk/; revision=26445
---
 .../networking/browsers/chromium/default.nix  | 29 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index b8ec890315d..e5ca3498899 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,24 +1,24 @@
-{ GConf, alsaLib, atk, bzip2, cairo, cups, dbus, dbus_glib, expat,
-  fetchurl, ffmpeg, fontconfig, freetype, glib, gtk, libX11,
-  libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst,
-  libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, pango, patchelf,
-  stdenv, unzip, zlib }:
+{ GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat
+, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11
+, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
+, libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
+, stdenv, unzip, zlib, pam }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
 
 stdenv.mkDerivation rec {
   name = "chrome-${version}";
-  version = "75853";
+  version = "78873";
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://build.chromium.org/f/chromium/continuous/linux64/2011-02-23/${version}/chrome-linux.zip";
-        sha256 = "1bh507j1pm3qrkj8afzhmqicza5nms6f4dc9848xjgcvj9x2qii7";
+        url = "http://build.chromium.org/f/chromium/continuous/linux64/2011-03-21/${version}/chrome-linux.zip";
+        sha256 = "04jmk4hfj305iyc6mi26iy617q4hd8341vfnl830qy02cp8pwf03";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "http://build.chromium.org/f/chromium/continuous/linux/2011-02-23/${version}/chrome-linux.zip";
-        sha256 = "0rq888yvw5zsh0c3jnp115y4sl1q5kn4pz8flnwhrh35ca15lchn";
+        url = "http://build.chromium.org/f/chromium/continuous/linux/2011-03-21/${version}/chrome-linux.zip";
+        sha256 = "0jilfj5kk6zwr02m6982ss7xxnalmny8ml6m5k91h6gnlsrgi808";
       }
     else throw "Chromium is not supported on this platform.";
 
@@ -28,10 +28,13 @@ stdenv.mkDerivation rec {
 
   libPath =
     stdenv.lib.makeLibraryPath
-       [ GConf alsaLib atk bzip2 cairo cups dbus dbus_glib expat
-         ffmpeg fontconfig freetype glib gtk libX11 libXScrnSaver
+       [ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat
+         ffmpeg fontconfig freetype libX11 libXScrnSaver
          libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
-         libpng nspr nss pango stdenv.gcc.gcc zlib stdenv.gcc.libc ];
+         libpng nspr nss stdenv.gcc.gcc zlib stdenv.gcc.libc
+         gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango
+         pam
+       ];
 
   installPhase = ''
     ensureDir $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6181667eb09..de53df95315 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5697,10 +5697,8 @@ let
     };
 
   chrome = callPackage ../applications/networking/browsers/chromium {
-    inherit (gtkLibs) gtk glib pango atk;
     inherit (gnome) GConf;
     patchelf = patchelf06;
-    libjpeg = libjpeg62;
   };
 
   chromeWrapper = wrapFirefox chrome "chrome" "";

From 84ca32b2935ae1bb786f7e014f141fcfe88c5bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 21 Mar 2011 15:42:21 +0000
Subject: [PATCH 042/143] Adding tuxonice for 2.6.35

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 8c2942bfdfc..adb89db34dd 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -1,4 +1,4 @@
-{ fetchurl }:
+{ stdenv, fetchurl }:
 
 let
 
@@ -235,4 +235,20 @@ in
       patch = ./guruplug-mach-type.patch;
     };
 
+  tuxonice_2_6_35 =
+    { name = "tuxonice-2.6.35";
+      patch = stdenv.mkDerivation {
+        name = "tuxonice-3.2-rc2-for-2.6.35.patch";
+        src = fetchurl {
+          url = http://tuxonice.net/files/tuxonice-3.2-rc2-for-2.6.35.patch.bz2;
+          sha256 = "00jbrqq6p1lyvli835wczc0vqsn0z73jpb2aak3ak0vgnvsxw37q";
+        };
+        phases = [ "installPhase" ];
+        installPhase = ''
+          source $stdenv/setup
+          bunzip2 -c $src > $out
+        '';
+      };
+    };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de53df95315..a90f33e2c20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4973,6 +4973,12 @@ let
         kernelPatches.sheevaplug_modules_2_6_35;
   };
 
+  linux_2_6_35_tuxonice = linux_2_6_35.override (attrs: {
+    kernelPatches = attrs.kernelPatches ++ [
+      kernelPatches.tuxonice_2_6_35
+    ];
+  });
+
   linux_nanonote_jz_2_6_34 = makeOverridable
     (import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.34.nix) {
       inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools ubootChooser;
@@ -5148,6 +5154,7 @@ let
   linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33 pkgs.linuxPackages_2_6_33);
   linuxPackages_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_2_6_34 pkgs.linuxPackages_2_6_34);
   linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35);
+  linuxPackages_2_6_35_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_35_tuxonice pkgs.linuxPackages_2_6_35);
   linuxPackages_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_2_6_36 pkgs.linuxPackages_2_6_36);
   linuxPackages_2_6_37 = recurseIntoAttrs (linuxPackagesFor linux_2_6_37 pkgs.linuxPackages_2_6_37);
   linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);

From f6e3d3e10d9872b56a9fae5a79dc2bf312011f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 21 Mar 2011 15:53:22 +0000
Subject: [PATCH 043/143] Adding tuxonice for some recent kernels.

svn path=/nixpkgs/trunk/; revision=26447
---
 pkgs/os-specific/linux/kernel/patches.nix | 55 ++++++++++++++++-------
 pkgs/top-level/all-packages.nix           | 23 +++++++++-
 2 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index adb89db34dd..59e0ac84ede 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -20,6 +20,22 @@ let
       FRAMEBUFFER_CONSOLE y
     '';
 
+  makeTuxonicePatch = { version, kernelVersion, sha256,
+    url ? "http://tuxonice.net/files/tuxonice-${version}-for-${kernelVersion}.patch.bz2" }:
+    { name = "tuxonice-${kernelVersion}";
+      patch = stdenv.mkDerivation {
+        name = "tuxonice-${version}-for-${kernelVersion}.patch";
+        src = fetchurl {
+          inherit url sha256;
+        };
+        phases = [ "installPhase" ];
+        installPhase = ''
+          source $stdenv/setup
+          bunzip2 -c $src > $out
+        '';
+      };
+    };
+
 in
 
 {
@@ -235,20 +251,29 @@ in
       patch = ./guruplug-mach-type.patch;
     };
 
-  tuxonice_2_6_35 =
-    { name = "tuxonice-2.6.35";
-      patch = stdenv.mkDerivation {
-        name = "tuxonice-3.2-rc2-for-2.6.35.patch";
-        src = fetchurl {
-          url = http://tuxonice.net/files/tuxonice-3.2-rc2-for-2.6.35.patch.bz2;
-          sha256 = "00jbrqq6p1lyvli835wczc0vqsn0z73jpb2aak3ak0vgnvsxw37q";
-        };
-        phases = [ "installPhase" ];
-        installPhase = ''
-          source $stdenv/setup
-          bunzip2 -c $src > $out
-        '';
-      };
-    };
+  tuxonice_2_6_34 = makeTuxonicePatch {
+    version = "3.2-rc2";
+    kernelVersion = "2.6.34";
+    sha256 = "0bagqinmky1kmvg3vw8cdysqklxrsfjm7gqrpxviq9jq8vyycviz";
+  };
+
+  tuxonice_2_6_35 = makeTuxonicePatch {
+    version = "3.2-rc2";
+    kernelVersion = "2.6.35";
+    sha256 = "00jbrqq6p1lyvli835wczc0vqsn0z73jpb2aak3ak0vgnvsxw37q";
+  };
+
+  tuxonice_2_6_36 = makeTuxonicePatch {
+    version = "3.2-rc2";
+    kernelVersion = "2.6.36";
+    sha256 = "1vcw3gpjdghnkli46j37pc6rp8mqk8dh688jv8rppzsry0ll7b7k";
+  };
+
+  tuxonice_2_6_37 = makeTuxonicePatch {
+    version = "3.2-rc2";
+    kernelVersion = "2.6.37";
+    url = "http://tuxonice.net/files/current-tuxonice-for-2.6.37.patch_0.bz2";
+    sha256 = "0acllabvbm9pmjnh0zx9mgnp47xbrl9ih6i037c85h0ymnjsxdhk";
+  };
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a90f33e2c20..e5a8769dd92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4963,6 +4963,12 @@ let
       ];
   };
 
+  linux_2_6_34_tuxonice = linux_2_6_34.override (attrs: {
+    kernelPatches = attrs.kernelPatches ++ [
+      kernelPatches.tuxonice_2_6_34
+    ];
+  });
+
   linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5021,6 +5027,12 @@ let
       ];
   };
 
+  linux_2_6_36_tuxonice = linux_2_6_36.override (attrs: {
+    kernelPatches = attrs.kernelPatches ++ [
+      kernelPatches.tuxonice_2_6_36
+    ];
+  });
+
   linux_2_6_37 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.37.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5031,6 +5043,12 @@ let
       ];
   };
 
+  linux_2_6_37_tuxonice = linux_2_6_37.override (attrs: {
+    kernelPatches = attrs.kernelPatches ++ [
+      kernelPatches.tuxonice_2_6_37
+    ];
+  });
+
   linux_2_6_38 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.38.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5153,10 +5171,13 @@ let
     recurseIntoAttrs (linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen);
   linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33 pkgs.linuxPackages_2_6_33);
   linuxPackages_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_2_6_34 pkgs.linuxPackages_2_6_34);
+  linuxPackages_2_6_34_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_34_tuxonice pkgs.linuxPackages_2_6_34_tuxonice);
   linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35);
-  linuxPackages_2_6_35_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_35_tuxonice pkgs.linuxPackages_2_6_35);
+  linuxPackages_2_6_35_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_35_tuxonice pkgs.linuxPackages_2_6_35_tuxonice);
   linuxPackages_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_2_6_36 pkgs.linuxPackages_2_6_36);
+  linuxPackages_2_6_36_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_36_tuxonice pkgs.linuxPackages_2_6_36_tuxonice);
   linuxPackages_2_6_37 = recurseIntoAttrs (linuxPackagesFor linux_2_6_37 pkgs.linuxPackages_2_6_37);
+  linuxPackages_2_6_37_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_37_tuxonice pkgs.linuxPackages_2_6_37_tuxonice);
   linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
   linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
   linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);

From 4fce3aceb0316d35d0685843af8453bb756ec5e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 21 Mar 2011 18:10:20 +0000
Subject: [PATCH 044/143] Adding xbindkeys (now with all the files)

svn path=/nixpkgs/trunk/; revision=26448
---
 pkgs/tools/X11/xbindkeys/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  3 +--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/X11/xbindkeys/default.nix

diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix
new file mode 100644
index 00000000000..dc79bd9e2d1
--- /dev/null
+++ b/pkgs/tools/X11/xbindkeys/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libX11, guile }:
+
+let version = "1.8.5"; in
+stdenv.mkDerivation {
+  name = "xbindkeys-${version}";
+  src = fetchurl {
+    url = "http://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz";
+    sha256 = "10gwyvj69yyqgk1xxbrl37gx3c3jfpgr92mz62b1x5q6jiq7hbyn";
+  };
+
+  buildInputs = [ libX11 guile ];
+
+  meta = {
+    homepage = http://www.nongnu.org/xbindkeys/xbindkeys.html;
+    description = "Launch shell commands with your keyboard or your mouse under X Window";
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5a8769dd92..f6fda91ed12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6846,8 +6846,7 @@ let
 
   xawtv = callPackage ../applications/video/xawtv { };
 
-  /* Commented until I can commit the default.nix I forgot
-  xbindkeys = callPackage ../tools/X11/xbindkeys { };*/
+  xbindkeys = callPackage ../tools/X11/xbindkeys { };
 
   xchat = callPackage ../applications/networking/irc/xchat { };
 

From df786c07dc4c453a65c0b8195c07b06a2952eb05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 22 Mar 2011 11:36:58 +0000
Subject: [PATCH 045/143] Updating gtkwave

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

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 87a18c20e99..72c3f3e2435 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} :
 stdenv.mkDerivation rec {
-  name = "gtkwave-3.3.11";
+  name = "gtkwave-3.3.20";
 
   src = fetchurl {
     url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "1krhxdpzj2ma3xisbk0d9yzhlk1i60hgkkfycc2nsqqirqrvdpbr";
+    sha256 = "0r2yh8a5rrxjzvykdmqlb098wws5c9k255saf2bsdchnigs8il3n";
   };
 
   buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy];

From 7cbb426eae1d804963744177f9d2e95221329e2e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Mar 2011 12:55:55 +0000
Subject: [PATCH 046/143] * dhclient: don't flush IPv6 addresses/routes.

svn path=/nixpkgs/trunk/; revision=26455
---
 pkgs/tools/networking/dhcp/flush-if.patch | 6 +++---
 pkgs/top-level/all-packages.nix           | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/dhcp/flush-if.patch b/pkgs/tools/networking/dhcp/flush-if.patch
index a6d914231ee..ff72248b0ab 100644
--- a/pkgs/tools/networking/dhcp/flush-if.patch
+++ b/pkgs/tools/networking/dhcp/flush-if.patch
@@ -10,9 +10,9 @@ diff --exclude '*~' -rc dhcp-4.1.0p1-orig/client/scripts/linux dhcp-4.1.0p1/clie
 + # Delete the old addresses, routes and ARP information for this
 + # interface.
 + flush_if() {
-+   ${ip} address flush dev $interface
-+   ${ip} route flush dev $interface
-+   ${ip} neighbour flush dev $interface
++   ${ip} -4 address flush dev $interface
++   ${ip} -4 route flush dev $interface
++   ${ip} -4 neighbour flush dev $interface
 + }
 + 
   # Invoke the local dhcp client enter hooks, if they exist.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6fda91ed12..e6b41900117 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1504,6 +1504,7 @@ let
 
   zsync = callPackage ../tools/compression/zsync { };
 
+
   ### SHELLS
 
 

From 34deb53fd76ab43e5bfae0ace581109944aa3c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 22 Mar 2011 13:21:24 +0000
Subject: [PATCH 047/143] Adding the efibootmgr, patch sent by Shea Levy.

svn path=/nixpkgs/trunk/; revision=26456
---
 pkgs/tools/system/efibootmgr/default.nix | 33 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/system/efibootmgr/default.nix

diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
new file mode 100644
index 00000000000..bf4c429808b
--- /dev/null
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, pciutils, perl, zlib}:
+
+let version = "0.5.4"; in
+
+stdenv.mkDerivation {
+  name = "efibootmgr-${version}";
+
+  buildInputs = [ pciutils zlib perl ];
+
+  
+  src = fetchurl {
+    url = "http://linux.dell.com/efibootmgr/permalink/efibootmgr-${version}.tar.gz";
+    sha256 = "0wcfgf8x4p4xfh38m9x3njwsxibm9bhnmvpjj94lj9sk9xxa8qmm";
+  };
+
+  patchPhase = ''
+    substituteInPlace "./tools/install.pl" \
+      --replace "/usr/bin/perl" "${perl}/bin/perl"
+  '';
+
+  preBuild = ''
+    export makeFlags="BINDIR=$out/sbin"
+  '';
+
+  meta = {
+    description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager";
+    homepage = http://linux.dell.com/efibootmgr/;
+    license = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6b41900117..3a89723ed8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -591,6 +591,8 @@ let
 
   ecryptfs = callPackage ../tools/security/ecryptfs { };
 
+  efibootmgr = callPackage ../tools/system/efibootmgr { };
+
   enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { };
 
   encfs = callPackage ../tools/filesystems/encfs { };

From 0b5a51d95b994e1d5fddf73d32b160f2c4660dea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Mar 2011 13:36:35 +0000
Subject: [PATCH 048/143] * Firefox 4.0.  Completely untested. * Removed
 Firefox 3.5.

svn path=/nixpkgs/trunk/; revision=26457
---
 .../networking/browsers/firefox/3.5.nix       | 138 ---------------
 .../networking/browsers/firefox/4.0-rc1.nix   | 158 ------------------
 .../networking/browsers/firefox/4.0-rc2.nix   | 158 ------------------
 .../networking/browsers/firefox/4.0.nix       |   6 +-
 pkgs/top-level/all-packages.nix               |   7 -
 5 files changed, 3 insertions(+), 464 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/firefox/3.5.nix
 delete mode 100644 pkgs/applications/networking/browsers/firefox/4.0-rc1.nix
 delete mode 100644 pkgs/applications/networking/browsers/firefox/4.0-rc2.nix

diff --git a/pkgs/applications/networking/browsers/firefox/3.5.nix b/pkgs/applications/networking/browsers/firefox/3.5.nix
deleted file mode 100644
index a5a35578b13..00000000000
--- a/pkgs/applications/networking/browsers/firefox/3.5.nix
+++ /dev/null
@@ -1,138 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss
-
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Shiretoko" or whatever, enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-}:
-
-rec {
-
-  firefoxVersion = "3.5.10";
-  
-  xulVersion = "1.9.1.10"; # this attribute is used by other packages
-
-  
-  src = fetchurl {
-    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "9e84dee03f003eaf79df12de9d13ac8f6c4cd9b1";
-  };
-
-
-  commonConfigureFlags =
-    [ "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      #"--with-system-nss"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      "--enable-system-cairo"
-      #"--enable-system-sqlite" # <-- this seems to be discouraged
-      "--disable-crashreporter"
-      "--disable-tests"
-    ];
-
-
-  xulrunner = stdenv.mkDerivation {
-    name = "xulrunner-${xulVersion}";
-    
-    inherit src;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
-        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
-        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr /* nss */
-      ];
-
-    configureFlags =
-      [ "--enable-application=xulrunner"
-        "--disable-javaxpcom"
-      ] ++ commonConfigureFlags;
-
-    # !!! Temporary hack.
-    preBuild = ''
-     export NIX_ENFORCE_PURITY=
-    '';
-
-    installFlags = "SKIP_GRE_REGISTRATION=1";
-
-    postInstall = ''
-      # Fix some references to /bin paths in the Xulrunner shell script.
-      substituteInPlace $out/bin/xulrunner \
-          --replace /bin/pwd "$(type -tP pwd)" \
-          --replace /bin/ls "$(type -tP ls)"
-
-      # Fix run-mozilla.sh search
-      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
-      echo libDir: $libDir
-      test -n "$libDir"
-      cd $out/bin
-      mv xulrunner ../lib/$libDir/
-
-      for i in $out/lib/$libDir/*; do 
-          file $i;
-          if file $i | grep executable &>/dev/null; then 
-              ln -s $i $out/bin
-          fi;
-      done;
-      rm -f $out/bin/run-mozilla.sh
-    ''; # */
-
-    meta = {
-      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = { inherit gtk; version = xulVersion; };
-  };
-
-
-  firefox = stdenv.mkDerivation rec {
-    name = "firefox-${firefoxVersion}";
-
-    inherit src;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
-        dbus dbus_glib pango freetype fontconfig alsaLib nspr
-      ];
-
-    propagatedBuildInputs = [xulrunner];
-
-    configureFlags =
-      [ "--enable-application=browser"
-        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
-      ]
-      ++ commonConfigureFlags
-      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-    postInstall = ''
-      libDir=$(cd $out/lib && ls -d firefox-[0-9]*)
-      test -n "$libDir"
-
-      ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner
-
-      # Register extensions etc. !!! is this needed anymore?
-      echo "running firefox -register..."
-      $out/bin/firefox -register
-    ''; # */
-
-    meta = {
-      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = {
-      inherit gtk xulrunner nspr;
-      isFirefox3Like = true;
-    };
-  };
-}
diff --git a/pkgs/applications/networking/browsers/firefox/4.0-rc1.nix b/pkgs/applications/networking/browsers/firefox/4.0-rc1.nix
deleted file mode 100644
index 62d403a50e6..00000000000
--- a/pkgs/applications/networking/browsers/firefox/4.0-rc1.nix
+++ /dev/null
@@ -1,158 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, libvpx, yasm, mesa, wirelesstools
-
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Shiretoko" or whatever, enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-}:
-
-rec {
-
-  firefoxVersion = "4.0rc1";
-  
-  xulVersion = "2.0"; # this attribute is used by other packages
-
-  
-  src = fetchurl {
-    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha256 = "8bae4af5d364c6caa624ad106f532f046f23e6187281cf87d8d4ed5d899f100f";
-  };
-
-  commonConfigureFlags =
-    [ "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      #"--with-system-nss"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      "--enable-system-cairo"
-      #"--enable-system-sqlite" # <-- this seems to be discouraged
-      "--disable-crashreporter"
-      "--disable-tests"
-      "--disable-necko-wifi" # maybe we want to enable this at some point
-    ];
-
-
-  xulrunner = stdenv.mkDerivation rec {
-    name = "xulrunner-${xulVersion}";
-    
-    inherit src;
-
-    buildInputs =
-    [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
-        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
-        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr /* nss */ libnotify xlibs.pixman libvpx yasm mesa
-	wirelesstools xlibs.libXScrnSaver xlibs.scrnsaverproto
-	xlibs.libXext xlibs.xextproto
-      ];
-
-    configureFlags =
-      [ "--enable-application=xulrunner"
-        "--disable-javaxpcom"
-      ] ++ commonConfigureFlags;
-
-    # !!! Temporary hack.
-    preBuild = ''
-     export NIX_ENFORCE_PURITY=
-    '';
-
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure = ''
-     find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-       stdenv.lib.concatStringsSep ":" 
-         (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-     }' ';'
-    '';
-
-    installFlags = "SKIP_GRE_REGISTRATION=1";
-
-    postInstall = ''
-      # Fix some references to /bin paths in the Xulrunner shell script.
-      substituteInPlace $out/bin/xulrunner \
-          --replace /bin/pwd "$(type -tP pwd)" \
-          --replace /bin/ls "$(type -tP ls)"
-
-      # Fix run-mozilla.sh search
-      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
-      echo libDir: $libDir
-      test -n "$libDir"
-      cd $out/bin
-      mv xulrunner ../lib/$libDir/
-
-      for i in $out/lib/$libDir/*; do 
-          file $i;
-          if file $i | grep executable &>/dev/null; then 
-              ln -s $i $out/bin
-          fi;
-      done;
-      rm -f $out/bin/run-mozilla.sh
-    ''; # */
-
-    meta = {
-      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = { inherit gtk; version = xulVersion; };
-  };
-
-
-  firefox = stdenv.mkDerivation rec {
-    name = "firefox-${firefoxVersion}";
-
-    inherit src;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
-        dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
-        xlibs.pixman libvpx yasm mesa wirelesstools
-      ];
-
-    propagatedBuildInputs = [xulrunner];
-
-    configureFlags =
-      [ "--enable-application=browser"
-        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
-      ]
-      ++ commonConfigureFlags
-      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-    postInstall = ''
-      libDir=$(cd $out/lib && ls -d firefox-[0-9]*)
-      test -n "$libDir"
-
-      ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner
-
-      # Register extensions etc. !!! is this needed anymore?
-      echo "running firefox -register..."
-      $out/bin/firefox -register
-    ''; # */
-
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure = ''
-     find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-       stdenv.lib.concatStringsSep ":" 
-         (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-     }' ';'
-    '';
-
-    meta = {
-      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = {
-      inherit gtk xulrunner nspr;
-      isFirefox3Like = true;
-    };
-  };
-}
diff --git a/pkgs/applications/networking/browsers/firefox/4.0-rc2.nix b/pkgs/applications/networking/browsers/firefox/4.0-rc2.nix
deleted file mode 100644
index 4fb3114577f..00000000000
--- a/pkgs/applications/networking/browsers/firefox/4.0-rc2.nix
+++ /dev/null
@@ -1,158 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, libvpx, yasm, mesa, wirelesstools
-
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Shiretoko" or whatever, enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-}:
-
-rec {
-
-  firefoxVersion = "4.0rc2";
-  
-  xulVersion = "2.0"; # this attribute is used by other packages
-
-  
-  src = fetchurl {
-    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha256 = "d38d94b66568c549bd4046838e61da783a7d4f53eb040a10fbad3e4811ce9c54";
-  };
-
-  commonConfigureFlags =
-    [ "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      #"--with-system-nss"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      "--enable-system-cairo"
-      #"--enable-system-sqlite" # <-- this seems to be discouraged
-      "--disable-crashreporter"
-      "--disable-tests"
-      "--disable-necko-wifi" # maybe we want to enable this at some point
-    ];
-
-
-  xulrunner = stdenv.mkDerivation rec {
-    name = "xulrunner-${xulVersion}";
-    
-    inherit src;
-
-    buildInputs =
-    [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
-        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
-        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr /* nss */ libnotify xlibs.pixman libvpx yasm mesa
-	wirelesstools xlibs.libXScrnSaver xlibs.scrnsaverproto
-	xlibs.libXext xlibs.xextproto
-      ];
-
-    configureFlags =
-      [ "--enable-application=xulrunner"
-        "--disable-javaxpcom"
-      ] ++ commonConfigureFlags;
-
-    # !!! Temporary hack.
-    preBuild = ''
-     export NIX_ENFORCE_PURITY=
-    '';
-
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure = ''
-     find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-       stdenv.lib.concatStringsSep ":" 
-         (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-     }' ';'
-    '';
-
-    installFlags = "SKIP_GRE_REGISTRATION=1";
-
-    postInstall = ''
-      # Fix some references to /bin paths in the Xulrunner shell script.
-      substituteInPlace $out/bin/xulrunner \
-          --replace /bin/pwd "$(type -tP pwd)" \
-          --replace /bin/ls "$(type -tP ls)"
-
-      # Fix run-mozilla.sh search
-      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
-      echo libDir: $libDir
-      test -n "$libDir"
-      cd $out/bin
-      mv xulrunner ../lib/$libDir/
-
-      for i in $out/lib/$libDir/*; do 
-          file $i;
-          if file $i | grep executable &>/dev/null; then 
-              ln -s $i $out/bin
-          fi;
-      done;
-      rm -f $out/bin/run-mozilla.sh
-    ''; # */
-
-    meta = {
-      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = { inherit gtk; version = xulVersion; };
-  };
-
-
-  firefox = stdenv.mkDerivation rec {
-    name = "firefox-${firefoxVersion}";
-
-    inherit src;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
-        dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
-        xlibs.pixman libvpx yasm mesa wirelesstools
-      ];
-
-    propagatedBuildInputs = [xulrunner];
-
-    configureFlags =
-      [ "--enable-application=browser"
-        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
-      ]
-      ++ commonConfigureFlags
-      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-    postInstall = ''
-      libDir=$(cd $out/lib && ls -d firefox-[0-9]*)
-      test -n "$libDir"
-
-      ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner
-
-      # Register extensions etc. !!! is this needed anymore?
-      echo "running firefox -register..."
-      $out/bin/firefox -register
-    ''; # */
-
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure = ''
-     find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-       stdenv.lib.concatStringsSep ":" 
-         (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-     }' ';'
-    '';
-
-    meta = {
-      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = {
-      inherit gtk xulrunner nspr;
-      isFirefox3Like = true;
-    };
-  };
-}
diff --git a/pkgs/applications/networking/browsers/firefox/4.0.nix b/pkgs/applications/networking/browsers/firefox/4.0.nix
index 49802f9a0ee..a72330e4c11 100644
--- a/pkgs/applications/networking/browsers/firefox/4.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/4.0.nix
@@ -13,14 +13,14 @@
 
 rec {
 
-  firefoxVersion = "4.0b7";
+  firefoxVersion = "4.0";
   
-  xulVersion = "2.0b7"; # this attribute is used by other packages
+  xulVersion = "2.0"; # this attribute is used by other packages
 
   
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha256 = "02cc466a92af828ff3bc563d4515bd98064cf5f136b5871e072b9408fb4db128";
+    sha1 = "403da9dd65662e5c4dd34299214e04cb6f80575e";
   };
 
   commonConfigureFlags =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a89723ed8a..a77aad3e1da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5991,13 +5991,6 @@ let
   firefox = firefox36Pkgs.firefox;
   firefoxWrapper = firefox36Wrapper;
 
-  firefox35Pkgs = callPackage ../applications/networking/browsers/firefox/3.5.nix {
-    inherit (gtkLibs) gtk pango;
-    inherit (gnome) libIDL;
-  };
-
-  firefox35Wrapper = wrapFirefox firefox35Pkgs.firefox "firefox" "";
-
   firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;

From 769c522df6d0aec873b1f4d31f08d3447c2fc217 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Mar 2011 13:44:25 +0000
Subject: [PATCH 049/143] svn path=/nixpkgs/trunk/; revision=26458

---
 pkgs/top-level/release.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index e60ec56fbb6..0dfbccfb167 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -380,10 +380,6 @@ with (import ./release-lib.nix);
     jdee = linux;
   };
 
-  firefox35Pkgs = {
-    firefox = prio 150 linux;
-  };
-
   firefox36Pkgs = {
     firefox = linux;
   };

From 73a66cc5e167f8632b3423fc77e6cccbd41677dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Mar 2011 14:14:50 +0000
Subject: [PATCH 050/143] * Firefox 4: add --enable-chrome-format=jar to make
 it run.

svn path=/nixpkgs/trunk/; revision=26459
---
 pkgs/applications/networking/browsers/firefox/4.0.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/4.0.nix b/pkgs/applications/networking/browsers/firefox/4.0.nix
index a72330e4c11..5a29eae2a1e 100644
--- a/pkgs/applications/networking/browsers/firefox/4.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/4.0.nix
@@ -60,9 +60,11 @@ rec {
         "--disable-javaxpcom"
       ] ++ commonConfigureFlags;
 
+    enableParallelBuilding = true;
+      
     # !!! Temporary hack.
     preBuild = ''
-     export NIX_ENFORCE_PURITY=
+      export NIX_ENFORCE_PURITY=
     '';
 
     # Hack to work around make's idea of -lbz2 dependency
@@ -111,6 +113,8 @@ rec {
 
     inherit src;
 
+    enableParallelBuilding = true;
+      
     buildInputs =
       [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
         dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
@@ -122,6 +126,7 @@ rec {
     configureFlags =
       [ "--enable-application=browser"
         "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
+        "--enable-chrome-format=jar"
       ]
       ++ commonConfigureFlags
       ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";

From f9ec20d6ecf73ec33cd569633dd5b8c88cee0aa5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Mar 2011 14:30:13 +0000
Subject: [PATCH 051/143] svn path=/nixpkgs/trunk/; revision=26460

---
 pkgs/top-level/all-packages.nix | 4 +++-
 pkgs/top-level/release.nix      | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a77aad3e1da..dc5bf4a8ba5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5996,12 +5996,14 @@ let
     inherit (gnome) libIDL;
   };
 
+  firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
+
   firefox40Pkgs = callPackage ../applications/networking/browsers/firefox/4.0.nix {
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
   };
 
-  firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
+  firefox40Wrapper = lowPrio (wrapFirefox firefox40Pkgs.firefox "firefox" "");
 
   flac = callPackage ../applications/audio/flac { };
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 0dfbccfb167..e8afa9bcb3b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -380,9 +380,8 @@ with (import ./release-lib.nix);
     jdee = linux;
   };
 
-  firefox36Pkgs = {
-    firefox = linux;
-  };
+  firefox36Pkgs.firefox = linux;
+  firefox40Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;

From c733c666dc52fa3e07e32f03f7317cfaa1c060b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Mar 2011 14:57:00 +0000
Subject: [PATCH 052/143] * Remove some unused patches.

svn path=/nixpkgs/trunk/; revision=26461
---
 .../networking/browsers/firefox/4.0.nix       |  4 +++-
 .../browsers/firefox/writable-copies.patch    | 23 -------------------
 .../networking/browsers/firefox/xlibs.patch   | 10 --------
 3 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/firefox/writable-copies.patch
 delete mode 100644 pkgs/applications/networking/browsers/firefox/xlibs.patch

diff --git a/pkgs/applications/networking/browsers/firefox/4.0.nix b/pkgs/applications/networking/browsers/firefox/4.0.nix
index 5a29eae2a1e..96fe1f91cf5 100644
--- a/pkgs/applications/networking/browsers/firefox/4.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/4.0.nix
@@ -11,6 +11,8 @@
   enableOfficialBranding ? false
 }:
 
+assert stdenv.gcc ? libc;
+
 rec {
 
   firefoxVersion = "4.0";
@@ -47,7 +49,7 @@ rec {
     inherit src;
 
     buildInputs =
-    [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
         python dbus dbus_glib pango freetype fontconfig xlibs.libXi
         xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
         alsaLib nspr /* nss */ libnotify xlibs.pixman libvpx yasm mesa
diff --git a/pkgs/applications/networking/browsers/firefox/writable-copies.patch b/pkgs/applications/networking/browsers/firefox/writable-copies.patch
deleted file mode 100644
index e3c7752c031..00000000000
--- a/pkgs/applications/networking/browsers/firefox/writable-copies.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -rc mozilla-orig/xpcom/io/nsLocalFileUnix.cpp mozilla/xpcom/io/nsLocalFileUnix.cpp
-*** mozilla-orig/xpcom/io/nsLocalFileUnix.cpp	2004-04-03 01:48:18.000000000 +0200
---- mozilla/xpcom/io/nsLocalFileUnix.cpp	2004-10-05 19:48:04.000000000 +0200
-***************
-*** 634,639 ****
---- 634,640 ----
-          // get the dirs old permissions
-          if (NS_FAILED(rv = GetPermissions(&oldPerms)))
-              return rv;
-+         oldPerms |= 0200;
-          if (NS_FAILED(rv = newParent->Create(DIRECTORY_TYPE, oldPerms)))
-              return rv;
-      } else {    // dir exists lets try to use leaf
-***************
-*** 758,763 ****
---- 759,765 ----
-          // get the old permissions
-          PRUint32 myPerms;
-          GetPermissions(&myPerms);
-+         myPerms |= 0200;
-  
-          // Create the new file with the old file's permissions, even if write
-          // permission is missing.  We can't create with write permission and
diff --git a/pkgs/applications/networking/browsers/firefox/xlibs.patch b/pkgs/applications/networking/browsers/firefox/xlibs.patch
deleted file mode 100644
index a656fbf9beb..00000000000
--- a/pkgs/applications/networking/browsers/firefox/xlibs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/layout/build/Makefile.in.orig	2007-01-13 14:23:19.000000000 -0200
-+++ mozilla/layout/build/Makefile.in	2007-01-13 14:24:55.000000000 -0200
-@@ -282,5 +282,6 @@ LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=50
- endif
- endif
- 
-+LDFLAGS += -lX11 -lXrender
- 
- export:: $(BUILD_DATE)
- 
\ No newline at end of file

From 3f7ea10694a857aa9a860cc7b1f79255032b89c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Mar 2011 10:24:22 +0000
Subject: [PATCH 053/143] topgit: updated to version 0.8-45-gd279e29

svn path=/nixpkgs/trunk/; revision=26463
---
 .../git-and-tools/default.nix                 | 30 ++---------------
 .../git-and-tools/topgit/default.nix          | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/applications/version-management/git-and-tools/topgit/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 1b4cc3cf70b..711f4aca336 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -59,34 +59,8 @@ rec {
         inherit fetchurl stdenv python git;
   };
 
-  topGit = stdenv.mkDerivation rec {
-    name = "topgit-0.8-32-g8b0f1f9";
-
-    src = fetchurl {
-      url = "http://repo.or.cz/w/topgit.git/snapshot/${name}.zip";
-      sha256 = "0v3binh7wc2di57w6rdnlww30ryszzsklfdmm61sl1ildyl1klk4";
-    };
-
-    buildInputs = [unzip];
-    configurePhase = "export prefix=$out";
-
-    postInstall = ''
-      mkdir -p "$out/share/doc/${name}"
-      cp -v README "$out/share/doc/${name}"
-
-      mkdir -p $out/etc/bash_completion.d
-      make prefix=$out \
-        install
-      mv contrib/tg-completion.bash $out/etc/bash_completion.d
-    '';
-
-    meta = {
-      description = "TopGit aims to make handling of large amount of interdependent topic branches easier";
-      maintainers = [ lib.maintainers.marcweber lib.maintainers.ludo lib.maintainers.simons ];
-      homepage = http://repo.or.cz/w/topgit.git;
-      license = "GPLv2";
-      platforms = stdenv.lib.platforms.unix;
-    };
+  topGit = lib.makeOverridable (import ./topgit) {
+    inherit stdenv fetchurl unzip;
   };
 
   tig = stdenv.mkDerivation {
diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
new file mode 100644
index 00000000000..d9aeffd4297
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, unzip }:
+
+let
+  version = "0.8-45-gd279e29";
+  lib = stdenv.lib;
+in
+stdenv.mkDerivation {
+  name = "topgit-${version}";
+
+  src = fetchurl {
+    url = "http://repo.or.cz/w/topgit.git/snapshot/topgit-${version}.zip";
+    sha256 = "0vzrng1w2k7m4z0x9h6zbrcf33dx08ly8fnbxzz3ms2k2dbsmpl6";
+  };
+
+  buildInputs = [unzip];
+  configurePhase = "export prefix=$out";
+
+  postInstall = ''
+    install -D -m 444 README "$out/share/doc/topgit-${version}/README"
+    ensureDir "$out/etc/bash_completion.d"
+    make prefix="$out" install
+    mv "contrib/tg-completion.bash" "$out/etc/bash_completion.d/"
+  '';
+
+  meta = {
+    description = "TopGit aims to make handling of large amount of interdependent topic branches easier";
+    maintainers = [ lib.maintainers.marcweber lib.maintainers.ludo lib.maintainers.simons ];
+    homepage = http://repo.or.cz/w/topgit.git;
+    license = "GPLv2";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}

From 07d14b99973786b9b6101771f280c63876897011 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Mar 2011 10:24:26 +0000
Subject: [PATCH 054/143] Cosmetic, no functional change intended.

svn path=/nixpkgs/trunk/; revision=26464
---
 pkgs/applications/version-management/git-and-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 711f4aca336..a49205a7046 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -56,7 +56,7 @@ rec {
 
 
   stgit = import ./stgit {
-        inherit fetchurl stdenv python git;
+    inherit fetchurl stdenv python git;
   };
 
   topGit = lib.makeOverridable (import ./topgit) {

From 789f14c0b78c3357a4966b496657570303175e20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Mar 2011 15:57:53 +0000
Subject: [PATCH 055/143] git-annex: added initial version 0.20110320

svn path=/nixpkgs/trunk/; revision=26470
---
 .../git-and-tools/default.nix                 |  5 +++
 .../git-and-tools/git-annex/default.nix       | 45 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-annex/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index a49205a7046..c9917e2edb0 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -42,6 +42,11 @@ rec {
     perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
   };
 
+  gitAnnex = lib.makeOverridable (import ./git-annex) {
+    inherit stdenv fetchurl libuuid rsync findutils curl perl;
+    inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight;
+  };
+
   qgit = import ./qgit {
     inherit fetchurl stdenv;
     inherit (xlibs) libXext libX11;
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
new file mode 100644
index 00000000000..7c1a69f29a2
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String, QuickCheck2
+, pcreLight }:
+
+let
+  version = "0.20110320";
+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 = "1waq9kx8yzyhaf3yib2adz91vqs2csa3lyxm5w7kvyqdq2yymhs4";
+  };
+
+  buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2
+    pcreLight];
+
+  preConfigure = "makeFlagsArray=( PREFIX=$out )";
+
+  meta = {
+    description = "Manage files with git, without checking the file contents into git";
+
+    longDescription = ''
+      Git-annex allows managing files with git, without checking the
+      file contents into git. While that may seem paradoxical, it is
+      useful when dealing with files larger than git can currently
+      easily handle, whether due to limitations in memory, checksumming
+      time, or disk space.
+
+      Even without file content tracking, being able to manage files
+      with git, move files around and delete files with versioned
+      directory trees, and use branches and distributed clones, are all
+      very handy reasons to use git. And annexed files can co-exist in
+      the same git repository with regularly versioned files, which is
+      convenient for maintaining documents, Makefiles, etc that are
+      associated with annexed files but that benefit from full revision
+      control.
+    '';
+
+    license = "GPLv3+";
+    homepage = "http://git-annex.branchable.com/";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}

From 2e24a92971d6d4aebb3e03fcd4f449af9c82382e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Mar 2011 15:57:58 +0000
Subject: [PATCH 056/143] pathtype: added initial version 0.5.2

svn path=/nixpkgs/trunk/; revision=26471
---
 .../libraries/haskell/pathtype/default.nix          | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/pathtype/default.nix

diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix
new file mode 100644
index 00000000000..d073f3d9290
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pathtype/default.nix
@@ -0,0 +1,13 @@
+{cabal, QuickCheck2}:
+
+cabal.mkDerivation (self : {
+  pname = "pathtype";
+  version = "0.5.2";
+  sha256 = "0rbmq6kzz2l07q9a5k888scpn62hnw2hmzz4ysprhfgdnn5b2cvi";
+  propagatedBuildInputs = [QuickCheck2];
+  meta = {
+    license = "BSD";
+    description = "Type-safe file path manipulations";
+    maintainer = [self.stdenv.lib.maintainers.simons];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7c589d9113d..f3121b40bf5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -672,6 +672,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   parsimony = callPackage ../development/libraries/haskell/parsimony {};
 
+  pathtype = callPackage ../development/libraries/haskell/pathtype {};
+
   pcreLight = callPackage ../development/libraries/haskell/pcre-light {
     inherit (pkgs) pcre;
   };

From 3a75769c51ca8fd2ff241eab418d0e15a5fe58a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Mar 2011 15:58:02 +0000
Subject: [PATCH 057/143] cosmetic; no functional change intended

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f3121b40bf5..402afe435d2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -318,7 +318,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cgi_3001_1_7_2 = callPackage ../development/libraries/haskell/cgi/3001.1.7.2.nix {};
   cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix {};
   cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {};
-  cgi = self.cgi_3001_1_7_1; 
+  cgi = self.cgi_3001_1_7_1;
 
   Chart = callPackage ../development/libraries/haskell/Chart {};
 
@@ -447,7 +447,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     inherit (pkgs.xlibs) libSM libICE libXmu libXi;
   };
 
-  GLUT = self.GLUT_2_1_1_2; 
+  GLUT = self.GLUT_2_1_1_2;
 
   gtk = callPackage ../development/libraries/haskell/gtk {
     inherit (pkgs) pkgconfig glibc;

From 9d2f691ee53bad76889bf07f3f3a7830218472c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Mar 2011 16:06:36 +0000
Subject: [PATCH 058/143] * Add Aangifte 2010.

svn path=/nixpkgs/trunk/; revision=26473
---
 .../taxes/aangifte-2010/default.nix           | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/taxes/aangifte-2010/default.nix

diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix
new file mode 100644
index 00000000000..cd8a3b62269
--- /dev/null
+++ b/pkgs/applications/taxes/aangifte-2010/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
+
+stdenv.mkDerivation {
+  name = "aangifte2010-1";
+  
+  src = fetchurl {
+    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2010_linux.tar.gz;
+    sha256 = "15mingjyqjvy4k6ws6qlhaaw8dj7336b54zg7mj70ig7jskjkz5h";
+  };
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  buildInputs = [ makeWrapper ];
+
+  buildPhase =
+    ''
+      for i in bin/*; do
+          patchelf \
+              --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
+              $i
+      done
+    '';
+
+  installPhase =
+    ''
+      ensureDir $out
+      cp -prvd * $out/
+      wrapProgram $out/bin/ib2010ux --prefix PATH : ${xdg_utils}/bin
+    '';
+
+  meta = {
+    description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)";
+    url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc5bf4a8ba5..ff51f02b623 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5607,6 +5607,8 @@ let
 
   aangifte2009 = callPackage_i686 ../applications/taxes/aangifte-2009 { };
 
+  aangifte2010 = callPackage_i686 ../applications/taxes/aangifte-2010 { };
+
   abcde = callPackage ../applications/audio/abcde { };
 
   abiword = callPackage ../applications/office/abiword {

From 6daacf02e0003c476ec9f37daaadb870607820ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Mar 2011 17:50:24 +0000
Subject: [PATCH 059/143] * Firefox 3.6.16.

svn path=/nixpkgs/trunk/; revision=26474
---
 pkgs/applications/networking/browsers/firefox/3.6.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix
index 996703a6686..2d472ce8cc0 100644
--- a/pkgs/applications/networking/browsers/firefox/3.6.nix
+++ b/pkgs/applications/networking/browsers/firefox/3.6.nix
@@ -12,14 +12,14 @@
 
 rec {
 
-  firefoxVersion = "3.6.15";
+  firefoxVersion = "3.6.16";
   
-  xulVersion = "1.9.2.15"; # this attribute is used by other packages
+  xulVersion = "1.9.2.16"; # this attribute is used by other packages
 
   
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "bfb69ae49b2def7482543d4d982fa58993a458e9";
+    sha1 = "38124597440b7d60aa568adeef23659575841e92";
   };
 
 

From fd81655bfb5f37f5f6721d42e6905f4f3f5c0093 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Mar 2011 20:32:12 +0000
Subject: [PATCH 060/143] topgit: avoid use of "install -D", which doesn't work
 on FreeBSD

svn path=/nixpkgs/trunk/; revision=26475
---
 .../version-management/git-and-tools/topgit/default.nix        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
index d9aeffd4297..ef8bb1b4dcf 100644
--- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation {
   configurePhase = "export prefix=$out";
 
   postInstall = ''
-    install -D -m 444 README "$out/share/doc/topgit-${version}/README"
+    ensureDir "$out/share/doc/topgit-${version}"
+    cp README "$out/share/doc/topgit-${version}/"
     ensureDir "$out/etc/bash_completion.d"
     make prefix="$out" install
     mv "contrib/tg-completion.bash" "$out/etc/bash_completion.d/"

From 4e6bc23b708c82c01930e75e71a3d7dacfe5ee4e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Mar 2011 21:05:01 +0000
Subject: [PATCH 061/143] git-annex: patch unpure /usr/bin/perl path in
 mdwn2man script

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

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 7c1a69f29a2..76871a89ba2 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
@@ -15,7 +15,10 @@ stdenv.mkDerivation {
   buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2
     pcreLight];
 
-  preConfigure = "makeFlagsArray=( PREFIX=$out )";
+  preConfigure = ''
+    makeFlagsArray=( PREFIX=$out )
+    sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' mdwn2man
+  '';
 
   meta = {
     description = "Manage files with git, without checking the file contents into git";

From 32fea0d8b12c7bb327077a09fa502beb537151b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Mar 2011 21:05:08 +0000
Subject: [PATCH 062/143] Cosmetic, no functional change intended.

svn path=/nixpkgs/trunk/; revision=26477
---
 .../version-management/git-and-tools/git-annex/default.nix  | 6 ++----
 1 file changed, 2 insertions(+), 4 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 76871a89ba2..a1624c9d566 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
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String, QuickCheck2
-, pcreLight }:
+{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String, QuickCheck2, pcreLight }:
 
 let
   version = "0.20110320";
@@ -12,8 +11,7 @@ stdenv.mkDerivation {
     sha256 = "1waq9kx8yzyhaf3yib2adz91vqs2csa3lyxm5w7kvyqdq2yymhs4";
   };
 
-  buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2
-    pcreLight];
+  buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight];
 
   preConfigure = ''
     makeFlagsArray=( PREFIX=$out )

From 53eb747a5c3332bcd1e5c8e69432967f0160d768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 23 Mar 2011 21:55:43 +0000
Subject: [PATCH 063/143] GNU uCommon C++ 4.2.0.

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

diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index dd8a0c11ed7..4bb927df842 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, pkgconfig, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "ucommon-4.1.7";
+  name = "ucommon-4.2.0";
 
   src = fetchurl {
-    url = mirror://gnu/commoncpp/ucommon-4.1.7.tar.gz;
-    sha256 = "1qbfhi3gfzjs44ilaipv0ynjvilxk06897g0zk974g0fgk98dd7i";
+    url = mirror://gnu/commoncpp/ucommon-4.2.0.tar.gz;
+    sha256 = "0w2695rf9hw407jhl1rxr2ika9syyhvd3il2g9jm1z1yk8zkl1jr";
   };
 
   buildInputs = [ pkgconfig gnutls zlib ];

From 4626c7eca3f8d561e97721960edb51a499aafbd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 23 Mar 2011 21:55:48 +0000
Subject: [PATCH 064/143] GNU SIP Witch 0.10.4.

svn path=/nixpkgs/trunk/; revision=26479
---
 pkgs/servers/sip/sipwitch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index a0ff9b2d3d7..835d6bdd4fb 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sipwitch-0.10.1";
+  name = "sipwitch-0.10.4";
 
   src = fetchurl {
     url = "mirror://gnu/sipwitch/${name}.tar.gz";
-    sha256 = "0s0j74a524la6q2yhwbll0ra1chygw3z4m0ch5awlifdbbhambz0";
+    sha256 = "0nmag4cpnll34fqrp4qg613knv99gmx6p8s0l1imic68i9a260vh";
   };
 
   buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];

From cc91f09d6bccd2c025fe6019ab450f99acb74e50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 23 Mar 2011 21:55:54 +0000
Subject: [PATCH 065/143] GNU Zile 2.3.23.

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

diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 587556cb90a..02971148ccd 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.3.22";
+  name = "zile-2.3.23";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "0zkmym5vpb653c5gmzic8588v4ksidnhh33s4pjvr24n7vgj9biy";
+    sha256 = "01vh7mar2m5p3rmfidl5g2vs86kb3iyljm345cqqh1h6bynqmbc6";
   };
 
   buildInputs = [ ncurses ];

From 0333bc298d4a45d943dabb1cded93aba257dcb47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 23 Mar 2011 21:55:59 +0000
Subject: [PATCH 066/143] GNU Parallel 20110322.

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 150ced67776..f009935a6cd 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20110205";
+  name = "parallel-20110322";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0z1yl7mqs4z1nz5hkjr8agbnj2bpr2f4pq683lr9axa9m0pszzvj";
+    sha256 = "0zcyyc8wlhi6196v4cs1ixz7hmcg10aqs6dycznjmbnwmpd77ybr";
   };
 
   patchPhase =

From acffafe66f0e7687ec9b01c084663edd26e61865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 23 Mar 2011 21:56:05 +0000
Subject: [PATCH 067/143] GStreamer: Actually use the setup hook.

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

diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
index 7edf0325b2a..7a5514a4608 100644
--- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
   # Hm, apparently --disable-gtk-doc is ignored...
   postInstall = "rm -rf $out/share/gtk-doc";
 
+  setupHook = ./setup-hook.sh;
+
   meta = {
     homepage = http://gstreamer.freedesktop.org;
 

From e0fa94d81fbae048f64a73d8e9c8d6093c478119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 23 Mar 2011 21:56:12 +0000
Subject: [PATCH 068/143] Remove obsolete version of `gnupdate'.

svn path=/nixpkgs/trunk/; revision=26483
---
 maintainers/scripts/gnu/gnupdate.scm | 712 ---------------------------
 1 file changed, 712 deletions(-)
 delete mode 100644 maintainers/scripts/gnu/gnupdate.scm

diff --git a/maintainers/scripts/gnu/gnupdate.scm b/maintainers/scripts/gnu/gnupdate.scm
deleted file mode 100644
index 3cf6e7cfaba..00000000000
--- a/maintainers/scripts/gnu/gnupdate.scm
+++ /dev/null
@@ -1,712 +0,0 @@
-;;; GNUpdate -- Update GNU packages in Nixpkgs.     -*- coding: utf-8; -*-
-;;; Copyright (C) 2010  Ludovic Courtès <ludo@gnu.org>
-;;;
-;;; This program is free software: you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation, either version 3 of the License, or
-;;; (at your option) any later version.
-;;;
-;;; This program is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-(cond-expand (guile-2 #t)
-             (else (error "GNU Guile 2.0 is required")))
-
-(use-modules (sxml ssax)
-             (ice-9 popen)
-             (ice-9 match)
-             (ice-9 rdelim)
-             (ice-9 regex)
-             (ice-9 vlist)
-             (srfi srfi-1)
-             (srfi srfi-9)
-             (srfi srfi-11)
-             (srfi srfi-37)
-             (system foreign)
-             (rnrs bytevectors))
-
-
-;;;
-;;; SNix.
-;;;
-
-(define-record-type <location>
-  (make-location file line column)
-  location?
-  (file          location-file)
-  (line          location-line)
-  (column        location-column))
-
-(define (->loc line column path)
-  (and line column path
-       (make-location path (string->number line) (string->number column))))
-
-;; XXX: Hack to add missing exports from `(sxml ssax)' as of 1.9.10.
-(let ((ssax (resolve-module '(sxml ssax))))
-  (for-each (lambda (sym)
-              (module-add! (current-module) sym
-                           (module-variable ssax sym)))
-            '(ssax:warn ssax:skip-pi nl)))
-
-;; Nix object types visible in the XML output of `nix-instantiate' and
-;; mapping to S-expressions (we map to sexps, not records, so that we
-;; can do pattern matching):
-;;
-;;   at               (at varpat attrspat)
-;;   attr             (attribute loc name value)
-;;   attrs            (attribute-set attributes)
-;;   attrspat         (attribute-set-pattern patterns)
-;;   bool             #f|#t
-;;   derivation       (derivation drv-path out-path attributes)
-;;   ellipsis         '...
-;;   expr             (snix loc body ...)
-;;   function         (function loc at|attrspat|varpat)
-;;   int              int
-;;   list             list
-;;   null             'null
-;;   path             string
-;;   string           string
-;;   unevaluated      'unevaluated
-;;   varpat           (varpat name)
-;;
-;; Initially ATTRIBUTES in `derivation' and `attribute-set' was a promise;
-;; however, handling `repeated' nodes makes it impossible to do anything
-;; lazily because the whole SXML tree has to be traversed to maintain the
-;; list of known derivations.
-
-(define (xml-element->snix elem attributes body derivations)
-  ;; Return an SNix element corresponding to XML element ELEM.
-
-  (define (loc)
-    (->loc (assq-ref attributes 'line)
-           (assq-ref attributes 'column)
-           (assq-ref attributes 'path)))
-
-  (case elem
-    ((at)
-     (values `(at ,(car body) ,(cadr body)) derivations))
-    ((attr)
-     (let ((name (assq-ref attributes 'name)))
-       (cond ((null? body)
-              (values `(attribute-pattern ,name) derivations))
-             ((and (pair? body) (null? (cdr body)))
-              (values `(attribute ,(loc) ,name ,(car body))
-                      derivations))
-             (else
-              (error "invalid attribute body" name (loc) body)))))
-    ((attrs)
-     (values `(attribute-set ,(reverse body)) derivations))
-    ((attrspat)
-     (values `(attribute-set-pattern ,body) derivations))
-    ((bool)
-     (values (string-ci=? "true" (assq-ref attributes 'value))
-             derivations))
-    ((derivation)
-     (let ((drv-path (assq-ref attributes 'drvPath))
-           (out-path (assq-ref attributes 'outPath)))
-       (if (equal? body '(repeated))
-           (let ((body (vhash-assoc drv-path derivations)))
-             (if (pair? body)
-                 (values `(derivation ,drv-path ,out-path ,(cdr body))
-                         derivations)
-                 (error "no previous occurrence of derivation"
-                        drv-path)))
-           (values `(derivation ,drv-path ,out-path ,body)
-                   (vhash-cons drv-path body derivations)))))
-    ((ellipsis)
-     (values '... derivations))
-    ((expr)
-     (values `(snix ,(loc) ,@body) derivations))
-    ((function)
-     (values `(function ,(loc) ,body) derivations))
-    ((int)
-     (values (string->number (assq-ref attributes 'value))
-             derivations))
-    ((list)
-     (values body derivations))
-    ((null)
-     (values 'null derivations))
-    ((path)
-     (values (assq-ref attributes 'value) derivations))
-    ((repeated)
-     (values 'repeated derivations))
-    ((string)
-     (values (assq-ref attributes 'value) derivations))
-    ((unevaluated)
-     (values 'unevaluated derivations))
-    ((varpat)
-     (values `(varpat ,(assq-ref attributes 'name)) derivations))
-    (else (error "unhandled Nix XML element" elem))))
-
-(define xml->snix
-  ;; Return the SNix represention of TREE, an SXML tree as returned by
-  ;; parsing the XML output of `nix-instantiate' on Nixpkgs.
-  (let ((parse
-         (ssax:make-parser NEW-LEVEL-SEED
-                           (lambda (elem-gi attributes namespaces expected-content
-                                    seed)
-                             (cons '() (cdr seed)))
-
-                           FINISH-ELEMENT
-                           (lambda (elem-gi attributes namespaces parent-seed
-                                            seed)
-                             (let ((snix        (car seed))
-                                   (derivations (cdr seed)))
-                               (let-values (((snix derivations)
-                                             (xml-element->snix elem-gi
-                                                                attributes
-                                                                snix
-                                                                derivations)))
-                                 (cons (cons snix (car parent-seed))
-                                       derivations))))
-
-                           CHAR-DATA-HANDLER
-                           (lambda (string1 string2 seed)
-                             ;; Discard inter-node strings, which are blanks.
-                             seed))))
-    (lambda (port)
-      ;; Discard the second value returned by the parser (the derivation
-      ;; vhash).
-      (caar (parse port (cons '() vlist-null))))))
-
-(define (call-with-package snix proc)
-  (match snix
-    (('attribute _ (and attribute-name (? string?))
-                 ('derivation _ _ body))
-     ;; Ugly pattern matching.
-     (let ((meta
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "meta" ('attribute-set metas)) metas)
-                     (_ #f)))
-                 body))
-           (package-name
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "name" (and name (? string?)))
-                      name)
-                     (_ #f)))
-                 body))
-           (location
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute loc "name" (? string?))
-                      loc)
-                     (_ #f)))
-                 body))
-           (src
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "src" src)
-                      src)
-                     (_ #f)))
-                 body)))
-       (proc attribute-name package-name location meta src)))))
-
-(define (call-with-src snix proc)
-  ;; Assume SNIX contains the SNix expression for the value of an `src'
-  ;; attribute, as returned by `call-with-package', and call PROC with the
-  ;; relevant SRC information, or #f if SNIX doesn't match.
-  (match snix
-    (('derivation _ _ body)
-     (let ((name
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "name" (and name (? string?)))
-                      name)
-                     (_ #f)))
-                 body))
-           (output-hash
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "outputHash" (and hash (? string?)))
-                      hash)
-                     (_ #f)))
-                 body))
-           (urls
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "urls" (and urls (? pair?)))
-                      urls)
-                     (_ #f)))
-                 body)))
-       (proc name output-hash urls)))
-    (_ (proc #f #f #f))))
-
-(define (src->values snix)
-  (call-with-src snix values))
-
-(define (open-nixpkgs nixpkgs)
-  (let ((script  (string-append nixpkgs
-                                "/maintainers/scripts/eval-release.nix")))
-    (open-pipe* OPEN_READ "nix-instantiate"
-                "--strict" "--eval-only" "--xml"
-                script)))
-
-(define (nix-prefetch-url url)
-  ;; Download URL in the Nix store and return the base32-encoded SHA256 hash
-  ;; of the file at URL
-  (let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url))
-         (hash (read-line pipe)))
-    (close-pipe pipe)
-    (if (eof-object? hash)
-        (values #f #f)
-        (let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path"
-                                 "sha256" hash (basename url)))
-               (path (read-line pipe)))
-          (if (eof-object? path)
-              (values #f #f)
-              (values (string-trim-both hash) (string-trim-both path)))))))
-
-(define (update-nix-expression file
-                               old-version old-hash
-                               new-version new-hash)
-  ;; Modify FILE in-place.  Ugly: we call out to sed(1).
-  (let ((cmd (format #f "sed -i \"~a\" -e 's/~A/~a/g ; s/~A/~A/g'"
-                     file
-                     (regexp-quote old-version) new-version
-                     old-hash
-                     (or new-hash "new hash not available, check the log"))))
-    (format #t "running `~A'...~%" cmd)
-    (system cmd)))
-
-
-;;;
-;;; FTP client.
-;;;
-
-(define-record-type <ftp-connection>
-  (%make-ftp-connection socket addrinfo)
-  ftp-connection?
-  (socket    ftp-connection-socket)
-  (addrinfo  ftp-connection-addrinfo))
-
-(define %ftp-ready-rx
-  (make-regexp "^([0-9]{3}) (.+)$"))
-
-(define (%ftp-listen port)
-  (let loop ((line (read-line port)))
-    (cond ((eof-object? line) (values line #f))
-          ((regexp-exec %ftp-ready-rx line)
-           =>
-           (lambda (match)
-             (values (string->number (match:substring match 1))
-                     (match:substring match 2))))
-          (else
-           (loop (read-line port))))))
-
-(define (%ftp-command command expected-code port)
-  (format port "~A~A~A" command (string #\return) (string #\newline))
-  (let-values (((code message) (%ftp-listen port)))
-    (if (eqv? code expected-code)
-        message
-        (throw 'ftp-error port command code message))))
-
-(define (%ftp-login user pass port)
-  (let ((command (string-append "USER " user (string #\newline))))
-    (display command port)
-    (let-values (((code message) (%ftp-listen port)))
-      (case code
-        ((230)  #t)
-        ((331) (%ftp-command (string-append "PASS " pass) 230 port))
-        (else  (throw 'ftp-error port command code message))))))
-
-(define (ftp-open host)
-  (catch 'getaddrinfo-error
-    (lambda ()
-      (let* ((ai (car (getaddrinfo host "ftp")))
-             (s  (socket (addrinfo:fam ai) (addrinfo:socktype ai)
-                         (addrinfo:protocol ai))))
-        (connect s (addrinfo:addr ai))
-        (setvbuf s _IOLBF)
-        (let-values (((code message) (%ftp-listen s)))
-          (if (eqv? code 220)
-              (begin
-                ;(%ftp-command "OPTS UTF8 ON" 200 s)
-                (%ftp-login "anonymous" "ludo@example.com" s)
-                (%make-ftp-connection s ai))
-              (begin
-                (format (current-error-port) "FTP to `~a' failed: ~A: ~A~%"
-                        host code message)
-                (close s)
-                #f)))))
-    (lambda (key errcode)
-      (format (current-error-port) "failed to resolve `~a': ~a~%"
-              host (gai-strerror errcode))
-      #f)))
-
-(define (ftp-close conn)
-  (close (ftp-connection-socket conn)))
-
-(define (ftp-chdir conn dir)
-  (%ftp-command (string-append "CWD " dir) 250
-                (ftp-connection-socket conn)))
-
-(define (ftp-pasv conn)
-  (define %pasv-rx
-    (make-regexp "([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+)"))
-
-  (let ((message (%ftp-command "PASV" 227 (ftp-connection-socket conn))))
-    (cond ((regexp-exec %pasv-rx message)
-           =>
-           (lambda (match)
-             (+ (* (string->number (match:substring match 5)) 256)
-                (string->number (match:substring match 6)))))
-          (else
-           (throw 'ftp-error conn "PASV" 227 message)))))
-
-
-(define* (ftp-list conn #:optional directory)
-  (define (address-with-port sa port)
-    (let ((fam  (sockaddr:fam sa))
-          (addr (sockaddr:addr sa)))
-      (cond ((= fam AF_INET)
-             (make-socket-address fam addr port))
-            ((= fam AF_INET6)
-             (make-socket-address fam addr port
-                                  (sockaddr:flowinfo sa)
-                                  (sockaddr:scopeid sa)))
-            (else #f))))
-
-  (if directory
-      (ftp-chdir conn directory))
-
-  (let* ((port (ftp-pasv conn))
-         (ai   (ftp-connection-addrinfo conn))
-         (s    (socket (addrinfo:fam ai) (addrinfo:socktype ai)
-                       (addrinfo:protocol ai))))
-    (connect s (address-with-port (addrinfo:addr ai) port))
-    (setvbuf s _IOLBF)
-
-    (dynamic-wind
-      (lambda () #t)
-      (lambda ()
-        (%ftp-command "LIST" 150 (ftp-connection-socket conn))
-
-        (let loop ((line   (read-line s))
-                   (result '()))
-          (cond ((eof-object? line) (reverse result))
-                ((regexp-exec %ftp-ready-rx line)
-                 =>
-                 (lambda (match)
-                   (let ((code (string->number (match:substring match 1))))
-                     (if (= 126 code)
-                         (reverse result)
-                         (throw 'ftp-error conn "LIST" code)))))
-                (else
-                 (loop (read-line s)
-                       (let ((file (car (reverse (string-tokenize line)))))
-                         (cons file result)))))))
-      (lambda ()
-        (close s)
-        (let-values (((code message) (%ftp-listen (ftp-connection-socket conn))))
-          (or (eqv? code 226)
-              (throw 'ftp-error conn "LIST" code message)))))))
-
-
-;;;
-;;; GNU.
-;;;
-
-(define %ignored-package-attributes
-  ;; Attribute name of packages to be ignored.
-  '("bash" "bashReal" "bashInteractive" ;; the full versioned name is incorrect
-    "autoconf213"
-    "automake17x"
-    "automake19x"
-    "automake110x"
-    "automake" ;; = 1.10.x
-    "bison1875"
-    "bison23"
-    "bison" ;; = 2.3
-    "emacs22"
-    "emacsSnapshot"
-    "gcc295"
-    "gcc33"
-    "gcc34"
-    "gcc40"
-    "gcc41"
-    "gcc42"
-    "gcc43"
-    "glibc25"
-    "glibc27"
-    "glibc29"
-    "guile_1_9"
-    ))
-
-(define (gnu? package)
-  ;; Return true if PACKAGE (a snix expression) is a GNU package (according
-  ;; to a simple heuristic.)  Otherwise return #f.
-  (match package
-    (('attribute _ attribute-name ('derivation _ _ body))
-     (any (lambda (attr)
-            (match attr
-              (('attribute _ "meta" ('attribute-set metas))
-               (any (lambda (attr)
-                      (match attr
-                        (('attribute _ "description" value)
-                         (string-prefix? "GNU" value))
-                        (('attribute _ "homepage" value)
-                         (string-contains value "www.gnu.org"))
-                        (_ #f)))
-                    metas))
-              (_ #f)))
-          body))
-    (_ #f)))
-
-(define (gnu-packages packages)
-  (fold (lambda (package gnu)
-          (match package
-            (('attribute _ "emacs23Packages" emacs-packages)
-             ;; XXX: Should prepend `emacs23Packages.' to attribute names.
-             (append (gnu-packages emacs-packages) gnu))
-            (('attribute _ attribute-name ('derivation _ _ body))
-             (if (member attribute-name %ignored-package-attributes)
-                 gnu
-                 (if (gnu? package)
-                     (cons package gnu)
-                     gnu)))
-            (_ gnu)))
-        '()
-        packages))
-
-(define (ftp-server/directory project)
-  (define quirks
-    '(("commoncpp2"   "ftp.gnu.org"   "/gnu/commoncpp" #f)
-      ("libgcrypt"    "ftp.gnupg.org" "/gcrypt" #t)
-      ("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t)
-      ("gnupg"        "ftp.gnupg.org" "/gcrypt" #t)
-      ("gnu-ghostscript" "ftp.gnu.org"  "/ghostscript" #f)
-      ("GNUnet"       "ftp.gnu.org" "/gnu/gnunet" #f)
-      ("mit-scheme"   "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg")
-      ("icecat"       "ftp.gnu.org" "/gnu/gnuzilla" #f)
-      ("TeXmacs"      "ftp.texmacs.org" "/TeXmacs/targz" #f)))
-
-  (let ((quirk (assoc project quirks)))
-    (match quirk
-      ((_ server directory subdir?)
-       (values server (if (not subdir?)
-                          directory
-                          (string-append directory "/" project))))
-      (else
-       (values "ftp.gnu.org" (string-append "/gnu/" project))))))
-
-(define (nixpkgs->gnu-name project)
-  (define quirks
-    '(("gcc-wrapper" . "gcc")
-      ("ghostscript" . "gnu-ghostscript") ;; ../ghostscript/gnu-ghoscript-X.Y.tar.gz
-      ("gnum4"       . "m4")
-      ("gnugrep"     . "grep")
-      ("gnused"      . "sed")
-      ("gnutar"      . "tar")
-      ("gnunet"      . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz
-      ("mitscheme"   . "mit-scheme")
-      ("texmacs"     . "TeXmacs")))
-
-  (or (assoc-ref quirks project) project))
-
-(define (releases project)
-  ;; TODO: Handle project release trees like that of IceCat and MyServer.
-  (define release-rx
-    (make-regexp (string-append "^" project "-[0-9].*\\.tar\\.")))
-
-  (catch #t
-    (lambda ()
-      (let-values (((server directory) (ftp-server/directory project)))
-        (let* ((conn  (ftp-open server))
-               (files (ftp-list conn directory)))
-          (ftp-close conn)
-          (map (lambda (tarball)
-                 (let ((end (string-contains tarball ".tar")))
-                   (substring tarball 0 end)))
-
-               ;; Filter out signatures, deltas, and files which are potentially
-               ;; not releases of PROJECT (e.g., in /gnu/guile, filter out
-               ;; guile-oops and guile-www).
-               (filter (lambda (file)
-                         (and (not (string-suffix? ".sig" file))
-                              (regexp-exec release-rx file)))
-                       files)))))
-    (lambda (key subr message . args)
-      (format (current-error-port)
-              "failed to get release list for `~A': ~A ~A~%"
-              project message args)
-      '())))
-
-(define version-string>?
-  (let ((strverscmp
-         (let ((sym (or (dynamic-func "strverscmp" (dynamic-link))
-                        (error "could not find `strverscmp' (from GNU libc)"))))
-           (make-foreign-function int sym (list '* '*))))
-        (string->null-terminated-utf8
-         (lambda (s)
-           (let* ((utf8 (string->utf8 s))
-                  (len  (bytevector-length utf8))
-                  (nts  (make-bytevector (+ len 1))))
-             (bytevector-copy! utf8 0 nts 0 len)
-             (bytevector-u8-set! nts len 0)
-             nts))))
-    (lambda (a b)
-      (let ((a (bytevector->foreign (string->null-terminated-utf8 a)))
-            (b (bytevector->foreign (string->null-terminated-utf8 b))))
-        (> (strverscmp a b) 0)))))
-
-(define (latest-release project)
-  ;; Return "FOO-X.Y" or #f.
-  (let ((releases (releases project)))
-    (and (not (null? releases))
-         (fold (lambda (release latest)
-                 (if (version-string>? release latest)
-                     release
-                     latest))
-               ""
-               releases))))
-
-(define (package/version name+version)
-  (let ((hyphen (string-rindex name+version #\-)))
-    (if (not hyphen)
-        (values name+version #f)
-        (let ((name    (substring name+version 0 hyphen))
-              (version (substring name+version (+ hyphen 1)
-                                  (string-length name+version))))
-          (values name version)))))
-
-(define (file-extension file)
-  (let ((dot (string-rindex file #\.)))
-    (and dot (substring file (+ 1 dot) (string-length file)))))
-
-(define (packages-to-update gnu-packages)
-  (fold (lambda (pkg result)
-          (call-with-package pkg
-            (lambda (attribute name+version location meta src)
-              (let-values (((name old-version)
-                            (package/version name+version)))
-                (let ((latest (latest-release (nixpkgs->gnu-name name))))
-                  (cond ((not latest)
-                         (format #t "~A [unknown latest version]~%"
-                                 name+version)
-                         result)
-                        ((string=? name+version latest)
-                         (format #t "~A [up to date]~%" name+version)
-                         result)
-                        (else
-                         (let-values (((project new-version)
-                                       (package/version latest))
-                                      ((old-name old-hash old-urls)
-                                       (src->values src)))
-                           (format #t "~A -> ~A [~A]~%" name+version latest
-                                   (and (pair? old-urls) (car old-urls)))
-                           (let* ((url      (and (pair? old-urls)
-                                                 (car old-urls)))
-                                  (new-hash (fetch-gnu project new-version
-                                                       (if url
-                                                           (file-extension url)
-                                                           "gz"))))
-                             (cons (list name attribute
-                                         old-version old-hash
-                                         new-version new-hash
-                                         location)
-                                   result))))))))))
-        '()
-        gnu-packages))
-
-(define (fetch-gnu project version archive-type)
-  (let-values (((server directory)
-                (ftp-server/directory project)))
-    (let* ((base    (string-append project "-" version ".tar." archive-type))
-           (url     (string-append "ftp://" server "/" directory "/" base))
-           (sig     (string-append base ".sig"))
-           (sig-url (string-append url ".sig")))
-      (let-values (((hash path) (nix-prefetch-url url)))
-        (pk 'prefetch-url url hash path)
-        (and hash path
-             (begin
-               (false-if-exception (delete-file sig))
-               (system* "wget" sig-url)
-               (if (file-exists? sig)
-                   (let ((ret (system* "gpg" "--verify" sig path)))
-                     (false-if-exception (delete-file sig))
-                     (if (and ret (= 0 (status:exit-val ret)))
-                         hash
-                         (begin
-                           (format (current-error-port)
-                                   "signature verification failed for `~a'~%"
-                                   base)
-                           (format (current-error-port)
-                                   "(could be because the public key is not in your keyring)~%")
-                           #f)))
-                   (begin
-                     (format (current-error-port)
-                             "no signature for `~a'~%" base)
-                     hash))))))))
-
-
-;;;
-;;; Main program.
-;;;
-
-(define %options
-  ;; Specifications of the command-line options.
-  (list (option '(#\h "help") #f #f
-                (lambda (opt name arg result)
-                  (format #t "Usage: gnupdate [OPTIONS...]~%")
-                  (format #t "GNUpdate -- update Nix expressions of GNU packages in Nixpkgs~%")
-                  (format #t "~%")
-                  (format #t "  -x, --xml=FILE      Read XML output of `nix-instantiate'~%")
-                  (format #t "                      from FILE.~%")
-                  (format #t "  -d, --dry-run       Don't actually update Nix expressions~%")
-                  (format #t "  -h, --help          Give this help list.~%~%")
-                  (format #t "Report bugs to <ludo@gnu.org>~%")
-                  (exit 0)))
-        (option '(#\d "dry-run") #f #f
-                (lambda (opt name arg result)
-                  (alist-cons 'dry-run #t result)))
-
-        (option '(#\x "xml") #t #f
-                (lambda (opt name arg result)
-                  (alist-cons 'xml-file arg result)))))
-
-(define-public (main . args)
-  ;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs.
-  (let* ((opts      (args-fold args %options
-                               (lambda (opt name arg result)
-                                 (error "unrecognized option `~A'" name))
-                               (lambda (operand result)
-                                 (error "extraneous argument `~A'" operand))
-                               '()))
-         (home      (getenv "HOME"))
-         (path      (or (getenv "NIXPKGS")
-                        (string-append home "/src/nixpkgs")))
-         (snix      (begin
-                      (format (current-error-port) "parsing XML...~%")
-                      (xml->snix
-                       (or (and=> (assoc-ref opts 'xml-file) open-input-file)
-                           (open-nixpkgs path)))))
-         (packages  (match snix
-                      (('snix _ ('attribute-set attributes))
-                       attributes)
-                      (else #f)))
-         (gnu       (gnu-packages packages))
-         (updates   (packages-to-update gnu)))
-    (format #t "~%~A packages to update...~%" (length updates))
-    (for-each (lambda (update)
-                (match update
-                  ((name attribute
-                    old-version old-hash
-                    new-version new-hash
-                    location)
-                   (if (assoc-ref opts 'dry-run)
-                       (format #t "`~a' would be updated from ~a to ~a (~a -> ~a)~%"
-                               name old-version new-version
-                               old-hash new-hash)
-                       (update-nix-expression (location-file location)
-                                              old-version old-hash
-                                              new-version new-hash)))
-                  (_ #f)))
-              updates)
-    #t))

From 0b176e1bd02fe8ca96631904d8265ed45b17d3f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 23 Mar 2011 22:05:14 +0000
Subject: [PATCH 069/143] Adding a first attempt of expression for wxwidgets
 2.9. It looks like building and installing. Part of the expression I copied
 from wxGTK 2.8, and some parts of it may be irrelevant or wrong.

svn path=/nixpkgs/trunk/; revision=26484
---
 .../libraries/wxGTK-2.9/default.nix           | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/libraries/wxGTK-2.9/default.nix

diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
new file mode 100644
index 00000000000..8385a52db19
--- /dev/null
+++ b/pkgs/development/libraries/wxGTK-2.9/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
+, mesa, compat24 ? false, compat26 ? true, unicode ? true,
+}:
+
+assert pkgconfig != null && gtk != null;
+assert gtk.libtiff != null;
+assert gtk.libjpeg != null;
+assert gtk.libpng != null;
+assert gtk.libpng.zlib != null;
+
+stdenv.mkDerivation {
+  name = "wxwidgets-2.9.1";
+
+  src = fetchurl {
+    url = mirror://sourceforge/wxwindows/wxWidgets-2.9.1.tar.bz2;
+    sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
+  };
+
+  buildInputs = [
+    pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
+    libXinerama libSM libXxf86vm xf86vidmodeproto mesa
+  ];
+
+  configureFlags = [
+    "--enable-gtk2"
+    (if compat24 then "--enable-compat24" else "--disable-compat24")
+    (if compat26 then "--enable-compat26" else "--disable-compat26")
+    "--disable-precomp-headers"
+    (if unicode then "--enable-unicode" else "")
+    "--with-opengl"
+  ];
+
+  SEARCH_LIB = "${mesa}/lib";
+
+  preConfigure = "
+    substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
+    substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
+    substituteInPlace configure --replace /usr /no-such-path
+  ";
+
+  postInstall = "
+    (cd $out/include && ln -s wx-*/* .)
+  ";
+
+  passthru = {inherit gtk compat24 compat26 unicode;};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff51f02b623..f9a78851171 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4180,6 +4180,10 @@ let
     inherit (gtkLibs) gtk;
   };
 
+  wxGTK29 = callPackage ../development/libraries/wxGTK-2.9 {
+    inherit (gtkLibs) gtk;
+  };
+
   wtk = callPackage ../development/libraries/wtk { };
 
   x264 = callPackage ../development/libraries/x264 { };

From ca084829d615d966e6e28b8d21a324050ab59217 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Mar 2011 11:44:43 +0000
Subject: [PATCH 070/143] =?UTF-8?q?*=20Added=20man-pages-posix=20(contribu?=
 =?UTF-8?q?ted=20by=20Vladim=C3=ADr=20=C4=8Cun=C3=A1t).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixpkgs/trunk/; revision=26485
---
 .../documentation/man-pages-posix/default.nix | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/data/documentation/man-pages-posix/default.nix

diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix
new file mode 100644
index 00000000000..8c126db0792
--- /dev/null
+++ b/pkgs/data/documentation/man-pages-posix/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "man-pages-posix-2003a";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/docs/man-pages/man-pages-posix/man-pages-posix-2003-a.tar.bz2";
+    sha256 = "1sj97lbj27w935f9ia91ih1mwlz4j3qcr3d3nkvcxm6cpfvv2mg3";
+  };
+
+  preBuild =
+    ''
+      makeFlagsArray=(MANDIR=$out/share/man)
+    '';
+
+  meta = {
+    description = "POSIX man-pages (0p, 1p, 3p)";
+    homepage = http://kernel.org/pub/linux/docs/manpages/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9a78851171..c1979c25317 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5559,6 +5559,8 @@ let
 
   mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
 
+  posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
+
   pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { };
 
   shared_mime_info = callPackage ../data/misc/shared-mime-info { };

From b73d1a47ffdd6d7245946f77fa880dca731b0acb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 24 Mar 2011 11:45:37 +0000
Subject: [PATCH 071/143] Grip adjustments: needed ncurses to build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Vladimír Čunát <vcunat@gmail.com>

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

diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index 6b08069054c..02fac4d4214 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
-, curl, cdparanoia, libid3tag }:
+, curl, cdparanoia, libid3tag, ncurses }:
 
 stdenv.mkDerivation {
   name = "grip-3.2.0";
@@ -9,9 +9,9 @@ stdenv.mkDerivation {
     sha256 = "1jh5x35rq15n8ivlp9wbdx8x9mj6agf5rfdv8sd6gai851zsclas";
   };
 
-  buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ];
+  buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ncurses ];
 
-  meta = { 
+  meta = {
     description = "GTK+-based audio CD player/ripper";
     homepage = http://nostatic.org/grip;
     license = "GPLv2";

From 998175f6bd009d2544dab868d099b4b818a3d9b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Mar 2011 11:45:58 +0000
Subject: [PATCH 072/143] =?UTF-8?q?*=20pthread-man-pages=20updated=20to=20?=
 =?UTF-8?q?2.5=20(contributed=20by=20Vladim=C3=ADr=20=C4=8Cun=C3=A1t).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixpkgs/trunk/; revision=26487
---
 pkgs/data/documentation/pthread-man-pages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/pthread-man-pages/default.nix b/pkgs/data/documentation/pthread-man-pages/default.nix
index bd29b0384a1..a19c8bf8e9a 100644
--- a/pkgs/data/documentation/pthread-man-pages/default.nix
+++ b/pkgs/data/documentation/pthread-man-pages/default.nix
@@ -7,14 +7,14 @@
 
 { fetchurl, stdenv, perl }:
 
-let version = "2.3.6";
+let version = "2.5";
 in
   stdenv.mkDerivation rec {
     name = "pthread-man-pages-${version}";
 
     src = fetchurl {
       url = "mirror://gnu/glibc/glibc-linuxthreads-${version}.tar.bz2";
-      sha256 = "0f56msimlyfmragqa69jd39rb47h09l9b0agn67k1rfi8yic8fvc";
+      sha256 = "0b5xg7ba64d1gbqw4k1qk96qgy7h2y4qksr0qx8v7a14c6xaw9zf";
     };
 
     buildInputs = [ perl ];

From 9d49bdee7818b5a4773c64faf2fcef47b4a879e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Mar 2011 11:47:55 +0000
Subject: [PATCH 073/143] =?UTF-8?q?*=20Mercurial=20updated=20to=201.7.5=20?=
 =?UTF-8?q?(contributed=20by=20Vladim=C3=ADr=20=C4=8Cun=C3=A1t).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixpkgs/trunk/; revision=26488
---
 .../version-management/mercurial/default.nix       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index f3d18036d07..cee9770d732 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, python, makeWrapper
+{ stdenv, fetchurl, python, makeWrapper, docutils
 , guiSupport ? false, tk ? null }:
 
 stdenv.mkDerivation rec {
-  name = "mercurial-1.6.4";
-  
+  name = "mercurial-1.7.5";
+
   src = fetchurl {
     url = "http://www.selenic.com/mercurial/release/${name}.tar.gz";
-    sha256 = "04c8vj942ys71dn0bjga33i0qi5hybjjhq087xd0jp29ijzxp3hy";
+    sha256 = "14849n52vladjmzp0s3nc8q31rkjxswg7l2f2v3j7a9h7n4czbfz";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
 
-  buildInputs = [ python makeWrapper ];
-  
+  buildInputs = [ python makeWrapper docutils ];
+
   makeFlags = "PREFIX=$(out)";
-  
+
   postInstall = (stdenv.lib.optionalString guiSupport
     ''
       ensureDir $out/etc/mercurial

From 2b3c9807e0c9a96cf8fe3f75cd3747c7dc7748fd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 24 Mar 2011 11:49:02 +0000
Subject: [PATCH 074/143] man-pages-posix: renamed attribute for consistency
 with other man page sets

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1979c25317..509139e3940 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5559,7 +5559,7 @@ let
 
   mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
 
-  posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
+  posixmanpages = callPackage ../data/documentation/man-pages-posix { };
 
   pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { };
 

From b38331611db34bc1f6843b1a5d6f4319ebbf589f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 24 Mar 2011 12:05:34 +0000
Subject: [PATCH 075/143] Revert "man-pages-posix: renamed attribute for
 consistency with other man page sets".

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 509139e3940..c1979c25317 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5559,7 +5559,7 @@ let
 
   mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
 
-  posixmanpages = callPackage ../data/documentation/man-pages-posix { };
+  posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
 
   pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { };
 

From be0d0b8a1377abe8b1ec553060646dc787777f43 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Mar 2011 14:30:06 +0000
Subject: [PATCH 076/143] * Added ndisc6 (which contains IPv6 related commands
 such as ndisc6,   rdisc6 and rdnssd).

svn path=/nixpkgs/trunk/; revision=26492
---
 pkgs/tools/networking/ndisc6/default.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/tools/networking/ndisc6/default.nix

diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix
new file mode 100644
index 00000000000..d1239a94642
--- /dev/null
+++ b/pkgs/tools/networking/ndisc6/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "ndisc6-1.0.1";
+
+  src = fetchurl {
+    url = "http://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2";
+    sha256 = "1pggc9x3zki1sv08rs8x4fm7pmd3sn1nwkan3szax19xg049xbqx";
+  };
+
+  meta = {
+    homepage = http://www.remlab.net/ndisc6/;
+    description = "A small collection of useful tools for IPv6 networking";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1979c25317..31ea900da7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -960,6 +960,8 @@ let
 
   ncompress = callPackage ../tools/compression/ncompress { };
 
+  ndisc6 = callPackage ../tools/networking/ndisc6 { };
+  
   netcat = callPackage ../tools/networking/netcat { };
 
   netkittftp = callPackage ../tools/networking/netkit/tftp { };

From 608018188208d98d0ea4e2537b85a181ad3f5845 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Mar 2011 15:26:11 +0000
Subject: [PATCH 077/143] * dnssort requires Perl.

svn path=/nixpkgs/trunk/; revision=26494
---
 pkgs/tools/networking/ndisc6/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix
index d1239a94642..5e9ef263463 100644
--- a/pkgs/tools/networking/ndisc6/default.nix
+++ b/pkgs/tools/networking/ndisc6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   name = "ndisc6-1.0.1";
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1pggc9x3zki1sv08rs8x4fm7pmd3sn1nwkan3szax19xg049xbqx";
   };
 
+  buildInputs = [ perl ];
+
   meta = {
     homepage = http://www.remlab.net/ndisc6/;
     description = "A small collection of useful tools for IPv6 networking";

From a3fb3b00cea75561ac224ec13e3bd3093e72c657 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Mar 2011 16:03:43 +0000
Subject: [PATCH 078/143] * ndisc6: use /var for rdnssd.

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

diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix
index 5e9ef263463..1d66d30aaba 100644
--- a/pkgs/tools/networking/ndisc6/default.nix
+++ b/pkgs/tools/networking/ndisc6/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ perl ];
 
+  configureFlags = "--localstatedir=/var";
+
+  installFlags = "localstatedir=$(TMPDIR)";
+
   meta = {
     homepage = http://www.remlab.net/ndisc6/;
     description = "A small collection of useful tools for IPv6 networking";

From 7df7521dd1d138261d0d0e052697edef23949ea9 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Thu, 24 Mar 2011 19:22:30 +0000
Subject: [PATCH 079/143] Add the PAKCS (Portland Aachen Kiel Curry System)
 Curry compiler to Nixpkgs.

svn path=/nixpkgs/trunk/; revision=26497
---
 pkgs/development/compilers/pakcs/default.nix | 81 ++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix          |  4 +
 2 files changed, 85 insertions(+)
 create mode 100644 pkgs/development/compilers/pakcs/default.nix

diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
new file mode 100644
index 00000000000..8d166584451
--- /dev/null
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -0,0 +1,81 @@
+{ stdenv, fetchurl, ghc, swiProlog, syb, mtl, makeWrapper, rlwrap, tk }:
+
+stdenv.mkDerivation rec {
+  pname = "pakcs";
+  version = "1.9.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://www.informatik.uni-kiel.de/~pakcs/download/pakcs_src.tar.gz";
+    sha256 = "1sa6k4s5avn3qvica3a5zvb6q9vnawpp00zviqjwncwwd4a9bcwm";
+  };
+
+  buildInputs = [ ghc swiProlog syb mtl makeWrapper rlwrap tk ];
+
+  prePatch = ''
+    # Remove copying pakcsrc into $HOME.
+    sed -i '/update-pakcsrc/d' Makefile
+
+    # Remove copying pakcsinitrc into $HOME
+    sed -i '68d' configure-pakcs
+  '';
+
+  preConfigure = ''
+    # Path to GHC and SWI Prolog
+    sed -i 's@GHC=@GHC=${ghc}/bin/ghc@' bin/.pakcs_variables
+    sed -i 's@SWIPROLOG=@SWIPROLOG=${swiProlog}/bin/swipl@' bin/.pakcs_variables
+  '';
+
+  postInstall = ''
+    cp pakcsrc $out/
+    cp update-pakcsrc $out/
+    cp -r bin/ $out/
+    cp -r cpns/ $out/
+    cp -r curry2prolog/ $out/
+    cp -r docs/ $out/
+    cp -r examples/ $out/
+    cp -r include/ $out/
+    cp -r lib/ $out/
+    cp -r mccparser/ $out/
+    cp -r tools/ $out/
+    cp -r www/ $out/
+
+    # The Prolog sources must be built in their final directory.
+    (cd $out/curry2prolog/ ; make)
+
+    ensureDir $out/share/emacs/site-lisp/curry-pakcs
+    for e in $out/tools/emacs/*.el ; do
+      ln -s $out/tools/emacs/$e $out/share/emacs/site-lisp/curry-pakcs/;
+    done
+
+    sed -i 's@which@type -P@' $out/bin/.pakcs_wrapper
+
+    # Get the program name from the environment instead of the calling wrapper (for rlwrap).
+    sed -i 's@progname=`basename "$0"`@progname=$PAKCS_PROGNAME@' $out/bin/.pakcs_wrapper
+
+    wrapProgram $out/bin/.pakcs_wrapper \
+      --prefix PATH ":" "${rlwrap}/bin" \
+      --prefix PATH ":" "${tk}/bin" \
+      --run 'export PAKCS_PROGNAME=`basename "$0"`'
+  '';
+
+  meta = {
+    description = "PAKCS is an implementation of the multi-paradigm declarative language Curry.";
+    longDescription = ''
+      PAKCS is an implementation of the multi-paradigm declarative language
+      Curry jointly developed by the Portland State University, the Aachen
+      University of Technology, and the University of Kiel. Although this is
+      not a highly optimized implementation but based on a high-level
+      compilation of Curry programs into Prolog programs, it is not a toy
+      implementation but has been used for a variety of applications (e.g.,
+      graphical programming environments, an object-oriented front-end for
+      Curry, partial evaluators, database applications, HTML programming
+      with dynamic web pages, prototyping embedded systems).
+    '';
+
+    homepage = http://www.informatik.uni-kiel.de/~pakcs/;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.kkallio ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 402afe435d2..b4025e1c18d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -951,6 +951,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   idris = callPackage ../development/compilers/idris {};
 
+  pakcs = callPackage ../development/compilers/pakcs {
+    syb = self.syb02;
+  };
+
   # Development tools.
 
   alex_2_3_1 = callPackage ../development/tools/parsing/alex/2.3.1.nix {};

From 37e69af39ea0e957608fa802f5f913f0290389a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 24 Mar 2011 22:25:03 +0000
Subject: [PATCH 080/143] GNU Gnash 0.8.9.

svn path=/nixpkgs/trunk/; revision=26498
---
 pkgs/applications/video/gnash/default.nix | 29 ++++++++++++++++-------
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index 00369be6c99..81b33849887 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -3,19 +3,21 @@
 , gstFfmpeg, speex
 , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
 , boost, freetype, agg, dbus, curl, pkgconfig, gettext
-, glib, gtk, gtkglext, x11, ming, dejagnu, python
-, lib, makeWrapper }:
+, glib, gtk, gtkglext, x11, ming, dejagnu, python, perl
+, freefont_ttf, haxe, swftools
+, lib, makeWrapper
+, xulrunner }:
 
 assert stdenv ? glibc;
 
-let version = "0.8.8"; in
+let version = "0.8.9"; in
 
 stdenv.mkDerivation rec {
   name = "gnash-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gnash/${version}/${name}.tar.bz2";
-    sha256 = "0872qrgzpy76lxq5b2xigyzaghn53xrpqba2qp3nrk8yz20lpb6w";
+    sha256 = "1ga8khwaympj4fphhpyqx6ddcikv0zmcpnlykcipny1xy33bs3gr";
   };
 
   patchPhase = ''
@@ -32,19 +34,27 @@ stdenv.mkDerivation rec {
     do
       sed -i "$file" -es'|/tmp/|$TMPDIR/|g'
     done
+
+    # Provide a default font.
+    sed -i "configure" \
+        -e 's|/usr/share/fonts/truetype/freefont/|${freefont_ttf}/share/fonts/truetype/|g'
   '';
 
+  enableParallelBuilding = true;
+
   # XXX: KDE is supported as well so we could make it available optionally.
   buildInputs = [
     gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstPluginsGood
     gstFfmpeg speex libtool
     libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
     dbus curl pkgconfig glib gtk gtkglext
+    xulrunner
     makeWrapper
+  ]
 
-    # For the test suite
-    ming dejagnu python
-  ];
+  ++ (stdenv.lib.optionals doCheck [
+        ming dejagnu python perl haxe swftools
+      ]);
 
   preConfigure =
     '' configureFlags="                                         \
@@ -58,12 +68,15 @@ stdenv.mkDerivation rec {
        # Work around this using GCC's $CPATH variable.
        export CPATH="${gstPluginsBase}/include/gstreamer-0.10:${gstPluginsGood}/include/gstreamer-0.10"
        echo "\$CPATH set to \`$CPATH'"
+
+       echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'"
     '';
 
   # Make sure `gtk-gnash' gets `libXext' in its `RPATH'.
   NIX_LDFLAGS="-lX11 -lXext";
 
-  doCheck = true;
+  # XXX: Tests currently fail.
+  doCheck = false;
 
   preInstall = ''ensureDir $out/plugins'';
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31ea900da7a..6bdc6e385dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6085,6 +6085,7 @@ let
   gmu = callPackage ../applications/audio/gmu { };
 
   gnash = callPackage ../applications/video/gnash {
+    xulrunner = icecatXulrunner3;
     inherit (gnome) gtkglext;
     inherit (gst_all) gstreamer gstPluginsBase gstPluginsGood gstFfmpeg;
   };

From 592abae649facdf90bf444c6faa4e006ec6a4cdc Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 25 Mar 2011 08:04:00 +0000
Subject: [PATCH 081/143] add patch for boost to get rid of ' what(): 
 locale::facet::_S_create_c_locale name not valid' errors in some packages

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

diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index c4b9f23bb23..2b516be2cbf 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -59,6 +59,16 @@ stdenv.mkDerivation {
 
   installPhase = ":";
 
+  patches = [
+    # Patch to get rid of following error, experienced by some packages like encfs, bitcoin:
+    #    terminate called after throwing an instance of 'std::runtime_error'
+    #    what():  locale::facet::_S_create_c_locale name not valid
+    (fetchurl { 
+       url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ;
+       sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d"; 
+     })
+  ];
+  
   crossAttrs = rec {
     buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
     # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to

From 8adedb4957543269dff99bba970d35a887610cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Fri, 25 Mar 2011 08:44:38 +0000
Subject: [PATCH 082/143] Re-enable library profiling.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b4025e1c18d..beec7429fb2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -107,7 +107,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   # packages. It isn't the Cabal library, which is a core package of GHC
   # and therefore not separately listed here.
 
-  cabal = callPackage ../development/libraries/haskell/cabal/cabal.nix {};
+  cabal = callPackage ../development/libraries/haskell/cabal/cabal.nix {
+    enableLibraryProfiling = enableLibraryProfiling;
+  };
 
   # Haskell Platform
   #

From 446b09c477aa1412c8344f566ceed6cd05737aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 25 Mar 2011 10:54:17 +0000
Subject: [PATCH 083/143] Give less work to Hydra.

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index e8afa9bcb3b..267b7a95fc7 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -13,7 +13,7 @@ with (import ./release-lib.nix);
 
   tarball = import ./make-tarball.nix;
 
-} // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec {
+} // (mapTestOn (/* (packagesWithMetaPlatform pkgs) // */ rec {
 
   MPlayer = linux;
   abcde = linux;
@@ -380,6 +380,7 @@ with (import ./release-lib.nix);
     jdee = linux;
   };
 
+  /*
   firefox36Pkgs.firefox = linux;
   firefox40Pkgs.firefox = linux;
 
@@ -541,6 +542,7 @@ with (import ./release-lib.nix);
     xfdesktop = linux;
     xfwm4 = linux;
   };
+  */
 
 } ))
 

From dd123060c06b2189f61efb4ea945b0d1d8fdf270 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Mar 2011 12:55:15 +0000
Subject: [PATCH 084/143] Add an expression for Darwin's install_name_tool
 utility, which is required by several other builds.

svn path=/nixpkgs/trunk/; revision=26509
---
 pkgs/os-specific/darwin/install_name_tool/builder.sh  | 3 +++
 pkgs/os-specific/darwin/install_name_tool/default.nix | 8 ++++++++
 pkgs/top-level/all-packages.nix                       | 2 ++
 3 files changed, 13 insertions(+)
 create mode 100755 pkgs/os-specific/darwin/install_name_tool/builder.sh
 create mode 100644 pkgs/os-specific/darwin/install_name_tool/default.nix

diff --git a/pkgs/os-specific/darwin/install_name_tool/builder.sh b/pkgs/os-specific/darwin/install_name_tool/builder.sh
new file mode 100755
index 00000000000..15e84994497
--- /dev/null
+++ b/pkgs/os-specific/darwin/install_name_tool/builder.sh
@@ -0,0 +1,3 @@
+source $stdenv/setup
+mkdir -p "$out/bin"
+ln -s /usr/bin/install_name_tool "$out/bin/"
diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix
new file mode 100644
index 00000000000..d8ffa6d38cf
--- /dev/null
+++ b/pkgs/os-specific/darwin/install_name_tool/default.nix
@@ -0,0 +1,8 @@
+{stdenv}:
+
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation {
+  name = "darwin-install_name_tool-utility";
+  builder = ./builder.sh;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bdc6e385dc..5c4503fa54f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4660,6 +4660,8 @@ let
 
   darwinLipoUtility = callPackage ../os-specific/darwin/lipo { };
 
+  darwinInstallNameToolUtility = callPackage ../os-specific/darwin/install_name_tool { };
+
   devicemapper = lvm2;
 
   dmidecode = callPackage ../os-specific/linux/dmidecode { };

From 0e5593b0f60aa89e2bc85e9fe7ed26177cf703f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Mar 2011 12:55:22 +0000
Subject: [PATCH 085/143] libarchive: don't try to build e2fsprogs, attr, or
 acl unless running on Linux

These packages give errors when built on, say, Darwin.

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

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 9782948ba53..ab862fd56f0 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -9,10 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a";
   };
 
-  propagatedBuildInputs = [acl libxml2 zlib bzip2 e2fsprogs xz attr openssl];
-  
+  propagatedBuildInputs = [libxml2 zlib bzip2 xz openssl] ++
+    (if stdenv.isLinux then [e2fsprogs attr acl] else []);
+
   buildInputs = [sharutils];
-  
+
   meta = {
     description = "A library for reading and writing streaming archives";
     homepage = http://people.freebsd.org/~kientzle/libarchive;

From 5ba10a94e1453a46678733a9f14216ce70caf24b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Mar 2011 12:55:29 +0000
Subject: [PATCH 086/143] cmake: add install_name_tool on Darwin to fix the
 build

svn path=/nixpkgs/trunk/; revision=26511
---
 pkgs/development/tools/build-managers/cmake/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 3e0b485e62e..571ce2feeb5 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,5 +1,6 @@
 {fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
-, useNcurses ? false, ncurses, useQt4 ? false, qt4}:
+, useNcurses ? false, ncurses, useQt4 ? false, qt4
+, darwinInstallNameToolUtility}:
 
 let
   os = stdenv.lib.optionalString;
@@ -19,6 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ curl expat zlib bzip2 libarchive ]
+    ++ optional stdenv.isDarwin darwinInstallNameToolUtility
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 

From 05474e174b58f43958e806e33e538971ed165b72 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Mar 2011 12:55:33 +0000
Subject: [PATCH 087/143] cmake: updated meta.platforms to reflect the fact
 that CMake is supposed to build on all Unix-like platforms

svn path=/nixpkgs/trunk/; revision=26512
---
 pkgs/development/tools/build-managers/cmake/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 571ce2feeb5..bc667749625 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
-    platforms = if useQt4 then qt4.meta.platforms else (with stdenv.lib.platforms; linux ++ freebsd);
+    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }

From b579f4fd5c7355f22fde853e90fa160f89514b2a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Mar 2011 12:55:37 +0000
Subject: [PATCH 088/143] ghc-7.0.2: fix build on Darwin

There were two problems preventing GHC 7.0.2 from being built on MacOS. For
one, the 'configure' script automatically added the flag

  -isysroot /Developer/SDKs/MacOSX10.5.sdk

to the command-line that's being passed to GCC. This setting doesn't work with
our GCC, and resulted in build errors because standard headers like <stdargs.h>
could no longer be found.

Secondly, the build depends on install_name_tool, which has been added as a
buildInput.

These changes trigger a re-build on all platforms, not just on Darwin. I
realize that this could have been avoided by adding some cruft. However, I
didn't want to add cruft, so there you are.

svn path=/nixpkgs/trunk/; revision=26513
---
 pkgs/development/compilers/ghc/7.0.2.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix
index 6dc061cd8c1..8e7a2bc574d 100644
--- a/pkgs/development/compilers/ghc/7.0.2.nix
+++ b/pkgs/development/compilers/ghc/7.0.2.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
+{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
 
 stdenv.mkDerivation rec {
   version = "7.0.2";
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "f0551f1af2f008a8a14a888b70c0557e00dd04f9ae309ac91897306cd04a6668";
   };
 
-  buildInputs = [ghc perl gmp ncurses];
+  buildInputs = [ghc perl gmp ncurses] ++
+    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
@@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '';
 
   configureFlags=[
@@ -39,7 +41,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 
 }

From cec39fe1a880e014d9f4ea383c0320d360b06d48 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Mar 2011 12:55:42 +0000
Subject: [PATCH 089/143] ghc-7.0.2: moved 'homepage' setting into the meta
 section

svn path=/nixpkgs/trunk/; revision=26514
---
 pkgs/development/compilers/ghc/7.0.2.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix
index 8e7a2bc574d..c99c8c813f1 100644
--- a/pkgs/development/compilers/ghc/7.0.2.nix
+++ b/pkgs/development/compilers/ghc/7.0.2.nix
@@ -2,11 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "7.0.2";
-  
   name = "ghc-${version}";
-  
-  # TODO: Does this have to be here, or can it go to meta?
-  homepage = "http://haskell.org/ghc";
 
   src = fetchurl {
     url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
@@ -35,7 +31,7 @@ stdenv.mkDerivation rec {
   stripDebugFlags=["-S" "--keep-file-symbols"];
 
   meta = {
-    inherit homepage;
+    homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     maintainers = [
       stdenv.lib.maintainers.marcweber

From 1dbbeeab2c5439fd3d36301a3c7b5ab65cd4fc6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Mar 2011 12:59:09 +0000
Subject: [PATCH 090/143] magit: updated to version 1.0.0

svn path=/nixpkgs/trunk/; revision=26515
---
 pkgs/applications/editors/emacs-modes/magit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index dcd0b9c5ba4..1b47ba3fc51 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, emacs, texinfo }:
 
 let
-  version = "0.8.2";
+  version = "1.0.0";
 in
 stdenv.mkDerivation {
   name = "magit-${version}";
 
   src = fetchurl {
     url = "http://github.com/downloads/philjackson/magit/magit-${version}.tar.gz";
-    sha256 = "fc02c23e3e8994e9c3e3299d560d0cbfed888dcc66088f06b8cea3bc89cd6ae8";
+    sha256 = "1hfdl90d96zin31v8x4p8zx5f0x0i5i9hccysx6q3prdgw9r6wzq";
   };
 
   buildInputs = [emacs texinfo];

From 9eb80e4f944a8c9d3ef5ab43542565d2cdef96ab Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Fri, 25 Mar 2011 15:27:30 +0000
Subject: [PATCH 091/143] URL to libssh has changed.

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

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 454e7ce9191..37c9b9c5dae 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libssh-0.4.1";
   src = fetchurl {
-    url = http://www.libssh.org/files/libssh-0.4.1.tar.gz;
+    url = http://www.libssh.org/files/0.4/libssh-0.4.1.tar.gz;
     sha256 = "0f12iyzwc2w5m5y1b6jzr08516vpfwwwrqqd4dkb6b0q2a1axlm6";
   };
   buildInputs = [ cmake zlib openssl ];

From ef57b57b929057bae4ab5711cbf799a241018967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 25 Mar 2011 22:15:48 +0000
Subject: [PATCH 092/143] Adding two NES emulators. Because of them, I made
 allegro build the allegrogl library. I also added the HawkNL library.

svn path=/nixpkgs/trunk/; revision=26517
---
 .../development/libraries/allegro/default.nix |  2 +-
 pkgs/development/libraries/hawknl/default.nix | 28 +++++++
 pkgs/misc/emulators/darcnes/default.nix       | 28 +++++++
 pkgs/misc/emulators/darcnes/label.patch       | 13 +++
 pkgs/misc/emulators/fakenes/build.patch       | 84 +++++++++++++++++++
 pkgs/misc/emulators/fakenes/default.nix       | 28 +++++++
 pkgs/top-level/all-packages.nix               |  6 ++
 7 files changed, 188 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/hawknl/default.nix
 create mode 100644 pkgs/misc/emulators/darcnes/default.nix
 create mode 100644 pkgs/misc/emulators/darcnes/label.patch
 create mode 100644 pkgs/misc/emulators/fakenes/build.patch
 create mode 100644 pkgs/misc/emulators/fakenes/default.nix

diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 1669d083f22..e5a976c3418 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -1,7 +1,7 @@
 x@{builderDefsPackage
   , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
   , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
-  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal
+  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
   , ...}:
 builderDefsPackage
 (a :  
diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix
new file mode 100644
index 00000000000..76f4a5a7dae
--- /dev/null
+++ b/pkgs/development/libraries/hawknl/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+	name = "hawknl-1.34";
+	src = fetchurl {
+		url = http://hawksoft.com/download/files/HawkNL168src.zip;
+		sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028";
+	};
+
+  buildInputs = [ unzip ];
+
+  makefile = "makefile.linux";
+
+  patchPhase = ''
+    sed -i s/soname,NL/soname,libNL/ src/makefile.linux
+  '';
+
+  preInstall = ''
+    sed -i s,/usr/local,$out, src/makefile.linux
+    ensureDir $out/lib $out/include
+  '';
+
+  meta = {
+    homepage = http://hawksoft.com/hawknl/;
+    description = "Free, open source, game oriented network API";
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix
new file mode 100644
index 00000000000..6cf7d848b65
--- /dev/null
+++ b/pkgs/misc/emulators/darcnes/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, libX11, libXt, libXext, libXaw }:
+
+assert stdenv.system == "i686-linux";
+
+stdenv.mkDerivation { 
+  name = "darnes-9b0401";
+  src = fetchurl {
+    url = http://www.dridus.com/~nyef/darcnes/download/dn9b0401.tgz;
+    sha256 = "05a7mh51rg7ydb414m3p5mm05p4nz2bgvspqzwm3bhbj7zz543k3";
+  };
+
+  buildInputs = [ libX11 libXt libXext libXaw ];
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp darcnes $out/bin
+  '';
+
+  patches = [ ./label.patch ];
+
+  meta = {
+    homepage = http://www.dridus.com/~nyef/darcnes/;
+    description = "Multi-System emulator, specially for NES";
+    /* Prohibited commercial use, credit required. */
+    license = "free";
+  };
+
+}
diff --git a/pkgs/misc/emulators/darcnes/label.patch b/pkgs/misc/emulators/darcnes/label.patch
new file mode 100644
index 00000000000..612aa1e3911
--- /dev/null
+++ b/pkgs/misc/emulators/darcnes/label.patch
@@ -0,0 +1,13 @@
+http://gentoo-overlays.zugaina.org/funtoo/portage/games-emulation/darcnes/files/darcnes-0401-exec-stack.patch
+
+diff -Naur old/video_x.c new/video_x.c
+--- old/video_x.c	2004-09-04 01:26:41.102187277 +0200
++++ new/video_x.c	2004-09-04 01:27:51.586427427 +0200
+@@ -366,6 +366,7 @@
+ 	}
+ 	
+     default:
++    	break;
+     }
+ }
+ 
diff --git a/pkgs/misc/emulators/fakenes/build.patch b/pkgs/misc/emulators/fakenes/build.patch
new file mode 100644
index 00000000000..90799d977a1
--- /dev/null
+++ b/pkgs/misc/emulators/fakenes/build.patch
@@ -0,0 +1,84 @@
+diff --git a/build/openal.cbd b/build/openal.cbd
+index d18e62d..74af061 100644
+--- a/build/openal.cbd
++++ b/build/openal.cbd
+@@ -23,7 +23,7 @@ CFLAGS += ' -DUSE_OPENAL'
+ # --
+ 
+ do ifplat unix
+-   LDFLAGS += ' `openal-config --libs`'
++   LDFLAGS += ' -lopenal'
+ else
+    LDFLAGS += ' -lOpenAL32'
+ done
+diff --git a/build/alleggl.cbd b/build/alleggl.cbd
+index e2708ff..e826371 100644
+--- a/build/alleggl.cbd
++++ b/build/alleggl.cbd
+@@ -22,7 +22,7 @@ CFLAGS += ' -DUSE_ALLEGROGL'
+ 
+ # --
+ 
+-LIBAGL = agl
++LIBAGL = alleggl
+ 
+ ifopt debug LIBAGL = 'agld'
+
+diff --git a/src/apu.cpp b/src/apu.cpp
+index af59f1c..893a798 100644
+--- a/src/apu.cpp
++++ b/src/apu.cpp
+@@ -1930,7 +1930,7 @@ static void amplify(real& sample)
+          gain -= releaseRate;
+       }
+ 
+-      real output = (1.0 / max(gain, EPSILON));
++      real output = (1.0 / MAX(gain, EPSILON));
+       output = fixf(output, apu_agc_gain_floor, apu_agc_gain_ceiling);
+       sample *= output;
+    }
+diff --git a/src/audio.cpp b/src/audio.cpp
+index b9650dc..c21c05e 100644
+--- a/src/audio.cpp
++++ b/src/audio.cpp
+@@ -7,6 +7,7 @@
+    You must read and accept the license prior to use. */
+ 
+ #include <allegro.h>
++#include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+ #include <vector>
+@@ -234,7 +235,7 @@ void audio_update(void)
+          const unsigned queuedFrames = (audioQueue.size() / audio_channels);
+          if(queuedFrames > 0) {
+             // Determine how many frames we want to make room for.
+-            const unsigned framesToAdd = min(queuedFrames, audio_buffer_size_frames);
++            const unsigned framesToAdd = MIN(queuedFrames, audio_buffer_size_frames);
+             // Make room for the frames in the buffer.
+             const unsigned framesToMove = (audioBufferedFrames - framesToAdd);
+             if(framesToMove > 0) {
+@@ -258,7 +259,7 @@ void audio_update(void)
+          // Determine how many frames are available in the buffer.
+          const unsigned bufferableFrames = (audio_buffer_size_frames - audioBufferedFrames);
+          // Determine the number of frames to copy to the buffer.
+-         const unsigned framesToCopy = min(queuedFrames, bufferableFrames);
++         const unsigned framesToCopy = MIN(queuedFrames, bufferableFrames);
+ 
+          // Copy frames to the buffer.
+          for(unsigned frame = 0; frame < framesToCopy; frame++) {
+diff --git a/src/include/common.h b/src/include/common.h
+index be28795..e2d21d1 100644
+--- a/src/include/common.h
++++ b/src/include/common.h
+@@ -41,8 +41,10 @@ extern "C" {
+ #define true   TRUE
+ #define false  FALSE
+ 
++/*
+ #define min(x,y)   MIN((x),(y))
+ #define max(x,y)   MAX((x),(y))
++*/
+ 
+ #define true_or_false(x)   ((x) ? true : false)
+ 
diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix
new file mode 100644
index 00000000000..62ecb6e4156
--- /dev/null
+++ b/pkgs/misc/emulators/fakenes/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, allegro, openal, mesa, zlib, hawknl, freeglut, libX11,
+  libXxf86vm, libXcursor, libXpm }:
+
+stdenv.mkDerivation { 
+  name = "fakenes-0.5.9b3";
+  src = fetchurl {
+    url = mirror://sourceforge/fakenes/fakenes-0.5.9-beta3.tar.gz;
+    sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4";
+  };
+
+  buildInputs = [ allegro openal mesa zlib hawknl freeglut libX11
+    libXxf86vm libXcursor libXpm ];
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp fakenes $out/bin
+  '';
+
+  NIX_LDFLAGS = "-lX11 -lXxf86vm -lXcursor -lXpm"; 
+
+  patches = [ ./build.patch ];
+
+  meta = {
+    homepage = http://fakenes.sourceforge.net/;
+    license = "GPLv2+";
+    description = "Portable Open Source NES Emulator";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c4503fa54f..0b720ceebab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3278,6 +3278,8 @@ let
   # TODO : Add MIT Kerberos and let admin choose.
   kerberos = heimdal;
 
+  hawknl = callPackage ../development/libraries/hawknl { };
+
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
 
   herqqSvn = callPackage ../development/libraries/herqq/svn.nix { };
@@ -7474,6 +7476,8 @@ let
 
   cupsBjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
 
+  darcnes = callPackage ../misc/emulators/darcnes { };
+
   dblatex = callPackage ../misc/tex/dblatex { };
 
   dosbox = callPackage ../misc/emulators/dosbox { };
@@ -7484,6 +7488,8 @@ let
 
   electricsheep = callPackage ../misc/screensavers/electricsheep { };
 
+  fakenes = callPackage ../misc/emulators/fakenes { };
+
   foldingathome = callPackage ../misc/foldingathome { };
 
   foo2zjs = callPackage ../misc/drivers/foo2zjs {};

From acf13a985987253a301f5ffd31d36a949320d910 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Fri, 25 Mar 2011 22:40:55 +0000
Subject: [PATCH 093/143] Get kdenlive to compile with qt47.

svn path=/nixpkgs/trunk/; revision=26518
---
 pkgs/applications/video/kdenlive/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix
index 38f843c447f..5edae1b3e72 100644
--- a/pkgs/applications/video/kdenlive/default.nix
+++ b/pkgs/applications/video/kdenlive/default.nix
@@ -8,6 +8,11 @@ stdenv.mkDerivation {
     sha256 = "10bwmhh3kzdbq1nzq8s5ln7ydrzg41d1rihj5kdmf5hb91az8mvx";
   };
 
+  prePatch = ''
+    # For Qt47 compatibility.
+    sed -i 's@class QImage@#include <QImage>@' src/colorcorrection/vectorscopegenerator.h
+  '';
+
   buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext
     shared_mime_info soprano ];
 

From f477fe9d3d051452612e90fa2539d1259a0de023 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Fri, 25 Mar 2011 23:14:01 +0000
Subject: [PATCH 094/143] Update libssh version to latest release 0.4.8

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

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 37c9b9c5dae..39423573fdf 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, cmake, zlib, openssl}:
 
 stdenv.mkDerivation {
-  name = "libssh-0.4.1";
+  name = "libssh-0.4.8";
   src = fetchurl {
-    url = http://www.libssh.org/files/0.4/libssh-0.4.1.tar.gz;
-    sha256 = "0f12iyzwc2w5m5y1b6jzr08516vpfwwwrqqd4dkb6b0q2a1axlm6";
+    url = http://www.libssh.org/files/0.4/libssh-0.4.8.tar.gz;
+    sha256 = "05d8i8hwya2gry3lky9pmjpvr9f4wvggszqjjzgxvyy74sj3khhm";
   };
   buildInputs = [ cmake zlib openssl ];
   meta = {

From 4c3c311f759b19485dd63e0a36f6471aa3975bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 25 Mar 2011 23:33:09 +0000
Subject: [PATCH 095/143] Adding the game 'racer'. It works only in i686-linux.

svn path=/nixpkgs/trunk/; revision=26520
---
 pkgs/games/racer/default.nix    | 25 +++++++++++++++++++++++++
 pkgs/games/racer/mkdir.patch    | 13 +++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/games/racer/default.nix
 create mode 100644 pkgs/games/racer/mkdir.patch

diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix
new file mode 100644
index 00000000000..6f70309dee0
--- /dev/null
+++ b/pkgs/games/racer/default.nix
@@ -0,0 +1,25 @@
+{ fetchurl, stdenv, allegro, libjpeg, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "racer-1.1";
+
+  src = fetchurl {
+    url = http://hippo.nipax.cz/src/racer-1.1.tar.gz;
+    sha256 = "0fll1qkqfcjq87k0jzsilcw701z92lfxn2y5ga1n038772lymxl9";
+  };
+
+  buildInputs = [ allegro libjpeg makeWrapper ];
+
+  prePatch = ''
+    sed -i s,/usr/local,$out, Makefile src/HGFX.cpp src/STDH.cpp
+    sed -i s,/usr/share,$out/share, src/HGFX.cpp src/STDH.cpp
+  '';
+
+  patches = [ ./mkdir.patch ];
+
+  meta = {
+    description = "Car racing game";
+    homepage = http://hippo.nipax.cz/download.en.php;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/games/racer/mkdir.patch b/pkgs/games/racer/mkdir.patch
new file mode 100644
index 00000000000..910eaf390f4
--- /dev/null
+++ b/pkgs/games/racer/mkdir.patch
@@ -0,0 +1,13 @@
+diff --git a/src/STDH.cpp b/src/STDH.cpp
+index 5f78473..47c3f8b 100644
+--- a/src/STDH.cpp
++++ b/src/STDH.cpp
+@@ -5,6 +5,8 @@
+ #include "player.h"
+ #include "drivers.h"
+ #include "cup.h"
++#include <sys/stat.h>
++#include <sys/types.h>
+ 
+ HScreen hscreen;
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b720ceebab..3d6ad6847ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7083,6 +7083,8 @@ let
 
   quake3game = callPackage ../games/quake3/game { };
 
+  racer = callPackage ../games/racer { };
+
   rogue = callPackage ../games/rogue { };
 
   sauerbraten = callPackage ../games/sauerbraten {};

From af5952eb0b75956b92dfd21df1660a1a84c4c81a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 25 Mar 2011 23:37:44 +0000
Subject: [PATCH 096/143] racer had a different source for 64-bit. Now it works
 in x86_64-linux too.

svn path=/nixpkgs/trunk/; revision=26521
---
 pkgs/games/racer/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix
index 6f70309dee0..8969b613ceb 100644
--- a/pkgs/games/racer/default.nix
+++ b/pkgs/games/racer/default.nix
@@ -3,10 +3,15 @@
 stdenv.mkDerivation rec {
   name = "racer-1.1";
 
-  src = fetchurl {
+  src = if stdenv.system == "i686-linux" then fetchurl {
     url = http://hippo.nipax.cz/src/racer-1.1.tar.gz;
     sha256 = "0fll1qkqfcjq87k0jzsilcw701z92lfxn2y5ga1n038772lymxl9";
-  };
+  } else if stdenv.system == "x86_64-linux" then fetchurl {
+    url = http://hippo.nipax.cz/src/racer-1.1.64.tar.gz;
+    sha256 = "0rjy3gmlhwfkb9zs58j0mc0dar0livwpbc19r6zw5r2k6r7xdan0";
+  } else
+    throw "System not supported";
+
 
   buildInputs = [ allegro libjpeg makeWrapper ];
 

From 20912b654bd125c0c33ba78f04d4001e3d1a059d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 26 Mar 2011 00:14:28 +0000
Subject: [PATCH 097/143] * runLaTeX: detect the existence of a pre-generated
 .bbl file and use   it.  Useful if you're supposed to stick a \balancecolumns
 in the   middle of the file.

svn path=/nixpkgs/trunk/; revision=26522
---
 pkgs/misc/tex/nix/default.nix      |  2 +-
 pkgs/misc/tex/nix/find-includes.pl |  1 +
 pkgs/misc/tex/nix/run-latex.sh     | 12 ++++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/tex/nix/default.nix b/pkgs/misc/tex/nix/default.nix
index ec09318979f..f5a34fb67a2 100644
--- a/pkgs/misc/tex/nix/default.nix
+++ b/pkgs/misc/tex/nix/default.nix
@@ -53,7 +53,7 @@ rec {
           # The type denotes the kind of dependency, which determines
           # what extensions we use to look for it.
           deps = import (pkgs.runCommand "latex-includes"
-            { src = key; }
+            { rootFile = baseNameOf (toString rootFile); src = key; }
             "${pkgs.perl}/bin/perl ${./find-includes.pl}");
 
           # Look for the dependencies of `key', trying various
diff --git a/pkgs/misc/tex/nix/find-includes.pl b/pkgs/misc/tex/nix/find-includes.pl
index 6441f18855b..41675e939f6 100644
--- a/pkgs/misc/tex/nix/find-includes.pl
+++ b/pkgs/misc/tex/nix/find-includes.pl
@@ -45,6 +45,7 @@ while (<FILE>) {
             $bib =~ s/^\s+//; # remove leading / trailing whitespace
             $bib =~ s/\s+$//;
             addName "misc", "$bib.bib";
+            addName "misc", (basename($ENV{"rootFile"}, ".tex", ".ltx") . ".bbl");
         }
     } elsif (/\\includegraphics(\[.*\])?\{(.*)\}/) {
         my $fn2 = $2;
diff --git a/pkgs/misc/tex/nix/run-latex.sh b/pkgs/misc/tex/nix/run-latex.sh
index 58c7cac302f..6c18721eed6 100644
--- a/pkgs/misc/tex/nix/run-latex.sh
+++ b/pkgs/misc/tex/nix/run-latex.sh
@@ -68,11 +68,15 @@ for auxFile in $(find . -name "*.aux"); do
     # Run bibtex to process all bibliographies.  There may be several
     # when we're using the multibib package.
     if grep -q '\\citation' $auxFile; then
-        echo "RUNNING BIBTEX ON $auxFile..."
         auxBase=$(basename $auxFile .aux)
-        bibtex --terse $auxBase
-        cp $auxBase.bbl $out
-        runNeeded=1
+        if [ -e $auxBase.bbl ]; then
+            echo "SKIPPING BIBTEX ON $auxFile!"
+        else
+            echo "RUNNING BIBTEX ON $auxFile..."
+            bibtex --terse $auxBase
+            cp $auxBase.bbl $out
+            runNeeded=1
+        fi
         echo
     fi
 

From 1e789495392bde3b0f64646c934cdc3df6ff2fa5 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sat, 26 Mar 2011 07:22:24 +0000
Subject: [PATCH 098/143] Add expression for the simutrans game.

svn path=/nixpkgs/trunk/; revision=26523
---
 pkgs/games/simutrans/default.nix | 78 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 +
 2 files changed, 80 insertions(+)
 create mode 100644 pkgs/games/simutrans/default.nix

diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
new file mode 100644
index 00000000000..511aa850ff9
--- /dev/null
+++ b/pkgs/games/simutrans/default.nix
@@ -0,0 +1,78 @@
+{ stdenv, fetchurl, unzip, zlib, libpng, bzip2, SDL, SDL_mixer } :
+
+let
+  # This is the default "pakset" of objects, images, text, music, etc.
+  pak64 = fetchurl {
+    url = http://sourceforge.net/projects/simutrans/files/pak64/110-0-1/simupak64-110-0-1.zip/download;
+    name = "pak64.zip";
+    sha256 = "0gs6k9dbbhh60g2smsx2jza65vyss616bpngwpvilrvb5rzzrxcq";
+  };
+
+  # The source distribution seems to be missing some text files.
+  # So we will get them from the binary Linux release (which apparently has them).
+  langtab = fetchurl {
+    url = http://sourceforge.net/projects/simutrans/files/simutrans/110-0-1/simulinux-110-0-1.zip/download;
+    name = "simulinux-110-0-1.zip";
+    sha256 = "15z13kazdzhfzwxry7a766xkkdzaidvscylzrjkx3nnbcq6461s4";
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "simutrans";
+  version = "110.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://github.com/aburch/simutrans/tarball/v110.0.1";
+    name = "${name}.tar.gz";
+    sha256 = "ab0e42e5013d6d2fd5d3176b39dc45e482583b3bad178aac1188bf2ec88feb51";
+  };
+
+  buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ];
+
+  prePatch = ''
+    # Use ~/.simutrans instead of ~/simutrans
+    sed -i 's@%s/simutrans@%s/.simutrans@' simsys_s.cc
+  '';
+
+  preConfigure = ''
+    # Configuration as per the readme.txt
+    sed -i 's@#BACKEND = sdl@BACKEND = sdl@' config.template
+    sed -i 's@#COLOUR_DEPTH = 16@COLOUR_DEPTH = 16@' config.template
+    sed -i 's@#OSTYPE = linux@OSTYPE = linux@' config.template
+    sed -i 's@#OPTIMISE = 1@OPTIMISE = 1@' config.template
+
+    cp config.template config.default
+  '';
+
+  installPhase = ''
+    # Erase the source distribution object definitions, will be replaced with langtab.
+    rm -r simutrans
+
+    # Default pakset and binary release core objects.
+    unzip ${pak64}
+    unzip ${langtab}
+
+    mv sim simutrans/
+
+    ensureDir $out/simutrans
+    cp -r simutrans $out
+
+    ensureDir $out/bin
+    ln -s $out/simutrans/sim $out/bin/simutrans
+  '';
+
+  meta = {
+    description = "Simutrans is a simulation game in which the player strives to run a successful transport system.";
+    longDescription = ''
+      Simutrans is a cross-platform simulation game in which the
+      player strives to run a successful transport system by
+      transporting goods, passengers, and mail between
+      places. Simutrans is an open source remake of Transport Tycoon.
+    '';
+
+    homepage = http://www.simutrans.com/;
+    license = "Artistic";
+    maintainers = [ stdenv.lib.maintainers.kkallio ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d6ad6847ed..400fceb698c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7101,6 +7101,8 @@ let
     inherit (xlibs) libX11;
   };
 
+  simutrans = callPackage ../games/simutrans { };
+
   six = callPackage ../games/six {
     inherit (kde3) arts kdelibs;
   };

From fe5b564e6bce6cdd767b6f1181f04dc57b1a2fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 26 Mar 2011 11:50:01 +0000
Subject: [PATCH 099/143] Magit: Install to $out.

svn path=/nixpkgs/trunk/; revision=26524
---
 pkgs/applications/editors/emacs-modes/magit/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index 1b47ba3fc51..3dc417bf772 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -13,8 +13,13 @@ stdenv.mkDerivation {
 
   buildInputs = [emacs texinfo];
 
+  configurePhase =
+    '' sed -i Makefile \
+           -e "s|^PREFIX=.*$|PREFIX=$out|g ; s|/etc/emacs/|$out/etc/emacs/|"
+    '';
+
   meta = {
-    description = "An an interface to Git, implemented as an extension to Emacs.";
+    description = "Magit, an Emacs interface to Git";
 
     longDescription = ''
       With Magit, you can inspect and modify your Git repositories with
@@ -31,6 +36,6 @@ stdenv.mkDerivation {
     license = "GPLv3+";
     homepage = "http://github.com/philjackson/magit";
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ simons ludo ];
   };
 }

From 4e512751ae8f5ff85a57cf387d50b27c02b7abe5 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 26 Mar 2011 18:14:28 +0000
Subject: [PATCH 100/143] knetworkmanager: fix license

svn path=/nixpkgs/trunk/; revision=26525
---
 pkgs/tools/networking/knetworkmanager/live.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/knetworkmanager/live.nix b/pkgs/tools/networking/knetworkmanager/live.nix
index 80c7e9335b6..5c812e19639 100644
--- a/pkgs/tools/networking/knetworkmanager/live.nix
+++ b/pkgs/tools/networking/knetworkmanager/live.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://kde.org;
     description = "KDE systray and plasma applet for network management.";
-    license = licenses.gplv2;
+    license = licenses.gpl2;
     maintainers = with maintainers; [  phreedom ];
   };
 }

From 27c14e39b7da07cb8fe36dc4cded022319a17430 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 26 Mar 2011 18:18:32 +0000
Subject: [PATCH 101/143] nm-applet: packaged

svn path=/nixpkgs/trunk/; revision=26526
---
 .../network-manager-applet/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/networking/network-manager-applet/default.nix

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
new file mode 100644
index 00000000000..515e3067365
--- /dev/null
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade
+, networkmanager, GConf, libnotify, gnome_keyring, dbus_glib
+, polkit}:
+stdenv.mkDerivation rec {
+
+  name = "network-manager-applet-${version}";
+  version = "0.8.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/network-manager-applet/0.8/network-manager-applet-${version}.tar.bz2";
+    sha256 = "0rn3mr0v8i3bkfhpvx6bbyhv1i6j6s120pkayq2318bg5ivbk12a";
+  };
+
+  buildInputs = [ intltool pkgconfig gtk glib libglade networkmanager GConf libnotify
+                  gnome_keyring dbus_glib polkit];
+
+  meta = with stdenv.lib; {
+    homepage = http://projects.gnome.org/NetworkManager/;
+    description = "NetworkManager control appler for GNOME.";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 400fceb698c..11d7df1b94d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -972,6 +972,8 @@ let
 
   networkmanager = callPackage ../tools/networking/network-manager { };
 
+  networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { };
+
   nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {};
 
   nmap = callPackage ../tools/security/nmap {

From 804bb9c8d1592084a5e97480e11a8d98a755108d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 26 Mar 2011 18:18:39 +0000
Subject: [PATCH 102/143] polkit-gnome: packaged

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

diff --git a/pkgs/tools/misc/polkit-gnome/default.nix b/pkgs/tools/misc/polkit-gnome/default.nix
new file mode 100644
index 00000000000..9adab0fb0c2
--- /dev/null
+++ b/pkgs/tools/misc/polkit-gnome/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, gtk, polkit, dbus_glib, intltool }:
+stdenv.mkDerivation rec {
+
+  name = "polkit-gnome-${version}";
+  version = "0.96";
+
+  src = fetchurl {
+    url = http://hal.freedesktop.org/releases/polkit-gnome-0.96.tar.bz2;
+    sha256 = "14la7j3h1k1s88amkcv8rzq9wmhgzypvxpwaxwg2x2k55l1wi5hd";
+  };
+
+  buildInputs = [ pkgconfig gtk polkit dbus_glib intltool ];
+
+  configureFlags = [ "--disable-introspection" ];
+
+  meta = with stdenv.lib; {
+    homepage = http://hal.freedesktop.org/docs/PolicyKit/;
+    description = "A dbus session bus service that is used to bring up authentication dialogs";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.phreedom ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11d7df1b94d..fffd5a40f6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1115,6 +1115,8 @@ let
 
   pngnq = callPackage ../tools/graphics/pngnq { };
 
+  polkit_gnome = callPackage ../tools/misc/polkit-gnome { };
+
   povray = callPackage ../tools/graphics/povray { };
 
   ppl = callPackage ../development/libraries/ppl { };

From bcb0efad3a2cc42af5d16a98e5333b494b7875f3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 26 Mar 2011 18:18:45 +0000
Subject: [PATCH 103/143] Quassel: version bump

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

diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 2be964db331..8dcde90e538 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -11,11 +11,11 @@ let
 
 in with stdenv; mkDerivation rec {
 
-  name = "quassel-0.6.1";
+  name = "quassel-0.7.1";
 
   src = fetchurl {
     url = "http://quassel-irc.org/pub/${name}.tar.bz2";
-    sha256 = "1v5mxligfygn7r7hm3b9by38qxigncfkp6w4n8ypp8ww6n8ml6z0";
+    sha256 = "1kby1yikiv5bpzkdri5dq39pxnsj9gjrcv1gigvy2jzy3g99qjli";
   };
 
   buildInputs = [ cmake qt4 ]

From 94e19387f3acf673604d40f75a0795aebf8b1bbd Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 26 Mar 2011 18:18:49 +0000
Subject: [PATCH 104/143] Bangarang: version bump

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

diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix
index 7784fc43913..e6ff1770c46 100644
--- a/pkgs/applications/video/bangarang/default.nix
+++ b/pkgs/applications/video/bangarang/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, kdemultimedia, taglib, glibc, gettext }:
 stdenv.mkDerivation rec {
-  name = "bangarang-1.0.1";
+  name = "bangarang-2.0";
 
   src = fetchurl {
     url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0a89w6zqyzcb34vp3qmyp1mdm2k0igm71b5sh11xnikjvs3k7c33";
+    sha256 = "1fixqx56k0mk0faz35rzpdg6zaa0mvm4548rg0g7fhafl35fxzlz";
   };
 
   buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano kdemultimedia taglib glibc gettext ];

From 7dd8b18baa93e523fb777707c67dc8e3b93ce255 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 26 Mar 2011 18:18:54 +0000
Subject: [PATCH 105/143] Flash player: bump

svn path=/nixpkgs/trunk/; revision=26530
---
 .../browsers/mozilla-plugins/flashplayer-10/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
index 3dd24af8d59..0abc5420338 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@@ -52,7 +52,7 @@ let
         url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz;
         sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc";
       } else {
-        version = "10.2.152.7";
+        version = "10.2.152.27";
         url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
         sha256 = "1xfa0m1h02lvl5an225z4n2l4rv4s35x7a4w3rc413jbggbd0f6k";
       }

From c8b82d55043d364b6d4adfd7b839ed30ec874eac Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 26 Mar 2011 18:23:20 +0000
Subject: [PATCH 106/143] Packaged optfunc

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e09978863ae..447218051a2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -624,6 +624,28 @@ rec {
     };
   });
 
+  optfunc = buildPythonPackage ( rec {
+    name = "optfunc-git";
+
+    src = pkgs.fetchgit {
+      url = "http://github.com/simonw/optfunc.git";
+      rev = "e3fa034a545ed94ac5a039cf5b170c7d0ee21b7b";
+    };
+
+    installCommand = ''
+      dest=$(toPythonPath $out)/optfunc
+      ensureDir $dest
+      cp * $dest/
+    '';
+
+    doCheck = false;
+
+    meta = {
+      description = "A new experimental interface to optparse which works by introspecting a function definition";
+      homepage = "http://simonwillison.net/2009/May/28/optfunc/";
+    };
+  });
+
   ply = buildPythonPackage (rec {
     name = "ply-3.2";
 

From b653226293ad4ad75554ef02d517cb850aed6849 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 26 Mar 2011 18:23:25 +0000
Subject: [PATCH 107/143] Packages pycurl

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 447218051a2..6731d853f4f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -812,6 +812,42 @@ rec {
     };
   });
 
+
+  pycurl =
+    let libcurl = pkgs.stdenv.lib.overrideDerivation pkgs.curl
+      (oldAttrs: {
+        configureFlags =
+          (if oldAttrs ? configureFlags then oldAttrs.configureFlags else "" )
+          + " --enable-static";
+      });
+    in
+  buildPythonPackage (rec {
+    name = "pycurl-7.19.0";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz";
+      sha256 = "0hh6icdbp7svcq0p57zf520ifzhn7jw64x07k99j7h57qpy2sy7b";
+    };
+
+    buildInputs = [ libcurl ];
+
+    doCheck = false;
+
+    postInstall = ''
+      find $out -name easy-install.pth | xargs rm -v
+      find $out -name 'site.py*' | xargs rm -v
+    '';
+
+    meta = {
+      homepage = http://pycurl.sourceforge.net/;
+
+      description = "Python wrapper for libcurl";
+
+      platforms = stdenv.lib.platforms.linux;
+    };
+  });
+
+
   pymacs = pkgs.stdenv.mkDerivation rec {
     version = "v0.24-beta2";
     name = "Pymacs-${version}";

From 9f7e3964d4f743a076a92b0a5553094b597ef435 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 26 Mar 2011 18:23:30 +0000
Subject: [PATCH 108/143] taglib: version bump

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

diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index c3b32c21f37..39e2b88b85e 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, zlib, cmake}:
 
 stdenv.mkDerivation rec {
-  name = "taglib-1.6.3";
+  name = "taglib-1.7.0";
   
   src = fetchurl {
-    url = "http://developer.kde.org/~wheeler/files/src/${name}.tar.gz";
-    sha256 = "0jr8ixqr2q0rwcmf4n58vrwbibmd3kijsjdddck6vln6qaf0ifm9";
+    url = "https://github.com/downloads/taglib/taglib/taglib-1.7.tar.gz";
+    sha256 = "0gvpmfrrh4wgdpyc14zq9mk3hivp8kbmfdxjk8bi2nf3py6zpph9";
   };
   
   cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";

From 3822bde42e0eb42b70e7ded45e990ee42b92e5a6 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 26 Mar 2011 18:23:34 +0000
Subject: [PATCH 109/143] Amarok: version bump

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

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index e47a06e2762..ab39babc48a 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   pname = "amarok";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0dw2928vkd42h3d8nsb8i4xhp8qfj1zsfc1m9wrzrsxl0vd6j9c4";
+    sha256 = "52be0e926d1362828a4bf64e2a174dc009c85f6f33da4ca589f0f09ab9b7085c";
   };
 
   QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";

From b0d3a2f38c5212a65b2d98f865c9459b9045c134 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 27 Mar 2011 04:45:26 +0000
Subject: [PATCH 110/143] libsepol: version bump

svn path=/nixpkgs/trunk/; revision=26535
---
 pkgs/os-specific/linux/libsepol/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index eac7efecaed..1751994e3de 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -1,10 +1,13 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  builder = ./builder.sh;
-  name = "libsepol-1.12";
+stdenv.mkDerivation rec {
+  name = "libsepol-${version}";
+  version = "2.0.42";
+
   src = fetchurl {
-    url = http://www.nsa.gov/selinux/archives/libsepol-1.12.tgz;
-    md5 = "937885f1fcbfe597a0f02aa9af044710";
+    url = "http://userspace.selinuxproject.org/releases/20101221/devel/${name}.tar.gz";
+    sha256 = "0sg61mb9qhyh4vplasar6nwd6j123v453zss93qws3h95fhrfc08";
   };
+
+  preBuild = '' makeFlags="$makeFlags PREFIX=$out DESTDIR=$out" '';
 }

From ebff53134047d229ae4dcbb3662c622d47595c1b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 27 Mar 2011 04:45:33 +0000
Subject: [PATCH 111/143] remove useless builder

svn path=/nixpkgs/trunk/; revision=26536
---
 pkgs/os-specific/linux/libsepol/builder.sh | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/libsepol/builder.sh

diff --git a/pkgs/os-specific/linux/libsepol/builder.sh b/pkgs/os-specific/linux/libsepol/builder.sh
deleted file mode 100644
index 673af3dcc7b..00000000000
--- a/pkgs/os-specific/linux/libsepol/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-export DESTDIR=$out
-export PREFIX=$out
-
-genericBuild

From deb3dd805f29c73f9d2bed7d3a9f2ab9d96c6509 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 27 Mar 2011 04:45:38 +0000
Subject: [PATCH 112/143] libselinux: version bump

svn path=/nixpkgs/trunk/; revision=26537
---
 pkgs/os-specific/linux/libselinux/builder.sh  |  6 ------
 pkgs/os-specific/linux/libselinux/default.nix | 15 +++++++++------
 2 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/libselinux/builder.sh

diff --git a/pkgs/os-specific/linux/libselinux/builder.sh b/pkgs/os-specific/linux/libselinux/builder.sh
deleted file mode 100644
index 673af3dcc7b..00000000000
--- a/pkgs/os-specific/linux/libselinux/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-export DESTDIR=$out
-export PREFIX=$out
-
-genericBuild
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index e0a02a14196..4be88a20e24 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -1,12 +1,15 @@
 {stdenv, fetchurl, libsepol}:
 
-stdenv.mkDerivation {
-  builder = ./builder.sh;
-  name = "libselinux-1.30";
+stdenv.mkDerivation rec {
+  name = "libselinux-${version}";
+  version = "2.0.98";
+
   src = fetchurl {
-    url = http://www.nsa.gov/selinux/archives/libselinux-1.30.tgz;
-    md5 = "0b7d269c9b7d847059e4b11a710ab404";
+    url = "http://userspace.selinuxproject.org/releases/20101221/devel/${name}.tar.gz";
+    sha256 = "00irm7nyakgi4z8d6dlm6c70fkbl6rzk5w1w0ny2c564yw0d0dlz";
   };
 
-  buildInputs = [libsepol];
+  buildInputs = [ libsepol ];
+
+  preBuild = '' makeFlags="$makeFlags PREFIX=$out DESTDIR=$out" '';
 }

From 28f7f1c1923f14ef5ed2748583e80711ea9a7654 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 27 Mar 2011 04:45:46 +0000
Subject: [PATCH 113/143] checkpolicy: packaged

svn path=/nixpkgs/trunk/; revision=26538
---
 .../os-specific/linux/checkpolicy/default.nix | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/os-specific/linux/checkpolicy/default.nix

diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix
new file mode 100644
index 00000000000..a69249b216d
--- /dev/null
+++ b/pkgs/os-specific/linux/checkpolicy/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, libsepol, libselinux, bison, flex }:
+stdenv.mkDerivation rec {
+
+  name = "checkpolicy-${version}";
+  version = "2.0.23";
+
+  src = fetchurl {
+    url = "http://userspace.selinuxproject.org/releases/20101221/devel/checkpolicy-2.0.23.tar.gz";
+    sha256 = "1n34ggacds7xap039r6hqkxmkd4g2wgfkxjdnv3lirq3cqqi8cnd";
+  };
+
+  buildInputs = [ libsepol libselinux bison flex ];
+
+  preBuild = '' makeFlags="$makeFlags LEX=flex LIBDIR=${libsepol}/lib PREFIX=$out" '';
+
+  meta = with stdenv.lib; {
+    homepage = http://userspace.selinuxproject.org/;
+    description = "SELinux policy compiler";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fffd5a40f6e..98eb1023cc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4643,6 +4643,8 @@ let
 
   bridge_utils = callPackage ../os-specific/linux/bridge-utils { };
 
+  checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
+
   cifs_utils = callPackage ../os-specific/linux/cifs-utils { };
 
   conky = callPackage ../os-specific/linux/conky { };

From 8113129d1ac728eb0fe5fa336f58ae322aee1f0e Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 27 Mar 2011 04:45:56 +0000
Subject: [PATCH 114/143] sepolgen: packaged

svn path=/nixpkgs/trunk/; revision=26539
---
 pkgs/os-specific/linux/sepolgen/default.nix | 22 +++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 pkgs/os-specific/linux/sepolgen/default.nix

diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix
new file mode 100644
index 00000000000..a17a4153c47
--- /dev/null
+++ b/pkgs/os-specific/linux/sepolgen/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, python }:
+stdenv.mkDerivation rec {
+
+  name = "sepolgen-${version}";
+  version = "1.0.23";
+
+  src = fetchurl {
+    url = http://userspace.selinuxproject.org/releases/20101221/devel/sepolgen-1.0.23.tar.gz;
+    sha256 = "04d11l091iclp8lnay9as7y473ydrjz7171h95ddsbn0ihj5if2p";
+  };
+
+  buildInputs = [ python ];
+  preBuild = '' makeFlags="$makeFlags DESTDIR=$out PACKAGEDIR=$out/lib/${python.libPrefix}/site-packages/sepolgen" '';
+
+  meta = with stdenv.lib; {
+    homepage = http://userspace.selinuxproject.org/;
+    description = "Python module for SELinux policy generation";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file

From 836b0d259de1cb8ac47771f994e895ac5079c562 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 27 Mar 2011 04:46:05 +0000
Subject: [PATCH 115/143] ustr: packaged

svn path=/nixpkgs/trunk/; revision=26540
---
 pkgs/development/libraries/ustr/default.nix | 24 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/ustr/default.nix

diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix
new file mode 100644
index 00000000000..ebf9628126e
--- /dev/null
+++ b/pkgs/development/libraries/ustr/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, glibc }:
+stdenv.mkDerivation rec {
+
+  name = "ustr-${version}";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "http://www.and.org/ustr/${version}/${name}.tar.bz2";
+    sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx";
+  };
+  prePatch = "substituteInPlace Makefile --replace /usr/include/ ${glibc}/include/";
+
+  makeFlags = "DESTDIR=$(out) prefix= LDCONFIG=echo";
+
+  configurePhase = "make ustr-import";
+  buildInputs = [ glibc ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.and.org/ustr/;
+    description = "Micro String API for C language";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.phreedom ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98eb1023cc2..6776dfe6357 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4144,6 +4144,8 @@ let
 
   urt = callPackage ../development/libraries/urt { };
 
+  ustr = callPackage ../development/libraries/ustr { stdenv = overrideGCC stdenv gcc44; };
+
   ucommon = callPackage ../development/libraries/ucommon { };
 
   vamp = callPackage ../development/libraries/audio/vamp { };

From f1201cf75fb288c9376a5303d67130f37362c6b4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 27 Mar 2011 04:46:12 +0000
Subject: [PATCH 116/143] libsemanage: packaged

svn path=/nixpkgs/trunk/; revision=26541
---
 .../os-specific/linux/libsemanage/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/os-specific/linux/libsemanage/default.nix

diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
new file mode 100644
index 00000000000..22e177191a5
--- /dev/null
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex }:
+stdenv.mkDerivation rec {
+
+  name = "libsemanage-${version}";
+  version = "2.0.46";
+
+  src = fetchurl {
+    url = "http://userspace.selinuxproject.org/releases/20101221/devel/${name}.tar.gz";
+    sha256 = "03ljdw48pn8vlk4h26w8z247c9wykp2198s1ksmxrai3avyz87wf";
+  };
+
+  NIX_LDFLAGS = "-lsepol";
+
+  makeFlags = "PREFIX=$(out) DESTDIR=$(out)";
+
+  buildInputs = [ libsepol libselinux ustr bzip2 bison flex ];
+
+  meta = with stdenv.lib; {
+    homepage = http://userspace.selinuxproject.org/;
+    description = "Policy management tools for SELinux";
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6776dfe6357..4fdcf8a88bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5211,6 +5211,8 @@ let
 
   libselinux = callPackage ../os-specific/linux/libselinux { };
 
+  libsemanage = callPackage ../os-specific/linux/libsemanage { };
+
   libraw1394 = callPackage ../development/libraries/libraw1394 { };
 
   libsexy = callPackage ../development/libraries/libsexy { };

From 1c9c082d00fd784137ff9448ae9e4e5cdcfab706 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 27 Mar 2011 04:46:19 +0000
Subject: [PATCH 117/143] policycoreutils: packaged

svn path=/nixpkgs/trunk/; revision=26542
---
 .../linux/policycoreutils/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/os-specific/linux/policycoreutils/default.nix

diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
new file mode 100644
index 00000000000..98a2bcb4e6c
--- /dev/null
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, libsepol, libselinux }:
+stdenv.mkDerivation rec {
+
+  name = "policycoreutils-${version}";
+  version = "2.0.85";
+
+  src = fetchurl {
+    url = http://userspace.selinuxproject.org/releases/20101221/devel/policycoreutils-2.0.85.tar.gz;
+    sha256 = "01q5ifacg24k9jdz85j9m17ps2l1p7abvh8pzy6qz55y68rycifb";
+  };
+
+  buildInputs = [ libsepol libselinux ];
+
+  makeFlags = "LOCALEDIR=$(out)/share/locale";
+
+  meta = with stdenv.lib; {
+    homepage = http://userspace.selinuxproject.org/;
+    description = "SELinux policy core utilities";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fdcf8a88bb..61343e0e257 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5329,6 +5329,8 @@ let
 
   pmutils = callPackage ../os-specific/linux/pm-utils { };
 
+  policycoreutils = callPackage ../os-specific/linux/policycoreutils { };
+
   powertop = callPackage ../os-specific/linux/powertop { };
 
   procps = callPackage ../os-specific/linux/procps { };

From ac951a6469d3cbf7acd0a43e5bc19bbb91e9093e Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 27 Mar 2011 04:46:25 +0000
Subject: [PATCH 118/143] coreutils: add SELinux support

svn path=/nixpkgs/trunk/; revision=26543
---
 pkgs/tools/misc/coreutils/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 21ce9215017..c4295e7b47a 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchurl, aclSupport ? false, acl ? null, perl, gmp ? null}:
+{ stdenv, fetchurl, perl, gmp ? null
+, aclSupport ? false, acl ? null
+, selinuxSupport? false, libselinux ? null, libsepol ? null }:
 
 assert aclSupport -> acl != null;
+assert selinuxSupport -> ( (libselinux != null) && (libsepol != null) );
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "coreutils-8.7";
 
   src = fetchurl {
@@ -11,11 +14,16 @@ stdenv.mkDerivation rec {
   };
 
   buildNativeInputs = [ perl ];
-  buildInputs = [ gmp ] ++ stdenv.lib.optional aclSupport acl;
+  buildInputs = [ gmp ]
+    ++ stdenv.lib.optional aclSupport acl
+    ++ stdenv.lib.optional selinuxSupport libselinux
+    ++ stdenv.lib.optional selinuxSupport libsepol;
 
   crossAttrs = {
     buildInputs = [ gmp ]
       ++ stdenv.lib.optional aclSupport acl.hostDrv
+      ++ stdenv.lib.optional selinuxSupport libselinux.hostDrv
+      ++ stdenv.lib.optional selinuxSupport libsepol.hostDrv
       ++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv)
         stdenv.gccCross.libc.libiconv.hostDrv;
 
@@ -48,4 +56,5 @@ stdenv.mkDerivation rec {
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
   };
-}
+} // (if selinuxSupport then { NIX_LDFLAGS = "-lsepol"; } else { } ) )
+

From 72124a0aa98c272629342388c457050e2d44c978 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sun, 27 Mar 2011 06:44:34 +0000
Subject: [PATCH 119/143] Bitcoin.

svn path=/nixpkgs/trunk/; revision=26544
---
 pkgs/applications/misc/bitcoin/default.nix    | 50 +++++++++++++++++++
 pkgs/development/libraries/db4/db4-4.7.nix    | 18 +++++++
 pkgs/development/libraries/db4/db4-4.8.nix    | 18 +++++++
 .../development/libraries/wxGTK-2.9/2.9.0.nix | 46 +++++++++++++++++
 pkgs/top-level/all-packages.nix               | 14 ++++++
 5 files changed, 146 insertions(+)
 create mode 100644 pkgs/applications/misc/bitcoin/default.nix
 create mode 100644 pkgs/development/libraries/db4/db4-4.7.nix
 create mode 100644 pkgs/development/libraries/db4/db4-4.8.nix
 create mode 100644 pkgs/development/libraries/wxGTK-2.9/2.9.0.nix

diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix
new file mode 100644
index 00000000000..d66ccf7cb58
--- /dev/null
+++ b/pkgs/applications/misc/bitcoin/default.nix
@@ -0,0 +1,50 @@
+{ fetchurl, stdenv, openssl, db4, boost, zlib, glib, libSM, gtk, wxGTK }:
+
+stdenv.mkDerivation rec {
+  version = "0.3.20.2";
+  name = "bitcoin-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/bitcoin/Bitcoin/bitcoin-0.3.20/bitcoin-0.3.20.2-linux.tar.gz";
+    sha256 = "1maq75myqkyngfi9ngaw6kv6nfia5wsjj2zjhns75k3wxhmvgpw5";
+  };
+
+  buildInputs = [ openssl db4 boost zlib glib libSM gtk wxGTK ];
+
+  preConfigure = ''
+    cd src
+    mkdir obj
+    mkdir obj/nogui
+    substituteInPlace makefile.unix \
+      --replace "-Wl,-Bstatic" "" \
+      --replace "-Wl,-Bdynamic" "" \
+      --replace "-mt \\" " \\" \
+      --replace "-l wx_gtk2ud-2.9" "-l wx_gtk2u_core-2.9 -l wx_gtk2u_html-2.9 -l wx_gtk2u_adv-2.9" \
+      --replace "DEBUGFLAGS=-g -D__WXDEBUG__" "DEBUGFLAGS=" \
+      --replace "/usr/local/include/wx-2.9" "${wxGTK}/include/wx-2.9" \
+      --replace "/usr/local/lib/wx/include/gtk2-unicode-debug-static-2.9" "${wxGTK}/lib/wx/include/gtk2-unicode-release-2.9"
+  '';
+
+  makefile = "makefile.unix";
+
+  buildFlags = "bitcoin bitcoind";
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp bitcoin $out/bin
+    cp bitcoind $out/bin
+  '';
+
+  meta = { 
+      description = "Bitcoin is a peer-to-peer currency";
+      longDescription=''
+Bitcoin is a free open source peer-to-peer electronic cash system that is
+completely decentralized, without the need for a central server or trusted
+parties.  Users hold the crypto keys to their own money and transact directly
+with each other, with the help of a P2P network to check for double-spending.
+      '';
+      homepage = "http://www.bitcoin.org/";
+      maintainers = [ stdenv.lib.maintainers.roconnor ];
+      license = "MIT";
+  };
+}
diff --git a/pkgs/development/libraries/db4/db4-4.7.nix b/pkgs/development/libraries/db4/db4-4.7.nix
new file mode 100644
index 00000000000..9fb0d6587c0
--- /dev/null
+++ b/pkgs/development/libraries/db4/db4-4.7.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
+
+stdenv.mkDerivation {
+  name = "db4-4.7.25";
+  
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = http://download-east.oracle.com/berkeley-db/db-4.7.25.tar.gz;
+    sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi";
+  };
+  
+  configureFlags = [
+    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
+    (if compat185 then "--enable-compat185" else "--disable-compat185")
+  ];
+  
+}
diff --git a/pkgs/development/libraries/db4/db4-4.8.nix b/pkgs/development/libraries/db4/db4-4.8.nix
new file mode 100644
index 00000000000..5b99f068769
--- /dev/null
+++ b/pkgs/development/libraries/db4/db4-4.8.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
+
+stdenv.mkDerivation {
+  name = "db4-4.8.26";
+  
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = http://download-east.oracle.com/berkeley-db/db-4.8.26.tar.gz;
+    sha256 = "0hcxh0kb6m0wk3apjhs57p7b171zzn63rg4l3nkcavygg5gx2mgp";
+  };
+  
+  configureFlags = [
+    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
+    (if compat185 then "--enable-compat185" else "--disable-compat185")
+  ];
+  
+}
diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
new file mode 100644
index 00000000000..433f7fe2187
--- /dev/null
+++ b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
+, mesa, compat24 ? false, compat26 ? true, unicode ? true,
+}:
+
+assert pkgconfig != null && gtk != null;
+assert gtk.libtiff != null;
+assert gtk.libjpeg != null;
+assert gtk.libpng != null;
+assert gtk.libpng.zlib != null;
+
+stdenv.mkDerivation {
+  name = "wxwidgets-2.9.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/wxwindows/wxWidgets-2.9.0.tar.bz2;
+    sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
+  };
+
+  buildInputs = [
+    pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
+    libXinerama libSM libXxf86vm xf86vidmodeproto mesa
+  ];
+
+  configureFlags = [
+    "--enable-gtk2"
+    (if compat24 then "--enable-compat24" else "--disable-compat24")
+    (if compat26 then "--enable-compat26" else "--disable-compat26")
+    "--disable-precomp-headers"
+    (if unicode then "--enable-unicode" else "")
+    "--with-opengl"
+  ];
+
+  SEARCH_LIB = "${mesa}/lib";
+
+  preConfigure = "
+    substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
+    substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
+    substituteInPlace configure --replace /usr /no-such-path
+  ";
+
+  postInstall = "
+    (cd $out/include && ln -s wx-*/* .)
+  ";
+
+  passthru = {inherit gtk compat24 compat26 unicode;};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61343e0e257..8024e8c12de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2873,6 +2873,10 @@ let
 
   db45 = callPackage ../development/libraries/db4/db4-4.5.nix { };
 
+  db47 = callPackage ../development/libraries/db4/db4-4.7.nix { };
+
+  db48 = callPackage ../development/libraries/db4/db4-4.8.nix { };
+
   dbus = callPackage ../development/libraries/dbus {
     useX11 = true;
   };
@@ -4194,6 +4198,10 @@ let
     inherit (gtkLibs) gtk;
   };
 
+  wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
+    inherit (gtkLibs) gtk;
+  };
+
   wtk = callPackage ../development/libraries/wtk { };
 
   x264 = callPackage ../development/libraries/x264 { };
@@ -5698,6 +5706,12 @@ let
     qt = qt4;
   } ;
 
+  bitcoin = callPackage ../applications/misc/bitcoin { 
+    wxGTK = wxGTK290;
+    db4 = db47;
+    inherit (xlibs) libSM;
+  };
+
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
 
   # commented out because it's using the new configuration style proposal which is unstable

From 08341727ae434a662827fecff6ffdf9f4e67b5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Mar 2011 14:02:51 +0000
Subject: [PATCH 120/143] Updating gpt (patch by Shea Levy)

svn path=/nixpkgs/trunk/; revision=26545
---
 pkgs/tools/system/gptfdisk/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index b7cebc5795a..df46be2e710 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -1,14 +1,14 @@
-{ fetchurl, stdenv, libuuid, popt }:
+{ fetchurl, stdenv, libuuid, popt, icu }:
 
 stdenv.mkDerivation rec {
-  name = "gptfdisk-0.7.0";
+  name = "gptfdisk-0.7.1";
 
   src = fetchurl {
     url = "http://www.rodsbooks.com/gdisk/${name}.tgz";
-    sha256 = "1912l01pj7wcaj2fp06yl6m893c52qh2qy0bkx33k6iq2k747zrf";
+    sha256 = "142mrlcaprh7a6r55wvaxpvjmkffh7w8lcagarmwq4cfibfrnwd8";
   };
 
-  buildInputs = [ libuuid popt ];
+  buildInputs = [ libuuid popt icu ];
 
   installPhase = ''
     ensureDir $out/bin
@@ -29,3 +29,4 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
   };
 }
+

From 20ef19e1d241a2fc20f2a057066a4a8e241cee19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Mar 2011 14:07:38 +0000
Subject: [PATCH 121/143] Updating enet

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

diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index c8c612fe94e..6df90622383 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "enet-1.3.0";
+  name = "enet-1.3.1";
   
   src = fetchurl {
     url = "http://enet.bespin.org/download/${name}.tar.gz";
-    sha256 = "0b6nv3q546mr1vr74jccd4nsad9zkmjn17kdrqxxnyc944djf310";
+    sha256 = "1faszy5jvxcbjvnqzxaxpcm0rh8xib52pgn2zm1vyc9gg957hw99";
   };
 
   meta = {

From bd3f5e73409b1980825e75e7e1a7cb8ad8b35131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Mar 2011 14:08:13 +0000
Subject: [PATCH 122/143] Adding a key 'exit 0' to myenv. Otherwise it fails to
 build if pkgconfig is one of the build inputs.

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

diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 7c6c2d46239..76080d8e114 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -45,7 +45,7 @@ mkDerivation {
   # the buildNativeInputs environment variable.
   buildNativeInputs = [ ] ++ buildInputs ;
   name = "env-${name}";
-  phases = "buildPhase";
+  phases = [ "buildPhase" ];
   setupNew = substituteAll {
     src = ../../stdenv/generic/setup.sh;
     preHook="";
@@ -53,6 +53,7 @@ mkDerivation {
     initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; };
     gcc = stdenv.gcc;
   };
+
   buildPhase = ''
     set -x
     mkdir -p "$out/dev-envs" "$out/nix-support"
@@ -110,5 +111,6 @@ mkDerivation {
       export PATH
       echo $name loaded
     EOF
+    exit 0
   '';
 }

From 13579049825ab815cfad43cd0eb175f0f0014e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Mar 2011 15:18:39 +0000
Subject: [PATCH 123/143] Committing the aufs2.1 patch by Shea Levy. His
 comments:

   * My motivation for this patch is that kernels < 2.6.36 contain an
     e1000e that does not support the ethernet card that is part of the
     chipset for the second-generation Core-i Intel CPUs, so in order
     to have a more useful livecd I needed to get aufs working with a
     newer kernel, and 2.6.37 is the latest kernel with an official
     aufs release.
   * All sources are downloaded with fetchgit. This is because the aufs
     upstream doesn't provide release tarballs, they just add a tag to
     their git tree for an official release.
   * The make target for the aufs2.1 headers uses a Makefile in the
     kernel build directory that requires that unifdef be in the
     scripts/ subdirectory of the build directory. The way I've dealt
     with this here is by adding "make $makeFlags -C scripts unifdef"
     to the postBuild in the kernel builder. Since the builder is used
     by all kernel versions, this will require rebuilding every kernel
     and kernel-dependent package if the patch is accepted, so one
     alternative I thought of would be to create a fake kernel build
     directory where everything is symlinked to the real build
     directory except scripts/, which is first copied and then make
     unifdef is run before building aufs2.1. If that more complicated
     solution is preferred, or if anyone has ideas for another one, I
     can do that and submit a new patch.
   * The patch was tested by building a livecd ISO that uses it, then
     running the ISO from within virtualbox and installing aufs2.1-util
     from within the livecd environment.
   * The livecd was built using installation-cd-minimal.nix, with two
     changes to the Nixos tree:
        1. boot.kernelPackages = pkgs.linuxPackages_2_6_37 was added to
           profiles/minimal.nix
        2. config.boot.kernelPackages.aufs2 was changed to
           config.boot.kernelPackages.aufs2_1 in iso-image.nix
     I would have preferred to keep all changes within
     profiles/minimal.nix, but I couldn't figure out how to override
     iso-image.nix's definition of boot.extraModulePackages. Livecds
     that use an older kernel can't be built with this iso-image.nix,
     since we don't have aufs2.1 for them (just aufs2). If someone can
     point me to how I can override things set in iso-image.nix, I'd
     appreciate it.

make -C scripts unifdef compiles the unifdef application in the
scripts/ directory, and when Nix copies over the build tree to
$out/lib/modules/$version/build for kernel modules to reference, it
copies over all of scripts/ except the .o files. I can't speak for
other kernel versions, but at the least for 2.6.37.1 unifdef is not
built by default. If you look at the Makefile in scripts, unifdef is
listed  under a comment saying that the following programs are only
built on-demand.

svn path=/nixpkgs/trunk/; revision=26548
---
 .../linux/aufs2.1-util/default.nix            |  41 ++
 pkgs/os-specific/linux/aufs2.1/default.nix    |  37 ++
 .../os-specific/linux/kernel/aufs2.1-37.patch | 368 ++++++++++++++++++
 pkgs/os-specific/linux/kernel/builder.sh      |   1 +
 pkgs/os-specific/linux/kernel/patches.nix     |   9 +
 pkgs/top-level/all-packages.nix               |   6 +-
 6 files changed, 461 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/aufs2.1-util/default.nix
 create mode 100644 pkgs/os-specific/linux/aufs2.1/default.nix
 create mode 100644 pkgs/os-specific/linux/kernel/aufs2.1-37.patch

diff --git a/pkgs/os-specific/linux/aufs2.1-util/default.nix b/pkgs/os-specific/linux/aufs2.1-util/default.nix
new file mode 100644
index 00000000000..a12a0900ca4
--- /dev/null
+++ b/pkgs/os-specific/linux/aufs2.1-util/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchgit, kernel, aufs2_1 }:
+
+let version = "20110217"; in
+
+stdenv.mkDerivation {
+  name = "aufs2.1-util-${version}";
+
+  src = fetchgit {
+    url = "git://git.c3sl.ufpr.br/aufs/aufs2-util.git";
+    rev = "0f0cf3f2ae39906fd4b5376cdaa24e9fe64a03f4";
+    sha256 = "0fce5601b67efe8b5652a813ae612348bf4503aa71056cd31a5ed0406632e364";
+  };
+
+  buildInputs = [ aufs2_1 ];
+
+  makeFlags =
+    [ "KDIR=${kernel}/lib/modules/${kernel.version}/build"
+      "Install=install"
+      "DESTDIR=$(out)"
+    ];
+
+  postInstall =
+    ''
+      mv $out/usr/* $out
+      rmdir $out/usr
+
+      cp aufs.shlib $out/lib/
+
+      substituteInPlace $out/bin/aubrsync \
+        --replace /sbin/mount $out/sbin/mount \
+        --replace /usr/lib/aufs.shlib $out/lib/aufs.shlib
+    '';
+
+  meta = {
+    description = "Utilities for AUFS2.1";
+    homepage = http://aufs.sourceforge.net/;
+    maintainers = [ stdenv.lib.maintainers.eelco 
+                    stdenv.lib.maintainers.shlevy ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/aufs2.1/default.nix b/pkgs/os-specific/linux/aufs2.1/default.nix
new file mode 100644
index 00000000000..65d334cc15c
--- /dev/null
+++ b/pkgs/os-specific/linux/aufs2.1/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, kernel, fetchgit, perl }:
+
+assert kernel.features ? aufsBase;
+
+let version = "20110303"; in
+
+stdenv.mkDerivation {
+  name = "aufs2.1-${version}";
+
+  src = fetchgit {
+    url = "git://git.c3sl.ufpr.br/aufs/aufs2-standalone.git";
+    rev = "aceef6c84dbe5798bf46904252727b9588eafaf6";
+    sha256 = "50a8cb39af5fee82e88b65351cac52b6ab95a68c45e0a98da9fa1925b28f048d";
+  };
+
+  buildInputs = [ perl ];
+
+  makeFlags = "KDIR=${kernel}/lib/modules/${kernel.version}/build";
+
+  installPhase =
+    ''
+      ensureDir $out/lib/modules/${kernel.version}/misc
+      cp -v aufs.ko $out/lib/modules/${kernel.version}/misc
+
+      # Install the headers because aufs2.1-util requires them.
+      cp -av usr/include $out/
+    '';
+
+  meta = {
+    description = "Another Unionfs implementation for Linux (second generation)";
+    homepage = http://aufs.sourceforge.net/;
+    maintainers = [ stdenv.lib.maintainers.eelco
+                    stdenv.lib.maintainers.raskin
+                    stdenv.lib.maintainers.shlevy ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/kernel/aufs2.1-37.patch b/pkgs/os-specific/linux/kernel/aufs2.1-37.patch
new file mode 100644
index 00000000000..4cb58ad8a57
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/aufs2.1-37.patch
@@ -0,0 +1,368 @@
+aufs2.1 base patch for linux-2.6.37
+
+diff --git a/fs/namei.c b/fs/namei.c
+index 4ff7ca5..a8c583f 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1161,12 +1161,12 @@ out:
+  * needs parent already locked. Doesn't follow mounts.
+  * SMP-safe.
+  */
+-static struct dentry *lookup_hash(struct nameidata *nd)
++struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
+ 
+-static int __lookup_one_len(const char *name, struct qstr *this,
++int __lookup_one_len(const char *name, struct qstr *this,
+ 		struct dentry *base, int len)
+ {
+ 	unsigned long hash;
+diff --git a/fs/splice.c b/fs/splice.c
+index ce2f025..ff0ae69 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+ /*
+  * Attempt to initiate a splice from pipe to file.
+  */
+-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+-			   loff_t *ppos, size_t len, unsigned int flags)
++long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++		    loff_t *ppos, size_t len, unsigned int flags)
+ {
+ 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
+ 				loff_t *, size_t, unsigned int);
+@@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ /*
+  * Attempt to initiate a splice from a file to a pipe.
+  */
+-static long do_splice_to(struct file *in, loff_t *ppos,
+-			 struct pipe_inode_info *pipe, size_t len,
+-			 unsigned int flags)
++long do_splice_to(struct file *in, loff_t *ppos,
++		  struct pipe_inode_info *pipe, size_t len,
++		  unsigned int flags)
+ {
+ 	ssize_t (*splice_read)(struct file *, loff_t *,
+ 			       struct pipe_inode_info *, size_t, unsigned int);
+diff --git a/include/linux/namei.h b/include/linux/namei.h
+index 05b441d..91bc74e 100644
+--- a/include/linux/namei.h
++++ b/include/linux/namei.h
+@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
+ 		int (*open)(struct inode *, struct file *));
+ 
++extern struct dentry *lookup_hash(struct nameidata *nd);
++extern int __lookup_one_len(const char *name, struct qstr *this,
++			    struct dentry *base, int len);
+ extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
+ 
+ extern int follow_down(struct path *);
+diff --git a/include/linux/splice.h b/include/linux/splice.h
+index 997c3b4..be9a153 100644
+--- a/include/linux/splice.h
++++ b/include/linux/splice.h
+@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
+ extern void splice_shrink_spd(struct pipe_inode_info *,
+ 				struct splice_pipe_desc *);
+ 
++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++			   loff_t *ppos, size_t len, unsigned int flags);
++extern long do_splice_to(struct file *in, loff_t *ppos,
++			 struct pipe_inode_info *pipe, size_t len,
++			 unsigned int flags);
++
+ #endif
+aufs2.1 standalone patch for linux-2.6.37
+
+diff --git a/fs/file_table.c b/fs/file_table.c
+index c3dee38..f529e4d 100644
+--- a/fs/file_table.c
++++ b/fs/file_table.c
+@@ -393,6 +393,8 @@ void file_sb_list_del(struct file *file)
+ 	}
+ }
+ 
++EXPORT_SYMBOL(file_sb_list_del);
++
+ #ifdef CONFIG_SMP
+ 
+ /*
+diff --git a/fs/inode.c b/fs/inode.c
+index ae2727a..2c8071a 100644
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -82,6 +82,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
+  * the i_state of an inode while it is in use..
+  */
+ DEFINE_SPINLOCK(inode_lock);
++EXPORT_SYMBOL(inode_lock);
+ 
+ /*
+  * iprune_sem provides exclusion between the kswapd or try_to_free_pages
+diff --git a/fs/namei.c b/fs/namei.c
+index a8c583f..b020c45 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -347,6 +347,7 @@ int deny_write_access(struct file * file)
+ 
+ 	return 0;
+ }
++EXPORT_SYMBOL(deny_write_access);
+ 
+ /**
+  * path_get - get a reference to a path
+@@ -1165,6 +1166,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
++EXPORT_SYMBOL(lookup_hash);
+ 
+ int __lookup_one_len(const char *name, struct qstr *this,
+ 		struct dentry *base, int len)
+@@ -1187,6 +1189,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
+ 	this->hash = end_name_hash(hash);
+ 	return 0;
+ }
++EXPORT_SYMBOL(__lookup_one_len);
+ 
+ /**
+  * lookup_one_len - filesystem helper to lookup single pathname component
+diff --git a/fs/namespace.c b/fs/namespace.c
+index 3dbfc07..3998762 100644
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1321,6 +1321,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+ 	}
+ 	return 0;
+ }
++EXPORT_SYMBOL(iterate_mounts);
+ 
+ static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
+ {
+diff --git a/fs/notify/group.c b/fs/notify/group.c
+index d309f38..f0e9568 100644
+--- a/fs/notify/group.c
++++ b/fs/notify/group.c
+@@ -22,6 +22,7 @@
+ #include <linux/srcu.h>
+ #include <linux/rculist.h>
+ #include <linux/wait.h>
++#include <linux/module.h>
+ 
+ #include <linux/fsnotify_backend.h>
+ #include "fsnotify.h"
+@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
+ 	if (atomic_dec_and_test(&group->refcnt))
+ 		fsnotify_destroy_group(group);
+ }
++EXPORT_SYMBOL(fsnotify_put_group);
+ 
+ /*
+  * Create a new fsnotify_group and hold a reference for the group returned.
+@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
+ 
+ 	return group;
+ }
++EXPORT_SYMBOL(fsnotify_alloc_group);
+diff --git a/fs/notify/mark.c b/fs/notify/mark.c
+index 325185e..adede09 100644
+--- a/fs/notify/mark.c
++++ b/fs/notify/mark.c
+@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
+ 	if (atomic_dec_and_test(&mark->refcnt))
+ 		mark->free_mark(mark);
+ }
++EXPORT_SYMBOL(fsnotify_put_mark);
+ 
+ /*
+  * Any time a mark is getting freed we end up here.
+@@ -190,6 +191,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
+ 	if (unlikely(atomic_dec_and_test(&group->num_marks)))
+ 		fsnotify_final_destroy_group(group);
+ }
++EXPORT_SYMBOL(fsnotify_destroy_mark);
+ 
+ void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
+ {
+@@ -277,6 +279,7 @@ err:
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(fsnotify_add_mark);
+ 
+ /*
+  * clear any marks in a group in which mark->flags & flags is true
+@@ -332,6 +335,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+ 	atomic_set(&mark->refcnt, 1);
+ 	mark->free_mark = free_mark;
+ }
++EXPORT_SYMBOL(fsnotify_init_mark);
+ 
+ static int fsnotify_mark_destroy(void *ignored)
+ {
+diff --git a/fs/open.c b/fs/open.c
+index 4197b9e..912817a 100644
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+ 	mutex_unlock(&dentry->d_inode->i_mutex);
+ 	return ret;
+ }
++EXPORT_SYMBOL(do_truncate);
+ 
+ static long do_sys_truncate(const char __user *pathname, loff_t length)
+ {
+diff --git a/fs/splice.c b/fs/splice.c
+index ff0ae69..1c9e9b0 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1116,6 +1116,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ 
+ 	return splice_write(pipe, out, ppos, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_from);
+ 
+ /*
+  * Attempt to initiate a splice from a file to a pipe.
+@@ -1142,6 +1143,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+ 
+ 	return splice_read(in, ppos, pipe, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_to);
+ 
+ /**
+  * splice_direct_to_actor - splices data directly between two non-pipes
+diff --git a/security/commoncap.c b/security/commoncap.c
+index 64c2ed9..e58b5d8 100644
+--- a/security/commoncap.c
++++ b/security/commoncap.c
+@@ -929,3 +929,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
+ 	}
+ 	return ret;
+ }
++EXPORT_SYMBOL(cap_file_mmap);
+diff --git a/security/device_cgroup.c b/security/device_cgroup.c
+index 8d9c48f..29108aa 100644
+--- a/security/device_cgroup.c
++++ b/security/device_cgroup.c
+@@ -515,6 +515,7 @@ found:
+ 
+ 	return -EPERM;
+ }
++EXPORT_SYMBOL(devcgroup_inode_permission);
+ 
+ int devcgroup_inode_mknod(int mode, dev_t dev)
+ {
+diff --git a/security/security.c b/security/security.c
+index 1b798d3..3b7d2ca 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -360,6 +360,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
+ 		return 0;
+ 	return security_ops->path_mkdir(dir, dentry, mode);
+ }
++EXPORT_SYMBOL(security_path_mkdir);
+ 
+ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+ {
+@@ -367,6 +368,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+ 		return 0;
+ 	return security_ops->path_rmdir(dir, dentry);
+ }
++EXPORT_SYMBOL(security_path_rmdir);
+ 
+ int security_path_unlink(struct path *dir, struct dentry *dentry)
+ {
+@@ -374,6 +376,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
+ 		return 0;
+ 	return security_ops->path_unlink(dir, dentry);
+ }
++EXPORT_SYMBOL(security_path_unlink);
+ 
+ int security_path_symlink(struct path *dir, struct dentry *dentry,
+ 			  const char *old_name)
+@@ -382,6 +385,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+ 		return 0;
+ 	return security_ops->path_symlink(dir, dentry, old_name);
+ }
++EXPORT_SYMBOL(security_path_symlink);
+ 
+ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ 		       struct dentry *new_dentry)
+@@ -390,6 +394,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ 		return 0;
+ 	return security_ops->path_link(old_dentry, new_dir, new_dentry);
+ }
++EXPORT_SYMBOL(security_path_link);
+ 
+ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+ 			 struct path *new_dir, struct dentry *new_dentry)
+@@ -400,6 +405,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+ 	return security_ops->path_rename(old_dir, old_dentry, new_dir,
+ 					 new_dentry);
+ }
++EXPORT_SYMBOL(security_path_rename);
+ 
+ int security_path_truncate(struct path *path)
+ {
+@@ -407,6 +413,7 @@ int security_path_truncate(struct path *path)
+ 		return 0;
+ 	return security_ops->path_truncate(path);
+ }
++EXPORT_SYMBOL(security_path_truncate);
+ 
+ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+ 			mode_t mode)
+@@ -415,6 +422,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+ 		return 0;
+ 	return security_ops->path_chmod(dentry, mnt, mode);
+ }
++EXPORT_SYMBOL(security_path_chmod);
+ 
+ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ {
+@@ -422,6 +430,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ 		return 0;
+ 	return security_ops->path_chown(path, uid, gid);
+ }
++EXPORT_SYMBOL(security_path_chown);
+ 
+ int security_path_chroot(struct path *path)
+ {
+@@ -498,6 +507,7 @@ int security_inode_readlink(struct dentry *dentry)
+ 		return 0;
+ 	return security_ops->inode_readlink(dentry);
+ }
++EXPORT_SYMBOL(security_inode_readlink);
+ 
+ int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+@@ -512,6 +522,7 @@ int security_inode_permission(struct inode *inode, int mask)
+ 		return 0;
+ 	return security_ops->inode_permission(inode, mask);
+ }
++EXPORT_SYMBOL(security_inode_permission);
+ 
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ {
+@@ -611,6 +622,7 @@ int security_file_permission(struct file *file, int mask)
+ 
+ 	return fsnotify_perm(file, mask);
+ }
++EXPORT_SYMBOL(security_file_permission);
+ 
+ int security_file_alloc(struct file *file)
+ {
+@@ -638,6 +650,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+ 		return ret;
+ 	return ima_file_mmap(file, prot);
+ }
++EXPORT_SYMBOL(security_file_mmap);
+ 
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
+ 			    unsigned long prot)
+
diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index bb030abaa6c..5bedebc11ec 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -50,6 +50,7 @@ postBuild() {
     # After the builder did a 'make all' (kernel + modules)
     # we force building the target asked: bzImage/zImage/uImage/...
     make $makeFlags $kernelTarget
+    make $makeFlags -C scripts unifdef
 }
 
 installPhase() {
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 59e0ac84ede..3811ce324d6 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -202,6 +202,15 @@ in
       features.aufsBase = true;
     };
 
+  aufs2_1_2_6_37 =
+    { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2.1-37;hb=refs/heads/aufs2.1-37
+      # Note that this merely the patch needed to build AUFS2.1 as a
+      # standalone package.
+      name = "aufs2.1";
+      patch = ./aufs2.1-37.patch;
+      features.aufsBase = true;
+    };
+
   # Increase the timeout on CIFS requests from 15 to 120 seconds to
   # make CIFS more resilient to high load on the CIFS server.
   cifs_timeout =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8024e8c12de..97b75cf8f32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5067,7 +5067,7 @@ let
     kernelPatches =
       [ kernelPatches.fbcondecor_2_6_37
         kernelPatches.sec_perm_2_6_24
-        #kernelPatches.aufs2_2_6_35
+        kernelPatches.aufs2_1_2_6_37
         #kernelPatches.mips_restart_2_6_36
       ];
   };
@@ -5106,8 +5106,12 @@ let
 
     aufs2 = callPackage ../os-specific/linux/aufs2 { };
 
+    aufs2_1 = callPackage ../os-specific/linux/aufs2.1 { };
+
     aufs2_util = callPackage ../os-specific/linux/aufs2-util { };
 
+    aufs2_1_util = callPackage ../os-specific/linux/aufs2.1-util { };
+
     blcr = callPackage ../os-specific/linux/blcr {
       #libtool = libtool_1_5; # libtool 2 causes a fork bomb
     };

From 6f30a10a2da8b5d408804b8320d7a6a4c8f64cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Mar 2011 16:35:45 +0000
Subject: [PATCH 124/143] Adding bzflag.

svn path=/nixpkgs/trunk/; revision=26549
---
 pkgs/games/bzflag/default.nix   | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/games/bzflag/default.nix

diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
new file mode 100644
index 00000000000..d15c25cef3c
--- /dev/null
+++ b/pkgs/games/bzflag/default.nix
@@ -0,0 +1,18 @@
+{ fetchurl, stdenv, curl, SDL, mesa, glew, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "bzflag-2.0.16";
+
+  src = fetchurl {
+    url = mirror://sourceforge/bzflag/bzflag-2.0.16.tar.bz2;
+    sha256 = "13v0ibiyq59j3xf23yf7s8blkmacagl8w48v2580k5bzkswa0vzy";
+  };
+
+  buildInputs = [ curl SDL mesa glew ncurses ];
+
+  meta = {
+    description = "Multiplayer 3D Tank game";
+    homepage = http://bzflag.org/;
+    license = "LGPLv2.1+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97b75cf8f32..96d87ef35a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7021,6 +7021,8 @@ let
 
   bsdgames = callPackage ../games/bsdgames { };
 
+  bzflag = callPackage ../games/bzflag { };
+
   castle_combat = callPackage ../games/castle-combat { };
 
   construoBase = callPackage ../games/construo {

From 997a5c8ef3cff22b0fe1d9070d3c789bbac7c347 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 27 Mar 2011 19:03:06 +0000
Subject: [PATCH 125/143] * Revert r26507, which I assume was intented for the
 stdenv branch.

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 267b7a95fc7..e8afa9bcb3b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -13,7 +13,7 @@ with (import ./release-lib.nix);
 
   tarball = import ./make-tarball.nix;
 
-} // (mapTestOn (/* (packagesWithMetaPlatform pkgs) // */ rec {
+} // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec {
 
   MPlayer = linux;
   abcde = linux;
@@ -380,7 +380,6 @@ with (import ./release-lib.nix);
     jdee = linux;
   };
 
-  /*
   firefox36Pkgs.firefox = linux;
   firefox40Pkgs.firefox = linux;
 
@@ -542,7 +541,6 @@ with (import ./release-lib.nix);
     xfdesktop = linux;
     xfwm4 = linux;
   };
-  */
 
 } ))
 

From a602209a6b43f0380c8d00f3978d214e94661d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Mar 2011 20:14:42 +0000
Subject: [PATCH 126/143] Fixing the name of darcnes.

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

diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix
index 6cf7d848b65..5ce5512119d 100644
--- a/pkgs/misc/emulators/darcnes/default.nix
+++ b/pkgs/misc/emulators/darcnes/default.nix
@@ -3,7 +3,7 @@
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation { 
-  name = "darnes-9b0401";
+  name = "darcnes-9b0401";
   src = fetchurl {
     url = http://www.dridus.com/~nyef/darcnes/download/dn9b0401.tgz;
     sha256 = "05a7mh51rg7ydb414m3p5mm05p4nz2bgvspqzwm3bhbj7zz543k3";

From 723fce8d578751acb15188416eb8abb639a1e586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Mar 2011 20:35:08 +0000
Subject: [PATCH 127/143] Adding the pacman-like game njam.

svn path=/nixpkgs/trunk/; revision=26553
---
 pkgs/games/njam/default.nix     | 24 ++++++++++++++++++++++++
 pkgs/games/njam/logfile.patch   | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 3 files changed, 48 insertions(+)
 create mode 100644 pkgs/games/njam/default.nix
 create mode 100644 pkgs/games/njam/logfile.patch

diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix
new file mode 100644
index 00000000000..4062405407b
--- /dev/null
+++ b/pkgs/games/njam/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net }:
+
+stdenv.mkDerivation rec {
+  name = "njam-1.25";
+
+  src = fetchurl {
+    url = mirror://sourceforge/njam/njam-1.25-src.tar.gz;
+    sha256 = "0ysvqw017xkvddj957pdfmbmji7qi20nyr7f0zxvcvm6c7d3cc7s";
+  };
+
+  preBuild = ''
+    rm src/*.o
+  '';
+
+  buildInputs = [ SDL SDL_image SDL_mixer SDL_net ];
+
+  patches = [ ./logfile.patch ];
+
+  meta = {
+    homepage = http://trackballs.sourceforge.net/;
+    description = "Cross-platform pacman-like game";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/games/njam/logfile.patch b/pkgs/games/njam/logfile.patch
new file mode 100644
index 00000000000..45fd82a0845
--- /dev/null
+++ b/pkgs/games/njam/logfile.patch
@@ -0,0 +1,22 @@
+diff --git a/src/njamedit.cpp b/src/njamedit.cpp
+index a895ca9..38477db 100644
+--- a/src/njamedit.cpp
++++ b/src/njamedit.cpp
+@@ -114,7 +114,7 @@ void NjamEngine::LevelEditor()
+ 				key = SDLK_a;
+ 			else if (CheckForSave())
+ 			{
+-				LogFile::LogFile("Saving maps");
++				LogFile("Saving maps");
+ 				m_Maps.Save(filename);
+ 				level_type_was = level_type;
+ 				changed = false;
+@@ -139,7 +139,7 @@ void NjamEngine::LevelEditor()
+ 						"levels/%s.%s",
+ #endif					
+ 						filename, types[level_type]);
+-					LogFile::LogFile("Saving maps");
++					LogFile("Saving maps");
+ 					m_Maps.Save(buf);
+ 					level_type_was = level_type;
+ 					changed = false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96d87ef35a7..d84b261517b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7096,6 +7096,8 @@ let
 
   micropolis = callPackage ../games/micropolis { };
 
+  njam = callPackage ../games/njam { };
+
   openttd = callPackage ../games/openttd {
     zlib = zlibStatic;
   };

From 3df4a63ec23b9c0113e3b6ed9270cd3ccfe3e876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Mar 2011 21:18:05 +0000
Subject: [PATCH 128/143] Adding some skeleton for btanks. It needs smpeg
 still, to build.

svn path=/nixpkgs/trunk/; revision=26554
---
 pkgs/games/btanks/default.nix   | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/games/btanks/default.nix

diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix
new file mode 100644
index 00000000000..dbd70b03551
--- /dev/null
+++ b/pkgs/games/btanks/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, zlib }:
+
+throw "Still does not build. It needs smpeg"
+
+stdenv.mkDerivation rec {
+  name = "battle-tanks-0.9.8083";
+
+  src = fetchurl {
+    url = mirror://sourceforge/btanks/btanks-0.9.8083.tar.bz2;
+    sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz";
+  };
+
+  /* It still does not build */
+  buildInputs = [ scons pkgconfig SDL mesa zlib ];
+
+  installPhase = ''
+    scons PREFIX=$out
+    scons PREFIX=$out install
+  '';
+
+  meta = {
+    homepage = http://trackballs.sourceforge.net/;
+    description = "Fast 2d tank arcade game";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d84b261517b..a158bd6636a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7021,6 +7021,8 @@ let
 
   bsdgames = callPackage ../games/bsdgames { };
 
+  btanks = callPackage ../games/btanks { };
+
   bzflag = callPackage ../games/bzflag { };
 
   castle_combat = callPackage ../games/castle-combat { };

From f5f5f804743d72041fd0d4a7aa50af70da9ca6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Mar 2011 21:26:51 +0000
Subject: [PATCH 129/143] Fixing the btanks webpage.

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

diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix
index dbd70b03551..7172d4c8147 100644
--- a/pkgs/games/btanks/default.nix
+++ b/pkgs/games/btanks/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://trackballs.sourceforge.net/;
+    homepage = http://sourceforge.net/projects/btanks/;
     description = "Fast 2d tank arcade game";
     license = "GPLv2+";
   };

From 9da3ee528119f2e269fa2abe4538916bed511df6 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 27 Mar 2011 23:31:31 +0000
Subject: [PATCH 130/143] ustr: cleanup

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a158bd6636a..b692f7ad67d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4148,7 +4148,7 @@ let
 
   urt = callPackage ../development/libraries/urt { };
 
-  ustr = callPackage ../development/libraries/ustr { stdenv = overrideGCC stdenv gcc44; };
+  ustr = callPackage ../development/libraries/ustr { };
 
   ucommon = callPackage ../development/libraries/ucommon { };
 

From 4b26d460142bc7b0a3892f7baf9b003ced837d20 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 28 Mar 2011 07:38:16 +0000
Subject: [PATCH 131/143] policycoreutils: fix compilation

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

diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index 98a2bcb4e6c..b75405b4272 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libsepol libselinux ];
 
+  NIX_LDFLAGS = "-lsepol";
+
   makeFlags = "LOCALEDIR=$(out)/share/locale";
 
   meta = with stdenv.lib; {

From 1233bbb9fa2a001fac8d09e875f32dcafdfa997f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 28 Mar 2011 08:16:15 +0000
Subject: [PATCH 132/143] Adding PicoLisp

svn path=/nixpkgs/trunk/; revision=26558
---
 .../interpreters/picolisp/default.nix         | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/interpreters/picolisp/default.nix

diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
new file mode 100644
index 00000000000..298c12d271a
--- /dev/null
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -0,0 +1,66 @@
+x@{builderDefsPackage
+  , jdk /* only used in bootstrap */
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="picolisp";
+    tarballBaseName="picoLisp";
+    version="3.0.5";
+    name="${baseName}-${version}";
+    tarballName="${tarballBaseName}-${version}";
+    extension="tgz";
+    url="http://www.software-lab.de/${tarballName}.${extension}";
+    hash="07w2aygllkmnfcnby3dy88n9giqsas35s77rp2lr2ll5yy2hkc0x";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doMake" "doDeploy"];
+
+  goSrcDir = if a.stdenv.system == "x86_64-linux" then 
+    "cd src64" else "cd src";
+  makeFlags = [''PREFIX=$out''];
+
+  doDeploy = a.fullDepEntry (''
+    cd ..
+
+    sed -e "s@/usr/@$out/@g" -i bin/pil
+
+    ensureDir "$out/share/picolisp" "$out/lib" "$out/bin"
+    cp -r . "$out/share/picolisp/build-dir"
+    ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp"
+    ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp"
+  '') ["minInit" "defEnsureDir" "doMake"];
+      
+  meta = {
+    description = "An interpreter for a small Lisp dialect with builtin DB";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = a.lib.licenses.mit;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://www.software-lab.de/down.html";
+    };
+  };
+}) x
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b692f7ad67d..e811c8031c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2276,6 +2276,8 @@ let
 
   phpXdebug = callPackage ../development/interpreters/php-xdebug { };
 
+  picolisp = callPackage ../development/interpreters/picolisp {};
+
   pltScheme = builderDefsPackage (import ../development/interpreters/plt-scheme) {
     inherit cairo fontconfig freetype libjpeg libpng openssl
       perl mesa zlib which;

From 5142fda2bf98a5218c3684f258e826ecec8dd838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 28 Mar 2011 10:22:55 +0000
Subject: [PATCH 133/143] Updating freeimage.

svn path=/nixpkgs/trunk/; revision=26560
---
 pkgs/development/libraries/freeimage/default.nix  |  7 +++----
 pkgs/development/libraries/freeimage/memset.patch | 11 -----------
 2 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/development/libraries/freeimage/memset.patch

diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index b2118eb1da4..ec381dc433a 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/pkgs/development/libraries/freeimage/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl, unzip}:
 stdenv.mkDerivation {
-  name = "freeimage-3.14.1";
+  name = "freeimage-3.15.0";
   src = fetchurl {
-    url = mirror://sourceforge/freeimage/FreeImage3141.zip;
-    sha256 = "0rgzdjwzd64z5z9j4bq075h3kfqjk8ab2dwswy0lnzw9jvmbbifm";
+    url = mirror://sourceforge/freeimage/FreeImage3150.zip;
+    sha256 = "0diyj862sdqwjqb7v2nccf8cl6886v937jkw6dgszp86qpwsfx3n";
   };
   buildInputs = [ unzip ];
   prePatch = ''
@@ -12,7 +12,6 @@ stdenv.mkDerivation {
         -e 's@ldconfig@echo not running ldconfig@' \
         -i Makefile.gnu
   '';
-  patches = [ ./memset.patch ];
   preInstall = "mkdir -p $out/include $out/lib";
 
   meta = {
diff --git a/pkgs/development/libraries/freeimage/memset.patch b/pkgs/development/libraries/freeimage/memset.patch
deleted file mode 100644
index 91eabf10fdc..00000000000
--- a/pkgs/development/libraries/freeimage/memset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN a/Source/OpenEXR/Imath/ImathMatrix.h b/Source/OpenEXR/Imath/ImathMatrix.h
---- a/Source/OpenEXR/Imath/ImathMatrix.h 2010-07-17 12:48:40.000000000 +0200
-+++ b/Source/OpenEXR/Imath/ImathMatrix.h 2010-09-03 18:38:37.138598422 +0200
-@@ -49,6 +49,7 @@
- #include "ImathVec.h"
- #include "ImathShear.h"
- 
-+#include <string.h>
- #include <iostream>
- #include <iomanip>
- 

From b56430e7c05464b172428ea0011f1a17b685ff55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 28 Mar 2011 12:04:59 +0000
Subject: [PATCH 134/143] MPC is now a GNU project.

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

diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix
index c66c99cc576..88c18565b78 100644
--- a/pkgs/development/libraries/mpc/default.nix
+++ b/pkgs/development/libraries/mpc/default.nix
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "MPC, a library for multiprecision complex arithmetic with exact rounding";
+    description = "GNU MPC, a library for multiprecision complex arithmetic with exact rounding";
 
     longDescription =
-      '' MPC is a C library for the arithmetic of complex numbers with
+      '' GNU MPC is a C library for the arithmetic of complex numbers with
          arbitrarily high precision and correct rounding of the result.  It is
          built upon and follows the same principles as GNU MPFR.
       '';

From ed10cda58dd54597f48ad1df05f97454e04b5460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 28 Mar 2011 12:05:17 +0000
Subject: [PATCH 135/143] Guile-Lib 0.2.0.

svn path=/nixpkgs/trunk/; revision=26563
---
 pkgs/development/guile-modules/guile-lib/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index eb69acdef64..cfcef5f0551 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -1,17 +1,22 @@
 {stdenv, fetchurl, guile, texinfo}:
 
 stdenv.mkDerivation rec {
-  name = "guile-lib-0.1.9";
+  name = "guile-lib-0.2.0";
 
   src = fetchurl {
     url = "mirror://savannah/guile-lib/${name}.tar.gz";
-    sha256 = "13sc2x9x0rmfgfa69wabyhajc70yiywih9ibszjmkhxcm2zx0gan";
+    sha256 = "14acyznc0xgjd33fb9ngil102nvbhx12bvxi4hd25pl66i2d6izc";
   };
 
   buildInputs = [guile texinfo];
 
   doCheck = true;
 
+  preCheck =
+    # Make `libgcc_s.so' visible for `pthread_cancel'.
+    '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH"
+    '';
+
   meta = {
     description = "Guile-Library, a collection of useful Guile Scheme modules";
     homepage = http://www.nongnu.org/guile-lib/;

From 127a2fc8e05a87c57e326142b6441c00f19e2cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 28 Mar 2011 15:03:51 +0000
Subject: [PATCH 136/143] Added random-fu plus dependencies.

(Unfortunately doesn't compile yet with ghc-7.)

svn path=/nixpkgs/trunk/; revision=26569
---
 .../libraries/haskell/MonadPrompt/default.nix   | 17 +++++++++++++++++
 .../libraries/haskell/data-default/default.nix  | 13 +++++++++++++
 .../haskell/mersenne-random-pure64/default.nix  | 13 +++++++++++++
 .../libraries/haskell/monad-loops/default.nix   | 13 +++++++++++++
 .../libraries/haskell/random-fu/default.nix     | 17 +++++++++++++++++
 .../haskell/random-shuffle/default.nix          | 13 +++++++++++++
 .../libraries/haskell/stateref/default.nix      | 14 ++++++++++++++
 .../libraries/haskell/tagged/default.nix        | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix             | 16 ++++++++++++++++
 9 files changed, 130 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/MonadPrompt/default.nix
 create mode 100644 pkgs/development/libraries/haskell/data-default/default.nix
 create mode 100644 pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
 create mode 100644 pkgs/development/libraries/haskell/monad-loops/default.nix
 create mode 100644 pkgs/development/libraries/haskell/random-fu/default.nix
 create mode 100644 pkgs/development/libraries/haskell/random-shuffle/default.nix
 create mode 100644 pkgs/development/libraries/haskell/stateref/default.nix
 create mode 100644 pkgs/development/libraries/haskell/tagged/default.nix

diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
new file mode 100644
index 00000000000..34b4bd14db4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
@@ -0,0 +1,17 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "MonadPrompt";
+  version = "1.0.0.2";
+  sha256 = "01inbw0lfjrsgs68fvak1rxi76nhwsiyarfwl1g5mis4glmh4w4c";
+  propagatedBuildInputs = [mtl];
+  preConfigure = ''
+    sed -i 's|base<=4|base >= 3 \&\& < 5|' ${self.pname}.cabal
+  '';
+  meta = {
+    description = "MonadPrompt, implementation & examples";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix
new file mode 100644
index 00000000000..52292209e59
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-default/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "data-default";
+  version = "0.2.0.1";
+  sha256 = "0hhrzaykwybqpig0kss4iq1i93ygb80g8i1chpr84akmvdr07w0i";
+  meta = {
+    description = "A class for types with a default value";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
new file mode 100644
index 00000000000..a0617a0190d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "mersenne-random-pure64";
+  version = "0.2.0.3";
+  sha256 = "0cyjfdl17n5al04vliykx0m7zncqh3201vn9b9fqfqqpmm61grqz";
+  meta = {
+    description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix
new file mode 100644
index 00000000000..c8ec938318b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-loops/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "monad-loops";
+  version = "0.3.1.1";
+  sha256 = "086aqd1x1xc6irp24z1lwhzrknw9r2wbs8fnxz6vyi75m3rqvdcv";
+  meta = {
+    description = "Monadic loops";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
new file mode 100644
index 00000000000..7773e53cb8b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -0,0 +1,17 @@
+{cabal, erf, mtl, mersenneRandomPure64, monadLoops, MonadPrompt,
+ mwcRandom, randomShuffle, stateref, tagged, vector, syb}:
+
+cabal.mkDerivation (self : {
+  pname = "random-fu";
+  version = "0.1.3";
+  sha256 = "1l7czlll6y02m5xzdky95m78806gnj5y3nk3cxs5zqgxwskq73bk";
+  propagatedBuildInputs =
+    [erf mtl mersenneRandomPure64 monadLoops MonadPrompt
+     mwcRandom randomShuffle stateref tagged vector syb];
+  meta = {
+    description = "Random number generation";
+    license = "Public Domain";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix
new file mode 100644
index 00000000000..c420f5f0e35
--- /dev/null
+++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "random-shuffle";
+  version = "0.0.2";
+  sha256 = "1csq0ffsqbbv6ymf707nzfb7c9bmykwk9bcgj21mxmh6khlqn9jp";
+  meta = {
+    description = "Random shuffle implementation";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix
new file mode 100644
index 00000000000..6391f25261d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stateref/default.nix
@@ -0,0 +1,14 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "stateref";
+  version = "0.3";
+  sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Abstraction for things that work like IORef";
+    license = "Public Domain";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
new file mode 100644
index 00000000000..97d42cf62f0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -0,0 +1,14 @@
+{cabal, dataDefault}:
+
+cabal.mkDerivation (self : {
+  pname = "tagged";
+  version = "0.2";
+  sha256 = "0hwc0hhq5pzihx6danxvgs4k1z0nqcrwf3ji0w2i1gx3298cwrz5";
+  propagatedBuildInputs = [dataDefault];
+  meta = {
+    description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index beec7429fb2..8108326d099 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -355,6 +355,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {};
 
+  dataDefault = callPackage ../development/libraries/haskell/data-default {};
+
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
   dataReify = callPackage ../development/libraries/haskell/data-reify {};
@@ -590,6 +592,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {};
 
+  mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {};
+
   MissingH = callPackage ../development/libraries/haskell/MissingH {};
 
   mmap = callPackage ../development/libraries/haskell/mmap {};
@@ -600,8 +604,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   monadlab = callPackage ../development/libraries/haskell/monadlab {};
 
+  monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
+
   monadPeel = callPackage ../development/libraries/haskell/monad-peel {};
 
+  MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {};
+
   MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};
 
   monadsFd = callPackage ../development/libraries/haskell/monads-fd {};
@@ -709,6 +717,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     time = self.time_1_2_0_3;
   };
 
+  randomFu = callPackage ../development/libraries/haskell/random-fu {};
+
+  randomShuffle = callPackage ../development/libraries/haskell/random-shuffle {};
+
   readline = callPackage ../development/libraries/haskell/readline {
     inherit (pkgs) readline ncurses;
   };
@@ -745,6 +757,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   sendfile = callPackage ../development/libraries/haskell/sendfile {};
 
+  stateref = callPackage ../development/libraries/haskell/stateref {};
+
   statistics = callPackage ../development/libraries/haskell/statistics {};
 
   # TODO: investigate status of syb in older platform versions
@@ -800,6 +814,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   svgcairo = callPackage ../development/libraries/haskell/svgcairo {};
 
+  tagged = callPackage ../development/libraries/haskell/tagged {};
+
   tagsoup = callPackage ../development/libraries/haskell/tagsoup {};
 
   terminfo = callPackage ../development/libraries/haskell/terminfo {

From b18dd910573fc8ecdcf198acf8cc911124974d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 28 Mar 2011 15:04:00 +0000
Subject: [PATCH 137/143] Removing trailing whitespace.

svn path=/nixpkgs/trunk/; revision=26570
---
 pkgs/development/libraries/haskell/AC-Vector/default.nix    | 2 +-
 pkgs/development/libraries/haskell/Agda/default.nix         | 2 +-
 pkgs/development/libraries/haskell/AspectAG/default.nix     | 2 +-
 pkgs/development/libraries/haskell/Boolean/default.nix      | 2 +-
 pkgs/development/libraries/haskell/CS173Tourney/default.nix | 6 +++---
 pkgs/development/libraries/haskell/Chart/default.nix        | 2 +-
 pkgs/development/libraries/haskell/ConfigFile/default.nix   | 2 +-
 pkgs/development/libraries/haskell/CouchDB/default.nix      | 4 ++--
 pkgs/development/libraries/haskell/Crypto/default.nix       | 2 +-
 pkgs/development/libraries/haskell/Diff/default.nix         | 2 +-
 pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix         | 2 +-
 pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix         | 2 +-
 pkgs/development/libraries/haskell/Graphalyze/default.nix   | 2 +-
 pkgs/development/libraries/haskell/HList/default.nix        | 2 +-
 .../libraries/haskell/HStringTemplate/default.nix           | 2 +-
 pkgs/development/libraries/haskell/HTTP/3001.1.5.nix        | 2 +-
 pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix        | 2 +-
 pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix        | 2 +-
 pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix        | 2 +-
 pkgs/development/libraries/haskell/Hipmunk/default.nix      | 2 +-
 .../libraries/haskell/MaybeT-transformers/default.nix       | 2 +-
 pkgs/development/libraries/haskell/MaybeT/default.nix       | 2 +-
 pkgs/development/libraries/haskell/MemoTrie/default.nix     | 2 +-
 pkgs/development/libraries/haskell/MissingH/default.nix     | 2 +-
 .../libraries/haskell/MonadCatchIO-mtl/default.nix          | 2 +-
 .../libraries/haskell/MonadCatchIO-transformers/default.nix | 2 +-
 pkgs/development/libraries/haskell/MonadPrompt/default.nix  | 2 +-
 pkgs/development/libraries/haskell/MonadRandom/default.nix  | 2 +-
 pkgs/development/libraries/haskell/OpenAL/default.nix       | 2 +-
 pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix       | 2 +-
 pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix       | 2 +-
 pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix   | 2 +-
 pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix   | 2 +-
 pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix   | 2 +-
 pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix   | 2 +-
 pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix   | 2 +-
 pkgs/development/libraries/haskell/Ranged-sets/default.nix  | 2 +-
 pkgs/development/libraries/haskell/SDL-image/default.nix    | 2 +-
 pkgs/development/libraries/haskell/SDL-mixer/default.nix    | 2 +-
 pkgs/development/libraries/haskell/SDL-ttf/default.nix      | 2 +-
 pkgs/development/libraries/haskell/SDL/default.nix          | 2 +-
 pkgs/development/libraries/haskell/SHA/default.nix          | 2 +-
 pkgs/development/libraries/haskell/SMTPClient/default.nix   | 2 +-
 .../libraries/haskell/Shellac/Shellac-haskeline.nix         | 2 +-
 .../libraries/haskell/Shellac/Shellac-readline.nix          | 2 +-
 pkgs/development/libraries/haskell/Shellac/Shellac.nix      | 2 +-
 pkgs/development/libraries/haskell/Vec/default.nix          | 2 +-
 .../libraries/haskell/WebServer-Extras/default.nix          | 6 +++---
 pkgs/development/libraries/haskell/WebServer/default.nix    | 4 ++--
 .../development/libraries/haskell/ansi-terminal/default.nix | 2 +-
 .../libraries/haskell/ansi-wl-pprint/default.nix            | 2 +-
 .../development/libraries/haskell/base64-string/default.nix | 4 ++--
 pkgs/development/libraries/haskell/bimap/default.nix        | 2 +-
 .../development/libraries/haskell/binary-shared/default.nix | 2 +-
 pkgs/development/libraries/haskell/binary/default.nix       | 2 +-
 pkgs/development/libraries/haskell/bktrees/default.nix      | 2 +-
 .../development/libraries/haskell/cautious-file/default.nix | 2 +-
 pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix       | 2 +-
 pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix       | 2 +-
 pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix       | 2 +-
 pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix       | 2 +-
 pkgs/development/libraries/haskell/citeproc-hs/default.nix  | 2 +-
 .../libraries/haskell/colorize-haskell/default.nix          | 2 +-
 pkgs/development/libraries/haskell/colour/default.nix       | 2 +-
 pkgs/development/libraries/haskell/convertible/default.nix  | 2 +-
 pkgs/development/libraries/haskell/csv/default.nix          | 2 +-
 .../haskell/data-accessor/data-accessor-template.nix        | 2 +-
 .../libraries/haskell/data-accessor/data-accessor.nix       | 2 +-
 pkgs/development/libraries/haskell/data-default/default.nix | 2 +-
 pkgs/development/libraries/haskell/digest/default.nix       | 2 +-
 pkgs/development/libraries/haskell/dlist/default.nix        | 2 +-
 pkgs/development/libraries/haskell/dotgen/default.nix       | 2 +-
 pkgs/development/libraries/haskell/editline/default.nix     | 2 +-
 pkgs/development/libraries/haskell/emgm/default.nix         | 2 +-
 pkgs/development/libraries/haskell/erf/default.nix          | 2 +-
 .../libraries/haskell/extensible-exceptions/default.nix     | 2 +-
 pkgs/development/libraries/haskell/fclabels/default.nix     | 2 +-
 pkgs/development/libraries/haskell/feed/default.nix         | 2 +-
 pkgs/development/libraries/haskell/fgl/5.4.2.2.nix          | 2 +-
 pkgs/development/libraries/haskell/fgl/5.4.2.3.nix          | 2 +-
 pkgs/development/libraries/haskell/filepath/default.nix     | 2 +-
 pkgs/development/libraries/haskell/filestore/default.nix    | 2 +-
 pkgs/development/libraries/haskell/gdiff/default.nix        | 2 +-
 pkgs/development/libraries/haskell/get-options/default.nix  | 2 +-
 pkgs/development/libraries/haskell/ghc-core/default.nix     | 2 +-
 pkgs/development/libraries/haskell/ghc-mtl/default.nix      | 2 +-
 pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix    | 2 +-
 pkgs/development/libraries/haskell/ghc-paths/default.nix    | 2 +-
 pkgs/development/libraries/haskell/gitit/default.nix        | 2 +-
 pkgs/development/libraries/haskell/graphviz/default.nix     | 2 +-
 .../libraries/haskell/haskeline-class/default.nix           | 2 +-
 pkgs/development/libraries/haskell/haskeline/default.nix    | 2 +-
 .../development/libraries/haskell/haskell-lexer/default.nix | 2 +-
 .../libraries/haskell/haskell-platform/2009.2.0.2.nix       | 2 +-
 .../libraries/haskell/haskell-platform/2010.1.0.0.nix       | 2 +-
 .../libraries/haskell/haskell-platform/2010.2.0.0.nix       | 2 +-
 .../libraries/haskell/haskell-platform/2011.2.0.0.nix       | 2 +-
 .../libraries/haskell/haskell-src-exts/default.nix          | 2 +-
 .../libraries/haskell/haskell-src-meta/default.nix          | 2 +-
 pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix  | 2 +-
 pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix  | 2 +-
 .../libraries/haskell/highlighting-kate/default.nix         | 2 +-
 pkgs/development/libraries/haskell/hint/default.nix         | 2 +-
 pkgs/development/libraries/haskell/hmatrix/default.nix      | 2 +-
 pkgs/development/libraries/haskell/hsemail/default.nix      | 2 +-
 .../libraries/haskell/hslogger-template/default.nix         | 2 +-
 pkgs/development/libraries/haskell/html/1.0.1.2.nix         | 2 +-
 pkgs/development/libraries/haskell/httpd-shed/default.nix   | 2 +-
 pkgs/development/libraries/haskell/jpeg/default.nix         | 2 +-
 pkgs/development/libraries/haskell/json/0.3.6.nix           | 2 +-
 pkgs/development/libraries/haskell/json/default.nix         | 2 +-
 .../libraries/haskell/mersenne-random-pure64/default.nix    | 2 +-
 pkgs/development/libraries/haskell/mmap/default.nix         | 2 +-
 pkgs/development/libraries/haskell/monad-loops/default.nix  | 2 +-
 pkgs/development/libraries/haskell/monads-fd/default.nix    | 2 +-
 pkgs/development/libraries/haskell/mpppc/default.nix        | 2 +-
 pkgs/development/libraries/haskell/mtl/1.1.0.2.nix          | 2 +-
 pkgs/development/libraries/haskell/mtl/1.1.1.1.nix          | 2 +-
 pkgs/development/libraries/haskell/mtl/2.0.1.0.nix          | 2 +-
 pkgs/development/libraries/haskell/multiplate/default.nix   | 2 +-
 pkgs/development/libraries/haskell/multirec/default.nix     | 2 +-
 pkgs/development/libraries/haskell/multiset/default.nix     | 2 +-
 pkgs/development/libraries/haskell/mwc-random/default.nix   | 2 +-
 pkgs/development/libraries/haskell/network/2.2.1.4.nix      | 2 +-
 pkgs/development/libraries/haskell/network/2.2.1.7.nix      | 2 +-
 pkgs/development/libraries/haskell/network/2.3.0.2.nix      | 2 +-
 pkgs/development/libraries/haskell/parallel/1.1.0.1.nix     | 2 +-
 pkgs/development/libraries/haskell/parallel/2.2.0.1.nix     | 2 +-
 pkgs/development/libraries/haskell/parallel/3.1.0.1.nix     | 2 +-
 pkgs/development/libraries/haskell/parsec/2.1.0.1.nix       | 2 +-
 pkgs/development/libraries/haskell/parsimony/default.nix    | 2 +-
 pkgs/development/libraries/haskell/pcre-light/default.nix   | 2 +-
 pkgs/development/libraries/haskell/polyparse/default.nix    | 2 +-
 pkgs/development/libraries/haskell/pretty-show/default.nix  | 2 +-
 pkgs/development/libraries/haskell/primitive/default.nix    | 2 +-
 pkgs/development/libraries/haskell/pureMD5/default.nix      | 2 +-
 pkgs/development/libraries/haskell/random-fu/default.nix    | 2 +-
 .../libraries/haskell/random-shuffle/default.nix            | 2 +-
 pkgs/development/libraries/haskell/readline/default.nix     | 2 +-
 pkgs/development/libraries/haskell/recaptcha/default.nix    | 2 +-
 pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix  | 2 +-
 pkgs/development/libraries/haskell/regex-base/0.93.1.nix    | 2 +-
 pkgs/development/libraries/haskell/regex-base/0.93.2.nix    | 2 +-
 .../development/libraries/haskell/regex-compat/0.71.0.1.nix | 2 +-
 pkgs/development/libraries/haskell/regex-compat/0.92.nix    | 2 +-
 pkgs/development/libraries/haskell/regex-compat/0.93.1.nix  | 2 +-
 pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix | 2 +-
 pkgs/development/libraries/haskell/regex-posix/0.94.1.nix   | 2 +-
 pkgs/development/libraries/haskell/regex-posix/0.94.2.nix   | 2 +-
 pkgs/development/libraries/haskell/regex-posix/0.94.4.nix   | 2 +-
 pkgs/development/libraries/haskell/regular/default.nix      | 2 +-
 pkgs/development/libraries/haskell/safe/default.nix         | 2 +-
 .../libraries/haskell/salvia-protocol/default.nix           | 2 +-
 pkgs/development/libraries/haskell/salvia/default.nix       | 2 +-
 pkgs/development/libraries/haskell/sendfile/default.nix     | 2 +-
 pkgs/development/libraries/haskell/stateref/default.nix     | 2 +-
 pkgs/development/libraries/haskell/statistics/default.nix   | 2 +-
 pkgs/development/libraries/haskell/stm/2.1.1.2.nix          | 2 +-
 pkgs/development/libraries/haskell/stm/2.1.2.1.nix          | 2 +-
 pkgs/development/libraries/haskell/stm/2.2.0.1.nix          | 2 +-
 .../libraries/haskell/strictConcurrency/default.nix         | 2 +-
 pkgs/development/libraries/haskell/tagged/default.nix       | 2 +-
 pkgs/development/libraries/haskell/tagsoup/default.nix      | 2 +-
 pkgs/development/libraries/haskell/testpack/default.nix     | 2 +-
 pkgs/development/libraries/haskell/texmath/default.nix      | 2 +-
 pkgs/development/libraries/haskell/text/0.11.0.5.nix        | 2 +-
 .../development/libraries/haskell/threadmanager/default.nix | 2 +-
 pkgs/development/libraries/haskell/time/1.1.2.4.nix         | 2 +-
 pkgs/development/libraries/haskell/time/1.1.3.nix           | 2 +-
 pkgs/development/libraries/haskell/time/1.2.0.3.nix         | 2 +-
 pkgs/development/libraries/haskell/transformers/0.2.2.0.nix | 2 +-
 pkgs/development/libraries/haskell/uniplate/default.nix     | 2 +-
 pkgs/development/libraries/haskell/uniqueid/default.nix     | 2 +-
 pkgs/development/libraries/haskell/unix-compat/default.nix  | 2 +-
 pkgs/development/libraries/haskell/url/default.nix          | 2 +-
 pkgs/development/libraries/haskell/utf8-string/default.nix  | 2 +-
 .../development/libraries/haskell/uu-parsinglib/default.nix | 2 +-
 pkgs/development/libraries/haskell/vacuum-cairo/default.nix | 2 +-
 pkgs/development/libraries/haskell/vacuum/default.nix       | 2 +-
 .../libraries/haskell/vector-algorithms/default.nix         | 2 +-
 pkgs/development/libraries/haskell/vector-space/default.nix | 2 +-
 pkgs/development/libraries/haskell/vector/default.nix       | 2 +-
 pkgs/development/libraries/haskell/wxHaskell/wx.nix         | 2 +-
 pkgs/development/libraries/haskell/wxHaskell/wxcore.nix     | 2 +-
 pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix   | 2 +-
 pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix     | 2 +-
 pkgs/development/libraries/haskell/xml/default.nix          | 2 +-
 pkgs/development/libraries/haskell/xss-sanitize/default.nix | 2 +-
 pkgs/development/libraries/haskell/zip-archive/default.nix  | 2 +-
 pkgs/development/libraries/haskell/zipper/default.nix       | 2 +-
 190 files changed, 197 insertions(+), 197 deletions(-)

diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix
index 0eacf3249b9..de9bdf8e479 100644
--- a/pkgs/development/libraries/haskell/AC-Vector/default.nix
+++ b/pkgs/development/libraries/haskell/AC-Vector/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix
index 160925482a4..5c896747ef1 100644
--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@@ -14,5 +14,5 @@ cabal.mkDerivation (self : {
     description = "A dependently typed functional language and proof assistant";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix
index 1f9737664a5..70d6def0156 100644
--- a/pkgs/development/libraries/haskell/AspectAG/default.nix
+++ b/pkgs/development/libraries/haskell/AspectAG/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "LGPL";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
index 664ea603995..78f9bae7630 100644
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ b/pkgs/development/libraries/haskell/Boolean/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/CS173Tourney/default.nix b/pkgs/development/libraries/haskell/CS173Tourney/default.nix
index 42df8754a34..ac35433e144 100644
--- a/pkgs/development/libraries/haskell/CS173Tourney/default.nix
+++ b/pkgs/development/libraries/haskell/CS173Tourney/default.nix
@@ -3,16 +3,16 @@
 cabal.mkDerivation (self : {
   pname = "CS173Tourney";
   version = "2.5.2";
-  
+
   src = fetchgit {
     url = git://github.com/arjunguha/173tourney.git;
     rev = "dce044761b008cb685a675a1f35be6aff66fed21" ;
     md5 = "21e5e5c2e184b4b70696d4d6c60e51d3";
   };
-  patches = [./sendmail.patch]; 
+  patches = [./sendmail.patch];
   propagatedBuildInputs = [json time hslogger Crypto base64string CouchDB WebServer WebServerExtras];
   meta = {
     description = "";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
index 6e5fdb9b787..9bbae20e51f 100644
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -11,5 +11,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
index 3ad1f545067..7598ba9c512 100644
--- a/pkgs/development/libraries/haskell/ConfigFile/default.nix
+++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "LGPL";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix
index 137aee52fb8..e3ce4825d77 100644
--- a/pkgs/development/libraries/haskell/CouchDB/default.nix
+++ b/pkgs/development/libraries/haskell/CouchDB/default.nix
@@ -3,12 +3,12 @@
 cabal.mkDerivation (self : {
   pname = "CouchDB";
   version = "0.8.1.1";
-  
+
   sha256 = "91edc35782e43a3b8dd5c5d3c303b88c05c57ba686e9565a11fe4d060f9372d7";
 
   propagatedBuildInputs = [network HTTP mtl json];
   meta = {
     description = "";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix
index 1a43ebd40f7..a25330a7b61 100644
--- a/pkgs/development/libraries/haskell/Crypto/default.nix
+++ b/pkgs/development/libraries/haskell/Crypto/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Several encryption algorithms for Haskell";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix
index ae408f69d4c..e40dec6dc96 100644
--- a/pkgs/development/libraries/haskell/Diff/default.nix
+++ b/pkgs/development/libraries/haskell/Diff/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "O(ND) diff algorithm in Haskell";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
index 9ccae0604f0..2ea65ec9d78 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A binding for the OpenGL Utility Toolkit";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
index 5ac0b612e63..4aa36b907bb 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A binding for the OpenGL Utility Toolkit";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix
index 0eca1c7edfc..253f6e08f2a 100644
--- a/pkgs/development/libraries/haskell/Graphalyze/default.nix
+++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     description = "A library to use graph theory analysis";
     license = "OtherLicene";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix
index 0e95d1771e5..92d9cbbef73 100644
--- a/pkgs/development/libraries/haskell/HList/default.nix
+++ b/pkgs/development/libraries/haskell/HList/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Heterogeneous lists";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
index 40909a25cce..e3b833e1cb3 100644
--- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix
+++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "StringTemplate implementation in Haskell";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/HTTP/3001.1.5.nix b/pkgs/development/libraries/haskell/HTTP/3001.1.5.nix
index d54ff70c1a4..b8ba3f27df6 100644
--- a/pkgs/development/libraries/haskell/HTTP/3001.1.5.nix
+++ b/pkgs/development/libraries/haskell/HTTP/3001.1.5.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "HTTP";
-  version = "3001.1.5"; 
+  version = "3001.1.5";
   sha256 = "e34d9f979bafbbf2e45bf90a9ee9bfd291f3c67c291a250cc0a6378431578aeb";
   propagatedBuildInputs = [mtl network parsec];
   meta = {
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
index a6f66eefad6..36e8b86f301 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A unit testing framework for Haskell";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
index a2cd4665e79..ebbf304721b 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A unit testing framework for Haskell";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
index 6b49db16227..d1e3f05aa62 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A unit testing framework for Haskell";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index 39dee6e8b09..8b965858f79 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A Haskell binding for Chipmunk";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix b/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix
index 4b67f75ad25..c07747a1674 100644
--- a/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix
index 783ff85d0c2..34a27532f68 100644
--- a/pkgs/development/libraries/haskell/MaybeT/default.nix
+++ b/pkgs/development/libraries/haskell/MaybeT/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix
index f826d0b13e0..68359322787 100644
--- a/pkgs/development/libraries/haskell/MemoTrie/default.nix
+++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index 252eb88c929..3e81e7548bf 100644
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "GPL";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
index 8e228bef5ef..cf848419bec 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Monad-transformer version of the Control.Exception module";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
index 665e1687ac0..13b271524ef 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Monad-transformer compatible version of the Control.Exception module";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
index 34b4bd14db4..33af33fe2e9 100644
--- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix
+++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
@@ -13,5 +13,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix
index 461f98a9033..c57e47003ee 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/default.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Random-number generation monad";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix
index 45d2394960d..87a8aa772ef 100644
--- a/pkgs/development/libraries/haskell/OpenAL/default.nix
+++ b/pkgs/development/libraries/haskell/OpenAL/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A binding to the OpenAL cross-platform 3D audio API";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
index dc16fb9cf17..b876c10b6e1 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A binding for the OpenGL graphics system";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
index c11b3612a45..55a2dd8130d 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A binding for the OpenGL graphics system";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
index 5405e50aa6b..ea59c8c7fdd 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Automatic testing of Haskell programs";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
index e305874bef9..195cd797dfe 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Automatic testing of Haskell programs";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix
index 6ad15d15380..182ee9ea42a 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
index f4463394ea1..3e8fa4ff9d4 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
index dd00a888fce..6a2a5470cd7 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix
index 547ac31b03c..3f650b22c09 100644
--- a/pkgs/development/libraries/haskell/Ranged-sets/default.nix
+++ b/pkgs/development/libraries/haskell/Ranged-sets/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix
index 4555cf322b8..e187b88492c 100644
--- a/pkgs/development/libraries/haskell/SDL-image/default.nix
+++ b/pkgs/development/libraries/haskell/SDL-image/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Binding to libSDL_image";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix
index e1bd81d834b..d1974a60156 100644
--- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix
+++ b/pkgs/development/libraries/haskell/SDL-mixer/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Binding to libSDL_mixer";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix
index 89c3a9bad8a..1d15976df1b 100644
--- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix
+++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Binding to libSDL_ttf";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix
index 0ffca624cd4..ce4c3cec66f 100644
--- a/pkgs/development/libraries/haskell/SDL/default.nix
+++ b/pkgs/development/libraries/haskell/SDL/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Binding to libSDL";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix
index 67d41c38422..5389cfcb498 100644
--- a/pkgs/development/libraries/haskell/SHA/default.nix
+++ b/pkgs/development/libraries/haskell/SHA/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Implementations of the SHA suite of message digest functions";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix
index 45c8d4aeaee..bac471ee90f 100644
--- a/pkgs/development/libraries/haskell/SMTPClient/default.nix
+++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix
index 9a697b95c91..b3a3563f6a1 100644
--- a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix
+++ b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Haskeline backend module for Shellac";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix
index 991126f709b..c728146c953 100644
--- a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix
+++ b/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Readline backend module for Shellac";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix
index 8660bd6dc13..a7034f27922 100644
--- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix
+++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A framework for creating shell environments";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix
index 92e1a68db28..4df2ccdb645 100644
--- a/pkgs/development/libraries/haskell/Vec/default.nix
+++ b/pkgs/development/libraries/haskell/Vec/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/WebServer-Extras/default.nix b/pkgs/development/libraries/haskell/WebServer-Extras/default.nix
index a0fe545ee21..1b427f72b78 100644
--- a/pkgs/development/libraries/haskell/WebServer-Extras/default.nix
+++ b/pkgs/development/libraries/haskell/WebServer-Extras/default.nix
@@ -4,16 +4,16 @@
 cabal.mkDerivation (self : {
   pname = "WebServer-Extras";
   version = "1.2";
-  
+
   src = fetchgit {
     url = git://github.com/arjunguha/haskell-web.git;
     rev = "76c9aabd31d03f052a80a0f6999dc7c5f1b11c41" ;
     sha256 = "afd550a4c6aeffe2f3adb38556b8e9ae198e98db17338ea6c8fa92d56c7eddb7";
   };
-  sourceRoot = "git-export/Extras"; 
+  sourceRoot = "git-export/Extras";
   propagatedBuildInputs = [Crypto WebServer base64string hslogger json mtl];
   meta = {
     description = "";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/WebServer/default.nix b/pkgs/development/libraries/haskell/WebServer/default.nix
index 003a4f27ac7..c8a1a2cd6cc 100644
--- a/pkgs/development/libraries/haskell/WebServer/default.nix
+++ b/pkgs/development/libraries/haskell/WebServer/default.nix
@@ -3,7 +3,7 @@
 cabal.mkDerivation (self : {
   pname = "WebServer";
   version = "1.2";
-  
+
   src = fetchgit {
     url = git://github.com/arjunguha/haskell-web.git;
     rev = "76c9aabd31d03f052a80a0f6999dc7c5f1b11c41" ;
@@ -14,5 +14,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
index 1da8fd85591..25e0fb88792 100644
--- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix
+++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Simple ANSI terminal support, with Windows compatibility";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
index b4507b5f411..b7141f6517d 100644
--- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
+++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/base64-string/default.nix b/pkgs/development/libraries/haskell/base64-string/default.nix
index 0d14a6cd142..348f4927ae1 100644
--- a/pkgs/development/libraries/haskell/base64-string/default.nix
+++ b/pkgs/development/libraries/haskell/base64-string/default.nix
@@ -3,12 +3,12 @@
 cabal.mkDerivation (self : {
   pname = "base64-string";
   version = "0.1";
-  
+
   sha256 = "f9a6f050f5d9993313a1ceb49eba827ecf1046af51266d10b0dc899b53f13d8c";
 
   propagatedBuildInputs = [];
   meta = {
     description = "";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix
index ec2dd1d3632..0e3365a4090 100644
--- a/pkgs/development/libraries/haskell/bimap/default.nix
+++ b/pkgs/development/libraries/haskell/bimap/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix
index 8c1bda52453..aea6fe19209 100644
--- a/pkgs/development/libraries/haskell/binary-shared/default.nix
+++ b/pkgs/development/libraries/haskell/binary-shared/default.nix
@@ -10,4 +10,4 @@ cabal.mkDerivation (self : {
     license = "GPL";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix
index 53aee9ca5b9..b2f729b25f9 100644
--- a/pkgs/development/libraries/haskell/binary/default.nix
+++ b/pkgs/development/libraries/haskell/binary/default.nix
@@ -7,4 +7,4 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Efficient, pure binary serialisation using lazy ByteStrings";
   };
-})  
+})
diff --git a/pkgs/development/libraries/haskell/bktrees/default.nix b/pkgs/development/libraries/haskell/bktrees/default.nix
index 03452a99f2b..19f79321199 100644
--- a/pkgs/development/libraries/haskell/bktrees/default.nix
+++ b/pkgs/development/libraries/haskell/bktrees/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
     description = "Burkhard-Keller trees sets implementation";
     license = "BSD3";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix
index 16fe6672bc7..012843adab8 100644
--- a/pkgs/development/libraries/haskell/cautious-file/default.nix
+++ b/pkgs/development/libraries/haskell/cautious-file/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
index e6e5bd91df6..c9740c6aabd 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A library for writing CGI programs";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
index 89e6df5004c..e694d51ba30 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A library for writing CGI programs";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
index d425e84d692..976fbc572b8 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A library for writing CGI programs";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
index 6b411ef7eca..d925ad5343c 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A library for writing CGI programs";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
index 1b41e6f3327..e1ce1124b07 100644
--- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix
+++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A Citation Style Language implementation in Haskell";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/colorize-haskell/default.nix b/pkgs/development/libraries/haskell/colorize-haskell/default.nix
index 1b7016970fa..1a74796981f 100644
--- a/pkgs/development/libraries/haskell/colorize-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/colorize-haskell/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Highlight Haskell source";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix
index 661f1507ab1..99b93632595 100644
--- a/pkgs/development/libraries/haskell/colour/default.nix
+++ b/pkgs/development/libraries/haskell/colour/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
     description = "Data type, conversion and composition of colours";
     license = "OtherLicense";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix
index 127da1f3b6b..7adc2e974f3 100644
--- a/pkgs/development/libraries/haskell/convertible/default.nix
+++ b/pkgs/development/libraries/haskell/convertible/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Typeclasses and instances for converting between types";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/csv/default.nix b/pkgs/development/libraries/haskell/csv/default.nix
index 56eefcc43a9..edbc977726a 100644
--- a/pkgs/development/libraries/haskell/csv/default.nix
+++ b/pkgs/development/libraries/haskell/csv/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "CSV loader and dumper";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
index ff985fbfef8..e3c80fdbd9c 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
index 99e84244460..9decb7ac2ed 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix
index 52292209e59..6575e9aa3db 100644
--- a/pkgs/development/libraries/haskell/data-default/default.nix
+++ b/pkgs/development/libraries/haskell/data-default/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix
index ce9a4edc027..7df65b1c0bf 100644
--- a/pkgs/development/libraries/haskell/digest/default.nix
+++ b/pkgs/development/libraries/haskell/digest/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Various cryptographic hashes for bytestrings: CRC32 and Adler32 for now";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix
index 6f99da03c80..fd0c2758593 100644
--- a/pkgs/development/libraries/haskell/dlist/default.nix
+++ b/pkgs/development/libraries/haskell/dlist/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix
index 19d0bc07513..c9e4c1e0400 100644
--- a/pkgs/development/libraries/haskell/dotgen/default.nix
+++ b/pkgs/development/libraries/haskell/dotgen/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A simple interface for building .dot graph files";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/editline/default.nix b/pkgs/development/libraries/haskell/editline/default.nix
index fb06cd52a80..b477df5fbd1 100644
--- a/pkgs/development/libraries/haskell/editline/default.nix
+++ b/pkgs/development/libraries/haskell/editline/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Binding to the BSD editline library (libedit)";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/emgm/default.nix b/pkgs/development/libraries/haskell/emgm/default.nix
index 8082b2f8d91..b5aa22ede88 100644
--- a/pkgs/development/libraries/haskell/emgm/default.nix
+++ b/pkgs/development/libraries/haskell/emgm/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Extensible and Modular Generics for the Masses";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix
index 57691777564..7bceb45f3e9 100644
--- a/pkgs/development/libraries/haskell/erf/default.nix
+++ b/pkgs/development/libraries/haskell/erf/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/default.nix b/pkgs/development/libraries/haskell/extensible-exceptions/default.nix
index 93857414f60..19390cc9470 100644
--- a/pkgs/development/libraries/haskell/extensible-exceptions/default.nix
+++ b/pkgs/development/libraries/haskell/extensible-exceptions/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Extensible exceptions";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index 4c13955a77e..61504f2be5c 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
index 3f1e9173efa..18a43e1075f 100644
--- a/pkgs/development/libraries/haskell/feed/default.nix
+++ b/pkgs/development/libraries/haskell/feed/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
index f14031aec5f..a71b83da033 100644
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Martin Erwig's Functional Graph Library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
index 01d0f6a64f2..1348e5f9913 100644
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Martin Erwig's Functional Graph Library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix
index 08d46f0c71f..4ba15b54e60 100644
--- a/pkgs/development/libraries/haskell/filepath/default.nix
+++ b/pkgs/development/libraries/haskell/filepath/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Library for manipulating FilePath's in a cross platform way";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index 996d0a51cbd..5fa1927df54 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Interface for versioning file stores";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix
index 3ea5e4877fa..5f494d19816 100644
--- a/pkgs/development/libraries/haskell/gdiff/default.nix
+++ b/pkgs/development/libraries/haskell/gdiff/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/get-options/default.nix b/pkgs/development/libraries/haskell/get-options/default.nix
index 1371f1719a3..01ae7575870 100644
--- a/pkgs/development/libraries/haskell/get-options/default.nix
+++ b/pkgs/development/libraries/haskell/get-options/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "get-options";
-  version = "x"; # ? 
+  version = "x"; # ?
   name = self.fname;
   # REGION AUTO UPDATE:             { name="getOptions"; type="darcs"; url = "http://repetae.net/john/repos/GetOptions"; }
   src = sourceFromHead "getOptions-nrmtag1.tar.gz"
diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix
index 0c1024e562b..27c18a5ad34 100644
--- a/pkgs/development/libraries/haskell/ghc-core/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-core/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Display GHC's core and assembly output in a pager";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
index 07b55c1aaa7..019086a6775 100644
--- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix b/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix
index f8c4a29e5e1..5d2ad6beaf5 100644
--- a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix
+++ b/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Knowledge of GHC's installations directories";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/ghc-paths/default.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix
index dadd195acfe..945a5605827 100644
--- a/pkgs/development/libraries/haskell/ghc-paths/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-paths/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Knowledge of GHC's installations directories";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 6edfa44087e..b5a1cfdbfcb 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -19,5 +19,5 @@ cabal.mkDerivation (self : {
     license = "GPL";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index f747d81e6c6..7f8b040d971 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     description = "Bindings for the Dot language (Graphviz)";
     license = "BSD3";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/haskeline-class/default.nix b/pkgs/development/libraries/haskell/haskeline-class/default.nix
index 40b3857c03b..d5658adf3c1 100644
--- a/pkgs/development/libraries/haskell/haskeline-class/default.nix
+++ b/pkgs/development/libraries/haskell/haskeline-class/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Class interface for working with Haskeline";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix
index 8c1ca9d87d2..f3a87459ace 100644
--- a/pkgs/development/libraries/haskell/haskeline/default.nix
+++ b/pkgs/development/libraries/haskell/haskeline/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A command-line interface for user input, written in Haskell";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/haskell-lexer/default.nix b/pkgs/development/libraries/haskell/haskell-lexer/default.nix
index 1df6b90db0d..465c2a39ac1 100644
--- a/pkgs/development/libraries/haskell/haskell-lexer/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-lexer/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A fully compliant Haskell 98 lexer";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
index 20aec7e59e9..e87d59582f2 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
@@ -20,5 +20,5 @@ cabal.mkDerivation (self : {
     description = "Haskell Platform meta package";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix
index 117c4fb3bf9..fc7de20f6c1 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix
@@ -20,5 +20,5 @@ cabal.mkDerivation (self : {
     description = "Haskell Platform meta package";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
index 476fc35f704..3a47f2a39c9 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
@@ -20,5 +20,5 @@ cabal.mkDerivation (self : {
     description = "Haskell Platform meta package";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix
index 1b4e56f68d0..8eb1b457aa3 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix
@@ -22,5 +22,5 @@ cabal.mkDerivation (self : {
     description = "Haskell Platform meta package";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
index f6be0149b99..c3c433b92a4 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index b60e55ed0eb..bc4455cadf3 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Parse source to template-haskell abstract syntax";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix
index 0cc7e888a20..c70bdc252fc 100644
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Manipulating Haskell source code";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix
index 7855b4a92c8..b58b0ad7f88 100644
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Manipulating Haskell source code";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index f637caa086c..cce66f3ec10 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -8,4 +8,4 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Syntax highlighting";
   };
-})  
+})
diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
index 17a5518c721..b37d7739148 100644
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@@ -12,5 +12,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 19d1d825c3f..5a0ff3e09ca 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -8,7 +8,7 @@ cabal.mkDerivation (self : {
   configureFlags = "-fvector";
   /* dirty hack to find blas at link time */
   postConfigure = ''
-    sed -i -e "/^extra-libraries/ s/: /: blas /" hmatrix.buildinfo 
+    sed -i -e "/^extra-libraries/ s/: /: blas /" hmatrix.buildinfo
     sed -i -e "/^extra-libraries/ s/$/ blas/" hmatrix.buildinfo
   '';
   extraLibDirs = "--extra-lib-dir=${blas}/lib --extra-lib-dir=${gsl}/lib --extra-lib-dir=${liblapack}/lib";
diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix
index bce28aa71fa..f9315e43c3e 100644
--- a/pkgs/development/libraries/haskell/hsemail/default.nix
+++ b/pkgs/development/libraries/haskell/hsemail/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix
index c08cdf3736f..79e6ab2a756 100644
--- a/pkgs/development/libraries/haskell/hslogger-template/default.nix
+++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Library for generating hslogger functions using Template Haskell";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/html/1.0.1.2.nix b/pkgs/development/libraries/haskell/html/1.0.1.2.nix
index 29168e7187d..fa671f934e8 100644
--- a/pkgs/development/libraries/haskell/html/1.0.1.2.nix
+++ b/pkgs/development/libraries/haskell/html/1.0.1.2.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "HTML combinator library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix
index 3a1269e4d50..c0a8634d361 100644
--- a/pkgs/development/libraries/haskell/httpd-shed/default.nix
+++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A simple web-server with an interact style API";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix
index f9d5b6efa8f..a1f63769cde 100644
--- a/pkgs/development/libraries/haskell/jpeg/default.nix
+++ b/pkgs/development/libraries/haskell/jpeg/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/json/0.3.6.nix b/pkgs/development/libraries/haskell/json/0.3.6.nix
index e84351052c9..1d644d88a41 100644
--- a/pkgs/development/libraries/haskell/json/0.3.6.nix
+++ b/pkgs/development/libraries/haskell/json/0.3.6.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Support for serialising Haskell to and from JSON";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix
index 8166c890e6f..ce0d150c045 100644
--- a/pkgs/development/libraries/haskell/json/default.nix
+++ b/pkgs/development/libraries/haskell/json/default.nix
@@ -11,5 +11,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Support for serialising Haskell to and from JSON";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
index a0617a0190d..e7e33e39a86 100644
--- a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
+++ b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix
index e925ce858bd..cce2e7d1b09 100644
--- a/pkgs/development/libraries/haskell/mmap/default.nix
+++ b/pkgs/development/libraries/haskell/mmap/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Memory mapped files for POSIX and Windows";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix
index c8ec938318b..abac15618d5 100644
--- a/pkgs/development/libraries/haskell/monad-loops/default.nix
+++ b/pkgs/development/libraries/haskell/monad-loops/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/monads-fd/default.nix b/pkgs/development/libraries/haskell/monads-fd/default.nix
index d84d84975ae..e2981063135 100644
--- a/pkgs/development/libraries/haskell/monads-fd/default.nix
+++ b/pkgs/development/libraries/haskell/monads-fd/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/mpppc/default.nix b/pkgs/development/libraries/haskell/mpppc/default.nix
index d67a3700165..fd841dd6d88 100644
--- a/pkgs/development/libraries/haskell/mpppc/default.nix
+++ b/pkgs/development/libraries/haskell/mpppc/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Multi-dimensional parametric pretty-printer with color";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
index f06f92976b3..6fcdb41e3f1 100644
--- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
+++ b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Monad transformer library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
index 3598a0d4c3e..174df4bda49 100644
--- a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
+++ b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Monad transformer library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
index f0ad0770220..dc55078d0fc 100644
--- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
+++ b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Monad transformer library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix
index 3354a5873d0..8338d07ef3f 100644
--- a/pkgs/development/libraries/haskell/multiplate/default.nix
+++ b/pkgs/development/libraries/haskell/multiplate/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "MIT";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
index d4187a680da..f30caeb2fb1 100644
--- a/pkgs/development/libraries/haskell/multirec/default.nix
+++ b/pkgs/development/libraries/haskell/multirec/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Generic programming with systems of recursive datatypes";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/multiset/default.nix b/pkgs/development/libraries/haskell/multiset/default.nix
index b17b2244a26..5850e0ce947 100644
--- a/pkgs/development/libraries/haskell/multiset/default.nix
+++ b/pkgs/development/libraries/haskell/multiset/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A variation of Data.Set. Multisets, sometimes also called bags, can contain multiple copies of the same key";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix
index dfffbe3d818..c537625d6cf 100644
--- a/pkgs/development/libraries/haskell/mwc-random/default.nix
+++ b/pkgs/development/libraries/haskell/mwc-random/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/network/2.2.1.4.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix
index c0ef812c918..09dd5226433 100644
--- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix
+++ b/pkgs/development/libraries/haskell/network/2.2.1.4.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Networking-related facilities";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix
index 6c740b0ef05..8074f38825d 100644
--- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix
+++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Networking-related facilities";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix
index 529785169d0..17b8af70672 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.2.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Networking-related facilities";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
index 065344d75fa..5cd693f5048 100644
--- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "parallel programming library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
index 7cec49c9e53..aca8f99616e 100644
--- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "parallel programming library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
index 2c6352e923f..8cd55d4bed1 100644
--- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "parallel programming library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
index 8b8827bfa06..0d473fd122e 100644
--- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Monadic parser combinators";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix
index 26f4d09ae90..95962a4f475 100644
--- a/pkgs/development/libraries/haskell/parsimony/default.nix
+++ b/pkgs/development/libraries/haskell/parsimony/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Monadic parser combinators derived from Parsec";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix
index 5b6ac6abffd..12e86377a5f 100644
--- a/pkgs/development/libraries/haskell/pcre-light/default.nix
+++ b/pkgs/development/libraries/haskell/pcre-light/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix
index 3c9055f1680..e05ba114938 100644
--- a/pkgs/development/libraries/haskell/polyparse/default.nix
+++ b/pkgs/development/libraries/haskell/polyparse/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A variety of alternative parser combinator libraries";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix
index 7056fed1df4..10db565fa97 100644
--- a/pkgs/development/libraries/haskell/pretty-show/default.nix
+++ b/pkgs/development/libraries/haskell/pretty-show/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/default.nix
index f4d29695118..c39f718e70c 100644
--- a/pkgs/development/libraries/haskell/primitive/default.nix
+++ b/pkgs/development/libraries/haskell/primitive/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix
index 1e56df6d4bd..34b78092b66 100644
--- a/pkgs/development/libraries/haskell/pureMD5/default.nix
+++ b/pkgs/development/libraries/haskell/pureMD5/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index 7773e53cb8b..d35a9c85793 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -13,5 +13,5 @@ cabal.mkDerivation (self : {
     license = "Public Domain";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix
index c420f5f0e35..5ff40e4efbd 100644
--- a/pkgs/development/libraries/haskell/random-shuffle/default.nix
+++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix
index d29df7cefde..370764307cb 100644
--- a/pkgs/development/libraries/haskell/readline/default.nix
+++ b/pkgs/development/libraries/haskell/readline/default.nix
@@ -13,5 +13,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "An interface to the GNU readline library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix
index 9e2f7c8391b..236016d0d77 100644
--- a/pkgs/development/libraries/haskell/recaptcha/default.nix
+++ b/pkgs/development/libraries/haskell/recaptcha/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Functions for using the reCAPTCHA service in web applications";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix
index afb08ebee0d..e8d84ef2923 100644
--- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix
+++ b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Replaces/Ehances Text.Regex";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
index 73d5afeedb2..9a1fe37d155 100644
--- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
+++ b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Replaces/Ehances Text.Regex";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
index b1db30548ba..1d65438ff94 100644
--- a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
+++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Replaces/Ehances Text.Regex";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix
index 85a725264f8..19e643d906a 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Replaces/Enhances Text.Regex";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix
index 68e9d2321d0..e65669a8107 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.92.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Replaces/Enhances Text.Regex";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
index 1113b38cbb0..c1b4536cd11 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Replaces/Enhances Text.Regex";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix
index fbaf5938b04..a27d267b27b 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Replaces/Enhances Text.Regex";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
index 1e7db2ab0b1..b202ce58c90 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Replaces/Enhances Text.Regex";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
index 871805c63f0..3d7149607d2 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Replaces/Enhances Text.Regex";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix
index 3ac8782f0df..142827f14ce 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Replaces/Enhances Text.Regex";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix
index 76ce9ff40d5..bd366d3828e 100644
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ b/pkgs/development/libraries/haskell/regular/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix
index cce391c8153..79e83b30891 100644
--- a/pkgs/development/libraries/haskell/safe/default.nix
+++ b/pkgs/development/libraries/haskell/safe/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/salvia-protocol/default.nix b/pkgs/development/libraries/haskell/salvia-protocol/default.nix
index e1418423ae8..a3c7832312e 100644
--- a/pkgs/development/libraries/haskell/salvia-protocol/default.nix
+++ b/pkgs/development/libraries/haskell/salvia-protocol/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/salvia/default.nix b/pkgs/development/libraries/haskell/salvia/default.nix
index 658273ead31..16f1afe8f28 100644
--- a/pkgs/development/libraries/haskell/salvia/default.nix
+++ b/pkgs/development/libraries/haskell/salvia/default.nix
@@ -15,5 +15,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix
index 801257cc4e5..12554817992 100644
--- a/pkgs/development/libraries/haskell/sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/sendfile/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix
index 6391f25261d..88049490c33 100644
--- a/pkgs/development/libraries/haskell/stateref/default.nix
+++ b/pkgs/development/libraries/haskell/stateref/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "Public Domain";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix
index 21635fba601..8dc70c41044 100644
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ b/pkgs/development/libraries/haskell/statistics/default.nix
@@ -11,5 +11,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
index de3f7e3bc03..691eb63cdb1 100644
--- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Software Transactional Memory";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
index 976f0054a4a..a3c77c4d371 100644
--- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
+++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Software Transactional Memory";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix
index 5a80ec5f47d..b9d7b51c522 100644
--- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Software Transactional Memory";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
index 91ba2d94886..33734eb8753 100644
--- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix
+++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Strict concurrency abstractions";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index 97d42cf62f0..e68b628253f 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix
index 51b14a54053..a7c2e7e1f60 100644
--- a/pkgs/development/libraries/haskell/tagsoup/default.nix
+++ b/pkgs/development/libraries/haskell/tagsoup/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/testpack/default.nix b/pkgs/development/libraries/haskell/testpack/default.nix
index fc77c15446d..76287bb6d50 100644
--- a/pkgs/development/libraries/haskell/testpack/default.nix
+++ b/pkgs/development/libraries/haskell/testpack/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Test Utility Pack for HUnit and QuickCheck";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 0dd4fe50f5c..a329076c352 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "GPL";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix
index af31029bdd9..8a0328ec40a 100644
--- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix
index b80b374baa7..431f8e587dd 100644
--- a/pkgs/development/libraries/haskell/threadmanager/default.nix
+++ b/pkgs/development/libraries/haskell/threadmanager/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix
index 24b78a54ed8..430e836068d 100644
--- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix
+++ b/pkgs/development/libraries/haskell/time/1.1.2.4.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A time library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/time/1.1.3.nix b/pkgs/development/libraries/haskell/time/1.1.3.nix
index 025a5faa380..2d3703b2351 100644
--- a/pkgs/development/libraries/haskell/time/1.1.3.nix
+++ b/pkgs/development/libraries/haskell/time/1.1.3.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A time library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/time/1.2.0.3.nix b/pkgs/development/libraries/haskell/time/1.2.0.3.nix
index 7ddbdcc2fa9..fbdf4aa100f 100644
--- a/pkgs/development/libraries/haskell/time/1.2.0.3.nix
+++ b/pkgs/development/libraries/haskell/time/1.2.0.3.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A time library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
index d3a60d4cf69..c3fec93abeb 100644
--- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
+++ b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Concrete functor and monad transformers";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix
index 06451b53e24..f44755983a7 100644
--- a/pkgs/development/libraries/haskell/uniplate/default.nix
+++ b/pkgs/development/libraries/haskell/uniplate/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Uniform type generic traversals";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix
index 193fefe0e5f..5ab87f34128 100644
--- a/pkgs/development/libraries/haskell/uniqueid/default.nix
+++ b/pkgs/development/libraries/haskell/uniqueid/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Splittable Unique Identifier Supply";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix
index ae1c54ec973..b859ddd0ef5 100644
--- a/pkgs/development/libraries/haskell/unix-compat/default.nix
+++ b/pkgs/development/libraries/haskell/unix-compat/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix
index d82af144515..f12cc629b7f 100644
--- a/pkgs/development/libraries/haskell/url/default.nix
+++ b/pkgs/development/libraries/haskell/url/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix
index b9d9628350d..bc1a4c15714 100644
--- a/pkgs/development/libraries/haskell/utf8-string/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-string/default.nix
@@ -7,4 +7,4 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A UTF8 layer for IO and Strings";
   };
-})  
+})
diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
index 5320acd255e..e3707d8112d 100644
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "New version of the Utrecht University parser combinator library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
index 16d10b49ac2..249951659aa 100644
--- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
index c273beb7972..657ede90b0f 100644
--- a/pkgs/development/libraries/haskell/vacuum/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Extract graph representations of ghc heap values";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
index 5f212e33177..8759d960342 100644
--- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix
index d502bfcbf8a..a798cb7d589 100644
--- a/pkgs/development/libraries/haskell/vector-space/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/vector/default.nix b/pkgs/development/libraries/haskell/vector/default.nix
index 797d9e703e4..38159786245 100644
--- a/pkgs/development/libraries/haskell/vector/default.nix
+++ b/pkgs/development/libraries/haskell/vector/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
index 33a940eca31..49f2070b04d 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "wxHaskell";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index d46a6ac864d..64369534549 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -18,5 +18,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "wxHaskell core";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
index 181db89a984..05d5a20702f 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
@@ -12,5 +12,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "helper tool for building wxHaskell";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix
index e4b12f9363d..697e6bfc93d 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "An XHTML combinator library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix
index 096934dfeae..055ead4838b 100644
--- a/pkgs/development/libraries/haskell/xml/default.nix
+++ b/pkgs/development/libraries/haskell/xml/default.nix
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A simple XML library";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index 9a445adeb2a..4203b037e92 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix
index ac7ea77754b..7ff5c1d480c 100644
--- a/pkgs/development/libraries/haskell/zip-archive/default.nix
+++ b/pkgs/development/libraries/haskell/zip-archive/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Library for creating and modifying zip archives";
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix
index 6ba3cb2aaa1..36dbc389fb7 100644
--- a/pkgs/development/libraries/haskell/zipper/default.nix
+++ b/pkgs/development/libraries/haskell/zipper/default.nix
@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Generic zipper for systems of recursive datatypes";
   };
-})  
+})
 

From 83b3ab465700c1a1651ea2af42ccb599d1da5876 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Mar 2011 15:46:10 +0000
Subject: [PATCH 138/143] * Adobe Reader: depend on gdk_pixbuf (from Marc
 Weber).  Also update   to 9.4.2.

svn path=/nixpkgs/trunk/; revision=26572
---
 pkgs/applications/misc/adobe-reader/default.nix | 16 +++++++++++-----
 pkgs/top-level/all-packages.nix                 |  4 +---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix
index 24d01dae059..6182931de96 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, libX11, cups, glib, pango, atk, gtk, zlib, libxml2 }:
+{ stdenv, fetchurl, libX11, cups, gtkLibs, zlib, libxml2 }:
 
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
-  name = "adobe-reader-9.4-1";
+  name = "adobe-reader-9.4.2-1";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.0/enu/AdbeRdr9.4-1_i486linux_enu.tar.bz2;
-    sha256 = "093msw0b5k3ab0vv7bh4n81fxp51s2lynvsm076i5jvlp71l8adf";
+    url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/enu/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2;
+    sha256 = "0xm8ngr7lslhxli9ly1g2w7ichip88vpf7lfx1ma0liaw4m2gv0h";
   };
 
   # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
@@ -17,7 +17,13 @@ stdenv.mkDerivation {
   # versions.
   
   libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.gcc.gcc libX11 glib pango atk gtk zlib libxml2 cups ];
+    [ stdenv.gcc.gcc libX11 zlib libxml2 cups 
+      gtkLibs.pango
+      gtkLibs.atk
+      gtkLibs.gtk
+      gtkLibs.glib
+      gtkLibs.gdk_pixbuf
+    ];
   
   meta = {
     description = "Adobe Reader, a viewer for PDF documents";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e811c8031c0..44b97b4004c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5653,9 +5653,7 @@ let
     inherit (gnome) libglade libgnomecanvas;
   };
 
-  adobeReader = callPackage_i686 ../applications/misc/adobe-reader {
-    inherit (pkgsi686Linux.gtkLibs) glib pango atk gtk;
-  };
+  adobeReader = callPackage_i686 ../applications/misc/adobe-reader { };
 
   akunambol = newScope pkgs.kde4 ../applications/networking/sync/akunambol { };
 

From 97182f0bcbe0ebbecf1d320f1f079228273fd1e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 28 Mar 2011 16:08:17 +0000
Subject: [PATCH 139/143] Making SDL_gfx and SDL_image find the SDL headers, by
 a postInstall patch. They expected to sit in the same directory as the SDL
 headers.

svn path=/nixpkgs/trunk/; revision=26574
---
 pkgs/development/libraries/SDL_gfx/default.nix   |  7 ++++++-
 pkgs/development/libraries/SDL_image/default.nix | 10 +++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix
index aabbd8f8941..1090a99915f 100644
--- a/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/pkgs/development/libraries/SDL_gfx/default.nix
@@ -12,7 +12,12 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-mmx";
 
-  postInstall = "ln -s $out/include/SDL/*.h $out/include/";
+  postInstall = ''
+    sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
+      $out/include/SDL/*.h
+    
+    ln -s $out/include/SDL/*.h $out/include/;
+  '';
 
   meta = {
     description = "SDL graphics drawing primitives and support functions";
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index eafe10d0527..21461cc4259 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -13,7 +13,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [SDL libpng libjpeg libtiff libungif libXpm];
 
-  postInstall = "ln -sv $out/include/SDL/SDL_image.h $out/include/";
+  postInstall = ''
+    sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
+    -e 's,"SDL_version.h",<SDL/SDL_version.h>,' \
+    -e 's,"begin_code.h",<SDL/begin_code.h>,' \
+    -e 's,"close_code.h",<SDL/close_code.h>,' \
+      $out/include/SDL/SDL_image.h
+
+    ln -sv $out/include/SDL/SDL_image.h $out/include/
+  '';
 
   meta = {
     description = "SDL image library";

From 655a9ea9c37c2368996251120c09843fd673fc6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 28 Mar 2011 16:08:21 +0000
Subject: [PATCH 140/143] Adding the racing videogame VDrift. I added the asio
 library as a side effect.

svn path=/nixpkgs/trunk/; revision=26575
---
 pkgs/development/libraries/asio/default.nix | 20 +++++++++++++++
 pkgs/games/vdrift/default.nix               | 28 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  6 ++++-
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/asio/default.nix
 create mode 100644 pkgs/games/vdrift/default.nix

diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix
new file mode 100644
index 00000000000..acf53c708e0
--- /dev/null
+++ b/pkgs/development/libraries/asio/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, boost, openssl}:
+
+stdenv.mkDerivation rec {
+  name = "asio-1.5.3";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/asio/${name}.tar.bz2";
+    sha256 = "08fdsv1zhwbfwlx3r3dzl1371lxy5gw92ms0kqcscxqn0ycf3rlj";
+  };
+
+  propagatedBuildInputs = [ boost ];
+  buildInputs = [ openssl ];
+
+  meta = {
+    homepage = http://asio.sourceforge.net/;
+    description = "Cross-platform C++ library for network and low-level I/O programming";
+    license = "boost";
+  };
+
+}
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix
new file mode 100644
index 00000000000..586bfc3e511
--- /dev/null
+++ b/pkgs/games/vdrift/default.nix
@@ -0,0 +1,28 @@
+{ fetchurl, stdenv, mesa, SDL, scons, freeglut, SDL_image, glew, libvorbis,
+  asio, boost, SDL_gfx }:
+
+stdenv.mkDerivation rec {
+  name = "vdrift-2010-06-30";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/vdrift/${name}.tar.bz2";
+    sha256 = "1zbh62363gx4ayyx4wcsp5di4f16qqfg2ajwkgw71kss6j7lk71j";
+  };
+
+  buildInputs = [ scons mesa SDL freeglut SDL_image glew libvorbis asio boost
+    SDL_gfx ];
+
+  buildPhase = ''
+    sed -i -e s,/usr/local,$out, SConstruct
+    scons
+  '';
+  installPhase = "scons install";
+
+  meta = {
+    description = "Car racing game";
+    homepage = http://vdrift.net/;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44b97b4004c..8a134f400c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2748,6 +2748,8 @@ let
     bdbSupport = true;
   };
 
+  asio = callPackage ../development/libraries/asio { };
+
   aspell = callPackage ../development/libraries/aspell { };
 
   aspellDicts = recurseIntoAttrs (import ../development/libraries/aspell/dictionaries.nix {
@@ -7194,7 +7196,9 @@ let
 
   ut2004demo = callPackage ../games/ut2004demo { };
 
-  warmux = callPackage ../games/warmux {};
+  vdrift = callPackage ../games/vdrift { };
+
+  warmux = callPackage ../games/warmux { };
 
   warsow = callPackage ../games/warsow {
     libjpeg = libjpeg62;

From 8bf1dd5cefe3c60c7c8e0b99989e6f2011bba0a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 28 Mar 2011 16:08:26 +0000
Subject: [PATCH 141/143] Updating xchm

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

diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index b574b5fa5ec..aed55c67c10 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, wxGTK, chmlib}:
 
 stdenv.mkDerivation {
-  name = "xchm-1.17";
+  name = "xchm-1.18";
   src = fetchurl {
-    url = mirror://sourceforge/xchm/xchm-1.17.tar.gz;
-    sha256 = "0yizisn4833nnpd4apallyg8iv334y00hv3awbsbc0ks2zf93x0n";
+    url = mirror://sourceforge/xchm/xchm-1.18.tar.gz;
+    sha256 = "1wvvyzqbmj3c6i46x4vpxkawjwmmp276r84ifvlzaj5q4b52g5gw";
   };
   buildInputs = [wxGTK chmlib];
 

From 3dcaa029ab5b2fa4d9740b401e5ca35d4c08d134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 28 Mar 2011 16:08:29 +0000
Subject: [PATCH 142/143] Adding the zod engine, a multiplayer zed remake.

svn path=/nixpkgs/trunk/; revision=26577
---
 pkgs/games/zod/default.nix      | 44 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/games/zod/default.nix

diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix
new file mode 100644
index 00000000000..731a5e40fd8
--- /dev/null
+++ b/pkgs/games/zod/default.nix
@@ -0,0 +1,44 @@
+{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer,
+  mysql, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "zod-engine-2011-03-18";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/zod/zod_src-2011-03-18.zip";
+    sha256 = "00ny7a1yfn9zgl7q1ys27qafwc92dzxv07wjxl8nxa4f98al2g4n";
+  };
+
+  srcAssets = fetchurl {
+    url = "mirror://sourceforge/zod/zod_assets-2011-03-12.rar";
+    sha256 = "0gmg4ppr4y6ck04mandlp2fmdcyssmck999m012jx5v1rm57g2hn";
+  };
+
+  unpackPhase = ''
+    mkdir src
+    pushd src
+    unzip $src
+    popd
+    sourceRoot=`pwd`/src
+  '';
+
+  buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql
+    makeWrapper ];
+
+  NIX_LDFLAGS="-L${mysql}/lib/mysql";
+
+  installPhase = ''
+    ensureDir $out/bin $out/share/zod
+    pushd $out/share/zod
+    unrar x $srcAssets
+    popd
+    cp zod $out/bin
+    wrapProgram $out/bin/zod --run "cd $out/share/zod"
+  '';
+
+  meta = {
+    description = "Multiplayer remake of ZED";
+    homepage = http://zod.sourceforge.net/;
+    license = "GPLv3+"; /* Says the web */
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a134f400c4..f9b7419f2be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7218,6 +7218,8 @@ let
 
   zdoom = callPackage ../games/zdoom { };
 
+  zod = callPackage ../games/zod { };
+
   zoom = callPackage ../games/zoom { };
 
   keen4 = callPackage ../games/keen4 { };

From 497fc7bb94925f884a3ffd37f0660e2416be5d61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 28 Mar 2011 18:58:49 +0000
Subject: [PATCH 143/143] Making btanks work (and adding smpeg).

svn path=/nixpkgs/trunk/; revision=26585
---
 pkgs/development/libraries/smpeg/default.nix | 34 ++++++++++++++++++++
 pkgs/games/btanks/default.nix                | 15 +++++----
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/libraries/smpeg/default.nix

diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix
new file mode 100644
index 00000000000..3e7baf77df8
--- /dev/null
+++ b/pkgs/development/libraries/smpeg/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa }:
+
+stdenv.mkDerivation rec {
+  name = "smpeg-svn-${version}";
+  version = "390";
+
+  src = fetchsvn {
+    url = svn://svn.icculus.org/smpeg/trunk;
+    rev = version;
+    sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0";
+  };
+
+  buildInputs = [ SDL autoconf automake libtool gtk m4 pkgconfig mesa ];
+
+  preConfigure = ''
+    touch NEWS AUTHORS ChangeLog
+    autoreconf -fvi -I acinclude
+  '';
+
+  postInstall = ''
+    sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
+    -e 's,"SDL_mutex.h",<SDL/SDL_mutex.h>,' \
+    -e 's,"SDL_audio.h",<SDL/SDL_audio.h>,' \
+    -e 's,"SDL_thread.h",<SDL/SDL_thread.h>,' \
+    -e 's,"SDL_types.h",<SDL/SDL_types.h>,' \
+      $out/include/smpeg/*.h
+  '';
+
+  meta = {
+    homepage = http://icculus.org/smpeg/;
+    description = "MPEG decoding library";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix
index 7172d4c8147..085c7c4082c 100644
--- a/pkgs/games/btanks/default.nix
+++ b/pkgs/games/btanks/default.nix
@@ -1,6 +1,4 @@
-{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, zlib }:
-
-throw "Still does not build. It needs smpeg"
+{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, zlib, smpeg, SDL_image, libvorbis, lua5, zip }:
 
 stdenv.mkDerivation rec {
   name = "battle-tanks-0.9.8083";
@@ -10,12 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz";
   };
 
-  /* It still does not build */
-  buildInputs = [ scons pkgconfig SDL mesa zlib ];
+  buildInputs = [ scons pkgconfig SDL mesa zlib smpeg SDL_image libvorbis lua5
+    zip ];
+
+  buildPhase = ''
+    scons prefix=$out
+  '';
 
   installPhase = ''
-    scons PREFIX=$out
-    scons PREFIX=$out install
+    scons install
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9b7419f2be..de855238ed5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4075,6 +4075,8 @@ let
     scheme = guile;
   };
 
+  smpeg = callPackage ../development/libraries/smpeg { };
+
   snack = callPackage ../development/libraries/snack {
         # optional
   };