diff options
author | Robin Gloster <mail@glob.in> | 2017-03-13 13:31:44 +0100 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-03-20 22:23:41 +0100 |
commit | f57185db953670d6e4f334b7ad2dc79a96d703c4 (patch) | |
tree | b306c2b35218daa92894a1256dd5dd32c2ff3698 /pkgs/build-support/fetchsvnssh | |
parent | 1c3308e9c1dcbfc939b8cfd6d4f6e7b1c4b40748 (diff) | |
download | nixpkgs-f57185db953670d6e4f334b7ad2dc79a96d703c4.tar nixpkgs-f57185db953670d6e4f334b7ad2dc79a96d703c4.tar.gz nixpkgs-f57185db953670d6e4f334b7ad2dc79a96d703c4.tar.bz2 nixpkgs-f57185db953670d6e4f334b7ad2dc79a96d703c4.tar.lz nixpkgs-f57185db953670d6e4f334b7ad2dc79a96d703c4.tar.xz nixpkgs-f57185db953670d6e4f334b7ad2dc79a96d703c4.tar.zst nixpkgs-f57185db953670d6e4f334b7ad2dc79a96d703c4.zip |
fetch-*: remove md5 support
fixes #4491
Diffstat (limited to 'pkgs/build-support/fetchsvnssh')
-rw-r--r-- | pkgs/build-support/fetchsvnssh/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix index 6c6c03d6873..a6f3d3469f0 100644 --- a/pkgs/build-support/fetchsvnssh/default.nix +++ b/pkgs/build-support/fetchsvnssh/default.nix @@ -1,16 +1,20 @@ {stdenv, subversion, sshSupport ? false, openssh ? null, expect}: {username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}: + +if md5 != "" then + throw "fetchsvnssh does not support md5 anymore, please use sha256" +else stdenv.mkDerivation { name = "svn-export-ssh"; builder = ./builder.sh; buildInputs = [subversion expect]; - outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then md5 else sha256; - + outputHash = sha256; + sshSubversion = ./sshsubversion.exp; - + inherit username password url rev sshSupport openssh; } |