Merge master into staging-next

2020-11-16 09:01:53 +01:00
parent da6239dab3 300846f3c9
commit 986c2d36da
169 changed files with 2938 additions and 1614 deletions
@@ -179,6 +179,7 @@ stdenv.mkDerivation {
          mips64   = "btsmip";
          mips64el = "ltsmip";
        }.${targetPlatform.parsed.cpu.name}
+      else if targetPlatform.isMmix then "mmix"
      else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc"
      else if targetPlatform.isSparc then "sparc"
      else if targetPlatform.isMsp430 then "msp430"