diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 57afb1c4ab8..8e060b87ebd 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,9 +1,21 @@ -{stdenv, git, cacert, gitRepoToName}: +{stdenv, git, cacert}: let + urlToName = url: rev: let + inherit (stdenv.lib) removeSuffix splitString last; + base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); + matched = builtins.match "(.*).git" base; + + short = builtins.substring 0 7 rev; + + appendShort = if (builtins.match "[a-f0-9]*" rev) != null + then "-${short}" + else ""; + in "${if matched == null then base else builtins.head matched}${appendShort}"; +in { url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? deepClone , fetchSubmodules ? true, deepClone ? false , branchName ? null -, name ? gitRepoToName url rev +, name ? urlToName url rev , # Shell code executed after the file has been fetched # successfully. This can do things like check or transform the file. postFetch ? "" diff --git a/pkgs/build-support/fetchgit/gitrepotoname.nix b/pkgs/build-support/fetchgit/gitrepotoname.nix index 9f4392c387f..90005b54569 100644 --- a/pkgs/build-support/fetchgit/gitrepotoname.nix +++ b/pkgs/build-support/fetchgit/gitrepotoname.nix @@ -1,14 +1,19 @@ { lib }: -urlOrRepo: rev: let - inherit (lib) removeSuffix splitString last; - base = last (splitString ":" (baseNameOf (removeSuffix "/" urlOrRepo))); +let + inherit (lib) removeSuffix hasPrefix removePrefix splitString stringToCharacters concatMapStrings last elem; - matched = builtins.match "(.*).git" base; - - short = builtins.substring 0 7 rev; - - appendShort = if (builtins.match "[a-f0-9]*" rev) != null - then "-${short}" - else ""; -in "${if matched == null then base else builtins.head matched}${appendShort}" \ No newline at end of file + allowedChars = stringToCharacters "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-._?="; + sanitizeStoreName = s: + let + s' = concatMapStrings (c: if elem c allowedChars then c else "") (stringToCharacters s); + s'' = if hasPrefix "." s' then "_${removePrefix "." s'}" else s'; + in + s''; +in + urlOrRepo: rev: + let + repo' = last (splitString ":" (baseNameOf (removeSuffix ".git" (removeSuffix "/" urlOrRepo)))); + rev' = baseNameOf rev; + in + "${sanitizeStoreName repo'}-${sanitizeStoreName rev'}-src"