From 8396168276aa693364a76731bc8267df014ed421 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Mar 2010 12:16:03 +0000
Subject: [PATCH] * Updated Nix to 0.15.

svn path=/nixpkgs/trunk/; revision=20697
---
 pkgs/tools/package-management/nix/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix               | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a2685ead6c26..c655637d1fb4 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-0.14";
+  name = "nix-0.15";
   
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/281118/download/4/${name}.tar.bz2";
-    sha256 = "7df3dd52a7a42354e845302665c3e1f67af287f9cca2bda67f8abb724e52c519";
+    url = "http://hydra.nixos.org/build/326788/download/4/${name}.tar.bz2";
+    sha256 = "2d125e75dba387075a8bd443926d7fc6752e54cc9a21c2ef32e44fffc445a8ce";
   };
 
   buildInputs = [ perl curl openssl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56fd9f3c6ca2..66bdb4e5f8e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9102,11 +9102,14 @@ let
   };
 
   # The bleeding edge.
+  nixUnstable = nix;
+  /*
   nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
     inherit fetchurl stdenv perl curl bzip2 openssl aterm;
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   };
+  */
 
   # The SQLite branch.
   nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) {