diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-08 09:57:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-08 09:57:30 -0500 |
| commit | 1193468f13f4304efa0b391bda0af3fc60109f47 (patch) | |
| tree | 16cae2d986c7e0c727535a16cfdfabd802822fd1 /lib | |
| parent | 4befcf4c6e9cfd32f54f4567db2851f4aa41dfad (diff) | |
| parent | 5d4821141bde599d6e40c14049b0d23bfc367b57 (diff) | |
| download | nixpkgs-1193468f13f4304efa0b391bda0af3fc60109f47.tar nixpkgs-1193468f13f4304efa0b391bda0af3fc60109f47.tar.gz nixpkgs-1193468f13f4304efa0b391bda0af3fc60109f47.tar.bz2 nixpkgs-1193468f13f4304efa0b391bda0af3fc60109f47.tar.lz nixpkgs-1193468f13f4304efa0b391bda0af3fc60109f47.tar.xz nixpkgs-1193468f13f4304efa0b391bda0af3fc60109f47.tar.zst nixpkgs-1193468f13f4304efa0b391bda0af3fc60109f47.zip | |
Merge pull request #79291 from chkno/remove-isArm
Remove isArm
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/systems/default.nix | 2 | ||||
| -rw-r--r-- | lib/systems/inspect.nix | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 026117cc34f..36afdae3866 100644 --- 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 { diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index d1980c6dff8..01dcf0787df 100644 --- 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: |