From 41ecc6941b49d2211d4215e4e6c9a496a179ada8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 4 Dec 2007 22:06:13 +0000
Subject: svn path=/nixpkgs/trunk/; revision=9861

---
 pkgs/build-support/fetchsvn/builder.sh  | 2 +-
 pkgs/build-support/fetchsvn/default.nix | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh
index d06efa88e29..b53ce95579a 100644
--- a/pkgs/build-support/fetchsvn/builder.sh
+++ b/pkgs/build-support/fetchsvn/builder.sh
@@ -12,7 +12,7 @@ fi
 # hash of the output matters.
 echo 'p' | svn export -r "$rev" "$url" $out
 
-actual=$(nix-hash $out)
+actual=$(nix-hash $out --type "$outputHashAlgo")
 if test "$actual" != "$outputHash"; then
     echo "hash is $actual, expected $outputHash" >&2
     exit 1
diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index ff842b0ee24..ce6a1e61d9c 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@@ -1,4 +1,5 @@
-{stdenv, subversion, nix, sshSupport ? false, openssh ? null}: {url, rev ? "HEAD", md5}:
+{stdenv, subversion, nix, sshSupport ? false, openssh ? null}: 
+{url, rev ? "HEAD", md5 ? "", sha256 ? ""}:
 
 stdenv.mkDerivation {
   name = "svn-export";
@@ -6,11 +7,11 @@ stdenv.mkDerivation {
   buildInputs = [subversion nix];
 
   # Nix <= 0.7 compatibility.
-  id = md5;
+  /*id = if sha256 == "" then md5 else sha256;*/
 
-  outputHashAlgo = "md5";
+  outputHashAlgo = if sha256=="" then "md5" else "sha256";
   outputHashMode = "recursive";
-  outputHash = md5;
+  outputHash = if sha256 =="" then md5 else sha256;
   
   inherit url rev sshSupport openssh;
 }
-- 
cgit 1.4.1