From b81415699faf5cf863af342718f54e73f19c20c0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jun 2008 09:39:19 +0000
Subject: [PATCH] * Updated nixUnstable to the latest version.  This is the
 first no-bdb   version, so if you use it, it will convert /nix/var/nix/db to
 the   new schema.

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 128bc23dd4b..b7b95031a17 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "nix-0.11";
   
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/nix/nix-0.11/nix-0.11.tar.bz2;
+    url = http://nixos.org/releases/nix/nix-0.11/nix-0.11.tar.bz2;
     md5 = "890c25ac0005ff466683869efc288b67";
   };
   
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "The Nix Deployment System";
-    homepage = http://nix.cs.uu.nl/;
+    homepage = http://nixos.org/;
     license = "LGPL";
   };
 }
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 428f1325bc8..99c9ffb972f 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -1,29 +1,31 @@
 { stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
+, supportOldDBs ? true
 }:
 
-let version = "0.12pre11304"; in
+let version = "0.12pre12178"; in
 
 stdenv.mkDerivation {
   name = "nix-${version}";
   
   src = fetchurl {
-    url = "http://nixos.org/releases/nix/nix-${version}-6hxl2ybs/nix-${version}.tar.bz2";
-    sha256 = "8f33687ed70d4e1453cf62c0a9c5010cc49ed787794320ef94e9ead740fd042b";
+    url = "http://nixos.org/releases/nix/nix-${version}-ncl8zjnw/nix-${version}.tar.bz2";
+    sha256 = "7a5cc47272a56035bb949b32a41e7a42cfdee271334a4f12e48c96362ebd7697";
   };
 
   buildInputs = [perl curl openssl];
 
   configureFlags = ''
     --with-store-dir=${storeDir} --localstatedir=${stateDir}
-    --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
+    --with-aterm=${aterm} --with-bzip2=${bzip2}
+    ${if supportOldDBs then "--with-bdb=${db4}" else "--disable-old-db-compat"}
     --disable-init-state
   '';
 
   meta = {
     description = "The Nix Deployment System";
-    homepage = http://nix.cs.uu.nl/;
+    homepage = http://nixos.org/;
     license = "LGPL";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11354614b5b..30ed2163a2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6996,15 +6996,11 @@ let pkgs = rec {
     inherit fetchurl stdenv perl curl bzip2 openssl;
     aterm = aterm242fixes;
     db4 = db45;
+    supportOldDBs = false;
   };
 
-  # The really bleeding edge.
-  nixNoBDB = lowPrio (nixCustomFun
-    (fetchurl {
-      url = http://nixos.org/releases/nix-no-bdb/nix-0.12pre11675-jvhinhlm/nix-0.12pre11675.tar.bz2;
-      sha256 = "1c20dd159f0f7ffb7105745426b64097f833b265604e14ff77f94da2d145d44b";
-    })
-    "" [] "");
+  # !!! remove in a few weeks, obsolete
+  nixNoBDB = nixUnstable;
 
   nixCustomFun = src: preConfigure: enableScripts: configureFlags:
     import ../tools/package-management/nix/custom.nix {