mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 22:21:26 +00:00
fetchFromGitHub: also use git if deepClone or leaveDotGit is used
leaveDotGit is only inherited if it is explicitly set, so fetchgit's default value for leaveDotGit ? deepClone is respected.
This commit is contained in:
parent
69e614e77f
commit
697b46aa96
@ -1,17 +1,19 @@
|
||||
{ lib, fetchgit, fetchzip }:
|
||||
|
||||
{ owner, repo, rev, name ? "source"
|
||||
, fetchSubmodules ? false, private ? false
|
||||
, fetchSubmodules ? false, leaveDotGit ? null
|
||||
, deepClone ? false, private ? false
|
||||
, githubBase ? "github.com", varPrefix ? null
|
||||
, ... # For hash agility
|
||||
}@args: assert private -> !fetchSubmodules;
|
||||
}@args:
|
||||
let
|
||||
baseUrl = "https://${githubBase}/${owner}/${repo}";
|
||||
passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ];
|
||||
varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_";
|
||||
useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone;
|
||||
# We prefer fetchzip in cases we don't need submodules as the hash
|
||||
# is more stable in that case.
|
||||
fetcher = if fetchSubmodules then fetchgit else fetchzip;
|
||||
fetcher = if useFetchGit then fetchgit else fetchzip;
|
||||
privateAttrs = lib.optionalAttrs private {
|
||||
netrcPhase = ''
|
||||
if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then
|
||||
@ -26,8 +28,14 @@ let
|
||||
'';
|
||||
netrcImpureEnvVars = [ "${varBase}USERNAME" "${varBase}PASSWORD" ];
|
||||
};
|
||||
fetcherArgs = (if fetchSubmodules
|
||||
then { inherit rev fetchSubmodules; url = "${baseUrl}.git"; }
|
||||
fetcherArgs = (if useFetchGit
|
||||
then {
|
||||
inherit rev deepClone fetchSubmodules; url = "${baseUrl}.git";
|
||||
} // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }
|
||||
else ({ url = "${baseUrl}/archive/${rev}.tar.gz"; } // privateAttrs)
|
||||
) // passthruAttrs // { inherit name; };
|
||||
in fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; }
|
||||
in
|
||||
|
||||
assert private -> !useFetchGit;
|
||||
|
||||
fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; }
|
||||
|
Loading…
Reference in New Issue
Block a user