Merge branch 'master' into staging-next

2021-01-10 23:24:33 +01:00
parent 76394e4624 581232454f
commit dd72357155
298 changed files with 746 additions and 415 deletions
@@ -23,7 +23,7 @@ lib.makeScope pkgs.newScope (self: with self; {
    wingpanel-indicator-session wingpanel-indicator-sound
  ];

-  maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ];
+  maintainers = with pkgs.lib.maintainers; [ worldofpeace ];

  mutter = pkgs.gnome3.mutter334;