pyrox.dev
Merge pull request #138809 from SuperSandro2000/fetchgithub-private
+14
-2
pkgs/build-support/fetchgit/default.nix
+14
-2
pkgs/build-support/fetchgit/default.nix
···
21
21
postFetch ? ""
22
22
, preferLocalBuild ? true
23
23
, fetchLFS ? false
24
+
, # Shell code to build a netrc file for BASIC auth
25
+
netrcPhase ? null
26
+
, # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes)
27
+
# needed for netrcPhase
28
+
netrcImpureEnvVars ? []
24
29
}:
25
30
26
31
/* NOTE:
···
64
69
65
70
inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName postFetch;
66
71
72
+
postHook = if netrcPhase == null then null else ''
73
+
${netrcPhase}
74
+
# required that git uses the netrc file
75
+
mv {,.}netrc
76
+
export HOME=$PWD
77
+
'';
78
+
67
79
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
68
80
69
-
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
70
-
"GIT_PROXY_COMMAND" "SOCKS_SERVER"
81
+
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ netrcImpureEnvVars ++ [
82
+
"GIT_PROXY_COMMAND" "NIX_GIT_SSL_CAINFO" "SOCKS_SERVER"
71
83
];
72
84
73
85
inherit preferLocalBuild;
+4
pkgs/build-support/fetchgit/nix-prefetch-git
+4
pkgs/build-support/fetchgit/nix-prefetch-git
···
17
17
out=${out:-}
18
18
http_proxy=${http_proxy:-}
19
19
20
+
# allow overwritting cacert's ca-bundle.crt with a custom one
21
+
# this can be done by setting NIX_GIT_SSL_CAINFO and NIX_SSL_CERT_FILE enviroment variables for the nix-daemon
22
+
GIT_SSL_CAINFO=${NIX_GIT_SSL_CAINFO:-$GIT_SSL_CAINFO}
23
+
20
24
# populated by clone_user_rev()
21
25
fullRev=
22
26
humanReadableRev=
+4
-6
pkgs/build-support/fetchgithub/default.nix
+4
-6
pkgs/build-support/fetchgithub/default.nix
···
2
2
3
3
{ owner, repo, rev, name ? "source"
4
4
, fetchSubmodules ? false, leaveDotGit ? null
5
-
, deepClone ? false, private ? false
5
+
, deepClone ? false, private ? false, forceFetchGit ? false
6
6
, githubBase ? "github.com", varPrefix ? null
7
7
, ... # For hash agility
8
8
}@args:
···
10
10
baseUrl = "https://${githubBase}/${owner}/${repo}";
11
11
passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ];
12
12
varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_";
13
-
useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone;
13
+
useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit;
14
14
# We prefer fetchzip in cases we don't need submodules as the hash
15
15
# is more stable in that case.
16
16
fetcher = if useFetchGit then fetchgit else fetchzip;
···
32
32
then {
33
33
inherit rev deepClone fetchSubmodules; url = "${baseUrl}.git";
34
34
} // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }
35
-
else ({ url = "${baseUrl}/archive/${rev}.tar.gz"; } // privateAttrs)
36
-
) // passthruAttrs // { inherit name; };
35
+
else { url = "${baseUrl}/archive/${rev}.tar.gz"; }
36
+
) // privateAttrs // passthruAttrs // { inherit name; };
37
37
in
38
-
39
-
assert private -> !useFetchGit;
40
38
41
39
fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; }