From 7a3e4c40ec4b57cac5c245cfa28944bc93bf1488 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:07:47 +0000
Subject: [PATCH 001/101] Add openjdk to all-packages.nix

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 608da21752c..f488eb93096 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2117,6 +2117,8 @@ let
 
   openjdkDarwin = callPackage ../development/compilers/openjdk-darwin { };
 
+  openjdk = callPackage ../development/compilers/openjdk { };
+
   j2sdk14x = (
     assert system == "i686-linux";
     import ../development/compilers/jdk/default-1.4.nix {

From 23e378a3c464d811f38df0064b212c4700bb0c9f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:07:58 +0000
Subject: [PATCH 002/101] *openjdk: Get source to unpack

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 88099a90949..4364766e64f 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,16 +1,12 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
-  name = "openjdk6-b16-24_apr_2009-r1";
+  name = "openjdk-7b127";
 
   src = fetchurl {
-    url = http://hg.bikemonkey.org/archive/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2;
-    sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v";
+    url = http://www.java.net/download/openjdk/jdk7/promoted/b147/openjdk-7-fcs-src-b147-27_jun_2011.zip;
+    sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
   };
 
-  installPhase = ''
-    ensureDir $out
-    cp -vR * $out/
-  '';
-
+  buildInputs = [ unzip ];
 }

From 11f0ca932042b0e9097580106bb09958c581bd8c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:08:07 +0000
Subject: [PATCH 003/101] openjdk: Add 'free' to $PATH for the build

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 4364766e64f..f14358a37a8 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl, unzip, procps}:
 
 stdenv.mkDerivation {
   name = "openjdk-7b127";
@@ -8,5 +8,5 @@ stdenv.mkDerivation {
     sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
   };
 
-  buildInputs = [ unzip ];
+  buildInputs = [ unzip procps ];
 }

From 686476b7bbd36bffd4fa243c49e60257a9a6df99 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:08:15 +0000
Subject: [PATCH 004/101] openjdk: Fix hard-code to echo

svn path=/nixpkgs/trunk/; revision=28030
---
 pkgs/development/compilers/openjdk/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index f14358a37a8..c9d61cb1f86 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, procps}:
+{stdenv, fetchurl, unzip, procps, coreutils}:
 
 stdenv.mkDerivation {
   name = "openjdk-7b127";
@@ -9,4 +9,11 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ unzip procps ];
+
+  postUnpack = ''
+    substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk \
+       --replace /bin/echo ${coreutils}/bin/echo
+    substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk \
+       --replace /usr/nix/store /nix/store
+  '';
 }

From d46390e7d2de6b37f0246e83bdca40243d1e8a48 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:08:23 +0000
Subject: [PATCH 005/101] openjdk: Add sanity check

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index c9d61cb1f86..f24c7fbc845 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -16,4 +16,8 @@ stdenv.mkDerivation {
     substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk \
        --replace /usr/nix/store /nix/store
   '';
+
+  configurePhase = ''
+    make sanity
+  '';
 }

From 3439ac32bfaa0a5f7c24049ed5f37f21bb3c8f5d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:08:32 +0000
Subject: [PATCH 006/101] openjdk: Fix some formatting

svn path=/nixpkgs/trunk/; revision=28032
---
 pkgs/development/compilers/openjdk/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index f24c7fbc845..30a88bf3d19 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -12,12 +12,13 @@ stdenv.mkDerivation {
 
   postUnpack = ''
     substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk \
-       --replace /bin/echo ${coreutils}/bin/echo
+      --replace /bin/echo ${coreutils}/bin/echo
     substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk \
-       --replace /usr/nix/store /nix/store
+      --replace /usr/nix/store /nix/store
   '';
 
   configurePhase = ''
     make sanity
   '';
 }
+

From 057e36e2f731b1d9d8ee969fe420da08e8bb9fe8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:08:40 +0000
Subject: [PATCH 007/101] openjdk: Override hard-coded mkdir

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 30a88bf3d19..dc61bf83796 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   '';
 
   configurePhase = ''
-    make sanity
+    make MKDIR=${coreutils}/bin/mkdir sanity
   '';
 }
 

From 146d6875b3887fb68d5f1681b6da212fe0035776 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:08:49 +0000
Subject: [PATCH 008/101] openjdk: Fix hardcoded gcc

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index dc61bf83796..115c2ceb86c 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   '';
 
   configurePhase = ''
-    make MKDIR=${coreutils}/bin/mkdir sanity
+    make MKDIR=${coreutils}/bin/mkdir CC=${stdenv.gcc}/bin/gcc sanity
   '';
 }
 

From b3ab977d903e6a778fff8a004f7b69d02b433690 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:08:58 +0000
Subject: [PATCH 009/101] openjdk: Factor path overrides out into makeFlags

svn path=/nixpkgs/trunk/; revision=28035
---
 pkgs/development/compilers/openjdk/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 115c2ceb86c..db49e8bdf2f 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, unzip, procps, coreutils}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "openjdk-7b127";
 
   src = fetchurl {
@@ -17,8 +17,13 @@ stdenv.mkDerivation {
       --replace /usr/nix/store /nix/store
   '';
 
+  makeFlags = ''
+    MKDIR=${coreutils}/bin/mkdir \
+    CC=${stdenv.gcc}/bin/gcc
+  '';
+
   configurePhase = ''
-    make MKDIR=${coreutils}/bin/mkdir CC=${stdenv.gcc}/bin/gcc sanity
+    make ${makeFlags} sanity
   '';
 }
 

From eceec04a441fe147ea152417362c32f061725e47 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:09:06 +0000
Subject: [PATCH 010/101] openjdk: Override hardcoded grep

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index db49e8bdf2f..e8018425bdc 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, procps, coreutils}:
+{stdenv, fetchurl, unzip, procps, coreutils, gnugrep}:
 
 stdenv.mkDerivation rec {
   name = "openjdk-7b127";
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \
+    GREP=${gnugrep}/bin/grep \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 39bea038277c53d46f6428acc8eefca4b1102336 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:09:14 +0000
Subject: [PATCH 011/101] openjdk: Override hardcoded date

svn path=/nixpkgs/trunk/; revision=28037
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index e8018425bdc..d91c29c23ae 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \
     GREP=${gnugrep}/bin/grep \
+    DATE=${coreutils}/bin/date \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 027595d6b031e81c0fff20fc05b673aa5d812576 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:09:22 +0000
Subject: [PATCH 012/101] openjdk: Override hardcoded pwd

svn path=/nixpkgs/trunk/; revision=28038
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index d91c29c23ae..32f1ff152b5 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     MKDIR=${coreutils}/bin/mkdir \
     GREP=${gnugrep}/bin/grep \
     DATE=${coreutils}/bin/date \
+    PWD=${coreutils}/bin/pwd \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 8286d4df8d7634af679c883f0b7061f4d9ddd151 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:09:30 +0000
Subject: [PATCH 013/101] openjdk: Override hardcoded tr

svn path=/nixpkgs/trunk/; revision=28039
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 32f1ff152b5..d5d277982d8 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     GREP=${gnugrep}/bin/grep \
     DATE=${coreutils}/bin/date \
     PWD=${coreutils}/bin/pwd \
+    TR=${coreutils}/bin/tr \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 0734d0315eb120b03ba225b7053de9c93d450082 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:09:38 +0000
Subject: [PATCH 014/101] openjdk: Override hardcoded egrep

svn path=/nixpkgs/trunk/; revision=28040
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index d5d277982d8..6acf47e48a3 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \
     GREP=${gnugrep}/bin/grep \
+    EGREP=${gnugrep}/bin/egrep \
     DATE=${coreutils}/bin/date \
     PWD=${coreutils}/bin/pwd \
     TR=${coreutils}/bin/tr \

From e3ebf2024a76795615f5453cca4d1f64a4762aaf Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:09:45 +0000
Subject: [PATCH 015/101] openjdk: Fix hardcoded sed

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 6acf47e48a3..a72cca3c5a2 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, procps, coreutils, gnugrep}:
+{stdenv, fetchurl, unzip, procps, coreutils, gnugrep, gnused}:
 
 stdenv.mkDerivation rec {
   name = "openjdk-7b127";
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     DATE=${coreutils}/bin/date \
     PWD=${coreutils}/bin/pwd \
     TR=${coreutils}/bin/tr \
+    SED=${gnused}/bin/sed \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 27112e723336cdc475dda60b877b8264af6a12d0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:09:53 +0000
Subject: [PATCH 016/101] openjdk: Override hardcoded alsa headers

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index a72cca3c5a2..24fee040759 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, procps, coreutils, gnugrep, gnused}:
+{stdenv, fetchurl, unzip, procps, coreutils, gnugrep, gnused, alsaLib}:
 
 stdenv.mkDerivation rec {
   name = "openjdk-7b127";
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     PWD=${coreutils}/bin/pwd \
     TR=${coreutils}/bin/tr \
     SED=${gnused}/bin/sed \
+    ALSA_INCLUDE=${alsaLib}/include \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 17c2fb730e1268c07c39f545e91af553d984e1f2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:10:01 +0000
Subject: [PATCH 017/101] openjdk: Override hardcoded head

svn path=/nixpkgs/trunk/; revision=28043
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 24fee040759..8b08b8980c7 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     TR=${coreutils}/bin/tr \
     SED=${gnused}/bin/sed \
     ALSA_INCLUDE=${alsaLib}/include \
+    HEAD=${coreutils}/bin/head \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 52582a9b45551fccfaf07b0a91f28d8a2aa17694 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:10:08 +0000
Subject: [PATCH 018/101] openjdk: Add ant to buildInputs

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 8b08b8980c7..4c5bea8fc7e 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, procps, coreutils, gnugrep, gnused, alsaLib}:
+{stdenv, fetchurl, unzip, procps, coreutils, gnugrep, gnused, alsaLib, ant}:
 
 stdenv.mkDerivation rec {
   name = "openjdk-7b127";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
   };
 
-  buildInputs = [ unzip procps ];
+  buildInputs = [ unzip procps ant ];
 
   postUnpack = ''
     substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk \

From 6795da68376c458ccc8abf674a49f94774e92189 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:10:16 +0000
Subject: [PATCH 019/101] Rearrange program inputs

svn path=/nixpkgs/trunk/; revision=28045
---
 pkgs/development/compilers/openjdk/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 4c5bea8fc7e..140697c2aff 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,4 +1,13 @@
