From 813909d153b6683998c744a51edc8491b0c9b15d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Jun 2009 14:25:45 +0000 Subject: [PATCH] * Fedora 11 uses SHA-256 hashes instead of SHA-1 in primary.xml. svn path=/nixpkgs/trunk/; revision=15908 --- pkgs/build-support/vm/rpm/rpm-closure.pl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl index c3e8d52a4c6..5f333fdfe80 100644 --- a/pkgs/build-support/vm/rpm/rpm-closure.pl +++ b/pkgs/build-support/vm/rpm/rpm-closure.pl @@ -103,10 +103,15 @@ print "[\n\n"; foreach my $pkgName (@needed) { my $pkg = $pkgs{$pkgName}; - die if $pkg->{checksum}->{type} ne "sha"; print " (fetchurl {\n"; print " url = $urlPrefix/$pkg->{location}->{href};\n"; - print " sha1 = \"$pkg->{checksum}->{content}\";\n"; + if ($pkg->{checksum}->{type} eq "sha") { + print " sha1 = \"$pkg->{checksum}->{content}\";\n"; + } elsif ($pkg->{checksum}->{type} eq "sha256") { + print " sha256 = \"$pkg->{checksum}->{content}\";\n"; + } else { + die "unsupported hash type"; + } print " })\n"; print "\n"; }