diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-30 21:07:07 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-30 21:07:07 +0200 |
| commit | 6d4bd78fad1c2040cafe6f5fa30d8134dac3bdf6 (patch) | |
| tree | 37977913dee77c1804abc3915b218c05ab0419fd /lib | |
| parent | 7cd46a05943bfd86a46a3d99a1d85a2a028d4d2c (diff) | |
| parent | 2858c41823db1654f123c455cca2b145b8d8737b (diff) | |
| download | nixpkgs-6d4bd78fad1c2040cafe6f5fa30d8134dac3bdf6.tar nixpkgs-6d4bd78fad1c2040cafe6f5fa30d8134dac3bdf6.tar.gz nixpkgs-6d4bd78fad1c2040cafe6f5fa30d8134dac3bdf6.tar.bz2 nixpkgs-6d4bd78fad1c2040cafe6f5fa30d8134dac3bdf6.tar.lz nixpkgs-6d4bd78fad1c2040cafe6f5fa30d8134dac3bdf6.tar.xz nixpkgs-6d4bd78fad1c2040cafe6f5fa30d8134dac3bdf6.tar.zst nixpkgs-6d4bd78fad1c2040cafe6f5fa30d8134dac3bdf6.zip | |
Merge commit '2858c41' into HEAD
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/systems/doubles.nix | 2 | ||||
| -rw-r--r-- | lib/systems/inspect.nix | 4 | ||||
| -rw-r--r-- | lib/systems/parse.nix | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 0168eb42f2f..ac1a199d80c 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,7 +26,7 @@ in rec { allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; none = []; - arm = filterDoubles predicates.isArm32; + arm = filterDoubles predicates.isArm; i686 = filterDoubles predicates.isi686; mips = filterDoubles predicates.isMips; x86_64 = filterDoubles predicates.isx86_64; 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"; }; |