git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107999 from andir/platforms-arm-trusted-platform

lib/systems/platforms: treat missing cpu version as generic pcBase

commit15cb12178a451a5d5c273f40dec356a2e89dfc14 authorJohn Ericson <git@JohnEricson.me> dateThu 31 Dec 2020, 13:52 (6 years ago) parent35ac949a44aec2
1 file changed+3−2
lib/systems/platforms.nix+3−2
lib/systems/platforms.nix+3−2
@@ -490,8 +490,9 @@ rec {
490490
491491 # ARM
492492 else if platform.isAarch32 then let
493− version = platform.parsed.cpu.version or "";
494− in if lib.versionOlder version "6" then sheevaplug
493+ version = platform.parsed.cpu.version or null;
494+ in if version == null then pcBase
495+ else if lib.versionOlder version "6" then sheevaplug
495496 else if lib.versionOlder version "7" then raspberrypi
496497 else armv7l-hf-multiplatform
497498 else if platform.isAarch64 then aarch64-multiplatform