diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/fetchgit/default.nix | 3 | ||||
-rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index a5f81ef1794..8e060b87ebd 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,6 +1,7 @@ {stdenv, git, cacert}: let urlToName = url: rev: let - base = baseNameOf (stdenv.lib.removeSuffix "/" url); + inherit (stdenv.lib) removeSuffix splitString last; + base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); matched = builtins.match "(.*).git" base; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 3d656eba5ff..9e4f346f7a5 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -120,9 +120,8 @@ hash_from_ref(){ url_to_name(){ local url=$1 local ref=$2 - # basename removes the / and .git suffixes local base - base=$(basename "$url" .git) + base=$(basename "$url" .git | cut -d: -f2) if [[ $ref =~ ^[a-z0-9]+$ ]]; then echo "$base-${ref:0:7}" |