-{stdenv, fetchurl, unzip, procps, coreutils, gnugrep, gnused, alsaLib, ant}:
+{ stdenv
+, fetchurl
+, unzip
+, procps
+, coreutils
+, gnugrep
+, gnused
+, alsaLib
+, ant
+}:
 
 stdenv.mkDerivation rec {
   name = "openjdk-7b127";

From 38c1179f56602cff1ea648aeb9e5465d32ff3610 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:10:28 +0000
Subject: [PATCH 020/101] openjdk: Override hardcoded zip

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 140697c2aff..4c48867876a 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , fetchurl
 , unzip
+, zip
 , procps
 , coreutils
 , gnugrep
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
     SED=${gnused}/bin/sed \
     ALSA_INCLUDE=${alsaLib}/include \
     HEAD=${coreutils}/bin/head \
+    ZIPEXE=${zip}/bin/zip \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 6a34912bfb572403c816601332fba9d05bc263e0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:10:36 +0000
Subject: [PATCH 021/101] zip: Folded builder into derivation

svn path=/nixpkgs/trunk/; revision=28047
---
 pkgs/tools/archivers/zip/builder.sh  | 7 -------
 pkgs/tools/archivers/zip/default.nix | 5 ++++-
 2 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 pkgs/tools/archivers/zip/builder.sh

diff --git a/pkgs/tools/archivers/zip/builder.sh b/pkgs/tools/archivers/zip/builder.sh
deleted file mode 100644
index da58762b434..00000000000
--- a/pkgs/tools/archivers/zip/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-buildFlags="-f unix/Makefile generic"
-
-installFlags="-f unix/Makefile prefix=$out INSTALL=cp"
-
-genericBuild
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 9498bf089ff..7d78d6e41fd 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -1,11 +1,14 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "zip-2.32";
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.info-zip.org/pub/infozip/src/zip232.tgz;
     md5 = "8a4da4460386e324debe97f3b7fe4d96";
   };
 
+  buildFlags="-f unix/Makefile generic";
+
+  installFlags="-f unix/Makefile prefix=$out INSTALL=cp";
+
   meta = {
     homepage = http://www.info-zip.org;
   };

From 92e792f17bd428321b2f4e1cc3f2b847424e821f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:10:44 +0000
Subject: [PATCH 022/101] zip: Change formatting

svn path=/nixpkgs/trunk/; revision=28048
---
 pkgs/tools/archivers/zip/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 7d78d6e41fd..92458a6ef1b 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -1,5 +1,8 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
   name = "zip-2.32";
+
   src = fetchurl {
     url = ftp://ftp.info-zip.org/pub/infozip/src/zip232.tgz;
     md5 = "8a4da4460386e324debe97f3b7fe4d96";
@@ -13,3 +16,4 @@
     homepage = http://www.info-zip.org;
   };
 }
+

From 3a74fd3f3b48fdf4c7fbec45abcb0eb5d7fab0e5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:10:52 +0000
Subject: [PATCH 023/101] zip: Bump to 3.0

svn path=/nixpkgs/trunk/; revision=28049
---
 pkgs/tools/archivers/zip/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 92458a6ef1b..3392a0d1f78 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "zip-2.32";
+  name = "zip-3.0";
 
   src = fetchurl {
-    url = ftp://ftp.info-zip.org/pub/infozip/src/zip232.tgz;
-    md5 = "8a4da4460386e324debe97f3b7fe4d96";
+    url = ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz;
+    sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h";
   };
 
   buildFlags="-f unix/Makefile generic";

From 6e06060c3389bf5c8ef5d06f4fb09bd7efe4656c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:11:01 +0000
Subject: [PATCH 024/101] zip: Make it actually install something

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

diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 3392a0d1f78..884af0f0b03 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   buildFlags="-f unix/Makefile generic";
 
-  installFlags="-f unix/Makefile prefix=$out INSTALL=cp";
+  installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp";
 
   meta = {
     homepage = http://www.info-zip.org;

From d5eec4cd11f472d8ca61abdfaf4b33488b5fd50b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:11:09 +0000
Subject: [PATCH 025/101] openjdk: Override hardcoded freetype headers

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 4c48867876a..c4f167c4ede 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -8,6 +8,7 @@
 , gnused
 , alsaLib
 , ant
+, freetype
 }:
 
 stdenv.mkDerivation rec {
@@ -38,6 +39,7 @@ stdenv.mkDerivation rec {
     ALSA_INCLUDE=${alsaLib}/include \
     HEAD=${coreutils}/bin/head \
     ZIPEXE=${zip}/bin/zip \
+    FREETYPE_HEADERS_PATH=${freetype}/include \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From ed9837c37cc9deec6301c380beaeaf04f2416148 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:11:17 +0000
Subject: [PATCH 026/101] openjdk: Override hardcoded freetype library path

svn path=/nixpkgs/trunk/; revision=28052
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index c4f167c4ede..6fc5d294610 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
     HEAD=${coreutils}/bin/head \
     ZIPEXE=${zip}/bin/zip \
     FREETYPE_HEADERS_PATH=${freetype}/include \
+    FREETYPE_LIB_PATH=${freetype}/lib \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 08fe49fbb4f1a0e317f7df9af68708d72e30654b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:11:24 +0000
Subject: [PATCH 027/101] openjdk: Override hardcoded cat

svn path=/nixpkgs/trunk/; revision=28053
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 6fc5d294610..c62c6b45d2b 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \
+    CAT=${coreutils}/bin/cat \
     GREP=${gnugrep}/bin/grep \
     EGREP=${gnugrep}/bin/egrep \
     DATE=${coreutils}/bin/date \

From fa80adbe2aef919eb97020aa090b4d56aedefff5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:11:32 +0000
Subject: [PATCH 028/101] openjdk: Use proper milestone and build_number
 strings

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index c62c6b45d2b..57872e5065f 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
     ZIPEXE=${zip}/bin/zip \
     FREETYPE_HEADERS_PATH=${freetype}/include \
     FREETYPE_LIB_PATH=${freetype}/lib \
+    MILESTONE="release" \
+    BUILD_NUMBER="127" \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From ac6fb72ab1daca7f6be12dfd552df5e1784aafd3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:11:40 +0000
Subject: [PATCH 029/101] openjdk: Override hardcoded cups headers path

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 57872e5065f..83012fa602c 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -9,6 +9,7 @@
 , alsaLib
 , ant
 , freetype
+, cups
 }:
 
 stdenv.mkDerivation rec {
@@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
     FREETYPE_LIB_PATH=${freetype}/lib \
     MILESTONE="release" \
     BUILD_NUMBER="127" \
+    CUPS_HEADERS_PATH="${cups}/include" \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From a156ccd7632e08356c804afd7af66cc7de79115b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:11:48 +0000
Subject: [PATCH 030/101] openjdk: Fix ALSA_INCLUDE variable

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 83012fa602c..7050f62cb8a 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     PWD=${coreutils}/bin/pwd \
     TR=${coreutils}/bin/tr \
     SED=${gnused}/bin/sed \
-    ALSA_INCLUDE=${alsaLib}/include \
+    ALSA_INCLUDE=${alsaLib}/include/alsa/version.h \
     HEAD=${coreutils}/bin/head \
     ZIPEXE=${zip}/bin/zip \
     FREETYPE_HEADERS_PATH=${freetype}/include \

From 374eb5688e00824bfd99e684c65bc031adf7c7c7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:11:56 +0000
Subject: [PATCH 031/101] openjdk: Set dummy
 /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec
 variables

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 7050f62cb8a..7bbc2bcd200 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -46,6 +46,9 @@ stdenv.mkDerivation rec {
     MILESTONE="release" \
     BUILD_NUMBER="127" \
     CUPS_HEADERS_PATH="${cups}/include" \
+    USRBIN_PATH="/" \
+    COMPILER_PATH="/" \
+    DEVTOOLS_PATH="/" \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 706a7ff59d54ebcb9503221553449af6a01fbb10 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:12:04 +0000
Subject: [PATCH 032/101] openjdk: Override hardcoded gawk

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 7bbc2bcd200..23166bbd26e 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -10,6 +10,7 @@
 , ant
 , freetype
 , cups
+, gawk
 }:
 
 stdenv.mkDerivation rec {
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
     USRBIN_PATH="/" \
     COMPILER_PATH="/" \
     DEVTOOLS_PATH="/" \
+    NAWK=${gawk}/bin/gawk \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 82d11e742cee8ecda7b43773208e04a0fff653e6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:12:12 +0000
Subject: [PATCH 033/101] openjdk: Override hardcoded printf

svn path=/nixpkgs/trunk/; revision=28059
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 23166bbd26e..a63aae75c6b 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
     COMPILER_PATH="/" \
     DEVTOOLS_PATH="/" \
     NAWK=${gawk}/bin/gawk \
+    PRINTF=${coreutils}/bin/printf \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 75918e6537068a247a928b8248c38dc302976d57 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:12:19 +0000
Subject: [PATCH 034/101] openjdk: add 'which' to buildInputs

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index a63aae75c6b..1602409f5a7 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -11,6 +11,7 @@
 , freetype
 , cups
 , gawk
+, which
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
   };
 
-  buildInputs = [ unzip procps ant ];
+  buildInputs = [ unzip procps ant which ];
 
   postUnpack = ''
     substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk \

From b1b5b095576c6d873bc16b1340aa3f2af9e4b720 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:12:28 +0000
Subject: [PATCH 035/101] openjdk: Add bootstrap JDK

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 1602409f5a7..113372fea6a 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -12,6 +12,7 @@
 , cups
 , gawk
 , which
+, jdk
 }:
 
 stdenv.mkDerivation rec {
@@ -53,6 +54,7 @@ stdenv.mkDerivation rec {
     DEVTOOLS_PATH="/" \
     NAWK=${gawk}/bin/gawk \
     PRINTF=${coreutils}/bin/printf \
+    BOOTDIR=${jdk} \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 40d1bd9950250974536328ad3aee4d4b81d4ea9b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:12:36 +0000
Subject: [PATCH 036/101] openjdk: Replace substitutions with env vars

svn path=/nixpkgs/trunk/; revision=28062
---
 pkgs/development/compilers/openjdk/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 113372fea6a..2af153addec 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -25,15 +25,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip procps ant which ];
 
-  postUnpack = ''
-    substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk \
-      --replace /bin/echo ${coreutils}/bin/echo
-    substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk \
-      --replace /usr/nix/store /nix/store
-  '';
-
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \
+    ECHO=${coreutils}/bin/echo \
     CAT=${coreutils}/bin/cat \
     GREP=${gnugrep}/bin/grep \
     EGREP=${gnugrep}/bin/egrep \

From 5054c8e8bb1654010b97bc90230de0c79d7cad46 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:12:44 +0000
Subject: [PATCH 037/101] openjdk: Override hardcoded find

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 2af153addec..a67f2657932 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -13,6 +13,7 @@
 , gawk
 , which
 , jdk
+, findutils
 }:
 
 stdenv.mkDerivation rec {
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
     NAWK=${gawk}/bin/gawk \
     PRINTF=${coreutils}/bin/printf \
     BOOTDIR=${jdk} \
+    FIND=${findutils}/bin/find \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From 735366584ab5433550f98c0d1eb73d9e4f91094f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:12:54 +0000
Subject: [PATCH 038/101] openjdk: Override hardcoded touch

svn path=/nixpkgs/trunk/; revision=28064
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index a67f2657932..bd43943e6ca 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \
+    TOUCH=${coreutils}/bin/touch \
     ECHO=${coreutils}/bin/echo \
     CAT=${coreutils}/bin/cat \
     GREP=${gnugrep}/bin/grep \

From b722db6adbf35bda75f616a7164a121fa8df31bd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:13:02 +0000
Subject: [PATCH 039/101] openjdk: Override hardcoded cp

svn path=/nixpkgs/trunk/; revision=28065
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index bd43943e6ca..0b4d0769f31 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \
     TOUCH=${coreutils}/bin/touch \
+    CP=${coreutils}/bin/cp \
     ECHO=${coreutils}/bin/echo \
     CAT=${coreutils}/bin/cat \
     GREP=${gnugrep}/bin/grep \

From 2731048017c5941251b57023e27bb417ec5fa81a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:13:11 +0000
Subject: [PATCH 040/101] openjdk: Override hardcoded chmod

svn path=/nixpkgs/trunk/; revision=28066
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 0b4d0769f31..7130c6aceaf 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
     MKDIR=${coreutils}/bin/mkdir \
     TOUCH=${coreutils}/bin/touch \
     CP=${coreutils}/bin/cp \
+    CHMOD=${coreutils}/bin/chmod \
     ECHO=${coreutils}/bin/echo \
     CAT=${coreutils}/bin/cat \
     GREP=${gnugrep}/bin/grep \

From 482daa3afdd911bad512f4b1fcc0e7b6d6ec72ef Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:13:19 +0000
Subject: [PATCH 041/101] openjdk: Add zip to buildInputs

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 7130c6aceaf..674ab224e20 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
   };
 
-  buildInputs = [ unzip procps ant which ];
+  buildInputs = [ unzip procps ant which zip ];
 
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \

From 0603a5d356f0fd61a133b5edfa5dffffafb1b4d9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:13:27 +0000
Subject: [PATCH 042/101] openjdk: Allow downloads of source 'drops' during
 build

svn path=/nixpkgs/trunk/; revision=28068
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 674ab224e20..4109363f038 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
     PRINTF=${coreutils}/bin/printf \
     BOOTDIR=${jdk} \
     FIND=${findutils}/bin/find \
+    ALLOW_DOWNLOADS=true \
     CC=${stdenv.gcc}/bin/gcc
   '';
 

From ddd7cc3fd2792a0293062609153980b65b22b554 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:13:36 +0000
Subject: [PATCH 043/101] openjdk: Fix hardcode to /usr/bin/test

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 4109363f038..801aa0765fd 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip procps ant which zip ];
 
