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

* Nix stable updated to 0.14.

Browse Source 
svn path=/nixpkgs/trunk/; revision=19830
This commit is contained in:
Eelco Dolstra 2010-02-05 10:41:24 +00:00
parent 9ba64dc6d9
commit 874b4869a3
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/package-management/nix/default.nix
View File

@ -1,23 +1,22 @@
{ 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
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nix-0.13"; name = "nix-0.14";
src = fetchurl { src = fetchurl {
url = "http://hydra.nixos.org/build/118589/download/4/${name}.tar.bz2"; url = "http://hydra.nixos.org/build/281118/download/4/${name}.tar.bz2";
sha256 = "6da44cacb7185e67dff39a2339c42f9c722081bac0dc593565bd89674beb1f94"; sha256 = "7df3dd52a7a42354e845302665c3e1f67af287f9cca2bda67f8abb724e52c519";
}; };
buildInputs = [perl curl openssl]; buildInputs = [ perl curl openssl ];
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
''; '';

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

@ -8665,19 +8665,20 @@ let
nix = makeOverridable (import ../tools/package-management/nix) { nix = makeOverridable (import ../tools/package-management/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";
}; };
# 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;
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 {