Merge branch 'staging-next' into staging

Conflicts: pkgs/development/python-modules/panel/default.nix pkgs/os-specific/linux/kernel/generic.nix pkgs/servers/home-assistant/default.nix
2021-04-08 22:42:26 -04:00
parent 625ce6c7f6 c99b6f5343
commit 219590673c
127 changed files with 8479 additions and 625 deletions
@@ -38,7 +38,7 @@ buildRubyGem rec {
    '';
    homepage = "https://github.com/manveru/bundix";
    license = "MIT";
-    maintainers = with lib.maintainers; [ manveru zimbatm ];
+    maintainers = with lib.maintainers; [ manveru marsam zimbatm ];
    platforms = lib.platforms.all;
  };
 }