+  postUnpack = ''
+    sed -i s@/usr/bin/test@${coreutils}/bin/test@ \
+      openjdk/hotspot/make/linux/makefiles/sa.make 
+  '';
+
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \
     TOUCH=${coreutils}/bin/touch \

From 1eb55ce7438e494e767dd7e2b2497542c55e82df Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:13:44 +0000
Subject: [PATCH 044/101] openjdk: Fix hardcode to /bin/ls

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 801aa0765fd..a9a6c492380 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -29,6 +29,9 @@ stdenv.mkDerivation rec {
   postUnpack = ''
     sed -i s@/usr/bin/test@${coreutils}/bin/test@ \
       openjdk/hotspot/make/linux/makefiles/sa.make 
+
+    sed -i s@/bin/ls@${coreutils}/bin/ls@ \
+      openjdk/hotspot/make/linux/makefiles/sa.make 
   '';
 
   makeFlags = ''

From dff2d2b06fd21ae8cdf4fca04521ec07868d48d7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:13:52 +0000
Subject: [PATCH 045/101] openjdk: Override hardcode to mv

svn path=/nixpkgs/trunk/; revision=28071
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index a9a6c492380..9c063584243 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \
+    MV=${coreutils}/bin/mv \
     TOUCH=${coreutils}/bin/touch \
     CP=${coreutils}/bin/cp \
     CHMOD=${coreutils}/bin/chmod \

From 8cf5de2fd47879e400d8059a5eed06add7bae6ed Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:14:00 +0000
Subject: [PATCH 046/101] openjdk: Override hardcodes to nm and ldd

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 9c063584243..1c28086c584 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -14,6 +14,8 @@
 , which
 , jdk
 , findutils
+, glibc
+, binutils
 }:
 
 stdenv.mkDerivation rec {
@@ -36,6 +38,8 @@ stdenv.mkDerivation rec {
 
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \
+    LDD=${glibc}/bin/ldd \
+    NM=${binutils}/bin/nm \
     MV=${coreutils}/bin/mv \
     TOUCH=${coreutils}/bin/touch \
     CP=${coreutils}/bin/cp \

From b65c19f18b6d3b1a9394f828f5355d45726e08eb Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:14:09 +0000
Subject: [PATCH 047/101] openjdk: Override hardcode to readelf

svn path=/nixpkgs/trunk/; revision=28073
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 1c28086c584..840e8c48b26 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
     MKDIR=${coreutils}/bin/mkdir \
     LDD=${glibc}/bin/ldd \
     NM=${binutils}/bin/nm \
+    READELF=${binutils}/bin/readelf \
     MV=${coreutils}/bin/mv \
     TOUCH=${coreutils}/bin/touch \
     CP=${coreutils}/bin/cp \

From 49be6e4ed6463346cfdf49cddb262a5f33f2642a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:14:17 +0000
Subject: [PATCH 048/101] openjdk: Override hardcode to ln

svn path=/nixpkgs/trunk/; revision=28074
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 840e8c48b26..3ca3bcfd1a3 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \
+    LN=${coreutils}/bin/ln \
     LDD=${glibc}/bin/ldd \
     NM=${binutils}/bin/nm \
     READELF=${binutils}/bin/readelf \

From 693dc6536ba12422b38ec7011444bddcb521c2a9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:14:25 +0000
Subject: [PATCH 049/101] openjdk: Replace dummy paths with empty path so the
 build uses the binaries in
 /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 3ca3bcfd1a3..e36e65f14ea 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -62,9 +62,9 @@ stdenv.mkDerivation rec {
     MILESTONE="release" \
     BUILD_NUMBER="127" \
     CUPS_HEADERS_PATH="${cups}/include" \
-    USRBIN_PATH="/" \
-    COMPILER_PATH="/" \
-    DEVTOOLS_PATH="/" \
+    USRBIN_PATH="" \
+    COMPILER_PATH="" \
+    DEVTOOLS_PATH="" \
     NAWK=${gawk}/bin/gawk \
     PRINTF=${coreutils}/bin/printf \
     BOOTDIR=${jdk} \

From 0f257e1d5d81b7b748ce3ca113691e1d691c04b4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:14:33 +0000
Subject: [PATCH 050/101] openjdk: Remove all coreutils overrides so they can
 be found in
 /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec

svn path=/nixpkgs/trunk/; revision=28076
---
 pkgs/development/compilers/openjdk/default.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index e36e65f14ea..257595f1e95 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -37,25 +37,13 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = ''
-    MKDIR=${coreutils}/bin/mkdir \
-    LN=${coreutils}/bin/ln \
     LDD=${glibc}/bin/ldd \
     NM=${binutils}/bin/nm \
     READELF=${binutils}/bin/readelf \
-    MV=${coreutils}/bin/mv \
-    TOUCH=${coreutils}/bin/touch \
-    CP=${coreutils}/bin/cp \
-    CHMOD=${coreutils}/bin/chmod \
-    ECHO=${coreutils}/bin/echo \
-    CAT=${coreutils}/bin/cat \
     GREP=${gnugrep}/bin/grep \
     EGREP=${gnugrep}/bin/egrep \
-    DATE=${coreutils}/bin/date \
-    PWD=${coreutils}/bin/pwd \
-    TR=${coreutils}/bin/tr \
     SED=${gnused}/bin/sed \
     ALSA_INCLUDE=${alsaLib}/include/alsa/version.h \
-    HEAD=${coreutils}/bin/head \
     ZIPEXE=${zip}/bin/zip \
     FREETYPE_HEADERS_PATH=${freetype}/include \
     FREETYPE_LIB_PATH=${freetype}/lib \
@@ -66,7 +54,6 @@ stdenv.mkDerivation rec {
     COMPILER_PATH="" \
     DEVTOOLS_PATH="" \
     NAWK=${gawk}/bin/gawk \
-    PRINTF=${coreutils}/bin/printf \
     BOOTDIR=${jdk} \
     FIND=${findutils}/bin/find \
     ALLOW_DOWNLOADS=true \

From 29c72c44997394f473cbd0a23ad0bcc3b9e30e14 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:14:41 +0000
Subject: [PATCH 051/101] openjdk: Override UNIXCOMMAND_PATH so those binaries
 are found in
 /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec

svn path=/nixpkgs/trunk/; revision=28077
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 257595f1e95..c2b612c4237 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
     USRBIN_PATH="" \
     COMPILER_PATH="" \
     DEVTOOLS_PATH="" \
+    UNIXCOMMAND_PATH="" \
     NAWK=${gawk}/bin/gawk \
     BOOTDIR=${jdk} \
     FIND=${findutils}/bin/find \

From cdc12ac64a80e4051565084ee9ba7942f4ed44e1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:14:49 +0000
Subject: [PATCH 052/101] openjdk: Add nettools to buildInputs

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index c2b612c4237..e1cacfe0ee7 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -16,6 +16,7 @@
 , findutils
 , glibc
 , binutils
+, nettools
 }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
   };
 
-  buildInputs = [ unzip procps ant which zip ];
+  buildInputs = [ unzip procps ant which zip nettools ];
 
   postUnpack = ''
     sed -i s@/usr/bin/test@${coreutils}/bin/test@ \

From a0022251d98880e62d19222d499b0d1424caa4e7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:14:57 +0000
Subject: [PATCH 053/101] openjdk: Override hardcoded echo again. It doesn't
 use any of the _PATH variables on linux

svn path=/nixpkgs/trunk/; revision=28079
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index e1cacfe0ee7..7b9741f124d 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = ''
+    ECHO=${coreutils}/bin/echo \
     LDD=${glibc}/bin/ldd \
     NM=${binutils}/bin/nm \
     READELF=${binutils}/bin/readelf \

From d0fe9fa2e809af001de1fd3b1037a748b4e8aa3a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:15:05 +0000
Subject: [PATCH 054/101] openjdk: Remove all hardcoded binary overrides except
 echo

svn path=/nixpkgs/trunk/; revision=28080
---
 pkgs/development/compilers/openjdk/default.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 7b9741f124d..db52dbffa59 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -39,14 +39,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = ''
     ECHO=${coreutils}/bin/echo \
-    LDD=${glibc}/bin/ldd \
-    NM=${binutils}/bin/nm \
-    READELF=${binutils}/bin/readelf \
-    GREP=${gnugrep}/bin/grep \
-    EGREP=${gnugrep}/bin/egrep \
-    SED=${gnused}/bin/sed \
     ALSA_INCLUDE=${alsaLib}/include/alsa/version.h \
-    ZIPEXE=${zip}/bin/zip \
     FREETYPE_HEADERS_PATH=${freetype}/include \
     FREETYPE_LIB_PATH=${freetype}/lib \
     MILESTONE="release" \
@@ -56,11 +49,8 @@ stdenv.mkDerivation rec {
     COMPILER_PATH="" \
     DEVTOOLS_PATH="" \
     UNIXCOMMAND_PATH="" \
-    NAWK=${gawk}/bin/gawk \
     BOOTDIR=${jdk} \
-    FIND=${findutils}/bin/find \
-    ALLOW_DOWNLOADS=true \
-    CC=${stdenv.gcc}/bin/gcc
+    ALLOW_DOWNLOADS=true
   '';
 
   configurePhase = ''

From 465a320b20df6b19fc7c6c7e6a962cc970b15486 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:15:13 +0000
Subject: [PATCH 055/101] openjdk: Remove unneeded explicit dependencies

svn path=/nixpkgs/trunk/; revision=28081
---
 pkgs/development/compilers/openjdk/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index db52dbffa59..2414c2925c9 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -4,18 +4,12 @@
 , zip
 , procps
 , coreutils
-, gnugrep
-, gnused
 , alsaLib
 , ant
 , freetype
 , cups
-, gawk
 , which
 , jdk
-, findutils
-, glibc
-, binutils
 , nettools
 }:
 

From 58d64db27df0f5b4c9675f3ac36beda74442ebc7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:15:21 +0000
Subject: [PATCH 056/101] openjdk: Override hardcoded sort. It doesn't use any
 of the _PATH variables on linux

svn path=/nixpkgs/trunk/; revision=28082
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 2414c2925c9..bdef2e527d5 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = ''
     ECHO=${coreutils}/bin/echo \
+    SORT=${coreutils}/bin/sort \
     ALSA_INCLUDE=${alsaLib}/include/alsa/version.h \
     FREETYPE_HEADERS_PATH=${freetype}/include \
     FREETYPE_LIB_PATH=${freetype}/lib \

From 5fca670490f3872de1296f67553361527be8337a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:15:29 +0000
Subject: [PATCH 057/101] openjdk: Use makeFlags properly

svn path=/nixpkgs/trunk/; revision=28083
---
 .../development/compilers/openjdk/default.nix | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index bdef2e527d5..9205849b206 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -31,25 +31,25 @@ stdenv.mkDerivation rec {
       openjdk/hotspot/make/linux/makefiles/sa.make 
   '';
 
-  makeFlags = ''
-    ECHO=${coreutils}/bin/echo \
-    SORT=${coreutils}/bin/sort \
-    ALSA_INCLUDE=${alsaLib}/include/alsa/version.h \
-    FREETYPE_HEADERS_PATH=${freetype}/include \
-    FREETYPE_LIB_PATH=${freetype}/lib \
-    MILESTONE="release" \
-    BUILD_NUMBER="127" \
-    CUPS_HEADERS_PATH="${cups}/include" \
-    USRBIN_PATH="" \
-    COMPILER_PATH="" \
-    DEVTOOLS_PATH="" \
-    UNIXCOMMAND_PATH="" \
-    BOOTDIR=${jdk} \
-    ALLOW_DOWNLOADS=true
-  '';
+  makeFlags = [
+    "ECHO=${coreutils}/bin/echo"
+    "SORT=${coreutils}/bin/sort"
+    "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
+    "FREETYPE_HEADERS_PATH=${freetype}/include"
+    "FREETYPE_LIB_PATH=${freetype}/lib"
+    "MILESTONE=release"
+    "BUILD_NUMBER=127"
+    "CUPS_HEADERS_PATH=${cups}/include"
+    "USRBIN_PATH="
+    "COMPILER_PATH="
+    "DEVTOOLS_PATH="
+    "UNIXCOMMAND_PATH="
+    "BOOTDIR=${jdk}"
+    "ALLOW_DOWNLOADS=true"
+  ];
 
   configurePhase = ''
-    make ${makeFlags} sanity
+    make $makeFlags sanity
   '';
 }
 

From f70d3b72df7d63e7c63af3796cfcd572e2fc5b9e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:15:37 +0000
Subject: [PATCH 058/101] openjdk: We need ECHO to be echo -e, so replace the
 override with a sed

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 9205849b206..8db69b126be 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -29,10 +29,12 @@ stdenv.mkDerivation rec {
 
     sed -i s@/bin/ls@${coreutils}/bin/ls@ \
       openjdk/hotspot/make/linux/makefiles/sa.make 
+
+    sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \
+      openjdk/jdk/make/common/shared/Defs-utils.gmk
   '';
 
   makeFlags = [
-    "ECHO=${coreutils}/bin/echo"
     "SORT=${coreutils}/bin/sort"
     "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
     "FREETYPE_HEADERS_PATH=${freetype}/include"

From 635dd9aac56954470942bc82d936e901fe10f5ba Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:15:45 +0000
Subject: [PATCH 059/101] openjdk: Combine two seds into one

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 8db69b126be..733a6e1409f 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -24,10 +24,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip procps ant which zip nettools ];
 
   postUnpack = ''
-    sed -i s@/usr/bin/test@${coreutils}/bin/test@ \
-      openjdk/hotspot/make/linux/makefiles/sa.make 
-
-    sed -i s@/bin/ls@${coreutils}/bin/ls@ \
+    sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \
+      -e "s@/bin/ls@${coreutils}/bin/ls@" \
       openjdk/hotspot/make/linux/makefiles/sa.make 
 
     sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \

From e052a36daf5ac523d1a957504ce9e29424095ca2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:15:53 +0000
Subject: [PATCH 060/101] openjdk: Use the /bin/echo sed on the corba makefiles
 too

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 733a6e1409f..62be0354d86 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       openjdk/hotspot/make/linux/makefiles/sa.make 
 
     sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \
-      openjdk/jdk/make/common/shared/Defs-utils.gmk
+      openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk
   '';
 
   makeFlags = [

From 9e06eb71d63a3b888e5afbd7c51c9790cf5039f2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:16:02 +0000
Subject: [PATCH 061/101] Add alsaLib to buildInputs

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 62be0354d86..71116c3adbc 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
   };
 
-  buildInputs = [ unzip procps ant which zip nettools ];
+  buildInputs = [ unzip procps ant which zip nettools alsaLib ];
 
   postUnpack = ''
     sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \

From 2e0252011dffed077b30ae3d4a3d0a042a384954 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:16:10 +0000
Subject: [PATCH 062/101] Add libX11 to buildInputs

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 71116c3adbc..d5168c287e5 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -11,6 +11,7 @@
 , which
 , jdk
 , nettools
+, libX11
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
   };
 
-  buildInputs = [ unzip procps ant which zip nettools alsaLib ];
+  buildInputs = [ unzip procps ant which zip nettools alsaLib libX11 ];
 
   postUnpack = ''
     sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \

From 6ce3f32da27545e45f221ba26b375abaa8c8efe4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:16:19 +0000
Subject: [PATCH 063/101] Add libXt to buildInputs

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index d5168c287e5..74cb7ba46bf 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -12,6 +12,7 @@
 , jdk
 , nettools
 , libX11
+, libXt
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
   };
 
-  buildInputs = [ unzip procps ant which zip nettools alsaLib libX11 ];
+  buildInputs = [ unzip procps ant which zip nettools alsaLib libX11 libXt ];
 
   postUnpack = ''
     sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \

From fb896f62dd47c061e18f300347d02f07160bff95 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:16:27 +0000
Subject: [PATCH 064/101] Add libXext to buildInputs

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 74cb7ba46bf..22b25b45d21 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -13,6 +13,7 @@
 , nettools
 , libX11
 , libXt
+, libXext
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
   };
 
