reverting -r17404 - the patch I should have kept private

svn path=/nixpkgs/trunk/; revision=17408

2 files changed, 5 insertions, 33 deletions

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 375eb148afd..68e836ba6ee 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -1,41 +1,13 @@
-{ stdenv, fetchurl, lib, aterm, db4, perl, curl, bzip2, openssl ? null
+{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 , supportOldDBs ? true
 , nameSuffix ? ""
-, debugcCoercionFailuresPatch ? false
-  /* enabling this experimental patch will output a xml representation of the
-     thing which didn't match the expected type - for debugging only
-
-     The message of
-      let a = {}; in builtins.substring a a a; # always cause failure
-     looks like
- 
-     value is an attribute set while an integer was expected
-     <?xml version='1.0' encoding='utf-8'?>
-     <expr>
-       <attrs>
-       </attrs>
-     </expr>
-   */
 , patches ? []
 }:
 
-
-let
-   
-
-  allPatches =
-      patches ++ lib.optional debugcCoercionFailuresPatch
-                      (fetchurl { url = http://mawercer.de/~marc/debug-coercion-failures.patch; sha256 = "13q6vbxp3p36hqzlfp0hw84n6f1hzljnxqy73vr2bmglp8np24wy"; });
-  
-  vName = "nix-0.13pre17232";
-  name = "${vName}${nameSuffix}${if allPatches == [] then "" else "-patched"}";
-in
-
-stdenv.mkDerivation {
-  
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "nix-0.13pre17232${nameSuffix}";
   
   src = fetchurl {
     url = "http://hydra.nixos.org/build/75293/download/4/${name}.tar.bz2";
@@ -61,5 +33,5 @@ stdenv.mkDerivation {
     license = "LGPL";
   };
 
-  patches = allPatches;
+  inherit patches;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ada6f8a177b..512924915a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8341,7 +8341,7 @@ let
 
   # The bleeding edge.
   nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
-    inherit fetchurl stdenv lib perl curl bzip2 openssl;
+    inherit fetchurl stdenv perl curl bzip2 openssl;
     aterm = aterm242fixes;
     db4 = db45;
     supportOldDBs = getPkgConfig "nix" "OldDBSupport" true;