google-cloud-sdk: Fix default component arches
When a google-cloud-sdk component does not specify architectures on components.json we should fallback to all supported arches. Previously there was a bug where `allArches` were incorrectly taken from the `attrValues arches` (nixOS architectures) instead of the GCS ones using `attrNames arches`. Also added arm to the list of supported architectures. No changes needed on components.json since it looks urls and hashes were already there. Co-authored-by: Fabián Heredia Montiel <fabianhjr@protonmail.com>
This commit is contained in:
parent
ffd1309e4e
commit
be1d3742e8
|
@ -11,7 +11,7 @@ let
|
|||
arches = {
|
||||
x86 = "i686";
|
||||
x86_64 = "x86_64";
|
||||
# TODO arm
|
||||
arm = "aarch64";
|
||||
};
|
||||
|
||||
# Mapping from GCS component operating systems to Nix operating systems
|
||||
|
@ -30,8 +30,8 @@ let
|
|||
in
|
||||
"${arch'}-${os'}";
|
||||
|
||||
# All architectures that are supported
|
||||
allArches = builtins.attrValues arches;
|
||||
# All architectures that are supported by GCS
|
||||
allArches = builtins.attrNames arches;
|
||||
|
||||
# A description of all available google-cloud-sdk components.
|
||||
# It's a JSON file with a list of components, along with some metadata
|
||||
|
|
Loading…
Reference in a new issue