Merge master into staging-next

2019-05-07 09:00:06 +02:00
parent 193b899af2 a3f8a25ab3
commit 0196d8f11c
220 changed files with 4309 additions and 2743 deletions
@@ -82,5 +82,11 @@ stdenv.mkDerivation rec {

    maintainers = [ stdenv.lib.maintainers.eelco ];
    platforms = stdenv.lib.platforms.unix;
+    badPlatforms = [
+      "armv5tel-linux" "armv6l-linux" "armv6m-linux"
+      "sparc-linux" "sparc64-linux"
+      "riscv32-linux" "riscv64-linux"
+      "alpha-linux"
+    ];
  };
 }