summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-03-19 10:42:13 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-03-19 10:55:16 +0100
commit3ca0990da15ae8c9928b06d7e7f8bfb3a230981e (patch)
treecc88dfb5607ba4e3ee8fe03ee5890185e63d18fd /pkgs/build-support
parent705b2d9b66ec361b3f0a1a0c9e8d3050409f9bac (diff)
downloadnixlib-3ca0990da15ae8c9928b06d7e7f8bfb3a230981e.tar
nixlib-3ca0990da15ae8c9928b06d7e7f8bfb3a230981e.tar.gz
nixlib-3ca0990da15ae8c9928b06d7e7f8bfb3a230981e.tar.bz2
nixlib-3ca0990da15ae8c9928b06d7e7f8bfb3a230981e.tar.lz
nixlib-3ca0990da15ae8c9928b06d7e7f8bfb3a230981e.tar.xz
nixlib-3ca0990da15ae8c9928b06d7e7f8bfb3a230981e.tar.zst
nixlib-3ca0990da15ae8c9928b06d7e7f8bfb3a230981e.zip
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.
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/fetchsvn/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index 05ed0505f81c..747052c1cb70 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/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;