Merge pull request #79291 from chkno/remove-isArm

Remove isArm
2020-02-08 09:57:30 -05:00
parent 4befcf4c6e 5d4821141b
commit 1193468f13
4 changed files with 5 additions and 11 deletions
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -84,7 +84,7 @@ rec {
        else final.parsed.cpu.name;

      qemuArch =
-        if final.isArm then "arm"
+        if final.isAarch32 then "arm"
        else if final.isx86_64 then "x86_64"
        else if final.isx86 then "i386"
        else {
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -55,9 +55,6 @@ rec {

    isEfi          = map (family: { cpu.family = family; })
                       [ "x86" "arm" "aarch64" ];
-
-    # Deprecated after 18.03
-    isArm = isAarch32;
  };

  matchAnyAttrs = patterns: