mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 18:32:23 +08:00
Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
@@ -97,6 +97,7 @@ CROSS_TARGETS=(
|
||||
riscv64-unknown-linux-gnu
|
||||
s390x-unknown-linux-gnu
|
||||
x86_64-unknown-freebsd
|
||||
loongarch64-unknown-linux-gnu
|
||||
)
|
||||
|
||||
is_cross() {
|
||||
@@ -264,14 +265,14 @@ EOF
|
||||
|
||||
# individual file entries
|
||||
cat <<EOF
|
||||
$attr = import <nix/fetchurl.nix> {
|
||||
$attr = import <nix/fetchurl.nix> {
|
||||
url = "http://tarballs.nixos.org/${s3_prefix}/${nixpkgs_revision}/$fname";
|
||||
hash = "${sri}";$(
|
||||
[[ -n ${executable_nix} ]] && printf "\n %s" "${executable_nix}"
|
||||
[[ -n ${name_nix} ]] && printf "\n %s" "${name_nix}"
|
||||
[[ -n ${unpack_nix} ]] && printf "\n %s" "${unpack_nix}"
|
||||
)
|
||||
};
|
||||
};
|
||||
EOF
|
||||
done
|
||||
# footer
|
||||
|
||||
Reference in New Issue
Block a user