diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-01-19 18:32:10 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2018-01-19 18:32:51 +0100 |
commit | 77225a5a952f2c9dedbc3b9d2529120c6549819a (patch) | |
tree | 3522d00a51feccfc9619e545fc0340a7ba60a089 | |
parent | 3d2948e00968feceb35688be268402709fc466ea (diff) | |
download | nixlib-77225a5a952f2c9dedbc3b9d2529120c6549819a.tar nixlib-77225a5a952f2c9dedbc3b9d2529120c6549819a.tar.gz nixlib-77225a5a952f2c9dedbc3b9d2529120c6549819a.tar.bz2 nixlib-77225a5a952f2c9dedbc3b9d2529120c6549819a.tar.lz nixlib-77225a5a952f2c9dedbc3b9d2529120c6549819a.tar.xz nixlib-77225a5a952f2c9dedbc3b9d2529120c6549819a.tar.zst nixlib-77225a5a952f2c9dedbc3b9d2529120c6549819a.zip |
Revert "fetchFromGitHub: Revert to the original version"
This reverts commit 3d5391c2561fc1d848fc4edd267c6a890457fbb5.
-rw-r--r-- | pkgs/top-level/all-packages.nix | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788d40747fd5..a36547af80dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -203,11 +203,38 @@ with pkgs; fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; - fetchFromGitHub = { owner, repo, rev, sha256 }: fetchzip { - name = "source"; - url = "https://github.com/${owner}/${repo}/archive/${rev}.zip"; - inherit sha256; - }; + fetchFromGitHub = { + owner, repo, rev, name ? "source", + fetchSubmodules ? false, private ? false, + githubBase ? "github.com", varPrefix ? null, + ... # For hash agility + }@args: assert private -> !fetchSubmodules; + 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_"; + # 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; + privateAttrs = lib.optionalAttrs private { + netrcPhase = '' + if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then + echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 + exit 1 + fi + cat > netrc <<EOF + machine ${githubBase} + login ''$${varBase}USERNAME + password ''$${varBase}PASSWORD + EOF + ''; + netrcImpureEnvVars = [ "${varBase}USERNAME" "${varBase}PASSWORD" ]; + }; + fetcherArgs = (if fetchSubmodules + then { inherit rev fetchSubmodules; url = "${baseUrl}.git"; } + else ({ url = "${baseUrl}/archive/${rev}.tar.gz"; } // privateAttrs) + ) // passthruAttrs // { inherit name; }; + in fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; }; fetchFromBitbucket = { owner, repo, rev, name ? "source", |