Author: eelco
Date: Fri Apr 15 13:39:44 2011
New Revision: 26851
URL: https://svn.nixos.org/websvn/nix/?rev=26851&sc=1
Log:
* Bump nixUnstable.
Modified:
nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
Modified: nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix Fri Apr
15 09:11:49 2011 (r26850)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix Fri Apr
15 13:39:44 2011 (r26851)
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
-, pkgconfig, boehmgc
+, pkgconfig, boehmgc, perlPackages
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
}:
stdenv.mkDerivation rec {
- name = "nix-1.0pre26015";
+ name = "nix-1.0pre26784";
src = fetchurl {
- url = "http://hydra.nixos.org/build/920246/download/4/${name}.tar.bz2";;
- sha256 =
"d2c9caa8573689de4e95eecaf9829d4b672ea3cb9bdfa825dac0ab0dbffb3c70";
+ url = "http://hydra.nixos.org/build/1041231/download/4/${name}.tar.bz2";;
+ sha256 =
"33711d31b25b99f0ee06ad093332f71b2be5abdbb52d5eed77c42d7e24ad3765";
};
buildNativeInputs = [ perl pkgconfig ];
@@ -19,6 +19,8 @@
''
--with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-bzip2=${bzip2} --with-sqlite=${sqlite}
+ --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
+ --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
--disable-init-state
--enable-gc
CFLAGS=-O3 CXXFLAGS=-O3
@@ -35,6 +37,8 @@
doCheck = false;
};
+ enableParallelBuilding = true;
+
doCheck = true;
meta = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
