From 56a081cd55365d1028876f4a9b3ea75f00b6a224 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Jul 2011 12:20:34 +0000
Subject: [PATCH 001/101] * Added libav, a fork of ffmpeg.

svn path=/nixpkgs/trunk/; revision=27797
---
 pkgs/development/libraries/libav/default.nix | 72 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 74 insertions(+)
 create mode 100644 pkgs/development/libraries/libav/default.nix

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
new file mode 100644
index 000000000000..0d6637d6116b
--- /dev/null
+++ b/pkgs/development/libraries/libav/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchurl, pkgconfig, yasm, xz
+, mp3Support ? true, lame ? null
+, speexSupport ? true, speex ? null
+, theoraSupport ? true, libtheora ? null
+, vorbisSupport ? true, libvorbis ? null
+, vpxSupport ? false, libvpx ? null
+, x264Support ? false, x264 ? null
+, xvidSupport ? true, xvidcore ? null
+, faacSupport ? false, faac ? null
+}:
+
+assert speexSupport -> speex != null;
+assert theoraSupport -> libtheora != null;
+assert vorbisSupport -> libvorbis != null;
+assert vpxSupport -> libvpx != null;
+assert x264Support -> x264 != null;
+assert xvidSupport -> xvidcore != null;
+
+stdenv.mkDerivation rec {
+  name = "libav-0.7";
+  
+  src = fetchurl {
+    url = "http://libav.org/releases/${name}.tar.xz";
+    sha256 = "04pl6y53xh6xmwzz0f12mg5vh62ylp5zwwinj6dxzd8pnbjg4lsz";
+  };
+
+  # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
+  # the resulting library is GPL'ed, so it can only be used in GPL'ed
+  # applications.
+  configureFlags = [
+    "--enable-gpl"
+    "--enable-postproc"
+    "--enable-swscale"
+    "--disable-ffserver"
+    "--disable-ffplay"
+    "--enable-shared"
+    "--enable-runtime-cpudetect"
+  ]
+    ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
+    ++ stdenv.lib.optional speexSupport "--enable-libspeex"
+    ++ stdenv.lib.optional theoraSupport "--enable-libtheora"
+    ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
+    ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
+    ++ stdenv.lib.optional x264Support "--enable-libx264"
+    ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
+    ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
+
+  buildInputs = [ pkgconfig lame yasm xz ]
+    ++ stdenv.lib.optional mp3Support lame
+    ++ stdenv.lib.optional speexSupport speex
+    ++ stdenv.lib.optional theoraSupport libtheora
+    ++ stdenv.lib.optional vorbisSupport libvorbis
+    ++ stdenv.lib.optional vpxSupport libvpx
+    ++ stdenv.lib.optional x264Support x264
+    ++ stdenv.lib.optional xvidSupport xvidcore
+    ++ stdenv.lib.optional faacSupport faac;
+
+  crossAttrs = {
+    dontSetConfigureCross = true;
+    configureFlags = configureFlags ++ [
+      "--cross-prefix=${stdenv.cross.config}-"
+      "--enable-cross-compile"
+      "--target_os=linux"
+      "--arch=${stdenv.cross.arch}"
+      ];
+  };
+
+  meta = {
+    homepage = http://libav.org/;
+    description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c2bdb8b40dd..c4d2eaab547e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3554,6 +3554,8 @@ let
 
   libassuan = callPackage ../development/libraries/libassuan { };
 
+  libav = callPackage ../development/libraries/libav { };
+
   libavc1394 = callPackage ../development/libraries/libavc1394 { };
 
   libbluedevil = callPackage ../development/libraries/libbluedevil { };

From c58754b390e145003f06ed670302e1ed44cfa281 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 Jul 2011 12:47:20 +0000
Subject: [PATCH 002/101] stellarium: build this package on Linux only

Stellarium is supposed to compile on mesaPlatforms, but unfortunately our qt47
expression doesn't support platforms other than Linux.

svn path=/nixpkgs/trunk/; revision=27798
---
 pkgs/applications/science/astronomy/stellarium/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 0f2a104f80f7..acf7721489a7 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     homepage = http://stellarium.org/;
     license = "GPL2";
 
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    platforms = stdenv.lib.platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From 66dbd40cb7d62d34ec3d44ce08a45d7e531cffaa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 Jul 2011 12:53:21 +0000
Subject: [PATCH 003/101] ghc: build GHC on haskellPlatforms instead of
 linux++darwin to avoid evaluation errors on Hydra because x86_64-darwin is
 unsupported

svn path=/nixpkgs/trunk/; revision=27799
---
 pkgs/development/compilers/ghc/6.10.1-binary.nix | 2 +-
 pkgs/development/compilers/ghc/7.0.2.nix         | 2 +-
 pkgs/development/compilers/ghc/7.0.3.nix         | 2 +-
 pkgs/development/compilers/ghc/7.0.4.nix         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix
index 459a1b94724d..c43f8525a33f 100644
--- a/pkgs/development/compilers/ghc/6.10.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix
@@ -100,5 +100,5 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
-  meta.platforms = [ "i686-darwin" "x86_64-linux" "i686-linux"] ;
+  meta.platforms = stdenv.lib.platforms.haskellPlatforms;
 }
diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix
index c99c8c813f16..ca59a8b53116 100644
--- a/pkgs/development/compilers/ghc/7.0.2.nix
+++ b/pkgs/development/compilers/ghc/7.0.2.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = stdenv.lib.platforms.haskellPlatforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.0.3.nix b/pkgs/development/compilers/ghc/7.0.3.nix
index 210de9445876..b1ecb5a1db68 100644
--- a/pkgs/development/compilers/ghc/7.0.3.nix
+++ b/pkgs/development/compilers/ghc/7.0.3.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = stdenv.lib.platforms.haskellPlatforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix
index 3892efd05468..ca3f72f08e43 100644
--- a/pkgs/development/compilers/ghc/7.0.4.nix
+++ b/pkgs/development/compilers/ghc/7.0.4.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = stdenv.lib.platforms.haskellPlatforms;
   };
 
 }

From 5693872dc10836094ea4fce381a522e96bf93aaa Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 15 Jul 2011 15:10:22 +0000
Subject: [PATCH 004/101] Bumped feh to version 1.14.2 as the previous one does
 not exist anymore

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

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

From abbf22c397ce6a5fe76ef2cd5ab1cc7acd09a7dd Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Fri, 15 Jul 2011 18:54:43 +0000
Subject: [PATCH 005/101] Update version of urweb compiler.

svn path=/nixpkgs/trunk/; revision=27801
---
 pkgs/development/compilers/urweb/default.nix  | 16 +++++++------
 ...move-header-include-directory-prefix.patch | 24 -------------------
 2 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/compilers/urweb/remove-header-include-directory-prefix.patch

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 6db4eb9961e8..89501df648b7 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -2,27 +2,29 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20110517";
+  version = "20110715";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "1jmaj62laf8q4f07jrg6r2gb1ky120n21qfzpia3q5j5ihjiavb1";
+    sha256 = "1qaz6alabhi7jmpsj7x0x4sskkjf05619maym133y2lkgdnvhydh";
   };
 
   buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];
 
-  patches = [ ./remove-header-include-directory-prefix.patch ];
-
-  postPatch = ''
+  prePatch = ''
     sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
     sed -e 's@gcc @${stdenv.gcc}/bin/gcc @g' -i src/compiler.sml
     '';
 
   preConfigure =
     ''
-      export GCCARGS="-I$out/include -I${mysql}/include/mysql -I${postgresql}/include -I${sqlite}/include \
-                      -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib"
+      export GCCARGS="-I$out/include \
+                      -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";
+
+      export PGHEADER="${postgresql}/include/libpq-fe.h";
+      export MSHEADER="${mysql}/include/mysql/mysql.h";
+      export SQHEADER="${sqlite}/include/sqlite3.h";
     '';
 
   configureFlags = "--with-openssl=${openssl}"; 
