alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

fetchsvn: fixup name guessing after #23851

Browse source 
I can't see any unfixed differences due to that PR,
at least in nix-env -qa output for the four Hydra platforms.
This commit is contained in:
Vladimír Čunát 2017-03-19 10:42:13 +01:00
parent 705b2d9b66
commit 3ca0990da1
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,9 @@ let
fst = head; fst = head;
snd = l: head (tail l); snd = l: head (tail l);
trd = l: head (tail (tail l)); trd = l: head (tail (tail l));
path_ = reverseList (splitString "/" url); path_ =
(p: if head p == "" then tail p else p) # ~ drop final slash if any
(reverseList (splitString "/" url));
path = [ (removeSuffix "/" (head path_)) ] ++ (tail path_); path = [ (removeSuffix "/" (head path_)) ] ++ (tail path_);
in in
# ../repo/trunk -> repo # ../repo/trunk -> repo
@ -31,7 +33,7 @@ stdenv.mkDerivation {
outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashAlgo = if sha256 == "" then "md5" else "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = if sha256 == "" then md5 else sha256; outputHash = if sha256 == "" then md5 else sha256;
inherit url rev sshSupport openssh ignoreExternals ignoreKeywords; inherit url rev sshSupport openssh ignoreExternals ignoreKeywords;
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;