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
@@ -37,6 +37,8 @@ let
    "vc4-none"
    "or1k-none"

+    "mmix-mmixware"
+
    "js-ghcjs"

    "aarch64-genode" "i686-genode" "x86_64-genode"
@@ -57,6 +59,7 @@ in {
  i686          = filterDoubles predicates.isi686;
  x86_64        = filterDoubles predicates.isx86_64;
  mips          = filterDoubles predicates.isMips;
+  mmix          = filterDoubles predicates.isMmix;
  riscv         = filterDoubles predicates.isRiscV;
  vc4           = filterDoubles predicates.isVc4;
  or1k          = filterDoubles predicates.isOr1k;