b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #243568 from tjni/fetchsvn

Browse source
This commit is contained in:
Sandro 2023-07-20 17:08:53 +02:00 committed by GitHub
parent 21e2e172b9 4cbdf0d1fc
commit 081d7a5712
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/build-support/fetchsvn/default.nix
View file

@ -2,7 +2,7 @@
, subversion, glibcLocales, sshSupport ? true, openssh ? null
}:
{ url, rev ? "HEAD", md5 ? "", sha256 ? ""
{ url, rev ? "HEAD", md5 ? "", sha256 ? "", hash ? ""
, ignoreExternals ? false, ignoreKeywords ? false, name ? null
, preferLocalBuild ? true
}:
@ -34,6 +34,8 @@ in
if md5 != "" then
throw "fetchsvn does not support md5 anymore, please use sha256"
else if hash != "" && sha256 != "" then
throw "Only one of sha256 or hash can be set"
else
stdenvNoCC.mkDerivation {
name = name_;
@ -43,9 +45,14 @@ stdenvNoCC.mkDerivation {
SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null;
outputHashAlgo = "sha256";
outputHashAlgo = if hash != "" then null else "sha256";
outputHashMode = "recursive";
outputHash = sha256;
outputHash = if hash != "" then
hash
else if sha256 != "" then
sha256
else
lib.fakeSha256;
inherit url rev ignoreExternals ignoreKeywords;