Merge remote-tracking branch 'origin/master' into staging-next

nixos/modules/services/matrix/conduit.nix

@@ -143,10 +143,10 @@ in
       wantedBy = [ "multi-user.target" ];
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
-      environment = lib.mkMerge ([
+      environment = lib.mkMerge [
         { CONDUIT_CONFIG = configFile; }
         cfg.extraEnvironment
-      ]);
+      ];
       serviceConfig = {
         DynamicUser = true;
         User = "conduit";

nixos/modules/services/matrix/mautrix-meta.nix

@@ -619,5 +619,5 @@ in
     }
   ];
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }