treewide: fix trivial cases of with lib removal errors using substitu…

…teInPlace

Signed-off-by: lucasew <[email protected]>

nixos/modules/config/stevenblack.nix

@@ -41,7 +41,7 @@ in
     networking.hostFiles = map (x: "${getOutput x cfg.package}/hosts") ([ "ads" ] ++ cfg.block);
   };
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     moni
     artturin
     frontear

nixos/modules/config/xdg/portal.nix

@@ -32,7 +32,7 @@ in
   ];
 
   meta = {
-    maintainers = teams.freedesktop.members;
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options.xdg.portal = {

nixos/modules/hardware/uni-sync.nix

@@ -9,7 +9,7 @@ let
   cfg = config.hardware.uni-sync;
 in
 {
-  meta.maintainers = with maintainers; [ yunfachi ];
+  meta.maintainers = with lib.maintainers; [ yunfachi ];
 
   options.hardware.uni-sync = {
     enable = mkEnableOption "udev rules and software for Lian Li Uni Controllers";

nixos/modules/programs/bat.nix

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

nixos/modules/programs/pay-respects.nix

@@ -53,5 +53,5 @@ in
       zsh.interactiveShellInit = optionalString config.programs.zsh.enable (initScript "zsh");
     };
   };
-  meta.maintainers = with maintainers; [ sigmasquadron ];
+  meta.maintainers = with lib.maintainers; [ sigmasquadron ];
 }

nixos/modules/security/isolate.nix

@@ -140,6 +140,6 @@ in
       description = "Isolate Sandbox Slice";
     };
 
-    meta.maintainers = with maintainers; [ virchau13 ];
+    meta.maintainers = with lib.maintainers; [ virchau13 ];
   };
 }

nixos/modules/services/audio/navidrome.nix

@@ -169,5 +169,5 @@ in
 
       networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.Port ];
     };
-  meta.maintainers = with maintainers; [ fsnkty ];
+  meta.maintainers = with lib.maintainers; [ fsnkty ];
 }

nixos/modules/services/continuous-integration/gitlab-runner.nix

@@ -875,5 +875,5 @@ in
     )
   ];
 
-  meta.maintainers = teams.gitlab.members;
+  meta.maintainers = lib.teams.gitlab.members;
 }

nixos/modules/services/desktops/gnome/gnome-browser-connector.nix

@@ -16,7 +16,7 @@ in
 
 {
   meta = {
-    maintainers = teams.gnome.members;
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {

nixos/modules/services/desktops/pipewire/pipewire.nix

@@ -88,7 +88,7 @@ let
   };
 in
 {
-  meta.maintainers = teams.freedesktop.members ++ [ maintainers.k900 ];
+  meta.maintainers = lib.teams.freedesktop.members ++ [ maintainers.k900 ];
 
   ###### interface
   options = {

nixos/modules/services/desktops/pipewire/wireplumber.nix

@@ -37,7 +37,7 @@ let
       scripts;
 in
 {
-  meta.maintainers = [ maintainers.k900 ];
+  meta.maintainers = [ lib.maintainers.k900 ];
 
   options = {
     services.pipewire.wireplumber = {

nixos/modules/services/hardware/handheld-daemon.nix

@@ -55,5 +55,5 @@ in
     };
   };
 
-  meta.maintainers = [ maintainers.appsforartists ];
+  meta.maintainers = [ lib.maintainers.appsforartists ];
 }

nixos/modules/services/hardware/lcd.nix

@@ -36,7 +36,7 @@ in
 with lib;
 {
 
-  meta.maintainers = with maintainers; [ peterhoeg ];
+  meta.maintainers = with lib.maintainers; [ peterhoeg ];
 
   options = with types; {
     services.hardware.lcd = {

nixos/modules/services/home-automation/esphome.nix

@@ -26,7 +26,7 @@ let
       "--address ${cfg.address} --port ${toString cfg.port}";
 in
 {
-  meta.maintainers = with maintainers; [ oddlama ];
+  meta.maintainers = with lib.maintainers; [ oddlama ];
 
   options.services.esphome = {
     enable = mkEnableOption "esphome, for making custom firmwares for ESP32/ESP8266";

nixos/modules/services/matrix/synapse.nix

@@ -1599,7 +1599,7 @@ in
   meta = {
     buildDocsInSandbox = false;
     doc = ./synapse.md;
-    maintainers = teams.matrix.members;
+    maintainers = lib.teams.matrix.members;
   };
 
 }

nixos/modules/services/misc/anki-sync-server.nix

@@ -144,7 +144,7 @@ in {
   };
 
   meta = {
-    maintainers = with maintainers; [telotortium];
+    maintainers = with lib.maintainers; [telotortium];
     doc = ./anki-sync-server.md;
   };
 }

nixos/modules/services/misc/autosuspend.nix

@@ -248,6 +248,6 @@ in
   };
 
   meta = {
-    maintainers = with maintainers; [ xlambein ];
+    maintainers = with lib.maintainers; [ xlambein ];
   };
 }

nixos/modules/services/misc/db-rest.nix

@@ -201,5 +201,5 @@ in
 
     services.redis.servers.db-rest.enable = cfg.redis.enable && cfg.redis.createLocally;
   };
-  meta.maintainers = with maintainers; [ marie ];
+  meta.maintainers = with lib.maintainers; [ marie ];
 }

nixos/modules/services/misc/gitlab.nix

@@ -1721,5 +1721,5 @@ in {
   };
 
   meta.doc = ./gitlab.md;
-  meta.maintainers = teams.gitlab.members;
+  meta.maintainers = lib.teams.gitlab.members;
 }

nixos/modules/services/misc/jellyfin.nix

@@ -200,7 +200,7 @@ in
 
   };
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     minijackson
     fsnkty
   ];

