Merge master into staging-next

2021-05-16 06:22:05 +00:00
parent b484cef365 3280de8b8c
commit d6fe7f78a8
6 changed files with 86 additions and 76 deletions
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -35,6 +35,7 @@
      "armv7a" = "armv7";
      "armv7l" = "armv7";
      "armv6l" = "arm";
+      "armv5tel" = "armv5te";
    }.${cpu.name} or cpu.name;
  in platform.rustc.config
    or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";