Merge master into staging

2018-04-08 10:54:17 +02:00
parent f9e17ca3f6 62dc989963
commit 595a72589f
150 changed files with 2923 additions and 772 deletions
@@ -42,5 +42,8 @@ in stdenv.mkDerivation rec {
    license     = licenses.mit;
    platforms   = platforms.linux;
    maintainers = with maintainers; [ primeos ];
+    # Marked as broken until the first official/stable release (upstream
+    # request). See #38344 for the public discussion.
+    broken = true;
  };
 }