diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-08-24 14:43:57 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-08-24 14:43:57 +0300 |
| commit | 5674da5aed5edcab01378a506707fb78574c5b75 (patch) | |
| tree | 36753671111cb899ab35b1b07cda043dc3d12648 /lib | |
| parent | 8137a8cb73833432e8da8281663b56ac01d3ba0b (diff) | |
| download | nixpkgs-5674da5aed5edcab01378a506707fb78574c5b75.tar nixpkgs-5674da5aed5edcab01378a506707fb78574c5b75.tar.gz nixpkgs-5674da5aed5edcab01378a506707fb78574c5b75.tar.bz2 nixpkgs-5674da5aed5edcab01378a506707fb78574c5b75.tar.lz nixpkgs-5674da5aed5edcab01378a506707fb78574c5b75.tar.xz nixpkgs-5674da5aed5edcab01378a506707fb78574c5b75.tar.zst nixpkgs-5674da5aed5edcab01378a506707fb78574c5b75.zip | |
Fix "treewide: Consistently call ARM 'arm'"
0c0fad6141cf3d62 was broken. I didn't realize there's some hidden metaprogramming code where one can't even grep for 'isFoo' to find its definition :(
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/systems/inspect.nix | 4 | ||||
| -rw-r--r-- | lib/systems/parse.nix | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index a81e88989c0..2d5353341f5 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -11,6 +11,7 @@ rec { PowerPC = { cpu = cpuTypes.powerpc; }; x86 = { cpu = { family = "x86"; }; }; Arm = { cpu = { family = "arm"; }; }; + Aarch64 = { cpu = { family = "aarch64"; }; }; Mips = { cpu = { family = "mips"; }; }; BigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; }; LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; }; @@ -28,9 +29,6 @@ rec { Windows = { kernel = kernels.windows; }; Cygwin = { kernel = kernels.windows; abi = abis.cygnus; }; MinGW = { kernel = kernels.windows; abi = abis.gnu; }; - - Arm32 = recursiveUpdate Arm patterns."32bit"; - Arm64 = recursiveUpdate Arm patterns."64bit"; }; matchAnyAttrs = patterns: diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index befe90f9abe..438d83685db 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -40,7 +40,7 @@ rec { armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; }; - aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; }; + aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; }; i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; }; |