Merge pull request #284985 from wegank/fetchzip-nix-prefetch

fetchFromGitHub: fix compatibility issue with nix-prefetch
This commit is contained in:
h7x4 2024-02-02 09:54:55 +01:00 committed by GitHub
commit 0e08f348b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -28,7 +28,11 @@ let
useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || (sparseCheckout != []);
# We prefer fetchzip in cases we don't need submodules as the hash
# is more stable in that case.
fetcher = if useFetchGit then fetchgit else fetchzip.override { withUnzip = false; };
fetcher =
if useFetchGit then fetchgit
# fetchzip may not be overridable when using external tools, for example nix-prefetch
else if fetchzip ? override then fetchzip.override { withUnzip = false; }
else fetchzip;
privateAttrs = lib.optionalAttrs private {
netrcPhase = ''
if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then