diff --git a/pkgs/development/compilers/urweb/remove-header-include-directory-prefix.patch b/pkgs/development/compilers/urweb/remove-header-include-directory-prefix.patch
deleted file mode 100644
index a7c7c2da9c58..000000000000
--- a/pkgs/development/compilers/urweb/remove-header-include-directory-prefix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur urweb-orig/src/mysql.sml urweb-patched/src/mysql.sml
---- urweb-orig/src/mysql.sml	2010-08-23 15:36:58.665234434 -0430
-+++ urweb-patched/src/mysql.sml	2010-08-23 15:44:10.765238334 -0430
-@@ -1521,7 +1521,7 @@
- fun p_blank _ = "?"
-
- val () = addDbms {name = "mysql",
--                  header = "mysql/mysql.h",
-+                  header = "mysql.h",
-                   link = "-lmysqlclient",
-                   init = init,
-                   p_sql_type = p_sql_type,
-diff -Naur urweb-orig/src/postgres.sml urweb-patched/src/postgres.sml
---- urweb-orig/src/postgres.sml	2010-08-23 15:36:58.666253464 -0430
-+++ urweb-patched/src/postgres.sml	2010-08-23 15:43:26.216251221 -0430
-@@ -928,7 +928,7 @@
- fun p_blank (n, t) = p_cast ("$" ^ Int.toString n, t)
-
- val () = addDbms {name = "postgres",
--                  header = "postgresql/libpq-fe.h",
-+                  header = "libpq-fe.h",
-                   link = "-lpq",
-                   p_sql_type = p_sql_type,
-                   init = init,

From 9c2f9fd2f2135821129567bd67a6e46823d4076c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 18 Jul 2011 08:36:01 +0000
Subject: [PATCH 006/101] GNU Bison 2.5.

svn path=/nixpkgs/trunk/; revision=27813
---
 .../tools/parsing/bison/bison-2.5.nix         | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/tools/parsing/bison/bison-2.5.nix

diff --git a/pkgs/development/tools/parsing/bison/bison-2.5.nix b/pkgs/development/tools/parsing/bison/bison-2.5.nix
new file mode 100644
index 000000000000..e373a80e46dd
--- /dev/null
+++ b/pkgs/development/tools/parsing/bison/bison-2.5.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, m4, perl }:
+
+stdenv.mkDerivation rec {
+  name = "bison-2.5";
+
+  src = fetchurl {
+    url = "mirror://gnu/bison/${name}.tar.bz2";
+    sha256 = "1f1rai3v6k6xjii94964iq0alhc2hxwapqa363nfj8rbxvv0sdqa";
+  };
+
+  buildInputs = [ m4 ]
+    ++ stdenv.lib.optional doCheck perl;
+
+  doCheck = true;
+
+  meta = {
+    description = "GNU Bison, a Yacc-compatible parser generator";
+
+    longDescription = ''
+      Bison is a general-purpose parser generator that converts an
+      annotated context-free grammar into an LALR(1) or GLR parser for
+      that grammar.  Once you are proficient with Bison, you can use
+      it to develop a wide range of language parsers, from those used
+      in simple desk calculators to complex programming languages.
+
+      Bison is upward compatible with Yacc: all properly-written Yacc
+      grammars ought to work with Bison with no change.  Anyone
+      familiar with Yacc should be able to use Bison with little
+      trouble.  You need to be fluent in C or C++ programming in order
+      to use Bison.
+    '';
+
+    homepage = http://www.gnu.org/software/bison/;
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+
+  passthru = { glrSupport = true; };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4d2eaab547e..b1102aec3b69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2620,6 +2620,8 @@ let
 
   bison24 = callPackage ../development/tools/parsing/bison/bison-2.4.nix { };
 
+  bison25 = callPackage ../development/tools/parsing/bison/bison-2.5.nix { };
+
   buildbot = callPackage ../development/tools/build-managers/buildbot {
     inherit (pythonPackages) twisted;
   };

From dc5a3adf5f6897e96e171d4da1a177d7108883a4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 12:39:11 +0000
Subject: [PATCH 007/101] * Use callPackage.

svn path=/nixpkgs/trunk/; revision=27820
---
 pkgs/top-level/all-packages.nix | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1102aec3b69..1d7d02dddff2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6314,20 +6314,14 @@ let
 
   flashplayer = flashplayer10;
 
-  flashplayer9 = (
-    import ../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
-      inherit fetchurl stdenv zlib alsaLib nss nspr fontconfig freetype expat;
-      inherit (xlibs) libX11 libXext libXrender libXt;
-      inherit (gtkLibs) gtk glib pango atk;
-    });
+  flashplayer9 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
+      inherit (gtkLibs) atk;
+  };
 
-  flashplayer10 = (
-    import ../applications/networking/browsers/mozilla-plugins/flashplayer-10 {
-      inherit fetchurl stdenv zlib alsaLib curl nss nspr fontconfig freetype expat cairo;
-      inherit (xlibs) libX11 libXext libXrender libXt ;
-      inherit (gtkLibs) gtk glib pango atk gdk_pixbuf;
-      debug = getConfig ["flashplayer" "debug"] false;
-    });
+  flashplayer10 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-10 {
+    inherit (gtkLibs) atk gdk_pixbuf;
+    debug = getConfig ["flashplayer" "debug"] false;
+  };
 
   freecad = callPackage ../applications/graphics/freecad {
     boost = boost146;

From f80ef6645b2d8744b032afdb9dc2a7a962003683 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Jul 2011 13:45:47 +0000
Subject: [PATCH 008/101] magit: fixed download url

svn path=/nixpkgs/trunk/; revision=27821
---
 pkgs/applications/editors/emacs-modes/magit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index 3dc417bf7725..0746dd5b3bec 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "magit-${version}";
 
   src = fetchurl {
-    url = "http://github.com/downloads/philjackson/magit/magit-${version}.tar.gz";
+    url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz";
     sha256 = "1hfdl90d96zin31v8x4p8zx5f0x0i5i9hccysx6q3prdgw9r6wzq";
   };
 

From 356928aad9957bbbff5bfb8c85b87c98a07fe3ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Jul 2011 14:06:35 +0000
Subject: [PATCH 009/101] fetchmail: updated to version 6.3.20

svn path=/nixpkgs/trunk/; revision=27822
---
 pkgs/applications/misc/fetchmail/default.nix | 29 +++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index f80ea6ef453e..79d27eea8487 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -1,18 +1,33 @@
-args: with args;
+{ stdenv, fetchurl, openssl }:
+
+let
+  version = "6.3.20";
+in
 stdenv.mkDerivation {
-  name="fetchmail-6.3.8";
+  name="fetchmail-${version}";
+
   src = fetchurl {
-    url = http://download.berlios.de/fetchmail/fetchmail-6.3.8.tar.bz2;
-    sha256 = "5612f9af367f641e0efd084f44fcf1889669e711dbd8c60f6b7953e494d1b09b";
+    url = "http://download.berlios.de/fetchmail/fetchmail-${version}.tar.bz2";
+    sha256 = "22e94f11d885cb9330a197fd80217d44f65e6b087e4d4b4d83e573adfc24aa7b";
   };
 
   buildInputs = [ openssl ];
 
   configureFlags = "--with-ssl=${openssl}";
 
-  patches = [ ./security-fix.patch ];
-
   meta = {
-    homepage = http://www.fetchmail.info;
+    homepage = "http://www.fetchmail.info/";
+    description = "a full-featured remote-mail retrieval and forwarding utility";
+    longDescription = ''
+      A full-featured, robust, well-documented remote-mail retrieval and
+      forwarding utility intended to be used over on-demand TCP/IP links
+      (such as SLIP or PPP connections). It supports every remote-mail
+      protocol now in use on the Internet: POP2, POP3, RPOP, APOP, KPOP,
+      all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and
+      IPSEC.
+    '';
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From 21691b47d70cbdcb5ff5a97b184b0025fe066fdc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Jul 2011 14:34:33 +0000
Subject: [PATCH 010/101] libtorrent: updated to version 0.12.9

svn path=/nixpkgs/trunk/; revision=27823
---
 .../networking/p2p/libtorrent/default.nix     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index b1456c0666e1..e702a406aad3 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -1,19 +1,23 @@
 { stdenv, fetchurl, pkgconfig, openssl, libsigcxx }:
 
-stdenv.mkDerivation rec {
-  pname = "libtorrent";
-  version = "0.12.6";
+let
+  version = "0.12.9";
+in
+stdenv.mkDerivation {
+  name = "libtorrent-${version}";
 
-  name = "${pname}-${version}";
-  
   src = fetchurl {
-    url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz";
-    sha256 = "0abisz3jgfv4zmyzbsknzvz9hwakxxpdgfl33qk0aslnchqz60kv";
+    url = "http://libtorrent.rakshasa.no/downloads/libtorrent-${version}.tar.gz";
+    sha256 = "25dc9e8dd45d070f447e599bef08ef0ca421bac6e7f55e608dcd19360594af64";
   };
 
   buildInputs = [ pkgconfig openssl libsigcxx ];
-  
+
   meta = {
+    homepage = "http://libtorrent.rakshasa.no/";
     description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From 7c19a3a6913a3a2b1e50003764c995298d2c88b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Jul 2011 14:34:46 +0000
Subject: [PATCH 011/101] rtorrent: updated to version 0.8.9

svn path=/nixpkgs/trunk/; revision=27824
---
 .../tools/networking/p2p/rtorrent/default.nix | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index eee5b5acbaae..b45542a6358d 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -1,20 +1,24 @@
 { stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl
 , zlib, openssl }:
 
-stdenv.mkDerivation rec {
-  pname = "rtorrent";
-  version = "0.8.6";
+let
+  version = "0.8.9";
+in
+stdenv.mkDerivation {
+  name = "rtorrent-${version}";
 
-  name = "${pname}-${version}";
-  
   src = fetchurl {
-    url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz";
-    sha256 = "1nrj1cgjhscf40zhp70m4p6gq96rqg815dn43yyjl5i42n7cd5lc";
+    url = "http://libtorrent.rakshasa.no/downloads/rtorrent-${version}.tar.gz";
+    sha256 = "cca70eb36a0c176bbd6fdb3afe2bc9f163fa4c9377fc33bc29689dec60cf6d84";
   };
 
   buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];
-  
+
   meta = {
+    homepage = "http://libtorrent.rakshasa.no/";
     description = "An ncurses client for libtorrent, ideal for use with screen or dtach";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From b70a14f88c4953221abf302c4865520f9cd5c5ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 14:44:28 +0000
Subject: [PATCH 012/101] =?UTF-8?q?*=20Added=20the=20Google=20Talk=20plugi?=
 =?UTF-8?q?n.=20=20Doesn't=20work=20yet=20(says=20=E2=80=98ABORT:=20=20=20?=
 =?UTF-8?q?X=5FGLXCreateContext:=20BadValue=E2=80=99).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixpkgs/trunk/; revision=27825
---
 .../google-talk-plugin/default.nix            | 92 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 22 +++--
 2 files changed, 105 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
new file mode 100644
index 000000000000..3ae24bdddf98
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -0,0 +1,92 @@
+{ stdenv, fetchurl, rpm, cpio, pkgsi686Linux, mesa, xorg, cairo
+, libpng, gtk, glib, fontconfig, freetype, curl
+}:
+
+with stdenv.lib;
+
+let
+
+  rpathNative = makeLibraryPath
+    [ stdenv.gcc.gcc
+      mesa
+      xorg.libXt
+      xorg.libX11
+      cairo
+      libpng
+      gtk
+      glib
+      fontconfig
+      freetype
+      curl
+    ];
+
+  rpath32 = makeLibraryPath
+    [ pkgsi686Linux.gtkLibs.gdk_pixbuf
+      pkgsi686Linux.gtkLibs.glib
+      pkgsi686Linux.gtkLibs.gtk
+      pkgsi686Linux.xorg.libX11
+      pkgsi686Linux.xorg.libXcomposite
+      pkgsi686Linux.xorg.libXfixes
+      pkgsi686Linux.xorg.libXrender
+      pkgsi686Linux.xorg.libXrandr
+      pkgsi686Linux.gcc.gcc
+      pkgsi686Linux.alsaLib
+      pkgsi686Linux.pulseaudio
+      pkgsi686Linux.dbus_glib
+      pkgsi686Linux.udev
+    ];
+
+in
+
+stdenv.mkDerivation {
+  name = "google-talk-plugin-2.107.0";
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm";
+        sha256 = "01c8w221azvmqvxf5lgb8l151086d72ll5wnjndwn50dvi6rphvx";
+      }
+    else
+      throw "Google Talk does not support your platform.";
+
+  buildInputs = [ rpm cpio ];
+      
+  unpackPhase =
+    ''
+      rpm2cpio $src | cpio -i --make-directories -v
+    '';
+
+  installPhase =
+    ''
+      mkdir -p $out/lib/mozilla/plugins
+      cp opt/google/talkplugin/libnp*.so $out/lib/mozilla/plugins/
+
+      patchelf --set-rpath "${makeLibraryPath [ stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64" \
+        $out/lib/mozilla/plugins/libnpgoogletalk64.so
+
+      patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathNative}:${stdenv.gcc.gcc}/lib64" \
+        $out/lib/mozilla/plugins/libnpgtpo3dautoplugin.so
+
+      mkdir -p $out/libexec/google/talkplugin
+      cp opt/google/talkplugin/GoogleTalkPlugin $out/libexec/google/talkplugin/
+      
+      mkdir -p $out/libexec/google/talkplugin/lib
+      cp opt/google/talkplugin/lib/libCg* $out/libexec/google/talkplugin/lib/
+
+      patchelf \
+        --set-interpreter ${pkgsi686Linux.glibc}/lib/ld-linux*.so.2 \
+        --set-rpath ${rpath32} \
+        $out/libexec/google/talkplugin/GoogleTalkPlugin
+    '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+  
+  passthru.mozillaPlugin = "/lib/mozilla/plugins";
+
+  meta = {
+    homepage = http://www.google.com/chat/video/;
+    license = "unfree";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d7d02dddff2..327b97d07f5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6315,7 +6315,7 @@ let
   flashplayer = flashplayer10;
 
   flashplayer9 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
-      inherit (gtkLibs) atk;
+    inherit (gtkLibs) atk;
   };
 
   flashplayer10 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-10 {
@@ -6434,6 +6434,10 @@ let
 
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
 
+  google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
+    inherit pkgsi686Linux;
+  };
+
   gosmore = builderDefsPackage ../applications/misc/gosmore {
     inherit fetchsvn curl pkgconfig libxml2;
     inherit (gtkLibs) gtk;
@@ -6911,8 +6915,8 @@ let
   rdesktop = callPackage ../applications/networking/remote/rdesktop { };
 
   RealPlayer = callPackage ../applications/video/RealPlayer {
-      inherit (gtkLibs) glib pango atk gtk;
-      libstdcpp5 = gcc33.gcc;
+    inherit (gtkLibs) glib pango atk gtk;
+    libstdcpp5 = gcc33.gcc;
   };
 
   rekonq = newScope pkgs.kde4 ../applications/networking/browsers/rekonq { };
@@ -6923,7 +6927,7 @@ let
 
   retroshare = callPackage ../applications/networking/p2p/retroshare {
     qt = qt4;
-   inherit (gnome) gnome_keyring;
+    inherit (gnome) gnome_keyring;
   };
 
   rsync = callPackage ../applications/networking/sync/rsync {
@@ -6934,7 +6938,8 @@ let
 
   # = urxvt
   rxvt_unicode = callPackage ../applications/misc/rxvt_unicode {
-    perlSupport = false;  };
+    perlSupport = false;
+  };
 
   sakura = callPackage ../applications/misc/sakura {
     inherit (gnome) vte;
@@ -6950,9 +6955,7 @@ let
   seeks = callPackage ../tools/networking/p2p/seeks { };
 
   seg3d = callPackage ../applications/graphics/seg3d {
-    wxGTK = wxGTK28.override {
-      unicode = false;
-  };
+    wxGTK = wxGTK28.override { unicode = false; };
   };
 
   semnotes = newScope pkgs.kde4 ../applications/misc/semnotes { };
@@ -7188,7 +7191,7 @@ let
         enableGnash = getConfig [ browserName "enableGnash" ] false;
       in
        assert !(enableGnash && enableAdobeFlash);
-       ([]
+       ([ ]
         ++ lib.optional enableGnash gnash
         ++ lib.optional enableAdobeFlash flashplayer
         # RealPlayer is disabled by default for legal reasons.
@@ -7197,6 +7200,7 @@ let
         ++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser)
         ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer
         ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin
+        ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin 
        );
   };
 

From b9d382c2ddeb70dc853f1149cd2b1dd1e3a4f06f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Jul 2011 15:23:03 +0000
Subject: [PATCH 013/101] libtorrent: use sha256 hash returned by
 nix-prefetch-url

svn path=/nixpkgs/trunk/; revision=27827
---
 pkgs/tools/networking/p2p/libtorrent/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index e702a406aad3..76aedf1c0ef9 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://libtorrent.rakshasa.no/downloads/libtorrent-${version}.tar.gz";
-    sha256 = "25dc9e8dd45d070f447e599bef08ef0ca421bac6e7f55e608dcd19360594af64";
+    sha256 = "0r5gjh2kc6fdimh5xxg7qsx2390cxw4fz6srgr20y1sxsj6rxp0m";
   };
 
   buildInputs = [ pkgconfig openssl libsigcxx ];

From 5152d0148ea3b2b256eef3c63f85e75d9dd2bc2c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 20:50:59 +0000
Subject: [PATCH 014/101] * Drop the "_configurable" from the name of the PHP
 package, it's   ugly.

svn path=/nixpkgs/trunk/; revision=27830
---
 pkgs/development/interpreters/php/5.2.nix | 2 +-
 pkgs/development/interpreters/php/5.3.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.2.nix b/pkgs/development/interpreters/php/5.2.nix
index 077c1ae7d7da..8a70871af84b 100644
--- a/pkgs/development/interpreters/php/5.2.nix
+++ b/pkgs/development/interpreters/php/5.2.nix
@@ -10,7 +10,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
   version = "5.2.14";
 
-  name = "php_configurable-${version}";
+  name = "php-${version}";
 
   buildInputs = ["flex" "bison" "pkgconfig"];
 
diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index d34e4f6cc04a..6e4e67069b96 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -10,7 +10,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
   version = "5.3.6";
 
-  name = "php_configurable-${version}";
+  name = "php-${version}";
 
   buildInputs = ["flex" "bison" "pkgconfig"];
 

From 2e5d962f72d5a158896d2c3bd15eae730cea7af8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 22:34:57 +0000
Subject: [PATCH 015/101] * Spotify updated to 0.5.1.151.

svn path=/nixpkgs/trunk/; revision=27831
---
 pkgs/applications/audio/spotify/default.nix | 12 ++++++------
 pkgs/applications/audio/spotify/preload.c   |  7 +++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index d8bbec84782d..51c4b733d307 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -2,7 +2,7 @@
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
-let version = "0.4.9.302"; in
+let version = "0.5.1.151"; in
 
 stdenv.mkDerivation {
   name = "spotify-${version}";
@@ -10,13 +10,13 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then 
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g604b4fb-1_i386.deb";
-        sha256 = "1kw3jfvz8a9v6zl3yh6f51vsick35kmcf7vkbjb6wl0nk1a8q8gg";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g7c8c074-1_i386.deb";
+        sha256 = "1zs52hlji3niaiw9lhwmq1393cydr3i494gpzk3fpwr9n8m1jbk0";
       }
     else if stdenv.system == "x86_64-linux" then 
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g604b4fb-1_amd64.deb";
-        sha256 = "1cghs3hwmqnd7g62g1h2bf3yvxgjq8b94vzhp1w9ysb5rswyjkyv";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g7c8c074-1_amd64.deb";
+        sha256 = "01yvrggcj1hvdrqmy35x3klv2v20d63knzfh0lrdfbhi99hr6nvx";
       }
     else throw "Spotify not supported on this platform.";
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
       patchelf \
         --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-        --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver qt4 alsaLib stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
+        --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
         $out/bin/spotify
 
       preload=$out/libexec/spotify/libpreload.so
diff --git a/pkgs/applications/audio/spotify/preload.c b/pkgs/applications/audio/spotify/preload.c
index d6e8fe417401..42d482c21e43 100644
--- a/pkgs/applications/audio/spotify/preload.c
+++ b/pkgs/applications/audio/spotify/preload.c
@@ -57,3 +57,10 @@ int __xstat64(int ver, const char *path, struct stat64 *st)
     int (*___xstat64) (int ver, const char *, struct stat64 *) = dlsym(RTLD_NEXT, "__xstat64");
     return ___xstat64(ver, rewrite(path, buf), st);
 }
+
+int access(const char *path, int mode)
+{
+    char buf[PATH_MAX];
+    int (*_access) (const char *path, int mode) = dlsym(RTLD_NEXT, "access");
+    return _access(rewrite(path, buf), mode);
+}

From 5795d233204b739b2322fe4b5b108f3347018173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 19 Jul 2011 09:03:09 +0000
Subject: [PATCH 016/101] Linux: Actually use `postBuild'.

svn path=/nixpkgs/trunk/; revision=27833
---
 pkgs/os-specific/linux/kernel/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 3fa316b1224b..ce609f238499 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation {
 
   generateConfig = ./generate-config.pl;
 
-  inherit preConfigure src module_init_tools localVersion postInstall;
+  inherit preConfigure src module_init_tools localVersion postBuild postInstall;
 
   patches = map (p: p.patch) kernelPatches;
 

From dfcaa06a125b5b4d7867dc6ac8f4733adbf19a63 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 19 Jul 2011 16:02:37 +0000
Subject: [PATCH 017/101] add pylint and deps

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81c80200b294..7ecffc76745a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -110,6 +110,16 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  astng = buildPythonPackage rec {
+    name = "logilab-astng-0.21.1";
+
+    src = fetchurl {
+      url = "http://ftp.logilab.org/pub/astng/${name}.tar.gz";
+      sha256 = "0rqp2vwrnv6gkzdd96j078h1sz26plh49cmnyswy2wb6l4wans67";
+    };
+    propagatedBuildInputs = [logilabCommon];
+  };
+
   beautifulsoap = buildPythonPackage (rec {
     name = "beautifulsoap-3.0.8";
 
@@ -599,6 +609,15 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+  logilabCommon = buildPythonPackage rec {
+    name = "logilab-common-0.56.0";
+
+    src = fetchurl {
+      url = "http://ftp.logilab.org/pub/common/${name}.tar.gz";
+      sha256 = "14p557nqypbd10d8k7qs6jlm58pksiwh86wvvl0axyki00hj6971";
+    };
+    propagatedBuildInputs = [unittest2];
+  };
   
   lxml = buildPythonPackage ( rec {
     name = "lxml-2.2.2";
@@ -1220,6 +1239,15 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  pylint = buildPythonPackage rec {
+    name = "pylint-0.23.0";
+
+    src = fetchurl {
+      url = "http://ftp.logilab.org/pub/pylint/${name}.tar.gz";
+      sha256 = "07091avcc2b374i5f3blszmawjcin8xssjfryz91qbxybb8r7c6d";
+    };
+    propagatedBuildInputs = [astng];
+  };
 
   pymacs = pkgs.stdenv.mkDerivation rec {
     version = "v0.24-beta2";

From f61f66f46de6badeaaafb5f09630a8e42b96b43c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 10:16:35 +0000
Subject: [PATCH 018/101] git-annex: updated to version 3.20110719

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

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 4407514b70ed..f9bc4767916b 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
@@ -2,14 +2,14 @@
 , QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which }:
 
 let
-  version = "3.20110707";
+  version = "3.20110719";
 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 = "0yyrp94przjmdljd97q5p0yll9aa1jdajrvlhl4m1yq0ngx6x4rr";
+    sha256 = "0wkfm6sc3rnprigi8xxw1h0d1bs3lwzzzwgqfzlcbsh44rdlnz54";
   };
 
   buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight

From ff91dbdb35315fee173db212359a14e47f86c1b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 12:13:07 +0000
Subject: [PATCH 019/101] git-annex: the latest version depends on the
 monad-control package

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

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index cc58a6ff6c6c..dd20d17fb9df 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -48,7 +48,7 @@ rec {
   gitAnnex = lib.makeOverridable (import ./git-annex) {
     inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
     inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc
-      HTTP testpack;
+      HTTP testpack monadControl;
   };
 
   qgit = import ./qgit {
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 f9bc4767916b..fb0365710656 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,6 @@
 { stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String
-, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which }:
+, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which
+, monadControl }:
 
 let
   version = "3.20110719";
@@ -13,7 +14,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight
-    SHA dataenc HTTP testpack git ikiwiki which];
+    SHA dataenc HTTP testpack git ikiwiki which monadControl];
 
   checkTarget = "test";
   doCheck = true;

From d86570f94e5a9a93054eeeced92325dd01574424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 20 Jul 2011 13:24:26 +0000
Subject: [PATCH 020/101] Updating opencv.

svn path=/nixpkgs/trunk/; revision=27841
---
 .../libraries/opencv/changeset_r3190.diff     | 20 -------------------
 pkgs/development/libraries/opencv/default.nix |  8 ++++----
 2 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/opencv/changeset_r3190.diff

diff --git a/pkgs/development/libraries/opencv/changeset_r3190.diff b/pkgs/development/libraries/opencv/changeset_r3190.diff
deleted file mode 100644
index 4a614659e723..000000000000
--- a/pkgs/development/libraries/opencv/changeset_r3190.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- opencv/src/highgui/cvcap_ffmpeg.cpp
-+++ opencv/src/highgui/cvcap_ffmpeg.cpp
-@@ -49,6 +49,15 @@
- #if !defined(WIN32) || defined(__MINGW32__)
- // some versions of FFMPEG assume a C99 compiler, and don't define INT64_C
--#ifndef INT64_C
--#define INT64_C
-+#if !defined INT64_C || !defined UINT64_C
-+# if __WORDSIZE == 64
-+#  define INT64_C(c)	c ## UL
-+# else
-+#  define INT64_C(c)	c ## ULL
-+# endif
-+# if __WORDSIZE == 64
-+#  define UINT64_C(c)	c ## UL
-+# else
-+#  define UINT64_C(c)	c ## ULL
-+# endif
- #define __STDC_CONSTANT_MACROS
- // force re-inclusion of stdint.h to get INT64_C macro
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index c8b77d5f5725..95a8f0d8fdb0 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -2,17 +2,17 @@
   xineLib, gstreamer }:
 
 stdenv.mkDerivation rec {
-  name = "opencv-2.1.0";
+  name = "opencv-2.3.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2";
-    sha256 = "0zrr24hr64gz35qb95nsvvbmdf89biglpy9z14y5kaxh5baiy1i6";
+    url = "mirror://sourceforge/opencvlibrary/OpenCV-2.3.0.tar.bz2";
+    sha256 = "02wl56a87if84brrhd4wq59linyhbxx30ykh4cjwzw37yw7zzgxw";
   };
 
   buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
     xineLib gstreamer ];
 
-  patches = [ ./changeset_r3190.diff ];
+  enableParallelBuilding = true;
 
   meta = {
     description = "Open Computer Vision Library with more than 500 algorithms";

From 33765b5899a8c0cf29681b01f399f7261c50795f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 15:30:35 +0000
Subject: [PATCH 021/101] python-packages.nix: added genzshcomp 0.2.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ecffc76745a..bd7f5718cbfb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -466,7 +466,25 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+  genzshcomp = buildPythonPackage {
+    name = "genzshcomp-0.2.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/g/genzshcomp/genzshcomp-0.2.2.tar.gz";
+      sha256 = "0bhiyx41kilvy04cgjbvjy2r4b6l7zz31fbrg3l6lvnqm26nihb0";
+    };
+
+    buildInputs = [ pkgs.setuptools ];
+
+    meta = {
+      description = "automatically generated zsh completion function for Python's option parser modules";
+      license = "BSD";
+      maintainers = [ stdenv.lib.maintainers.simons ];
+      platforms = python.meta.platforms;
+    };
+  };
+
+
   gflags = buildPythonPackage rec {
     name = "gflags-1.5.1";
 

From 3290213e4294dd6581b99fccc3b423ae0b23a16d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 15:30:40 +0000
Subject: [PATCH 022/101] python-packages.nix: strip trailing whitespace

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd7f5718cbfb..5e99700e865f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12,7 +12,7 @@ let pythonPackages = python.modules // rec {
     inherit python wrapPython setuptools;
   };
 
-  
+
   setuptools = import ../development/python-modules/setuptools {
     inherit (pkgs) stdenv fetchurl;
     inherit python wrapPython;
@@ -62,7 +62,7 @@ let pythonPackages = python.modules // rec {
 
   apsw = buildPythonPackage rec {
     name = "apsw-3.7.6.2-r1";
-    
+
     src = fetchurl {
       url = "http://apsw.googlecode.com/files/${name}.zip";
       sha1 = "fa4aec08e59fa5964197f59ba42408d64031675b";
@@ -78,7 +78,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   argparse = buildPythonPackage (rec {
     name = "argparse-1.1";
 
@@ -228,7 +228,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   cherrypy = buildPythonPackage (rec {
     name = "cherrypy-3.1.2";
 
@@ -357,10 +357,10 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   dtopt = buildPythonPackage rec {
     name = "dtopt-0.1";
-    
+
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/d/dtopt/${name}.tar.gz";
       md5 = "9a41317149e926fcc408086aedee6bab";
@@ -372,7 +372,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   eventlet = buildPythonPackage rec {
     name = "eventlet-0.9.16";
 
@@ -395,7 +395,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   flup = buildPythonPackage (rec {
     name = "flup-1.0.2";
 
@@ -499,7 +499,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   glance = buildPythonPackage rec {
     name = "glance-0.1.7";
 
@@ -520,7 +520,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   greenlet = buildPythonPackage rec {
     name = "greenlet-0.3.1";
 
@@ -535,7 +535,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   httplib2 = buildPythonPackage rec {
     name = "httplib2-0.6.0";
 
@@ -552,11 +552,11 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   ipy = buildPythonPackage rec {
     version = "0.74";
     name = "ipy-${version}";
-    
+
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/I/IPy/IPy-${version}.tar.gz";
       md5 = "f4f7ddc7c5e55a47222a5cc6c0a87b6d";
@@ -570,7 +570,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   jinja2 = buildPythonPackage {
     name = "jinja2-2.2.1";
 
@@ -591,7 +591,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   libcloud = buildPythonPackage (rec {
     name = "libcloud-0.3.1";
 
@@ -610,7 +610,7 @@ let pythonPackages = python.modules // rec {
     };
   });
 
-  
+
   lockfile = buildPythonPackage rec {
     name = "lockfile-0.9.1";
 
@@ -636,7 +636,7 @@ let pythonPackages = python.modules // rec {
     };
     propagatedBuildInputs = [unittest2];
   };
-  
+
   lxml = buildPythonPackage ( rec {
     name = "lxml-2.2.2";
 
@@ -674,11 +674,11 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   m2crypto = buildPythonPackage rec {
     version = "0.21.1";
     name = "m2crypto-${version}";
-    
+
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${version}.tar.gz";
       md5 = "f93d8462ff7646397a9f77a2fe602d17";
@@ -696,7 +696,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   markdown = buildPythonPackage rec {
     version = "2.0.3";
     name = "markdown-${version}";
@@ -713,7 +713,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   matplotlib = buildPythonPackage ( rec {
     name = "matplotlib-0.99.1.2";
 
@@ -751,7 +751,7 @@ let pythonPackages = python.modules // rec {
     };
   });
 
-  
+
   mock = buildPythonPackage (rec {
     name = "mock-0.7.0";
 
@@ -788,7 +788,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   mutagen = buildPythonPackage (rec {
     name = "mutagen-1.20";
 
@@ -858,7 +858,7 @@ let pythonPackages = python.modules // rec {
     };
   });
 
-  
+
   netaddr = buildPythonPackage rec {
     name = "netaddr-0.7.5";
 
@@ -875,7 +875,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   nevow = buildPythonPackage (rec {
     name = "nevow-${version}";
     version = "0.10.0";
@@ -1070,7 +1070,7 @@ let pythonPackages = python.modules // rec {
 
   paste = buildPythonPackage rec {
     name = "paste-1.7.5.1";
-    
+
     src = fetchurl {
       url = http://pypi.python.org/packages/source/P/Paste/Paste-1.7.5.1.tar.gz;
       md5 = "7ea5fabed7dca48eb46dc613c4b6c4ed";
@@ -1086,11 +1086,11 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   paste_deploy = buildPythonPackage rec {
     version = "1.3.4";
     name = "paste-deploy-${version}";
-    
+
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-${version}.tar.gz";
       md5 = "eb4b3e2543d54401249c2cbd9f2d014f";
@@ -1106,7 +1106,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   pexpect = buildPythonPackage {
     name = "pexpect-2.3";
 
@@ -1143,10 +1143,10 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   prettytable = buildPythonPackage rec {
     name = "prettytable-0.5";
-    
+
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.gz";
       md5 = "13a6930d775395f393afd86948afa4fa";
@@ -1158,7 +1158,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   psycopg2 = buildPythonPackage rec {
     name = "psycopg2-2.0.13";
 
@@ -1377,7 +1377,7 @@ let pythonPackages = python.modules // rec {
     };
   });
 
-  
+
   pysvn = pkgs.stdenv.mkDerivation {
     name = "pysvn-1.7.2";
 
@@ -1424,7 +1424,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   pyutil = buildPythonPackage (rec {
     name = "pyutil-1.7.9";
 
@@ -1543,10 +1543,10 @@ let pythonPackages = python.modules // rec {
      };
   };
 
-  
+
   routes = buildPythonPackage rec {
     name = "routes-1.12.3";
-    
+
     src = fetchurl {
       url = http://pypi.python.org/packages/source/R/Routes/Routes-1.12.3.tar.gz;
       md5 = "9740ff424ff6b841632c784a38fb2be3";
@@ -1560,11 +1560,11 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   scripttest = buildPythonPackage rec {
     version = "1.1.1";
     name = "scripttest-${version}";
-    
+
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/S/ScriptTest/ScriptTest-${version}.tar.gz";
       md5 = "592ce890764c3f546d35b4d7c40c32ef";
@@ -1578,7 +1578,7 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   setuptoolsDarcs = buildPythonPackage {
     name = "setuptools-darcs-1.2.9";
 
@@ -1766,7 +1766,7 @@ let pythonPackages = python.modules // rec {
 
   unittest2 = buildPythonPackage rec {
     name = "unittest2-0.5.1";
-    
+
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/u/unittest2/${name}.tar.gz";
       md5 = "a0af5cac92bbbfa0c3b0e99571390e0f";
@@ -1778,11 +1778,11 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   webob = buildPythonPackage rec {
     version = "1.0.6";
     name = "webob-${version}";
-    
+
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/W/WebOb/WebOb-${version}.zip";
       md5 = "8e46dd755f6998d471bfbcb4def897ff";
@@ -1799,11 +1799,11 @@ let pythonPackages = python.modules // rec {
     };
   };
 
-  
+
   webtest = buildPythonPackage rec {
     version = "1.2.3";
     name = "webtest-${version}";
-    
+
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.tar.gz";
       md5 = "585f9331467e6d99acaba4051c1c5878";
@@ -1819,7 +1819,7 @@ let pythonPackages = python.modules // rec {
 
 
   wxPython = wxPython28;
-  
+
 
   wxPython26 = import ../development/python-modules/wxPython/2.6.nix {
     inherit (pkgs) stdenv fetchurl pkgconfig;
@@ -1827,14 +1827,14 @@ let pythonPackages = python.modules // rec {
     wxGTK = pkgs.wxGTK26;
   };
 
-  
+
   wxPython28 = import ../development/python-modules/wxPython/2.8.nix {
     inherit (pkgs) stdenv fetchurl pkgconfig;
     inherit pythonPackages;
     wxGTK = pkgs.wxGTK28;
   };
 
-  
+
   zbase32 = buildPythonPackage (rec {
     name = "zbase32-1.1.2";
 

From fbad200e88713c92a48e27bec944f5eedd8afe10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 20 Jul 2011 17:40:53 +0000
Subject: [PATCH 023/101] Updating php 5.2

svn path=/nixpkgs/trunk/; revision=27844
---
 pkgs/development/interpreters/php/5.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.2.nix b/pkgs/development/interpreters/php/5.2.nix
index 8a70871af84b..f98d178663f1 100644
--- a/pkgs/development/interpreters/php/5.2.nix
+++ b/pkgs/development/interpreters/php/5.2.nix
@@ -8,7 +8,7 @@ in
 
 composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.2.14";
+  version = "5.2.17";
 
   name = "php-${version}";
 
@@ -157,7 +157,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
   src = args.fetchurl {
     url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    sha256 = "1l9b7iv0f6ds9x2ayclcfgjh62xbabbv11ixp5cqsyaq2ba5ynsi";
+    sha256 = "0v0i7zjp1a2c60imn58xjqcczmiglnfnwdkgwl0bfai4xh9yn6z8";
     name = "php-${version}.tar.bz2";
   };
 

From 35312ae76f9eb37a191085a20a9dc7aae069de59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 18:04:03 +0000
Subject: [PATCH 024/101] haskell-packages.nix: added storable-record

svn path=/nixpkgs/trunk/; revision=27845
---
 .../libraries/haskell/storable-record/default.nix    | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/storable-record/default.nix

diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix
new file mode 100644
index 000000000000..a14d081430d2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/storable-record/default.nix
@@ -0,0 +1,12 @@
+{cabal, utilityHt, transformers}:
+
+cabal.mkDerivation (self : {
+  pname = "storable-record";
+  version = "0.0.2.4";
+  sha256 = "5ed2680dcfc4c3d4fe605d23e797b847fe047b7acd3f4acfd82155c93e72b280";
+  propagatedBuildInputs = [utilityHt transformers];
+  meta = {
+    description = "build a Storable instance of a record type from Storable instances of its elements";
+  };
+})
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9d14ad9fe2f9..aeab3b9931dc 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -934,6 +934,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   storableComplex = callPackage ../development/libraries/haskell/storable-complex {};
 
+  storableRecord = callPackage ../development/libraries/haskell/storable-record {};
+
   strictConcurrency = callPackage ../development/libraries/haskell/strictConcurrency {};
 
   svgcairo = callPackage ../development/libraries/haskell/svgcairo {};

From e0a9dc3a29b6db47039fd8c31ea67d38aa368425 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 18:04:08 +0000
Subject: [PATCH 025/101] utility-ht: updated to version 0.0.7

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

diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix
index 74671673030f..eed22ffd26ad 100644
--- a/pkgs/development/libraries/haskell/utility-ht/default.nix
+++ b/pkgs/development/libraries/haskell/utility-ht/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "utility-ht";
-  version = "0.0.5.1";
-  sha256 = "f15fd1450b31f002e6d4fe3720cff7c899f23f8a68b890ea3854e68e596c97cb";
+  version = "0.0.7";
+  sha256 = "83ffd750088a0eef5485b5dfadd13158ab7883655a3773bcc8d22485ba8d3a20";
   meta = {
     description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
   };

From c01bf4d344905fcfc9e2521780b44b92fda47d92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 18:04:12 +0000
Subject: [PATCH 026/101] non-negative: updated to version 0.1

svn path=/nixpkgs/trunk/; revision=27847
---
 .../libraries/haskell/non-negative/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix
index 32d6a629389a..ecde2772e250 100644
--- a/pkgs/development/libraries/haskell/non-negative/default.nix
+++ b/pkgs/development/libraries/haskell/non-negative/default.nix
@@ -1,10 +1,10 @@
-{cabal, QuickCheck}:
+{cabal, QuickCheck, utilityHt}:
 
 cabal.mkDerivation (self : {
   pname = "non-negative";
-  version = "0.0.4";
-  sha256 = "0b82b7be086c8d4e493d606098d82c2e5d943fe76d18a5eb6836c449ba19fc6f";
-  propagatedBuildInputs = [QuickCheck];
+  version = "0.1";
+  sha256 = "0aebb6f5518191a02b11230798444997a03b84d63d2aaa6c38cac6718f6c351c";
+  propagatedBuildInputs = [QuickCheck utilityHt];
   meta = {
     description = "Non-negative numbers";
   };

From fef790c942c811cd8cc8843beeece5b4f0c5b0ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 18:04:16 +0000
Subject: [PATCH 027/101] numeric-prelude: updated to version 0.2.2

svn path=/nixpkgs/trunk/; revision=27848
---
 .../libraries/haskell/numeric-prelude/default.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
index 409a5b3e2689..e73b0879143e 100644
--- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
@@ -1,10 +1,10 @@
-{cabal, HUnit, QuickCheck, parsec, nonNegative, utilityHt}:
+{cabal, HUnit, QuickCheck, parsec, nonNegative, utilityHt, storableRecord}:
 
 cabal.mkDerivation (self : {
   pname = "numeric-prelude";
-  version = "0.1";
-  sha256 = "01de33ea483808704f6d2c635763fcbff3abe12db8035c6640124eb8486b6efb";
-  propagatedBuildInputs = [HUnit QuickCheck parsec nonNegative utilityHt];
+  version = "0.2.2";
+  sha256 = "bc6adb8c2f04e0e1f62e183e052974700143dc93b1a3cbafe3562aa1f7a649fd";
+  propagatedBuildInputs = [HUnit QuickCheck parsec nonNegative utilityHt storableRecord];
   meta = {
     description = "An experimental alternative hierarchy of numeric type classes";
   };

From 37e07ad933bb2c2f2cb36ab78b659ca9c8b62b07 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 18:20:28 +0000
Subject: [PATCH 028/101] pandoc: updated to version 1.8.1.2

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

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index e5865a1356af..58842d7186f5 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "pandoc";
-  version = "1.8.1.1";
-  sha256 = "0g680j8x3v19wcb9k2dxgrdrjr48w0vhvlspfzgw0sgzrgfmaqsj";
+  version = "1.8.1.2";
+  sha256 = "93b23b7ff91ac6d91c8b3945175967fa4da5a5587c1147a19a1a20c8d61b734d";
   propagatedBuildInputs =
     [HTTP citeprocHs dlist tagsoup texmath xhtml zipArchive];
   meta = {

From f05ab93c88ef986855f4599da98d2b2a471faf81 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 18:20:32 +0000
Subject: [PATCH 029/101] haskell-packages.nix: added mtlparse

svn path=/nixpkgs/trunk/; revision=27851
---
 .../libraries/haskell/mtlparse/default.nix           | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/mtlparse/default.nix

diff --git a/pkgs/development/libraries/haskell/mtlparse/default.nix b/pkgs/development/libraries/haskell/mtlparse/default.nix
new file mode 100644
index 000000000000..51b620368855
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mtlparse/default.nix
@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "mtlparse";
+  version = "0.1.2";
+  sha256 = "cd85d985e4eff842b1c053a2ff507094a20995c5757acc06ea34ff07d9edd142";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "parse library based on the mtl package";
+  };
+})
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index aeab3b9931dc..7377c86aa74a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -716,6 +716,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   mtl2 = self.mtl_2_0_1_0;
   mtl  = self.mtl1;
 
+  mtlparse  = callPackage ../development/libraries/haskell/mtlparse {};
+
   multiplate = callPackage ../development/libraries/haskell/multiplate {};
 
   multirec = callPackage ../development/libraries/haskell/multirec {};

From f8b4f9e85c101486b96c630996dd1575786ea18d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 18:20:37 +0000
Subject: [PATCH 030/101] haskell-packages.nix: added regexpr

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

diff --git a/pkgs/development/libraries/haskell/regexpr/default.nix b/pkgs/development/libraries/haskell/regexpr/default.nix
new file mode 100644
index 000000000000..36ba5e4005b3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regexpr/default.nix
@@ -0,0 +1,11 @@
+{cabal, HUnit, mtl, mtlparse}:
+
+cabal.mkDerivation (self : {
+  pname = "regexpr";
+  version = "0.5.4";
+  sha256 = "bf7813247f26877d9fba4ba4b66eb80bfddfc2086a5cd8d635b2da0ccde56604";
+  propagatedBuildInputs = [HUnit mtl mtlparse];
+  meta = {
+    description = "regular expression library like Perl and Ruby's regular expressions";
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7377c86aa74a..698f8b892cf6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -854,6 +854,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   regexPCRE = callPackage ../development/libraries/haskell/regex-pcre {};
 
+  regexpr = callPackage ../development/libraries/haskell/regexpr {};
+
   regular = callPackage ../development/libraries/haskell/regular {};
 
   repa = callPackage ../development/libraries/haskell/repa {};

From 7237cf32ecf48ab314dc0bb45d2a595098236479 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 18:20:42 +0000
Subject: [PATCH 031/101] haskell-packages.nix: added hledger and hledger-lib

svn path=/nixpkgs/trunk/; revision=27853
---
 .../libraries/haskell/hledger-lib/default.nix       | 11 +++++++++++
 .../libraries/haskell/hledger/default.nix           | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  3 +++
 3 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hledger-lib/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hledger/default.nix

diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
new file mode 100644
index 000000000000..b4f6e6ef57de
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -0,0 +1,11 @@
+{cabal, HUnit, mtl, parsec, regexpr, safe, split, utf8String}:
+
+cabal.mkDerivation (self : {
+  pname = "hledger-lib";
+  version = "0.14";
+  sha256 = "9a6d6ab4383800279e135e9bbcd886e95cea45232d093202c5d43e6edd1f927c";
+  propagatedBuildInputs = [HUnit mtl parsec regexpr safe split utf8String];
+  meta = {
+    description = "core data types, parsers and utilities used by the hledger tools";
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
new file mode 100644
index 000000000000..f3a2dc4fac96
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -0,0 +1,13 @@
+{cabal, hledgerLib, csv, haskeline}:
+
+cabal.mkDerivation (self : {
+  pname = "hledger";
+  version = "0.14";
+  sha256 = "1bfcb1dcc88d8cec924afbf7aefd1ccf88b7be785b522c1595b75b91f8c82d35";
+  propagatedBuildInputs = [hledgerLib csv haskeline];
+  meta = {
+    description = "a reliable, practical financial reporting tool for day-to-day use";
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 698f8b892cf6..10fdf64ee9b2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -611,6 +611,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {};
 
+  hledger = callPackage ../development/libraries/haskell/hledger {};
+  hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {};
+
   HList = callPackage ../development/libraries/haskell/HList {};
 
   hmatrix = callPackage ../development/libraries/haskell/hmatrix {

From 9d426cd4702b8515dde8aa025035b12c2cc0ca34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 18:32:33 +0000
Subject: [PATCH 032/101] haskell-packages.nix: added hledger-chart and
 hledger-vty

svn path=/nixpkgs/trunk/; revision=27855
---
 .../libraries/haskell/hledger-chart/default.nix     | 13 +++++++++++++
 .../libraries/haskell/hledger-vty/default.nix       | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hledger-chart/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hledger-vty/default.nix

diff --git a/pkgs/development/libraries/haskell/hledger-chart/default.nix b/pkgs/development/libraries/haskell/hledger-chart/default.nix
new file mode 100644
index 000000000000..8c9a465afe4f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hledger-chart/default.nix
@@ -0,0 +1,13 @@
+{cabal, Chart, colour, hledger, hledgerLib, safe}:
+
+cabal.mkDerivation (self : {
+  pname = "hledger-chart";
+  version = "0.14";
+  sha256 = "fe321e4e31c72aef22945080323992a0033ae8fb48213ad7b708f86f9e2f6462";
+  propagatedBuildInputs = [Chart colour hledger hledgerLib safe];
+  meta = {
+    description = "generate simple pie chart graphics showing hledger account balances";
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hledger-vty/default.nix b/pkgs/development/libraries/haskell/hledger-vty/default.nix
new file mode 100644
index 000000000000..6cb58834ef14
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hledger-vty/default.nix
@@ -0,0 +1,13 @@
+{cabal, hledger, hledgerLib, vty, safe}:
+
+cabal.mkDerivation (self : {
+  pname = "hledger-vty";
+  version = "0.14";
+  sha256 = "3d9972430053548a65bfe5fb39ba374d1c930c6e0cfc704be5c59de742a4287e";
+  propagatedBuildInputs = [hledger hledgerLib vty safe];
+  meta = {
+    description = "a simple curses-style console interface to hledger";
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 10fdf64ee9b2..3d3f969126e8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -613,6 +613,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hledger = callPackage ../development/libraries/haskell/hledger {};
   hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {};
+  hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {};
+  hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {};
 
   HList = callPackage ../development/libraries/haskell/HList {};
 

From 01fc263ff29bee96af63c9bc051470f3339d856a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 18:38:47 +0000
Subject: [PATCH 033/101] haskell-packages.nix: added hsdns

svn path=/nixpkgs/trunk/; revision=27856
---
 .../libraries/haskell/hsdns/default.nix            | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  4 ++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hsdns/default.nix

diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix
new file mode 100644
index 000000000000..30838f8b39c9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hsdns/default.nix
@@ -0,0 +1,14 @@
+{cabal, adns, network}:
+
+cabal.mkDerivation (self : {
+  pname = "hsdns";
+  version = "1.5";
+  sha256 = "2788d1ad5ef07ae5f356a460fb92316118f3a4d9c779ec27fb8243602bcf6399";
+  propagatedBuildInputs = [adns network];
+  meta = {
+    description = "an asynchronous DNS resolver on top of GNU ADNS";
+    license = "LGPL";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3d3f969126e8..713d8d3cb42a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -632,6 +632,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hscolour = callPackage ../development/libraries/haskell/hscolour {};
 
+  hsdns = callPackage ../development/libraries/haskell/hsdns {
+    inherit (pkgs) adns;
+  };
+
   hsemail = callPackage ../development/libraries/haskell/hsemail {};
 
   HsSyck = callPackage ../development/libraries/haskell/HsSyck {};

From 5b96eac9101ffcdc7f276d7273312a30191dbe58 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 18:41:25 +0000
Subject: [PATCH 034/101] ledger: build this package only on Linux, all other
 platforms fail

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

diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index c1cd4b42a02a..1bc8e586e33f 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
       their data, there really is no alternative.
     '';
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From 62eab9e44ae9d6224bd99b773fe0f5fc4a946920 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 18:58:34 +0000
Subject: [PATCH 035/101] pdsh: updated to version 2.26

svn path=/nixpkgs/trunk/; revision=27858
---
 pkgs/tools/networking/pdsh/default.nix | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index ed437d37b52b..07dfd5c30a71 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -1,10 +1,14 @@
 {stdenv, fetchurl, perl, readline, rsh, ssh, pam}:
 
+let
+  name = "pdsh-2.26";
+in
 stdenv.mkDerivation {
-  name = "pdsh-2.25";
+  inherit name;
+
   src = fetchurl {
-    url = "http://pdsh.googlecode.com/files/pdsh-2.25.tar.bz2";
-    sha256 = "00cigkpdmabvh2aqzw2qbs6i7yj5x4lg1196ap0k9gqdnw0fd70z";
+    url = "http://pdsh.googlecode.com/files/${name}.tar.bz2";
+    sha256 = "ada2f35509064bf9cd0fd5ca39a351108cdd6f5155b05f39f1711a271298469a";
   };
 
   buildInputs = [perl readline ssh pam];
@@ -18,21 +22,13 @@ stdenv.mkDerivation {
     configureFlagsArray=(
       "--infodir=$out/share/info"
       "--mandir=$out/share/man"
-      "--with-machines=$out/etc/machines"
+      "--with-machines=/etc/pdsh/machines"
       ${if readline == null then "--without-readline" else "--with-readline"}
       ${if ssh == null then "--without-ssh" else "--with-ssh"}
       ${if pam == null then "--without-pam" else "--with-pam"}
       ${if rsh == false then "--without-rsh" else "--with-rsh"}
       "--with-dshgroups"
       "--with-xcpu"
-      "--without-genders"
-      "--without-mqshell"
-      "--without-mrsh"
-      "--without-netgroup"
-      "--without-nodeattr"
-      "--without-nodeupdown"
-      "--without-qshell"
-      "--without-slurm"
       "--disable-debug"
     )
   '';

From efe5ab73b19c0c8c769afa9433db2d8f90840360 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 22:56:31 +0000
Subject: [PATCH 036/101] git: fixed impure path to perl in git-am and
 git-submodule

svn path=/nixpkgs/trunk/; revision=27859
---
 .../version-management/git-and-tools/git/default.nix        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 7d51573bad20..ee207788875b 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -53,6 +53,12 @@ stdenv.mkDerivation rec {
       substituteInPlace $out/libexec/git-core/git-sh-setup \
           --replace ' grep' ' ${gnugrep}/bin/grep' \
           --replace ' egrep' ' ${gnugrep}/bin/egrep'
+
+      # Fix references to the perl binary. Note that the tab character
+      # in the patterns is important.
+      sed -i -e 's|	perl -ne|	${perl}/bin/perl -ne|g' \
+             -e 's|	perl -e|	${perl}/bin/perl -e|g' \
+             $out/libexec/git-core/{git-am,git-submodule}
     ''
 
    + (if svnSupport then

From 0b1bf668cdb55637481c7788bdb3e2cd27376d5b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 22:56:35 +0000
Subject: [PATCH 037/101] fetchgit: added support for fetching sub-modules

svn path=/nixpkgs/trunk/; revision=27860
---
 pkgs/build-support/fetchgit/builder.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh
index ed3af4a7ab61..7441c944eea4 100644
--- a/pkgs/build-support/fetchgit/builder.sh
+++ b/pkgs/build-support/fetchgit/builder.sh
@@ -25,6 +25,10 @@ else
     git checkout -b __nixos_build__ origin/HEAD
 fi
 
+if test -f .gitmodules; then
+  git submodule update --init
+fi
+
 if test -z "$leaveDotGit"; then
     find $out -name .git\* | xargs rm -rf
 fi

From 99a9a4b8bcc9d089e8e265cb1f732aa3b2ec9a61 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 22:56:39 +0000
Subject: [PATCH 038/101] all-packages.nix: added ledger 3.0 via Git

svn path=/nixpkgs/trunk/; revision=27861
---
 pkgs/applications/office/ledger/3.0.nix | 45 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/office/ledger/3.0.nix

diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix
new file mode 100644
index 000000000000..6c3a46943953
--- /dev/null
+++ b/pkgs/applications/office/ledger/3.0.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchgit, python, autoconf, automake, libtool, gettext, emacs, gmp
+, pcre, expat, boost, mpfr, git, texinfo }:
+
+let
+  rev = "cf35984971341b8a8688";
+in
+stdenv.mkDerivation {
+  name = "ledger3-${rev}";
+
+  src = fetchgit {
+    url = "git://github.com/jwiegley/ledger.git";
+    inherit rev;
+    sha256 = "4078983db9fc8d232fa71a31b47e505c531971b4515d6ef723e7d333a2352d2a";
+  };
+
+  buildInputs = [
+    python autoconf automake libtool gettext emacs gmp pcre expat boost mpfr
+    git texinfo
+  ];
+
+  buildPhase = ''
+    sed -i acprep \
+      -e 's|search_prefixes = .*|search_prefixes = ["${boost}"]|'
+    export MAKEFLAGS="-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES"
+    python acprep update --no-pch --prefix=$out
+  '';
+
+  doCheck = true;
+
+  meta = {
+    homepage = "http://ledger-cli.org/";
+    description = "A double-entry accounting system with a command-line reporting interface";
+    license = "BSD";
+
+    longDescription = ''
+      Ledger is a powerful, double-entry accounting system that is accessed
+      from the UNIX command-line. This may put off some users, as there is
+      no flashy UI, but for those who want unparalleled reporting access to
+      their data, there really is no alternative.
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 327b97d07f5c..904ed7b19fb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6638,6 +6638,7 @@ let
   links = callPackage ../applications/networking/browsers/links { };
 
   ledger = callPackage ../applications/office/ledger { };
+  ledger3 = callPackage ../applications/office/ledger/3.0.nix { };
 
   links2 = (builderDefsPackage ../applications/networking/browsers/links2) {
     inherit fetchurl stdenv bzip2 zlib libjpeg libpng libtiff

From c78c1288c3e3d538b8b80783417bdfa56bc6f4f5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 22:56:44 +0000
Subject: [PATCH 039/101] fetchgit: strip trailing whitespace

svn path=/nixpkgs/trunk/; revision=27862
---
 pkgs/build-support/fetchgit/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh
index 7441c944eea4..1e7527d0e39e 100644
--- a/pkgs/build-support/fetchgit/builder.sh
+++ b/pkgs/build-support/fetchgit/builder.sh
@@ -18,7 +18,7 @@ if test -n "$rev"; then
     parsed_rev=$(
         git rev-parse --verify "$rev" 2>/dev/null ||
         git rev-parse --verify origin/"$rev" 2>/dev/null
-    ) 
+    )
     git reset --hard $parsed_rev
     git checkout -b __nixos_build__
 else

From bb87bf9a5526efc48da65744de74e48a59084835 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 22:56:47 +0000
Subject: [PATCH 040/101] all-packages.nix: strip trailing whitespace

svn path=/nixpkgs/trunk/; revision=27863
---
 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 904ed7b19fb0..5c7dd7386a3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7201,7 +7201,7 @@ let
         ++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser)
         ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer
         ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin
-        ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin 
+        ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin
        );
   };
 

From 7f94a9ffbf94a2f17c5508362f488fc8596474fb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jul 2011 23:11:16 +0000
Subject: [PATCH 041/101] boost: fix "locale::facet::_S_create_c_locale name
 not valid" error

One would assume that the boost maintainers would have been able to apply this
two line change within the last 10 months or so, but apparently not.

svn path=/nixpkgs/trunk/; revision=27864
---
 .../libraries/boost/boost_filesystem.patch    | 24 +++++++++++++++++++
 pkgs/development/libraries/boost/default.nix  |  3 +++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/boost/boost_filesystem.patch

diff --git a/pkgs/development/libraries/boost/boost_filesystem.patch b/pkgs/development/libraries/boost/boost_filesystem.patch
new file mode 100644
index 000000000000..f32e9ed572d3
--- /dev/null
+++ b/pkgs/development/libraries/boost/boost_filesystem.patch
@@ -0,0 +1,24 @@
+diff -ubr boost_1_47_0/libs/filesystem/v2/src/v2_path.cpp boost_1_47_0-patched/libs/filesystem/v2/src/v2_path.cpp
+--- boost_1_47_0/libs/filesystem/v2/src/v2_path.cpp	2011-01-11 22:39:33.000000000 +0100
++++ boost_1_47_0-patched/libs/filesystem/v2/src/v2_path.cpp	2011-07-21 01:06:26.000000000 +0200
+@@ -45,7 +45,7 @@
+   {
+ #if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__) 
+     // ISO C calls this "the locale-specific native environment":
+-    static std::locale lc("");
++    static std::locale lc;
+ #else  // Mac OS
+     // "All BSD system functions expect their string parameters to be in UTF-8 encoding
+     // and nothing else."
+diff -ubr boost_1_47_0/libs/filesystem/v3/src/path.cpp boost_1_47_0-patched/libs/filesystem/v3/src/path.cpp
+--- boost_1_47_0/libs/filesystem/v3/src/path.cpp	2011-07-05 16:49:42.000000000 +0200
++++ boost_1_47_0-patched/libs/filesystem/v3/src/path.cpp	2011-07-21 01:06:26.000000000 +0200
+@@ -767,7 +767,7 @@
+     // or LANG are wrong, for example), so dynamic initialization is used to ensure
+     // that exceptions can be caught.
+ 
+-    return std::locale("");
++    return std::locale();
+ 
+ #   endif
+   }
diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index bd3ddd2ba738..12aa1ba0fee1 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -48,6 +48,9 @@ stdenv.mkDerivation {
     sha256 = "815a5d9faac4dbd523fbcf3fe1065e443c0bbf43427c44aa423422c6ec4c2e31";
   };
 
+  # See <http://svn.boost.org/trac/boost/ticket/4688>.
+  patches = [ ./boost_filesystem.patch ];
+
   enableParallelBuilding = true;
 
   buildInputs = [icu expat zlib bzip2 python];

From bda0f3bfd035f41c00c3437a12fdfa62c5390e44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 21 Jul 2011 06:58:14 +0000
Subject: [PATCH 042/101] Updating fossil.

svn path=/nixpkgs/trunk/; revision=27865
---
 pkgs/applications/version-management/fossil/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 5002565b3eac..fcbe57f40531 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,20 +1,23 @@
 {stdenv, fetchurl, zlib, openssl, tcl}:
 
 let
-  version = "20110512145652";
+  version = "1.18";
+  filedate = "20110713230341";
 in
 
 stdenv.mkDerivation {
   name = "fossil-${version}";
 
   src = fetchurl {
-    url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz";
-    sha256 = "1x51bmmzmabq8dkpm4sxkqbpmp6nxk9dix7pqa2calmjn3rmzc8k";
+    url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz";
+    sha256 = "065hp5hppzjzvvk9g8zaqbfms011rkiimydnfsgkp4s8jlc2h6dc";
   };
 
   buildInputs = [ zlib openssl ];
   buildNativeInputs = [ tcl ];
 
+  configurePhase = ":";
+
   doCheck = true;
 
   checkTarget = "test";

From 6e61ef201068a5dde7b0a88a3b1d156e4bd0603e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 21 Jul 2011 13:36:16 +0000
Subject: [PATCH 043/101] Version bump.

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

diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index b7d3e81160a8..64d5622aaf83 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "cmdargs";
-  version = "0.1";
-  sha256 = "1ec8a0b49dedc0b159c4e8f6b02ae57ba918b27d8648294998a13e04cf257ebf";
+  version = "0.7";
+  sha256 = "0qijfdc66f0r2k272sl41nxfymmsk7naw5is3b4zyxsgm147c0vq";
   propagatedBuildInputs = [filepath mtl];
   meta = {
     description = "Command line argument processing";

From 6f5e72deedcce9381c1844d3ea3d91aa4c1d7ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 21 Jul 2011 13:51:03 +0000
Subject: [PATCH 044/101] libelf: Disable native language support on Darwin.

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

diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix
index 46be77d713d0..40eb2a10faf5 100644
--- a/pkgs/development/libraries/libelf/default.nix
+++ b/pkgs/development/libraries/libelf/default.nix
@@ -24,9 +24,9 @@ stdenv.mkDerivation (rec {
 
 //
 
-# Gettext is lacking from `stdenv' on Darwin, but not completely, so NLS
-# support is enabled but eventually fails.
+# Libelf's custom NLS macros fail to determine the catalog file extension on
+# Darwin, so disable NLS for now.
 # FIXME: Eventually make Gettext a build input on all platforms.
 (if stdenv.isDarwin
- then { buildInputs = [ gettext ]; }
+ then { configureFlags = [ "--disable-nls" ]; }
  else { }))

From 57f59594dbbb542e1bbff7060d39b1e28dc011f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 21 Jul 2011 13:56:25 +0000
Subject: [PATCH 045/101] Updating the linux 2.6.39 to 2.6.39.3

svn path=/nixpkgs/trunk/; revision=27878
---
 pkgs/applications/version-management/fossil/default.nix | 2 --
 pkgs/os-specific/linux/kernel/linux-2.6.39.nix          | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index fcbe57f40531..2d20ab739a4e 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation {
   buildInputs = [ zlib openssl ];
   buildNativeInputs = [ tcl ];
 
-  configurePhase = ":";
-
   doCheck = true;
 
   checkTarget = "test";
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix
index 10f8dbfe8599..dbde51b2ab92 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix
@@ -192,11 +192,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.39";
+    version = "2.6.39.3";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "1xk1bka63i2hhn5rfaa5pbyqqlwycc3nkwvz3m8aj67flgr1fkaq";
+      sha256 = "1lx8064xf13h79qcbdw74mz5x94pl662s9iyqgcyb6wjwfyxhjrj";
     };
 
     config = configWithPlatform stdenv.platform;

From f5609042c046fd8b7118eb05ccafbe2e4025abeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 21 Jul 2011 14:58:13 +0000
Subject: [PATCH 046/101] I broke fossil in a commit where I did not mean even
 to touch it.

svn path=/nixpkgs/trunk/; revision=27880
---
 pkgs/applications/version-management/fossil/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 2d20ab739a4e..002226292b02 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
+  configurePhase = ":";
+
   checkTarget = "test";
 
   installPhase = ''

From 3815442cf4b0afeebd90eaa31b1dbfa0f4ca59fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Jul 2011 17:01:31 +0000
Subject: [PATCH 047/101] all-packages.nix: added jbidwatcher, a tool to
 monitor and snipe ebay auctions

svn path=/nixpkgs/trunk/; revision=27881
---
 .../applications/misc/jbidwatcher/default.nix | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/applications/misc/jbidwatcher/default.nix

diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
new file mode 100644
index 000000000000..555c7e45d7b8
--- /dev/null
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, jre }:
+
+stdenv.mkDerivation rec {
+  pname = "jbidwatcher";
+  version = "2.1.5";
+
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar";
+    sha256 = "0nrs9ly56cqn33dm1sjm53pzj1cf7jncwn4c8v0xyva4jqyz2y5p";
+  };
+
+  buildInputs = [ jre ];
+
+  jarfile = "$out/share/java/${pname}/JBidwatcher.jar";
+
+  unpackPhase = "true";
+
+  buildPhase = "true";
+
+  installPhase = ''
+    ensureDir "$out/bin"
+    echo > "$out/bin/${pname}" "#!/bin/sh"
+    echo >>"$out/bin/${pname}" "${jre}/bin/java -Xmx512m -jar ${jarfile}"
+    chmod +x "$out/bin/${pname}"
+    install -D -m644 ${src} ${jarfile}
+  '';
+
+  meta = {
+    homepage = "http://www.jbidwatcher.com/";
+    description = "monitor and snipe Ebay auctions";
+    license = "LGPL";
+
+    longDescription = ''
+      A Java-based application allowing you to monitor auctions you're
+      not part of, submit bids, snipe (bid at the last moment), and
+      otherwise track your auction-site experience. It includes
+      adult-auction management, MANY currencies (pound, dollar (US,
+      Canada, Australian, and New Taiwanese) and euro, presently),
+      drag-and-drop of auction URLs, an original, unique and powerful
+      'multisniping' feature, a relatively nice UI, and is known to work
+      cleanly under Linux, Windows, Solaris, and MacOSX from the same
+      binary.
+    '';
+
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c7dd7386a3f..774bbd9592a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6415,6 +6415,8 @@ let
     inherit (gnome) libglade;
   };
 
+  jbidwatcher = callPackage ../applications/misc/jbidwatcher { };
+
   qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
     inherit libpng opencv;
   };

From 2758c07f1ee596cdbb56c856588ed5820d6e9663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 21 Jul 2011 18:34:41 +0000
Subject: [PATCH 048/101] Updating mldonkey. I remove the patch needed for
 mips, as they put it upstream already.

svn path=/nixpkgs/trunk/; revision=27885
---
 .../networking/p2p/mldonkey/default.nix       |   6 +-
 .../networking/p2p/mldonkey/gcc44mips64.patch | 103 ------------------
 2 files changed, 2 insertions(+), 107 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch

diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index ecc2e5f77941..244858757d10 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/pkgs/applications/networking/p2p/mldonkey/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }:
 
 stdenv.mkDerivation (rec {
-  name = "mldonkey-3.0.4";
+  name = "mldonkey-3.0.7";
   
   src = fetchurl {
     url = "mirror://sourceforge/mldonkey/${name}.tar.bz2";
-    sha256 = "0wnyi2m7126dq6r5zbqplgknnypzcx0p3q2mxcdfhp94ln7vn3f6";
+    sha256 = "1m5cfx79jiym93bx789lqc1bmwrkz1b1jilhga7d994jsjcw6c2n";
   };
   
   meta = {
@@ -13,8 +13,6 @@ stdenv.mkDerivation (rec {
     homepage = http://mldonkey.sourceforge.net/;
   };
 
-  patches = [ ./gcc44mips64.patch ];
-
   buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ];
   configureFlags = [ "--disable-gui" ];
 } // (if (stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux") then
diff --git a/pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch b/pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch
deleted file mode 100644
index 41449dcdd05c..000000000000
--- a/pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Patch fixing CryptoPP so:
-- it builds properly in mips64 with gcc 4.4 (gcc 4.4 does not have the 'h' asm constraint)
-- it runs properly in mips64 (where lack of templated *Precision functions gave wrong numbers).
-  An assertion check failed without this.
-
-diff --git a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc
-index 9208e1c..6b12b0a 100644
---- a/src/utils/lib/CryptoPP.cc
-+++ b/src/utils/lib/CryptoPP.cc
-@@ -890,35 +890,6 @@ unsigned int Parity(unsigned long value)
- 	return (unsigned int)value&1;
- }
- 
--unsigned int BytePrecision(unsigned long value)
--{
--	unsigned int i;
--	for (i=sizeof(value); i; --i)
--		if (value >> (i-1)*8)
--			break;
--
--	return i;
--}
--
--unsigned int BitPrecision(unsigned long value)
--{
--	if (!value)
--		return 0;
--
--	unsigned int l=0, h=8*sizeof(value);
--
--	while (h-l > 1)
--	{
--		unsigned int t = (l+h)/2;
--		if (value >> t)
--			l = t;
--		else
--			h = t;
--	}
--
--	return h;
--}
--
- unsigned long Crop(unsigned long value, unsigned int size)
- {
- 	if (size < 8*sizeof(value))
-@@ -1880,7 +1851,10 @@ public:
- 		#elif defined(__x86_64__)
- 			__asm__("mulq %3" : "=d" (r.m_halfs.high), "=a" (r.m_halfs.low) : "a" (a), "rm" (b) : "cc");
- 		#elif defined(__mips64)
--			__asm__("dmultu %2,%3" : "=h" (r.m_halfs.high), "=l" (r.m_halfs.low) : "r" (a), "r" (b));
-+      //typedef unsigned int uint128_t __attribute__((mode(TI)));
-+      __uint128_t tmp = (__uint128_t) a * b;
-+      r.m_halfs.high = tmp >> 64;
-+      r.m_halfs.low = tmp;
- 		#elif defined(_M_IX86)
- 			// for testing
- 			word64 t = (word64)a * b;
-diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
-index d2ec1b2..775a898 100644
---- a/src/utils/lib/CryptoPP.h
-+++ b/src/utils/lib/CryptoPP.h
-@@ -1869,10 +1869,39 @@ template <class T> inline const T& STDMAX(const T& a, const T& b)
- // #define GETBYTE(x, y) (((byte *)&(x))[y])
- 
- CRYPTOPP_DLL unsigned int Parity(unsigned long);
--CRYPTOPP_DLL unsigned int BytePrecision(unsigned long);
--CRYPTOPP_DLL unsigned int BitPrecision(unsigned long);
- CRYPTOPP_DLL unsigned long Crop(unsigned long, unsigned int size);
- 
-+template <typename T>
-+unsigned int BitPrecision(const T &value)
-+{
-+	if (!value)
-+		return 0;
-+
-+	unsigned int l=0, h=8*sizeof(value);
-+
-+	while (h-l > 1)
-+	{
-+		unsigned int t = (l+h)/2;
-+		if (value >> t)
-+			l = t;
-+		else
-+			h = t;
-+	}
-+
-+	return h;
-+}
-+
-+template <typename T>
-+unsigned int BytePrecision(const T &value)
-+{
-+	unsigned int i;
-+	for (i=sizeof(value); i; --i)
-+		if (value >> (i-1)*8)
-+			break;
-+
-+	return i;
-+}
-+
- inline unsigned int BitsToBytes(unsigned int bitCount)
- {
- 	return ((bitCount+7)/(8));

From 9387a99a19dbdf9e280394c92a71a9781f04f7c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 21 Jul 2011 18:40:24 +0000
Subject: [PATCH 049/101] Adding netfilter/iptables to the sheevaplug kernel.

svn path=/nixpkgs/trunk/; revision=27886
---
 pkgs/top-level/platforms.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index f44306785709..097d81fb0b8b 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -55,6 +55,12 @@ rec {
         NFSD_V3 y
         NFSD_V3_ACL y
         NFSD_V4 y
+        NETFILTER y
+        IP_NF_IPTABLES y
+        IP_NF_FILTER y
+        IP_NF_MATCH_ADDRTYPE y
+        IP_NF_TARGET_LOG y
+        IP_NF_MANGLE y
 
         # Fail to build
         DRM n

From 903c9189c4c74fe7b6e97256835154b02241bdb7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Jul 2011 20:58:34 +0000
Subject: [PATCH 050/101] adns: dropped obsolete versions and static-only
 feature

svn path=/nixpkgs/trunk/; revision=27890
---
 pkgs/development/libraries/adns/1.1.nix     |  9 ----
 pkgs/development/libraries/adns/1.2.nix     |  9 ----
 pkgs/development/libraries/adns/1.3.nix     |  9 ----
 pkgs/development/libraries/adns/1.4.nix     |  9 ----
 pkgs/development/libraries/adns/default.nix | 46 ++++++++++-----------
 pkgs/top-level/all-packages.nix             |  5 +--
 6 files changed, 23 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/development/libraries/adns/1.1.nix
 delete mode 100644 pkgs/development/libraries/adns/1.2.nix
 delete mode 100644 pkgs/development/libraries/adns/1.3.nix
 delete mode 100644 pkgs/development/libraries/adns/1.4.nix

diff --git a/pkgs/development/libraries/adns/1.1.nix b/pkgs/development/libraries/adns/1.1.nix
deleted file mode 100644
index 311862d3b9f9..000000000000
--- a/pkgs/development/libraries/adns/1.1.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl, version ? "1.1", static }:
-
-assert version == "1.1";
-
-import ./default.nix
-{
-  inherit stdenv fetchurl static version;
-  versionHash = "02plci50c7svbq15284z40c5aglydzh2zp68dj4lnigaxr6vm5vn";
-}
diff --git a/pkgs/development/libraries/adns/1.2.nix b/pkgs/development/libraries/adns/1.2.nix
deleted file mode 100644
index 1340f790ed14..000000000000
--- a/pkgs/development/libraries/adns/1.2.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl, version ? "1.2", static }:
-
-assert version == "1.2";
-
-import ./default.nix
-{
-  inherit stdenv fetchurl static version;
-  versionHash = "0jn03hz6q4r6x40cxc94n38mxxj45f73xqisi0sh7zmvixh3qhi2";
-}
diff --git a/pkgs/development/libraries/adns/1.3.nix b/pkgs/development/libraries/adns/1.3.nix
deleted file mode 100644
index ccc6fa563edf..000000000000
--- a/pkgs/development/libraries/adns/1.3.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl, version ? "1.3", static }:
-
-assert version == "1.3";
-
-import ./default.nix
-{
-  inherit stdenv fetchurl static version;
-  versionHash = "05hd7qspvlsac9bqzx86r5a1wv7x1zdmqx6pi3ddk094m0n4bqn6";
-}
diff --git a/pkgs/development/libraries/adns/1.4.nix b/pkgs/development/libraries/adns/1.4.nix
deleted file mode 100644
index d82b8aec9025..000000000000
--- a/pkgs/development/libraries/adns/1.4.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl, version ? "1.4", static }:
-
-assert version == "1.4";
-
-import ./default.nix
-{
-  inherit stdenv fetchurl static version;
-  versionHash = "1zm99i9fd5gfijd144ajngn6x73563355im79sqdi98pj6ir4yvi";
-}
diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
index d0eedef15f03..830d4bfa0376 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@@ -1,31 +1,29 @@
-{ stdenv, fetchurl, version, versionHash, static }:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation
-{
+let
+  version = "1.4";
+in
+stdenv.mkDerivation {
   name = "adns-${version}";
-  meta =
-  {
-    homepage = "http://www.chiark.greenend.org.uk/~ian/adns/";
-    description = "Asynchronous DNS Resolver Library";
-    license = "LGPL-v2";
-  };
-  src = fetchurl
-  {
-    urls =
-      [ "http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz"
-        "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz"
-        "mirror://gnu/adns/adns-${version}.tar.gz"
-      ];
-    sha256 = "${versionHash}";
-  };
-  configureFlags = if static then "--disable-dynamic" else "--enable-dynamic";
-  CPPFLAGS = "-DNDEBUG";
-  CFLAGS = "-O3";
 
-  # FIXME: The test suite fails on NixOS in a chroot.  See
+  src = fetchurl {
+    urls = [
+      "http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz"
+      "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz"
+      "mirror://gnu/adns/adns-${version}.tar.gz"
+    ];
+    sha256 = "1zm99i9fd5gfijd144ajngn6x73563355im79sqdi98pj6ir4yvi";
+  };
+
   # http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details.
   doCheck = false;
 
-  # adns doesn't understand the automatic --disable-shared from the Cygwin stdenv.
-  cygwinConfigureEnableShared = true;
+  meta = {
+    homepage = "http://www.chiark.greenend.org.uk/~ian/adns/";
+    description = "Asynchronous DNS Resolver Library";
+    license = "LGPL-v2";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 774bbd9592a9..016700200537 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2879,10 +2879,7 @@ let
 
   acl = callPackage ../development/libraries/acl { };
 
-  adns = import ../development/libraries/adns/1.4.nix {
-    inherit stdenv fetchurl;
-    static = getConfig [ "adns" "static" ] (stdenv ? isStatic || stdenv ? isDietLibC);
-  };
+  adns = callPackage ../development/libraries/adns { };
 
   agg = callPackage ../development/libraries/agg { };
 

From c29e9369b01147ac2c9eabf1b06a60d4f00e44d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Jul 2011 20:58:41 +0000
Subject: [PATCH 051/101] xlockmore: dropped support for obsolete getConfig
 mechanism

If you want to build xlockmore without support for PAM, override { pam = null; } instead.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 016700200537..5997bf78265b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8050,9 +8050,7 @@ let
 
   rssglx = callPackage ../misc/screensavers/rss-glx { };
 
-  xlockmore = callPackage ../misc/screensavers/xlockmore {
-    pam = if getConfig [ "xlockmore" "pam" ] true then pam else null;
-  };
+  xlockmore = callPackage ../misc/screensavers/xlockmore { };
 
   saneBackends = callPackage ../misc/sane-backends {
     gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null;

From 71237fce000f5b8737b267766edb3785d577ed42 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Jul 2011 21:26:21 +0000
Subject: [PATCH 052/101] adns: blind attempt to fix the shared library build
 on Darwin

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

diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
index 830d4bfa0376..cbc4e0b8c89b 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@@ -15,6 +15,9 @@ stdenv.mkDerivation {
     sha256 = "1zm99i9fd5gfijd144ajngn6x73563355im79sqdi98pj6ir4yvi";
   };
 
+  preConfigure =
+    stdenv.lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure";
+
   # http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details.
   doCheck = false;
 

From 1d3c534625358107f2348d897197ab56170a13c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 21 Jul 2011 21:46:06 +0000
Subject: [PATCH 053/101] Updating unison.

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

diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index aa694a3908d2..06bab807ebdd 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -6,10 +6,10 @@ let
 in
 stdenv.mkDerivation (rec {
 
-  name = "unison-2.32.52";
+  name = "unison-2.40.63";
   src = fetchurl {
     url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/${name}/${name}.tar.gz";
-    sha256 = "11844yh1gpjjapn8pvc14hla7g70spwqy6h61qk2is83mpafahhm";
+    sha256 = "17fd2bg5jxwbib87j6j2bjpwdm66whqm1fq46v70hfby79j00vkf";
   };
 
   buildInputs = [ ocaml makeWrapper ncurses ];

From db86b7f2374482c48fbbb35a7c31711b5fc0a225 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Jul 2011 22:02:01 +0000
Subject: [PATCH 054/101] all-packages.nix: added package bash-completion

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

diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix
new file mode 100644
index 000000000000..0cda358b8efb
--- /dev/null
+++ b/pkgs/shells/bash-completion/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+let
+  version = "1.3";
+in
+stdenv.mkDerivation {
+  name = "bash-completion-${version}";
+
+  src = fetchurl {
+    url = "http://bash-completion.alioth.debian.org/files/bash-completion-${version}.tar.bz2";
+    sha256 = "8ebe30579f0f3e1a521013bcdd183193605dab353d7a244ff2582fb3a36f7bec";
+  };
+
+  postInstall = ''
+    rm $out/etc/profile.d/bash_completion.sh
+    rmdir $out/etc/profile.d
+  '';
+
+  meta = {
+    homepage = "http://bash-completion.alioth.debian.org/";
+    description = "Programmable completion for the bash shell";
+    license = "GPL";
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5997bf78265b..4ebaeeeeb02f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1573,6 +1573,8 @@ let
     interactive = true;
   });
 
+  bashCompletion = callPackage ../shells/bash-completion { };
+
   dash = callPackage ../shells/dash { };
 
   ipython = callPackage ../shells/ipython { };

From b1f6ed4a6e2356d81113dfd9b3e23197ec036782 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Fri, 22 Jul 2011 07:28:51 +0000
Subject: [PATCH 055/101] Update OCaml Batteries to 1.4.0

svn path=/nixpkgs/trunk/; revision=27900
---
 pkgs/development/ocaml-modules/batteries/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index b7a80129451f..06583cd15e1a 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -8,19 +8,14 @@ stdenv.mkDerivation {
   name = "ocaml-batteries-1.3.0";
 
   src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/560/batteries-1.3.0.tar.gz";
-    sha256 = "1kf8dyivigavi89lpsz7hzdv48as10yck7gkmqmnsnn1dps3m7an";
+    url = https://forge.ocamlcore.org/frs/download.php/643/batteries-1.4.0.tar.gz;
+    sha256 = "1qyhiyanlhpbj0dv0vyqak87qfadjzg2pb8q93iybmg59akaxl15";
   };
 
   buildInputs = [ocaml findlib camomile ounit];
 
-  # This option is not correctly detected on Darwin
-  # It should be fixed in the svn
-  BATTERIES_NATIVE_SHLIB = if stdenv.isDarwin then "no" else "yes";
-
-  # Ditto
   patchPhase = ''
-    substituteInPlace Makefile --replace 'echo -n' echo
+    substituteInPlace Makefile --replace '/bin/echo -n' echo
   '';
 
   configurePhase = "true"; 	# Skip configure

From af9eaf34419d718174989ba102933e5e3725e0e4 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Fri, 22 Jul 2011 07:39:14 +0000
Subject: [PATCH 056/101] Oops

svn path=/nixpkgs/trunk/; revision=27901
---
 pkgs/development/ocaml-modules/batteries/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index 06583cd15e1a..876b87408e8d 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -5,7 +5,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ocaml-batteries-1.3.0";
+  name = "ocaml-batteries-1.4.0";
 
   src = fetchurl {
     url = https://forge.ocamlcore.org/frs/download.php/643/batteries-1.4.0.tar.gz;

From cb8409612cc483d76a366ab78bed1d07b1ef6593 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 22 Jul 2011 14:03:23 +0000
Subject: [PATCH 057/101] Added Mupen64 Plus, a nintendo 64 emulator

svn path=/nixpkgs/trunk/; revision=27902
---
 pkgs/misc/emulators/mupen64plus/default.nix | 23 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/misc/emulators/mupen64plus/default.nix

diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
new file mode 100644
index 000000000000..8aa0cde02ef9
--- /dev/null
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}:
+
+stdenv.mkDerivation {
+  name = "mupen64plus-1.5";
+  src = fetchurl {
+    url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz;
+    sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq";
+  };
+  
+  buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ];
+  
+  preConfigure = ''
+    # Some C++ incompatibility fixes
+    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp
+    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp
+
+    # Fix some hardcoded paths
+    sed -i -e "s|/usr/local|$out|g" main/main.c
+  '';
+  
+  buildPhase = "make all";
+  installPhase = "PREFIX=$out make install";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ebaeeeeb02f..d4f38f8c42f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7975,6 +7975,8 @@ let
 
   mess = callPackage ../misc/emulators/mess { };
 
+  mupen64plus = callPackage ../misc/emulators/mupen64plus { };
+
   nix = nixStable;
 
   nixStable = callPackage ../tools/package-management/nix {

From 2cb4bc4a47cacf4553552c3fac34a4ac79271125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 22 Jul 2011 14:44:28 +0000
Subject: [PATCH 058/101] GCC 4.6: Don't assume
 `$NIX_GCC/nix-support/orig-libc' exists.

svn path=/nixpkgs/trunk/; revision=27903
---
 pkgs/development/compilers/gcc-4.6/builder.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/gcc-4.6/builder.sh b/pkgs/development/compilers/gcc-4.6/builder.sh
index 5d295356831c..8e1b3c8e4079 100644
--- a/pkgs/development/compilers/gcc-4.6/builder.sh
+++ b/pkgs/development/compilers/gcc-4.6/builder.sh
@@ -171,13 +171,15 @@ preConfigure() {
         rm -Rf zlib
     fi
 
-    # Patch the configure script so it finds glibc headers
-    # It's important for example in order not to get libssp built, because it's
-    # functionality is in glibc already.
-    glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include"
-    sed -i \
-      -e s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers, \
-      gcc/configure
+    if test -f "$NIX_GCC/nix-support/orig-libc"; then
+        # Patch the configure script so it finds glibc headers.  It's
+        # important for example in order not to get libssp built,
+        # because its functionality is in glibc already.
+        glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include"
+        sed -i \
+            -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \
+            gcc/configure
+    fi
 
     if test -n "$crossMingw" -a -n "$crossStageStatic"; then
         mkdir -p ../mingw

From 6ac699ba9734464d22dfe64e64da5a9a6a73c9a6 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 22 Jul 2011 18:31:42 +0000
Subject: [PATCH 059/101] Added VisualBoy advance; a gameboy/gameboy
 color/gameboy advance emulator

svn path=/nixpkgs/trunk/; revision=27904
---
 .../emulators/VisualBoyAdvance/default.nix    | 16 ++++++++++
 pkgs/misc/emulators/VisualBoyAdvance/fix.diff | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/misc/emulators/VisualBoyAdvance/default.nix
 create mode 100644 pkgs/misc/emulators/VisualBoyAdvance/fix.diff

diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix
new file mode 100644
index 000000000000..720cc2083c26
--- /dev/null
+++ b/pkgs/misc/emulators/VisualBoyAdvance/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, zlib, libpng, SDL, nasm}:
+
+stdenv.mkDerivation {
+  name = "VisualBoyAdvance-1.7.2";
+  src = fetchurl {
+    url = mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz;
+    sha256 = "1dr9w5i296dyq2gbx7sijk6p375aqnwld2n6rwnbzm2g3a94y4gl";
+  };
+  patches = [ ./fix.diff ]; # patch to shut up lost of precision errors
+  preConfigure = ''
+    # Fix errors with invalid conversion from 'const char*' to 'char*'
+    sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/GBA.cpp
+    sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/Util.cpp
+  '';
+  buildInputs = [ zlib libpng SDL ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
+}
diff --git a/pkgs/misc/emulators/VisualBoyAdvance/fix.diff b/pkgs/misc/emulators/VisualBoyAdvance/fix.diff
new file mode 100644
index 000000000000..646db9c45e66
--- /dev/null
+++ b/pkgs/misc/emulators/VisualBoyAdvance/fix.diff
@@ -0,0 +1,31 @@
+diff -urN ../tmp-orig/visualboyadvance-1.7.2/src/sdl/debugger.cpp 
+./src/sdl/debugger.cpp
+--- ../tmp-orig/visualboyadvance-1.7.2/src/sdl/debugger.cpp     2004-05-13 
+16:13:14.000000000 +0200
++++ ./src/sdl/debugger.cpp      2005-03-21 21:57:06.000000000 +0100
+@@ -950,9 +950,9 @@
+ {
+   u32 address = 0;
+   if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
+-    address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
++    address = 0x2000000 + ((unsigned long)mem - (unsigned long)&workRAM[0]);
+   else
+-    address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
++    address = 0x3000000 + ((unsigned long)mem - (unsigned long)&internalRAM[0]);
+ 
+   if(size == 2)
+     printf("Breakpoint (on write) address %08x old:%08x new:%08x\n", 
+diff -urN ../tmp-orig/visualboyadvance-1.7.2/src/prof/prof.cpp 
+./src/prof/prof.cpp
+--- ../tmp-orig/visualboyadvance-1.7.2/src/prof/prof.cpp        2004-05-13 
+16:31:58.000000000 +0200
++++ ./src/prof/prof.cpp 2005-03-21 21:56:27.000000000 +0100
+@@ -266,7 +266,7 @@
+     for (toindex=froms[fromindex]; toindex!=0; toindex=tos[toindex].link) {
+       if(profWrite8(fd, GMON_TAG_CG_ARC) ||
+          profWrite32(fd, (u32)frompc) ||
+-         profWrite32(fd, (u32)tos[toindex].selfpc) ||
++         profWrite32(fd, (unsigned long)tos[toindex].selfpc) ||
+          profWrite32(fd, tos[toindex].count)) {
+         systemMessage(0, "mcount: arc");
+         fclose(fd);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4f38f8c42f1..8aa78da2090f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8133,6 +8133,8 @@ let
 
   vice = callPackage ../misc/emulators/vice { };
 
+  VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
+  
   # Wine cannot be built in 64-bit; use a 32-bit build instead.
   wine = callPackage_i686 ../misc/emulators/wine { };
 

From f635aceb5b934bf746dd7362f9ce4d07a9b53f69 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 22 Jul 2011 19:25:31 +0000
Subject: [PATCH 060/101] Updated some meta information for the emulators I've
 tried recently. They all seem to work fine :-)

svn path=/nixpkgs/trunk/; revision=27905
---
 pkgs/misc/emulators/VisualBoyAdvance/default.nix | 7 +++++++
 pkgs/misc/emulators/mupen64plus/default.nix      | 7 +++++++
 pkgs/misc/emulators/uae/default.nix              | 7 +++++++
 pkgs/misc/emulators/vice/default.nix             | 2 +-
 pkgs/misc/emulators/zsnes/default.nix            | 4 +++-
 pkgs/top-level/release.nix                       | 4 ++++
 6 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix
index 720cc2083c26..964a0491adb4 100644
--- a/pkgs/misc/emulators/VisualBoyAdvance/default.nix
+++ b/pkgs/misc/emulators/VisualBoyAdvance/default.nix
@@ -13,4 +13,11 @@ stdenv.mkDerivation {
     sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/Util.cpp
   '';
   buildInputs = [ zlib libpng SDL ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
+  
+  meta = {
+    description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator";
+    license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.sander ];
+    homepage = http://vba.ngemu.com;
+  };
 }
diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
index 8aa0cde02ef9..7de7c9ce6bc3 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -20,4 +20,11 @@ stdenv.mkDerivation {
   
   buildPhase = "make all";
   installPhase = "PREFIX=$out make install";
+  
+  meta = {
+    description = "A Nintendo 64 Emulator";
+    license = "GPLv2+";
+    homepage = http://code.google.com/p/mupen64plus;
+    maintainers = [ stdenv.lib.maintainers.sander ];
+  };
 }
diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix
index ad68be11e950..9f93c9957d65 100644
--- a/pkgs/misc/emulators/uae/default.nix
+++ b/pkgs/misc/emulators/uae/default.nix
@@ -8,4 +8,11 @@ stdenv.mkDerivation {
   };
   configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ];
   buildInputs = [ pkgconfig gtk alsaLib SDL ];
+  
+  meta = {
+    description = "Ultimate/Unix/Unusuable Amiga Emulator";
+    license = "GPLv2+";
+    homepage = http://www.amigaemulator.org;
+    maintainers = [ stdenv.lib.maintainers.sander ];
+  };
 }
diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix
index 293fe43d0653..425080d7c625 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/pkgs/misc/emulators/vice/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Commodore 64, 128 and other emulators";
     homepage = http://www.viceteam.org;
-    license = "GPL";
+    license = "GPLv2+";
     maintainers = [ lib.maintainers.sander ];
   };
 }
diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index d878d34184a8..0b34fc0f9fec 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation {
   
   meta = {
     description = "A Super Nintendo Entertainment System Emulator";
-    license = "GPLv2";
+    license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.sander ];
+    homepage = http://www.zsnes.com;
   };
 }
\ No newline at end of file
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 648eef655d8d..729c68712a19 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -203,6 +203,7 @@ with (import ./release-lib.nix);
   module_init_tools = linux;
   mono = linux;
   mpg321 = linux;
+  mupen64plus = linux;
   mutt = linux;
   mysql = linux;
   mysql51 = linux;
@@ -306,6 +307,7 @@ with (import ./release-lib.nix);
   tightvnc = linux;
   time = linux;
   tinycc = ["i686-linux"];
+  uae = linux;
   udev = linux;
   uml = ["i686-linux"];
   unrar = linux;
@@ -319,6 +321,7 @@ with (import ./release-lib.nix);
   vice = linux;
   vim = linux;
   vimHugeX = linux;
+  VisualBoyAdvance = linux;
   vlc = linux;
   vncrec = linux;
   vorbisTools = linux;
@@ -352,6 +355,7 @@ with (import ./release-lib.nix);
   zile = linux;
   zip = all;
   zsh = linux;
+  zsnes = ["i686-linux"];
 
   aspellDicts = {
     de = all;

From 14be409d8fb300a75cf78477682a85a7a9f2edfb Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 22 Jul 2011 20:09:00 +0000
Subject: [PATCH 061/101] Removed hardcoded paths to /bin and /usr/bin

svn path=/nixpkgs/trunk/; revision=27906
---
 pkgs/misc/emulators/mupen64plus/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
index 7de7c9ce6bc3..d67121fe430a 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation {
 
     # Fix some hardcoded paths
     sed -i -e "s|/usr/local|$out|g" main/main.c
+
+    # Remove PATH environment variable from install script
+    sed -i -e "s|export PATH=|#export PATH=|" ./install.sh
   '';
   
   buildPhase = "make all";

From d9c22f38da94f187b8a59051fc01fb28df739aa0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 23 Jul 2011 22:58:32 +0000
Subject: [PATCH 062/101] Add firmware for rtl8192c and related NICs

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

diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
new file mode 100644
index 000000000000..0ab7436ebfff
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "rtl8192c-fw";
+  src = fetchurl {
+    url = "ftp://WebUser:n8W9ErCy@208.70.202.219/cn/wlan/92ce_se_de_linux_mac80211_0003.0401.2011.tar.gz";
+    sha256 = "002kj6f1xaali2iwrxvirqq0hbiyb2cpf93y2xycp3qd69cp8lik";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  # Installation copies the firmware AND the license.  The license
+  # says: "Your rights to redistribute the Software shall be
+  # contingent upon your installation of this Agreement in its
+  # entirety in the same directory as the Software."
+  installPhase = "ensureDir $out; cp -a firmware/* $out";
+  
+  meta = {
+    description = "Firmware for the Realtek RTL8192c wireless cards";
+    homepage = "http://www.realtek.com";
+    license = "non-free";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8aa78da2090f..9f97bc6b2e7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5625,6 +5625,8 @@ let
 
   rt73fw = callPackage ../os-specific/linux/firmware/rt73 { };
 
+  rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { };
+
   sdparm = callPackage ../os-specific/linux/sdparm { };
 
   shadow = callPackage ../os-specific/linux/shadow { };

From 5869748e70de2086c31489b9cc556afb5b1de7a9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 24 Jul 2011 01:39:11 +0000
Subject: [PATCH 063/101] Update Spotify

Only tested x86_64

svn path=/nixpkgs/trunk/; revision=27914
---
 pkgs/applications/audio/spotify/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 51c4b733d307..eb783e60fc5f 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -2,7 +2,7 @@
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
-let version = "0.5.1.151"; in
+let version = "0.5.2.84"; in
 
 stdenv.mkDerivation {
   name = "spotify-${version}";
@@ -10,13 +10,13 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then 
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g7c8c074-1_i386.deb";
-        sha256 = "1zs52hlji3niaiw9lhwmq1393cydr3i494gpzk3fpwr9n8m1jbk0";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g6d797eb-1_i386.deb";
+        sha256 = "0l1pvvkkssng0yc7zlgxr39jx3cs6i71sspmm4xb84y1bl045pas";
       }
     else if stdenv.system == "x86_64-linux" then 
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g7c8c074-1_amd64.deb";
-        sha256 = "01yvrggcj1hvdrqmy35x3klv2v20d63knzfh0lrdfbhi99hr6nvx";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g6d797eb-1_amd64.deb";
+        sha256 = "1wi1z3dyzjz13mkb0r2ilm914p8sg06923sv872nclrl102qbbni";
       }
     else throw "Spotify not supported on this platform.";
 

From e34c2e366ea268b969dfff4b6702ef5190836b2a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 24 Jul 2011 03:05:00 +0000
Subject: [PATCH 064/101] First attempt at linuxPackages_3_0

svn path=/nixpkgs/trunk/; revision=27915
---
 pkgs/os-specific/linux/kernel/linux-3.0.nix | 207 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  11 ++
 2 files changed, 218 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-3.0.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
new file mode 100644
index 000000000000..c9bde0eafe9a
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -0,0 +1,207 @@
+args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
+, perl, mktemp, module_init_tools
+, ... }:
+
+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
+      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_L2CAP y
+      BT_RFCOMM m
+      BT_RFCOMM_TTY y # RFCOMM TTY support
+      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
+      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 = "3.0";
+  
+    src = fetchurl {
+      url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.bz2";
+      sha256 = "182n0glwxb6wdm87kxzl7n7fbk9pnykhjq88vyrb0fffaj5j5c34";
+    };
+
+    config = configWithPlatform stdenv.platform;
+    configCross = configWithPlatform stdenv.cross.platform;
+
+    features.iwlwifi = true;
+  }
+
+  // removeAttrs args ["extraConfig"]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f97bc6b2e7a..7c8c106ebc37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5336,6 +5336,16 @@ let
       ];
   };
 
+  linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
+    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    kernelPatches =
+      [ #kernelPatches.fbcondecor_2_6_38
+        kernelPatches.sec_perm_2_6_24
+        #kernelPatches.aufs2_1_2_6_38
+        #kernelPatches.mips_restart_2_6_36
+      ];
+  };
+
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages
@@ -5466,6 +5476,7 @@ let
   linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38);
   linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38);
   linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39);
+  linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0);
   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 7743596401707b249c044cda4bde38597931dfd7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Jul 2011 09:57:06 +0000
Subject: [PATCH 065/101] all-packages.nix: added the 'tree' utility

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

diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
new file mode 100644
index 000000000000..77c075c89bba
--- /dev/null
+++ b/pkgs/tools/system/tree/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl}:
+
+let
+  version = "1.6.0";
+in
+stdenv.mkDerivation {
+  name = "tree-${version}";
+
+  src = fetchurl {
+    url = "http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz";
+    sha256 = "4dc470a74880338b01da41701d8db90d0fb178877e526d385931a007d68d7591";
+  };
+
+  configurePhase = ''
+    makeFlagsArray=(
+      prefix=$out
+      MANDIR=$out/share/man/man1
+    )
+  '';
+
+  meta = {
+    homepage = "http://mama.indstate.edu/users/ice/tree/";
+    description = "command to produce a depth indented directory listing";
+    license = "GPLv2";
+
+    longDescription = ''
+      Tree is a recursive directory listing command that produces a
+      depth indented listing of files, which is colorized ala dircolors if
+      the LS_COLORS environment variable is set and output is to tty.
+    '';
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [stdenv.lib.maintainers.simons];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c8c106ebc37..a896aa07aa73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7094,6 +7094,8 @@ let
 
   transmission = callPackage ../applications/networking/p2p/transmission { };
 
+  tree = callPackage ../tools/system/tree { };
+
   tribler = callPackage ../applications/networking/p2p/tribler { };
 
   twinkle = callPackage ../applications/networking/twinkle {

From e0e42141d9ea6fdb840e27fa416241c186a196b6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Jul 2011 19:15:03 +0000
Subject: [PATCH 066/101] tree: blind attempt to fix the build on Darwin

svn path=/nixpkgs/trunk/; revision=27917
---
 pkgs/tools/system/tree/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index 77c075c89bba..14057ba393e3 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -2,6 +2,17 @@
 
 let
   version = "1.6.0";
+
+  # These settings are found in the Makefile, but there seems to be no
+  # way to select one ore the other setting other than editing the file
+  # manually, so we have to duplicate the know how here.
+  systemFlags =
+    if stdenv.isDarwin then ''
+      CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp"
+      LDFLAGS=
+      OBJS+=strverscmp.o
+    '' else
+    "";
 in
 stdenv.mkDerivation {
   name = "tree-${version}";
@@ -15,6 +26,7 @@ stdenv.mkDerivation {
     makeFlagsArray=(
       prefix=$out
       MANDIR=$out/share/man/man1
+      ${systemFlags}
     )
   '';
 

From 3415f0f088205c8aef34f45b22a0b06341fe1820 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Jul 2011 19:15:09 +0000
Subject: [PATCH 067/101] tree: the tool ought to compile everywhere, so let's
 give it a try

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

diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index 14057ba393e3..900108d3dfed 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       the LS_COLORS environment variable is set and output is to tty.
     '';
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.all;
     maintainers = [stdenv.lib.maintainers.simons];
   };
 }

From 31d1abd4a16f5f12a0f8e69436227b0349319b16 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Jul 2011 19:36:03 +0000
Subject: [PATCH 068/101] tree: OBJS+=... doesn't work on the make command
 line, use EXTRA_OBJS variable instead

svn path=/nixpkgs/trunk/; revision=27919
---
 pkgs/tools/system/tree/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index 900108d3dfed..8e74f12f1576 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -10,9 +10,9 @@ let
     if stdenv.isDarwin then ''
       CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp"
       LDFLAGS=
-      OBJS+=strverscmp.o
+      EXTRA_OBJS=strverscmp.o
     '' else
-    "";
+    ""; # use linux flags by default
 in
 stdenv.mkDerivation {
   name = "tree-${version}";
@@ -23,6 +23,7 @@ stdenv.mkDerivation {
   };
 
   configurePhase = ''
+    sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |'
     makeFlagsArray=(
       prefix=$out
       MANDIR=$out/share/man/man1

From 1bc8594052a0df817abca2793a6bc4fda6d5458e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Jul 2011 20:05:08 +0000
Subject: [PATCH 069/101] hledger-chart: build this package only on Linux

The build should work on haskellPlatforms, but an attempt to build it on
Darwin generates assertion errors because it somehow ends up depending
on the Linux kernel headers.

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

diff --git a/pkgs/development/libraries/haskell/hledger-chart/default.nix b/pkgs/development/libraries/haskell/hledger-chart/default.nix
index 8c9a465afe4f..d570ea9a9dcb 100644
--- a/pkgs/development/libraries/haskell/hledger-chart/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-chart/default.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self : {
   propagatedBuildInputs = [Chart colour hledger hledgerLib safe];
   meta = {
     description = "generate simple pie chart graphics showing hledger account balances";
-    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    platforms = self.stdenv.lib.platforms.linux;
     maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })

From 5db8c885470584789547c2b24544bcd98f758721 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 24 Jul 2011 20:24:12 +0000
Subject: [PATCH 070/101] Fix problem with linux 3.0 trying to install in
 /nix/store/...

Thanks to MarcWeber on IRC for helping with this

svn path=/nixpkgs/trunk/; revision=27921
---
 pkgs/os-specific/linux/kernel/generic.nix   | 8 +++++++-
 pkgs/os-specific/linux/kernel/linux-3.0.nix | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index ce609f238499..46ebb2b8fff4 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -35,6 +35,7 @@
 , extraMeta ? {}
 , ubootChooser ? null
 , postInstall ? ""
+, setModuleDir ? true
 
 , # After the builder did a 'make all' (kernel + modules)
   # we force building the target asked: bzImage/zImage/uImage/...
@@ -74,7 +75,11 @@ stdenv.mkDerivation {
 
   generateConfig = ./generate-config.pl;
 
-  inherit preConfigure src module_init_tools localVersion postBuild postInstall;
+  inherit preConfigure src module_init_tools localVersion postInstall;
+
+  postBuild = (if setModuleDir then "" else '' 
+    eval "$(type installPhase | sed -e '1d' -e '/export MODULE_DIR/d')";
+  '') + postBuild;
 
   patches = map (p: p.patch) kernelPatches;
 
@@ -140,3 +145,4 @@ stdenv.mkDerivation {
     platforms = lib.platforms.linux;
   } // extraMeta;
 }
+
diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index c9bde0eafe9a..169c37dec492 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -200,6 +200,8 @@ import ./generic.nix (
     config = configWithPlatform stdenv.platform;
     configCross = configWithPlatform stdenv.cross.platform;
 
+    setModuleDir = false;
+
     features.iwlwifi = true;
   }
 

From 20ebca303e3372317c01c0c54f64f3d6423b094c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 24 Jul 2011 20:24:23 +0000
Subject: [PATCH 071/101] Add comments explaining the purpose of the postBuild
 prepend

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

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 46ebb2b8fff4..b5d10f069211 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -77,6 +77,11 @@ stdenv.mkDerivation {
 
   inherit preConfigure src module_init_tools localVersion postInstall;
 
+  #Currently, the builder sets $MODULE_DIR during installPhase. This causes
+  #problems with at least linux 3.0, so we need to conditionally avoid
+  #setting $MODULE_DIR. This prepend to postBuild accomplishes this with a
+  #sed/eval trick thanks to MarcWeber
+
   postBuild = (if setModuleDir then "" else '' 
     eval "$(type installPhase | sed -e '1d' -e '/export MODULE_DIR/d')";
   '') + postBuild;

From 7e9676bab5527bca8310adea09ce967e7b9ea9b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Jul 2011 20:26:28 +0000
Subject: [PATCH 072/101] jbidwatcher: generalized java support so that the
 package can be built on Darwin, too

svn path=/nixpkgs/trunk/; revision=27923
---
 pkgs/applications/misc/jbidwatcher/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index 555c7e45d7b8..56c547ce4357 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre }:
+{ stdenv, fetchurl, java }:
 
 stdenv.mkDerivation rec {
   pname = "jbidwatcher";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0nrs9ly56cqn33dm1sjm53pzj1cf7jncwn4c8v0xyva4jqyz2y5p";
   };
 
-  buildInputs = [ jre ];
+  buildInputs = [ java ];
 
   jarfile = "$out/share/java/${pname}/JBidwatcher.jar";
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     ensureDir "$out/bin"
     echo > "$out/bin/${pname}" "#!/bin/sh"
-    echo >>"$out/bin/${pname}" "${jre}/bin/java -Xmx512m -jar ${jarfile}"
+    echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}"
     chmod +x "$out/bin/${pname}"
     install -D -m644 ${src} ${jarfile}
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a896aa07aa73..5c779134d0e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6427,7 +6427,9 @@ let
     inherit (gnome) libglade;
   };
 
-  jbidwatcher = callPackage ../applications/misc/jbidwatcher { };
+  jbidwatcher = callPackage ../applications/misc/jbidwatcher {
+    java = if stdenv.isLinux then jre else jdk;
+  };
 
   qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
     inherit libpng opencv;

From 5a72bae9df1d29fddb53c828e1e8e9b8d2f80909 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Jul 2011 20:26:33 +0000
Subject: [PATCH 073/101] all-packages.nix: stripped trailing whitespace

svn path=/nixpkgs/trunk/; revision=27924
---
 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 5c779134d0e9..33185b684716 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8151,7 +8151,7 @@ let
   vice = callPackage ../misc/emulators/vice { };
 
   VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
-  
+
   # Wine cannot be built in 64-bit; use a 32-bit build instead.
   wine = callPackage_i686 ../misc/emulators/wine { };
 

From 2cc5d14382256ba80afdab5f621eeeda524d17f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 25 Jul 2011 07:33:48 +0000
Subject: [PATCH 074/101] Added monad-par.

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

diff --git a/pkgs/development/libraries/haskell/monad-par/default.nix b/pkgs/development/libraries/haskell/monad-par/default.nix
new file mode 100644
index 000000000000..1aaee7e08839
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-par/default.nix
@@ -0,0 +1,13 @@
+{cabal, deepseq, HUnit}:
+
+cabal.mkDerivation (self : {
+  pname = "monad-par";
+  version = "0.1.0.1";
+  sha256 = "0sd5w09vi12jwzz8xgh51r27577byr6pqp15dw0z5nhf4w869qxq";
+  propagatedBuildInputs = [deepseq HUnit];
+  meta = {
+    description = "A library for parallel programming based on a monad";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 713d8d3cb42a..01ae3d8ee474 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -708,6 +708,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
 
+  monadPar = callPackage ../development/libraries/haskell/monad-par {};
+
   monadPeel = callPackage ../development/libraries/haskell/monad-peel {};
 
   MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {};

From f0e799a492ec41e6b81deccaa35bf8563dfc43cc Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 25 Jul 2011 10:48:07 +0000
Subject: [PATCH 075/101] Updated eduke32 to rev 1944

svn path=/nixpkgs/trunk/; revision=27936
---
 pkgs/games/eduke32/default.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 9ff05667f1e6..9b41b110ad7b 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -1,19 +1,18 @@
-{stdenv, fetchsvn, SDL, SDL_mixer, unzip, libvorbis, mesa, gtk, pkgconfig, nasm, makeDesktopItem}:
+{stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, makeDesktopItem}:
 
 stdenv.mkDerivation rec {
-  name = "eduke32";
+  name = "eduke32-1944";
   
-  src = fetchsvn {
-    url = https://eduke32.svn.sourceforge.net/svnroot/eduke32/polymer/eduke32;
-    rev = 1597;
-    sha256 = "be917420d628584e1b950570f67332f66cee0d24edfcee39c7bd62e6b9456436";
+  src = fetchurl {
+    url = http://dukeworld.duke4.net/eduke32/synthesis/20110724-1944/eduke32_src_20110724-1944.tar.bz2;
+    sha256 = "0y2y9agydfkdq4krp4lz22br3p23as6hrqhq7l9djw0pm2y76fqh";
   };
   
-  buildInputs = [ unzip SDL SDL_mixer libvorbis mesa gtk pkgconfig ]
+  buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig ]
     ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
   
-  NIX_LDFLAGS = "-lgcc_s";
   NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
+  NIX_LDFLAGS = "-L${SDL}/lib";
   
   desktopItem = makeDesktopItem {
     name = "eduke32";
@@ -24,6 +23,10 @@ stdenv.mkDerivation rec {
     categories = "Application;Game;";
   };
 
+  preConfigure = ''
+    sed -i -e "s|/usr/bin/sdl-config|${SDL}/bin/sdl-config|" build/Makefile.shared
+  '';
+  
   buildPhase = ''
     make OPTLEVEL=0
   '';
@@ -39,7 +42,7 @@ stdenv.mkDerivation rec {
     
     if [ "$EDUKE32_DATA_DIR" = "" ]
     then 
-        EDUKE32_DATA_DIR=/var/games/eduke32
+        EDUKE32_DATA_DIR=/var/lib/games/eduke32
     fi
     if [ "$EDUKE32_GRP_FILE" = "" ]
     then
@@ -58,7 +61,8 @@ stdenv.mkDerivation rec {
   
   meta = {
     description = "Enhanched port of Duke Nukem 3D for various platforms";
-    license = "GPL";
+    license = "GPLv2+ and BUILD license";
+    homepage = http://eduke32.com;
     maintainers = [ stdenv.lib.maintainers.sander ];
   };
 }

From bf5c3bb6716e145ff26c748a119299bd4d639d29 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 25 Jul 2011 11:43:27 +0000
Subject: [PATCH 076/101] - libgcc_s seems to be needed after all - eduke32
 uses UNIX style options nowadays

svn path=/nixpkgs/trunk/; revision=27937
---
 pkgs/games/eduke32/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 9b41b110ad7b..b99f8b09b9de 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
   
   NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
-  NIX_LDFLAGS = "-L${SDL}/lib";
+  NIX_LDFLAGS = "-L${SDL}/lib -lgcc_s";
   
   desktopItem = makeDesktopItem {
     name = "eduke32";
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     fi
     
     cd \$EDUKE32_DATA_DIR
-    eduke32 /g\$EDUKE32_GRP_FILE    
+    eduke32 -g \$EDUKE32_GRP_FILE    
     EOF
     chmod 755 $out/bin/eduke32-wrapper
     

From 486ff3ff408ffe4ba633c82aa3b6a467ff244511 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Jul 2011 17:19:37 +0000
Subject: [PATCH 077/101] tree: configure build for Cygwin

svn path=/nixpkgs/trunk/; revision=27947
---
 pkgs/tools/system/tree/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index 8e74f12f1576..f043dae1e2b7 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -11,6 +11,11 @@ let
       CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp"
       LDFLAGS=
       EXTRA_OBJS=strverscmp.o
+    '' else if stdenv.isCygwin then ''
+      CFLAGS="-O2 -Wall -fomit-frame-pointer -DCYGWIN"
+      LDFLAGS=-s
+      TREE_DEST=tree.exe
+      EXTRA_OBJS=strverscmp.o
     '' else
     ""; # use linux flags by default
 in

From de4c559ce9f3c1f2289955c68aa11b586e6d2807 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Jul 2011 17:24:49 +0000
Subject: [PATCH 078/101] tree: configure build for BSD Unix

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

diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index f043dae1e2b7..549cc449f024 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -16,6 +16,10 @@ let
       LDFLAGS=-s
       TREE_DEST=tree.exe
       EXTRA_OBJS=strverscmp.o
+    '' else if stdenv.isBSD then ''
+      CFLAGS="-O2 -Wall -fomit-frame-pointer"
+      LDFLAGS=-s
+      EXTRA_OBJS=strverscmp.o
     '' else
     ""; # use linux flags by default
 in

From 7eb1afad495d47c62ba0ed61dac04f078a54fef9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 22:24:02 +0000
Subject: [PATCH 079/101] * Spotify: use PulseAudio if available.

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index eb783e60fc5f..1b9675c1f62f 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper }:
+{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, pulseaudio, makeWrapper }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
       patchelf \
         --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-        --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
+        --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib pulseaudio stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
         $out/bin/spotify
 
       preload=$out/libexec/spotify/libpreload.so

From 6b302190a4b6fdafd9a7aae45c23b76e152cf27d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Jul 2011 14:01:47 +0000
Subject: [PATCH 080/101] * Spotify: drop PulseAudio from the library path, as
 Spotify seems to   have it statically linked anyway.

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 1b9675c1f62f..eb783e60fc5f 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, pulseaudio, makeWrapper }:
+{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
       patchelf \
         --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-        --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib pulseaudio stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
+        --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
         $out/bin/spotify
 
       preload=$out/libexec/spotify/libpreload.so

From 22135b319b6dfd0c98ec89308590afffefcf6125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 27 Jul 2011 16:07:20 +0000
Subject: [PATCH 081/101] Updating skype. It runs fine (start, see the friends
 list) for me.

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

diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix
index 7e066b5e380c..45a83f62870f 100644
--- a/pkgs/applications/networking/skype/default.nix
+++ b/pkgs/applications/networking/skype/default.nix
@@ -4,11 +4,11 @@
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation rec {
-  name = "skype-2.1.0.81";
+  name = "skype-2.2.0.35";
 
   src = fetchurl {
     url = "http://download.skype.com/linux/${name}.tar.bz2";
-    sha256 = "1x18m4900c0ssaq95wv8mhhgwvw9fh66dszx7zq24zgvb2v1h4jz";
+    sha256 = "157ba3ci12bq0nv2m8wlsab45ib5sccqagyna8nixnhqw9q72sxm";
   };
 
   buildInputs = [

From adb988d57c189c7e4385dcdcff2efd1f7092af2b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 27 Jul 2011 16:37:44 +0000
Subject: [PATCH 082/101] Introduce the 'firefoxPkgs' attribute so that only
 one change needs to be made when changing default firefox version

A quick test showed that this change does not change the hash for building pkgs.firefoxWrapper

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33185b684716..e4d76baec683 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2502,10 +2502,10 @@ let
   xulrunnerWrapper = {application, launcher}:
     import ../development/interpreters/xulrunner/wrapper {
       inherit stdenv application launcher;
-      xulrunner = firefox50Pkgs.xulrunner;
+      xulrunner = firefoxPkgs.xulrunner;
     };
 
-  xulrunner = firefox50Pkgs.xulrunner;
+  xulrunner = firefoxPkgs.xulrunner;
 
   ### DEVELOPMENT / MISC
 
@@ -6297,9 +6297,11 @@ let
 
   filelight = newScope pkgs.kde4 ../applications/misc/filelight { };
 
-  firefox = firefox50Pkgs.firefox;
+  firefox = firefoxPkgs.firefox;
 
-  firefoxWrapper = firefox50Wrapper;
+  firefoxWrapper = wrapFirefox firefoxPkgs.firefox "firefox" "";
+
+  firefoxPkgs = firefox50Pkgs;
 
   firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
     inherit (gtkLibs) gtk pango;

From 0026458089ed4a754f75b182b5e903f2242127cc Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 27 Jul 2011 16:40:12 +0000
Subject: [PATCH 083/101] Eliminate redundant definition of xulrunner

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4d76baec683..792f59f2e107 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2501,8 +2501,7 @@ let
 
   xulrunnerWrapper = {application, launcher}:
     import ../development/interpreters/xulrunner/wrapper {
-      inherit stdenv application launcher;
-      xulrunner = firefoxPkgs.xulrunner;
+      inherit stdenv application launcher xulrunner;
     };
 
   xulrunner = firefoxPkgs.xulrunner;

From c7f7be4faef2de4ea028e63ad1483caf7c667ba6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 27 Jul 2011 16:42:00 +0000
Subject: [PATCH 084/101] Make use of the existing 'firefox' attribute

svn path=/nixpkgs/trunk/; revision=27976
---
 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 792f59f2e107..5c6aee8c8a4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6298,7 +6298,7 @@ let
 
   firefox = firefoxPkgs.firefox;
 
-  firefoxWrapper = wrapFirefox firefoxPkgs.firefox "firefox" "";
+  firefoxWrapper = wrapFirefox firefox "firefox" "";
 
   firefoxPkgs = firefox50Pkgs;
 

From 0690f20ea8fc734302dffe42d3a72ca4199b5235 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 27 Jul 2011 21:00:09 +0000
Subject: [PATCH 085/101] ffmpeg: Add previous version to fix fuppes.

svn path=/nixpkgs/trunk/; revision=27980
---
 pkgs/development/libraries/ffmpeg/0.6.90.nix  | 73 +++++++++++++++++++
 pkgs/development/libraries/ffmpeg/default.nix |  1 +
 pkgs/top-level/all-packages.nix               |  8 +-
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/ffmpeg/0.6.90.nix

diff --git a/pkgs/development/libraries/ffmpeg/0.6.90.nix b/pkgs/development/libraries/ffmpeg/0.6.90.nix
new file mode 100644
index 000000000000..31e00b5cd789
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/0.6.90.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, pkgconfig, yasm
+, mp3Support ? true, lame ? null
+, speexSupport ? true, speex ? null
+, theoraSupport ? true, libtheora ? null
+, vorbisSupport ? true, libvorbis ? null
+, vpxSupport ? false, libvpx ? null
+, x264Support ? true, x264 ? null
+, xvidSupport ? true, xvidcore ? null
+, faacSupport ? false, faac ? null
+}:
+
+assert speexSupport -> speex != null;
+assert theoraSupport -> libtheora != null;
+assert vorbisSupport -> libvorbis != null;
+assert vpxSupport -> libvpx != null;
+assert x264Support -> x264 != null;
+assert xvidSupport -> xvidcore != null;
+assert faacSupport -> faac != null;
+
+stdenv.mkDerivation rec {
+  name = "ffmpeg-0.6.90-rc0";
+
+  src = fetchurl {
+    url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
+    sha256 = "1xn9fmpq2cbf1bx1gxbxnas8fq02gb8bmvvg5vjjxyw9lz5zw49f";
+  };
+
+  # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
+  # the resulting library is GPL'ed, so it can only be used in GPL'ed
+  # applications.
+  configureFlags = [
+    "--enable-gpl"
+    "--enable-postproc"
+    "--enable-swscale"
+    "--disable-ffserver"
+    "--disable-ffplay"
+    "--enable-shared"
+    "--enable-runtime-cpudetect"
+  ]
+    ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
+    ++ stdenv.lib.optional speexSupport "--enable-libspeex"
+    ++ stdenv.lib.optional theoraSupport "--enable-libtheora"
+    ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
+    ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
+    ++ stdenv.lib.optional x264Support "--enable-libx264"
+    ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
+    ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
+
+  buildInputs = [ pkgconfig lame yasm ]
+    ++ stdenv.lib.optional mp3Support lame
+    ++ stdenv.lib.optional speexSupport speex
+    ++ stdenv.lib.optional theoraSupport libtheora
+    ++ stdenv.lib.optional vorbisSupport libvorbis
+    ++ stdenv.lib.optional vpxSupport libvpx
+    ++ stdenv.lib.optional x264Support x264
+    ++ stdenv.lib.optional xvidSupport xvidcore
+    ++ stdenv.lib.optional faacSupport faac;
+
+  crossAttrs = {
+    dontSetConfigureCross = true;
+    configureFlags = configureFlags ++ [
+      "--cross-prefix=${stdenv.cross.config}-"
+      "--enable-cross-compile"
+      "--target_os=linux"
+      "--arch=${stdenv.cross.arch}"
+      ];
+  };
+
+  meta = {
+    homepage = http://www.ffmpeg.org/;
+    description = "A complete, cross-platform solution to record, convert and stream audio and video";
+  };
+}
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 3575e24c4f90..52de10148a4c 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -15,6 +15,7 @@ assert vorbisSupport -> libvorbis != null;
 assert vpxSupport -> libvpx != null;
 assert x264Support -> x264 != null;
 assert xvidSupport -> xvidcore != null;
+assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-0.7-rc1";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c6aee8c8a4a..16204d35d599 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -657,7 +657,9 @@ let
 
   ftgl = callPackage ../development/libraries/ftgl { };
 
-  fuppes = callPackage ../tools/networking/fuppes {};
+  fuppes = callPackage ../tools/networking/fuppes {
+    ffmpeg = ffmpeg_0_6_90;
+  };
 
   fsfs = callPackage ../tools/filesystems/fsfs { };
 
@@ -3100,6 +3102,10 @@ let
     vpxSupport = if !stdenv.isMips then true else false;
   };
 
+  ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix {
+    vpxSupport = if !stdenv.isMips then true else false;
+  };
+
   fftw = callPackage ../development/libraries/fftw {
     singlePrecision = false;
   };

From 3c05ad236d7b306dcb5e48d4fb9c009ee13da8e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Jul 2011 09:32:02 +0000
Subject: [PATCH 086/101] * Linux 2.6.32.43.

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

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
index dfbdc534e11b..da6ff2160b21 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
@@ -198,11 +198,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.32.41";
+    version = "2.6.32.43";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-${version}.tar.bz2";
-      sha256 = "0s1ck6q1zv1jy7zgbm89f2lk1m991wrp2fp7cffrinnzmx8j96lk";
+      sha256 = "1adqrax806hj9sjp3qvjffblz2jvdydrwra9cr5qxqys3spql3p8";
     };
 
     config = configWithPlatform stdenv.platform;

From e7349f43295a636f3fbef6acbb0911b17277b37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 28 Jul 2011 12:08:08 +0000
Subject: [PATCH 087/101] BitlBee 3.0.3.

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

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 74b6b0b21eaf..1d49e0d1ff78 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr }:
 
 stdenv.mkDerivation rec {
-  name = "bitlbee-3.0.1";
+  name = "bitlbee-3.0.3";
 
   src = fetchurl {
     url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "027n5f0phjr5fcrphbcflqv8hlkv5qnrpc1xgr09qjyv6mxp72j0";
+    sha256 = "09dgwfqznd2cnqraksivmh132nnl99gwgplynjmfsyyf6y4pbjl2";
   };
 
   buildInputs = [ gnutls glib pkgconfig libotr ]

From eaa82cb4efed82ecc305be37fb4f76d7037c502f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 28 Jul 2011 12:08:11 +0000
Subject: [PATCH 088/101] glibc: Update Hurd snapshot.

svn path=/nixpkgs/trunk/; revision=27986
---
 pkgs/development/libraries/glibc-2.12/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix
index a83aeeab7f3a..2efe56bb2146 100644
--- a/pkgs/development/libraries/glibc-2.12/common.nix
+++ b/pkgs/development/libraries/glibc-2.12/common.nix
@@ -141,8 +141,8 @@ stdenv.mkDerivation ({
       # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
       # See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
       url = "git://git.sv.gnu.org/hurd/glibc.git";
-      sha256 = "e51c6b0bb8544ee4547fda22272bfa6a23677655d15da3c041be6e820f37f844";
-      rev = "05862f9210fb029df3773ef004af954461f07478";
+      sha256 = "39ea53f318376cbd33e06ec23f4a393fc0801ea3aa87286b30943aa7ef7604cd";
+      rev = "77a94de8d3490e73a71efc0b981356d5acb7a28a";
     }
     else fetchurl {
       url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";

From 2c17fb436bde30bf802435d90f0b1078e4429c5f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 28 Jul 2011 18:53:12 +0000
Subject: [PATCH 089/101] Copy openjdk-darwin as a starting point for openjdk7

svn path=/nixpkgs/trunk/; revision=27992
---
 pkgs/development/compilers/openjdk/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 pkgs/development/compilers/openjdk/default.nix

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
new file mode 100644
index 000000000000..88099a90949c
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "openjdk6-b16-24_apr_2009-r1";
+
+  src = fetchurl {
+    url = http://hg.bikemonkey.org/archive/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2;
+    sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v";
+  };
+
+  installPhase = ''
+    ensureDir $out
+    cp -vR * $out/
+  '';
+
+}

From 415be547b31a48f0047fd2b0e13370d05fa5af38 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 30 Jul 2011 18:51:42 +0000
Subject: [PATCH 090/101] Enabling optional jackaudio support for pulseaudio

svn path=/nixpkgs/trunk/; revision=28010
---
 pkgs/servers/pulseaudio/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 40af62072439..aabb276523a1 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,8 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
 , gconf, liboil, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
 , libcap, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
+, jackaudioSupport ? false, jackaudio ? null
 , ...}:
 
+assert jackaudioSupport -> jackaudio != null;
+
 stdenv.mkDerivation rec {
   name = "pulseaudio-0.9.21";
 
@@ -18,8 +21,8 @@ stdenv.mkDerivation rec {
     pkgconfig gnum4 libtool glib dbus avahi gconf liboil
     libsamplerate libsndfile speex alsaLib libcap
     gtk libX11 libICE libSM libXtst libXi
-    intltool gettext bluez udev
-  ];
+    intltool gettext bluez udev]
+    ++ stdenv.lib.optional jackaudioSupport jackaudio;
 
   preConfigure = ''
     # Change the `padsp' script so that it contains the full path to
@@ -33,8 +36,9 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = ''
-    --disable-solaris --disable-hal --disable-jack --localstatedir=/var
+    --disable-solaris --disable-hal --localstatedir=/var
     --disable-oss-output --disable-oss-wrapper
+    ${if (!jackaudioSupport) then "--disable-jack" else ""}
   '';
 
   meta = {

From e1c210808593d6585dd19f204b3c1c7ada53075d Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 30 Jul 2011 21:06:45 +0000
Subject: [PATCH 091/101] Add dbus support to qjackctl so that it can use
 jackdbus

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

diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 30527171e57c..4cdea1a21ce3 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, alsaLib, jackaudio }:
+{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
 
 stdenv.mkDerivation rec {
   version = "0.3.7";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1gynym21d8d4d38qyl817qg0v8360brcpga4wcdapccbgpaz3c28";
   };
 
-  buildInputs = [ qt4 alsaLib jackaudio ];
+  buildInputs = [ qt4 alsaLib jackaudio dbus ];
 
-  meta = { 
+  meta = {
     description = "qt jackd control gui tool";
     homepage = http://qjackctl.sourceforge.net/;
     license = "GPL";

From 4aca0cf2179784df73aa40fbfeb5ac36aa52284d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 30 Jul 2011 21:43:39 +0000
Subject: [PATCH 092/101] haskell-polyparse: updated to version 1.7

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

diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix
index e05ba114938e..f78cdfa2413b 100644
--- a/pkgs/development/libraries/haskell/polyparse/default.nix
+++ b/pkgs/development/libraries/haskell/polyparse/default.nix
@@ -1,9 +1,10 @@
-{cabal}:
+{cabal, text}:
 
 cabal.mkDerivation (self : {
   pname = "polyparse";
-  version = "1.4";
-  sha256 = "6e599fb0771e8ce2e1d3a3bbe5eddc2d77b2b4bbb54602f01005dc55dc039d44";
+  version = "1.7";
+  sha256 = "de8ed0ce54f1f81bb0783dd97b7b22eca28df4a238684a26b37c5af2d17a364b";
+  propagatedBuildInputs = [text];
   meta = {
     description = "A variety of alternative parser combinator libraries";
   };

From 10f65d114824bcc1ae09c118fe6f780e5a4d5901 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 30 Jul 2011 21:43:47 +0000
Subject: [PATCH 093/101] HaXml: added version 1.22.2

It's not the default, though, because it breaks API compatibility
with earlier versions.

svn path=/nixpkgs/trunk/; revision=28013
---
 .../libraries/haskell/HaXml/1.22.2.nix        | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/HaXml/1.22.2.nix

diff --git a/pkgs/development/libraries/haskell/HaXml/1.22.2.nix b/pkgs/development/libraries/haskell/HaXml/1.22.2.nix
new file mode 100644
index 000000000000..03fa18245514
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HaXml/1.22.2.nix
@@ -0,0 +1,20 @@
+{cabal, polyparse}:
+
+cabal.mkDerivation (self : {
+  pname = "HaXml";
+  version = "1.22.2";
+  sha256 = "8d4706430a1bdd1cb09e6e346f108a24c8d420d0240b2706633b9e949e67b355";
+  propagatedBuildInputs = [polyparse];
+  /* Avoid the following error:
+
+      src/Text/XML/HaXml/Schema/Schema.hs:50:21:
+	  parse error on input `{- | t -> s -}'
+   */
+  noHaddock = true;
+  meta = {
+    description = "Haskell utilities for parsing, filtering, transforming and generating XML documents.";
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 01ae3d8ee474..1615fb695767 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -587,8 +587,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   HaXml_1_13_3 = callPackage ../development/libraries/haskell/HaXml/1.13.3.nix {};
   HaXml_1_20_2 = callPackage ../development/libraries/haskell/HaXml/1.20.2.nix {};
+  HaXml_1_22_2 = callPackage ../development/libraries/haskell/HaXml/1.22.2.nix {};
   HaXml113 = self.HaXml_1_13_3;
   HaXml120 = self.HaXml_1_20_2;
+  HaXml122 = self.HaXml_1_22_2;
   HaXml    = self.HaXml120;
 
   HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {};

From 0942a5b164ffdfbf57191dbf22f8c2f2cfc0875d Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 31 Jul 2011 08:49:03 +0000
Subject: [PATCH 094/101] Updating node to 0.5.2

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

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index d6c337e306f2..39eba01d0f76 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, python }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.7";
+  version = "0.5.2";
   name = "nodejs-${version}";
 
   src = fetchurl {
     url = "http://nodejs.org/dist/node-v${version}.tar.gz";
-    sha256 = "1vixb54an9zp2zvc0z8pn6r6bv823wwy9m06xr4zzss9apw5yh2w";
+    sha256 = "16z16gq5pibw5l830pv5dgx7v2gw6syrddphikcgia92pw4r33qr";
   };
 
   patchPhase = ''
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ python openssl ];
 
-  meta = with stdenv.lib; { 
+  meta = with stdenv.lib; {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;
     license = licenses.mit;

From 4cc923b4bbe1296f0e348617c413eaa9ef329169 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 31 Jul 2011 08:56:09 +0000
Subject: [PATCH 095/101] Fixing the download url

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

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 39eba01d0f76..f3e5e9aa6b46 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "nodejs-${version}";
 
   src = fetchurl {
-    url = "http://nodejs.org/dist/node-v${version}.tar.gz";
+    url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
     sha256 = "16z16gq5pibw5l830pv5dgx7v2gw6syrddphikcgia92pw4r33qr";
   };
 

From 53b9044b19cbd35ec556b7e387b244ec1ca24337 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 31 Jul 2011 10:49:19 +0000
Subject: [PATCH 096/101] Updating darktable to 0.9.1

svn path=/nixpkgs/trunk/; revision=28016
---
 .../graphics/darktable/default.nix            | 46 +++++++++++++------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 18f19f7347e0..c0ebb95a67a2 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -1,27 +1,47 @@
 { stdenv, fetchurl,
-  GConf, cairo, curl, dbus_glib, exiv2, gnome_keyring, gphoto2, gtk,
-  intltool, lcms, lensfun, libexif, libglade, libgphoto2, libjpeg,
-  libpng, libraw1394, librsvg, libtiff, openexr, pkgconfig, sqlite, }:
+  GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib,
+  gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2,
+  lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg,
+  libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb,
+  openexr, pixman, pkgconfig, sqlite}:
 
 stdenv.mkDerivation rec {
-  version = "0.7.1";
+  version = "0.9.1";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
-    sha256 = "080gvf5gp3rb0vlsvdgnzrzky9dfpqw5cwnj6z1k8lvryd9fzahm";
+    sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e";
   };
 
-  patches = [ ./exif.patch ];
+  buildInputs = [
+    GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
+    ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
+    libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
+    librsvg libtiff libxcb openexr pixman pkgconfig sqlite];
 
-  buildInputs = [ GConf cairo curl dbus_glib exiv2 gnome_keyring gtk
-                        intltool lcms lensfun libexif libglade
-                        libgphoto2 libjpeg libpng libraw1394 librsvg
-                        libtiff openexr pkgconfig sqlite ];
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
+  '';
 
-  meta = {
-    description = "a virtual lighttable and darkroom for photographers";
+  cmakeFlags = [
+    "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include"
+    "-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Virtual lighttable and darkroom for photographers";
     homepage = http://darktable.sourceforge.net;
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
   };
 }

From 1d227008666ae518554c58b8a49a81d3d9fc0ad8 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 31 Jul 2011 10:50:06 +0000
Subject: [PATCH 097/101] Removing exif patch, no longer needed

svn path=/nixpkgs/trunk/; revision=28017
---
 pkgs/applications/graphics/darktable/exif.patch | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 pkgs/applications/graphics/darktable/exif.patch

diff --git a/pkgs/applications/graphics/darktable/exif.patch b/pkgs/applications/graphics/darktable/exif.patch
deleted file mode 100644
index f1f59d3ef4e4..000000000000
--- a/pkgs/applications/graphics/darktable/exif.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- darktable-0.7.1/src/common/exif.cc	2011-01-01 12:08:36.000000000 +0100
-+++ darktable-0.7.1/src/common/exif.cc	2011-01-01 12:09:27.000000000 +0100
-@@ -33,7 +33,7 @@
- #include <exiv2/error.hpp>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
--#include <exiv2/canonmn.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <sqlite3.h>
- #include <iostream>
- #include <fstream>

From 492935270b3216bd6b40464c58e465a81d75b904 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 31 Jul 2011 11:11:52 +0000
Subject: [PATCH 098/101] Adding new required inputs for darktable

svn path=/nixpkgs/trunk/; revision=28018
---
 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 16204d35d599..608da21752cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6109,7 +6109,8 @@ let
   darcs = haskellPackages.darcs;
 
   darktable = callPackage ../applications/graphics/darktable {
-     inherit (gnome) GConf gnome_keyring libglade;
+    inherit (gnome) GConf gnome_keyring libglade atk;
+    inherit (xlibs) libxcb pixman libpthreadstubs libXau;
   };
 
   dia = callPackage ../applications/graphics/dia { };

From 5231ba050fa5bb03442a83669c62b04e22c02fc2 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 31 Jul 2011 14:04:45 +0000
Subject: [PATCH 099/101] Updating qtractor to the latest release: 0.5.0

svn path=/nixpkgs/trunk/; revision=28019
---
 pkgs/applications/audio/qtractor/default.nix | 21 +++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index 4a257b0de5c7..7634ecc01da2 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -1,22 +1,19 @@
-{ alsaLib, autoconf, automake, dssi, fetchsvn, gtk, jackaudio,
-ladspaH, ladspaPlugins, liblo, libmad, libsndfile, libtool, libvorbis,
-pkgconfig, qt4, rubberband, stdenv }:
+{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio,
+ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile,
+libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
 
 stdenv.mkDerivation rec {
-  version = "svn-1992";
+  version = "0.5.0";
   name = "qtractor-${version}";
 
-  src = fetchsvn {
-    url = "http://qtractor.svn.sourceforge.net/svnroot/qtractor/trunk";
-    rev = "1992";
-    sha256 = "10k0w5pzci21k1i32jzv5gdkbs34iv4hdn6dzp3n5048hvrp1hiy";
+  src = fetchurl {
+    url = "mirror://sourceforge/qtractor/${name}.tar.gz";
+    sha256 = "de5991d2d29b2713d73a90ab29efc24db0be68d8e9ca328062d53d229e902e89";
   };
 
-  preConfigure = "make -f Makefile.svn";
-
   buildInputs = [ alsaLib autoconf automake dssi gtk jackaudio ladspaH
-    ladspaPlugins liblo libmad libsndfile libtool libvorbis pkgconfig
-    qt4 rubberband ];
+    ladspaPlugins liblo libmad libsamplerate libsndfile libtool
+    libvorbis pkgconfig qt4 rubberband ];
 
   meta = with stdenv.lib; {
     description = "Audio/MIDI multi-track sequencer";

From 5e6506c4d0a47fdfdbd14985753fc9dc33b29638 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sun, 31 Jul 2011 14:52:42 +0000
Subject: [PATCH 100/101] Updating the development ardour3 revision, also
 renaming so that ardour2 and ardour3 can peacefully co-exist

svn path=/nixpkgs/trunk/; revision=28020
---
 pkgs/applications/audio/ardour/ardour3.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
index 6705afcfb54c..dea27cb6a552 100644
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -5,16 +5,16 @@ librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile,
 libusb, libuuid, libxml2, libxslt, pango, perl, pkgconfig, python }:
 
 let
-  rev = "9484";
+  rev = "9942";
 in
 
 stdenv.mkDerivation {
-  name = "ardour-3.0-${rev}";
+  name = "ardour3-svn-${rev}";
 
   src = fetchsvn {
     url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
     inherit rev;
-    sha256 = "13j490kw66sslxibfab8hmm2k6gapvsriqa4av02y438dr1k4skf";
+    sha256 = "5f463e5a67bcb1ee6b4d24c25307419ea14ce52130819054b775e377c31a0664";
   };
 
   buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec

From fc5ea05cfd4f76a4b32833bfe6f3b9fe68cfd93d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Jul 2011 15:33:55 +0000
Subject: [PATCH 101/101] Keep polyparse 1.4 around because haskell-graphviz
 depends on the older version.

I've asked upstream to update their cabal file, but until then we'll
need both versions. :-(

svn path=/nixpkgs/trunk/; revision=28021
---
 pkgs/development/libraries/haskell/polyparse/1.4.nix  | 11 +++++++++++
 .../haskell/polyparse/{default.nix => 1.7.nix}        |  0
 pkgs/top-level/haskell-packages.nix                   |  8 ++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/polyparse/1.4.nix
 rename pkgs/development/libraries/haskell/polyparse/{default.nix => 1.7.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/polyparse/1.4.nix b/pkgs/development/libraries/haskell/polyparse/1.4.nix
new file mode 100644
index 000000000000..e05ba114938e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/polyparse/1.4.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "polyparse";
+  version = "1.4";
+  sha256 = "6e599fb0771e8ce2e1d3a3bbe5eddc2d77b2b4bbb54602f01005dc55dc039d44";
+  meta = {
+    description = "A variety of alternative parser combinator libraries";
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/1.7.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/polyparse/default.nix
rename to pkgs/development/libraries/haskell/polyparse/1.7.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1615fb695767..a45bf7a111a7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -541,7 +541,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {};
 
-  graphviz = callPackage ../development/libraries/haskell/graphviz {};
+  graphviz = callPackage ../development/libraries/haskell/graphviz {
+    polyparse = self.polyparse14;
+  };
 
   hakyll = callPackage ../development/libraries/haskell/hakyll {};
 
@@ -804,7 +806,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {};
 
-  polyparse = callPackage ../development/libraries/haskell/polyparse {};
+  polyparse14 = callPackage ../development/libraries/haskell/polyparse/1.4.nix {};
+  polyparse17 = callPackage ../development/libraries/haskell/polyparse/1.7.nix {};
+  polyparse = self.polyparse17;
 
   pool = callPackage ../development/libraries/haskell/pool {};