Merge branch 'master' into staging

2019-04-05 11:37:15 +02:00
parent 79b3d1b33d 9fa17c5957
commit cb1a20499a
513 changed files with 10098 additions and 5499 deletions
@@ -187,6 +187,7 @@ stdenv.mkDerivation {
        }.${targetPlatform.parsed.cpu.name}
      else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc"
      else if targetPlatform.isSparc then "sparc"
+      else if targetPlatform.isMsp430 then "msp430"
      else if targetPlatform.isAvr then "avr"
      else if targetPlatform.isAlpha then "alpha"
      else throw "unknown emulation for platform: ${targetPlatform.config}";