public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23830 from Rotsor/svn-ignore-keywords

Browse Source 
fetchSvn: Add support for --ignore-keywords flag
This commit is contained in:
Michael Raskin 2017-03-13 10:54:36 +01:00 committed by GitHub
commit 777bc07e1f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/fetchsvn/builder.sh
View File

@ -22,7 +22,8 @@ fi;
# server's certificate. This is perfectly safe: we don't care # server's certificate. This is perfectly safe: we don't care
# whether the server is being spoofed --- only the cryptographic # whether the server is being spoofed --- only the cryptographic
# hash of the output matters. Pass in extra p's to handle redirects. # hash of the output matters. Pass in extra p's to handle redirects.
printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive ${ignoreExternals:+--ignore-externals} \ printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive \
${ignoreExternals:+--ignore-externals} ${ignoreKeywords:+--ignore-keywords} \
-r "$rev" "$url" "$out" -r "$rev" "$url" "$out"
stopNest stopNest

5
pkgs/build-support/fetchsvn/default.nix
View File

@ -1,5 +1,6 @@
{stdenv, subversion, sshSupport ? false, openssh ? null}: {stdenv, subversion, sshSupport ? false, openssh ? null}:
{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false, name ? null}: {url, rev ? "HEAD", md5 ? "", sha256 ? "",
ignoreExternals ? false, ignoreKeywords ? false, name ? null}:
let let
repoName = with stdenv.lib; repoName = with stdenv.lib;
@ -31,7 +32,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = if sha256 == "" then md5 else sha256; outputHash = if sha256 == "" then md5 else sha256;
inherit url rev sshSupport openssh ignoreExternals; inherit url rev sshSupport openssh ignoreExternals ignoreKeywords;
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
preferLocalBuild = true; preferLocalBuild = true;