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

* Added Fedora 10.

Browse Source 
svn path=/nixpkgs/trunk/; revision=13428
This commit is contained in:
Eelco Dolstra 2008-11-26 11:14:39 +00:00
parent dd61c77d4e
commit 5dad580963
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/build-support/vm/default.nix
View File

@ -708,6 +708,27 @@ rec {
archs = ["noarch" "x86_64"];
} // args);
fedora10i386 = args: makeImageFromRPMDist ({
name = "fedora-10-i386";
fullName = "Fedora 10 (i386)";
packagesList = fetchurl {
url = mirror://fedora/linux/releases/10/Fedora/i386/os/repodata/primary.xml.gz;
sha256 = "15ha8pxzvlch707mpy06c7pkr2ra2vpd5b8x30qhydvx8fgcqcx9";
};
urlPrefix = mirror://fedora/linux/releases/10/Fedora/i386/os;
} // args);
fedora10x86_64 = args: makeImageFromRPMDist ({
name = "fedora-10-x86_64";
fullName = "Fedora 10 (x86_64)";
packagesList = fetchurl {
url = mirror://fedora/linux/releases/10/Fedora/x86_64/os/repodata/primary.xml.gz;
sha256 = "1pmaav6mdaw13fq99wfggbsmhcix306cimijjxh35qi7yc3wbsz4";
};
urlPrefix = mirror://fedora/linux/releases/10/Fedora/x86_64/os;
archs = ["noarch" "x86_64"];
} // args);
opensuse103i386 = args: makeImageFromRPMDist ({
name = "opensuse-10.3-i586";
fullName = "openSUSE 10.3 (i586)";
@ -908,6 +929,8 @@ rec {
fedora8i386 = diskImageFuns.fedora8i386 { packages = commonFedoraPackages; };
fedora9i386 = diskImageFuns.fedora9i386 { packages = commonFedoraPackages; };
fedora9x86_64 = diskImageFuns.fedora9x86_64 { packages = commonFedoraPackages; };
fedora10i386 = diskImageFuns.fedora10i386 { packages = commonFedoraPackages; };
fedora10x86_64 = diskImageFuns.fedora10x86_64 { packages = commonFedoraPackages; };
opensuse103i386 = diskImageFuns.opensuse103i386 { packages = commonOpenSUSEPackages; };
ubuntu710i386 = diskImageFuns.ubuntu710i386 { packages = commonDebianPackages; };

2
pkgs/build-support/vm/rpm/rpm-closure.pl
View File

@ -69,7 +69,7 @@ sub closePackage {
my $pkg = $pkgs{$pkgName} or die "package $pkgName doesn't exist";
my $requires = $pkg->{format}->{'rpm:requires'}->{'rpm:entry'} or die;
my $requires = $pkg->{format}->{'rpm:requires'}->{'rpm:entry'} || [];
my @deps = ();
foreach my $req (@{$requires}) {