diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-11-26 11:14:39 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-11-26 11:14:39 +0000 |
| commit | 5dad58096360ae0b8d59323990550ef5c7ee9ee1 (patch) | |
| tree | b4e40c029b2e9b787480d3a77bd584fa7f561e86 /pkgs/build-support | |
| parent | dd61c77d4ee3f0549a3a2ad60a781ff7ed59abe6 (diff) | |
* Added Fedora 10.
svn path=/nixpkgs/trunk/; revision=13428
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/build-support/vm/rpm/rpm-closure.pl | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 756aa14c09551..076e7fa9a3665 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -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; }; diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl index a29745d928319..c3e8d52a4c67d 100644 --- a/pkgs/build-support/vm/rpm/rpm-closure.pl +++ b/pkgs/build-support/vm/rpm/rpm-closure.pl @@ -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}) { |