diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-25 18:01:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-25 18:01:06 +0000 |
| commit | fc1f757bf69f0d3594c4d507907e2fd7d618564b (patch) | |
| tree | 2a72cc9726b7364a0d86fe25eb6dc10bde0cd8cd /pkgs/build-support | |
| parent | 3e52e5929d1e96662acc0805ec08fca38f25ef94 (diff) | |
| parent | 99eb0f3469482c7a26b925e96d2a47914731193e (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 9 | ||||
| -rw-r--r-- | pkgs/build-support/php/build-pecl.nix | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 2a53fd94e7f2b..1194b39dafd74 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -293,9 +293,6 @@ clone_user_rev() { local rev="${3:-HEAD}" if [ -n "$fetchLFS" ]; then - tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")" - exit_handlers+=(remove_tmpHomePath) - HOME="$tmpHomePath" clean_git lfs install fi @@ -417,6 +414,12 @@ if test -z "$branchName"; then branchName=fetchgit fi +tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")" +exit_handlers+=(remove_tmpHomePath) +HOME="$tmpHomePath" +unset XDG_CONFIG_HOME +export GIT_CONFIG_NOSYSTEM=1 + if test -n "$builder"; then test -n "$out" -a -n "$url" -a -n "$rev" || usage mkdir -p "$out" diff --git a/pkgs/build-support/php/build-pecl.nix b/pkgs/build-support/php/build-pecl.nix index 389447e066fa2..6f38a668f3a34 100644 --- a/pkgs/build-support/php/build-pecl.nix +++ b/pkgs/build-support/php/build-pecl.nix @@ -8,10 +8,9 @@ , nativeBuildInputs ? [ ] , postPhpize ? "" , makeFlags ? [ ] -, src ? fetchurl { +, src ? fetchurl ({ url = "https://pecl.php.net/get/${pname}-${version}.tgz"; - inherit (args) sha256; - } + } // lib.filterAttrs (attrName: _: lib.elem attrName [ "sha256" "hash" ]) args) , passthru ? { } , ... }@args: |