diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2020-12-21 13:17:01 +0100 |
---|---|---|
committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2020-12-21 13:20:04 +0100 |
commit | 697b46aa96b9a85d324b4995f326664858062e57 (patch) | |
tree | 8e80384dd49aa6f0d676e5a37774c6cef40bfe71 /pkgs/build-support/fetchgithub/default.nix | |
parent | 69e614e77f6a7412f882424c6c5d376357e163ef (diff) | |
download | nixpkgs-697b46aa96b9a85d324b4995f326664858062e57.tar nixpkgs-697b46aa96b9a85d324b4995f326664858062e57.tar.gz nixpkgs-697b46aa96b9a85d324b4995f326664858062e57.tar.bz2 nixpkgs-697b46aa96b9a85d324b4995f326664858062e57.tar.lz nixpkgs-697b46aa96b9a85d324b4995f326664858062e57.tar.xz nixpkgs-697b46aa96b9a85d324b4995f326664858062e57.tar.zst nixpkgs-697b46aa96b9a85d324b4995f326664858062e57.zip |
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.
Diffstat (limited to 'pkgs/build-support/fetchgithub/default.nix')
-rw-r--r-- | pkgs/build-support/fetchgithub/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index 66671dd0a6a..3f355d10f8a 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -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; } |