nixos/modules/services/misc/sourcehut/default.nix

@@ -1554,7 +1554,7 @@ in
   ];
 
   meta.doc = ./default.md;
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     tomberek
     nessdoor
     christoph-heiss

nixos/modules/services/misc/xmrig.nix

@@ -66,6 +66,6 @@ in
   };
 
   meta = {
-    maintainers = with maintainers; [ ratsclub ];
+    maintainers = [ lib.maintainers.ratsclub ];
   };
 }

nixos/modules/services/monitoring/gatus.nix

@@ -128,5 +128,5 @@ in
     networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ cfg.settings.web.port ];
   };
 
-  meta.maintainers = with maintainers; [ pizzapim ];
+  meta.maintainers = with lib.maintainers; [ pizzapim ];
 }

nixos/modules/services/monitoring/gitwatch.nix

@@ -93,5 +93,5 @@ in
       });
   };
   config.systemd.services = mapAttrs' mkSystemdService config.services.gitwatch;
-  meta.maintainers = with maintainers; [ shved ];
+  meta.maintainers = with lib.maintainers; [ shved ];
 }

nixos/modules/services/monitoring/glances.nix

@@ -106,5 +106,5 @@ in
     networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
   };
 
-  meta.maintainers = with maintainers; [ claha ];
+  meta.maintainers = with lib.maintainers; [ claha ];
 }

nixos/modules/services/monitoring/prometheus/exporters.nix

@@ -465,6 +465,6 @@ in
 
   meta = {
     doc = ./exporters.md;
-    maintainers = [ maintainers.willibutz ];
+    maintainers = [ lib.maintainers.willibutz ];
   };
 }

nixos/modules/services/monitoring/scrutiny.nix

@@ -228,5 +228,5 @@ in
     })
   ];
 
-  meta.maintainers = [ maintainers.jnsgruk ];
+  meta.maintainers = [ lib.maintainers.jnsgruk ];
 }

nixos/modules/services/networking/bitcoind.nix

@@ -280,6 +280,6 @@ in
 
   };
 
-  meta.maintainers = with maintainers; [ _1000101 ];
+  meta.maintainers = with lib.maintainers; [ _1000101 ];
 
 }

nixos/modules/services/networking/dnsproxy.nix

@@ -115,6 +115,6 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ diogotcorreia ];
+  meta.maintainers = with lib.maintainers; [ diogotcorreia ];
 
 }

nixos/modules/services/networking/hostapd.nix

