Merge master into staging-next

2021-02-08 12:19:33 +00:00
parent f6ef5ce473 078f893795
commit bef005163c
56 changed files with 580 additions and 282 deletions
@@ -37,5 +37,6 @@ stdenv.mkDerivation {

    platforms = lib.platforms.unix;
    license = lib.licenses.asl20;
+    maintainers = lib.teams.beam.members;
  };
 }
@@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
      '';

    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ gleber tazjin ];
+    maintainers = lib.teams.beam.members;
    license = lib.licenses.asl20;
  };
 }