From 44a1f6078742e2da695420ed84f3ef68a7554442 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Feb 2005 15:34:58 +0000 Subject: [PATCH] * `md5' -> `id' in compatibility mode. svn path=/nixpkgs/trunk/; revision=2273 --- pkgs/build-support/fetchurl/builder.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 74ea1f5a9c58..afa381fabc6c 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -5,9 +5,13 @@ header "downloading $out from $url" curl --fail --location --max-redirs 20 "$url" > "$out" if test "$NIX_OUTPUT_CHECKED" != "1"; then + if test "$outputHashAlgo" != "md5"; then + echo "hashes other than md5 are unsupported in Nix <= 0.7, upgrade to Nix 0.8" + exit 1 + fi actual=$(md5sum -b "$out" | cut -c1-32) - if test "$actual" != "$md5"; then - echo "hash is $actual, expected $md5" + if test "$actual" != "$id"; then + echo "hash is $actual, expected $id" exit 1 fi fi