-  buildInputs = [ unzip procps ant which zip nettools alsaLib libX11 libXt ];
+  buildInputs = [ unzip procps ant which zip nettools alsaLib libX11 libXt libXext ];
 
   postUnpack = ''
     sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \

From e2f7b2087c33e774b5ee070e2077fc00fdc07b05 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:16:35 +0000
Subject: [PATCH 065/101] Add libXrender to buildInputs

svn path=/nixpkgs/trunk/; revision=28091
---
 pkgs/development/compilers/openjdk/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 22b25b45d21..79e6a60d17c 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -14,6 +14,7 @@
 , libX11
 , libXt
 , libXext
+, libXrender
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +25,19 @@ stdenv.mkDerivation rec {
     sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
   };
 
-  buildInputs = [ unzip procps ant which zip nettools alsaLib libX11 libXt libXext ];
+  buildInputs = [
+    unzip
+    procps
+    ant
+    which
+    zip
+    nettools
+    alsaLib
+    libX11
+    libXt
+    libXext
+    libXrender
+  ];
 
   postUnpack = ''
     sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \

From 09567b5caf9ae6f3d384b32c5fc1918db3c2ae1e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:16:42 +0000
Subject: [PATCH 066/101] Add libXtst to buildInputs

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 79e6a60d17c..632afbfc8ec 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -15,6 +15,7 @@
 , libXt
 , libXext
 , libXrender
+, libXtst
 }:
 
 stdenv.mkDerivation rec {
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
     libXt
     libXext
     libXrender
+    libXtst
   ];
 
   postUnpack = ''

From c6cf3e563ed7363b0cbe3b3fd5ba25c6d104a864 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:16:50 +0000
Subject: [PATCH 067/101] Add libXi to buildInputs

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 632afbfc8ec..021009c8ea8 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -16,6 +16,7 @@
 , libXext
 , libXrender
 , libXtst
+, libXi
 }:
 
 stdenv.mkDerivation rec {
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
     libXext
     libXrender
     libXtst
+    libXi
   ];
 
   postUnpack = ''

