nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 19:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247351 from NixOS/backport-243568-to-release-23.05

Browse Source 
[Backport release-23.05] fetchsvn: support hash parameter alongside sha256
This commit is contained in:
Emily
2023-08-05 21:49:06 +02:00
committed by GitHub
parent 9607b9149c 2efdd4d98b
commit 4612af6e1c
1 changed files with 10 additions and 3 deletions
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;