From 50348f525889dd25e62af0ba0e655c209d9d875b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 29 Feb 2008 10:30:29 +0000 Subject: [PATCH] * fetchsvn: Nix already checks the hash, no need for the builder to do it. svn path=/nixpkgs/trunk/; revision=10896 --- pkgs/build-support/fetchsvn/builder.sh | 6 ------ pkgs/build-support/fetchsvn/default.nix | 7 ++----- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index b53ce95579ab..6ee0e82aca01 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 d1435dc4fb69..7775e392af43 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 629d39d2bfcf..2e77dfd55427 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -305,7 +305,7 @@ rec { }; fetchsvn = import ../build-support/fetchsvn { - inherit stdenv subversion nix openssh; + inherit stdenv subversion openssh; sshSupport = true; };