Merge branch 'master' into staging-next

2020-11-05 09:42:47 +01:00
parent 8a95871193 79b173c358
commit a821be7531
106 changed files with 1203 additions and 794 deletions
@@ -163,7 +163,7 @@ in stdenv.mkDerivation (rec {
    description = "Collection of modular and reusable compiler and toolchain technologies";
    homepage    = "https://llvm.org/";
    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
+    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill primeos ];
    platforms   = stdenv.lib.platforms.all;
  };
 } // stdenv.lib.optionalAttrs enableManpages {