diff options
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/docker/default.nix | 2 | ||||
-rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 2 | ||||
-rw-r--r-- | pkgs/build-support/fetchnextcloudapp/default.nix | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 8e04944bc810..6b8a03932f5b 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -523,7 +523,7 @@ rec { runCommand "${baseNameOf name}.tar${compress.ext}" { inherit (stream) imageName; - passthru = { inherit (stream) imageTag; }; + passthru = { inherit (stream) imageTag; inherit stream; }; nativeBuildInputs = compress.nativeInputs; } "${stream} | ${compress.compress} > $out" ); diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index a3ea0297673d..7ac3dec91f7f 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -120,7 +120,7 @@ init_remote(){ git config remote.origin.partialclonefilter "blob:none" echo "$sparseCheckout" | git sparse-checkout set --stdin ${nonConeMode:+--no-cone} fi - ( [ -n "$http_proxy" ] && clean_git config http.proxy "$http_proxy" ) || true + ( [ -n "$http_proxy" ] && clean_git config --global http.proxy "$http_proxy" ) || true } # Return the reference of an hash if it exists on the remote repository. diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix index 0ec64bbe1df6..059003df903d 100644 --- a/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchzip, applyPatches, lib, ... }: { url -, sha256 +, hash ? "" +, sha256 ? "" , appName ? null , appVersion ? null , license @@ -11,7 +12,7 @@ applyPatches ({ inherit patches; src = fetchzip { - inherit url sha256; + inherit url hash sha256; postFetch = '' pushd $out &>/dev/null if [ ! -f ./appinfo/info.xml ]; then |