8 files changed, 12 insertions, 32 deletions
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 1a77f6486017..d9f5e0302588 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, makeWrapper, patchelf, jdk, gtk, glib, libXtst}:
+{fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst}:
 
 let {
   body =
@@ -7,7 +7,6 @@ let {
       builder = ./builder.sh;
       src = bindist;
       inherit makeWrapper jdk;
-      buildInputs = [patchelf];
       libraries = [gtk glib libXtst];
    };
 
diff --git a/pkgs/applications/misc/acrobat-reader/default.nix b/pkgs/applications/misc/acrobat-reader/default.nix
index 4d1f849ab123..f1e12fc02cf5 100644
--- a/pkgs/applications/misc/acrobat-reader/default.nix
+++ b/pkgs/applications/misc/acrobat-reader/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libXt, libXp, libXext, libX11, glib, pango, atk, gtk, libstdcpp5, zlib, patchelf}:
+{stdenv, fetchurl, libXt, libXp, libXext, libX11, glib, pango, atk, gtk, libstdcpp5, zlib}:
 
 stdenv.mkDerivation {
   name = "acrobat-reader-7.0.1";
@@ -7,7 +7,5 @@ stdenv.mkDerivation {
     url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz;
     md5 = "79e5a40aca6b49f7015cb1694876f87a";
   };
-  
   libPath = [libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib];
-  buildInputs = [patchelf]; /* !!! temporary */
 }
diff --git a/pkgs/development/compilers/ghc/boot.nix b/pkgs/development/compilers/ghc/boot.nix
index a6e04b4d4489..54b32ece9388 100644
--- a/pkgs/development/compilers/ghc/boot.nix
+++ b/pkgs/development/compilers/ghc/boot.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, patchelf, readline, ncurses}:
+{stdenv, fetchurl, perl, readline, ncurses}:
 
 assert stdenv.system == "i686-linux";
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     url = http://www.haskell.org/ghc/dist/6.4.1/ghc-6.4.1-i386-unknown-linux.tar.bz2;
     md5 = "9cd18a8e946da91b373b8ec855cd842e";
   };
-  buildInputs = [perl patchelf];
+  buildInputs = [perl];
   propagatedBuildInputs = [readline ncurses];
   inherit readline ncurses;
 }
diff --git a/pkgs/development/compilers/helium/default.nix b/pkgs/development/compilers/helium/default.nix
index ac4ef2fb20d2..a2437d845351 100644
--- a/pkgs/development/compilers/helium/default.nix
+++ b/pkgs/development/compilers/helium/default.nix
@@ -3,11 +3,11 @@
 assert ghc != null;
 
 stdenv.mkDerivation {
-  name = "helium-1.2";
+  name = "helium-1.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cs.uu.nl/helium/distr/helium-1.2-src.tar.gz;
-    md5 = "6ea1d6e4436e137d75f5354b4758f299";
+    url = http://www.cs.uu.nl/helium/distr/helium-1.5-src.tar.gz;
+    md5 = "b25fbee324a54059789eb1b4d62aa048";
   };
   inherit ghc;
 }
diff --git a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix
index d1cabb33df7b..57ec2d6d6e9f 100644
--- a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix
@@ -9,7 +9,7 @@
  * @author Martin Bravenboer <martin@cs.uu.nl>
  */
 { swingSupport ? true
-, stdenv, fetchurl, unzip, patchelf, libX11 ? null, libXext ? null
+, stdenv, fetchurl, unzip, libX11 ? null, libXext ? null
 }:
 
 assert stdenv.system == "i686-linux";
@@ -23,7 +23,7 @@ assert swingSupport -> libX11 != null && libXext != null;
   dirname = "jdk1.5.0_05";
   pathname = "/tmp/jdk-1_5_0_05-linux-i586.bin";
   md5 = "2f83bf2a38fff1f8ac51b02ec7391ca3";
-  buildInputs = [unzip patchelf];
+  buildInputs = [unzip];
   libraries =
     (if swingSupport then [libX11 libXext] else []);
 } // {inherit swingSupport;})
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index e030cb1d338d..da51f3acac8c 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "patchelf-0.1pre2286";
+  name = "patchelf-0.1";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/nix/patchelf-0.1pre2286/patchelf-0.1pre2286.tar.gz;
-    md5 = "2b1377e6745c239255b3f4a6ba6c0c87";
+    url = http://nix.cs.uu.nl/dist/nix/patchelf-0.1/patchelf-0.1.tar.bz2;
+    md5 = "bc20c173bf8bd590fa8ee0f348a563be";
   };
 }
diff --git a/pkgs/development/tools/misc/patchelf/new.nix b/pkgs/development/tools/misc/patchelf/new.nix
deleted file mode 100644
index dfda22814ebd..000000000000
--- a/pkgs/development/tools/misc/patchelf/new.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "patchelf-0.1pre4005";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/nix/patchelf-0.1pre4005/patchelf-0.1pre4005.tar.gz;
-    md5 = "95f0a2025d72a8499d608cc706c097b3";
-  };
-}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index f300ca236d4f..14fbbb5eae18 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -295,10 +295,6 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  patchelfNew = (import ../development/tools/misc/patchelf/new.nix) {
-    inherit fetchurl stdenv;
-  };
-
   gnum4 = (import ../development/tools/misc/gnum4) {
     inherit fetchurl stdenv;
   };
@@ -515,7 +511,6 @@ rec {
     else
       (import ../development/compilers/jdk) {
         inherit fetchurl stdenv unzip;
-        patchelf = patchelfNew;
         inherit (xlibs) libX11 libXext;
       };
 
@@ -569,7 +564,6 @@ rec {
   ghcboot = (import ../development/compilers/ghc/boot.nix) {
     inherit fetchurl stdenv perl ncurses;
     readline = readline4;
-    patchelf = patchelfNew;
   };
 
   ghc = (import ../development/compilers/ghc) {
@@ -1581,14 +1575,12 @@ rec {
     inherit (xlibs) libXt libXp libXext libX11;
     inherit (gtkLibs) glib pango atk gtk;
     libstdcpp5 = gcc33.gcc;
-    patchelf = patchelfNew;
   };
 
   eclipse = (import ../applications/editors/eclipse) {
     inherit fetchurl stdenv makeWrapper jdk;
     inherit (gtkLibs) gtk glib;
     inherit (xlibs) libXtst;
-    patchelf = patchelfNew;
   };
 
   monodevelop = (import ../applications/editors/monodevelop) {