diff options
| author | Chuck <chuck@intelligence.org> | 2020-02-05 10:26:21 -0800 |
|---|---|---|
| committer | Chuck <chuck@intelligence.org> | 2020-02-05 10:56:14 -0800 |
| commit | 5d4821141bde599d6e40c14049b0d23bfc367b57 (patch) | |
| tree | 11eb95dddc433b62e491418f650c87115fc855d6 | |
| parent | a7835b936ed8836475ca1aab01e921c3b256776d (diff) | |
| download | nixpkgs-5d4821141bde599d6e40c14049b0d23bfc367b57.tar nixpkgs-5d4821141bde599d6e40c14049b0d23bfc367b57.tar.gz nixpkgs-5d4821141bde599d6e40c14049b0d23bfc367b57.tar.bz2 nixpkgs-5d4821141bde599d6e40c14049b0d23bfc367b57.tar.lz nixpkgs-5d4821141bde599d6e40c14049b0d23bfc367b57.tar.xz nixpkgs-5d4821141bde599d6e40c14049b0d23bfc367b57.tar.zst nixpkgs-5d4821141bde599d6e40c14049b0d23bfc367b57.zip | |
stdenv: Remove isArm (use isAarch32 instead)
isArm has been deprecated for three releases. All references have been removed. Tree-wide substitution was performed in #37401 21 months ago.
| -rw-r--r-- | lib/systems/inspect.nix | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 |
2 files changed, 0 insertions, 6 deletions
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: diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index df2d35d541b..77d70e84258 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -137,9 +137,6 @@ let isi686 isx86_32 isx86_64 is32bit is64bit isAarch32 isAarch64 isMips isBigEndian; - isArm = lib.warn - "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead" - hostPlatform.isAarch32; # The derivation's `system` is `buildPlatform.system`. inherit (buildPlatform) system; |