From 29a457c5b01f83018d4cfce9ea8b6549bccf7029 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Oct 2006 12:25:40 +0000
Subject: [PATCH] * Use Nix 0.10.1.

svn path=/nixpkgs/trunk/; revision=6695
---
 pkgs/misc/nix/default.nix       | 8 +++-----
 pkgs/top-level/all-packages.nix | 4 ++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix
index 1160dcefe89..42d2ac8c2c0 100644
--- a/pkgs/misc/nix/default.nix
+++ b/pkgs/misc/nix/default.nix
@@ -4,15 +4,13 @@
 }:
 
 assert aterm != null && bdb != null && perl != null;
-# assert bdb.version >= 4.2
-# assert aterm.version >= 2.0
 
 stdenv.mkDerivation {
-  name = "nix-0.10";
+  name = "nix-0.10.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/nix/nix-0.10/nix-0.10.tar.bz2;
-    md5 = "2e5db8be894b28873b5bb1b25194955f";
+    url = http://nix.cs.uu.nl/dist/nix/nix-0.10.1/nix-0.10.1.tar.bz2;
+    md5 = "22dc0c024ca5bb477da0b38ba834dbf2";
   };
   buildInputs = [aterm bdb perl curl];
   inherit storeDir stateDir aterm bdb;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f64ae55b70..b74e155c034 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2794,10 +2794,14 @@ rec {
     bdb = db4;
   };
 
+  nixUnstable = nix;
+
+  /*
   nixUnstable = (import ../misc/nix-unstable) {
     inherit fetchurl stdenv aterm perl curl;
     bdb = db4;
   };
+  */
 
   polytable = (import ../misc/tex/polytable) {
     inherit fetchurl stdenv tetex lazylist;