Merge master into staging-next

2021-04-22 12:06:24 +00:00
parent 8248f4db36 a48ea1b0b3
commit 120744d620
78 changed files with 405 additions and 370 deletions
@@ -180,6 +180,6 @@ in

  };

-  meta.maintainers = with lib.maintainers; [ tavyc ];
+  meta.maintainers = with lib.maintainers; [ ];

 }