git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #79291 from chkno/remove-isArm

Remove isArm

commit1193468f13f4304efa0b391bda0af3fc60109f47 authorworldofpeace <worldofpeace@protonmail.ch> dateSat 8 Feb 2020, 09:57 (7 years ago) parent4befcf45d48211
4 files changed+5−11
lib/systems/default.nix+1−1 lib/systems/inspect.nix−3 pkgs/development/web/nodejs/nodejs.nix+4−4 pkgs/stdenv/generic/default.nix−3
lib/systems/default.nix+1−1
@@ -84,7 +84,7 @@ rec {
8484 else final.parsed.cpu.name;
8585
8686 qemuArch =
87− if final.isArm then "arm"
87+ if final.isAarch32 then "arm"
8888 else if final.isx86_64 then "x86_64"
8989 else if final.isx86 then "i386"
9090 else {
lib/systems/inspect.nix−3
@@ -55,9 +55,6 @@ rec {
5555
5656 isEfi = map (family: { cpu.family = family; })
5757 [ "x86" "arm" "aarch64" ];
58−
59− # Deprecated after 18.03
60− isArm = isAarch32;
6158 };
6259
6360 matchAnyAttrs = patterns:
pkgs/development/web/nodejs/nodejs.nix+4−4
@@ -61,18 +61,18 @@ in
6161 configureFlags = let
6262 isCross = stdenv.hostPlatform != stdenv.buildPlatform;
6363 host = stdenv.hostPlatform.platform;
64− isArm = stdenv.hostPlatform.isArm;
64+ isAarch32 = stdenv.hostPlatform.isAarch32;
6565 in sharedConfigureFlags ++ [
6666 "--without-dtrace"
6767 ] ++ (optionals isCross [
6868 "--cross-compiling"
6969 "--without-intl"
7070 "--without-snapshot"
71− ]) ++ (optionals (isCross && isArm && hasAttr "fpu" host.gcc) [
71+ ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [
7272 "--with-arm-fpu=${host.gcc.fpu}"
73− ]) ++ (optionals (isCross && isArm && hasAttr "float-abi" host.gcc) [
73+ ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" host.gcc) [
7474 "--with-arm-float-abi=${host.gcc.float-abi}"
75− ]) ++ (optionals (isCross && isArm) [
75+ ]) ++ (optionals (isCross && isAarch32) [
7676 "--dest-cpu=arm"
7777 ]) ++ extraConfigFlags;
7878
pkgs/stdenv/generic/default.nix−3
@@ -137,9 +137,6 @@ let
137137 isi686 isx86_32 isx86_64
138138 is32bit is64bit
139139 isAarch32 isAarch64 isMips isBigEndian;
140− isArm = lib.warn
141− "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead"
142− hostPlatform.isAarch32;
143140
144141 # The derivation's `system` is `buildPlatform.system`.
145142 inherit (buildPlatform) system;