From f52952e504a2bfeefc3c2cde53d0d5f7901703a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Nov 2009 14:19:20 +0000
Subject: [PATCH] * Nix updated to nix-0.14pre18592.
svn path=/nixpkgs/trunk/; revision=18594
---
pkgs/tools/package-management/nix/unstable.nix | 14 ++++----------
pkgs/top-level/all-packages.nix | 5 -----
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index dd72b340d1aa..f7bb8c6413d6 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -1,17 +1,14 @@
-{ 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
-, nameSuffix ? ""
-, patches ? []
}:
stdenv.mkDerivation rec {
- name = "nix-0.13pre17922${nameSuffix}";
+ name = "nix-0.14pre18592";
src = fetchurl {
- url = "http://hydra.nixos.org/build/105957/download/4/${name}.tar.bz2";
- sha256 = "11735f2d01ed1c4a7dd345690cd6bbfec175626a6bf2c0d76a27da3c5f51c187";
+ url = "http://hydra.nixos.org/build/156376/download/4/${name}.tar.bz2";
+ sha256 = "5f0d9612a5d06176a3f0a45b16155c43cbf94a2b22849030864de276cee7f9a8";
};
buildInputs = [perl curl openssl];
@@ -19,7 +16,6 @@ stdenv.mkDerivation rec {
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
'';
@@ -32,6 +28,4 @@ stdenv.mkDerivation rec {
homepage = http://nixos.org/;
license = "LGPL";
};
-
- inherit patches;
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4497e1200b9..04e9e2a7c577 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8310,17 +8310,12 @@ let
};
# The bleeding edge.
- nixUnstable = nix;
- /*
nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.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";
};
- */
nixCustomFun = src: preConfigure: enableScripts: configureFlags:
import ../tools/package-management/nix/custom.nix {