Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-05-16 06:22:08 +00:00
committed by GitHub
6 changed files with 86 additions and 76 deletions
@@ -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}"}";