diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-29 10:30:29 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-29 10:30:29 +0000 |
commit | 50348f525889dd25e62af0ba0e655c209d9d875b (patch) | |
tree | 38336244418e9890e959d6a3797a2e5d99fa5802 /pkgs | |
parent | afe69eecbee5f6162205b94d05c93b32f49cf9c7 (diff) | |
download | nixpkgs-50348f525889dd25e62af0ba0e655c209d9d875b.tar nixpkgs-50348f525889dd25e62af0ba0e655c209d9d875b.tar.gz nixpkgs-50348f525889dd25e62af0ba0e655c209d9d875b.tar.bz2 nixpkgs-50348f525889dd25e62af0ba0e655c209d9d875b.tar.lz nixpkgs-50348f525889dd25e62af0ba0e655c209d9d875b.tar.xz nixpkgs-50348f525889dd25e62af0ba0e655c209d9d875b.tar.zst nixpkgs-50348f525889dd25e62af0ba0e655c209d9d875b.zip |
* fetchsvn: Nix already checks the hash, no need for the builder to do it.
svn path=/nixpkgs/trunk/; revision=10896
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/fetchsvn/builder.sh | 6 | ||||
-rw-r--r-- | pkgs/build-support/fetchsvn/default.nix | 7 | ||||
-rw-r--r-- | 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 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 629d39d2bfc..2e77dfd5542 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; }; |