From 0e9cda68fcb8bcb1b8d394568056049d8b97c7e2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:16:59 +0000
Subject: [PATCH 068/101] openjdk: Fix an Xrender.h include

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 021009c8ea8..9e6556f2bff 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -50,6 +50,9 @@ stdenv.mkDerivation rec {
 
     sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \
       openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk
+
+    sed -i "s@<Xrender.h>@<X11/extensions/Xrender.h>@" \
+      openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
   '';
 
   makeFlags = [

From ec41a120fb6f4fae5ef0e67f160dc5d3d38eaec8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:17:08 +0000
Subject: [PATCH 069/101] openjdk: Add patch to avoid an empty -I flag

svn path=/nixpkgs/trunk/; revision=28095
---
 .../compilers/openjdk/cppflags-include-fix.patch | 16 ++++++++++++++++
 pkgs/development/compilers/openjdk/default.nix   |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/compilers/openjdk/cppflags-include-fix.patch

diff --git a/pkgs/development/compilers/openjdk/cppflags-include-fix.patch b/pkgs/development/compilers/openjdk/cppflags-include-fix.patch
new file mode 100644
index 00000000000..36fa9054bc6
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/cppflags-include-fix.patch
@@ -0,0 +1,16 @@
+diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
+--- openjdk-orig/jdk/make/sun/awt/mawt.gmk	2011-06-27 13:19:26.000000000 -0400
++++ openjdk/jdk/make/sun/awt/mawt.gmk	2011-07-31 17:42:11.370026854 -0400
+@@ -223,12 +223,6 @@
+         -I$(PLATFORM_SRC)/native/$(PKGDIR) \
+         $(EVENT_MODEL)
+ 
+-ifeq ($(PLATFORM), linux)
+-  # Checking for the X11/extensions headers at the additional location
+-  CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
+-                        $(wildcard /usr/include/X11/extensions))
+-endif
+-
+ ifeq ($(PLATFORM), solaris)
+   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
+ endif
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 9e6556f2bff..784bc70b929 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
       openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
   '';
 
+  patches = [ ./cppflags-include-fix.patch ];
+
   makeFlags = [
     "SORT=${coreutils}/bin/sort"
     "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"

From 43cb8fb1491ffe18c542fbfcdfa20cd67a24d1d3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:17:16 +0000
Subject: [PATCH 070/101] openjdk: Add cpio to buildInputs

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 784bc70b929..92bc9c0ff00 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -17,6 +17,7 @@
 , libXrender
 , libXtst
 , libXi
+, cpio
 }:
 
 stdenv.mkDerivation rec {
@@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
     ant
     which
     zip
+    cpio
     nettools
     alsaLib
     libX11

From 572edb6f68b84856c6ad5d4c93880b01ebd38163 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:17:25 +0000
Subject: [PATCH 071/101] openjdk: Add patch to fix 'printf: --: invalid
 option' error

Thanks to http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg510739.html for the fix

svn path=/nixpkgs/trunk/; revision=28097
---
 pkgs/development/compilers/openjdk/default.nix      |  2 +-
 pkgs/development/compilers/openjdk/printf-fix.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/openjdk/printf-fix.patch

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 92bc9c0ff00..623896ae277 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
       openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
   '';
 
-  patches = [ ./cppflags-include-fix.patch ];
+  patches = [ ./cppflags-include-fix.patch ./printf-fix.patch ];
 
   makeFlags = [
     "SORT=${coreutils}/bin/sort"
diff --git a/pkgs/development/compilers/openjdk/printf-fix.patch b/pkgs/development/compilers/openjdk/printf-fix.patch
new file mode 100644
index 00000000000..3d66962a119
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/printf-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur openjdk-orig/make/Defs-internal.gmk openjdk/make/Defs-internal.gmk
+--- openjdk-orig/make/Defs-internal.gmk	2011-06-27 11:44:06.000000000 -0400
++++ openjdk/make/Defs-internal.gmk	2011-07-31 18:30:15.784506762 -0400
+@@ -79,7 +79,7 @@
+ # Find all build_time_* files and print their contents in a list sorted
+ # on the name of the sub repository.
+ define ReportBuildTimes
+-$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd   %s\n%s\n%s\n-------------------------\n" \
++$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd   %s\n%s\n%s\n-------------------------\n" \
+ $1 \
+ "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
+ "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \

From 31b09ab6954436b6653ac6de49c02629036cd337 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:17:33 +0000
Subject: [PATCH 072/101] openjdk: Install build results to $out

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 623896ae277..9aafd0acee7 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -78,5 +78,11 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     make $makeFlags sanity
   '';
+
+  installPhase = ''
+    ensureDir $out
+    cp -av build/*/j2sdk-image/* $out
+    rm $out/src.zip
+  '';
 }
 

From 84529a1370657fdcbe9281d0d44565e087c847b9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:17:42 +0000
Subject: [PATCH 073/101] openjdk: Add meta attributes

svn path=/nixpkgs/trunk/; revision=28099
---
 pkgs/development/compilers/openjdk/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 9aafd0acee7..eb7e55afa97 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     libXrender
     libXtst
     libXi
-  ];
+ ;
 
   postUnpack = ''
     sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \
@@ -84,5 +84,15 @@ stdenv.mkDerivation rec {
     cp -av build/*/j2sdk-image/* $out
     rm $out/src.zip
   '';
+
+  meta = {
+    homepage = http://openjdk.java.net/;
+
+    license = "GPLv2";
+
+    description = "The open-source Java Development Kit";
+
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
 }
 

From 6a74987ad4cc34c2a36690ce74a42724d21ad35b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 02:59:22 +0000
Subject: [PATCH 074/101] openjdk: Fix mistakenly erased square bracket

Not sure how that happend...

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index eb7e55afa97..7b4e7c259e0 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     libXrender
     libXtst
     libXi
- ;
+  ];
 
   postUnpack = ''
     sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \

From 034fb4fa11e318f37bac60449b0faceca529c875 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 1 Aug 2011 10:24:14 +0000
Subject: [PATCH 075/101] Bumped midnight commander to version 4.7.5.3

svn path=/nixpkgs/trunk/; revision=28106
---
 pkgs/tools/misc/mc/default.nix | 66 ++++++----------------------------
 1 file changed, 10 insertions(+), 56 deletions(-)

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 4a76adfd621..d3ea7a38a74 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -1,66 +1,20 @@
-{ stdenv, fetchurl, lib, pkgconfig, glib, ncurses, e2fsprogs, gpm
-, libX11, libXt, shebangfix, perl, zip, unzip, gettext, slang}:
+{ stdenv, fetchurl, pkgconfig, glib, gpm, file, e2fsprogs
+, libX11, libICE, perl, zip, unzip, gettext, slang}:
 
 stdenv.mkDerivation rec {
-  name = "mc-4.6.1";
+  name = "mc-4.7.5.3";
+  
   src = fetchurl {
-    url = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/${name}.tar.gz";
-    sha256 = "0zly25mwdn84s0wqx9mzyqi177mm828716nv1n6a4a5cm8yv0sh8";
+    url = http://www.midnight-commander.org/downloads/mc-4.7.5.3.tar.bz2;
+    sha256 = "1di8fsdg6y98iq3846j145qjk4bf5rgjj2hxnxdbcwfp8p3v8x88";
   };
-  buildInputs = [pkgconfig glib ncurses libX11 libXt
-                 shebangfix perl zip unzip slang gettext e2fsprogs gpm];
   
-  # Fix the paths to the terminfo files. Otherwise mc has no colors
-  preConfigure = ''
-    sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" configure
-  '';
-  configureFlags = "--enable-charset";
-  
-  # Stole some patches from LFS which fix some nasty bugs
-  patches = [ ./mc-4.6.1-bash32-1.patch ./mc-4.6.1-debian_fixes-1.patch ];
-  
-  # Required to enable the Debian UTF8 fixes
-  CPPFLAGS = "-DUTF8";
-  
-  # The Debian UTF8 patch expects that the documentation is in UTF8 format,
-  # therefore we have to convert them (I stole this also from LFS)
-  
-  postBuildPhase = ''
-    for file in lib/mc.hint{,.es,.it,.nl} doc/{es,it}/mc.hlp.*
-    do
-        iconv -f ISO-8859-1 -t UTF-8 $file > $file.utf8 &&
-        mv $file.utf8 $file
-    done &&
-    for file in lib/mc.hint{.cs,.hu,.pl} doc/{hu,pl}/mc.hlp.*
-    do
-        iconv -f ISO-8859-2 -t UTF-8 $file > $file.utf8 &&
-        mv $file.utf8 $file
-    done &&
-    for file in lib/mc.hint.sr doc/sr/mc.hlp.sr
-    do
-        iconv -f ISO-8859-5 -t UTF-8 $file > $file.utf8 &&
-        mv $file.utf8 $file
-    done &&
-    for file in doc/ru/mc.hlp.ru lib/mc.hint.ru
-    do
-        iconv -f KOI8-R -t UTF-8 $file > $file.utf8 &&
-        mv $file.utf8 $file
-    done &&
+  buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs ];
 
-    iconv -f KOI8-U -t UTF-8 lib/mc.hint.uk > lib/mc.hint.uk.utf8 &&
-    mv lib/mc.hint.uk.utf8 lib/mc.hint.uk &&
-    iconv -f BIG5 -t UTF-8 lib/mc.hint.zh > lib/mc.hint.zh.utf8 &&
-    mv lib/mc.hint.zh.utf8 lib/mc.hint.zh
-    # foo
-  '';
-  
-  makeFlags = "UNZIP=unzip";
-  postInstall = ''
-    find $out -iname "*.pl" | xargs shebangfix;
-  '';
   meta = {
     description = "File Manager and User Shell for the GNU Project";
-    homepage = http://www.ibiblio.org/mc;
-    maintainers = [ lib.maintainers.sander ];
+    homepage = http://www.midnight-commander.org;
+    license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.sander ];
   };
 }

From 9023f528552275dbe5dabd2a85d52b1574ca336d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 17:51:59 +0000
Subject: [PATCH 076/101] openjdk: Don't delete src.zip, it comes with the
 binary distribution too

svn path=/nixpkgs/trunk/; revision=28115
---
 pkgs/development/compilers/openjdk/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 7b4e7c259e0..a20a03ac3dd 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -82,7 +82,6 @@ stdenv.mkDerivation rec {
   installPhase = ''
     ensureDir $out
     cp -av build/*/j2sdk-image/* $out
-    rm $out/src.zip
   '';
 
   meta = {

From ba497f837aab32c705b5867b28cddc78d73970b1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 1 Aug 2011 18:05:09 +0000
Subject: [PATCH 077/101] to compile glibc-2.5 use older headers

svn path=/nixpkgs/trunk/; revision=28116
---
 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 f488eb93096..0f38c2c41c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3198,7 +3198,7 @@ let
   glibc = glibc212;
 
   glibc25 = callPackage ../development/libraries/glibc-2.5 {
-    kernelHeaders = linuxHeaders;
+    kernelHeaders = linuxHeaders_2_6_28;
     installLocales = false;
   };
 

From 02083734d1c6238e25ac2b23538201edeeac33c9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 18:48:01 +0000
Subject: [PATCH 078/101] Add openjre

svn path=/nixpkgs/trunk/; revision=28117
---
 pkgs/development/compilers/openjdk/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix                | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index a20a03ac3dd..92a7942ab57 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -18,6 +18,7 @@
 , libXtst
 , libXi
 , cpio
+, jreOnly ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -81,7 +82,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     ensureDir $out
-    cp -av build/*/j2sdk-image/* $out
+    cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f38c2c41c5..dd293993de0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2119,6 +2119,10 @@ let
 
   openjdk = callPackage ../development/compilers/openjdk { };
 
+  openjre = callPackage ../development/compilers/openjdk {
+    jreOnly = true;
+  };
+
   j2sdk14x = (
     assert system == "i686-linux";
     import ../development/compilers/jdk/default-1.4.nix {

From c497c19c4655bf8237b553c6b675095e6c141860 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 18:48:10 +0000
Subject: [PATCH 079/101] openjre: Call the derivation openjre instead of
 openjdk

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 92a7942ab57..5fab8792a66 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -22,7 +22,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "openjdk-7b127";
+  name = "openj${if jreOnly then "re" else "dk"}-7b127";
 
   src = fetchurl {
     url = http://www.java.net/download/openjdk/jdk7/promoted/b147/openjdk-7-fcs-src-b147-27_jun_2011.zip;

From 7233051b2c265598cd6702ce335c4c95f2388aa7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 2 Aug 2011 00:19:29 +0000
Subject: [PATCH 080/101] rdesktop: Bump to 1.7.0

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

diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index 24e18a75cc9..cceb70b74fb 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation (rec {
   pname = "rdesktop";
-  version = "1.6.0";
+  version = "1.7.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "0y890s5rv47ipcijcrmcy9988br22ipr4c1ppb88pjhlism6w0im";
+    sha256 = "0x2hnzvm0smnanin28n4mvzx9chpj2qnjfrxy307x21mgw6l5q1v";
   };
 
   buildInputs = [openssl libX11];

From 71dc3b87eb5d711218bb2e9233a5bb6b8c1e5773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 2 Aug 2011 14:26:47 +0000
Subject: [PATCH 081/101] Adding mairix

svn path=/nixpkgs/trunk/; revision=28122
---
 pkgs/tools/text/mairix/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/text/mairix/default.nix

diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix
new file mode 100644
index 00000000000..feaf3afe52b
--- /dev/null
+++ b/pkgs/tools/text/mairix/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, zlib, bzip2, bison, flex }:
+
+stdenv.mkDerivation rec {
+  name = "mairix-0.22";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mairix/${name}.tar.gz";
+    sha256 = "0kwxq738nbv8ip5gkq2bw320qs1vg0pnv7wsc0p5cxwzxxrv47ql";
+  };
+
+  buildInputs = [ zlib bzip2 bison flex ];
+
+  meta = {
+    homepage = http://www.rc0.org.uk/mairix;
+    license = "GPLv2+";
+    description = "Program for indexing and searching email messages stored in maildir, MH or mbox";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd293993de0..939d8c4a345 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -912,6 +912,8 @@ let
     guile = guile_1_8;
   };
 
+  mairix = callPackage ../tools/text/mairix { };
+
   man = callPackage ../tools/misc/man { };
 
   man_db = callPackage ../tools/misc/man-db { };
@@ -7620,6 +7622,8 @@ let
 
   xconq = callPackage ../games/xconq {};
 
+  xracer = callPackage ../games/xracer { };
+
   xsokoban = builderDefsPackage (import ../games/xsokoban) {
     inherit (xlibs) libX11 xproto libXpm libXt;
   };

From 23e9cfac655fa7b2989925c70b865fe2853799c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Aug 2011 15:55:55 +0000
Subject: [PATCH 082/101] * Build Skype with PulseAudio support.  This is
 needed on 64-bit   NixOS because it doesn't provide a 32-bit ALSA/Pulse
 module.

svn path=/nixpkgs/trunk/; revision=28123
---
 pkgs/applications/networking/skype/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix
index 45a83f62870..98cbfdb7c57 100644
--- a/pkgs/applications/networking/skype/default.nix
+++ b/pkgs/applications/networking/skype/default.nix
@@ -1,5 +1,6 @@
-{stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib
-, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig}:
+{ stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib
+, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
+, pulseaudio }:
 
 assert stdenv.system == "i686-linux";
 
@@ -12,7 +13,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    alsaLib 
+    alsaLib
+    pulseaudio
     stdenv.glibc 
     stdenv.gcc.gcc
     libXv

From bf68854ff40ad5095f4bfc91ed237be28016afd9 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 2 Aug 2011 16:02:53 +0000
Subject: [PATCH 083/101] make gcc 4.1 compile

svn path=/nixpkgs/trunk/; revision=28124
---
 pkgs/development/compilers/gcc-4.1/default.nix | 2 ++
 pkgs/top-level/all-packages.nix                | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix
index c11c76acc89..66bf48cb6e1 100644
--- a/pkgs/development/compilers/gcc-4.1/default.nix
+++ b/pkgs/development/compilers/gcc-4.1/default.nix
@@ -37,6 +37,8 @@ stdenv.mkDerivation {
   inherit noSysDirs profiledCompiler staticCompiler;
 
   buildInputs = [gmp mpfr texinfo];
+
+  enableParallelBuilding = true;
   
   configureFlags = "
     --disable-multilib
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 939d8c4a345..9797809b9da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1660,7 +1660,8 @@ let
   });
 
   gcc41 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.1) {
-    inherit fetchurl stdenv noSysDirs;
+    inherit fetchurl noSysDirs gmp mpfr;
+    stdenv = overrideGCC stdenv gcc42;
     texinfo = texinfo49;
     profiledCompiler = false;
   });

From 77c65a1a3b09576f35b5cf6caac9f0f1b6c123f2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Aug 2011 18:52:00 +0000
Subject: [PATCH 084/101] Update SBCL

svn path=/nixpkgs/trunk/; revision=28125
---
 pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix
index 87fbdf54e8c..5c10638805d 100644
--- a/pkgs/development/compilers/sbcl/src-for-default.nix
+++ b/pkgs/development/compilers/sbcl/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.0.49";
-   name="sbcl-1.0.49";
-   hash="1s3am56vh1rr91zkdc5ba4rirc8ydnla3sgk8yhh56sd101c7q0v";
-   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.49/sbcl-1.0.49-source.tar.bz2";
-   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.49/sbcl-1.0.49-source.tar.bz2";
+   version="1.0.50";
+   name="sbcl-1.0.50";
+   hash="1asbb43rmrp87ia2kq66ymdlgdx3jvihlz3dlgwhlz7syd9z3wc3";
+   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-source.tar.bz2";
+   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-source.tar.bz2";
   
   
 }

From 6e2572440adac85394cb4cc0e685ea20624c997e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Aug 2011 18:58:42 +0000
Subject: [PATCH 085/101] Update Wine

svn path=/nixpkgs/trunk/; revision=28126
---
 pkgs/misc/emulators/wine/src-for-default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/wine/src-for-default.nix b/pkgs/misc/emulators/wine/src-for-default.nix
index 8a742072fde..86e2d4b14d2 100644
--- a/pkgs/misc/emulators/wine/src-for-default.nix
+++ b/pkgs/misc/emulators/wine/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.3.22";
-   name="wine-1.3.22";
-   hash="11m5m6dc2hx3nhjwlcxy8z880612aa4qh7ph6fanycby1ha5rh47";
+   version="1.3.25";
+   name="wine-1.3.25";
+   hash="1ahwgq6j8js9gkj8ynar5r1ifn1y1lfkkmhgk8y9fbzxdsb5llpm";
    url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
-   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.22.tar.bz2";
+   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.25.tar.bz2";
   
   
 }

From 58c022ab56719a44c74e3b753cc3b6b05246a101 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Aug 2011 18:58:59 +0000
Subject: [PATCH 086/101] Update Veracity

svn path=/nixpkgs/trunk/; revision=28127
---
 .../version-management/veracity/src-for-default.nix    | 10 +++++-----
 .../veracity/src-info-for-default.nix                  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index dce73da0bf5..504d260204c 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.9.0.10466";
-   name="veracity-0.9.0.10466";
-   hash="19mi6pw4cy4f0w7v7myx0i1ajy40i9pgkmgr9rvfilcyi9rlvj6q";
-   url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.9.0.10466.tar.gz";
+   version="1.0.0.10517";
+   name="veracity-1.0.0.10517";
+   hash="08bka5zzn7i7c3dm3xp57n3szvm9msmi7mq1zynqb6i210qix79g";
+   url="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-${version}.tar.gz";
+   advertisedUrl="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-1.0.0.10517.tar.gz";
   
   
 }
diff --git a/pkgs/applications/version-management/veracity/src-info-for-default.nix b/pkgs/applications/version-management/veracity/src-info-for-default.nix
index dac6c65e85c..cf4936ffc55 100644
--- a/pkgs/applications/version-management/veracity/src-info-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-info-for-default.nix
@@ -1,5 +1,5 @@
 {
-  #downloadPage = "http://sourcegear.com/veracity/downloads.html";
-  downloadPage = "http://download-us.sourcegear.com/Veracity/nightly/index.html";
+  downloadPage = "http://veracity-scm.org/downloads.html";
+  #downloadPage = "http://download-us.sourcegear.com/Veracity/nightly/index.html";
   baseName = "veracity";
 }

From 9d04057b112043ee550ffd404d82541947b84ccb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Aug 2011 19:40:07 +0000
Subject: [PATCH 087/101] Update libewf. Actually buildable now

svn path=/nixpkgs/trunk/; revision=28128
---
 pkgs/development/libraries/libewf/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index cbf6847c370..7c948aa9824 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -1,12 +1,14 @@
-{ fetchurl, stdenv, zlib, openssl, libuuid }:
+{ fetchurl, stdenv, zlib, openssl, libuuid, file }:
 
 stdenv.mkDerivation rec {
-  name = "libewf-20080501";
+  name = "libewf-20100226";
   src = fetchurl {
-    url = mirror://sourceforge/libewf/libewf-20080501.tar.gz;
-    sha256 = "0s8fp7kmpk0976zii0fbk8vhi8k1br2fjp510rmgr6q1ssqdbi36";
+    url = "mirror://sourceforge/libewf/${name}.tar.gz";
+    sha256 = "aedd2a6b3df6525ff535ab95cd569ebb361a4022eb4163390f26257913c2941a";
   };
 
+  preConfigure = ''sed -e 's@/usr/bin/file@file@g' -i configure'';
+
   buildInputs = [ zlib openssl libuuid ];
 
   meta = {

From 87554657c1a6059967fd4b815ec5ca5b8deb9b47 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Aug 2011 19:46:28 +0000
Subject: [PATCH 088/101] Adding afflib

svn path=/nixpkgs/trunk/; revision=28129
---
 pkgs/development/libraries/afflib/default.nix | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  9 ++++
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/libraries/afflib/default.nix

diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix
new file mode 100644
index 00000000000..a5fdafe7914
--- /dev/null
+++ b/pkgs/development/libraries/afflib/default.nix
@@ -0,0 +1,48 @@
+x@{builderDefsPackage
+  , libewf, zlib, curl, expat, fuse, openssl
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="afflib";
+    version="3.6.12";
+    name="${baseName}-${version}";
+    url="http://afflib.org/downloads/${name}.tar.gz";
+    hash="1l13nrqjlvad112543qbyvrzai5by43zl96d3miklrhn26q9rs07";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "Advanced forensic format library";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = a.lib.licenses.bsdOriginal;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://afflib.org/";
+    };
+  };
+}) x
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9797809b9da..5f04c3925de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1612,6 +1612,10 @@ let
     buildClang = true;
   };
 
+  clangSVN = llvmSVN.override {
+    buildClang = true;
+  };
+
   clean = callPackage ../development/compilers/clean { };
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
@@ -2164,6 +2168,7 @@ let
   };
 
   llvm = callPackage ../development/compilers/llvm { };
+  llvmSVN = callPackage ../development/compilers/llvm/svn-head.nix { };
 
   mitscheme = callPackage ../development/compilers/mit-scheme { };
 
@@ -2268,6 +2273,8 @@ let
 
   roadsend = callPackage ../development/compilers/roadsend { };
 
+  rust = pkgsi686Linux.callPackage ../development/compilers/rust {};
+
   sbcl = builderDefsPackage (import ../development/compilers/sbcl) {
     inherit makeWrapper clisp;
   };
@@ -2893,6 +2900,8 @@ let
 
   adns = callPackage ../development/libraries/adns { };
 
+  afflib = callPackage ../development/libraries/afflib {};
+
   agg = callPackage ../development/libraries/agg { };
 
   allegro = callPackage ../development/libraries/allegro {};

From 451f7818a5d22e7142d6a73a4923f570d4a3b4a1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Aug 2011 20:06:09 +0000
Subject: [PATCH 089/101] Adding The Sleuth Kit

svn path=/nixpkgs/trunk/; revision=28130
---
 pkgs/tools/system/sleuthkit/default.nix | 48 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/tools/system/sleuthkit/default.nix

diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
new file mode 100644
index 00000000000..86ec54ecb8f
--- /dev/null
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -0,0 +1,48 @@
+x@{builderDefsPackage
+  , libewf, afflib, openssl, zlib
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="sleuthkit";
+    version="3.2.2";
+    name="${baseName}-${version}";
+    url="mirror://sourceforge/project/${baseName}/${baseName}/${version}/${name}.tar.gz";
+    hash="02hik5xvbgh1dpisvc3wlhhq1aprnlsk0spbw6h5khpbq9wqnmgj";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "A forensic/data recovery tool";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = "IBM Public License";
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://sourceforge.net/projects/sleuthkit/files/sleuthkit";
+    };
+  };
+}) x
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f04c3925de..73ae09f1aa8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1286,6 +1286,8 @@ let
 
   siege = callPackage ../tools/networking/siege {};
 
+  sleuthkit = callPackage ../tools/system/sleuthkit {};
+  
   slimrat = callPackage ../tools/networking/slimrat {
     inherit (perlPackages) WWWMechanize LWP;
   };

From 857d2673aea58066419a9a158079968a9443eee0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Aug 2011 22:14:18 +0000
Subject: [PATCH 090/101] haskell-packages.nix: added numtype and dimensional
 libraries

svn path=/nixpkgs/trunk/; revision=28131
---
 .../libraries/haskell/dimensional/default.nix       | 13 +++++++++++++
 .../libraries/haskell/numtype/default.nix           | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  4 ++++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/dimensional/default.nix
 create mode 100644 pkgs/development/libraries/haskell/numtype/default.nix

diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
new file mode 100644
index 00000000000..08368de5be9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -0,0 +1,13 @@
+{cabal, numtype}:
+
+cabal.mkDerivation (self : {
+  pname = "dimensional";
+  version = "0.10";
+  sha256 = "5d0ab2a0ca566f7d9a4fe1ec180a1bcf4138a3647a2c287a908506c8911cd385";
+  propagatedBuildInputs = [numtype];
+  meta = {
+    description = "library providing data types for performing arithmetic with physical quantities and units";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.simons];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix
new file mode 100644
index 00000000000..a169579c8d6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/numtype/default.nix
@@ -0,0 +1,12 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "numtype";
+  version = "1.0";
+  sha256 = "2606e81d7bcef0ba76b1e6ffc8d513c36fef5fefaab3bdd02da18761ec504e1f";
+  meta = {
+    description = "unary type level representations of the (positive and negative) integers";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.simons];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a45bf7a111a..d4b6c08e4fe 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -442,6 +442,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     inherit (pkgs) zlib;
   };
 
+  dimensional = callPackage ../development/libraries/haskell/dimensional {};
+
   directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
 
   dlist = callPackage ../development/libraries/haskell/dlist {};
@@ -754,6 +756,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {};
 
+  numtype = callPackage ../development/libraries/haskell/numtype {};
+
   OneTuple = callPackage ../development/libraries/haskell/OneTuple {};
 
   OpenAL = callPackage ../development/libraries/haskell/OpenAL {

From 21b8ff7aee05ce95c344afc4fede0c3dc8f5c17b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Aug 2011 07:49:21 +0000
Subject: [PATCH 091/101] haskell-packages.nix: added bnfc version 2.4

svn path=/nixpkgs/trunk/; revision=28132
---
 .../tools/haskell/bnfc/default.nix            | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/bnfc/default.nix

diff --git a/pkgs/development/tools/haskell/bnfc/default.nix b/pkgs/development/tools/haskell/bnfc/default.nix
new file mode 100644
index 00000000000..7f7ba00c056
--- /dev/null
+++ b/pkgs/development/tools/haskell/bnfc/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, ghc}:
+
+stdenv.mkDerivation {
+  name = "bnfc-2.4-beta1";
+
+  src = fetchurl {
+    url = "https://svn.spraakdata.gu.se/clt/release/bnfc_2.4_beta_1.tgz";
+    sha256 = "1njnck3m6qpp0qw11v1chf6m217j8f85bsgjl7zcpb4py18mjjrx";
+  };
+
+  buildInputs = [ghc];
+
+  preConfigure = "cd source";
+
+  meta = {
+    description = "Compiler construction tool generating a compiler front-end from a Labelled BNF grammar";
+    platforms = stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d4b6c08e4fe..1fc7d789852 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -361,6 +361,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   bmp = callPackage ../development/libraries/haskell/bmp {};
 
+  bnfc = callPackage ../development/tools/haskell/bnfc {};
+
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
   bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {};

From 5fbf32b737631b7ea576210098a0cf93f0c70c75 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 3 Aug 2011 08:38:34 +0000
Subject: [PATCH 092/101] Missing files

svn path=/nixpkgs/trunk/; revision=28133
---
 .../llvm/clang-include-paths-svn.patch        | 40 +++++++++++
 pkgs/development/compilers/llvm/svn-head.nix  | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 108 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/clang-include-paths-svn.patch
 create mode 100644 pkgs/development/compilers/llvm/svn-head.nix

diff --git a/pkgs/development/compilers/llvm/clang-include-paths-svn.patch b/pkgs/development/compilers/llvm/clang-include-paths-svn.patch
new file mode 100644
index 00000000000..85c7a12d09b
--- /dev/null
+++ b/pkgs/development/compilers/llvm/clang-include-paths-svn.patch
@@ -0,0 +1,40 @@
+diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
+--- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2010-09-03 18:45:53.000000000 +0200
++++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2011-02-05 14:59:08.669573190 +0100
+@@ -480,6 +480,7 @@
+       AddPath(*i, System, false, false, false);
+     return;
+   }
+ 
++#if 0
+   switch (os) {
+   case llvm::Triple::Win32: {
+@@ -593,7 +593,9 @@
+   }
+ 
+   if ( os != llvm::Triple::RTEMS )
+     AddPath("/usr/include", System, false, false, false);
++#endif
++  AddPath(C_INCLUDE_PATH, System, false, false, false);
+ }
+ 
+ void InitHeaderSearch::
+@@ -550,6 +553,7 @@
+                                   triple);
+     return;
+   }
++#if 0  
+   // FIXME: temporary hack: hard-coded paths.
+ 
+   if (triple.isOSDarwin()) {
+@@ -769,6 +773,10 @@
+   default:
+     break;
+   }
++#endif
++  AddGnuCPlusPlusIncludePaths(
++      CPP_INCLUDE_PATH,
++      CPP_HOST, "", "", triple);
+ }
+ 
+ void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang,
diff --git a/pkgs/development/compilers/llvm/svn-head.nix b/pkgs/development/compilers/llvm/svn-head.nix
new file mode 100644
index 00000000000..f929815f8a2
--- /dev/null
+++ b/pkgs/development/compilers/llvm/svn-head.nix
@@ -0,0 +1,66 @@
+{ stdenv, fetchurl, gcc, flex, perl, libtool, groff, fetchsvn
+, buildClang ? false }:
+
+let rev =  "134309"; in
+stdenv.mkDerivation ({
+  name = "llvm-r${rev}";
+  
+  src = fetchsvn {
+    url    = "http://llvm.org/svn/llvm-project/llvm/trunk";
+    inherit rev;
+    sha256 = "136qwpcl22r5bl9y4kk94vgbha1m58xrggy7qw19lg7jkgxxj8s6";
+  };
+
+  buildInputs = [ gcc flex perl groff ];
+
+  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ];
+
+  meta = {
+    homepage = http://llvm.org/;
+    description = "Collection of modular and reusable compiler and toolchain technologies";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
+// stdenv.lib.optionalAttrs buildClang (
+  # I write the assert because 'gcc.libc' will be evaluated although 'triplet' would not
+  # evaluate properly (in the preConfigure below)
+  assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+  let
+    triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu"
+              else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
+              else throw "System not supported";
+  in rec {
+    name = "clang-r${rev}";
+
+    srcClang = fetchsvn {
+      url = http://llvm.org/svn/llvm-project/cfe/trunk;
+      inherit rev;
+      sha256 = "0afbrjakfw6zgsplxblgzr2kwjndlnr2lnqjnbj16ggam5fcnhlr";
+    };
+
+    prePatch = ''
+      cp -r ${srcClang} tools/clang
+      chmod u+rwX -R tools/clang
+    '';
+
+    patches = [ ./clang-include-paths-svn.patch ];
+
+    # Set up the header file paths
+    preConfigure = ''
+      sed -i -e 's,C_INCLUDE_PATH,"${gcc.libc}/include/",' \
+        -e 's,CPP_HOST,"${triplet}",' \
+        -e 's,CPP_INCLUDE_PATH,"${gcc.gcc}/include/c++/${gcc.gcc.version}",' \
+        tools/clang/lib/Frontend/InitHeaderSearch.cpp
+    '';
+
+    meta = {
+      homepage = http://clang.llvm.org/;
+      description = "A C language family frontend for LLVM";
+      license = "BSD";
+      maintainers = with stdenv.lib.maintainers; [viric];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  }
+))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73ae09f1aa8..daadf22fbf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2170,6 +2170,8 @@ let
   };
 
   llvm = callPackage ../development/compilers/llvm { };
+
+  # Works partially
   llvmSVN = callPackage ../development/compilers/llvm/svn-head.nix { };
 
   mitscheme = callPackage ../development/compilers/mit-scheme { };

From dd9121ccff49292b49fdfcc301b7d0eb86ac9f48 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Aug 2011 08:43:47 +0000
Subject: [PATCH 093/101] all-packages.nix: disable 'rust' attribute to fix
 evaluation errors on Hydra

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index daadf22fbf9..002df137556 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2277,7 +2277,8 @@ let
 
   roadsend = callPackage ../development/compilers/roadsend { };
 
-  rust = pkgsi686Linux.callPackage ../development/compilers/rust {};
+  # TODO: the corresponding nix file is missing
+  # rust = pkgsi686Linux.callPackage ../development/compilers/rust {};
 
   sbcl = builderDefsPackage (import ../development/compilers/sbcl) {
     inherit makeWrapper clisp;

From bc913e250814e498259a793bf5d09aa1266d7106 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Aug 2011 08:43:52 +0000
Subject: [PATCH 094/101] all-packages.nix: disable 'xracer' attribute to fix
 evaluation errors on Hydra

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 002df137556..7e89c53c03b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7637,7 +7637,8 @@ let
 
   xconq = callPackage ../games/xconq {};
 
-  xracer = callPackage ../games/xracer { };
+  # TODO: the corresponding nix file is missing
+  # xracer = callPackage ../games/xracer { };
 
   xsokoban = builderDefsPackage (import ../games/xsokoban) {
     inherit (xlibs) libX11 xproto libXpm libXt;

From ee74a7e379f3241e75898625703f6d986a7140b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Aug 2011 08:43:56 +0000
Subject: [PATCH 095/101] all-packages.nix: strip trailing whitespace

svn path=/nixpkgs/trunk/; revision=28136
---
 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 7e89c53c03b..c19f1410542 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1287,7 +1287,7 @@ let
   siege = callPackage ../tools/networking/siege {};
 
   sleuthkit = callPackage ../tools/system/sleuthkit {};
-  
+
   slimrat = callPackage ../tools/networking/slimrat {
     inherit (perlPackages) WWWMechanize LWP;
   };

From 8ec17cf0a0f78b280fa06fec6461bf27136a3386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 3 Aug 2011 09:46:56 +0000
Subject: [PATCH 096/101] Updating dwm.

svn path=/nixpkgs/trunk/; revision=28137
---
 pkgs/applications/window-managers/dwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix
index cca60332d06..1427eec54f6 100644
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libX11, libXinerama, patches ? []}:
 
 stdenv.mkDerivation rec {
-  name = "dwm-5.8.2";
+  name = "dwm-5.9";
  
   src = fetchurl {
     url = "http://dl.suckless.org/dwm/${name}.tar.gz";
-    sha256 = "0rlv72fls2k4s48a0mw7mxa05d4qdxgs8pqbkyqkpzz3jb3kn965";
+    sha256 = "0cp25zqgaqj5k1mlvgxnc5jqi252chqjc5v0fzpqbhrklaidbk9d";
   };
  
   buildInputs = [ libX11 libXinerama ];

From 4f20b609fb13ca306fc72299b58d92a8357f75bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 3 Aug 2011 09:47:00 +0000
Subject: [PATCH 097/101] Updating the nvidia drivers (I experience hangs from
 time to time, maybe this will solve that)

svn path=/nixpkgs/trunk/; revision=28138
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index dec6bdbd29e..f5a45a62233 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 
-let versionNumber = "275.09.07"; in
+let versionNumber = "280.13"; in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@@ -18,12 +18,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "037zl60adks465vpcfxb74n2h7rzfwibv07d4gj5dg8i7h3v5l97";
+        sha256 = "16xcidshamxvc80sdnkph5rpgf72m5zz4x155amg2433kkhsy8mj";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "1k26z747iy0gh94288d39cgzb90wcbm339hbhd4gw3klkswhza39";
+        sha256 = "04m0wn20jwzyy8xhbs9a4vjqhh33c3dikr5vm5wa24irjiyqr84q";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From c5a60206e7147a94ffc5c3bd8ea21bbe90e29e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 3 Aug 2011 09:47:03 +0000
Subject: [PATCH 098/101] Fixing the nvidia x86_64 driver url

svn path=/nixpkgs/trunk/; revision=28139
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index f5a45a62233..f2065e1aa01 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "04m0wn20jwzyy8xhbs9a4vjqhh33c3dikr5vm5wa24irjiyqr84q";
+        sha256 = "14x80qirwlfxhphzqvi92lpgs82qnzb7hq0vd02rkbwvvnkhgdxd";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From cc2b24254abe921b60cfbb8099c9795c97d27533 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Aug 2011 13:39:49 +0000
Subject: [PATCH 099/101] * Added vnc2flv.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e99700e865..9489c0eb9e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1779,6 +1779,24 @@ let pythonPackages = python.modules // rec {
   };
 
 
+  vnc2flv = buildPythonPackage rec {
+    name = "vnc2flv-20100207";
+    namePrefix = "";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz";
+      md5 = "8492e46496e187b49fe5569b5639804e";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "Tool to record VNC sessions to Flash Video";
+      homepage = http://www.unixuser.org/~euske/python/vnc2flv/;
+    };
+  };
+
+
   webob = buildPythonPackage rec {
     version = "1.0.6";
     name = "webob-${version}";

From cf58813fb05815b6a265d4db94630e04f87e6d65 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Aug 2011 16:51:19 +0000
Subject: [PATCH 100/101] haskell-packages.nix: added tabular library

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

diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix
new file mode 100644
index 00000000000..c0e52b5b488
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tabular/default.nix
@@ -0,0 +1,13 @@
+{cabal, csv, html}:
+
+cabal.mkDerivation (self : {
+  pname = "tabular";
+  version = "0.2.2.3";
+  sha256 = "cf6d9f1928ec6981edcbb06c4dcbaea7a96deef5272192ad4290caa18711ea76";
+  propagatedBuildInputs = [csv html];
+  meta = {
+    description = "a DSL for describing (and rendering) two-dimensional data tables";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.simons];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1fc7d789852..3057e868d4c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -967,6 +967,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   svgcairo = callPackage ../development/libraries/haskell/svgcairo {};
 
+  tabular = callPackage ../development/libraries/haskell/tabular {};
+
   tagged = callPackage ../development/libraries/haskell/tagged {};
 
   tagsoup = callPackage ../development/libraries/haskell/tagsoup {};

From 8d546fbdb871c3c67f5c3d3f1d804254c8f642ec Mon Sep 17 00:00:00 2001
From: Piotr Pietraszkiewicz <ppietrasa@googlemail.com>
Date: Wed, 3 Aug 2011 18:36:56 +0000
Subject: [PATCH 101/101] upgraded kadu to v0.9.2 + fixed typos in description

svn path=/nixpkgs/trunk/; revision=28143
---
 .../instant-messengers/kadu/config.patch      | 15 ++++++++++
 .../instant-messengers/kadu/default.nix       | 28 +++++++++----------
 .../instant-messengers/kadu/includes.patch    | 13 ---------
 .../instant-messengers/kadu/more-icons.patch  | 12 --------
 4 files changed, 29 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/kadu/config.patch
 delete mode 100644 pkgs/applications/networking/instant-messengers/kadu/includes.patch
 delete mode 100644 pkgs/applications/networking/instant-messengers/kadu/more-icons.patch

diff --git a/pkgs/applications/networking/instant-messengers/kadu/config.patch b/pkgs/applications/networking/instant-messengers/kadu/config.patch
new file mode 100644
index 00000000000..263898ba0db
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/kadu/config.patch
@@ -0,0 +1,15 @@
+diff --git a/.config b/.config
+index e0068bf..808ebf4 100644
+--- a/.config
++++ b/.config
+@@ -187,8 +187,8 @@ module_history_migration=m
+ # PL: Obsługa szyfrowania wiadomości przy pomocy OpenSSLa
+ # Platform: Linux, Mac OS X, Windows
+ # Needs: libcrypto, libssl
+-module_encryption_ng=m
+-module_encryption_ng_simlite=m
++module_encryption_ng=n
++module_encryption_ng_simlite=n
+ 
+ # Description: Auto away module
+ # PL: Obsługa automatycznej zmiany statusu po określonym czasie bezczynności
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index 598bc1c0b2f..1a2193100cd 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -1,33 +1,33 @@
-{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, qca2
-, libX11, alsaLib }:
+{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, libX11,
+  alsaLib, aspell, libidn, qca2 }:
 
 stdenv.mkDerivation {
 
-  name = "kadu-0.6.5.4";
+  name = "kadu-0.9.2";
 
   src = fetchurl {
-    url = http://www.kadu.net/download/stable/kadu-0.6.5.4.tar.bz2;
-    sha256 = "09bdcyx75lca1pl6x3vfpawmdjn5pfxvwivb9xdhk4bdvswxgv4x";
+    url = http://www.kadu.net/download/stable/kadu-0.9.2.tar.bz2;
+    sha256 = "05lpx7m2adx8vv4h62rsiwlgay24m6cxdbibg7vzl4xkq9ybv30b";
   };
-  
+
   buildInputs = [
-    cmake qt4 libgadu libXScrnSaver libsndfile qca2 libX11 alsaLib
+    cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2
   ];
 
-  cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF";
+  configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";
+
+  cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS' -DCMAKE_BUILD_TYPE=Release";
 
   prePatch = ''
     patchShebangs .
   '';
-  
-  patches = [ 
-    ./includes.patch
-  ];
+
+  patches = [ ./config.patch ];
 
   NIX_LDFLAGS="-lX11";
 
-  meta = { 
-    description = "An instance messanger client for the gadu-gadu network (most popular polish IM network)";
+  meta = {
+    description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)";
     homepage = http://www.kadu.net/w/English:Main_Page;
     license = "GPLv2";
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/kadu/includes.patch b/pkgs/applications/networking/instant-messengers/kadu/includes.patch
deleted file mode 100644
index 6960a24b176..00000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/includes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- kadu/kadu-core/main.cpp	2011-01-27 22:58:22.000000000 +0100
-+++ kadu/kadu-core/main.cpp	2011-01-27 22:58:28.000000000 +0100
-@@ -20,10 +20,8 @@
- #include <winsock2.h>
- #include <windows.h>
- #endif
--#ifdef Q_OS_BSD4
- #include <sys/types.h>
- #include <sys/stat.h>
--#endif
- 
- #include "config_file.h"
- #include "debug.h"
diff --git a/pkgs/applications/networking/instant-messengers/kadu/more-icons.patch b/pkgs/applications/networking/instant-messengers/kadu/more-icons.patch
deleted file mode 100644
index 60234d361f7..00000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/more-icons.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- kadu/.config	2010-01-18 17:13:31.000000000 +0100
-+++ kadu/.config	2010-09-28 21:21:48.000000000 +0200
-@@ -559,10 +559,10 @@ icons_glass16=y
- icons_glass22=y
- 
- # Desctiption: Tango 16x16 icons made by BlotoPosniegowe
--icons_tango16=n
-+icons_tango16=y
- 
- # Description: Oxygen 16x16 icons maintained by Piotr Pelzowski
--icons_oxygen16=n
-+icons_oxygen16=y