Merge master into staging-next

2020-11-04 09:27:42 +01:00
parent a31fd3cb7f 9957d406a2
commit 9e6d7d3c74
170 changed files with 7077 additions and 4472 deletions
@@ -59,6 +59,6 @@ in stdenv.mkDerivation {
    homepage = "https://gn.googlesource.com/gn";
    license = licenses.bsd3;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ stesie matthewbauer ];
+    maintainers = with maintainers; [ stesie matthewbauer primeos ];
  };
 }