diff options
Diffstat (limited to 'pkgs/build-support/fetchsvn')
| -rw-r--r-- | pkgs/build-support/fetchsvn/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/build-support/fetchsvn/default.nix | 7 |
2 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index b53ce95579a..6ee0e82aca0 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -12,10 +12,4 @@ fi # hash of the output matters. 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 diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index d1435dc4fb6..7775e392af4 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,13 +1,10 @@ -{stdenv, subversion, nix, sshSupport ? false, openssh ? null}: +{stdenv, subversion, sshSupport ? false, openssh ? null}: {url, rev ? "HEAD", md5 ? "", sha256 ? ""}: stdenv.mkDerivation { name = "svn-export"; builder = ./builder.sh; - buildInputs = [subversion nix]; - - # Nix <= 0.7 compatibility. - /*id = if sha256 == "" then md5 else sha256;*/ + buildInputs = [subversion]; outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; |