diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-09 09:17:51 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-09 09:17:51 +0100 |
| commit | 03755ed59a34197c0d54552bf42d95e66931376b (patch) | |
| tree | 5a66531970bac093e8b8e948064604a114365f40 /pkgs/stdenv | |
| parent | 30f0909e3aadf7279b17283b6e45fcb4db30e573 (diff) | |
| parent | eee784a1bb6b3e23491e2ee99814d7cb8700db5e (diff) | |
| download | nixlib-03755ed59a34197c0d54552bf42d95e66931376b.tar nixlib-03755ed59a34197c0d54552bf42d95e66931376b.tar.gz nixlib-03755ed59a34197c0d54552bf42d95e66931376b.tar.bz2 nixlib-03755ed59a34197c0d54552bf42d95e66931376b.tar.lz nixlib-03755ed59a34197c0d54552bf42d95e66931376b.tar.xz nixlib-03755ed59a34197c0d54552bf42d95e66931376b.tar.zst nixlib-03755ed59a34197c0d54552bf42d95e66931376b.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index df2d35d541b8..77d70e84258d 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; |