diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-08-28 12:01:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-28 12:01:44 +0000 |
| commit | 57ced0896576fc844e4b4cdf8064c922948561d6 (patch) | |
| tree | df974fe0284a9f1b098d8594964a8fb9aecce79c /pkgs/build-support | |
| parent | 3b2a731f12303210336af55172078d9081058c28 (diff) | |
| parent | dbad333a723f118641f6c55305b5b54027cfa571 (diff) | |
| download | nixpkgs-57ced0896576fc844e4b4cdf8064c922948561d6.tar nixpkgs-57ced0896576fc844e4b4cdf8064c922948561d6.tar.gz nixpkgs-57ced0896576fc844e4b4cdf8064c922948561d6.tar.bz2 nixpkgs-57ced0896576fc844e4b4cdf8064c922948561d6.tar.lz nixpkgs-57ced0896576fc844e4b4cdf8064c922948561d6.tar.xz nixpkgs-57ced0896576fc844e4b4cdf8064c922948561d6.tar.zst nixpkgs-57ced0896576fc844e4b4cdf8064c922948561d6.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 8110d670e41..6e869ab5e43 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -300,7 +300,9 @@ clone_user_rev() { local rev="${3:-HEAD}" if [ -n "$fetchLFS" ]; then - HOME=$TMPDIR + tmpHomePath="$(mktemp -d -p nix-prefetch-git-tmp-home-XXXXXXXXXX)" + exit_handlers+=(remove_tmpHomePath) + HOME="$tmpHomePath" git lfs install fi @@ -396,6 +398,7 @@ print_results() { "date": "$(json_escape "$commitDateStrict8601")", "path": "$(json_escape "$finalPath")", "$(json_escape "$hashType")": "$(json_escape "$hash")", + "fetchLFS": $([[ -n "$fetchLFS" ]] && echo true || echo false), "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false), "deepClone": $([[ -n "$deepClone" ]] && echo true || echo false), "leaveDotGit": $([[ -n "$leaveDotGit" ]] && echo true || echo false) @@ -408,6 +411,10 @@ remove_tmpPath() { rm -rf "$tmpPath" } +remove_tmpHomePath() { + rm -rf "$tmpHomePath" +} + if test -n "$QUIET"; then quiet_mode fi |