@@ -107,7 +107,7 @@ let
 
   runtimeConfigFiles = mapAttrsToList (radio: _: "/run/hostapd/${radio}.hostapd.conf") cfg.radios;
 in {
-  meta.maintainers = with maintainers; [ oddlama ];
+  meta.maintainers = with lib.maintainers; [ oddlama ];
 
   options = {
     services.hostapd = {

nixos/modules/services/networking/mtr-exporter.nix

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

nixos/modules/services/networking/mullvad-vpn.nix

@@ -65,5 +65,5 @@ with lib;
     };
   };
 
-  meta.maintainers = with maintainers; [ arcuru ymarkus ];
+  meta.maintainers = with lib.maintainers; [ arcuru ymarkus ];
 }

nixos/modules/services/networking/netbird.nix

@@ -35,7 +35,7 @@ let
   cfg = config.services.netbird;
 in
 {
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = with lib.maintainers; [ ];
   meta.doc = ./netbird.md;
 
   options.services.netbird = {

nixos/modules/services/networking/networkmanager.nix

@@ -140,7 +140,7 @@ in
 {
 
   meta = {
-    maintainers = teams.freedesktop.members;
+    maintainers = lib.teams.freedesktop.members;
   };
 
   ###### interface

nixos/modules/services/networking/nix-store-gcs-proxy.nix

@@ -80,5 +80,5 @@ in
     }
   );
 
-  meta.maintainers = [ maintainers.mrkkrp ];
+  meta.maintainers = [ lib.maintainers.mrkkrp ];
 }

nixos/modules/services/networking/openconnect.nix

@@ -159,5 +159,5 @@ in
     }) cfg.interfaces;
   };
 
-  meta.maintainers = with maintainers; [ alyaeanyx ];
+  meta.maintainers = with lib.maintainers; [ alyaeanyx ];
 }

nixos/modules/services/networking/peroxide.nix

@@ -143,7 +143,7 @@ in
     environment.systemPackages = [ cfg.package ];
   };
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     aanderse
     aidalgol
   ];

nixos/modules/services/networking/pixiecore.nix

@@ -11,7 +11,7 @@ let
   cfg = config.services.pixiecore;
 in
 {
-  meta.maintainers = with maintainers; [ bbigras ];
+  meta.maintainers = with lib.maintainers; [ bbigras ];
 
   options = {
     services.pixiecore = {

nixos/modules/services/networking/routedns.nix

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

nixos/modules/services/networking/searx.nix

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

nixos/modules/services/networking/snowflake-proxy.nix

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

nixos/modules/services/networking/soju.nix

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

nixos/modules/services/networking/tailscale-auth.nix

@@ -111,7 +111,7 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     dan-theriault
     phaer
   ];

nixos/modules/services/networking/tailscale.nix

@@ -6,7 +6,7 @@ let
   cfg = config.services.tailscale;
   isNetworkd = config.networking.useNetworkd;
 in {
-  meta.maintainers = with maintainers; [ mbaillie mfrw ];
+  meta.maintainers = with lib.maintainers; [ mbaillie mfrw ];
 
   options.services.tailscale = {
     enable = mkEnableOption "Tailscale client daemon";

nixos/modules/services/networking/tinc.nix

@@ -431,5 +431,5 @@ in
       );
     });
 
-  meta.maintainers = with maintainers; [ minijackson mic92 ];
+  meta.maintainers = with lib.maintainers; [ minijackson mic92 ];
 }

nixos/modules/services/networking/tinyproxy.nix

@@ -100,5 +100,5 @@ in
     };
     users.groups.tinyproxy = {};
   };
-  meta.maintainers = with maintainers; [ tcheronneau ];
+  meta.maintainers = with lib.maintainers; [ tcheronneau ];
 }

nixos/modules/services/networking/tmate-ssh-server.nix

@@ -111,7 +111,7 @@ in
   };
 
   meta = {
-    maintainers = with maintainers; [ jlesquembre ];
+    maintainers = with lib.maintainers; [ jlesquembre ];
   };
 
 }

nixos/modules/services/networking/trickster.nix

@@ -113,6 +113,6 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ _1000101 ];
+  meta.maintainers = with lib.maintainers; [ _1000101 ];
 
 }

nixos/modules/services/networking/v2raya.nix

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

nixos/modules/services/networking/veilid.nix

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