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

* fetchsvn: Nix already checks the hash, no need for the builder to do it.

Browse Source 
svn path=/nixpkgs/trunk/; revision=10896
This commit is contained in:
Eelco Dolstra 2008-02-29 10:30:29 +00:00
parent afe69eecbe
commit 50348f5258
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/fetchsvn/builder.sh
View File

@ -12,10 +12,4 @@ fi
# hash of the output matters. # hash of the output matters.
echo 'p' | svn export -r "$rev" "$url" $out echo 'p' | svn export -r "$rev" "$url" $out
actual=$(nix-hash $out --type "$outputHashAlgo")
if test "$actual" != "$outputHash"; then
echo "hash is $actual, expected $outputHash" >&2
exit 1
fi
stopNest stopNest

7
pkgs/build-support/fetchsvn/default.nix
View File

@ -1,13 +1,10 @@
{stdenv, subversion, nix, sshSupport ? false, openssh ? null}: {stdenv, subversion, sshSupport ? false, openssh ? null}:
{url, rev ? "HEAD", md5 ? "", sha256 ? ""}: {url, rev ? "HEAD", md5 ? "", sha256 ? ""}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "svn-export"; name = "svn-export";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [subversion nix]; buildInputs = [subversion];
# Nix <= 0.7 compatibility.
/*id = if sha256 == "" then md5 else sha256;*/
outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashAlgo = if sha256 == "" then "md5" else "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

2
pkgs/top-level/all-packages.nix
View File

@ -305,7 +305,7 @@ rec {
}; };
fetchsvn = import ../build-support/fetchsvn { fetchsvn = import ../build-support/fetchsvn {
inherit stdenv subversion nix openssh; inherit stdenv subversion openssh;
sshSupport = true; sshSupport = true;
}; };