From 874b4869a341654e3a4333d7e97c56a4ef25f301 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Feb 2010 10:41:24 +0000
Subject: [PATCH] * Nix stable updated to 0.14.

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 70e7b749c709..a2685ead6c26 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,25 +1,24 @@
-{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
+{ stdenv, fetchurl, aterm, perl, curl, bzip2, openssl ? null
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
-, supportOldDBs ? true
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-0.13";
+  name = "nix-0.14";
   
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/118589/download/4/${name}.tar.bz2";
-    sha256 = "6da44cacb7185e67dff39a2339c42f9c722081bac0dc593565bd89674beb1f94";
+    url = "http://hydra.nixos.org/build/281118/download/4/${name}.tar.bz2";
+    sha256 = "7df3dd52a7a42354e845302665c3e1f67af287f9cca2bda67f8abb724e52c519";
   };
 
-  buildInputs = [perl curl openssl];
+  buildInputs = [ perl curl openssl ];
 
-  configureFlags = ''
-    --with-store-dir=${storeDir} --localstatedir=${stateDir}
-    --with-aterm=${aterm} --with-bzip2=${bzip2}
-    ${if supportOldDBs then "--with-bdb=${db4}" else "--disable-old-db-compat"}
-    --disable-init-state
-  '';
+  configureFlags =
+    ''
+      --with-store-dir=${storeDir} --localstatedir=${stateDir}
+      --with-aterm=${aterm} --with-bzip2=${bzip2}
+      --disable-init-state
+    '';
 
   doCheck = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5b0a8ee5f51..7a1979cc6ec7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8665,19 +8665,20 @@ let
   nix = makeOverridable (import ../tools/package-management/nix) {
     inherit fetchurl stdenv perl curl bzip2 openssl;
     aterm = aterm242fixes;
-    db4 = db45;
-    supportOldDBs = getPkgConfig "nix" "OldDBSupport" true;
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   };
 
   # The bleeding edge.
+  nixUnstable = nix;
+  /*
   nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
     inherit fetchurl stdenv perl curl bzip2 openssl;
     aterm = aterm242fixes;
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   };
+  */
 
   nixCustomFun = src: preConfigure: enableScripts: configureFlags:
     import ../tools/package-management/nix/custom.nix {