diff options
Diffstat (limited to 'pkgs/tools/package-management/nix/unstable.nix')
-rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 2dac26dd1b1d..c89b913200b9 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, perl, curl, bzip2, openssl ? null -, pkgconfig, boehmgc +{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null +, pkgconfig, boehmgc, perlPackages , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-1.0pre24855"; + name = "nix-1.0pre28391"; src = fetchurl { - url = "http://hydra.nixos.org/build/774404/download/4/${name}.tar.bz2"; - sha256 = "cd2a75a04fc03dcafbab1d183e6ee485b491e17f1680bb7ee38738a2b1235932"; + url = "http://hydra.nixos.org/build/1232663/download/4/${name}.tar.bz2"; + sha256 = "c990f0ad564960b1d82fdbed32bee0db64c26b57400f027f01434237edd1be0f"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-bzip2=${bzip2} + --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 @@ -28,13 +30,15 @@ stdenv.mkDerivation rec { configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-bzip2=${bzip2.hostDrv} + --with-bzip2=${bzip2.hostDrv} --with-sqlite=${sqlite.hostDrv} --disable-init-state CFLAGS=-O3 CXXFLAGS=-O3 ''; doCheck = false; }; + enableParallelBuilding = true; + doCheck = true; meta = { |