Author: eelco Date: Wed Mar 7 09:47:22 2012 New Revision: 32847 URL: https://nixos.org/websvn/nix/?rev=32847&sc=1
Log: * We accidentally lost xz support in rpm. This broke RPM builds (http://hydra.nixos.org/build/2230623). Modified: nixpkgs/trunk/pkgs/build-support/vm/test.nix nixpkgs/trunk/pkgs/tools/package-management/rpm/default.nix Modified: nixpkgs/trunk/pkgs/build-support/vm/test.nix ============================================================================== --- nixpkgs/trunk/pkgs/build-support/vm/test.nix Wed Mar 7 09:13:52 2012 (r32846) +++ nixpkgs/trunk/pkgs/build-support/vm/test.nix Wed Mar 7 09:47:22 2012 (r32847) @@ -8,13 +8,13 @@ buildPatchelfInVM = runInLinuxVM patchelf; - testRPMImage = makeImageTestScript diskImages.fedora8i386; + testRPMImage = makeImageTestScript diskImages.fedora16i386; buildPatchelfRPM = buildRPM { name = "patchelf-rpm"; src = patchelf.src; - diskImage = diskImages.fedora13i386; + diskImage = diskImages.fedora16x86_64; }; Modified: nixpkgs/trunk/pkgs/tools/package-management/rpm/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/tools/package-management/rpm/default.nix Wed Mar 7 09:13:52 2012 (r32846) +++ nixpkgs/trunk/pkgs/tools/package-management/rpm/default.nix Wed Mar 7 09:47:22 2012 (r32847) @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4 }: +{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz }: stdenv.mkDerivation rec { name = "rpm-4.7.2"; @@ -8,7 +8,7 @@ sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0"; }; - buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 ]; + buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz ]; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
