public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Nix updated to nix-0.14pre18592.

Browse Source 
svn path=/nixpkgs/trunk/; revision=18594
This commit is contained in:
Eelco Dolstra 2009-11-24 14:19:20 +00:00
parent 6f2e018c7a
commit f52952e504
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/package-management/nix/unstable.nix
View File

@ -1,17 +1,14 @@
{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null { stdenv, fetchurl, aterm, perl, curl, bzip2, openssl ? null
, storeDir ? "/nix/store" , storeDir ? "/nix/store"
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
, supportOldDBs ? true
, nameSuffix ? ""
, patches ? []
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nix-0.13pre17922${nameSuffix}"; name = "nix-0.14pre18592";
src = fetchurl { src = fetchurl {
url = "http://hydra.nixos.org/build/105957/download/4/${name}.tar.bz2"; url = "http://hydra.nixos.org/build/156376/download/4/${name}.tar.bz2";
sha256 = "11735f2d01ed1c4a7dd345690cd6bbfec175626a6bf2c0d76a27da3c5f51c187"; sha256 = "5f0d9612a5d06176a3f0a45b16155c43cbf94a2b22849030864de276cee7f9a8";
}; };
buildInputs = [perl curl openssl]; buildInputs = [perl curl openssl];
@ -19,7 +16,6 @@ stdenv.mkDerivation rec {
configureFlags = '' configureFlags = ''
--with-store-dir=${storeDir} --localstatedir=${stateDir} --with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-aterm=${aterm} --with-bzip2=${bzip2} --with-aterm=${aterm} --with-bzip2=${bzip2}
${if supportOldDBs then "--with-bdb=${db4}" else "--disable-old-db-compat"}
--disable-init-state --disable-init-state
''; '';
@ -32,6 +28,4 @@ stdenv.mkDerivation rec {
homepage = http://nixos.org/; homepage = http://nixos.org/;
license = "LGPL"; license = "LGPL";
}; };
inherit patches;
} }

5
pkgs/top-level/all-packages.nix
View File

@ -8310,17 +8310,12 @@ let
}; };
# The bleeding edge. # The bleeding edge.
nixUnstable = nix;
/*
nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) { nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
inherit fetchurl stdenv perl curl bzip2 openssl; inherit fetchurl stdenv perl curl bzip2 openssl;
aterm = aterm242fixes; aterm = aterm242fixes;
db4 = db45;
supportOldDBs = getPkgConfig "nix" "OldDBSupport" true;
storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
}; };
*/
nixCustomFun = src: preConfigure: enableScripts: configureFlags: nixCustomFun = src: preConfigure: enableScripts: configureFlags:
import ../tools/package-management/nix/custom.nix { import ../tools/package-management/nix/custom.nix {