From ade60645af4a088050fbeaf0a00af02ed2b0a955 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Nov 2009 23:47:53 +0000
Subject: [PATCH] * Nix 0.13.

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index dcb5d3ce4da0..70e7b749c709 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -4,14 +4,14 @@
 , supportOldDBs ? true
 }:
 
-stdenv.mkDerivation {
-  name = "nix-0.12";
+stdenv.mkDerivation rec {
+  name = "nix-0.13";
   
   src = fetchurl {
-    url = http://nixos.org/releases/nix/nix-0.12/nix-0.12.tar.bz2;
-    sha256 = "44454670876ad0e96d551c94ba993903b84594ccf57fef17bc2d92b1f6b155b1";
+    url = "http://hydra.nixos.org/build/118589/download/4/${name}.tar.bz2";
+    sha256 = "6da44cacb7185e67dff39a2339c42f9c722081bac0dc593565bd89674beb1f94";
   };
-  
+
   buildInputs = [perl curl openssl];
 
   configureFlags = ''
@@ -21,6 +21,10 @@ stdenv.mkDerivation {
     --disable-init-state
   '';
 
+  doCheck = true;
+
+  passthru = { inherit aterm; };
+
   meta = {
     description = "The Nix Deployment System";
     homepage = http://nixos.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9d99ba12c57..16867594516f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8450,6 +8450,8 @@ let
   };
 
   # The bleeding edge.
+  nixUnstable = nix;
+  /*
   nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
     inherit fetchurl stdenv perl curl bzip2 openssl;
     aterm = aterm242fixes;
@@ -8458,6 +8460,7 @@ let
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   };
+  */
 
   nixCustomFun = src: preConfigure: enableScripts: configureFlags:
     import ../tools/package-management/nix/custom.nix {