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

* Don't run the RPM post-install scripts for Fedora 2/3. It seems to

Browse Source 
hang.

svn path=/nixpkgs/trunk/; revision=11575
This commit is contained in:
Eelco Dolstra
2008-04-11 15:36:03 +00:00
parent 6f08f0723d
commit 631586df47
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/vm/default.nix
+8 -4
View File
@@ -295,7 +295,7 @@ rec {
a set of RPM packages. */ a set of RPM packages. */
fillDiskWithRPMs = fillDiskWithRPMs =
{size ? 1024, rpms, name, fullName, preInstall ? "", postInstall ? ""}: {size ? 1024, rpms, name, fullName, preInstall ? "", postInstall ? "", runScripts ? true}:
runInLinuxVM (stdenv.mkDerivation { runInLinuxVM (stdenv.mkDerivation {
inherit name preInstall postInstall rpms; inherit name preInstall postInstall rpms;
@@ -325,7 +325,7 @@ rec {
echo "installing RPMs..." echo "installing RPMs..."
PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \ PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
rpm -iv $rpms rpm -iv ${if runScripts then "" else "--noscripts"} $rpms
echo "running post-install script..." echo "running post-install script..."
eval "$postInstall" eval "$postInstall"
@@ -508,10 +508,11 @@ rec {
names. */ names. */
makeImageFromRPMDist = makeImageFromRPMDist =
{name, fullName, size ? 1024, urlPrefix, packagesList, packages, postInstall ? "", archs ? ["noarch" "i386"]}: { name, fullName, size ? 1024, urlPrefix, packagesList, packages
, postInstall ? "", archs ? ["noarch" "i386"], runScripts ? true}:
fillDiskWithRPMs { fillDiskWithRPMs {
inherit name fullName size postInstall; inherit name fullName size postInstall runScripts;
rpms = import (rpmClosureGenerator { rpms = import (rpmClosureGenerator {
inherit name packagesList urlPrefix packages archs; inherit name packagesList urlPrefix packages archs;
}) {inherit fetchurl;}; }) {inherit fetchurl;};
@@ -560,6 +561,7 @@ rec {
sha256 = "1nq1k2k0nzkii737cka301f0vbd2ix2wsfvi6bblpi748q6h2w4k"; sha256 = "1nq1k2k0nzkii737cka301f0vbd2ix2wsfvi6bblpi748q6h2w4k";
}; };
urlPrefix = mirror://fedora/linux/core/2/i386/os; urlPrefix = mirror://fedora/linux/core/2/i386/os;
runScripts = false;
} // args); } // args);
fedora3i386 = args: makeImageFromRPMDist ({ fedora3i386 = args: makeImageFromRPMDist ({
@@ -570,6 +572,8 @@ rec {
sha256 = "13znspn4g1bkjkk47393k9chswgzl6nx1n0q6h2wrw52c7d9nw9i"; sha256 = "13znspn4g1bkjkk47393k9chswgzl6nx1n0q6h2wrw52c7d9nw9i";
}; };
urlPrefix = mirror://fedora/linux/core/3/i386/os; urlPrefix = mirror://fedora/linux/core/3/i386/os;
archs = ["noarch" "i386" "i586"];
runScripts = false;
} // args); } // args);
fedora5i386 = args: makeImageFromRPMDist ({ fedora5i386 = args: makeImageFromRPMDist ({