pyrox.dev
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>
oeiuwq.com
+3
-3
pkgs/tools/admin/google-cloud-sdk/components.nix
+3
-3
pkgs/tools/admin/google-cloud-sdk/components.nix
···
11
11
arches = {
12
12
x86 = "i686";
13
13
x86_64 = "x86_64";
14
-
# TODO arm
14
+
arm = "aarch64";
15
15
};
16
16
17
17
# Mapping from GCS component operating systems to Nix operating systems
···
30
30
in
31
31
"${arch'}-${os'}";
32
32
33
-
# All architectures that are supported
34
-
allArches = builtins.attrValues arches;
33
+
# All architectures that are supported by GCS
34
+
allArches = builtins.attrNames arches;
35
35
36
36
# A description of all available google-cloud-sdk components.
37
37
# It's a JSON file with a list of components, along with some metadata