diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-31 20:01:40 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-31 20:01:40 +0000 |
commit | 5299c1f6fb7cc9fa5e6dad9107ccab1417179731 (patch) | |
tree | 52d7d482e7310407aa3f48dfd757ec13a6ce413d /pkgs/tools/package-management | |
parent | 3f44fb8f2f1ab6bb0571eef0fe16748d951b91f1 (diff) | |
parent | d789eb6a05b5eb2bd3c46798a1e7babfcffe1413 (diff) | |
download | nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.gz nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.bz2 nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.lz nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.xz nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.zst nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.zip |
svn merge ^/nixpkgs/trunk
- 1 conflict (gnome-doc-utils) - final merge before --reintegrate svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index f3ef69dd03d9..d32917c3bb77 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,20 +5,19 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre2614_005d1e4"; + name = "nix-1.0pre2632_b8fb0ce"; src = fetchurl { - url = "http://hydra.nixos.org/build/2230618/download/4/${name}.tar.bz2"; - sha256 = "47a4ff811f0d23d1c0176bc1fbb828edf16906568b0cbf5942b912ed2d2c1b44"; + url = "http://hydra.nixos.org/build/2337744/download/4/${name}.tar.bz2"; + sha256 = "5f965a54ac4ef949b1531d21c3bc1c920552ea3103a39669a3b8a4f3187bd6da"; }; buildNativeInputs = [ perl pkgconfig ]; - buildInputs = [ curl openssl boehmgc ]; + buildInputs = [ curl openssl boehmgc bzip2 sqlite ]; configureFlags = '' --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 @@ -30,11 +29,10 @@ stdenv.mkDerivation rec { configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-bzip2=${bzip2.hostDrv} --with-sqlite=${sqlite.hostDrv} - --enable-gc --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 '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system @@ -44,11 +42,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + installCheckPhase = "make installcheck"; - # Hack to get the check to succeed on Darwin. - phases = stdenv.lib.optionalString stdenv.isDarwin - "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases"; + postPhases = [ "installCheckPhase" ]; meta = { description = "The Nix Deployment System"; |