From 9cbb1dbec69fe0995fd1dcd32994e1dfdc153e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 7 Jul 2011 15:10:33 +0000
Subject: [PATCH 001/113] mpg321 0.2.13-2.

svn path=/nixpkgs/trunk/; revision=27621
---
 pkgs/applications/audio/mpg321/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
index 23cc92132b95..4ca0cc8f8476 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -1,17 +1,20 @@
 {stdenv, fetchurl, libao, libmad, libid3tag, zlib}:
 
-stdenv.mkDerivation {
-  name = "mpg321-0.2.10";
+stdenv.mkDerivation rec {
+  name = "mpg321-0.2.13-2";
+
   src = fetchurl {
-    url = mirror://sourceforge/mpg321/mpg321-0.2.10.tar.gz;
-    sha256 = "db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4";
+    url = "mirror://sourceforge/mpg321/0.2.13/${name}.tar.gz";
+    sha256 = "0zx9xyr97frlyrwyk2msm9h1sn2b84vqaxcy5drbzcd2n585lwlx";
   };
 
   buildInputs = [libao libid3tag libmad zlib];
 
   meta = {
-    description = "Command-line MP3 player.";
+    description = "mpg321, a command-line MP3 player";
     homepage = http://mpg321.sourceforge.net/;
     license = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;
   };
 }

From 4d7d10da6b196c43aaa4eb0e79202560395a4c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 7 Jul 2011 15:10:40 +0000
Subject: [PATCH 002/113] GNU Automake: Append `-I' flags stemming from
 $ACLOCAL_PATH instead of prepending them.

See <http://lists.gnu.org/archive/html/bug-gnulib/2011-07/msg00100.html>
for an illustration of the bug.

svn path=/nixpkgs/trunk/; revision=27622
---
 .../tools/misc/automake/builder.sh            | 39 ++++++++++++++-----
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh
index 6b0cd7e4fa22..7f9e9219de31 100644
--- a/pkgs/development/tools/misc/automake/builder.sh
+++ b/pkgs/development/tools/misc/automake/builder.sh
@@ -1,5 +1,33 @@
 source $stdenv/setup
 
+# Wrap the given `aclocal' program, appending extra `-I' flags
+# corresponding to the directories listed in $ACLOCAL_PATH.  (Note
+# that `wrapProgram' can't be used for that purpose since it can only
+# prepend flags, not append them.)
+wrapAclocal() {
+    local program="$1"
+    local wrapped="$(dirname $program)/.$(basename $program)-wrapped"
+
+    mv "$program" "$wrapped"
+    cat > "$program"<<EOF
+#! $SHELL -e
+
+unset extraFlagsArray
+declare -a extraFlagsArray
+
+oldIFS=\$IFS
+IFS=:
+for dir in \$ACLOCAL_PATH; do
+    if test -n "\$dir" -a -d "\$dir"; then
+        extraFlagsArray=("\${extraFlagsArray[@]}" "-I" "\$dir")
+    fi
+done
+IFS=\$oldIFS
+
+exec "$wrapped" "\$@" "\${extraFlagsArray[@]}"
+EOF
+    chmod +x "$program"
+}
 
 postInstall() {
     # Create a wrapper around `aclocal' that converts every element in
@@ -9,16 +37,7 @@ postInstall() {
     # `-I' options explicitly.
 
     for prog in $out/bin/aclocal*; do 
-        wrapProgram $prog --run \
-            '
-oldIFS=$IFS
-IFS=:
-for dir in $ACLOCAL_PATH; do
-    if test -n "$dir" -a -d "$dir"; then
-        extraFlagsArray=("${extraFlagsArray[@]}" "-I" "$dir")
-    fi
-done
-IFS=$oldIFS'
+        wrapAclocal "$prog"
     done
 }
 

From 5422838e567c4076db935afd6e8fa00c8d46f3b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 7 Jul 2011 19:08:51 +0000
Subject: [PATCH 003/113] Version bumps for hakyll and dependencies.

svn path=/nixpkgs/trunk/; revision=27638
---
 .../libraries/haskell/blaze-builder/default.nix    |  4 ++--
 .../libraries/haskell/blaze-html/default.nix       |  4 ++--
 .../libraries/haskell/case-insensitive/default.nix | 14 ++++++++++++++
 .../libraries/haskell/hakyll/default.nix           |  4 ++--
 .../libraries/haskell/hamlet/default.nix           |  8 ++++----
 pkgs/development/libraries/haskell/snap/core.nix   |  8 ++++----
 pkgs/development/libraries/haskell/snap/server.nix |  4 ++--
 pkgs/top-level/haskell-packages.nix                |  2 ++
 8 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/case-insensitive/default.nix

diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
index 8eed52f1cee5..4b8dc9b08e96 100644
--- a/pkgs/development/libraries/haskell/blaze-builder/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "blaze-builder";
-  version = "0.2.1.4";
-  sha256 = "0r0lj2whwa1v99gx59l56af06w704qvv1vhkxlca86h7iri4b262";
+  version = "0.3.0.1";
+  sha256 = "1p3xlifcr7v987zx8l2sppn9yydph332mn1xxk0yfi78a6386nfb";
   propagatedBuildInputs = [text];
   meta = {
     description = "Builder to efficiently append text";
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index 9d7950ced1fb..e42a008a9484 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "blaze-html";
-  version = "0.4.1.0";
-  sha256 = "0a39wzfsb8lsr0z8c0s90n6pwmhjg6lihbxigk2c02vn5marzc4f";
+  version = "0.4.1.4";
+  sha256 = "1xf302dapwmmlxj9alfbdv6rcrxhr9p305s4jz2d6ckq2xzz8yjf";
   propagatedBuildInputs = [text blazeBuilder];
   meta = {
     description = "A blazingly fast HTML combinator library";
diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix
new file mode 100644
index 000000000000..2bda4a7eefea
--- /dev/null
+++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix
@@ -0,0 +1,14 @@
+{cabal, text}:
+
+cabal.mkDerivation (self : {
+  pname = "case-insensitive";
+  version = "0.2.0.2";
+  sha256 = "0qn2scaxxbqi4770nwvcmb1ldj0ipa2ljxcavcn0kv48xzs519l7";
+  propagatedBuildInputs = [text];
+  meta = {
+    description = "Case insensitive string comparison";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index d8e8954e5964..8c544ccc75e0 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self : {
   pname = "hakyll";
-  version = "3.0.2.0";
-  sha256 = "0d1kmvkbwygr9mxz7m8jiasrbj470j4hwsj8mmkdgdm9clxbi74k";
+  version = "3.2.0.3";
+  sha256 = "0biy9p662anhhlmwa502iy8cck597q0vlwj57l6cj8kpyxj4g0lz";
   propagatedBuildInputs =
     [ binary blazeHtml hamlet hopenssl mtl network pandoc regexBase
      regexPCRE snapCore snapServer strictConcurrency
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 2025b38015f0..6eb100c36f37 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -1,11 +1,11 @@
-{cabal, blazeBuilder, blazeHtml, failure, parsec, text, jsonEnumerator, jsonTypes}:
+{cabal, blazeBuilder, blazeHtml, failure, parsec, text}:
 
 cabal.mkDerivation (self : {
   pname = "hamlet";
-  version = "0.7.3";
-  sha256 = "1knapi8506kqm6pbl1qdr3vm579z2dn6q3h3ahzwbxqjafy7pnj9";
+  version = "0.8.2.1";
+  sha256 = "0798ic6qap4npw2rx42xcgmi1fcbwqvyic5x6vyyf6abvxv16925";
   propagatedBuildInputs =
-    [blazeBuilder blazeHtml failure parsec text jsonEnumerator jsonTypes];
+    [blazeBuilder blazeHtml failure parsec text];
   meta = {
     description = "Haml-like template files that are compile-time checked";
     license = "BSD";
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index 905af17b0e65..c95d36f7d504 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -1,13 +1,13 @@
 {cabal, attoparsec, attoparsecEnumerator, MonadCatchIOTransformers, blazeBuilder
-, bytestringNums, dlist, mtl, unixCompat, vector, zlib}:
+, bytestringNums, caseInsensitive, dlist, mtl, unixCompat, vector, zlib}:
 
 cabal.mkDerivation (self : {
   pname = "snap-core";
-  version = "0.4.1";
-  sha256 = "0cc6qh8rnfdhv6s4clnb4avbxkvvj4dibbdg0vjbf75iafxvsg9f";
+  version = "0.5.1.4";
+  sha256 = "0fvff7hjyfwnii057vpg8m75qaipsklk6v6cbvms4p6wp14zqaj1";
   propagatedBuildInputs =
     [ attoparsec attoparsecEnumerator MonadCatchIOTransformers blazeBuilder
-     bytestringNums dlist mtl unixCompat vector zlib
+     bytestringNums caseInsensitive dlist mtl unixCompat vector zlib
     ];
   meta = {
     description = "Snap: A Haskell Web Framework (Core)";
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index b29bc6363bac..14417dd0e80e 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self : {
   pname = "snap-server";
-  version = "0.4.1";
-  sha256 = "1xav58sk6f1capibkil9a834lxg7badcq3v8016azzzmvvhy9iq8";
+  version = "0.5.1.4";
+  sha256 = "17b95db48as418whcvbxzyvql16z1c706n0s4jryyqr6kvgpsvzp";
   propagatedBuildInputs =
     [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator
      bytestringNums directoryTree enumerator MonadCatchIOTransformers mtl murmurHash
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e244ca8fc95e..b987afcdb94f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -363,6 +363,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     inherit (pkgs) cairo zlib;
   };
 
+  caseInsensitive = callPackage ../development/libraries/haskell/case-insensitive {};
+
   cautiousFile = callPackage ../development/libraries/haskell/cautious-file {};
 
   cereal = callPackage ../development/libraries/haskell/cereal {};

From ea4daca60d1196231780ba3dda471519e9f08615 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 21:04:56 +0000
Subject: [PATCH 004/113] pkgs/applications/editors/emacs-modes/bbdb: replace
 custom build script with standard builder

Also added most of optional contributions shipped in the release tarball to the
installation.

svn path=/nixpkgs/trunk/; revision=27646
---
 .../editors/emacs-modes/bbdb/builder.sh           | 12 ------------
 .../editors/emacs-modes/bbdb/default.nix          | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/bbdb/builder.sh

diff --git a/pkgs/applications/editors/emacs-modes/bbdb/builder.sh b/pkgs/applications/editors/emacs-modes/bbdb/builder.sh
deleted file mode 100644
index b860adbb745f..000000000000
--- a/pkgs/applications/editors/emacs-modes/bbdb/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-source "$stdenv/setup" || exit 1
-
-unpackPhase &&							\
-cd bbdb-*.* && patchPhase &&					\
-./configure --prefix="$out"					\
-            --with-package-dir="$out/share/emacs/site-lisp" &&	\
-make && make install-pkg &&					\
-mkdir -p "$out/info" &&						\
-make -C texinfo install-pkg &&					\
-mv "$out/share/emacs/site-lisp/lisp/bbdb/"*			\
-   "$out/share/emacs/site-lisp" &&				\
-rm -rf "$out/share/emacs/site-lisp/lisp"
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
index 51474a197174..52afebc6297b 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
@@ -11,7 +11,20 @@ stdenv.mkDerivation {
   patches = [ ./install-infodir.patch ];
 
   buildInputs = [emacs texinfo ctags];
-  builder = ./builder.sh;
+  configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp";
+  preInstall = "ensureDir $out/info";
+  installTargets = "install-pkg texinfo";
+  postInstall = ''
+    mv  $out/info $out/share/
+    mv "$out/share/emacs/site-lisp/lisp/bbdb/"* $out/share/emacs/site-lisp/
+    mv $out/share/emacs/site-lisp/etc/bbdb $out/share/
+    rm -rf $out/share/emacs/site-lisp/{lisp,etc}
+    mv bits $out/share/bbdb/
+    # Make optional modules from bbdb available for import, but symlink
+    # them into the site-lisp directory to make it obvious that they are
+    # not a genuine part of the distribution.
+    ln -s "$out/share/bbdb/bits/"*.el $out/share/emacs/site-lisp/
+  '';
 
   meta = {
     description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs";

From c76ef494667f3c0cc64f55066345d4fd4ce98cdd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 21:05:02 +0000
Subject: [PATCH 005/113] gprolog: add myself as maintainer

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

diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix
index af6bfc56c096..f7a64da73096 100644
--- a/pkgs/development/compilers/gprolog/default.nix
+++ b/pkgs/development/compilers/gprolog/default.nix
@@ -53,5 +53,8 @@ stdenv.mkDerivation rec {
     '';
 
     license = "GPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.gnu;
   };
 }

From 4f9d5c825ac7741d436a62857537a37fc0673e32 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 21:32:55 +0000
Subject: [PATCH 006/113] all-packages.nix: strip trailing whitespace

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 083066dcf83f..bcb1a25de39f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -873,7 +873,7 @@ let
   most = callPackage ../tools/misc/most { };
 
   ninka = callPackage ../development/tools/misc/ninka { };
-  
+
   nodejs = callPackage ../development/web/nodejs {};
 
   lftp = callPackage ../tools/networking/lftp { };
@@ -1025,7 +1025,7 @@ let
   nylon = callPackage ../tools/networking/nylon { };
 
   nzbget = callPackage ../tools/networking/nzbget { };
-  
+
   obex_data_server = callPackage ../tools/bluetooth/obex-data-server { };
 
   obexd = callPackage ../tools/bluetooth/obexd { };
@@ -4363,7 +4363,7 @@ let
         gstPluginsGood;
       inherit (xlibs) libXt renderproto libXrender;
     };
-  
+
   webkitSVN =
     builderDefsPackage ../development/libraries/webkit/svn.nix {
       inherit (gnome28) gtkdoc libsoup;
@@ -4377,7 +4377,7 @@ let
         gstPluginsGood;
       inherit (xlibs) libXt renderproto libXrender;
     };
-    
+
   wvstreams = callPackage ../development/libraries/wvstreams { };
 
   wxGTK = wxGTK28;
@@ -5544,7 +5544,7 @@ let
     config = getConfig ["pcmciaUtils" "config"] null;
   };
 
-  phat = callPackage ../development/libraries/phat { 
+  phat = callPackage ../development/libraries/phat {
     inherit (gnome) gtk libgnomecanvas;
   };
 
@@ -5890,7 +5890,7 @@ let
 
   audacious = callPackage ../applications/audio/audacious { };
 
-  audacity = callPackage ../applications/audio/audacity { 
+  audacity = callPackage ../applications/audio/audacity {
     portaudio = portaudioSVN;
   };
 
@@ -6837,11 +6837,11 @@ let
 
   qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };
 
-  qtractor = callPackage ../applications/audio/qtractor { 
+  qtractor = callPackage ../applications/audio/qtractor {
     inherit (gtkLibs) gtk;
   };
 
-  rakarrack = callPackage ../applications/audio/rakarrack { 
+  rakarrack = callPackage ../applications/audio/rakarrack {
     inherit (xorg) libXpm libXft;
     fltk = fltk11;
   };
@@ -7608,7 +7608,7 @@ let
   kde45 = callPackage ../desktops/kde-4.5 {
     callPackage = newScope pkgs.kde45;
   };
-    
+
   kde46 = callPackage ../desktops/kde-4.6 {
     callPackage = newScope pkgs.kde46;
   };

From f8b1ace1d75478b4a130364402503a2d68af3828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 7 Jul 2011 21:40:33 +0000
Subject: [PATCH 007/113] Added warp plus dependencies.

svn path=/nixpkgs/trunk/; revision=27649
---
 .../libraries/haskell/http-types/default.nix   | 14 ++++++++++++++
 .../haskell/simple-sendfile/default.nix        | 14 ++++++++++++++
 .../libraries/haskell/unix-compat/default.nix  |  4 ++--
 .../libraries/haskell/wai/default.nix          | 14 ++++++++++++++
 .../libraries/haskell/warp/default.nix         | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  8 ++++++++
 6 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/http-types/default.nix
 create mode 100644 pkgs/development/libraries/haskell/simple-sendfile/default.nix
 create mode 100644 pkgs/development/libraries/haskell/wai/default.nix
 create mode 100644 pkgs/development/libraries/haskell/warp/default.nix

diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
new file mode 100644
index 000000000000..d8ee2cab1d48
--- /dev/null
+++ b/pkgs/development/libraries/haskell/http-types/default.nix
@@ -0,0 +1,14 @@
+{cabal, blazeBuilder, caseInsensitive, text}:
+
+cabal.mkDerivation (self : {
+  pname = "http-types";
+  version = "0.6.5";
+  sha256 = "1z2y219170n6rrmmffkg8xa450xzl42zpwahv7m71bxlz4cvxjc1";
+  propagatedBuildInputs = [blazeBuilder caseInsensitive text];
+  meta = {
+    description = "Generic HTTP types for Haskell (for both client and server code)";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
new file mode 100644
index 000000000000..c3a455a54754
--- /dev/null
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -0,0 +1,14 @@
+{cabal, network}:
+
+cabal.mkDerivation (self : {
+  pname = "simple-sendfile";
+  version = "0.1.2";
+  sha256 = "08w5ria2x41j85z1126kddi918zdqrwmr4vwqczgzh9kdi49wv8j";
+  propagatedBuildInputs = [network];
+  meta = {
+    description = "Cross platform library for the sendfile system call";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix
index c0d3940d318c..aee31438d10a 100644
--- a/pkgs/development/libraries/haskell/unix-compat/default.nix
+++ b/pkgs/development/libraries/haskell/unix-compat/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "unix-compat";
-  version = "0.2.1.1";
-  sha256 = "11bh29rq3g4qqvxc72wbip85vc3m91lafa85086izpqkkpnl4pxh";
+  version = "0.2.1.3";
+  sha256 = "12645n23b7b86w3fllg3vl39pvbxazqx9rflgnhc6qrlfklkyxxd";
   meta = {
     description = "Portable POSIX-compatibility layer";
     license = "BSD";
diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
new file mode 100644
index 000000000000..48eb38e3baef
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -0,0 +1,14 @@
+{cabal, blazeBuilder, enumerator, network, httpTypes, text, transformers}:
+
+cabal.mkDerivation (self : {
+  pname = "wai";
+  version = "0.4.0";
+  sha256 = "1xp03g3q967rpgas896a5j3y7hjiir4ny0qlwmaj5ki61zivjsln";
+  propagatedBuildInputs = [blazeBuilder enumerator network httpTypes text transformers];
+  meta = {
+    description = "Web Application Interface";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
new file mode 100644
index 000000000000..38e94d0277fa
--- /dev/null
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -0,0 +1,18 @@
+{cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive, enumerator,
+ httpTypes, network, simpleSendfile, transformers, unixCompat, wai}:
+
+cabal.mkDerivation (self : {
+  pname = "warp";
+  version = "0.4.1.1";
+  sha256 = "0qck4mpg4p6v2yx2r6qchqd3lvsn8n5ys6xsm11hhznc2r50aayh";
+  propagatedBuildInputs = [
+    blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
+    httpTypes network simpleSendfile transformers unixCompat wai
+  ];
+  meta = {
+    description = "A fast, light-weight web server for WAI applications";
+    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 b987afcdb94f..fac80af01c75 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -618,6 +618,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   httpdShed = callPackage ../development/libraries/haskell/httpd-shed {};
 
+  httpTypes = callPackage ../development/libraries/haskell/http-types {};
+
   HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {};
   HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {};
   HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {};
@@ -840,6 +842,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   sendfile = callPackage ../development/libraries/haskell/sendfile {};
 
+  simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {};
+
   smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
 
   snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
@@ -967,6 +971,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     mtl = self.mtl2;
   };
 
+  wai = callPackage ../development/libraries/haskell/wai {};
+
+  warp = callPackage ../development/libraries/haskell/warp {};
+
   WebBits = callPackage ../development/libraries/haskell/WebBits {
     parsec = self.parsec2;
   };

From 1b603fe1574a18b466e9c2f43052883225638c2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 7 Jul 2011 21:40:35 +0000
Subject: [PATCH 008/113] Added yesod-core.

svn path=/nixpkgs/trunk/; revision=27650
---
 .../haskell/base-unicode-symbols/default.nix  | 13 ++++++++++++
 .../libraries/haskell/cereal/default.nix      |  4 ++--
 .../haskell/clientsession/default.nix         | 13 ++++++++++++
 .../libraries/haskell/cookie/default.nix      | 14 +++++++++++++
 .../haskell/monad-control/default.nix         | 14 +++++++++++++
 .../libraries/haskell/wai-extra/default.nix   | 18 +++++++++++++++++
 .../haskell/web-routes-quasi/default.nix      | 10 +++++-----
 .../libraries/haskell/yesod-core/default.nix  | 20 +++++++++++++++++++
 .../haskell/zlib-bindings/default.nix         | 14 +++++++++++++
 pkgs/top-level/haskell-packages.nix           | 14 +++++++++++++
 10 files changed, 127 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
 create mode 100644 pkgs/development/libraries/haskell/clientsession/default.nix
 create mode 100644 pkgs/development/libraries/haskell/cookie/default.nix
 create mode 100644 pkgs/development/libraries/haskell/monad-control/default.nix
 create mode 100644 pkgs/development/libraries/haskell/wai-extra/default.nix
 create mode 100644 pkgs/development/libraries/haskell/yesod-core/default.nix
 create mode 100644 pkgs/development/libraries/haskell/zlib-bindings/default.nix

diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
new file mode 100644
index 000000000000..1c51f82bed68
--- /dev/null
+++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "base-unicode-symbols";
+  version = "0.2.1.5";
+  sha256 = "1ir1dckrpax4xlrfp7jdsjn7s403a8n8mcmv3wdnpzkg1klfahyq";
+  meta = {
+    description = "Unicode alternatives for common functions and operators";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix
index 2cbd4a5fe454..82fc2d81c3ec 100644
--- a/pkgs/development/libraries/haskell/cereal/default.nix
+++ b/pkgs/development/libraries/haskell/cereal/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "cereal";
-  version = "0.2";
-  sha256 = "aa00eb88cea5616a0eb9e4b6604cb164b8bef6e86b111cbb67d51d4d3441332b";
+  version = "0.3.3.0";
+  sha256 = "0bqd5qfvbz77mq0zxgafj011hrxcanrfzvlwhf4j4dzr6yryk53y";
   meta = {
     description = "A binary serialization library";
     license = "BSD";
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
new file mode 100644
index 000000000000..9d91ac477e7a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "clientsession";
+  version = "0.6.0";
+  sha256 = "0h92jjkhldn7f9b78cajfda8rprsj5scdsyl3pjpzicpvvy9g00y";
+  meta = {
+    description = "Store session data in a cookie";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix
new file mode 100644
index 000000000000..750c4de28abb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cookie/default.nix
@@ -0,0 +1,14 @@
+{cabal, blazeBuilder, text}:
+
+cabal.mkDerivation (self : {
+  pname = "cookie";
+  version = "0.2.1";
+  sha256 = "0jn4as09qx2948k0r916vy5igz0xmrvng37s0il81b0ndvhnsc6c";
+  propagatedBuildInputs = [blazeBuilder text];
+  meta = {
+    description = "HTTP cookie parsing and rendering";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
new file mode 100644
index 000000000000..30a46369df63
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
@@ -0,0 +1,14 @@
+{cabal, baseUnicodeSymbols, transformers}:
+
+cabal.mkDerivation (self : {
+  pname = "monad-control";
+  version = "0.2.0.1";
+  sha256 = "1pnckk9080g64ipvsg3n1vn4jr1083giacgy58if2ppw3dk7m97k";
+  propagatedBuildInputs = [baseUnicodeSymbols transformers];
+  meta = {
+    description = "Lift control operations, like exception catching, through monad transformers";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
new file mode 100644
index 000000000000..9b2ea52ed43a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -0,0 +1,18 @@
+{cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive, enumerator,
+ httpTypes, network, text, transformers, wai, zlibBindings}:
+
+cabal.mkDerivation (self : {
+  pname = "wai-extra";
+  version = "0.4.0.1";
+  sha256 = "0xj7dkwqa9axgm6cizf2kd97fakbmq5580mian888i5f21jn1n2z";
+  propagatedBuildInputs = [
+    blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
+    httpTypes network text transformers wai zlibBindings
+  ];
+  meta = {
+    description = "Provides some basic WAI handlers and middleware";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
index 8d0303d65bb4..434a19cfcfea 100644
--- a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
@@ -1,13 +1,13 @@
-{cabal, webRoutes}:
+{cabal, text}:
 
 cabal.mkDerivation (self : {
   pname = "web-routes-quasi";
-  version = "0.5.0";
-  sha256 = "07ef2717b44f92bccee9af4b4d9a173c12ec3b3b1d49a8495811dad0af240673";
-  propagatedBuildInputs = [webRoutes];
+  version = "0.7.0.1";
+  sha256 = "1khrf5kbw285hddyyzcz2mx4qpz46mdmlm31jszag2ay64gw35gw";
+  propagatedBuildInputs = [text];
   meta = {
     description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL";
-    license = "BSD";
+    license = "BSD3";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
new file mode 100644
index 000000000000..4c9634bf759b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -0,0 +1,20 @@
+{cabal, blazeBuilder, blazeHtml, caseInsensitive, cereal, clientsession,
+ cookie, enumerator, failure, hamlet, httpTypes, monadControl, parsec,
+ text, transformers, wai, waiExtra, webRoutesQuasi}:
+
+cabal.mkDerivation (self : {
+  pname = "yesod-core";
+  version = "0.8.2";
+  sha256 = "15h5nm45w3z1g4ayn0dj9grviqm857krad1453rway76yrrv7xsr";
+  propagatedBuildInputs = [
+    blazeBuilder blazeHtml caseInsensitive cereal clientsession
+    cookie enumerator failure hamlet httpTypes monadControl parsec
+    text transformers wai waiExtra webRoutesQuasi
+  ];
+  meta = {
+    description = "Creation of type-safe, RESTful web applications";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
new file mode 100644
index 000000000000..efe5e4134a81
--- /dev/null
+++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
@@ -0,0 +1,14 @@
+{cabal, zlib}:
+
+cabal.mkDerivation (self : {
+  pname = "zlib-bindings";
+  version = "0.0.0";
+  sha256 = "168sll6mrmcnvdmdx79izqxcrli1s7asp4qilhkqss8w0jlrv1ni";
+  propagatedBuildInputs = [zlib];
+  meta = {
+    description = "Low-level bindings to the zlib package";
+    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 fac80af01c75..a95e6d34df2b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -335,6 +335,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec/enumerator.nix {};
 
+  baseUnicodeSymbols = callPackage ../development/libraries/haskell/base-unicode-symbols {};
+
   benchpress = callPackage ../development/libraries/haskell/benchpress {};
 
   bimap = callPackage ../development/libraries/haskell/bimap {};
@@ -379,6 +381,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {};
 
+  clientsession = callPackage ../development/libraries/haskell/clientsession {};
+
   cmdargs = callPackage ../development/libraries/haskell/cmdargs {};
 
   colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {};
@@ -391,6 +395,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     time = self.time_1_1_3;
   };
 
+  cookie = callPackage ../development/libraries/haskell/cookie {};
+
   criterion = callPackage ../development/libraries/haskell/criterion {
     parsec = self.parsec3;
   };
@@ -669,6 +675,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {};
 
+  monadControl = callPackage ../development/libraries/haskell/monad-control {};
+
   monadlab = callPackage ../development/libraries/haskell/monadlab {};
 
   monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
@@ -973,6 +981,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   wai = callPackage ../development/libraries/haskell/wai {};
 
+  waiExtra = callPackage ../development/libraries/haskell/wai-extra {};
+
   warp = callPackage ../development/libraries/haskell/warp {};
 
   WebBits = callPackage ../development/libraries/haskell/WebBits {
@@ -1032,6 +1042,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};
 
+  yesodCore = callPackage ../development/libraries/haskell/yesod-core {};
+
   yst = callPackage ../development/libraries/haskell/yst {};
 
   zipArchive = callPackage ../development/libraries/haskell/zip-archive {};
@@ -1052,6 +1064,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   zlib = self.zlib_0_5_0_0;
 
+  zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
+
   # Compilers.
 
   AgdaExecutable = callPackage ../development/compilers/Agda-executable {};

From bec4023fbe35575e37783310361408e9224bd884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 7 Jul 2011 21:40:38 +0000
Subject: [PATCH 009/113] Version bump for attoparsec.

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

diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix
index 8d3e53cd2ea9..536b27833a29 100644
--- a/pkgs/development/libraries/haskell/attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/default.nix
@@ -1,9 +1,10 @@
-{cabal}:
+{cabal, deepseq}:
 
 cabal.mkDerivation (self : {
   pname = "attoparsec";
-  version = "0.8.5.0";
-  sha256 = "0rdhjqgbbasc1diqzjdb6a8s46kcpdw5yxq2vkg3y2z71zln0a31";
+  version = "0.9.1.1";
+  sha256 = "1qkkl9pzk4znqh34pchmxbcslybvii35lkxhwf6445lyhj20356b";
+  propagatedBuildInputs = [deepseq];
   meta = {
     description = "Fast combinator parsing for bytestrings";
     license = "BSD3";
diff --git a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
index 95a06a09da53..4152cd4ed2c4 100644
--- a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "attoparsec-enumerator";
-  version = "0.2.0.3";
-  sha256 = "02v9cwq1jbn0179zd2cky4ix6ykrkd7cpw38c1x7zgy0pal42x4v";
+  version = "0.2.0.4";
+  sha256 = "14v53vppcf4k3m4kid10pg5r3zsn894f36w1y2pzlc72w81fv3gd";
   propagatedBuildInputs = [attoparsec enumerator];
   meta = {
     description = "Converts an Attoparsec parser into an iteratee";

From 65d9fa940b8a05b4e60fa180a4f7ba092ae8461e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 7 Jul 2011 21:40:40 +0000
Subject: [PATCH 010/113] Adding yesod-persistent.

svn path=/nixpkgs/trunk/; revision=27652
---
 .../libraries/haskell/dataenc/default.nix        |  5 +++--
 .../haskell/persistent-template/default.nix      | 14 ++++++++++++++
 .../libraries/haskell/persistent/default.nix     | 12 +++++-------
 .../libraries/haskell/pool/default.nix           | 14 ++++++++++++++
 .../haskell/yesod-persistent/default.nix         | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  6 ++++++
 6 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/persistent-template/default.nix
 create mode 100644 pkgs/development/libraries/haskell/pool/default.nix
 create mode 100644 pkgs/development/libraries/haskell/yesod-persistent/default.nix

diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
index ba4b1edcc95f..2290a1f50923 100644
--- a/pkgs/development/libraries/haskell/dataenc/default.nix
+++ b/pkgs/development/libraries/haskell/dataenc/default.nix
@@ -2,10 +2,11 @@
 
 cabal.mkDerivation (self : {
   pname = "dataenc";
-  version = "0.11.1";
-  sha256 = "1212dbed8a1b8f80140d6450a7635a4365bc5733a00e2b96d00bcc526396c6bc";
+  version = "0.14";
+  sha256 = "0q92pzm6wp4rl92ac9b2x2b6na8nzhf229myc9h3cyr3p822liw6";
   meta = {
     description = "Data encoding library";
+    license = "BSD3";
   };
 })
 
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
new file mode 100644
index 000000000000..9b41f8e0396d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -0,0 +1,14 @@
+{cabal, monadControl, persistent, text, webRoutesQuasi}:
+
+cabal.mkDerivation (self : {
+  pname = "persistent-template";
+  version = "0.5.1";
+  sha256 = "163j36pm6fl64m4h8kgj9h19snh026ia1166p3c6rjw86qi9fk0r";
+  propagatedBuildInputs = [monadControl persistent text webRoutesQuasi];
+  meta = {
+    description = "Type-safe, non-relational, multi-backend persistence";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index f8b733664d5e..cc093dddfa35 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -1,17 +1,15 @@
-{cabal, blazeHtml, MonadCatchIOTransformers, parsec, text, transformers,
- utf8String, webRoutesQuasi}:
+{cabal, blazeHtml, enumerator, monadControl, parsec, pool, text, transformers}:
 
 cabal.mkDerivation (self : {
   pname = "persistent";
-  version = "0.1.0";
-  sha256 = "32379f5ef937da1bf910cfaf9b6cce6326b8fba7554ef81159e6684c7ce2ca45";
+  version = "0.5.1";
+  sha256 = "1m0558vi99z15q0w62a9rkz25n8djswggbad9m0il359jb3mrzsd";
   propagatedBuildInputs = [
-    blazeHtml MonadCatchIOTransformers parsec text transformers
-    utf8String webRoutesQuasi
+    blazeHtml enumerator monadControl parsec pool text transformers
   ];
   meta = {
     description = "Type-safe, non-relational, multi-backend persistence";
-    license = "BSD";
+    license = "BSD3";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pool/default.nix b/pkgs/development/libraries/haskell/pool/default.nix
new file mode 100644
index 000000000000..87dcecb35889
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pool/default.nix
@@ -0,0 +1,14 @@
+{cabal, monadControl, stm, transformers}:
+
+cabal.mkDerivation (self : {
+  pname = "pool";
+  version = "0.1.0.2";
+  sha256 = "1w2z3p3iriw43g655rhd5b70r3cbzl4jf8bybyk5d04x6mcg3wfq";
+  propagatedBuildInputs = [monadControl stm transformers];
+  meta = {
+    description = "Thread-safe resource pools";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
new file mode 100644
index 000000000000..ded78d7b3826
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -0,0 +1,16 @@
+{cabal, failure, persistent, persistentTemplate, transformers, yesodCore}:
+
+cabal.mkDerivation (self : {
+  pname = "yesod-persistent";
+  version = "0.1.0";
+  sha256 = "1h0kk3sx0c4c3pcg3s2c5kfy0kz7gci45h4gsgrkhkcgg0pg324c";
+  propagatedBuildInputs = [
+    failure persistent persistentTemplate transformers yesodCore
+  ];
+  meta = {
+    description = "Some helpers for using Persistent from Yesod";
+    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 a95e6d34df2b..856a68d50b56 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -769,8 +769,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   persistent = callPackage ../development/libraries/haskell/persistent {};
 
+  persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {};
+
   polyparse = callPackage ../development/libraries/haskell/polyparse {};
 
+  pool = callPackage ../development/libraries/haskell/pool {};
+
   ppm = callPackage ../development/libraries/haskell/ppm {};
 
   prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
@@ -1044,6 +1048,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yesodCore = callPackage ../development/libraries/haskell/yesod-core {};
 
+  yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {};
+
   yst = callPackage ../development/libraries/haskell/yst {};
 
   zipArchive = callPackage ../development/libraries/haskell/zip-archive {};

From 29c7cd1298c6384418b4e9d531a83a875098e348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 7 Jul 2011 21:40:43 +0000
Subject: [PATCH 011/113] Added aeson, unordered-containers.

svn path=/nixpkgs/trunk/; revision=27653
---
 .../libraries/haskell/aeson/default.nix        | 18 ++++++++++++++++++
 .../haskell/blaze-textual/default.nix          | 14 ++++++++++++++
 .../libraries/haskell/hashable/default.nix     | 14 ++++++++++++++
 .../haskell/unordered-containers/default.nix   | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  8 ++++++++
 5 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/aeson/default.nix
 create mode 100644 pkgs/development/libraries/haskell/blaze-textual/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hashable/default.nix
 create mode 100644 pkgs/development/libraries/haskell/unordered-containers/default.nix

diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
new file mode 100644
index 000000000000..511a06700b1b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -0,0 +1,18 @@
+{cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, hashable, mtl,
+ syb, text, unorderedContainers, vector}:
+
+cabal.mkDerivation (self : {
+  pname = "aeson";
+  version = "0.3.2.9";
+  sha256 = "1qaajk797zpickw4ik5lc03wnmxkrcmv3zik7n1bjqx6h37h0zqw";
+  propagatedBuildInputs = [
+    attoparsec blazeBuilder blazeTextual deepseq hashable mtl
+    syb text unorderedContainers vector
+  ];
+  meta = {
+    description = "Fast JSON parsing and encoding";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix
new file mode 100644
index 000000000000..3217ef0a1084
--- /dev/null
+++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix
@@ -0,0 +1,14 @@
+{cabal, blazeBuilder, text, vector}:
+
+cabal.mkDerivation (self : {
+  pname = "blaze-textual";
+  version = "0.1.0.0";
+  sha256 = "0ql25b0r4xbshqsjfndl7glq0hp2ncxb3h5zd541vsqrqrf8y4gk";
+  propagatedBuildInputs = [blazeBuilder text vector];
+  meta = {
+    description = "Fast rendering of common datatypes";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix
new file mode 100644
index 000000000000..5da274d41f6f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hashable/default.nix
@@ -0,0 +1,14 @@
+{cabal, text}:
+
+cabal.mkDerivation (self : {
+  pname = "hashable";
+  version = "1.1.2.1";
+  sha256 = "1kmx3jr9cmkbapd7gywx7zvyd22nyz2mgs8lnzspp5hi7crx3wcx";
+  propagatedBuildInputs = [text];
+  meta = {
+    description = "A class for types that can be converted to a hash value";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix
new file mode 100644
index 000000000000..62cc44ac89f3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix
@@ -0,0 +1,14 @@
+{cabal, deepseq, hashable}:
+
+cabal.mkDerivation (self : {
+  pname = "unordered-containers";
+  version = "0.1.4.0";
+  sha256 = "1v5m92rn2k7knhca91ldzi082hy4z0hp4nm66ihns4vxgslywgb9";
+  propagatedBuildInputs = [deepseq hashable];
+  meta = {
+    description = "Efficient hashing-based container types";
+    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 856a68d50b56..f64719fd66d6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -325,6 +325,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
 
+  aeson = callPackage ../development/libraries/haskell/aeson {};
+
   ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {};
 
   ansiWLPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {};
@@ -355,6 +357,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
 
+  blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {};
+
   bmp = callPackage ../development/libraries/haskell/bmp {};
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
@@ -545,6 +549,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix {};
 
+  hashable = callPackage ../development/libraries/haskell/hashable {};
+
   hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {};
 
   haskeline = callPackage ../development/libraries/haskell/haskeline {};
@@ -955,6 +961,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
 
+  unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {};
+
   url = callPackage ../development/libraries/haskell/url {};
 
   utf8String = callPackage ../development/libraries/haskell/utf8-string {};

From 6f43e422ba6dd752256148bac8a62abaa0555a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 7 Jul 2011 21:40:46 +0000
Subject: [PATCH 012/113] Added yesod-form and yesod-json.

svn path=/nixpkgs/trunk/; revision=27654
---
 .../haskell/email-validate/default.nix        | 14 +++++++++++++
 .../libraries/haskell/ranges/default.nix      | 13 ++++++++++++
 .../libraries/haskell/yesod-form/default.nix  | 21 +++++++++++++++++++
 .../libraries/haskell/yesod-json/default.nix  | 16 ++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  8 +++++++
 5 files changed, 72 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/email-validate/default.nix
 create mode 100644 pkgs/development/libraries/haskell/ranges/default.nix
 create mode 100644 pkgs/development/libraries/haskell/yesod-form/default.nix
 create mode 100644 pkgs/development/libraries/haskell/yesod-json/default.nix

diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix
new file mode 100644
index 000000000000..3c053565e2aa
--- /dev/null
+++ b/pkgs/development/libraries/haskell/email-validate/default.nix
@@ -0,0 +1,14 @@
+{cabal, parsec, ranges}:
+
+cabal.mkDerivation (self : {
+  pname = "email-validate";
+  version = "0.2.6";
+  sha256 = "1nw4r5wyck30r6n0bjxwybpkw2dqr2mp4y8fy6ypra9zhhw1jd8m";
+  propagatedBuildInputs = [parsec ranges];
+  meta = {
+    description = "Validating an email address string against RFC 5322";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix
new file mode 100644
index 000000000000..194d6227c507
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ranges/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "ranges";
+  version = "0.2.3";
+  sha256 = "1jmybrwwvg8zkbxjrlrahfavlf2g2584ld15hzhch317683nvr1p";
+  meta = {
+    description = "Ranges and various functions on them";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
new file mode 100644
index 000000000000..b190e8d848e1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -0,0 +1,21 @@
+{cabal, blazeBuilder, blazeHtml, dataDefault, emailValidate, hamlet,
+ network, persistent, text, transformers, wai, webRoutesQuasi,
+ xssSanitize, yesodCore, yesodPersistent}:
+
+cabal.mkDerivation (self : {
+  pname = "yesod-form";
+  version = "0.2.0";
+  sha256 = "1dwwndrb09bqfzrarxpiw29xqvxk70iy8b2vcy0rl6g2wvrcm8an";
+  propagatedBuildInputs = [
+    blazeBuilder blazeHtml dataDefault emailValidate hamlet
+    network persistent text transformers wai webRoutesQuasi
+    xssSanitize yesodCore yesodPersistent
+  ];
+  noHaddock = true;
+  meta = {
+    description = "Form handling support for Yesod Web Framework";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
new file mode 100644
index 000000000000..7607dbfa15fb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@@ -0,0 +1,16 @@
+{cabal, aeson, blazeTextual, hamlet, text, vector, yesodCore}:
+
+cabal.mkDerivation (self : {
+  pname = "yesod-json";
+  version = "0.1.1.1";
+  sha256 = "02mly02c6z49s0gznx47w919gcn7qz1qvr8704sab1sjk87cyjwl";
+  propagatedBuildInputs = [
+    aeson blazeTextual hamlet text vector yesodCore
+  ];
+  meta = {
+    description = "Generate content for Yesod using the aeson package";
+    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 f64719fd66d6..17e91685c56f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -450,6 +450,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     inherit (pkgs) libedit;
   };
 
+  emailValidate = callPackage ../development/libraries/haskell/email-validate {};
+
   enumerator = callPackage ../development/libraries/haskell/enumerator {};
 
   erf = callPackage ../development/libraries/haskell/erf {};
@@ -812,6 +814,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   randomShuffle = callPackage ../development/libraries/haskell/random-shuffle {};
 
+  ranges = callPackage ../development/libraries/haskell/ranges {};
+
   readline = callPackage ../development/libraries/haskell/readline {
     inherit (pkgs) readline ncurses;
   };
@@ -1056,6 +1060,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yesodCore = callPackage ../development/libraries/haskell/yesod-core {};
 
+  yesodForm = callPackage ../development/libraries/haskell/yesod-form {};
+
+  yesodJson = callPackage ../development/libraries/haskell/yesod-json {};
+
   yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {};
 
   yst = callPackage ../development/libraries/haskell/yst {};

From 947610085d8deefe4a7a745f8e32ad0576f76099 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 21:53:21 +0000
Subject: [PATCH 013/113] Added Eukleides, a geometry drawing language.

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

diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix
new file mode 100644
index 000000000000..9f65bcb8c148
--- /dev/null
+++ b/pkgs/applications/science/math/eukleides/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, bison, flex, texinfo, readline, texLive }:
+
+let
+  name    = "eukleides";
+  version = "1.5.4";
+in
+stdenv.mkDerivation {
+  name = "${name}-${version}";
+
+  src = fetchurl {
+    url = "http://www.eukleides.org/files/${name}-${version}.tar.bz2";
+    sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q";
+  };
+
+  buildInputs = [bison flex texinfo readline texLive];
+
+  preConfigure = "sed -i 's/ginstall-info/install-info/g' doc/Makefile";
+  installPhase = "ensureDir $out/bin ; make PREFIX=$out install";
+
+  meta = {
+    description = "Geometry Drawing Language";
+    homepage = "http://www.eukleides.org/";
+    license = "GPLv2";
+
+    longDescription = ''
+      Eukleides is a computer language devoted to elementary plane
+      geometry. It aims to be a fairly comprehensive system to create
+      geometric figures, either static or dynamic. Eukleides allows to
+      handle basic types of data: numbers and strings, as well as
+      geometric types of data: points, vectors, sets (of points), lines,
+      circles and conics.
+    '';
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bcb1a25de39f..cb173d3bc4ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7777,6 +7777,8 @@ let
 
   ecm = callPackage ../applications/science/math/ecm { };
 
+  eukleides = callPackage ../applications/science/math/eukleides { };
+
   maxima = callPackage ../applications/science/math/maxima { };
 
   wxmaxima = callPackage ../applications/science/math/wxmaxima { };

From ebefce41aa4ffbd9facd5d3a06632a96676616ff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 22:19:52 +0000
Subject: [PATCH 014/113] banner: a tool to print print large banners to ASCII
 terminals

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

diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix
new file mode 100644
index 000000000000..73d08fda79f6
--- /dev/null
+++ b/pkgs/games/banner/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }:
+
+let
+  # Banner depends on two separate libraries. Adding those libraries to
+  # the top-level seems like overkill, though, because no other tools
+  # seems to use them. So we'll build them within this expression.
+  mkDerivation = name: hash: deriv: stdenv.mkDerivation (deriv // {
+    inherit name;
+
+    src = fetchurl {
+      url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
+      sha256 = hash;
+    };
+
+    configurePhase = "make dep";
+
+    buildPhase = "make OPTIM='-DNDEBUG -O3'";
+
+    installPhase = ''
+      make INSTBASEDIR=$out install
+      if [ -d $out/man ]; then
+        ensureDir $out/share
+	mv -v $out/man $out/share/
+      fi
+    '';
+  });
+
+  shhopt = mkDerivation "shhopt-1.1.7" "bae94335124efa6fcc2f0a55cabd68c9c90be935bcdb8054d7e5188e0d5da679" {};
+
+  shhmsg = mkDerivation "shhmsg-1.4.1" "f65d45d3a5e415b541a1975e13fe7c5b58e21df6e9306cc3f7901279a9f6d461" {};
+
+in
+
+mkDerivation "banner-1.3.2" "0dc0ac0667b2e884a7f5ad3e467af68cd0fd5917f8c9aa19188e6452aa1fc6d5" {
+  buildInputs = [shhopt shhmsg];
+
+  meta = {
+    homepage = "http://shh.thathost.com/pub-unix/";
+    description = "print large banners to ASCII terminals";
+    license = "GPLv2";
+
+    longDescription = ''
+      An implementation of the traditional Unix-program used to display
+      large characters.
+    '';
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb173d3bc4ac..ff4550def327 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -403,6 +403,8 @@ let
 
   azureus = callPackage ../tools/networking/p2p/azureus { };
 
+  banner = callPackage ../games/banner {};
+
   barcode = callPackage ../tools/graphics/barcode {};
 
   bc = callPackage ../tools/misc/bc { };

From 80713bcc75e265f7e5cd3c04cd4c05e829ca56ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 22:48:36 +0000
Subject: [PATCH 015/113] ledger: fixed build

 * Patchelf doesn't work for this program. Fortunately, we don't need patchelf,
   because libtool takes care of hard-coding the proper rpaths.

 * Updated home page address.

 * Build with more aggressive optimization flags.

 * Drop the obsolete const-fix patch.

svn path=/nixpkgs/trunk/; revision=27657
---
 pkgs/applications/office/ledger/default.nix | 52 +++++++++++----------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 99b768c58e1e..010e5c48c1f4 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -1,48 +1,52 @@
-# TODO: fix a problem with patchelf(?)
+# Patchelf fails to hard-code the library paths to ledger's
+# libamounts.so and libledger-2.6.3 shared objects:
+#
+# $ ldd ~/.nix-profile/bin/ledger
+#         linux-vdso.so.1 =>  (0x00007fff513ff000)
+#         libamounts.so.0 => not found
+#         libledger-2.6.3.so => not found
+#         libstdc++.so.6 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libstdc++.so.6 (0x00007f1f0feee000)
+#         libpcre.so.0 => /nix/store/kfhy189arpj3wrfzpgw8p9ac4g4hfgca-pcre-8.10/lib/libpcre.so.0 (0x00007f1f0fcd3000)
+#         libgmp.so.3 => /nix/store/ji6py9m9w2ray1bmpkmgig9llj1i2ggf-gmp-4.3.2/lib/libgmp.so.3 (0x00007f1f0fa7f000)
+#         libm.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libm.so.6 (0x00007f1f0f7fd000)
+#         libgcc_s.so.1 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libgcc_s.so.1 (0x00007f1f0f5e8000)
+#         libc.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6 (0x00007f1f0f27d000)
+#         /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2 (0x00007f1f101ef000)
+#
+# Fortunately, libtools builds the program with proper paths hard-coded
+# alread, so we don't need patchelf. Phew!
 
 {stdenv, fetchurl, emacs, gmp, pcre}:
 
 let
-
-  pname = "ledger";
-  version = "2.6.3";
-  name = "${pname}-${version}";
-
+  name = "ledger-2.6.3";
 in
-
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "https://github.com/downloads/jwiegley/ledger/ledger-${version}.tar.gz";
+    url = "https://github.com/downloads/jwiegley/ledger/${name}.tar.gz";
     sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k";
   };
 
   buildInputs = [ emacs gmp pcre ];
 
-  patches = [ ./const.patch ];
-
-  # Something goes wrong with pathelf...
-  # this is a small workaround: adds a small shell script for
-  # setting LD_LIBRARY_PATH
-  postInstall = ''
-    cd $out/bin
-    mv ledger ledger.bin
-    echo "#!/bin/sh" > ledger
-    echo "LD_LIBRARY_PATH=$out/lib $out/bin/ledger.bin "'"$@"' >> ledger
-    chmod +x ledger
-  '';
+  configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";
+  dontPatchELF = true;
 
   meta = {
-    description =
-     "A double-entry accounting system with a command-line reporting interface";
+    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.
     '';
-    homepage = http://wiki.github.com/jwiegley/ledger;
-    license = "BSD";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From f05fce5e6e08177615a7a9ce85fc82148722eb1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 22:48:40 +0000
Subject: [PATCH 016/113] ledger: enable XML support so that ledger can read
 GnuCash data files

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

diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 010e5c48c1f4..6070087008e1 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -16,7 +16,7 @@
 # Fortunately, libtools builds the program with proper paths hard-coded
 # alread, so we don't need patchelf. Phew!
 
-{stdenv, fetchurl, emacs, gmp, pcre}:
+{stdenv, fetchurl, emacs, gmp, pcre, expat}:
 
 let
   name = "ledger-2.6.3";
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
     sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k";
   };
 
-  buildInputs = [ emacs gmp pcre ];
+  buildInputs = [ emacs gmp pcre expat ];
 
   configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";
   dontPatchELF = true;

From d7f698c078cc5f69024d2b9e70497ebe92826b6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 22:48:44 +0000
Subject: [PATCH 017/113] ledger: enable the test suite

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

diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 6070087008e1..c1cd4b42a02a 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation {
 
   configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";
   dontPatchELF = true;
+  doCheck = true;
 
   meta = {
     homepage = "http://ledger-cli.org/";

From 20ba4e9296eedea1bebdcfd947e9ce91036b9f01 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 23:48:17 +0000
Subject: [PATCH 018/113] haskell-testpack: updated to version 2.1.0

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

diff --git a/pkgs/development/libraries/haskell/testpack/default.nix b/pkgs/development/libraries/haskell/testpack/default.nix
index 76287bb6d503..626155f6a3cf 100644
--- a/pkgs/development/libraries/haskell/testpack/default.nix
+++ b/pkgs/development/libraries/haskell/testpack/default.nix
@@ -1,10 +1,10 @@
-{cabal, HUnit, QuickCheck, mtl}:
+{cabal, HUnit, QuickCheck2, mtl}:
 
 cabal.mkDerivation (self : {
   pname = "testpack";
-  version = "1.0.2";
-  sha256 = "ff3d24a755aeeb765d5e93aa0189d0d67ac96b2d84e27a29609eb4738a6cdabc";
-  propagatedBuildInputs = [HUnit QuickCheck mtl];
+  version = "2.1.0";
+  sha256 = "8128f3a409855fca1d431391b2cbf6a9f4dec32dd6f26825960b936fe578c476";
+  propagatedBuildInputs = [HUnit QuickCheck2 mtl];
   meta = {
     description = "Test Utility Pack for HUnit and QuickCheck";
   };

From 0ec6325b87e5eec95067762f61670e1a4a084a58 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 23:48:22 +0000
Subject: [PATCH 019/113] git-annex: updated to version 3.20110705

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

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 6271ab408eff..69134f33cc31 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -46,8 +46,9 @@ rec {
   };
 
   gitAnnex = lib.makeOverridable (import ./git-annex) {
-    inherit stdenv fetchurl libuuid rsync findutils curl perl;
-    inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc;
+    inherit stdenv fetchurl libuuid rsync findutils curl perl git;
+    inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc
+      HTTP testpack;
   };
 
   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 8fa4cba9a240..4d5feb941715 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,17 +1,22 @@
-{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String, QuickCheck2, pcreLight, SHA, dataenc }:
+{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String
+, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git }:
 
 let
-  version = "0.20110427";
+  version = "3.20110705";
 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 = "1vbmkvf9hlnfcaqsyi1ay2rr835j49bxqyfdi3v3373pdfd6195z";
+    sha256 = "781b0c02f992e46f3c2555db803caed2a9bbd274a62fcebab3f596bfd7888c9a";
   };
 
-  buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight SHA dataenc];
+  buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight
+    SHA dataenc HTTP testpack git];
+
+  checkTarget = "test";
+  doCheck = true;
 
   preConfigure = ''
     makeFlagsArray=( PREFIX=$out )

From 39f2346b1b990110d98ff58f9375962f8a2a9f2b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 23:48:26 +0000
Subject: [PATCH 020/113] git-annex: cosmetic changes in the meta section

svn path=/nixpkgs/trunk/; revision=27662
---
 .../version-management/git-and-tools/git-annex/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 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 4d5feb941715..3003902c2282 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
@@ -24,7 +24,9 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Manage files with git, without checking the file contents into git";
+    homepage = "http://git-annex.branchable.com/";
+    description = "Manage files with git without checking them into git";
+    license = "GPLv3+";
 
     longDescription = ''
       Git-annex allows managing files with git, without checking the
@@ -43,8 +45,6 @@ stdenv.mkDerivation {
       control.
     '';
 
-    license = "GPLv3+";
-    homepage = "http://git-annex.branchable.com/";
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };

From 21373bc49b3ea1b36dd252949a8e50b595c3d724 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 23:48:30 +0000
Subject: [PATCH 021/113] git-annex: enable the documentation build

svn path=/nixpkgs/trunk/; revision=27663
---
 .../applications/version-management/git-and-tools/default.nix | 2 +-
 .../version-management/git-and-tools/git-annex/default.nix    | 4 ++--
 2 files changed, 3 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 69134f33cc31..e049c01869da 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -46,7 +46,7 @@ rec {
   };
 
   gitAnnex = lib.makeOverridable (import ./git-annex) {
-    inherit stdenv fetchurl libuuid rsync findutils curl perl git;
+    inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki;
     inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc
       HTTP testpack;
   };
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 3003902c2282..52b4161a0f72 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,5 @@
 { stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String
-, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git }:
+, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki }:
 
 let
   version = "3.20110705";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight
-    SHA dataenc HTTP testpack git];
+    SHA dataenc HTTP testpack git ikiwiki];
 
   checkTarget = "test";
   doCheck = true;

From 2fee0ecef93d94c87d3a8735dc6e6550ccbb2b22 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 23:48:34 +0000
Subject: [PATCH 022/113] git: updated to version 1.7.6

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

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 1ba00fcb0f29..8db7151094d7 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -12,11 +12,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "git-1.7.5.1";
+  name = "git-1.7.6";
 
   src = fetchurl {
     url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
-    sha256 = "037q4nl17i1q9zrlp4k38dplv384ay9bwb1s96y8zrh0jg2s3m51";
+    sha256 = "778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082";
   };
 
   patches = [ ./docbook2texi.patch ];

From e4353b1f65c8dd8b46085bfdfc294b6465da9e4a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jul 2011 23:48:38 +0000
Subject: [PATCH 023/113] git: install contrib code included in the
 distribution

TODO: byte-compile emacs modules

svn path=/nixpkgs/trunk/; revision=27665
---
 .../git-and-tools/git/default.nix                | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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 8db7151094d7..7d51573bad20 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -41,16 +41,19 @@ stdenv.mkDerivation rec {
         chmod +x $1
       }
 
-      # Install Emacs mode.
-      echo "installing Emacs mode..."
+      # Install contrib stuff.
+      ensureDir $out/share/git
+      mv contrib $out/share/git/
       ensureDir $out/share/emacs/site-lisp
-      cp -p contrib/emacs/*.el $out/share/emacs/site-lisp
+      ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/
+      ensureDir $out/etc/bash_completion.d
+      ln -s $out/share/git/contrib/completion/git-completion.bash $out/etc/bash_completion.d/
 
       # grep is a runtime dependence, need to patch so that it's found
       substituteInPlace $out/libexec/git-core/git-sh-setup \
           --replace ' grep' ' ${gnugrep}/bin/grep' \
           --replace ' egrep' ' ${gnugrep}/bin/egrep'
-    '' # */
+    ''
 
    + (if svnSupport then
 
@@ -97,10 +100,6 @@ stdenv.mkDerivation rec {
        done
      '')
 
-   + ''# install bash completion script
-      d="$out/etc/bash_completion.d"
-      ensureDir $d; cp contrib/completion/git-completion.bash "$d"
-     ''
    # Don't know why hardlinks aren't created. git installs the same executable
    # multiple times into $out so replace duplicates by symlinks because I
    # haven't tested whether the nix distribution system can handle hardlinks.
@@ -109,6 +108,7 @@ stdenv.mkDerivation rec {
       declare -A seen
       shopt -s globstar
       for f in "$out/"**; do
+        if [ -L "$f" ]; then continue; fi
         test -f "$f" || continue
         sum=$(md5sum "$f");
         sum=''\${sum/ */}

From 9fbe9c9541560e7b8d7e85d095790a378145234e Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Fri, 8 Jul 2011 00:59:01 +0000
Subject: [PATCH 024/113] Repair Wesnoth build error and advance to version
 1.8.6.

svn path=/nixpkgs/trunk/; revision=27666
---
 .../wesnoth/add-acl-prefix-to-libext.patch    | 28 -------------------
 pkgs/games/wesnoth/default.nix                | 16 +++++------
 2 files changed, 7 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/games/wesnoth/add-acl-prefix-to-libext.patch

diff --git a/pkgs/games/wesnoth/add-acl-prefix-to-libext.patch b/pkgs/games/wesnoth/add-acl-prefix-to-libext.patch
deleted file mode 100644
index 6ff96efda1e1..000000000000
--- a/pkgs/games/wesnoth/add-acl-prefix-to-libext.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur wesnoth-upstream-1.8.5/m4/boost.m4 wesnoth-1.8.5/m4/boost.m4
-
-Libtools seems to set a variable called acl_libext while the Boost
-library check code uses a variable called libext.  This patch makes
-the Boost check use the variable acl_libext actually set by libtools.
-
---- wesnoth-upstream-1.8.5/m4/boost.m4	2010-10-02 20:35:59.577619372 -0430
-+++ wesnoth-1.8.5/m4/boost.m4	2010-10-02 20:39:10.383653233 -0430
-@@ -252,8 +252,8 @@
-   test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
-   $boost_guess_use_mt && boost_mt=-mt
-   # Look for the abs path the static archive.
--  # $libext is computed by Libtool but let's make sure it's non empty.
--  test -z "$libext" &&
-+  # $acl_libext is computed by Libtool but let's make sure it's non empty.
-+  test -z "$acl_libext" &&
-     AC_MSG_ERROR([the libext variable is empty, did you invoke Libtool?])
-   boost_save_ac_objext=$ac_objext
-   # Generate the test file.
-@@ -309,7 +309,7 @@
-       # Are we looking for a static library?
-       case $boost_ldpath:$boost_rtopt_ in #(
-         *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
--          Boost_lib_LIBS="$boost_ldpath/lib$boost_lib.$libext"
-+          Boost_lib_LIBS="$boost_ldpath/lib$boost_lib.$acl_libext"
-           test -e "$Boost_lib_LIBS" || continue;; #(
-         *) # No: use -lboost_foo to find the shared library.
-           Boost_lib_LIBS="-l$boost_lib";;
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 59c2de21a483..000fa02b8ab5 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -3,32 +3,30 @@
 , fribidi, asciidoc }:
 
 stdenv.mkDerivation rec {
-  pname = "wesnoth";
-  version = "1.8.5";
+  name = "wesnoth";
+  version = "1.8.6";
 
-  name = "${pname}-${version}";
+  pname = "${name}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1yjmqvwzz446vvkjg923ypwnmhb0fbgqj0ax0k7s102la37bv8zc";
+    url = "mirror://sourceforge/sourceforge/${name}/${pname}.tar.bz2";
+    sha256 = "10c01ys846zsy831gprdy2nx3qlzv65s4jy99lw6misak3x07rjg";
   };
 
   buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
                   automake autoconf freetype libpng pkgconfig lua dbus fontconfig libtool ];
 
-  # The patch and the preInstall sed substitution fix errors which I 
+  # The preInstall sed substitution fix errors which I 
   # believe arise from autotools version mismatches.  Rather than
   # hunt for the correct automake and autoconf versions these changes
   # make the build work with the versions current in Nixpkgs.
-  patches = ./add-acl-prefix-to-libext.patch;
-
   preInstall = ''
     sed -i -e s,@MKINSTALLDIRS@,`pwd`/config/mkinstalldirs, po/*/Makefile
   '';
 
   configurePhase = ''
     ./autogen.sh --prefix=$out --with-boost=${boost} \
-                 --with-preferences-dir=.${name} --program-suffix=-${version} \
+                 --with-preferences-dir=.${name} \
                  --with-datadir-name=${name}
   '';
 

From 9a115becc36bb6c1e8f3220f237ee15910d7f51e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 09:29:52 +0000
Subject: [PATCH 025/113] PerlMagick: fixed download URL and hash

Why has this module disappeared from CPAN? And why did its hash change?
Very strange ...

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 25a3c121b449..89c4cd64875c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1488,8 +1488,8 @@ rec {
   PerlMagick = buildPerlPackage {
     name = "PerlMagick-6.59";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.59.tar.gz;
-      sha256 = "a87999b322460f7ba964eed81f91f400fba4ba6ff88e3f9e2b216d4d8ecf638d";
+      url = http://image_magick.veidrodis.com:8003/image_magick/perl/PerlMagick-6.59.tar.gz;
+      sha256 = "6d7a33f6431b5650637cf73dd696927dbb2073f28e8f8d11a465d7de4c4638b3";
     };
     buildInputs = [pkgs.imagemagick];
     preConfigure =

From 07fd56678032ee190267f138251c77627c4671f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 09:29:57 +0000
Subject: [PATCH 026/113] perl-packages.nix: strip trailing whitespace

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 89c4cd64875c..36d470f70668 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1277,7 +1277,7 @@ rec {
       sha256 = "1p84585b4iyqa21hbqni0blj8fzd917ynd3y1hwh3mrmyfqj178x";
     };
 
-    buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype 
+    buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype
                     pkgs.libpng pkgs.fontconfig pkgs.xlibs.libXpm GetOptLong ];
 
     # Patch needed to get arguments past the first GetOptions call
@@ -1290,7 +1290,7 @@ rec {
     # ( although the images look the same to my eye ); this is
     # possibly because the source packaged image was generated with a
     # different version of some library ( libpng maybe? ).
-    postPatch = "sed -ie 's/if (GD::Image->can(.newFromJpeg.)) {/if ( 0 ) {/' t/GD.t";    
+    postPatch = "sed -ie 's/if (GD::Image->can(.newFromJpeg.)) {/if ( 0 ) {/' t/GD.t";
 
     makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xlibs.libXpm}";
   };
@@ -2081,7 +2081,7 @@ rec {
       sha256 = "179cxwqxb0f9dpx8954nvwjmggxxi5ndnang41yav1dx6mf0abp7";
     };
   };
-  
+
   ParamsUtil = buildPerlPackage rec {
     name = "Params-Util-1.01";
     src = fetchurl {

From 4303240ef930596e3c5240c59ab9162ad2d94395 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 09:30:01 +0000
Subject: [PATCH 027/113] ikiwiki: updated to version 3.20110707

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

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 93748e21abad..48eb9ae888b4 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick,
-  TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
-  CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
+{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick, YAML
+, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate
+, CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
 , gitSupport ? false
 , git ? null
 , monotoneSupport ? false
@@ -13,19 +13,19 @@ assert monotoneSupport -> (monotone != null);
 
 let
   name = "ikiwiki";
-  version = "3.20100704";
+  version = "3.20110707";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "1kakh2bf9k0fhvqhn9p9g4wwck64if2y9z23zmlcrm02bw1m6lr9";
+    sha256 = "b51fa7452a900212ab1c8c879227b83a688c10f770552aee61944695f8c6f1bf";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
     TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
-    RpcXML XMLSimple PerlMagick]
+    RpcXML XMLSimple PerlMagick YAML]
     ++ stdenv.lib.optionals gitSupport [git]
     ++ stdenv.lib.optionals monotoneSupport [monotone];
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   configurePhase = "perl Makefile.PL PREFIX=$out";
 
   postInstall = ''
-    for a in $out/bin/*; do
+    for a in "$out/bin/"*; do
       wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \
       ${lib.optionalString (git != null)
         ''--prefix PATH : ${git}/bin \''}

From f58421b59fdc952be71f932101b482050fd9ffee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 09:30:05 +0000
Subject: [PATCH 028/113] ikiwiki: drop obsolete getConfig mechanism; use
 override to configure support for git and/or monotone

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff4550def327..8cba3480a939 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6475,9 +6475,9 @@ let
   ikiwiki = callPackage ../applications/misc/ikiwiki {
     inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
       HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext
-      RpcXML XMLSimple PerlMagick;
-    gitSupport = getConfig [ "ikiwiki" "git" ] false;
-    monotoneSupport = getConfig [ "ikiwiki" "monotone" ] false;
+      RpcXML XMLSimple PerlMagick YAML;
+    gitSupport = false;
+    monotoneSupport = false;
     extraUtils = [];
   };
 

From 8e79697a84f1c07907f0dff2d78f187f0333a452 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 10:51:18 +0000
Subject: [PATCH 029/113] smartmontools: updated to version 5.41

svn path=/nixpkgs/trunk/; revision=27671
---
 pkgs/tools/system/smartmontools/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 8cab529d5c38..140e0008ed83 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -1,11 +1,14 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation rec {
-  name = "smartmontools-5.38";
-  
+let
+  name = "smartmontools-5.41";
+in
+stdenv.mkDerivation {
+  inherit name;
+
   src = fetchurl {
     url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
-    sha256 = "1s1i5y5n3jx681y03jj459yy4ijaq564z8bp2cgqb97wl4h762dj";
+    sha256 = "173eb14e3253a30230f38c7e684085bcae7fa021efff58bdf94c2702ac76fa32";
   };
 
   meta = {

From 84be287f40a8b3e85a9583771965295b2fbf1630 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 8 Jul 2011 14:42:13 +0000
Subject: [PATCH 030/113] bumped disnixos

svn path=/nixpkgs/trunk/; revision=27673
---
 pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 70953772c4a9..1a7ca5716044 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, disnix, socat, pkgconfig}:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2pre27272";
+  name = "disnixos-0.2pre27672";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/1112308/download/3/disnixos-0.2pre27272.tar.gz;
-    sha256 = "0ij06bz24ig9g6h3pig7kwvndj46vnabpyfb173vy2ll1mx0vqnp";
+    url = http://hydra.nixos.org/build/1153468/download/3/disnixos-0.2pre27672.tar.gz;
+    sha256 = "0z74p9fnvchvl78brj2p3r9h0wwvpl86zk0ynzqcf8ww0h71ws08";
   };
   buildInputs = [ socat pkgconfig disnix ];
   dontStrip = true;

From 132b87eceddea7707a7b7c40e52a3d10be73f9c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 16:01:59 +0000
Subject: [PATCH 031/113] nbd: updated to 2.9.23

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

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index e411772f3615..0e795ed739e2 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 let
-  name = "nbd-2.9.22";
+  name = "nbd-2.9.23";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "f9e1a9db1663393fd1f2de2dd70cf15cc4fa17616853b717db7ca6c539f8787d";
+    sha256 = "0ab44fe9e80c3f41bb1025ecda351a874affd46bf56ba4033ea03700c3b83803";
   };
 
   buildInputs = [pkgconfig glib];

From 574eb09fa46b24ea8c6aa5e4b87b2ab6a72e1e1f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 21:23:48 +0000
Subject: [PATCH 032/113] xplanet: move expression into new category
 "astronomy"

svn path=/nixpkgs/trunk/; revision=27676
---
 pkgs/applications/science/{ => astronomy}/xplanet/default.nix | 0
 pkgs/top-level/all-packages.nix                               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/applications/science/{ => astronomy}/xplanet/default.nix (100%)

diff --git a/pkgs/applications/science/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix
similarity index 100%
rename from pkgs/applications/science/xplanet/default.nix
rename to pkgs/applications/science/astronomy/xplanet/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8cba3480a939..7e297ebbd538 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7633,7 +7633,7 @@ let
 
   ### SCIENCE
 
-  xplanet = callPackage ../applications/science/xplanet {
+  xplanet = callPackage ../applications/science/astronomy/xplanet {
     inherit (gtkLibs) pango;
   };
 

From e7746a78edcdaeb95cb3ffe50f5bf41d72c0f1af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 21:23:55 +0000
Subject: [PATCH 033/113] gravit: added version 0.4.2

svn path=/nixpkgs/trunk/; revision=27677
---
 .../science/astronomy/gravit/default.nix      | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/science/astronomy/gravit/default.nix

diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
new file mode 100644
index 000000000000..3e6ebc29519a
--- /dev/null
+++ b/pkgs/applications/science/astronomy/gravit/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa }:
+
+let
+  name = "gravit-0.4.2";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "http://gravit.slowchop.com/dist/${name}.tar.gz";
+    sha256 = "f37f3ac256a4acbf575f709addaae8cb01eda4f85537affa28c45f2df6fddb07";
+  };
+
+  buildInputs = [mesa SDL SDL_ttf SDL_image];
+
+  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3";
+
+  postInstall = ''
+    mv $out/etc/gravit $out/share/gravit/sample-config
+    rmdir $out/etc
+  '';
+
+  meta = {
+    homepage = "http://gravit.slowchop.com";
+    description = "A beautiful OpenGL-based gravity simulator";
+    license = "GPLv2";
+
+    longDescription = ''
+          Gravit is a gravity simulator which runs under Linux, Windows and
+      Mac OS X. It uses Newtonian physics using the Barnes-Hut N-body
+      algorithm. Although the main goal of Gravit is to be as accurate
+      as possible, it also creates beautiful looking gravity patterns.
+      It records the history of each particle so it can animate and
+      display a path of its travels. At any stage you can rotate your
+      view in 3D and zoom in and out.
+    '';
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e297ebbd538..4d0624216882 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -752,6 +752,8 @@ let
     inherit (gtkLibs) pango;
   };
 
+  gravit = callPackage ../applications/science/astronomy/gravit { };
+
   groff = callPackage ../tools/text/groff {
     ghostscript = null;
   };

From f92f3deed8e0ffdf6932c091fa9a42523bb021a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 21:24:01 +0000
Subject: [PATCH 034/113] lua-4: fixed build

svn path=/nixpkgs/trunk/; revision=27678
---
 .../interpreters/lua-4/default.nix            | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix
index 9502a9a0860f..a95e4e4c35ea 100644
--- a/pkgs/development/interpreters/lua-4/default.nix
+++ b/pkgs/development/interpreters/lua-4/default.nix
@@ -1,10 +1,30 @@
-{stdenv, fetchurl}: 
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "lua-4.0.1";
+
   src = fetchurl {
     url = http://www.lua.org/ftp/lua-4.0.1.tar.gz;
     md5 = "a31d963dbdf727f9b34eee1e0d29132c";
   };
-  builder= ./builder.sh;
+
+  configurePhase = "sed -i -e 's/CFLAGS= -O2/CFLAGS = -O3 -fPIC/' config";
+  buildFlags = "all so sobin";
+  installFlags = "INSTALL_ROOT=$$out";
+
+  meta = {
+    homepage = "http://www.lua.org";
+    description = "Lua is a powerful, fast, lightweight, embeddable scripting language.";
+    longDescription = ''
+      Lua combines simple procedural syntax with powerful data
+      description constructs based on associative arrays and extensible
+      semantics. Lua is dynamically typed, runs by interpreting bytecode
+      for a register-based virtual machine, and has automatic memory
+      management with incremental garbage collection, making it ideal
+      for configuration, scripting, and rapid prototyping.
+    '';
+    license = "MIT";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ ];
+  };
 }

From 758e85cfac62ba09893f83205e379ce83497319a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 22:45:23 +0000
Subject: [PATCH 035/113] texlive: fixed erroneous forwarder scripts

 - Generate a forwarder scripts only for executable files. This change
   removes the broken 'man' script, for example.

 - Run the real binaries with 'exec'.

 - Use $SHELL to interpret the forwarder scripts rather than /bin/sh.

 - Indent consistently with blanks.

 - Removed some debug output from the build expression.

svn path=/nixpkgs/trunk/; revision=27679
---
 pkgs/misc/tex/texlive/aggregate.nix | 28 ++++++++++++++--------------
 pkgs/misc/tex/texlive/default.nix   | 27 +++++++++++++--------------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/pkgs/misc/tex/texlive/aggregate.nix b/pkgs/misc/tex/texlive/aggregate.nix
index 2ea57445eb6c..1723f4819062 100644
--- a/pkgs/misc/tex/texlive/aggregate.nix
+++ b/pkgs/misc/tex/texlive/aggregate.nix
@@ -12,20 +12,20 @@ rec {
         echo Symlinking "$currentPath"
         find $currentPath/share/info $currentPath/share/man $(echo $currentPath/texmf*/) ! -type d | while read; do
             REPLY="''${REPLY#$currentPath}"
-	    ensureDir $out/"$(dirname "$REPLY")"
-	    ln -fs $currentPath/"$REPLY" $out/"$REPLY"
-	    echo
+            ensureDir $out/"$(dirname "$REPLY")"
+            ln -fs $currentPath/"$REPLY" $out/"$REPLY"
+            echo
         done | while read; do head -n 99 >/dev/null; echo -n .; done
 
-        for i in $currentPath/bin/* :; do #*/
-            test "$i" = : && continue;
-            echo -ne "#! /bin/sh\\n$i \"\$@\"" > "$out/bin/$(basename "$i")" && \
+        for i in "$currentPath/bin/"* :; do
+            test "$i" != : || continue
+            echo -ne "#! $SHELL\\nexec $i \"\$@\"" > "$out/bin/$(basename "$i")" && \
             chmod a+x "$out/bin/$(basename "$i")"
         done
 
-	echo
+        echo
 
-	cp -Trfp $currentPath/libexec $out/libexec || true
+        cp -Trfp $currentPath/libexec $out/libexec || true
     done
 
     ln -s $out/texmf* $out/share/
@@ -39,8 +39,8 @@ rec {
     for i in $out/libexec/*/* :; do
         test "$i" = : && continue;
         test -f "$i" && \
-	test -x "$i" && \
-	echo -ne "#! /bin/sh\\n$i \"\$@\"" >$out/bin/$(basename $i) && \
+        test -x "$i" && \
+        echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i) && \
         chmod a+x $out/bin/$(basename $i)
     done
 
@@ -58,12 +58,12 @@ rec {
   meta = {
     description = "TeX distribution directory";
     longDescription = ''
-      Here all the files from different TeX-related 
-      packages are collected in one directory. Of 
-      course, mktexlsr is called. Later placed 
+      Here all the files from different TeX-related
+      packages are collected in one directory. Of
+      course, mktexlsr is called. Later placed
       directories take precedence. It is supposed that
       share and libexec are symlinked, and bin is
-      recreated with wrappers for libexec-located 
+      recreated with wrappers for libexec-located
       linked binaries.
     '';
   };
diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/misc/tex/texlive/default.nix
index e72d9112daa7..69fb5d7e415f 100644
--- a/pkgs/misc/tex/texlive/default.nix
+++ b/pkgs/misc/tex/texlive/default.nix
@@ -1,11 +1,11 @@
-args : with args; 
+args : with args;
 rec {
-  src = fetchurl { 
+  src = fetchurl {
     url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2009.orig.tar.gz;
     sha256 = "0ywc8h4jnig53fs0bji2ivw5f9j6zlgdy477jqw7xvpc7migjpw7";
   };
-  
-  texmfSrc = fetchurl { 
+
+  texmfSrc = fetchurl {
     url = mirror://debian/pool/main/t/texlive-base/texlive-base_2009.orig.tar.gz;
     sha256 = "130z907xcxr10yrzbbmp9l8a00dabvi4bi702s5jxamjzav17cmf";
   };
@@ -19,7 +19,7 @@ rec {
 
   doMainBuild = fullDepEntry (''
     ensureDir $out
-    ensureDir $out/nix-support 
+    ensureDir $out/nix-support
     cp ${setupHook} $out/nix-support/setup-hook.sh
     ensureDir $out/share
     tar xf ${texmfSrc} -C $out --strip-components=1
@@ -32,7 +32,7 @@ rec {
     sed -e 's@\<env python@${python}/bin/python@' -i $(grep 'env python' -rl . )
 
     sed -e '/ubidi_open/i#include <unicode/urename.h>' -i $(find . -name configure)
-    sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . ) 
+    sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . )
     sed -e '1i\#include <string.h>\n\#include <stdlib.h>' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' )
 
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
@@ -47,12 +47,13 @@ rec {
     mv $out/bin $out/libexec
     ensureDir $out/bin
     for i in "$out/libexec/"*"/"*; do
-        echo -ne "#! /bin/sh\\n$i \"\$@\"" >$out/bin/$(basename $i)
+        test \( \! -d "$i" \) -a -x "$i" || continue
+        echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i)
         chmod a+x $out/bin/$(basename $i)
     done
     [ -d $out/texmf-config ] || ln -s $out/texmf $out/texmf-config
     ln -s "$out/"*texmf* "$out/share/"
-    
+
     sed -e 's/.*pyhyph.*/=&/' -i $out/texmf-config/tex/generic/config/language.dat
 
     PATH=$PATH:$out/bin mktexlsr $out/texmf*
@@ -76,18 +77,16 @@ rec {
 
   buildInputs = [
     zlib bzip2 ncurses libpng flex bison libX11 libICE
-    xproto freetype t1lib gd libXaw icu ghostscript ed 
-    libXt libXpm libXmu libXext xextproto perl libSM 
+    xproto freetype t1lib gd libXaw icu ghostscript ed
+    libXt libXpm libXmu libXext xextproto perl libSM
     ruby expat curl libjpeg python fontconfig
   ];
 
-  configureFlags = [ "--with-x11" 
+  configureFlags = [ "--with-x11"
     "--enable-ipc" "--with-mktexfmt"
   ];
 
-  phaseNames = ["addInputs" (doDump "0") "doMainBuild" 
-    (doDump "1")
-    "doMakeInstall" "doPostInstall"];
+  phaseNames = ["addInputs" "doMainBuild" "doMakeInstall" "doPostInstall"];
 
   name = "texlive-core-2009";
   meta = {

From f15dca4c9c711a07a4187588338686258821b2bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 22:45:28 +0000
Subject: [PATCH 036/113] htop: updated to version 0.9

svn path=/nixpkgs/trunk/; revision=27680
---
 pkgs/os-specific/linux/htop/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix
index 6a2320993517..923f27981458 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@@ -1,12 +1,18 @@
 {fetchurl, stdenv, ncurses}:
 
-stdenv.mkDerivation rec {
-  name = "htop-0.8.3";
+let
+  name = "htop-0.9";
+in
+stdenv.mkDerivation {
+  inherit name;
+
   src = fetchurl {
     url = "mirror://sourceforge/htop/${name}.tar.gz";
-    sha256 = "f03bac8999c57c399cbf4332831bcce905d0393d0f97f7e32a1407b48890dd9d";
+    sha256 = "4de65c38e1886bccd30ed692b30eb9bf195240680781bfe1eaf5faf84ee6fbfd";
   };
+
   buildInputs = [ncurses];
+
   meta = {
     description = "An interactive process viewer for Linux";
     homepage = "http://htop.sourceforge.net";

From 720e3518c5fa02195e94b1d1a5ced388e061c8e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 23:11:38 +0000
Subject: [PATCH 037/113] util-linux-ng: prepare expression for the addition of
 perl as a buildInput

The chkdupexe utility requires perl. We cannot change the expression, though,
without triggering a re-build of almost all of stdenv, so for the time being
I'm making Perl an optional build input that is disabled by default.

svn path=/nixpkgs/trunk/; revision=27681
---
 pkgs/os-specific/linux/util-linux-ng/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix
index 2ae172c6c190..4e62be4ff32d 100644
--- a/pkgs/os-specific/linux/util-linux-ng/default.nix
+++ b/pkgs/os-specific/linux/util-linux-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses ? null }:
+{ stdenv, fetchurl, ncurses ? null, perl ? null }:
 
 stdenv.mkDerivation rec {
   name = "util-linux-ng-2.18";
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     ${if ncurses == null then "--without-ncurses" else ""}
   '';
 
-  buildInputs = stdenv.lib.optional (ncurses != null) ncurses;
+  buildInputs = stdenv.lib.optional (ncurses != null) ncurses
+             ++ stdenv.lib.optional (perl != null) perl;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d0624216882..9f36d8a5d290 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5663,6 +5663,7 @@ let
 
   utillinuxng = callPackage ../os-specific/linux/util-linux-ng {
     ncurses = null;
+    perl = null;
   };
 
   utillinuxngCurses = utillinuxng.override {

From 47ffc4635fe119339079d487c00acf10dafcd0ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 23:11:41 +0000
Subject: [PATCH 038/113] utillinuxngCurses: build this package with perl
 support enabled

This means that chkdupexe will work correctly.

svn path=/nixpkgs/trunk/; revision=27682
---
 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 9f36d8a5d290..4f4422ad4dee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5667,7 +5667,7 @@ let
   };
 
   utillinuxngCurses = utillinuxng.override {
-    inherit ncurses;
+    inherit ncurses perl;
   };
 
   windows = rec {

From e090fed42093feba06b1a2ca8aa15d4ee98e7e2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 Jul 2011 12:11:31 +0000
Subject: [PATCH 039/113] gnucash: added myself as a maintainer

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

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 213e3fd0a457..e1d86db16f68 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnucash.org/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }

From eb264a8c510f1aa8fffa92cf164e582ad98d55c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 Jul 2011 12:11:36 +0000
Subject: [PATCH 040/113] all-packages.nix: build slibGuile with guile version
 1.8 rather than 2.0

The guile 2.0 build of slib generates plenty of errors.

svn path=/nixpkgs/trunk/; revision=27684
---
 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 4f4422ad4dee..2c8db75f0a2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4254,7 +4254,7 @@ let
   slang = callPackage ../development/libraries/slang { };
 
   slibGuile = callPackage ../development/libraries/slib {
-    scheme = guile;
+    scheme = guile_1_8;
   };
 
   smpeg = callPackage ../development/libraries/smpeg { };

From 483eb4948b2ef52940a51ee1ee8304352b3ecd14 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 Jul 2011 12:11:41 +0000
Subject: [PATCH 041/113] all-packages.nix: Changed gnucash expression to
 override the 'scheme' argument in slibGuile so that the library is built with
 the same version of guile as gnucash is.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c8db75f0a2d..7bcdc74e6c04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6321,6 +6321,7 @@ let
       libgnomeprint;
     gconf = gnome.GConf;
     guile = guile_1_8;
+    slibGuile = slibGuile.override { scheme = guile_1_8; };
   };
 
   qcad = callPackage ../applications/misc/qcad { };

From f903153fe619dadea5b0a0506a5609c710f9d0a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 Jul 2011 13:02:46 +0000
Subject: [PATCH 042/113] gnucash: updated to version 2.4.7

The test suite is currently disabled. There is an issue with GUILE_LOAD_PATH
that needs to be addressed before we can re-enable those tests. See comments in
the expression for further details.

svn path=/nixpkgs/trunk/; revision=27686
---
 pkgs/applications/office/gnucash/default.nix | 33 +++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index e1d86db16f68..52687e1cced6 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -3,12 +3,15 @@
 , gettext, intltool, perl, guile, slibGuile, swig, isocodes, bzip2
 , makeWrapper }:
 
-stdenv.mkDerivation rec {
-  name = "gnucash-2.2.9";
+let
+  name = "gnucash-2.4.7";
+in
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
-    url = "http://ftp.at.gnucash.org/pub/gnucash/gnucash/sources/stable/${name}.tar.bz2";
-    sha256 = "0sj83mmshx50122n1i3y782p4b54k37n7sb4vldmqmhwww32925i";
+    url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
+    sha256 = "eeb3b17f9081a544f8705db735df88ab3f468642a1d01552ea4e36bcb5b0730e";
   };
 
   buildInputs = [
@@ -17,11 +20,24 @@ stdenv.mkDerivation rec {
     gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper
   ];
 
+  /* The test suite isn't enabled at the moment, so this setting
+     shouldn't be necessary.
+
   preConfigure = ''
     # The `.gnucash' directory, used by the test suite.
     export GNC_DOT_DIR="$PWD/dot-gnucash"
     echo "\$GNC_DOT_DIR set to \`$GNC_DOT_DIR'"
   '';
+   */
+
+  configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O2 CXXFLAGS=-O2 --disable-dbi";
+  /* More flags to figure out:
+
+       --enable-gtkmm            enable gtkmm gui
+       --enable-ofx              compile with ofx support (needs LibOFX)
+       --enable-aqbanking        compile with AqBanking support
+       --enable-python-bindings  enable python bindings
+   */
 
   postInstall = ''
     for prog in "$out/bin/"*
@@ -32,7 +48,14 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  doCheck = true;
+  doCheck = false;
+  /* The test suite fails as follows:
+
+       /tmp/nix-build-y1mba6vkkscggnfigji57mwd0zhvnx1w-gnucash-2.4.7.drv-0/gnucash-2.4.7/src/import-export/test/.libs/lt-test-import-parse: error while loading shared libraries: libguile.so.17: cannot open shared object file: No such file or directory
+
+  */
+
+  enableParallelBuilding = true;
 
   meta = {
     description = "GnuCash, a personal and small-business financial-accounting application";

From d21e981e64dd6836e08cee94c6c423261dc09995 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sun, 10 Jul 2011 01:12:57 +0000
Subject: [PATCH 043/113] Upgrade bitcoin to 0.3.24

svn path=/nixpkgs/trunk/; revision=27687
---
 pkgs/applications/misc/bitcoin/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix
index 42b69f37f79d..9d9ddb056daa 100644
--- a/pkgs/applications/misc/bitcoin/default.nix
+++ b/pkgs/applications/misc/bitcoin/default.nix
@@ -1,18 +1,18 @@
 { fetchurl, stdenv, openssl, db4, boost, zlib, glib, libSM, gtk, wxGTK, miniupnpc }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.22";
+  version = "0.3.24";
   name = "bitcoin-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/bitcoin/Bitcoin/${name}/${name}-linux.tar.gz";
-    sha256 = "1nyji3xjyvw91snnbxk71dih3yf292d7mvkakw0nkqplbap14xjb";
+    url = "mirror://sourceforge/project/bitcoin/Bitcoin/${name}/${name}-src.tar.gz";
+    sha256 = "18n8i37c478b275m2x82411i1fsw8l34qm1k65ynnw38fpaj4h3r";
   };
 
   buildInputs = [ openssl db4 boost zlib glib libSM gtk wxGTK miniupnpc ];
 
   preConfigure = ''
-    cd src/src
+    cd src
     substituteInPlace makefile.unix \
       --replace "-Wl,-Bstatic" "" \
       --replace "-Wl,-Bdynamic" "" \
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
 
   makefile = "makefile.unix";
 
-  preBuild = "make -f ${makefile} clean";
-
   buildFlags = "bitcoin bitcoind";
 
   installPhase = ''

From 5fd662e2e936b6bee49815971bb6fbcab39be06c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Jul 2011 13:34:51 +0000
Subject: [PATCH 044/113] gnucash: add ${gconf}/bin to $PATH in wrapper scripts

GnuCash attempt to call gconf binaries to register its schemas in the
system-wide database. That still doesn't work, of course, because gconf
can't update its store path. TODO. :-(

svn path=/nixpkgs/trunk/; revision=27688
---
 pkgs/applications/office/gnucash/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 52687e1cced6..9a25b51f8f0c 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -44,7 +44,8 @@ stdenv.mkDerivation {
     do
       wrapProgram "$prog"                                       \
         --set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH"        \
-        --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH"
+        --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH"         \
+        --prefix PATH ":" "${gconf}/bin"
     done
   '';
 

From 4cf494c8ff0493040c1499df3c75b056daabdb67 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Jul 2011 13:34:56 +0000
Subject: [PATCH 045/113] gnucash: set RPATH so that GnuCash binaries can find
 its GNOME libraries at run-time

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

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 9a25b51f8f0c..880c749ea446 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk
-, libglade, libgnomeui, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant
+, libbonoboui, libgnomeui, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant
 , gettext, intltool, perl, guile, slibGuile, swig, isocodes, bzip2
 , makeWrapper }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     pkgconfig libxml2 gconf glib gtk
-    libglade libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant
+    libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant
     gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper
   ];
 
@@ -39,6 +39,8 @@ stdenv.mkDerivation {
        --enable-python-bindings  enable python bindings
    */
 
+  NIX_LDFLAGS = "-rpath=${libgnomeui}/lib/libglade/2.0 -rpath=${libbonoboui}/lib/libglade/2.0 -rpath=${guile}/lib";
+
   postInstall = ''
     for prog in "$out/bin/"*
     do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7bcdc74e6c04..b1cc6fbb7b7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6317,8 +6317,8 @@ let
   };
 
   gnucash = callPackage ../applications/office/gnucash {
-    inherit (gnome) gtk glib libglade libgnomeui libgtkhtml gtkhtml
-      libgnomeprint;
+    inherit (gnome) gtk glib libgnomeui libgtkhtml gtkhtml
+      libbonoboui libgnomeprint;
     gconf = gnome.GConf;
     guile = guile_1_8;
     slibGuile = slibGuile.override { scheme = guile_1_8; };

From 6b9ab942b50e044e09f439e7c9294ea1dd2157df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Jul 2011 14:04:09 +0000
Subject: [PATCH 046/113] pkgs/development/interpreters/lua-4/builder.sh:
 delete obsolete file

svn path=/nixpkgs/trunk/; revision=27690
---
 pkgs/development/interpreters/lua-4/builder.sh | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 pkgs/development/interpreters/lua-4/builder.sh

diff --git a/pkgs/development/interpreters/lua-4/builder.sh b/pkgs/development/interpreters/lua-4/builder.sh
deleted file mode 100644
index 350f67dc9183..000000000000
--- a/pkgs/development/interpreters/lua-4/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-buildFlags="all so sobin"
-installFlags="INSTALL_ROOT=$out"
-
-genericBuild

From 6ad966c8b8b86b88fa2fbaca303c2cd025846f0e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Jul 2011 14:04:14 +0000
Subject: [PATCH 047/113] gnucash: re-enable the test suite

svn path=/nixpkgs/trunk/; revision=27691
---
 pkgs/applications/office/gnucash/default.nix | 24 +++++---------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 880c749ea446..e2cbd3e2d6f7 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -3,6 +3,9 @@
 , gettext, intltool, perl, guile, slibGuile, swig, isocodes, bzip2
 , makeWrapper }:
 
+# TODO: Fix the gconf issue. The following posting might be the missing clue:
+# <http://osdir.com/ml/linux.distributions.nixos/2007-09/msg00003.html>.
+
 let
   name = "gnucash-2.4.7";
 in
@@ -20,15 +23,7 @@ stdenv.mkDerivation {
     gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper
   ];
 
-  /* The test suite isn't enabled at the moment, so this setting
-     shouldn't be necessary.
-
-  preConfigure = ''
-    # The `.gnucash' directory, used by the test suite.
-    export GNC_DOT_DIR="$PWD/dot-gnucash"
-    echo "\$GNC_DOT_DIR set to \`$GNC_DOT_DIR'"
-  '';
-   */
+  NIX_LDFLAGS = "-rpath=${libgnomeui}/lib/libglade/2.0 -rpath=${libbonoboui}/lib/libglade/2.0 -rpath=${guile}/lib";
 
   configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O2 CXXFLAGS=-O2 --disable-dbi";
   /* More flags to figure out:
@@ -39,8 +34,6 @@ stdenv.mkDerivation {
        --enable-python-bindings  enable python bindings
    */
 
-  NIX_LDFLAGS = "-rpath=${libgnomeui}/lib/libglade/2.0 -rpath=${libbonoboui}/lib/libglade/2.0 -rpath=${guile}/lib";
-
   postInstall = ''
     for prog in "$out/bin/"*
     do
@@ -51,13 +44,8 @@ stdenv.mkDerivation {
     done
   '';
 
-  doCheck = false;
-  /* The test suite fails as follows:
-
-       /tmp/nix-build-y1mba6vkkscggnfigji57mwd0zhvnx1w-gnucash-2.4.7.drv-0/gnucash-2.4.7/src/import-export/test/.libs/lt-test-import-parse: error while loading shared libraries: libguile.so.17: cannot open shared object file: No such file or directory
-
-  */
-
+  preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
+  doCheck = true;
   enableParallelBuilding = true;
 
   meta = {

From c9695f2d485ac4db6ff332a88be2b427416a7892 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Jul 2011 14:04:19 +0000
Subject: [PATCH 048/113] Added obsolete lua-5.0.3 version, which is required
 by gravit.

svn path=/nixpkgs/trunk/; revision=27692
---
 pkgs/development/interpreters/lua-5/5.0.3.nix | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/interpreters/lua-5/5.0.3.nix

diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix
new file mode 100644
index 000000000000..ff2a81401910
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/5.0.3.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "lua-5.0.3";
+
+  src = fetchurl {
+    url = http://www.lua.org/ftp/lua-5.0.3.tar.gz;
+    sha256 = "1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671";
+  };
+
+  configurePhase = "sed -i -e 's/MYCFLAGS=.*/MYCFLAGS=-O3 -fomit-frame-pointer -fPIC/' config";
+  buildFlags = "all so sobin";
+  installFlags = "INSTALL_ROOT=$$out";
+  installTargets = "install soinstall";
+
+  meta = {
+    homepage = "http://www.lua.org";
+    description = "Lua is a powerful, fast, lightweight, embeddable scripting language.";
+    longDescription = ''
+      Lua combines simple procedural syntax with powerful data
+      description constructs based on associative arrays and extensible
+      semantics. Lua is dynamically typed, runs by interpreting bytecode
+      for a register-based virtual machine, and has automatic memory
+      management with incremental garbage collection, making it ideal
+      for configuration, scripting, and rapid prototyping.
+    '';
+    license = "MIT";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1cc6fbb7b7e..2dad148fb694 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2373,6 +2373,8 @@ let
 
   lua5 = callPackage ../development/interpreters/lua-5 { };
 
+  lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { };
+
   maude = callPackage ../development/interpreters/maude { };
 
   octave = callPackage ../development/interpreters/octave {

From 3806050f6023023c14dc4b9ad2931b2c90f7ee4f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Jul 2011 14:04:24 +0000
Subject: [PATCH 049/113] gravit: enable support for lua 5.0.x

The build doesn't work with the latest version 5.1.x. Upstream is going
to release an update to fix this soon.

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

diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
index 3e6ebc29519a..7183be1718aa 100644
--- a/pkgs/applications/science/astronomy/gravit/default.nix
+++ b/pkgs/applications/science/astronomy/gravit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa }:
+{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_0 }:
 
 let
   name = "gravit-0.4.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "f37f3ac256a4acbf575f709addaae8cb01eda4f85537affa28c45f2df6fddb07";
   };
 
-  buildInputs = [mesa SDL SDL_ttf SDL_image];
+  buildInputs = [mesa SDL SDL_ttf SDL_image lua5_0];
 
   configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3";
 

From 5d27ed479a5d180151703f27f77c4e9269e3e8dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Jul 2011 16:15:41 +0000
Subject: [PATCH 050/113] Updating podofo

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

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 0d18c37987ee..ad447207a14a 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -2,10 +2,10 @@
 openssl, libpng, lua5}:
 
 stdenv.mkDerivation rec {
-  name = "podofo-0.8.2";
+  name = "podofo-0.9.1";
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
-    sha256 = "064cgrvjvy57n5i25d4j7yx5wd3wgkdks448bzc3a8nsmyl08skq";
+    sha256 = "0icpxh1l1dpviq2zwy764dhg8y03zwyf4pgw4s7kb165nvh9v5kv";
   };
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
   buildInputs = [ cmake lua5 stdenv.gcc.libc ];

From d7d0700d18501374bc8ecb4e2a07c1c5bdbc6bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 10 Jul 2011 17:38:21 +0000
Subject: [PATCH 051/113] Added test-framework.

svn path=/nixpkgs/trunk/; revision=27695
---
 .../libraries/haskell/ansi-wl-pprint/default.nix   |  4 ++--
 .../libraries/haskell/hostname/default.nix         | 13 +++++++++++++
 .../haskell/test-framework-hunit/default.nix       | 14 ++++++++++++++
 .../haskell/test-framework-quickcheck/default.nix  | 14 ++++++++++++++
 .../haskell/test-framework-quickcheck2/default.nix | 14 ++++++++++++++
 .../libraries/haskell/test-framework/default.nix   | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                | 10 ++++++++++
 7 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/hostname/default.nix
 create mode 100644 pkgs/development/libraries/haskell/test-framework-hunit/default.nix
 create mode 100644 pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
 create mode 100644 pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
 create mode 100644 pkgs/development/libraries/haskell/test-framework/default.nix

diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
index b7141f6517da..588ffe4f5c1d 100644
--- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
+++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "ansi-wl-pprint";
-  version = "0.5.0";
-  sha256 = "295e6924409012e3371db1bb5c02475614fcf1ea99e6bff45a5fc84fb13b8284";
+  version = "0.6.3";
+  sha256 = "1cpkfn1ld0sjysksdsxxwwy1b17s4smmzk8y88y9mb81vgwlalkl";
   propagatedBuildInputs = [ansiTerminal];
   meta = {
     description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
diff --git a/pkgs/development/libraries/haskell/hostname/default.nix b/pkgs/development/libraries/haskell/hostname/default.nix
new file mode 100644
index 000000000000..543776e084c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hostname/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "hostname";
+  version = "1.0";
+  sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv";
+  meta = {
+    description = "A very simple package providing a cross-platform means of determining the hostname";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
new file mode 100644
index 000000000000..491a73e7616a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
@@ -0,0 +1,14 @@
+{cabal, HUnit, testFramework}:
+
+cabal.mkDerivation (self : {
+  pname = "test-framework-hunit";
+  version = "0.2.6";
+  sha256 = "1ivgyh71wwvrrgnk3fp6hsfssvy39jikhjdzr7x68pv1ca7f247r";
+  propagatedBuildInputs = [HUnit testFramework];
+  meta = {
+    description = "HUnit support for the test-framework package";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
new file mode 100644
index 000000000000..80e0b1a0f00e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
@@ -0,0 +1,14 @@
+{cabal, QuickCheck1, testFramework, deepseq}:
+
+cabal.mkDerivation (self : {
+  pname = "test-framework-quickcheck";
+  version = "0.2.7";
+  sha256 = "065nazli8vh9dz8xi71gwzlwy81anfd471jhz6hv3m893cc9vvx8";
+  propagatedBuildInputs = [QuickCheck1 testFramework deepseq];
+  meta = {
+    description = "QuickCheck support for the test-framework package";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
new file mode 100644
index 000000000000..c8d84f710505
--- /dev/null
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
@@ -0,0 +1,14 @@
+{cabal, QuickCheck2, testFramework}:
+
+cabal.mkDerivation (self : {
+  pname = "test-framework-quickcheck2";
+  version = "0.2.10";
+  sha256 = "12c37m74idjydxshgms9ib9ii2rpvy4647kra2ards1w2jmnr6w3";
+  propagatedBuildInputs = [QuickCheck2 testFramework];
+  meta = {
+    description = "QuickCheck2 support for the test-framework package";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix
new file mode 100644
index 000000000000..34d2db546b63
--- /dev/null
+++ b/pkgs/development/libraries/haskell/test-framework/default.nix
@@ -0,0 +1,14 @@
+{cabal, ansiTerminal, ansiWLPprint, hostname, regexPosix, xml}:
+
+cabal.mkDerivation (self : {
+  pname = "test-framework";
+  version = "0.4.0";
+  sha256 = "0zxrdndycr63kzfibk0c2n4j39x6b8s4332sgqm54g1vdl3fxzbl";
+  propagatedBuildInputs = [ansiTerminal ansiWLPprint hostname regexPosix xml];
+  meta = {
+    description = "Framework for running and organising tests";
+    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 17e91685c56f..09cc5606adfe 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -615,6 +615,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
 
+  hostname = callPackage ../development/libraries/haskell/hostname {};
+
   hscolour = callPackage ../development/libraries/haskell/hscolour {};
 
   hsemail = callPackage ../development/libraries/haskell/hsemail {};
@@ -937,6 +939,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     inherit (pkgs) ncurses;
   };
 
+  testFramework = callPackage ../development/libraries/haskell/test-framework {};
+
+  testFrameworkHUnit = callPackage ../development/libraries/haskell/test-framework-hunit {};
+
+  testFrameworkQuickCheck = callPackage ../development/libraries/haskell/test-framework-quickcheck {};
+
+  testFrameworkQuickCheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {};
+
   testpack = callPackage ../development/libraries/haskell/testpack {};
 
   texmath = callPackage ../development/libraries/haskell/texmath {};

From 03446e108d2e4b7481d13184deb2c5f6591122ba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Jul 2011 20:17:38 +0000
Subject: [PATCH 052/113] cmake: updated to version 2.8.5

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

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index bc6677496255..1e15558a93e0 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -6,7 +6,7 @@ let
   os = stdenv.lib.optionalString;
   inherit (stdenv.lib) optional;
   majorVersion = "2.8";
-  minorVersion = "4";
+  minorVersion = "5";
   version = "${majorVersion}.${minorVersion}";
 in
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1k2kjaj3vfifb329ff7fr4hcbpbaqb66l97pshq70h7m0zwajznr";
+    sha256 = "5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91";
   };
 
   buildInputs = [ curl expat zlib bzip2 libarchive ]

From 8223f679290e73ac456020fbcd150af3b1929d37 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Jul 2011 20:17:44 +0000
Subject: [PATCH 053/113] Added stellarium 0.11.0.

svn path=/nixpkgs/trunk/; revision=27697
---
 .../science/astronomy/stellarium/default.nix  | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/science/astronomy/stellarium/default.nix

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
new file mode 100644
index 000000000000..916363182a69
--- /dev/null
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
+
+let
+  name = "stellarium-0.11.0";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "mirror://sourceforge/stellarium/${name}.tar.gz";
+    sha256 = "dbedf47dd0744fb325d67d63d1279101be7f4259af2a5e8027f1072012dd2587";
+  };
+
+  buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];
+
+  cmakeFlags = "-DINTL_INCLUDE_DIR= -DINTL_LIBRARIES=";
+  preConfigure = ''
+    sed -i -e '/typedef void (\*__GLXextFuncPtr)(void);/d' src/core/external/GLee.h
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "an free open source planetarium";
+    homepage = http://stellarium.org/;
+    license = "GPL2";
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2dad148fb694..2603a46e5edd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -752,8 +752,6 @@ let
     inherit (gtkLibs) pango;
   };
 
-  gravit = callPackage ../applications/science/astronomy/gravit { };
-
   groff = callPackage ../tools/text/groff {
     ghostscript = null;
   };
@@ -7643,6 +7641,9 @@ let
     inherit (gtkLibs) pango;
   };
 
+  gravit = callPackage ../applications/science/astronomy/gravit { };
+
+  stellarium = callPackage ../applications/science/astronomy/stellarium { };
 
   ### SCIENCE/GEOMETRY
 

From 13e0b7bbed5e2a9654b78cf5425491d60ee1ab6f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Jul 2011 22:21:39 +0000
Subject: [PATCH 054/113] Revert "cmake: updated to version 2.8.5".

The latest version doesn't compile on Hydra. It does compile on my
machine, though. Not sure what happened.

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

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 1e15558a93e0..bc6677496255 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -6,7 +6,7 @@ let
   os = stdenv.lib.optionalString;
   inherit (stdenv.lib) optional;
   majorVersion = "2.8";
-  minorVersion = "5";
+  minorVersion = "4";
   version = "${majorVersion}.${minorVersion}";
 in
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91";
+    sha256 = "1k2kjaj3vfifb329ff7fr4hcbpbaqb66l97pshq70h7m0zwajznr";
   };
 
   buildInputs = [ curl expat zlib bzip2 libarchive ]

From 5c4590fa50ed79e7ab32ef36a56be1377f789606 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 11 Jul 2011 00:42:02 +0000
Subject: [PATCH 055/113] MediaTomb: packaged

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

diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix
new file mode 100644
index 000000000000..d040a4c9a57a
--- /dev/null
+++ b/pkgs/servers/mediatomb/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl
+, sqlite, expat, spidermonkey, taglib, libexif, curl, ffmpeg, file }:
+stdenv.mkDerivation rec {
+
+  name = "mediatomb-${version}";
+  version = "0.12.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mediatomb/${name}.tar.gz";
+    sha256 = "1k8i5zvgik7cad7znd8358grzwh62frpqww1a5rwkldrlws3q5ii";
+  };
+
+  buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file ];
+
+  configureFlags = [ "--enable-inotify" ];
+
+  meta = with stdenv.lib; {
+    homepage = http://mediatomb.cc;
+    description = "UPnP MediaServer with a web user interface,";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2603a46e5edd..ef104186ff52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4688,6 +4688,8 @@ let
 
   lighttpd = callPackage ../servers/http/lighttpd { };
 
+  mediatomb = callPackage ../servers/mediatomb { };
+
   mod_python = callPackage ../servers/http/apache-modules/mod_python { };
 
   mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { };

From eabbecd10f36e4513952c9224c0412d0b5442a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 11 Jul 2011 07:17:53 +0000
Subject: [PATCH 056/113] Added hp2any.

svn path=/nixpkgs/trunk/; revision=27701
---
 .../libraries/haskell/bytestring-trie/default.nix  | 14 ++++++++++++++
 .../libraries/haskell/hp2any-core/default.nix      | 14 ++++++++++++++
 .../libraries/haskell/hp2any-graph/default.nix     | 14 ++++++++++++++
 .../libraries/haskell/parseargs/default.nix        |  4 ++--
 pkgs/top-level/haskell-packages.nix                |  6 ++++++
 5 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/bytestring-trie/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hp2any-core/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hp2any-graph/default.nix

diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix
new file mode 100644
index 000000000000..8cbc0f30ea3e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix
@@ -0,0 +1,14 @@
+{cabal, binary}:
+
+cabal.mkDerivation (self : {
+  pname = "bytestring-trie";
+  version = "0.2.3";
+  sha256 = "1zb4s7fd951swc648szrpx0ldailmdinapgbcg1zajb5c5jq57ga";
+  propagatedBuildInputs = [binary];
+  meta = {
+    description = "An efficient finite map from (byte)strings to values";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix
new file mode 100644
index 000000000000..b7e7d1da40dc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix
@@ -0,0 +1,14 @@
+{cabal, bytestringTrie, network}:
+
+cabal.mkDerivation (self : {
+  pname = "hp2any-core";
+  version = "0.10.1";
+  sha256 = "1qblsvlj4x22ml3k5mlr28r5xk9rmi7lpipd369dbvdzm0rflf03";
+  propagatedBuildInputs = [bytestringTrie network];
+  meta = {
+    description = "Heap profiling helper library";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix
new file mode 100644
index 000000000000..b0e3d3ddfcde
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix
@@ -0,0 +1,14 @@
+{cabal, GLUT, OpenGL, hp2anyCore, network, parseargs}:
+
+cabal.mkDerivation (self : {
+  pname = "hp2any-graph";
+  version = "0.5.3";
+  sha256 = "1al20pxfgkgwynrx7vr0i57342s91lcm3cnd9qjx8b6vkqmzykkq";
+  propagatedBuildInputs = [GLUT OpenGL hp2anyCore network parseargs];
+  meta = {
+    description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
+    license = "BSD3";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix
index f105aaf5cfb2..08a5ac652e57 100644
--- a/pkgs/development/libraries/haskell/parseargs/default.nix
+++ b/pkgs/development/libraries/haskell/parseargs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "parseargs";
-  version = "0.1.2";
-  sha256 = "93e34497bc3921f245474a8fc1807303211cf5ab40f0b655e02eb0242ef75694";
+  version = "0.1.3.2";
+  sha256 = "1ncdbjzfkhb1f3aznsci26kss9nrv3iilc65q5xdl9nly8p837mv";
   meta = {
     description = "Command-line argument parsing library for Haskell programs";
   };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 09cc5606adfe..03df774c4c85 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -365,6 +365,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {};
 
+  bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {};
+
   cairo = callPackage ../development/libraries/haskell/cairo {
     inherit (pkgs) cairo zlib;
   };
@@ -617,6 +619,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hostname = callPackage ../development/libraries/haskell/hostname {};
 
+  hp2anyCore = callPackage ../development/libraries/haskell/hp2any-core {};
+
+  hp2anyGraph = callPackage ../development/libraries/haskell/hp2any-graph {};
+
   hscolour = callPackage ../development/libraries/haskell/hscolour {};
 
   hsemail = callPackage ../development/libraries/haskell/hsemail {};

From 8268a39690b036f9687ced0db23e9760505ec8c6 Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 13:59:37 +0000
Subject: [PATCH 057/113] Improved the Linux kernel building framework

Moved the hardcoded postBuild hook from the builder to generic.nix:

Some old kernel (such as 2.6.15) did not yet support the unifdef target.
As a result, compiling them with the current Linux builder leads to a
failure.
Fixed by moving this hook as argument of the top-level function of
generic.nix. This allows some kernel nix codes to overrides its default
value.

svn path=/nixpkgs/trunk/; revision=27708
---
 pkgs/os-specific/linux/kernel/builder.sh  | 15 ++++-----------
 pkgs/os-specific/linux/kernel/generic.nix |  4 ++++
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 5bedebc11ec8..61cb8f280810 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -16,8 +16,8 @@ postPatch() {
 }
 
 configurePhase() {
-    if test -n "$preConfigure"; then 
-        eval "$preConfigure"; 
+    if test -n "$preConfigure"; then
+        eval "$preConfigure";
     fi
 
     export INSTALL_PATH=$out
@@ -46,13 +46,6 @@ configurePhase() {
 }
 
 
-postBuild() {
-    # After the builder did a 'make all' (kernel + modules)
-    # we force building the target asked: bzImage/zImage/uImage/...
-    make $makeFlags $kernelTarget
-    make $makeFlags -C scripts unifdef
-}
-
 installPhase() {
 
     ensureDir $out
@@ -149,8 +142,8 @@ installPhase() {
         fi
     fi
 
-    if test -n "$postInstall"; then 
-        eval "$postInstall"; 
+    if test -n "$postInstall"; then
+        eval "$postInstall";
     fi
 }
 
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 42cefd5b584f..138c9a53d041 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -35,6 +35,10 @@
 , extraMeta ? {}
 , ubootChooser ? null
 , postInstall ? ""
+
+, # After the builder did a 'make all' (kernel + modules)
+  # we force building the target asked: bzImage/zImage/uImage/...
+  postBuild ? "make $makeFlags $kernelTarget; make $makeFlags -C scripts unifdef"
 , ...
 }:
 

From df0a6394b31fac21f29ce6230d012f592e1ef33a Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 13:59:40 +0000
Subject: [PATCH 058/113] Suffixed cifs timeout patch with kernel version.

Currently suffixed with 2.6.32.
This pre-patch prepares the landing of several versions of this patch to
support other Linux kernel versions.

svn path=/nixpkgs/trunk/; revision=27709
---
 ...s-timeout.patch => cifs-timeout-2.6.32.patch} |  0
 pkgs/os-specific/linux/kernel/patches.nix        | 16 +++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)
 rename pkgs/os-specific/linux/kernel/{cifs-timeout.patch => cifs-timeout-2.6.32.patch} (100%)

diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.32.patch
similarity index 100%
rename from pkgs/os-specific/linux/kernel/cifs-timeout.patch
rename to pkgs/os-specific/linux/kernel/cifs-timeout-2.6.32.patch
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 47154600aa0d..92e07f3cdefe 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -38,7 +38,7 @@ let
 
 in
 
-{
+rec {
 
   sec_perm_2_6_24 =
     { name = "sec_perm-2.6.24";
@@ -55,7 +55,7 @@ in
       extraConfig = fbcondecorConfig;
       features.fbConDecor = true;
     };
-      
+
   fbcondecor_2_6_27 =
     { name = "fbcondecor-0.9.4-2.6.27";
       patch = fetchurl {
@@ -75,7 +75,7 @@ in
       extraConfig = fbcondecorConfig;
       features.fbConDecor = true;
     };
-    
+
   fbcondecor_2_6_29 =
     { name = "fbcondecor-0.9.6-2.6.29.2";
       patch = fetchurl {
@@ -85,7 +85,7 @@ in
       extraConfig = fbcondecorConfig;
       features.fbConDecor = true;
     };
-    
+
   fbcondecor_2_6_31 =
     { name = "fbcondecor-0.9.6-2.6.31.2";
       patch = fetchurl {
@@ -148,7 +148,7 @@ in
       };
     };
 
-  gcov_2_6_28 = 
+  gcov_2_6_28 =
     { name = "gcov";
       patch = fetchurl {
         url = http://buildfarm.st.ewi.tudelft.nl/~eelco/dist/linux-2.6.28-gcov.patch;
@@ -235,12 +235,14 @@ in
 
   # Increase the timeout on CIFS requests from 15 to 120 seconds to
   # make CIFS more resilient to high load on the CIFS server.
-  cifs_timeout =
+  cifs_timeout_2_6_32 =
     { name = "cifs-timeout";
-      patch = ./cifs-timeout.patch;
+      patch = ./cifs-timeout-2.6.32.patch;
       features.cifsTimeout = true;
     };
 
+  cifs_timeout = cifs_timeout_2_6_32;
+
   no_xsave =
     { name = "no-xsave";
       patch = fetchurl {

From c551998c82c3db0c09a43578d5d132e05652303a Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 13:59:43 +0000
Subject: [PATCH 059/113] Added CIFS timeout patch for Linux 2.6.{35 --> 38}

svn path=/nixpkgs/trunk/; revision=27710
---
 .../linux/kernel/cifs-timeout-2.6.35.patch    | 45 +++++++++++++++++++
 .../linux/kernel/cifs-timeout-2.6.38.patch    | 13 ++++++
 pkgs/os-specific/linux/kernel/patches.nix     | 12 +++++
 3 files changed, 70 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-2.6.35.patch
 create mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch

diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.35.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.35.patch
new file mode 100644
index 000000000000..8043739ee9a8
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.35.patch
@@ -0,0 +1,45 @@
+--- /tmp/linux-2.6.32.14/fs/cifs/transport.c	2010-11-22 20:01:26.000000000 +0100
++++ linux-2.6.32.14/fs/cifs/transport.c	2011-03-29 15:31:14.926510480 +0200
+@@ -166,8 +166,8 @@
+ 			   after the retries we will kill the socket and
+ 			   reconnect which may clear the network problem.
+ 			*/
+-			if ((i >= 14) || (!server->noblocksnd && (i > 2))) {
+-				cERROR(1, "sends on sock %p stuck for 15 seconds",
++			if ((i >= 119) || (!server->noblocksnd && (i > 2))) {
++				cERROR(1, "sends on sock %p stuck for 119 seconds",
+ 				    ssocket);
+ 				rc = -EAGAIN;
+ 				break;
+@@ -458,11 +458,11 @@
+ 		goto out;
+ 
+ 	if (long_op == CIFS_STD_OP)
+-		timeout = 15 * HZ;
++		timeout = 120 * HZ;
+ 	else if (long_op == CIFS_VLONG_OP) /* e.g. slow writes past EOF */
+ 		timeout = 180 * HZ;
+ 	else if (long_op == CIFS_LONG_OP)
+-		timeout = 45 * HZ; /* should be greater than
++		timeout = 120 * HZ; /* should be greater than
+ 			servers oplock break timeout (about 43 seconds) */
+ 	else if (long_op == CIFS_ASYNC_OP)
+ 		goto out;
+@@ -650,7 +650,7 @@
+ 		goto out;
+ 
+ 	if (long_op == CIFS_STD_OP)
+-		timeout = 15 * HZ;
++		timeout = 120 * HZ;
+ 	/* wait for 15 seconds or until woken up due to response arriving or
+ 	   due to last connection to this server being unmounted */
+ 	else if (long_op == CIFS_ASYNC_OP)
+@@ -658,7 +658,7 @@
+ 	else if (long_op == CIFS_VLONG_OP) /* writes past EOF can be slow */
+ 		timeout = 180 * HZ;
+ 	else if (long_op == CIFS_LONG_OP)
+-		timeout = 45 * HZ; /* should be greater than
++		timeout = 120 * HZ; /* should be greater than
+ 			servers oplock break timeout (about 43 seconds) */
+ 	else if (long_op == CIFS_BLOCKING_OP)
+ 		timeout = 0x7FFFFFFF; /* large but no so large as to wrap */
diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch
new file mode 100644
index 000000000000..8168ffb5a1af
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch
@@ -0,0 +1,13 @@
+--- /tmp/linux-2.6.32.14/fs/cifs/transport.c	2011-03-27 20:37:20.000000000 +0200
++++ linux-2.6.32.14/fs/cifs/transport.c	2011-04-01 11:07:17.700305670 +0200
+@@ -182,8 +182,8 @@
+ 			   after the retries we will kill the socket and
+ 			   reconnect which may clear the network problem.
+ 			*/
+-			if ((i >= 14) || (!server->noblocksnd && (i > 2))) {
+-				cERROR(1, "sends on sock %p stuck for 15 seconds",
++			if ((i >= 119) || (!server->noblocksnd && (i > 2))) {
++				cERROR(1, "sends on sock %p stuck for 119 seconds",
+ 				    ssocket);
+ 				rc = -EAGAIN;
+ 				break;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 92e07f3cdefe..d662d2bc65ad 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -241,6 +241,18 @@ rec {
       features.cifsTimeout = true;
     };
 
+  cifs_timeout_2_6_35 =
+    { name = "cifs-timeout";
+      patch = ./cifs-timeout-2.6.35.patch;
+      features.cifsTimeout = true;
+    };
+
+  cifs_timeout_2_6_38 =
+    { name = "cifs-timeout";
+      patch = ./cifs-timeout-2.6.38.patch;
+      features.cifsTimeout = true;
+    };
+
   cifs_timeout = cifs_timeout_2_6_32;
 
   no_xsave =

From b2cf02eb5ed43c0c87b3c8e51032b78a4d8f82b2 Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 13:59:47 +0000
Subject: [PATCH 060/113] Renamed cifs-timeout-2.6.{32 --> 29} patch

Renamed cifs-timeout-2.6.32 patch to cifs-timeout-2.6.29 as this is the
older kernel version this patch applies to.

svn path=/nixpkgs/trunk/; revision=27711
---
 ...{cifs-timeout-2.6.32.patch => cifs-timeout-2.6.29.patch} | 0
 pkgs/os-specific/linux/kernel/patches.nix                   | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/os-specific/linux/kernel/{cifs-timeout-2.6.32.patch => cifs-timeout-2.6.29.patch} (100%)

diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.32.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.29.patch
similarity index 100%
rename from pkgs/os-specific/linux/kernel/cifs-timeout-2.6.32.patch
rename to pkgs/os-specific/linux/kernel/cifs-timeout-2.6.29.patch
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index d662d2bc65ad..62ecb55d0fc9 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -235,9 +235,9 @@ rec {
 
   # Increase the timeout on CIFS requests from 15 to 120 seconds to
   # make CIFS more resilient to high load on the CIFS server.
-  cifs_timeout_2_6_32 =
+  cifs_timeout_2_6_29 =
     { name = "cifs-timeout";
-      patch = ./cifs-timeout-2.6.32.patch;
+      patch = ./cifs-timeout-2.6.29.patch;
       features.cifsTimeout = true;
     };
 
@@ -253,7 +253,7 @@ rec {
       features.cifsTimeout = true;
     };
 
-  cifs_timeout = cifs_timeout_2_6_32;
+  cifs_timeout = cifs_timeout_2_6_29;
 
   no_xsave =
     { name = "no-xsave";

From 68db350b88bbeeb2b55b0c9045e503bf5cb39881 Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 13:59:51 +0000
Subject: [PATCH 061/113] Applied CIFS timeout patch to other Linux kernels

CIFS timeout patch is now activated for a wider range of Linux kernels :
from 2.6.29 to 2.6.38.

These kernels now can be used to perform "VM Testing".

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef104186ff52..2925e3e49534 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5087,6 +5087,7 @@ let
     kernelPatches =
       [ kernelPatches.fbcondecor_2_6_29
         kernelPatches.sec_perm_2_6_24
+	kernelPatches.cifs_timeout_2_6_29
       ];
   };
 
@@ -5101,7 +5102,7 @@ let
       [ kernelPatches.fbcondecor_2_6_31
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs2_2_6_32
-        kernelPatches.cifs_timeout
+        kernelPatches.cifs_timeout_2_6_29
         kernelPatches.no_xsave
         kernelPatches.dell_rfkill
       ];
@@ -5159,6 +5160,7 @@ let
     kernelPatches =
       [ kernelPatches.fbcondecor_2_6_33
         kernelPatches.sec_perm_2_6_24
+	kernelPatches.cifs_timeout_2_6_29
       ];
   };
 
@@ -5184,6 +5186,7 @@ let
       [ /*kernelPatches.fbcondecor_2_6_33*/
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs2_2_6_34
+	kernelPatches.cifs_timeout_2_6_29
       ];
   };
 
@@ -5199,6 +5202,7 @@ let
       [ #kernelPatches.fbcondecor_2_6_35
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs2_2_6_35
+	kernelPatches.cifs_timeout_2_6_35
       ] ++ lib.optional (platform.kernelArch == "arm")
         kernelPatches.sheevaplug_modules_2_6_35;
   };
@@ -5227,6 +5231,7 @@ let
           kernelPatches.sec_perm_2_6_24
           #kernelPatches.aufs2_2_6_35
           kernelPatches.mips_restart_2_6_36
+	  kernelPatches.cifs_timeout_2_6_35
         ];
     };
 
@@ -5248,6 +5253,7 @@ let
         kernelPatches.sec_perm_2_6_24
         #kernelPatches.aufs2_2_6_35
         kernelPatches.mips_restart_2_6_36
+	kernelPatches.cifs_timeout_2_6_35
       ];
   };
 
@@ -5263,6 +5269,7 @@ let
       [ kernelPatches.fbcondecor_2_6_37
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs2_1_2_6_37
+	kernelPatches.cifs_timeout_2_6_35
         #kernelPatches.mips_restart_2_6_36
       ];
   };
@@ -5279,6 +5286,7 @@ let
       [ kernelPatches.fbcondecor_2_6_38
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs2_1_2_6_38
+	kernelPatches.cifs_timeout_2_6_38
         #kernelPatches.mips_restart_2_6_36
       ];
   };

From 388ba0981b885a4772744851d6a94362108ab438 Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 13:59:54 +0000
Subject: [PATCH 062/113] Added CIFS timeout patch for Linux 2.6.{25 --> 28}

svn path=/nixpkgs/trunk/; revision=27713
---
 .../linux/kernel/cifs-timeout-2.6.25.patch    | 46 +++++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix     |  6 +++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-2.6.25.patch

diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.25.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.25.patch
new file mode 100644
index 000000000000..1c9544ae1dfd
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.25.patch
@@ -0,0 +1,46 @@
+--- /tmp/linux-2.6.32.14/fs/cifs/transport.c	2011-04-07 10:50:40.844188400 +0200
++++ linux-2.6.32.14/fs/cifs/transport.c	2011-04-07 10:52:22.092690465 +0200
+@@ -277,9 +277,9 @@
+ 				    n_vec - first_vec, total_len);
+ 		if ((rc == -ENOSPC) || (rc == -EAGAIN)) {
+ 			i++;
+-			if (i >= 14) {
++			if (i >= 119) {
+ 				cERROR(1,
+-				   ("sends on sock %p stuck for 15 seconds",
++				   ("sends on sock %p stuck for 120 seconds",
+ 				    ssocket));
+ 				rc = -EAGAIN;
+ 				break;
+@@ -553,11 +553,11 @@
+ 		goto out;
+
+ 	if (long_op == CIFS_STD_OP)
+-		timeout = 15 * HZ;
++		timeout = 120 * HZ;
+ 	else if (long_op == CIFS_VLONG_OP) /* e.g. slow writes past EOF */
+ 		timeout = 180 * HZ;
+ 	else if (long_op == CIFS_LONG_OP)
+-		timeout = 45 * HZ; /* should be greater than
++		timeout = 120 * HZ; /* should be greater than
+ 			servers oplock break timeout (about 43 seconds) */
+ 	else if (long_op == CIFS_ASYNC_OP)
+ 		goto out;
+@@ -744,7 +744,7 @@
+ 		goto out;
+
+ 	if (long_op == CIFS_STD_OP)
+-		timeout = 15 * HZ;
++		timeout = 120 * HZ;
+ 	/* wait for 15 seconds or until woken up due to response arriving or
+ 	   due to last connection to this server being unmounted */
+ 	else if (long_op == CIFS_ASYNC_OP)
+@@ -752,7 +752,7 @@
+ 	else if (long_op == CIFS_VLONG_OP) /* writes past EOF can be slow */
+ 		timeout = 180 * HZ;
+ 	else if (long_op == CIFS_LONG_OP)
+-		timeout = 45 * HZ; /* should be greater than
++		timeout = 120 * HZ; /* should be greater than
+ 			servers oplock break timeout (about 43 seconds) */
+ 	else if (long_op == CIFS_BLOCKING_OP)
+ 		timeout = 0x7FFFFFFF; /* large but no so large as to wrap */
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 62ecb55d0fc9..65400427cbe5 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -235,6 +235,12 @@ rec {
 
   # Increase the timeout on CIFS requests from 15 to 120 seconds to
   # make CIFS more resilient to high load on the CIFS server.
+  cifs_timeout_2_6_25 =
+    { name = "cifs-timeout";
+      patch = ./cifs-timeout-2.6.25.patch;
+      features.cifsTimeout = true;
+    };
+
   cifs_timeout_2_6_29 =
     { name = "cifs-timeout";
       patch = ./cifs-timeout-2.6.29.patch;

From e739dc7d6cc89c7e170c8a5f8d73bb471499225d Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 13:59:58 +0000
Subject: [PATCH 063/113] Applied CIFS timeout patch to other kernels

Linux-2.6.{25,27,28} are now compiled with the CIFS timeout patch,
allowing them to be used with "VM Testing".

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2925e3e49534..424332feba01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5059,6 +5059,7 @@ let
       [ kernelPatches.fbcondecor_2_6_25
         kernelPatches.sec_perm_2_6_24
         kernelPatches.glibc_getline
+	kernelPatches.cifs_timeout_2_6_25
       ];
   };
 
@@ -5068,6 +5069,7 @@ let
     kernelPatches =
       [ kernelPatches.fbcondecor_2_6_27
         kernelPatches.sec_perm_2_6_24
+	kernelPatches.cifs_timeout_2_6_25
       ];
   };
 
@@ -5079,6 +5081,7 @@ let
         kernelPatches.sec_perm_2_6_24
         kernelPatches.ext4_softlockups_2_6_28
         kernelPatches.glibc_getline
+	kernelPatches.cifs_timeout_2_6_25
       ];
   };
 

From e381c7c38582236d5bd361fb87fe4fe055d94ba2 Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 14:00:01 +0000
Subject: [PATCH 064/113] Added CIFS timeout patch for Linux 2.6.15

svn path=/nixpkgs/trunk/; revision=27715
---
 .../linux/kernel/cifs-timeout-2.6.15.patch    | 44 +++++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix     |  6 +++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-2.6.15.patch

diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.15.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.15.patch
new file mode 100644
index 000000000000..4e399af8300d
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.15.patch
@@ -0,0 +1,44 @@
+--- a/fs/cifs/transport.c	2011-04-12 15:16:00.253887813 +0200
++++ b/fs/cifs/transport.c	2011-04-12 15:17:22.650296413 +0200
+@@ -247,9 +247,9 @@
+ 				    n_vec - first_vec, total_len);
+ 		if ((rc == -ENOSPC) || (rc == -EAGAIN)) {
+ 			i++;
+-			if(i >= 14) {
++			if(i >= 119) {
+ 				cERROR(1,
+-				   ("sends on sock %p stuck for 15 seconds",
++				   ("sends on sock %p stuck for 120 seconds",
+ 				    ssocket));
+ 				rc = -EAGAIN;
+ 				break;
+@@ -421,12 +421,12 @@
+ 	else if (long_op == 2) /* writes past end of file can take loong time */
+ 		timeout = 180 * HZ;
+ 	else if (long_op == 1)
+-		timeout = 45 * HZ; /* should be greater than 
++		timeout = 120 * HZ; /* should be greater than 
+ 			servers oplock break timeout (about 43 seconds) */
+ 	else if (long_op > 2) {
+ 		timeout = MAX_SCHEDULE_TIMEOUT;
+ 	} else
+-		timeout = 15 * HZ;
++		timeout = 120 * HZ;
+ 	/* wait for 15 seconds or until woken up due to response arriving or 
+ 	   due to last connection to this server being unmounted */
+ 	if (signal_pending(current)) {
+@@ -687,12 +687,12 @@
+ 	else if (long_op == 2) /* writes past end of file can take loong time */
+ 		timeout = 180 * HZ;
+ 	else if (long_op == 1)
+-		timeout = 45 * HZ; /* should be greater than 
++		timeout = 120 * HZ; /* should be greater than 
+ 			servers oplock break timeout (about 43 seconds) */
+ 	else if (long_op > 2) {
+ 		timeout = MAX_SCHEDULE_TIMEOUT;
+ 	} else
+-		timeout = 15 * HZ;
++		timeout = 120 * HZ;
+ 	/* wait for 15 seconds or until woken up due to response arriving or 
+ 	   due to last connection to this server being unmounted */
+ 	if (signal_pending(current)) {
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 65400427cbe5..902be41f874c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -235,6 +235,12 @@ rec {
 
   # Increase the timeout on CIFS requests from 15 to 120 seconds to
   # make CIFS more resilient to high load on the CIFS server.
+  cifs_timeout_2_6_15 =
+    { name = "cifs-timeout";
+      patch = ./cifs-timeout-2.6.15.patch;
+      features.cifsTimeout = true;
+    };
+
   cifs_timeout_2_6_25 =
     { name = "cifs-timeout";
       patch = ./cifs-timeout-2.6.25.patch;

From 808c2f69b4eb76ee51801e3701effc770613302c Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 14:00:03 +0000
Subject: [PATCH 065/113] Fixed Linux 2.6.31 compilation

linux_2_6_31 compilation was broken and added the CIFS timeout patch.

svn path=/nixpkgs/trunk/; revision=27716
---
 .../os-specific/linux/kernel/linux-2.6.31.nix | 247 ++++++++++++++----
 pkgs/top-level/all-packages.nix               |   4 +-
 2 files changed, 202 insertions(+), 49 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.31.nix b/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
index d248e8f86083..523f3c9ceb5c 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
@@ -1,63 +1,214 @@
-args @ {stdenv, fetchurl, userModeLinux ? false, oldI686 ? false, ...}:
+{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
 
-assert !userModeLinux;
+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
+
+      # Include the CFQ I/O scheduler in the kernel, rather than as a
+      # module, so that the initrd gets a good I/O scheduler.
+      IOSCHED_CFQ 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
+      IWLWIFI_LEDS? y
+      IWLWIFI_SPECTRUM_MEASUREMENT y
+      IWL3945_SPECTRUM_MEASUREMENT y
+      IWL4965 y # Intel Wireless WiFi 4965AGN
+      IWL5000 y # Intel Wireless WiFi 5000AGN
+      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
+      HOSTAP_FIRMWARE_NVRAM y
+
+      # Some settings to make sure that fbcondecor works - in particular,
+      # disable tileblitting and the drivers that need it.
+
+      # Enable various FB devices.
+      FB y
+      FB_EFI y
+      FB_NVIDIA_I2C y # Enable DDC Support
+      FB_RIVA_I2C y
+      FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
+      FB_ATY_GX y # Mach64 GX support
+      FB_SAVAGE_I2C y
+      FB_SAVAGE_ACCEL y
+      FB_SIS_300 y
+      FB_SIS_315 y
+      FB_3DFX_ACCEL y
+      FB_GEODE y
+
+      # Video configuration
+      # The intel drivers already require KMS
+      DRM_I915_KMS y
+
+      # 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
+      OCFS2_FS_POSIX_ACL y
+      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_BSG n
+      BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
+      BLK_DEV_IDEACPI y # IDE ACPI support
+      BLK_DEV_INTEGRITY y
+      BSD_PROCESS_ACCT_V3 y
+      BT_HCIUART_BCSP y
+      BT_HCIUART_H4 y # UART (H4) protocol support
+      BT_HCIUART_LL y
+      BT_RFCOMM_TTY y # RFCOMM TTY support
+      CPU_FREQ_DEBUG n
+      CRASH_DUMP n
+      DMAR? n # experimental
+      DVB_DYNAMIC_MINORS y # we use udev
+      FUSION y # Fusion MPT device support
+      IDE_GD_ATAPI y # ATAPI floppy support
+      IRDA_ULTRA y # Ultra (connectionless) protocol
+      JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
+      JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
+      JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
+      JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
+      KALLSYMS_EXTRA_PASS n
+      LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
+      LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
+      LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
+      LOGO n # not needed
+      MEDIA_ATTACH y
+      MEGARAID_NEWGEN y
+      MICROCODE_AMD y
+      MODVERSIONS y
+      MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
+      MTRR_SANITIZER y
+      NET_FC y # Fibre Channel driver support
+      PCI_LEGACY y
+      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
+
+      ${extraConfig}
+    '';
+in
 
 import ./generic.nix (
 
   rec {
     version = "2.6.31.14";
-  
+
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
       sha256 = "1c6ivcjgns4gbx04mhnhndqikm3prqhhfm2a5zrb1mfyvvishqpp";
     };
 
-    features = {
-      iwlwifi = true;
-    };
+    config = configWithPlatform stdenv.platform;
+    configCross = configWithPlatform stdenv.cross.platform;
 
-    preConfigure = if (stdenv.system != "armv5tel-linux") then ''
-        killOption () {
-          sed -re 's/^('"$1"')=[ym]/# \1 is not set/' -i .config
-        }
-        setOptionMod () {
-          sed -re 's/^# ('"$1"') is not set/\1=m/' -i .config
-          sed -re "1i$1=m" -i .config
-        }
-        setOptionYes () {
-          sed -re 's/^# ('"$1"') is not set/\1=y/' -i .config
-          sed -re "1i$1=y" -i .config
-        }
-        
-        make allmodconfig
-        
-	killOption CONFIG_CMDLINE_OVERRIDE
-
-        killOption CONFIG_IMA
-        killOption 'CONFIG_.*_DEBUG.*'
-        killOption 'CONFIG_DEBUG.*'
-        killOption CONFIG_AUDIT_ARCH
-        killOption CONFIG_PERF_COUNTERS
-        killOption 'CONFIG_GCOV.*'
-        killOption 'CONFIG_KGDB.*'
-        killOption 'CONFIG_.*_TEST'
-
-        killOption 'CONFIG_USB_OTG_BLACKLIST_HUB'
-
-        killOption CONFIG_KERNEL_BZIP2
-        killOption CONFIG_KERNEL_LZMA
-        setOptionYes CONFIG_KERNEL_GZIP
-        
-        killOption CONFIG_TASKSTATS
-        killOption CONFIG_PREEMPT_NONE
-        setOptionYes CONFIG_PREEMPT_VOLUNTARY
-        
-        cp .config ${config}
-    '' else "";
-
-    config = if (stdenv.system == "armv5tel-linux") then 
-      (./config-2.6.31-armv5tel) else "./kernel-config";
+    features.iwlwifi = true;
   }
 
-  // args
+  // removeAttrs args ["extraConfig"]
 )
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 424332feba01..c7d94b682337 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5096,7 +5096,9 @@ let
 
   linux_2_6_31 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.31.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools platform;
-    kernelPatches = [];
+    kernelPatches =
+      [ kernelPatches.cifs_timeout_2_6_29
+      ];
   };
 
   linux_2_6_32 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) {

From ddb9ad5b3c42ecece22f7ed715fd4df651367ade Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 14:00:07 +0000
Subject: [PATCH 066/113] Modified Linux 2.6.25 configuration

Added "KMOD y" else booting this kernel fails (at the modprobe stuff).

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7d94b682337..3e131ffca299 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5054,6 +5054,7 @@ let
 
   linux_2_6_25 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.25.nix) {
     inherit fetchurl perl mktemp module_init_tools;
+    extraConfig = "KMOD y";
     stdenv = overrideInStdenv stdenv [gnumake381];
     kernelPatches =
       [ kernelPatches.fbcondecor_2_6_25

From 89e57d47d7e4cc772862644ed72b0d219a999b08 Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 14:00:13 +0000
Subject: [PATCH 067/113] Renamed udev to udev166

This renaming prepares the landing of several versions of udev which are
required to boot old Linux versions.
The udev expression is mapped to udev166.

svn path=/nixpkgs/trunk/; revision=27718
---
 pkgs/os-specific/linux/udev/{default.nix => 166.nix} | 0
 pkgs/top-level/all-packages.nix                      | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename pkgs/os-specific/linux/udev/{default.nix => 166.nix} (100%)

diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/166.nix
similarity index 100%
rename from pkgs/os-specific/linux/udev/default.nix
rename to pkgs/os-specific/linux/udev/166.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e131ffca299..4498c3c145c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5656,7 +5656,8 @@ let
     cross = assert crossSystem != null; crossSystem;
   };
 
-  udev = callPackage ../os-specific/linux/udev { };
+  udev166 = callPackage ../os-specific/linux/udev/166.nix { };
+  udev = udev166;
 
   uml = import ../os-specific/linux/kernel/linux-2.6.29.nix {
     inherit fetchurl stdenv perl mktemp module_init_tools;

From f225ee7c9b0e9448715897df4bf908a11d2163cb Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 14:00:17 +0000
Subject: [PATCH 068/113] Add udev145

svn path=/nixpkgs/trunk/; revision=27719
---
 pkgs/os-specific/linux/udev/145.nix | 51 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  1 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/os-specific/linux/udev/145.nix

diff --git a/pkgs/os-specific/linux/udev/145.nix b/pkgs/os-specific/linux/udev/145.nix
new file mode 100644
index 000000000000..43ae9c35e000
--- /dev/null
+++ b/pkgs/os-specific/linux/udev/145.nix
@@ -0,0 +1,51 @@
+{stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils}:
+
+stdenv.mkDerivation rec {
+  name = "udev-145";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
+    sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv";
+  };
+
+  buildInputs = [gperf pkgconfig glib acl libusb usbutils];
+
+  configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids";
+
+  preConfigure =
+    ''
+      substituteInPlace extras/keymap/Makefile.in \
+        --replace /usr/include ${stdenv.glibc}/include
+    '';
+
+  postInstall =
+    ''
+      # Install some rules that really should be installed by default.
+      for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do
+        cp rules/packages/$i $out/libexec/rules.d/
+      done
+
+      # The path to rule_generator.functions in write_cd_rules and
+      # write_net_rules is broken.  Also, don't store the mutable
+      # persistant rules in /etc/udev/rules.d but in
+      # /var/lib/udev/rules.d.
+      for i in $out/libexec/write_cd_rules $out/libexec/write_net_rules; do
+        substituteInPlace $i \
+          --replace /lib/udev $out/libexec \
+          --replace /etc/udev/rules.d /var/lib/udev/rules.d
+      done
+
+      # Don't set PATH to /bin:/sbin; won't work in NixOS.
+      substituteInPlace $out/libexec/rule_generator.functions \
+        --replace 'PATH=' '#PATH='
+
+      # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the
+      # environment of the caller.
+      sed '3,4d' -i $out/libexec/firmware.sh
+    '';
+
+  meta = {
+    homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
+    description = "Udev manages the /dev filesystem";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4498c3c145c3..4b20300f5abc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5656,6 +5656,7 @@ let
     cross = assert crossSystem != null; crossSystem;
   };
 
+  udev145 = callPackage ../os-specific/linux/udev/145.nix { };
   udev166 = callPackage ../os-specific/linux/udev/166.nix { };
   udev = udev166;
 

From 14f3664d3ff1bbe23a5744be9f3c09a92df3ceca Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 14:00:21 +0000
Subject: [PATCH 069/113] Added Linux 2.6.26

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

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.26.nix b/pkgs/os-specific/linux/kernel/linux-2.6.26.nix
new file mode 100644
index 000000000000..b402cdea7426
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.26.nix
@@ -0,0 +1,177 @@
+{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
+
+let
+  configWithPlatform = kernelPlatform :
+    ''
+        # Don't include any debug features.
+        DEBUG_KERNEL n
+
+	# Activate /proc/sys/kernel/modprobe
+	KMOD y
+
+        # 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
+
+        # Virtualisation (KVM, Xen...).
+        PARAVIRT_GUEST y
+        KVM_CLOCK y
+        KVM_GUEST y
+
+        # Include the CFQ I/O scheduler in the kernel, rather than as a
+        # module, so that the initrd gets a good I/O scheduler.
+        IOSCHED_CFQ y
+
+        # Disable some expensive (?) features.
+        MARKERS n
+        KPROBES n
+        NUMA? 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
+
+        # Some settings to make sure that fbcondecor works - in particular,
+        # disable tileblitting and the drivers that need it.
+
+        # Enable various FB devices.
+        FB_EFI y
+        FB_NVIDIA_I2C y # Enable DDC Support
+        FB_RIVA_I2C y
+        FB_ATY_CT y # ach64 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_TRIDENT_ACCEL y
+        FB_GEODE y
+
+        # Sound.
+        SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
+        SND_USB_CAIAQ_INPUT y
+        PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+
+        # Enable a bunch of USB storage devices.
+        USB_STORAGE_DATAFAB y
+        USB_STORAGE_FREECOM y
+        USB_STORAGE_ISD200 y
+        USB_STORAGE_USBAT y
+        USB_STORAGE_SDDR09 y
+        USB_STORAGE_SDDR55 y
+        USB_STORAGE_JUMPSHOT y
+        USB_STORAGE_ONETOUCH y
+        USB_STORAGE_KARMA y
+        USB_STORAGE_CYPRESS_ATACB y
+
+        # 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
+        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
+        NFSD_V2_ACL y
+        NFSD_V3 y
+        NFSD_V3_ACL y
+        NFSD_V4 y
+        CIFS_XATTR y
+        CIFS_POSIX y
+
+        # Misc. options.
+        8139TOO_8129 y
+        8139TOO_PIO n # PIO is slower
+        AIC79XX_DEBUG_ENABLE n
+        AIC7XXX_DEBUG_ENABLE n
+        AIC94XX_DEBUG n
+        BLK_DEV_BSG n
+        BLK_DEV_IDEACPI y # IDE ACPI support
+        BLK_DEV_IO_TRACE n
+        BT_HCIUART_BCSP y
+        BT_HCIUART_H4 y # UART (H4) protocol support
+        BT_HCIUART_LL y
+        BT_RFCOMM_TTY y # RFCOMM TTY support
+        CPU_FREQ_DEBUG n
+        CRASH_DUMP n
+        DMAR? n # experimental
+        FUSION y # Fusion MPT device support
+        IRDA_ULTRA y # Ultra (connectionless) protocol
+        KALLSYMS_EXTRA_PASS n
+        LOGO n # not needed
+        MEDIA_ATTACH y
+        MEGARAID_NEWGEN y
+        MODVERSIONS y
+        NET_FC y # Fibre Channel driver support
+        PCI_LEGACY y
+        PPP_MULTILINK y # PPP multilink 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_MCE y
+
+      ${extraConfig}
+   '';
+in
+
+import ./generic.nix (
+
+  rec {
+    version = "2.6.26.8";
+
+    src = fetchurl {
+      url = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2";
+      sha256 = "4f2991378a09bd4ba916236cba200052c18e52e44c9d7e4100337f7df2788dc9";
+    };
+
+    config = configWithPlatform stdenv.platform;
+    configCross = configWithPlatform stdenv.cross.platform;
+  }
+
+  // removeAttrs args ["extraConfig"]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b20300f5abc..64ee61fd4b33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5064,6 +5064,17 @@ let
       ];
   };
 
+  linux_2_6_26 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.26.nix) {
+    inherit fetchurl perl mktemp module_init_tools;
+    stdenv = overrideInStdenv stdenv [gnumake381];
+    kernelPatches =
+      [ kernelPatches.fbcondecor_2_6_25
+        kernelPatches.sec_perm_2_6_24
+        kernelPatches.glibc_getline
+	kernelPatches.cifs_timeout_2_6_25
+      ];
+  };
+
   linux_2_6_27 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.27.nix) {
     inherit fetchurl perl mktemp module_init_tools;
     stdenv = overrideInStdenv stdenv [gnumake381];

From 12f976e56e5448fa659e284776c263238c1c1628 Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 14:00:26 +0000
Subject: [PATCH 070/113] Added Linux 2.6.15

svn path=/nixpkgs/trunk/; revision=27721
---
 .../os-specific/linux/kernel/linux-2.6.15.nix | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 ++++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.15.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.15.nix b/pkgs/os-specific/linux/kernel/linux-2.6.15.nix
new file mode 100644
index 000000000000..2dd67f46167c
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.15.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
+
+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 various subsystems.
+    MTD_COMPLEX_MAPPINGS y # needed for many devices
+
+    # Networking options.
+    IP_PNP n
+    IPV6_PRIVACY y
+
+    # Filesystem options - in particular, enable extended attributes and
+    # ACLs for all filesystems that support them.
+    CIFS_XATTR y
+    CIFS_POSIX y
+
+    ${extraConfig}
+  '';
+in
+
+import ./generic.nix (rec {
+  version = "2.6.15.7";
+  postBuild = "make $makeFlags $kernelTarget";
+
+  src = fetchurl {
+    url = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2";
+      sha256 = "43e0c251924324749b06464512532c3002d6294520faabdba5b3aea4e840b48b";
+  };
+
+  config = configWithPlatform stdenv.platform;
+  configCross = configWithPlatform stdenv.cross.platform;
+}
+
+// removeAttrs args ["extraConfig"]
+)
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64ee61fd4b33..b7a99ef80f4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5052,6 +5052,14 @@ let
 
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 
+  linux_2_6_15 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.15.nix) {
+    inherit fetchurl perl mktemp module_init_tools;
+    stdenv = overrideInStdenv stdenv [gcc34 gnumake381];
+    kernelPatches =
+      [ kernelPatches.cifs_timeout_2_6_15
+      ];
+  };
+
   linux_2_6_25 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.25.nix) {
     inherit fetchurl perl mktemp module_init_tools;
     extraConfig = "KMOD y";

From 69dca5f4aa35fd2b32b49372f0400fbc570c9e16 Mon Sep 17 00:00:00 2001
From: Ludovic Stordeur <Ludovic.Stordeur@inria.fr>
Date: Mon, 11 Jul 2011 14:07:21 +0000
Subject: [PATCH 071/113] Add meta.platforms to the Linux kernel expression.

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

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 138c9a53d041..3fa316b1224b 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
     # Combine the `features' attribute sets of all the kernel patches.
     features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches;
   };
-  
+
   builder = ./builder.sh;
 
   generateConfig = ./generate-config.pl;
@@ -91,7 +91,7 @@ stdenv.mkDerivation {
   kernelBaseConfig = stdenv.platform.kernelBaseConfig;
   kernelTarget = stdenv.platform.kernelTarget;
   autoModules = stdenv.platform.kernelAutoModules;
-  
+
   # Should we trust platform.kernelArch? We can only do
   # that once we differentiate i686/x86_64 in platforms.
   arch =
@@ -137,5 +137,6 @@ stdenv.mkDerivation {
     license = "GPLv2";
     homepage = http://www.kernel.org/;
     maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.linux;
   } // extraMeta;
 }

From 2685bfc32bdc0908172d5790d5d49eed2878fa5a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 Jul 2011 16:38:07 +0000
Subject: [PATCH 072/113] gnucash: fix update-gnucash-gconf script so that it
 works on NixOS

Current versions of gconftool-2 don't support the --config-source option
anymore -- that path must be passed in $GCONF_CONFIG_SOURCE instead.

svn path=/nixpkgs/trunk/; revision=27729
---
 pkgs/applications/office/gnucash/default.nix | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index e2cbd3e2d6f7..2234f07b0abe 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -23,9 +23,7 @@ stdenv.mkDerivation {
     gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper
   ];
 
-  NIX_LDFLAGS = "-rpath=${libgnomeui}/lib/libglade/2.0 -rpath=${libbonoboui}/lib/libglade/2.0 -rpath=${guile}/lib";
-
-  configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O2 CXXFLAGS=-O2 --disable-dbi";
+  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi";
   /* More flags to figure out:
 
        --enable-gtkmm            enable gtkmm gui
@@ -35,17 +33,26 @@ stdenv.mkDerivation {
    */
 
   postInstall = ''
+    sed -i $out/bin/update-gnucash-gconf                                \
+       -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|'
     for prog in "$out/bin/"*
     do
-      wrapProgram "$prog"                                       \
-        --set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH"        \
-        --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH"         \
-        --prefix PATH ":" "${gconf}/bin"
+      wrapProgram "$prog"                                               \
+        --set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH"                \
+        --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH"                 \
+        --prefix LD_LIBRARY_PATH ":" "${libgnomeui}/lib/libglade/2.0"   \
+        --prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0"  \
+	--set GCONF_CONFIG_SOURCE 'xml::~/.gconf'			\
+        --prefix PATH ":" "${gconf}/bin"                                \
+        --suffix PATH ":" "$out/bin"
     done
   '';
 
+  # The following settings fix failures in the test suite. It's not required otherwise.
+  NIX_LDFLAGS = "-rpath=${guile}/lib";
   preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
   doCheck = true;
+
   enableParallelBuilding = true;
 
   meta = {

From a9d4dfb994e3f0f22d90e13f444bdbf83e619ca1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 Jul 2011 20:12:02 +0000
Subject: [PATCH 073/113] gnucash: polished the expression, enabled OFX
 support, and documented the GConf setup procedure on NixOS

svn path=/nixpkgs/trunk/; revision=27730
---
 pkgs/applications/office/gnucash/default.nix | 48 ++++++++++++--------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 2234f07b0abe..e829265944e0 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -1,10 +1,29 @@
-{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk
-, libbonoboui, libgnomeui, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant
-, gettext, intltool, perl, guile, slibGuile, swig, isocodes, bzip2
-, makeWrapper }:
+{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx
+, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
+, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper
+}:
 
-# TODO: Fix the gconf issue. The following posting might be the missing clue:
-# <http://osdir.com/ml/linux.distributions.nixos/2007-09/msg00003.html>.
+/******************************************************************************
+ *                            Note for NixOS users                            *
+ ******************************************************************************
+ *
+ * GnuCash relies on the GConf daemon to store and retrieve its internal
+ * configuration. That daemon implements a Windows-like, system-wide registry,
+ * which is very hard to support on NixOS because the concept is inherently
+ * impure. To register GnuCash's configuration schemas with GConf, you have to
+ * add ${gnucash}/etc/gconf/gconf.xml.defaults to GConf's search path, i.e. by
+ * adding the line
+ *
+ *   xml:readonly:$(HOME)/.nix-profile/etc/gconf/gconf.xml.defaults/
+ *
+ * to ~/.gconf.path in your user's home directory. Furthermore, the line
+ *
+ *   services.dbus.packages = [ pkgs.gnome.GConf ];
+ *
+ * must be added to /etc/nixos/configuration.nix to make sure the DBus daemon
+ * knows about GConf and starts it automatically whenever a program (such as
+ * GnuCash) needs it.
+ */
 
 let
   name = "gnucash-2.4.7";
@@ -18,19 +37,12 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    pkgconfig libxml2 gconf glib gtk
-    libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant
-    gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper
+    pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml
+    libgnomeprint goffice enchant gettext intltool perl guile slibGuile
+    swig isocodes bzip2 makeWrapper libofx
   ];
 
-  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi";
-  /* More flags to figure out:
-
-       --enable-gtkmm            enable gtkmm gui
-       --enable-ofx              compile with ofx support (needs LibOFX)
-       --enable-aqbanking        compile with AqBanking support
-       --enable-python-bindings  enable python bindings
-   */
+  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx";
 
   postInstall = ''
     sed -i $out/bin/update-gnucash-gconf                                \
@@ -42,7 +54,7 @@ stdenv.mkDerivation {
         --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH"                 \
         --prefix LD_LIBRARY_PATH ":" "${libgnomeui}/lib/libglade/2.0"   \
         --prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0"  \
-	--set GCONF_CONFIG_SOURCE 'xml::~/.gconf'			\
+        --set GCONF_CONFIG_SOURCE 'xml::~/.gconf'                       \
         --prefix PATH ":" "${gconf}/bin"                                \
         --suffix PATH ":" "$out/bin"
     done

From 43e046af45f647e3b1dfb8ad915a3da7ce5331c8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jul 2011 06:34:27 +0000
Subject: [PATCH 074/113] * Firefox 5.0.1.

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

diff --git a/pkgs/applications/networking/browsers/firefox/5.0.nix b/pkgs/applications/networking/browsers/firefox/5.0.nix
index 6b12025478cc..8e3d600feb22 100644
--- a/pkgs/applications/networking/browsers/firefox/5.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/5.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "5.0";
+  firefoxVersion = "5.0.1";
   
-  xulVersion = "5.0"; # this attribute is used by other packages
+  xulVersion = "5.0.1"; # this attribute is used by other packages
 
   
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "22b7b4751173c2142a0f09cca1aebc717d97b45a";
+    sha1 = "c93b3513e160d87535a9d61c5e06a6a701e9cd3e";
   };
 
   

From 7bef513d8a677edfd12973a8da7453a2b1b4d126 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jul 2011 13:44:56 +0000
Subject: [PATCH 075/113] * Update Flashplayer on i686-linux.

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

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
index 2d1cc719fa8d..1a013d78d574 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@@ -53,9 +53,9 @@ let
         url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz;
         sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc";
       } else {
-        version = "10.3.181.14";
+        version = "10.3.181.34";
         url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
-        sha256 = "00sh25g2h7yq9kwrqv9d0fgrd6n87i7biycgkxm46sh65mxb1aif";
+        sha256 = "1k7gq0rynrv4vwr06dhjmhb633vm5a961bsqi6s8aqk61bdzhsia";
       }
     else throw "flashplayer is not supported on this platform";
 

From cc34c985d3b9ca08f18ab0cc65463ce8d9655a1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jul 2011 13:54:29 +0000
Subject: [PATCH 076/113] * Fix evaluation.

svn path=/nixpkgs/trunk/; revision=27739
---
 pkgs/os-specific/linux/udev/145.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/udev/145.nix b/pkgs/os-specific/linux/udev/145.nix
index 43ae9c35e000..fd1cb8a2d8dc 100644
--- a/pkgs/os-specific/linux/udev/145.nix
+++ b/pkgs/os-specific/linux/udev/145.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils}:
+{ stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils }:
+
+assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
   name = "udev-145";

From 67bbb5203c9445686d2587a7a0fe24ac0a411629 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 12 Jul 2011 14:24:01 +0000
Subject: [PATCH 077/113] boost: updated to version 1.47.0

Packages that don't build with the latest libraries can use 'boost144', which
is the version we had before.

svn path=/nixpkgs/trunk/; revision=27740
---
 pkgs/development/libraries/boost/1.44.nix    | 90 ++++++++++++++++++++
 pkgs/development/libraries/boost/default.nix | 20 ++---
 pkgs/top-level/all-packages.nix              |  1 +
 3 files changed, 96 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/libraries/boost/1.44.nix

diff --git a/pkgs/development/libraries/boost/1.44.nix b/pkgs/development/libraries/boost/1.44.nix
new file mode 100644
index 000000000000..2b516be2cbf5
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.44.nix
@@ -0,0 +1,90 @@
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
+, enableRelease ? true
+, enableDebug ? false
+, enableSingleThreaded ? false
+, enableMultiThreaded ? true
+, enableShared ? true
+, enableStatic ? false
+, enablePIC ? false
+}:
+
+let
+
+  variant = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableRelease "release" ++
+     stdenv.lib.optional enableDebug "debug");
+
+  threading = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableSingleThreaded "single" ++
+     stdenv.lib.optional enableMultiThreaded "multi");
+
+  link = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableShared "shared" ++
+     stdenv.lib.optional enableStatic "static");
+
+  # To avoid library name collisions
+  finalLayout = if ((enableRelease && enableDebug) ||
+    (enableSingleThreaded && enableMultiThreaded) ||
+    (enableShared && enableStatic)) then
+    "tagged" else "system";
+
+  cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else "";
+
+in
+
+stdenv.mkDerivation {
+  name = "boost-1.44.0";
+
+  meta = {
+    homepage = "http://boost.org/";
+    description = "Boost C++ Library Collection";
+    license = "boost-license";
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_44_0.tar.bz2";
+    sha256 = "1nvq36mvzr1fr85q0jh86rk3bk65s1y55jgqgzfg3lcpkl12ihs5";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [icu expat zlib bzip2 python];
+
+  configureScript = "./bootstrap.sh";
+  configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
+
+  buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
+
+  installPhase = ":";
+
+  patches = [
+    # Patch to get rid of following error, experienced by some packages like encfs, bitcoin:
+    #    terminate called after throwing an instance of 'std::runtime_error'
+    #    what():  locale::facet::_S_create_c_locale name not valid
+    (fetchurl { 
+       url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ;
+       sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d"; 
+     })
+  ];
+  
+  crossAttrs = rec {
+    buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
+    # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
+    # override them.
+    propagatedBuildInputs = buildInputs;
+    # We want to substitute the contents of configureFlags, removing thus the
+    # usual --build and --host added on cross building.
+    preConfigure = ''
+      export configureFlags="--prefix=$out --without-icu"
+    '';
+    buildPhase = ''
+      set -x
+      cat << EOF > user-config.jam
+      using gcc : cross : $crossConfig-g++ ;
+      EOF
+      ./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
+    '';
+  };
+}
diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index 2b516be2cbf5..bd3ddd2ba738 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -33,7 +33,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "boost-1.44.0";
+  name = "boost-1.47.0";
 
   meta = {
     homepage = "http://boost.org/";
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_44_0.tar.bz2";
-    sha256 = "1nvq36mvzr1fr85q0jh86rk3bk65s1y55jgqgzfg3lcpkl12ihs5";
+    url = "mirror://sourceforge/boost/boost_1_47_0.tar.bz2";
+    sha256 = "815a5d9faac4dbd523fbcf3fe1065e443c0bbf43427c44aa423422c6ec4c2e31";
   };
 
   enableParallelBuilding = true;
@@ -55,20 +55,10 @@ stdenv.mkDerivation {
   configureScript = "./bootstrap.sh";
   configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
 
-  buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
+  buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
 
   installPhase = ":";
 
-  patches = [
-    # Patch to get rid of following error, experienced by some packages like encfs, bitcoin:
-    #    terminate called after throwing an instance of 'std::runtime_error'
-    #    what():  locale::facet::_S_create_c_locale name not valid
-    (fetchurl { 
-       url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ;
-       sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d"; 
-     })
-  ];
-  
   crossAttrs = rec {
     buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
     # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
@@ -84,7 +74,7 @@ stdenv.mkDerivation {
       cat << EOF > user-config.jam
       using gcc : cross : $crossConfig-g++ ;
       EOF
-      ./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
+      ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
     '';
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7a99ef80f4e..69cbc13f2af2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2923,6 +2923,7 @@ let
   boost = callPackage ../development/libraries/boost { };
 
   boost142 = callPackage ../development/libraries/boost/1.42.nix { };
+  boost144 = callPackage ../development/libraries/boost/1.44.nix { };
   boost146 = callPackage ../development/libraries/boost/1.46.nix { };
 
   # A Boost build with all library variants enabled.  Very large (about 250 MB).

From b1b274558aedbc214cf62a233897313f352f6b0a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 09:13:22 +0000
Subject: [PATCH 078/113] monotone: don't build this package on Cygwin

The expression can't build on Cygwin because it wants to know the version of
Perl that is being used. On Cygwin, however, we don't know that because we're
using sysPerl.

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

diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 651ac6b26b0b..36a3365c52be 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A free distributed version control system";
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 9485e2392bd9a88ce7c32a0ed4b78f7a458ce5b6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 09:13:28 +0000
Subject: [PATCH 079/113] monotone: strip trailing whitespace

svn path=/nixpkgs/trunk/; revision=27742
---
 .../version-management/monotone/default.nix            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 36a3365c52be..70dd669e30fd 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boost, zlib, botan, libidn
 , lua, pcre, sqlite, perl, pkgconfig }:
 
-let 
+let
   version = "1.0";
   perlVersion = (builtins.parseDrvName perl.name).version;
 in
@@ -10,21 +10,21 @@ assert perlVersion != "";
 
 stdenv.mkDerivation rec {
   name = "monotone-${version}";
-  
+
   src = fetchurl {
     url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2";
     sha256 = "5c530bc4652b2c08b5291659f0c130618a14780f075f981e947952dcaefc31dc";
   };
-  
+
   buildInputs = [boost zlib botan libidn lua pcre sqlite pkgconfig];
-  
+
   postInstall = ''
     ensureDir $out/share/${name}
     cp -rv contrib/ $out/share/${name}/contrib
     ensureDir $out/lib/perl5/site_perl/${perlVersion}
     cp -v contrib/Monotone.pm $out/lib/perl5/site_perl/${perlVersion}
   '';
-  
+
   meta = {
     description = "A free distributed version control system";
     maintainers = [stdenv.lib.maintainers.raskin];

From 3cd02cd43dbfe60e4bcd87964c3ae60ba2200669 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 09:13:32 +0000
Subject: [PATCH 080/113] maxima: switch from clisp to sbcl, enable tk gui, and
 fix various impurities

 * Build maxima with sbcl for better performance.

 * Enable the regression test suite.

 * Configure $PATH at start-up so that maxima knows how to find sbcl,
   wish, rlwrap, and gnuplot.

 * Move installed documentation and Emacs lisp modules into standard
   locations.

 * Enable parallel building.

svn path=/nixpkgs/trunk/; revision=27743
---
 .../science/math/maxima/default.nix           | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 00f0ab25e4cd..0b71b72f13c7 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -1,8 +1,12 @@
-{ stdenv, fetchurl, clisp, texinfo, perl }:
+{ stdenv, fetchurl, sbcl, texinfo, perl, makeWrapper, rlwrap ? null, tk ? null, gnuplot ? null }:
 
 let
   name    = "maxima";
   version = "5.24.0";
+
+  searchPath =
+    stdenv.lib.makeSearchPath "bin"
+      (stdenv.lib.filter (x: x != null) [ sbcl rlwrap tk gnuplot ]);
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
@@ -12,11 +16,25 @@ stdenv.mkDerivation {
     sha256 = "137crv2f6hxwqrv75m8679vrlbnqgg5ww755cs4kihs1cy03bssq";
   };
 
-  preConfigure = ''
-    configureFlags="--infodir=$out/share/info --mandir=$out/share/man"
+  buildInputs = [sbcl texinfo perl makeWrapper];
+
+  postInstall = ''
+    # Make sure that maxima can find its runtime dependencies.
+    for prog in "$out/bin/"*; do
+      wrapProgram "$prog" --prefix PATH ":" "${searchPath}"
+    done
+    # Move emacs modules and documentation into the right place.
+    ensureDir $out/share/emacs $out/share/doc
+    ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp
+    ln -s ../maxima/${version}/doc $out/share/doc/maxima
   '';
 
-  buildInputs = [clisp texinfo perl];
+  # The regression test suite has minor failures, but curiously enough
+  # this doesn't seem to abort the build process:
+  # <http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933>.
+  doCheck = true;
+
+  enableParallelBuilding = true;
 
   meta = {
     description = "Maxima computer algebra system";

From bcaaba6ea7d8eb4fd7cf7b850dffa64fdeebec12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 09:56:54 +0000
Subject: [PATCH 081/113] gnucash: improved comments

svn path=/nixpkgs/trunk/; revision=27744
---
 pkgs/applications/office/gnucash/default.nix | 23 +++-----------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index e829265944e0..3e20a350a791 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -3,26 +3,9 @@
 , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper
 }:
 
-/******************************************************************************
- *                            Note for NixOS users                            *
- ******************************************************************************
- *
- * GnuCash relies on the GConf daemon to store and retrieve its internal
- * configuration. That daemon implements a Windows-like, system-wide registry,
- * which is very hard to support on NixOS because the concept is inherently
- * impure. To register GnuCash's configuration schemas with GConf, you have to
- * add ${gnucash}/etc/gconf/gconf.xml.defaults to GConf's search path, i.e. by
- * adding the line
- *
- *   xml:readonly:$(HOME)/.nix-profile/etc/gconf/gconf.xml.defaults/
- *
- * to ~/.gconf.path in your user's home directory. Furthermore, the line
- *
- *   services.dbus.packages = [ pkgs.gnome.GConf ];
- *
- * must be added to /etc/nixos/configuration.nix to make sure the DBus daemon
- * knows about GConf and starts it automatically whenever a program (such as
- * GnuCash) needs it.
+/* If you experience GConf errors when running GnuCash on NixOS, see
+ * http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications
+ * for a possible solution.
  */
 
 let

From 7c8871512d1ffad407d2285c6d507e34be47ded3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 09:56:58 +0000
Subject: [PATCH 082/113] wxmaxima: ensure that wxMaxima will find Maxima even
 if it's not in $PATH

svn path=/nixpkgs/trunk/; revision=27745
---
 .../science/math/wxmaxima/default.nix         | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 54acf16ee89d..6bd6e9266e6b 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -1,8 +1,4 @@
-{ stdenv, fetchurl, maxima, wxGTK }:
-
-# TODO: Build the correct ${maxima}/bin/maxima store path into wxMaxima so that
-#       it can run that binary without relying on $PATH, /etc/wxMaxima.conf, or
-#       ~/.wxMaxima.
+{ stdenv, fetchurl, maxima, wxGTK, makeWrapper }:
 
 let
   name    = "wxmaxima";
@@ -16,7 +12,18 @@ stdenv.mkDerivation {
     sha256 = "1dfwh5ka125wr6wxzyiwz16lk8kaf09rb6lldzryjwh8zi7yw8dm";
   };
 
-  buildInputs = [maxima wxGTK];
+  buildInputs = [wxGTK maxima makeWrapper];
+
+  postInstall = ''
+    # Make sure that wxmaxima can find its runtime dependencies.
+    for prog in "$out/bin/"*; do
+      wrapProgram "$prog" --prefix PATH ":" "${maxima}/bin"
+    done
+  '';
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
 
   meta = {
     description = "Cross platform GUI for the computer algebra system Maxima.";

From d6f364ca8c723dfd52d0063353e603f1f7bb6c9f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 10:41:05 +0000
Subject: [PATCH 083/113] ikiwiki: removed unconditional dependencies on
 monotone and git

Both build inputs 'monotone' and 'git' are non-null in nixpkgs, so their
respective store paths were always included in the generated wrapper
script -- even if 'monotoneSupport' and 'gitSupport' were false.

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

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 48eb9ae888b4..c76efc9d1c53 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -44,9 +44,9 @@ stdenv.mkDerivation {
   postInstall = ''
     for a in "$out/bin/"*; do
       wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \
-      ${lib.optionalString (git != null)
+      ${lib.optionalString gitSupport
         ''--prefix PATH : ${git}/bin \''}
-      ${lib.optionalString (monotone != null)
+      ${lib.optionalString monotoneSupport
         ''--prefix PATH : ${monotone}/bin \''}
       ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
     done

From 9edc2574dd66198d9cb66e153cf5d370213ebdf2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 10:41:10 +0000
Subject: [PATCH 084/113] git-annex: the build system uses 'which' to determine
 whether ikiwiki is installed

svn path=/nixpkgs/trunk/; revision=27747
---
 .../applications/version-management/git-and-tools/default.nix | 2 +-
 .../version-management/git-and-tools/git-annex/default.nix    | 4 ++--
 2 files changed, 3 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 e049c01869da..506076543f04 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -46,7 +46,7 @@ rec {
   };
 
   gitAnnex = lib.makeOverridable (import ./git-annex) {
-    inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki;
+    inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
     inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc
       HTTP testpack;
   };
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 52b4161a0f72..262759a5bb2d 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,5 @@
 { stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String
-, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki }:
+, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which }:
 
 let
   version = "3.20110705";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight
-    SHA dataenc HTTP testpack git ikiwiki];
+    SHA dataenc HTTP testpack git ikiwiki which];
 
   checkTarget = "test";
   doCheck = true;

From 4e5cc9b965b33c2724f4fe20126635c37c604539 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 10:46:17 +0000
Subject: [PATCH 085/113] git: removed 'lowPri' wrapper around gitFull

Packages that need git as build-time or run-time dependency typically refer to
the attribute 'git', which is the expression with the least possible set of
features.

Users, however, who run "nix-env -i git", don't want that version, because it
lacks support for SVN, for sending e-mail, and it doesn't include the GUI. In
other words, users want gitFull by default, which is what this change
accomplishes.

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

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 506076543f04..cc58a6ff6c6c 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -29,11 +29,11 @@ rec {
   }));
 
   # The full-featured Git.
-  gitFull = lowPrio (appendToName "full" (git.override {
+  gitFull = appendToName "full" (git.override {
     svnSupport = true;
     guiSupport = true;
     sendEmailSupport = stdenv.isDarwin == false;
-  }));
+  });
 
   gitGit = import ./git/git-git.nix {
     inherit fetchurl sourceFromHead stdenv curl openssl zlib expat perl gettext

From 2eb4c1201245237ff77ac460294401b634fbee2a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 10:50:22 +0000
Subject: [PATCH 086/113] git: prefer 'utillinuxcurses' over 'utillinux' in
 user profiles

Packages that need util-linux-ng as a build-time or run-time dependency
typically refer to the attribute 'utillinux', which is the expression with
the least possible set of features.

Users, however, who run "nix-env -i util-linux", don't want that version,
because it lacks support for perl and curses. In other words, users want
utillinuxngCurses by default, which is what this change accomplishes.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69cbc13f2af2..dfc6367c1933 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5699,10 +5699,10 @@ let
 
   utillinuxCurses = utillinuxngCurses;
 
-  utillinuxng = callPackage ../os-specific/linux/util-linux-ng {
+  utillinuxng = lowPrio (callPackage ../os-specific/linux/util-linux-ng {
     ncurses = null;
     perl = null;
-  };
+  });
 
   utillinuxngCurses = utillinuxng.override {
     inherit ncurses perl;

From 14c9d261120ded1309803d289e68f12d432ebe2c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 10:56:52 +0000
Subject: [PATCH 087/113] jfsrec: build with boost 1.44.0

Compilation with the latest version, boost 1.47.0, fails as follows:

  g++ -DHAVE_CONFIG_H -I. -I. -I..     -g -O2 -c -o inode.o inode.cpp
  inode.cpp: In member function 'virtual boost::filesystem3::path jfsrec::Inode::get_full_path()':
  inode.cpp:70:54: error: invalid conversion from 'bool (*)(const std::string&)' to 'boost::enable_if_c<true, void>::type*'
  inode.cpp:70:54: error:   initializing argument 2 of 'boost::filesystem3::path::path(const Source&, typename boost::enable_if<boost::filesystem3::path_traits::is_pathable<typename boost::decay<Source>::type> >::type*) [with Source = std::basic_string<char>, typename boost::enable_if<boost::filesystem3::path_traits::is_pathable<typename boost::decay<Source>::type> >::type = void]'
  inode.cpp:72:54: error: invalid conversion from 'bool (*)(const std::string&)' to 'boost::enable_if_c<true, void>::type*'
  inode.cpp:72:54: error:   initializing argument 2 of 'boost::filesystem3::path::path(const Source&, typename boost::enable_if<boost::filesystem3::path_traits::is_pathable<typename boost::decay<Source>::type> >::type*) [with Source = std::basic_string<char>, typename boost::enable_if<boost::filesystem3::path_traits::is_pathable<typename boost::decay<Source>::type> >::type = void]'
  make[2]: *** [inode.o] Error 1

It appears that jfsrec assumes that fs::path is a string, which isn't
true anymore in Boost.FS v3.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfc6367c1933..ea374e491b57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -846,7 +846,9 @@ let
 
   jdiskreport = callPackage ../tools/misc/jdiskreport { };
 
-  jfsrec = callPackage ../tools/filesystems/jfsrec { };
+  jfsrec = callPackage ../tools/filesystems/jfsrec {
+    boost = boost144;
+  };
 
   jfsutils = callPackage ../tools/filesystems/jfsutils { };
 

From ce11df9d807f2a1ae60b3829df4e6415597dc675 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 11:09:06 +0000
Subject: [PATCH 088/113] ghc-6.10.1-binary: blind attempt to bootstrap GHC on
 x86_64-darwin with the i686 version of this compiler

I have no idea whether that's going to work, and I can't test it for
lack of access to a MacOS X machine, but think chances are pretty good
that this is going to succeed.

svn path=/nixpkgs/trunk/; revision=27751
---
 pkgs/development/compilers/ghc/6.10.1-binary.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 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..7052d6211bb0 100644
--- a/pkgs/development/compilers/ghc/6.10.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, perl, libedit, ncurses, gmp}:
 
-assert stdenv.system == "i686-darwin" || stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
+assert stdenv.system == "x86_64-darwin" || stdenv.system == "i686-darwin" || stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
 stdenv.mkDerivation rec {
   version = "6.10.1";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
         url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2";
         sha256 = "14jvvn333i36wm7mmvi47jr93f5hxrw1h2dpjvqql0rp00svhzzg";
       }
-    else if stdenv.system == "i686-darwin" then
+    else if (stdenv.system == "i686-darwin" || stdenv.system == "x86_64-darwin") then
       fetchurl {
         # Idem.
         url = "http://haskell.org/ghc/dist/${version}/maeder/ghc-${version}-i386-apple-darwin.tar.bz2";
@@ -100,5 +100,10 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
-  meta.platforms = [ "i686-darwin" "x86_64-linux" "i686-linux"] ;
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+  };
 }

From 35505a442ef53519a008e8e741d69fab9f4ae360 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Jul 2011 11:40:47 +0000
Subject: [PATCH 089/113] * Remove some dead files.

svn path=/nixpkgs/trunk/; revision=27752
---
 pkgs/development/libraries/openssl/1.x.nix    | 45 -------------------
 .../libraries/openssl/darwin-arch-1.patch     | 16 -------
 2 files changed, 61 deletions(-)
 delete mode 100644 pkgs/development/libraries/openssl/1.x.nix
 delete mode 100644 pkgs/development/libraries/openssl/darwin-arch-1.patch

diff --git a/pkgs/development/libraries/openssl/1.x.nix b/pkgs/development/libraries/openssl/1.x.nix
deleted file mode 100644
index eae32de30e48..000000000000
--- a/pkgs/development/libraries/openssl/1.x.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, perl }:
-
-let
-  opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
-    (throw "openssl needs its platform name cross building" null)
-    stdenv.cross;
-in
-
-stdenv.mkDerivation (rec {
-  name = "openssl-1.0.0";
-
-  src = fetchurl {
-    url = "http://www.openssl.org/source/${name}.tar.gz";
-    sha1 = "3f800ea9fa3da1c0f576d689be7dca3d55a4cb62";
-  };
-
-  buildNativeInputs = [ perl ];
-
-  configureScript = "./config";
-
-  configureFlags="--libdir=lib shared";
-
-  crossAttrs = {
-    preConfigure=''
-      export cross=$crossSystem-
-    '';
-    configureFlags="--libdir=lib ${opensslCrossSystem} shared";
-    buildPhase = ''
-      make CC=$crossConfig-gcc \
-        AR="$crossConfig-ar r" \
-        RANLIB=$crossConfig-ranlib
-    '';
-  };
-
-  meta = {
-    homepage = http://www.openssl.org/;
-    description = "A cryptographic library that implements the SSL and TLS protocols";
-  };
-}
-//
-(if stdenv.isDarwin then {
-  patches = ./darwin-arch.patch;
-}
-else { })
-)
diff --git a/pkgs/development/libraries/openssl/darwin-arch-1.patch b/pkgs/development/libraries/openssl/darwin-arch-1.patch
deleted file mode 100644
index ad8e86c6791e..000000000000
--- a/pkgs/development/libraries/openssl/darwin-arch-1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-The patch is specific to nix: MacOS gcc supports -arch.
---- a/Configure
-+++ b/Configure
-@@ -549,9 +549,9 @@ my %table=(
- "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
- "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
--"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
--"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
--"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-
- ##### A/UX

From 78ccc14e3eac5d4d5184b61d4cdb7e95990b7c6c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 12:00:19 +0000
Subject: [PATCH 090/113] ghc-6.10.1-binary: revert blind attempt to bootstrap
 GHC on x86_64-darwin with the i686 version of this compiler

Hydra says that we can *not* use the i686 compiler to bootstrap x86_64 on Darwin. Duh.

svn path=/nixpkgs/trunk/; revision=27753
---
 pkgs/development/compilers/ghc/6.10.1-binary.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix
index 7052d6211bb0..459a1b94724d 100644
--- a/pkgs/development/compilers/ghc/6.10.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, perl, libedit, ncurses, gmp}:
 
-assert stdenv.system == "x86_64-darwin" || stdenv.system == "i686-darwin" || stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
+assert stdenv.system == "i686-darwin" || stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
 stdenv.mkDerivation rec {
   version = "6.10.1";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
         url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2";
         sha256 = "14jvvn333i36wm7mmvi47jr93f5hxrw1h2dpjvqql0rp00svhzzg";
       }
-    else if (stdenv.system == "i686-darwin" || stdenv.system == "x86_64-darwin") then
+    else if stdenv.system == "i686-darwin" then
       fetchurl {
         # Idem.
         url = "http://haskell.org/ghc/dist/${version}/maeder/ghc-${version}-i386-apple-darwin.tar.bz2";
@@ -100,10 +100,5 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
-  meta = {
-    homepage = "http://haskell.org/ghc";
-    description = "The Glasgow Haskell Compiler";
-    maintainers = [ stdenv.lib.maintainers.simons ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-  };
+  meta.platforms = [ "i686-darwin" "x86_64-linux" "i686-linux"] ;
 }

From dc31e088c0455caad20f8b0bed17232b09e46337 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 12:33:54 +0000
Subject: [PATCH 091/113] Added archivemount-0.6.1, a FUSE-based file system
 for mounting tar archives.

svn path=/nixpkgs/trunk/; revision=27758
---
 .../filesystems/archivemount/default.nix      | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/filesystems/archivemount/default.nix

diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix
new file mode 100644
index 000000000000..c05d2e98af32
--- /dev/null
+++ b/pkgs/tools/filesystems/archivemount/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, fuse, libarchive }:
+
+let
+  name = "archivemount-0.6.1";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz";
+    sha256 = "9235d6377a70a7c25aa288dab6b0e8ef906d1d219d43e5b8fcdb8cf3ace98e01";
+  };
+
+  buildInputs = [ pkgconfig fuse libarchive ];
+
+  meta = {
+    description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives.";
+    license = "GPL2";
+
+    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 ea374e491b57..6d5aa8e0fb64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -354,6 +354,8 @@ let
 
   aircrackng = callPackage ../tools/networking/aircrack-ng { };
 
+  archivemount = callPackage ../tools/filesystems/archivemount { };
+
   asymptote = builderDefsPackage ../tools/graphics/asymptote {
     inherit freeglut ghostscriptX imagemagick fftw boehmgc
       mesa ncurses readline gsl libsigsegv python zlib perl

From 13720273bb3cf99031bc910d778cad4e86dd5631 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 15:00:51 +0000
Subject: [PATCH 092/113] haskell-funcmp: added version 1.5

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

diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix
new file mode 100644
index 000000000000..a667a1e1d289
--- /dev/null
+++ b/pkgs/development/libraries/haskell/funcmp/default.nix
@@ -0,0 +1,14 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "funcmp";
+  version = "1.5";
+  sha256 = "f68807833f39178c99877321f0f335cfde12a5c4b38e6c51f33f8cab94b9e12e";
+  propagatedBuildInputs = [];
+  meta = {
+    description = "Functional MetaPost";
+    license = "GPL";
+    maintainers = [self.stdenv.lib.maintainers.simons];
+  };
+})
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 03df774c4c85..9d14ad9fe2f9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -468,6 +468,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   fclabels = callPackage ../development/libraries/haskell/fclabels {};
 
+  funcmp = callPackage ../development/libraries/haskell/funcmp {};
+
   feed = callPackage ../development/libraries/haskell/feed {};
 
   filestore = callPackage ../development/libraries/haskell/filestore {};

From a16e01fe19c03f8f9cefcb97ecdb95af83e9cf7c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 15:00:59 +0000
Subject: [PATCH 093/113] Added moderncv package to texlive.

svn path=/nixpkgs/trunk/; revision=27762
---
 pkgs/misc/tex/texlive/moderncv.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/misc/tex/texlive/moderncv.nix

diff --git a/pkgs/misc/tex/texlive/moderncv.nix b/pkgs/misc/tex/texlive/moderncv.nix
new file mode 100644
index 000000000000..a3bd7aa29c29
--- /dev/null
+++ b/pkgs/misc/tex/texlive/moderncv.nix
@@ -0,0 +1,24 @@
+args: with args;
+rec {
+  name = "moderncv-2007.05.28";
+  src = fetchurl {
+    url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip";
+    sha256 = "d479141e9ae6dad745b03af47541b1bf7d312613de42bb7984eb4b556854cb51";
+  };
+
+  buildInputs = [texLive unzip];
+  phaseNames = ["doCopy"];
+  doCopy = fullDepEntry (''
+    ensureDir $out/share
+    cp -r texmf* $out/
+    ln -s $out/texmf* $out/share
+  '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
+
+  meta = {
+    description = "Extra components for TeXLive";
+    maintainers = [ args.lib.maintainers.simons ];
+
+    # Actually, arch-independent..
+    platforms = [] ;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d5aa8e0fb64..95deda799b1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8113,6 +8113,10 @@ let
     inherit texLiveLatexXColor texLivePGF texLive;
   };
 
+  texLiveModerncv = builderDefsPackage (import ../misc/tex/texlive/moderncv.nix) {
+    inherit texLive;
+  };
+
   trac = callPackage ../misc/trac {
     inherit (pythonPackages) pysqlite;
   };

From db9fc16b70225e50470ce4bf85968dfa8e171632 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 16:23:48 +0000
Subject: [PATCH 094/113] moderncv: cleanup the build instructions

Just add this package to texLiveAggregationFun to install it.

svn path=/nixpkgs/trunk/; revision=27765
---
 pkgs/misc/tex/texlive/moderncv.nix | 9 +++++----
 pkgs/top-level/all-packages.nix    | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/tex/texlive/moderncv.nix b/pkgs/misc/tex/texlive/moderncv.nix
index a3bd7aa29c29..2ddde10200b6 100644
--- a/pkgs/misc/tex/texlive/moderncv.nix
+++ b/pkgs/misc/tex/texlive/moderncv.nix
@@ -9,10 +9,11 @@ rec {
   buildInputs = [texLive unzip];
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    ensureDir $out/share
-    cp -r texmf* $out/
-    ln -s $out/texmf* $out/share
-  '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
+    ensureDir $out/texmf/tex/latex/moderncv $out/texmf/doc $out/share
+    mv *.cls *.sty $out/texmf/tex/latex/moderncv/
+    mv examples $out/texmf/doc/moderncv
+    ln -s $out/texmf* $out/share/
+  '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
 
   meta = {
     description = "Extra components for TeXLive";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95deda799b1b..583d939ef990 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8114,7 +8114,7 @@ let
   };
 
   texLiveModerncv = builderDefsPackage (import ../misc/tex/texlive/moderncv.nix) {
-    inherit texLive;
+    inherit texLive unzip;
   };
 
   trac = callPackage ../misc/trac {

From aa8cea3e4d18e00378dc096b594c6f2ac158f519 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 16:49:33 +0000
Subject: [PATCH 095/113] moderncv: updated description

svn path=/nixpkgs/trunk/; revision=27766
---
 pkgs/misc/tex/texlive/moderncv.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/tex/texlive/moderncv.nix b/pkgs/misc/tex/texlive/moderncv.nix
index 2ddde10200b6..a19835eda4bb 100644
--- a/pkgs/misc/tex/texlive/moderncv.nix
+++ b/pkgs/misc/tex/texlive/moderncv.nix
@@ -16,7 +16,7 @@ rec {
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
 
   meta = {
-    description = "Extra components for TeXLive";
+    description = "the moderncv class for TeXLive";
     maintainers = [ args.lib.maintainers.simons ];
 
     # Actually, arch-independent..

From 6f1ec7512e1c5e24fbac1bbbd59d0f9862ff9bd1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 11:13:41 +0000
Subject: [PATCH 096/113] python: added libxml2 bindings to the pythonFull
 attribute

svn path=/nixpkgs/trunk/; revision=27773
---
 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 583d939ef990..c6b66393d025 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2452,7 +2452,7 @@ let
   };
 
   pythonFull = callPackage ../development/interpreters/python/wrapper.nix {
-    extraLibs = lib.attrValues python.modules;
+    extraLibs = lib.attrValues python.modules ++ [libxml2Python];
   };
 
   pyrex = pyrex095;

From 68957344fa03f06cd95ceafe5e27caaee00298f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 12:22:26 +0000
Subject: [PATCH 097/113] git-annex: updated to version 3.20110707

svn path=/nixpkgs/trunk/; revision=27775
---
 .../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 262759a5bb2d..6d432c3d03d3 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.20110705";
+  version = "3.20110707";
 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 = "781b0c02f992e46f3c2555db803caed2a9bbd274a62fcebab3f596bfd7888c9a";
+    sha256 = "0yyrp94przjmdljd97q5p0yll9aa1jdajrvlhl4m1yq0ngx6x4rr";
   };
 
   buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight

From 1b53d1f22d38d0430e449eed9e9cf4358e7b1008 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 12:22:49 +0000
Subject: [PATCH 098/113] xorg: updated xf86-video-ati to version 6.14.2

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

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index ae56e00762b5..f25289a683a3 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1428,11 +1428,11 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
-    name = "xf86-video-ati-6.14.0";
+    name = "xf86-video-ati-6.14.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ati-6.14.0.tar.bz2;
-      sha256 = "12q2b6wj53h23iy9bkm6x8zidan3xqfszhkzyr4qm043x21szjlx";
+      url = mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2;
+      sha256 = "017974b622eea3b4483405368492b0c6f178854a9b9753d50e13c578b8a328dc";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
index 5b6059cd575a..c8039d24671c 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@@ -127,7 +127,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-6.14.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2

From 10b7a4fe966e98d8eefb46da2d35cc1fe90b6d20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 12:22:55 +0000
Subject: [PATCH 099/113] mesa: updated to version 7.10.2

There changes are based on patch <http://sprunge.us/bOMG> from goibhniu.

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index c769bd64c533..09f1d945846b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,23 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null, talloc }:
+{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, file, expat, pythonFull, lipo ? null, talloc }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
 else
 
-let version = "7.10.1"; in
+let version = "7.10.2"; in
 
 stdenv.mkDerivation {
   name = "mesa-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    md5 = "efe8da4d80c2a5d32a800770b8ce5dfa";
+    sha256 = "1hf7f6n5ms674v3bv5c9mrcg30kbraijxacl8s031kqirrw2dvcc";
   };
 
   patches = [ ./swrast-settexbuffer.patch ];
 
+  postPatch = ''
+    find . -name "*.py" -exec sed -i -e "s|#! */usr/bin/env python|#! ${pythonFull}/bin/python|" {} +
+  '';
+
   configureFlags =
-    "--disable-gallium"
+    "--enable-gallium --enable-gl-osmesa --with-dri-drivers=swrast,radeon,r600 "
     + stdenv.lib.optionalString (stdenv.system == "mips64-linux")
       " --with-dri-drivers=swrast --with-driver=dri"
     + stdenv.lib.optionalString stdenv.isDarwin " --disable-egl";
@@ -25,7 +29,7 @@ stdenv.mkDerivation {
   buildInputs =
     [ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto
       xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
-      lipo talloc 
+      lipo talloc file pythonFull
     ];
 
   enableParallelBuilding = true;

From 13db8d6999fb069fd2a4cfd13aa2456a153a72e0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 12:22:59 +0000
Subject: [PATCH 100/113] mesa: updated to version 7.10.3

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 09f1d945846b..5e2abb6065cd 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, file, expat, pythonFull, lipo ? null, talloc }:
+{ stdenv, fetchurl, flex, bison, pkgconfig, x11, xlibs, libdrm, file, expat
+, pythonFull, lipo ? null, talloc }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
 else
 
-let version = "7.10.2"; in
+let version = "7.10.3"; in
 
 stdenv.mkDerivation {
   name = "mesa-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1hf7f6n5ms674v3bv5c9mrcg30kbraijxacl8s031kqirrw2dvcc";
+    sha256 = "1h451vgsfsp0h0wig66spqgxmjalsy28gvd9viynfwmq7741yw0y";
   };
 
   patches = [ ./swrast-settexbuffer.patch ];
@@ -29,7 +30,7 @@ stdenv.mkDerivation {
   buildInputs =
     [ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto
       xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
-      lipo talloc file pythonFull
+      lipo talloc file pythonFull flex bison
     ];
 
   enableParallelBuilding = true;

From 7049b34b10df6d75ab19eb1518ba76d5001d63b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 12:23:03 +0000
Subject: [PATCH 101/113] glxinfo: updated to version 8.0.1

svn path=/nixpkgs/trunk/; revision=27779
---
 pkgs/tools/graphics/glxinfo/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index d1978134a710..02db33f92cb1 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -1,23 +1,27 @@
 {stdenv, fetchurl, x11, mesa}:
 
+let version = "8.0.1"; in
+
 stdenv.mkDerivation {
-  name = "glxinfo-7.8.2";
-  
+  name = "glxinfo-${version}";
+
   src = fetchurl {
-    url = ftp://ftp.freedesktop.org/pub/mesa/7.8.2/MesaDemos-7.8.2.tar.bz2;
-    md5 = "757d9e2e06f48b1a52848be9b0307ced";
+    url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2";
+    sha256 = "1lbp1llpx0hl5k79xb653yvjvk9mlikj73r8xjzyxqqp1nrg5isb";
   };
 
   buildInputs = [x11 mesa];
 
+  configurePhase = "true";
+
   buildPhase = "
-    cd progs/xdemos
-    gcc glxinfo.c -o glxinfo -lGL -lX11 
+    cd src/xdemos
+    gcc glxinfo.c -o glxinfo -lGL -lX11
     gcc glxgears.c -o glxgears -lGL -lX11
   ";
 
   installPhase = "
     ensureDir $out/bin
-    cp glxinfo glxgears $out/bin
+    cp glxinfo glxgears $out/bin/
   ";
 }

From 4cc476fa5212bf811182a7e24764f6be89a48308 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Jul 2011 17:16:00 +0000
Subject: [PATCH 102/113] * Update nixUnstable.

svn path=/nixpkgs/trunk/; revision=27782
---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index c59f0092c222..5cdf879f3220 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre27565";
+  name = "nix-1.0pre27764";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/1138550/download/4/${name}.tar.bz2";
-    sha256 = "1hvdvkl7grv1gv1mx1bad7i08ly4acs33mqxalishdhsdm4l9kmr";
+    url = "http://hydra.nixos.org/build/1162354/download/4/${name}.tar.bz2";
+    sha256 = "fe8117644a67947dd8aa8594181ff893b09806ea7803c842cc0b5be86a31a9c6";
   };
 
   buildNativeInputs = [ perl pkgconfig ];

From 05e489b24f1ef319dbee19f045294c3b61d8a9cf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 19:21:23 +0000
Subject: [PATCH 103/113] Added packages for radeon-r600 and radeon-r700
 firmware.

svn path=/nixpkgs/trunk/; revision=27783
---
 .../linux/firmware/radeon-r600/default.nix    | 19 +++++++++++++++++++
 .../linux/firmware/radeon-r700/default.nix    | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +++
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/radeon-r600/default.nix
 create mode 100644 pkgs/os-specific/linux/firmware/radeon-r700/default.nix

diff --git a/pkgs/os-specific/linux/firmware/radeon-r600/default.nix b/pkgs/os-specific/linux/firmware/radeon-r600/default.nix
new file mode 100644
index 000000000000..ed44b2eed78c
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/radeon-r600/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "radeon-r600-firmware-2009-12-09";
+
+  src = fetchurl {
+    url = "http://people.freedesktop.org/~agd5f/radeon_ucode/R600_rlc.bin";
+    sha256 = "11bxpivxycigv0ffbck33y9czgira3g8py33840zxzwcwbi59yps";
+  };
+
+  unpackPhase = "true";
+  installPhase = "install -D $src $out/radeon/R600_rlc.bin";
+
+  meta = {
+    description = "Firmware for the RADEON r600 chipset";
+    homepage = "http://people.freedesktop.org/~agd5f/radeon_ucode";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/os-specific/linux/firmware/radeon-r700/default.nix b/pkgs/os-specific/linux/firmware/radeon-r700/default.nix
new file mode 100644
index 000000000000..92e959737990
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/radeon-r700/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "radeon-r700-firmware-2009-12-09";
+
+  src = fetchurl {
+    url = "http://people.freedesktop.org/~agd5f/radeon_ucode/R700_rlc.bin";
+    sha256 = "1lbgrlbhqijizg16z0g0qa6ggznpdy844cawnwdp1b0fkwhrbkga";
+  };
+
+  unpackPhase = "true";
+  installPhase = "install -D $src $out/radeon/R700_rlc.bin";
+
+  meta = {
+    description = "Firmware for the RADEON r700 chipset";
+    homepage = "http://people.freedesktop.org/~agd5f/radeon_ucode";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6b66393d025..0e764e938e8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5608,6 +5608,9 @@ let
 
   radeontools = callPackage ../os-specific/linux/radeontools { };
 
+  radeonR700 = callPackage ../os-specific/linux/firmware/radeon-r700 { };
+  radeonR600 = callPackage ../os-specific/linux/firmware/radeon-r600 { };
+
   rfkill = callPackage ../os-specific/linux/rfkill { };
 
   rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { };

From ea27b1b042e5fc3a071af76513d502258f51cfcb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 19:21:29 +0000
Subject: [PATCH 104/113] mesa: depend on python+libxml2Python rather than
 depending on pythonFull

The latter package contains Tcl/Tk and whatnot else, so using that
expression as a built input was a bad idea. I'm sorry.

The dependency on talloc is gone, too. It wasn't used, apparently, but
it broke the build on Darwin because talloc doesn't compile there.

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 5e2abb6065cd..1274482091da 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, flex, bison, pkgconfig, x11, xlibs, libdrm, file, expat
-, pythonFull, lipo ? null, talloc }:
+, python, libxml2Python, lipo ? null }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   patches = [ ./swrast-settexbuffer.patch ];
 
   postPatch = ''
-    find . -name "*.py" -exec sed -i -e "s|#! */usr/bin/env python|#! ${pythonFull}/bin/python|" {} +
+    find . -name "*.py" -exec sed -i -e "s|#! */usr/bin/env python|#! ${python}/bin/python|" {} +
   '';
 
   configureFlags =
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   buildInputs =
     [ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto
       xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
-      lipo talloc file pythonFull flex bison
+      lipo file python libxml2Python flex bison
     ];
 
   enableParallelBuilding = true;

From 18bd4e67d7b60272f7a362856107b3859e648513 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 19:21:33 +0000
Subject: [PATCH 105/113] mesa: add myself as a maintainer

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 1274482091da..c2cd50f28da1 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -41,5 +41,8 @@ stdenv.mkDerivation {
     description = "An open source implementation of OpenGL";
     homepage = http://www.mesa3d.org/;
     license = "bsd";
+
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From e7a9b41e9c5e8d9d436129c55b0aeeee93b01685 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 19:21:37 +0000
Subject: [PATCH 106/113] mesa: enable full gallium, xcb, and egl support, and
 build all available dri back-ends

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index c2cd50f28da1..4c2ed0f30475 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -22,10 +22,10 @@ stdenv.mkDerivation {
   '';
 
   configureFlags =
-    "--enable-gallium --enable-gl-osmesa --with-dri-drivers=swrast,radeon,r600 "
-    + stdenv.lib.optionalString (stdenv.system == "mips64-linux")
-      " --with-dri-drivers=swrast --with-driver=dri"
-    + stdenv.lib.optionalString stdenv.isDarwin " --disable-egl";
+      " --with-driver=dri --enable-gl-osmesa --enable-gles1"
+    + " --enable-gallium --enable-gallium-r600 --enable-gles2"
+    + " --enable-gallium-swrast --enable-gallium-egl --enable-glx-tls"
+    + " --enable-xcb --enable-egl --disable-glut";
 
   buildInputs =
     [ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto

From fa5002d97bb42cda5c1935d60ca756af0e4eb39e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 19:35:24 +0000
Subject: [PATCH 107/113] Revert my earlier commit that added libxml2 to
 pythonFull.

After some discussion on #nixos, the consensus is that expressions should not
provide functionality that is not part of the package itself, i.e. pythonFull
ought to include only those extensions that are part of the python
distribution.

svn path=/nixpkgs/trunk/; revision=27787
---
 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 0e764e938e8e..2558602afd54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2452,7 +2452,7 @@ let
   };
 
   pythonFull = callPackage ../development/interpreters/python/wrapper.nix {
-    extraLibs = lib.attrValues python.modules ++ [libxml2Python];
+    extraLibs = lib.attrValues python.modules;
   };
 
   pyrex = pyrex095;

From 7c10cbb6c8f8dd69e0940b56d57562ed6bfd62d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 20:04:34 +0000
Subject: [PATCH 108/113] We cannot use thread-local store in mesa, because the
 rest of our xorg installation has been built without support for it.

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 4c2ed0f30475..6a1de4d95e4a 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   configureFlags =
       " --with-driver=dri --enable-gl-osmesa --enable-gles1"
     + " --enable-gallium --enable-gallium-r600 --enable-gles2"
-    + " --enable-gallium-swrast --enable-gallium-egl --enable-glx-tls"
+    + " --enable-gallium-swrast --enable-gallium-egl --disable-glx-tls"
     + " --enable-xcb --enable-egl --disable-glut";
 
   buildInputs =

From 938fc8490e8deae170d005f9c2417999d0ee44f0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 20:08:51 +0000
Subject: [PATCH 109/113] Added linux_2_6_38_ati, a kernel that supports
 hardware rendering on modern ATI graphics chips.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2558602afd54..9c2bdb8b40dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5321,6 +5321,8 @@ let
       ];
   };
 
+  linux_2_6_38_ati = linux_2_6_38.override { extraConfig="DRM_RADEON_KMS y"; };
+
   linux_2_6_39 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.39.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5459,6 +5461,7 @@ let
   linuxPackages_2_6_37 = recurseIntoAttrs (linuxPackagesFor linux_2_6_37 pkgs.linuxPackages_2_6_37);
   linuxPackages_2_6_37_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_37_tuxonice pkgs.linuxPackages_2_6_37_tuxonice);
   linuxPackages_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_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);

From fa99abdc89d061685923cff409302790487625ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 20:53:30 +0000
Subject: [PATCH 110/113] gravit, stellarium: build software that depends on
 mesa only on mesa platforms

svn path=/nixpkgs/trunk/; revision=27790
---
 pkgs/applications/science/astronomy/gravit/default.nix     | 2 +-
 pkgs/applications/science/astronomy/stellarium/default.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
index 7183be1718aa..8af963f84bc1 100644
--- a/pkgs/applications/science/astronomy/gravit/default.nix
+++ b/pkgs/applications/science/astronomy/gravit/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
       view in 3D and zoom in and out.
     '';
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.mesaPlatforms;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 916363182a69..0f2a104f80f7 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation {
     description = "an free open source planetarium";
     homepage = http://stellarium.org/;
     license = "GPL2";
+
+    platforms = stdenv.lib.platforms.mesaPlatforms;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From aeebf42fe6d859927bc823be21913b155636f9a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 21:54:49 +0000
Subject: [PATCH 111/113] pkgs/lib/platforms.nix: added 'haskellPlatforms', a
 list of all platforms on which a Haskell compiler is available

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

diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix
index e9ed1e226e79..90ccf66f20c9 100644
--- a/pkgs/lib/platforms.nix
+++ b/pkgs/lib/platforms.nix
@@ -13,4 +13,5 @@ rec {
   all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd;
   allBut = platform: lists.filter (x: platform != x) all;
   mesaPlatforms = linux ++ darwin ++ freebsd;
+  haskellPlatforms = ["i686-linux" "x86_64-linux" "i686-darwin"];
 }

From ffe01e880df5a6378d3ec88be48436c6855d36b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 21:54:53 +0000
Subject: [PATCH 112/113] git-annex: build only on platforms that support
 Haskell

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

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 6d432c3d03d3..4407514b70ed 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
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
       control.
     '';
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.haskellPlatforms;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From 48b86237e598d96f1068926f9ec1f0a19c61491d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 21:54:58 +0000
Subject: [PATCH 113/113] mod_fastcgi, mod_wsgi: these modules don't build on
 Darwin, and I don't know how to fix that

According to Hydra:

  at `mod_fastcgi' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

  at `mod_fastcgi' [system = "x86_64-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

  at `mod_wsgi' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

  at `mod_wsgi' [system = "x86_64-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

svn path=/nixpkgs/trunk/; revision=27793
---
 pkgs/servers/http/apache-modules/mod_fastcgi/default.nix | 2 +-
 pkgs/servers/http/apache-modules/mod_wsgi/default.nix    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index 4a016f991ebd..5fdf74551723 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
       more scalable.
     '';
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index b5073428754c..c8f0da7040cc 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     description = "Host Python applications in Apache through the WSGI interface";
     license = "ASL2.0";
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }