Browse Source

fetchsvn: fixup name guessing after #23851

I can't see any unfixed differences due to that PR,
at least in nix-env -qa output for the four Hydra platforms.
nixos-19.03
Vladimír Čunát 5 years ago
parent
commit
3ca0990da1
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
  1. 6
      pkgs/build-support/fetchsvn/default.nix

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

@ -8,7 +8,9 @@ let
fst = head;
snd = l: head (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_);
in
# ../repo/trunk -> repo
@ -31,7 +33,7 @@ stdenv.mkDerivation {
outputHashAlgo = if sha256 == "" then "md5" else "sha256";
outputHashMode = "recursive";
outputHash = if sha256 == "" then md5 else sha256;
inherit url rev sshSupport openssh ignoreExternals ignoreKeywords;
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;

Loading…
Cancel
Save