diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 95696dbd41c28..9c378d5f065fa 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -273,3 +273,8 @@ a034fb50f79816c6738fb48b48503b09ea3b0132
 # nixfmt 1.0.0
 a46262ae77e4016fe5a4a390c4a39c0c1b266428 # !autorebase nix-shell --run treefmt
 aefcb0d50d1124314429a11ed6b7aaaedf2861c5 # !autorebase nix-shell --run treefmt
+
+# nixf-diagnose
+6c1e6f90d35932355fdee300b13136a8b7ec851c # !autorebase nix-shell --run treefmt
+1c6af9ba0a9667e10ad97f53d2cff663abc290c9 # !autorebase nix-shell --run treefmt
+5cbdb94f3aa2e7de13f3c0a67899ec17427b58ce # !autorebase nix-shell --run treefmt
diff --git a/ci/default.nix b/ci/default.nix
index 19229e85414ea..7b7424f4f5be2 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -87,6 +87,32 @@ let
           "pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml"
         ];
 
+        programs.nixf-diagnose.enable = true;
+        settings.formatter.nixf-diagnose = {
+          # Ensure nixfmt cleans up after nixf-diagnose.
+          priority = -1;
+          options = [
+            "--auto-fix"
+            # Rule names can currently be looked up here:
+            # https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py
+            # TODO: Remove the following and fix things.
+            "--ignore=sema-unused-def-lambda-noarg-formal"
+            "--ignore=sema-unused-def-lambda-witharg-arg"
+            "--ignore=sema-unused-def-lambda-witharg-formal"
+            "--ignore=sema-unused-def-let"
+            # Keep this rule, because we have `lib.or`.
+            "--ignore=or-identifier"
+          ];
+          excludes = [
+            # Auto-generated; violates sema-extra-with
+            # Can only sensibly be removed when --auto-fix supports multiple fixes at once:
+            # https://github.com/inclyc/nixf-diagnose/issues/13
+            "pkgs/servers/home-assistant/component-packages.nix"
+            # https://github.com/nix-community/nixd/issues/708
+            "nixos/maintainers/scripts/azure-new/examples/basic/system.nix"
+          ];
+        };
+
         settings.formatter.editorconfig-checker = {
           command = "${pkgs.lib.getExe pkgs.editorconfig-checker}";
           options = [ "-disable-indent-size" ];
diff --git a/lib/customisation.nix b/lib/customisation.nix
index 8f6fbe2d4042f..db138da4a2ef8 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -385,7 +385,7 @@ rec {
       outputs = drv.outputs or [ "out" ];
 
       commonAttrs =
-        drv // (listToAttrs outputsList) // ({ all = map (x: x.value) outputsList; }) // passthru;
+        drv // (listToAttrs outputsList) // { all = map (x: x.value) outputsList; } // passthru;
 
       outputToAttrListElement = outputName: {
         name = outputName;
diff --git a/lib/tests/modules/functionTo/submodule-options.nix b/lib/tests/modules/functionTo/submodule-options.nix
index 5d490e07281d9..a133628f15725 100644
--- a/lib/tests/modules/functionTo/submodule-options.nix
+++ b/lib/tests/modules/functionTo/submodule-options.nix
@@ -56,8 +56,9 @@ in
       default = lib.concatStringsSep " " (
         lib.concatLists (
           lib.mapAttrsToList (k: v: if k == "_module" then [ ] else [ (lib.showOption v.loc) ]) (
-            (options.fun.type.getSubOptions [ "fun" ])
+            options.fun.type.getSubOptions [ "fun" ]
           )
+
         )
       );
     };
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index 236ee20727e6a..2c0b99b913c35 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -155,9 +155,7 @@ lib.runTests (
       "x86_64-genode"
     ];
     testredox = mseteq redox [ "x86_64-redox" ];
-    testgnu = mseteq gnu (
-      linux # ++ kfreebsd ++ ...
-    );
+    testgnu = mseteq gnu linux; # ++ kfreebsd ++ ...
     testillumos = mseteq illumos [ "x86_64-solaris" ];
     testlinux = mseteq linux [
       "aarch64-linux"
diff --git a/lib/types.nix b/lib/types.nix
index f7e73bbc07c14..d86375ada19af 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -831,7 +831,7 @@ let
                 loc: defs:
                 mapAttrs (n: v: v.value) (
                   filterAttrs (n: v: v ? value) (
-                    zipAttrsWith (name: defs: (mergeDefinitions (loc ++ [ name ]) elemType (defs)).optionalValue)
+                    zipAttrsWith (name: defs: (mergeDefinitions (loc ++ [ name ]) elemType defs).optionalValue)
                       # Push down position info.
                       (pushPositions defs)
                   )
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index a39bf7599c7d0..ef20ed4e6c28d 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -129,7 +129,7 @@ let
     in
     locatedModules ++ legacyModules;
 
-  noUserModules = evalModulesMinimal ({
+  noUserModules = evalModulesMinimal {
     inherit prefix specialArgs;
     modules =
       baseModules
@@ -138,7 +138,7 @@ let
         pkgsModule
         modulesModule
       ];
-  });
+  };
 
   # Extra arguments that are useful for constructing a similar configuration.
   modulesModule = {
diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix
index 3b68d56d4541b..7d4d3e5cb839b 100644
--- a/nixos/lib/systemd-lib.nix
+++ b/nixos/lib/systemd-lib.nix
@@ -361,12 +361,13 @@ rec {
     }:
     let
       typeDir =
-        ({
+        {
           system = "system";
           initrd = "system";
           user = "user";
           nspawn = "nspawn";
-        }).${type};
+        }
+        .${type};
     in
     pkgs.runCommand "${type}-units"
       {
diff --git a/nixos/lib/testing/network.nix b/nixos/lib/testing/network.nix
index c393056009d83..28581ff0d12c9 100644
--- a/nixos/lib/testing/network.nix
+++ b/nixos/lib/testing/network.nix
@@ -104,9 +104,10 @@ let
           optionalString (
             config.networking.primaryIPAddress != ""
           ) "${config.networking.primaryIPAddress} ${hostnames}"
-          + optionalString (config.networking.primaryIPv6Address != "") (
-            "${config.networking.primaryIPv6Address} ${hostnames}"
-          )
+          + optionalString (
+            config.networking.primaryIPv6Address != ""
+          ) "${config.networking.primaryIPv6Address} ${hostnames}"
+
         );
 
         virtualisation.qemu.options = qemuOptions;
diff --git a/nixos/modules/config/nix-remote-build.nix b/nixos/modules/config/nix-remote-build.nix
index 9a276aa29d07f..928ed0c2c9b62 100644
--- a/nixos/modules/config/nix-remote-build.nix
+++ b/nixos/modules/config/nix-remote-build.nix
@@ -241,7 +241,7 @@ in
               Invalid machine specifications:
           ''
           + "      "
-          + (concatStringsSep "\n      " (map (m: m.hostName) (filter (badMachine) cfg.buildMachines)));
+          + (concatStringsSep "\n      " (map (m: m.hostName) (filter badMachine cfg.buildMachines)));
         }
       ];
 
diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix
index f38bc20db0767..66a9d691c6b78 100644
--- a/nixos/modules/config/terminfo.nix
+++ b/nixos/modules/config/terminfo.nix
@@ -8,7 +8,7 @@
 }:
 {
 
-  options = with lib; {
+  options = {
     environment.enableAllTerminfo = lib.mkOption {
       default = false;
       type = lib.types.bool;
diff --git a/nixos/modules/config/xdg/terminal-exec.nix b/nixos/modules/config/xdg/terminal-exec.nix
index 0c8381bc2cde9..764a1ee6c0876 100644
--- a/nixos/modules/config/xdg/terminal-exec.nix
+++ b/nixos/modules/config/xdg/terminal-exec.nix
@@ -54,9 +54,9 @@ in
       etc = lib.mapAttrs' (
         desktop: terminals:
         # map desktop name such as GNOME to `xdg/gnome-xdg-terminals.list`, default to `xdg/xdg-terminals.list`
-        lib.nameValuePair (
-          "xdg/${if desktop == "default" then "" else "${lib.toLower desktop}-"}xdg-terminals.list"
-        ) { text = lib.concatLines terminals; }
+        lib.nameValuePair "xdg/${
+          if desktop == "default" then "" else "${lib.toLower desktop}-"
+        }xdg-terminals.list" { text = lib.concatLines terminals; }
       ) cfg.settings;
     };
   };
diff --git a/nixos/modules/hardware/opentabletdriver.nix b/nixos/modules/hardware/opentabletdriver.nix
index d74e9b8e4dce6..1eac6ee6dce40 100644
--- a/nixos/modules/hardware/opentabletdriver.nix
+++ b/nixos/modules/hardware/opentabletdriver.nix
@@ -54,7 +54,7 @@ in
     boot.blacklistedKernelModules = cfg.blacklistedKernelModules;
 
     systemd.user.services.opentabletdriver =
-      with pkgs;
+
       lib.mkIf cfg.daemon.enable {
         description = "Open source, cross-platform, user-mode tablet driver";
         wantedBy = [ "graphical-session.target" ];
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 28752c8f54061..e4d51cb7bfd42 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -333,7 +333,7 @@ in
     lib.mkIf cfg.enabled (
       lib.mkMerge [
         # Common
-        ({
+        {
           assertions = [
             {
               assertion = !(nvidiaEnabled && cfg.datacenter.enable);
@@ -388,7 +388,7 @@ in
             extraPackages32 = [ nvidia_x11.lib32 ];
           };
           environment.systemPackages = [ nvidia_x11.bin ];
-        })
+        }
 
         # X11
         (lib.mkIf nvidiaEnabled {
@@ -709,7 +709,7 @@ in
                 "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced";
 
             services = lib.mkMerge [
-              ({
+              {
                 nvidia-fabricmanager = {
                   enable = true;
                   description = "Start NVIDIA NVLink Management";
@@ -736,7 +736,7 @@ in
                     LimitCORE = "infinity";
                   };
                 };
-              })
+              }
               (lib.mkIf cfg.nvidiaPersistenced {
                 "nvidia-persistenced" = {
                   description = "NVIDIA Persistence Daemon";
diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix
index 55441dd83490d..dadfe12d9d64f 100644
--- a/nixos/modules/i18n/input-method/default.nix
+++ b/nixos/modules/i18n/input-method/default.nix
@@ -112,7 +112,7 @@ in
   };
 
   meta = {
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     doc = ./default.md;
   };
 
diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix
index 9f3517dd7771a..57c2f736cb471 100644
--- a/nixos/modules/i18n/input-method/fcitx5.nix
+++ b/nixos/modules/i18n/input-method/fcitx5.nix
@@ -127,7 +127,7 @@ in
       ++ lib.optionals (cfg.quickPhraseFiles != { }) [
         (pkgs.linkFarm "quickPhraseFiles" (
           lib.mapAttrs' (
-            name: value: lib.nameValuePair ("share/fcitx5/data/quickphrase.d/${name}.mb") value
+            name: value: lib.nameValuePair "share/fcitx5/data/quickphrase.d/${name}.mb" value
           ) cfg.quickPhraseFiles
         ))
       ];
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 47397b99d9221..a4189c20ac131 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -914,7 +914,7 @@ in
       let
         cfgFiles =
           cfg:
-          lib.optionals cfg.isoImage.showConfiguration ([
+          lib.optionals cfg.isoImage.showConfiguration [
             {
               source = cfg.boot.kernelPackages.kernel + "/" + cfg.system.boot.loader.kernelFile;
               target = "/boot/" + cfg.boot.kernelPackages.kernel + "/" + cfg.system.boot.loader.kernelFile;
@@ -923,7 +923,7 @@ in
               source = cfg.system.build.initialRamdisk + "/" + cfg.system.boot.loader.initrdFile;
               target = "/boot/" + cfg.system.build.initialRamdisk + "/" + cfg.system.boot.loader.initrdFile;
             }
-          ])
+          ]
           ++ lib.concatLists (
             lib.mapAttrsToList (_: { configuration, ... }: cfgFiles configuration) cfg.specialisation
           );
diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixos/modules/installer/netboot/netboot-base.nix
index 360ef56469962..25578b06fea1f 100644
--- a/nixos/modules/installer/netboot/netboot-base.nix
+++ b/nixos/modules/installer/netboot/netboot-base.nix
@@ -3,8 +3,6 @@
 
 { lib, ... }:
 
-with lib;
-
 {
   imports = [
     ./netboot.nix
diff --git a/nixos/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix
index d6d754462c14f..26aba8df311de 100644
--- a/nixos/modules/profiles/headless.nix
+++ b/nixos/modules/profiles/headless.nix
@@ -3,8 +3,6 @@
 
 { lib, ... }:
 
-with lib;
-
 {
   # Don't start a tty on the serial consoles.
   systemd.services."serial-getty@ttyS0".enable = lib.mkDefault false;
diff --git a/nixos/modules/profiles/nix-builder-vm.nix b/nixos/modules/profiles/nix-builder-vm.nix
index 50dde02eef642..9dc86363e27d4 100644
--- a/nixos/modules/profiles/nix-builder-vm.nix
+++ b/nixos/modules/profiles/nix-builder-vm.nix
@@ -208,18 +208,18 @@ in
           ''
         );
 
-        run-builder = hostPkgs.writeShellScriptBin "run-builder" (''
+        run-builder = hostPkgs.writeShellScriptBin "run-builder" ''
           set -euo pipefail
           KEYS="''${KEYS:-./keys}"
           KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm}
-        '');
+        '';
 
-        script = hostPkgs.writeShellScriptBin "create-builder" (''
+        script = hostPkgs.writeShellScriptBin "create-builder" ''
           set -euo pipefail
           export KEYS="''${KEYS:-./keys}"
           ${lib.getExe add-keys}
           ${lib.getExe run-builder}
-        '');
+        '';
 
       in
       script.overrideAttrs (old: {
diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix
index ca662d03213d3..34e48fbd34b99 100644
--- a/nixos/modules/programs/atop.nix
+++ b/nixos/modules/programs/atop.nix
@@ -16,7 +16,7 @@ in
 
   options = {
 
-    programs.atop = rec {
+    programs.atop = {
 
       enable = lib.mkEnableOption "Atop, a tool for monitoring system resources";
 
diff --git a/nixos/modules/programs/coolercontrol.nix b/nixos/modules/programs/coolercontrol.nix
index a886118568606..03aa774ad8465 100644
--- a/nixos/modules/programs/coolercontrol.nix
+++ b/nixos/modules/programs/coolercontrol.nix
@@ -29,7 +29,7 @@ in
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
       # Common
-      ({
+      {
         environment.systemPackages = with pkgs.coolercontrol; [
           coolercontrol-gui
         ];
@@ -46,7 +46,7 @@ in
             coolercontrold.wantedBy = [ "multi-user.target" ];
           };
         };
-      })
+      }
 
       # Nvidia support
       (lib.mkIf cfg.nvidiaSupport {
diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix
index 1600d62ad0388..9a6daaa88272d 100644
--- a/nixos/modules/programs/firefox.nix
+++ b/nixos/modules/programs/firefox.nix
@@ -149,7 +149,7 @@ in
     languagePacks = lib.mkOption {
       # Available languages can be found in https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/
       type = lib.types.listOf (
-        lib.types.enum ([
+        lib.types.enum [
           "ach"
           "af"
           "an"
@@ -253,7 +253,7 @@ in
           "xh"
           "zh-CN"
           "zh-TW"
-        ])
+        ]
       );
       default = [ ];
       description = ''
@@ -285,7 +285,7 @@ in
       '';
     };
 
-    nativeMessagingHosts = ({
+    nativeMessagingHosts = {
       packages = lib.mkOption {
         type = lib.types.listOf lib.types.package;
         default = [ ];
@@ -293,7 +293,7 @@ in
           Additional packages containing native messaging hosts that should be made available to Firefox extensions.
         '';
       };
-    })
+    }
     // (builtins.mapAttrs (k: v: lib.mkEnableOption "${v.name} support") nmhOptions);
   };
 
diff --git a/nixos/modules/programs/gamescope.nix b/nixos/modules/programs/gamescope.nix
index 62de0006551ca..8295eeee26ba5 100644
--- a/nixos/modules/programs/gamescope.nix
+++ b/nixos/modules/programs/gamescope.nix
@@ -78,5 +78,5 @@ in
     environment.systemPackages = lib.mkIf (!cfg.capSysNice) [ gamescope ];
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix
index b6c7aa9e32c06..cc16cee594f99 100644
--- a/nixos/modules/programs/nix-required-mounts.nix
+++ b/nixos/modules/programs/nix-required-mounts.nix
@@ -80,7 +80,7 @@ in
     '';
     allowedPatterns =
       with lib.types;
-      lib.mkOption rec {
+      lib.mkOption {
         type = attrsOf Pattern;
         description = "The hook config, describing which paths to mount for which system features";
         default = { };
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index a950a1c12b12e..8fecb4b41e2a5 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -380,8 +380,8 @@ in
         ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent";
         ExecStart =
           "${cfg.package}/bin/ssh-agent "
-          + lib.optionalString (cfg.agentTimeout != null) ("-t ${cfg.agentTimeout} ")
-          + lib.optionalString (cfg.agentPKCS11Whitelist != null) ("-P ${cfg.agentPKCS11Whitelist} ")
+          + lib.optionalString (cfg.agentTimeout != null) "-t ${cfg.agentTimeout} "
+          + lib.optionalString (cfg.agentPKCS11Whitelist != null) "-P ${cfg.agentPKCS11Whitelist} "
           + "-a %t/ssh-agent";
         StandardOutput = "null";
         Type = "forking";
diff --git a/nixos/modules/programs/tsm-client.nix b/nixos/modules/programs/tsm-client.nix
index f1b0c5dda28a6..32f04dfffa422 100644
--- a/nixos/modules/programs/tsm-client.nix
+++ b/nixos/modules/programs/tsm-client.nix
@@ -314,22 +314,22 @@ let
     # skip `null` value
     else
       [
-        (
-          "  ${key}${
-              if value == true then
-                ""
-              # just output key if value is `true`
-              else if isInt value then
-                "  ${builtins.toString value}"
-              else if path.check value then
-                "  \"${value}\""
-              # enclose path in ".."
-              else if singleLineStr.check value then
-                "  ${value}"
-              else
-                throw "assertion failed: cannot convert type" # should never happen
-            }"
-        )
+
+        "  ${key}${
+            if value == true then
+              ""
+            # just output key if value is `true`
+            else if isInt value then
+              "  ${builtins.toString value}"
+            else if path.check value then
+              "  \"${value}\""
+            # enclose path in ".."
+            else if singleLineStr.check value then
+              "  ${value}"
+            else
+              throw "assertion failed: cannot convert type" # should never happen
+          }"
+
       ];
 
   makeDsmSysStanza =
diff --git a/nixos/modules/programs/wayland/cardboard.nix b/nixos/modules/programs/wayland/cardboard.nix
index 84fe878dc1f8e..72d8612d7f1cc 100644
--- a/nixos/modules/programs/wayland/cardboard.nix
+++ b/nixos/modules/programs/wayland/cardboard.nix
@@ -9,7 +9,7 @@ let
   cfg = config.programs.cardboard;
 in
 {
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 
   options.programs.cardboard = {
     enable = lib.mkEnableOption "cardboard";
diff --git a/nixos/modules/programs/wayland/labwc.nix b/nixos/modules/programs/wayland/labwc.nix
index abbcfad19c6e4..d7477b8f2fcd1 100644
--- a/nixos/modules/programs/wayland/labwc.nix
+++ b/nixos/modules/programs/wayland/labwc.nix
@@ -9,7 +9,7 @@ let
   cfg = config.programs.labwc;
 in
 {
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 
   options.programs.labwc = {
     enable = lib.mkEnableOption "labwc";
diff --git a/nixos/modules/programs/wayland/lib.nix b/nixos/modules/programs/wayland/lib.nix
index bc639dc6d0e0c..bc130b7c0e58c 100644
--- a/nixos/modules/programs/wayland/lib.nix
+++ b/nixos/modules/programs/wayland/lib.nix
@@ -4,7 +4,7 @@
   genFinalPackage =
     pkg: args:
     let
-      expectedArgs = with lib; lib.naturalSort (lib.attrNames args);
+      expectedArgs = lib.naturalSort (lib.attrNames args);
       existingArgs =
         with lib;
         naturalSort (intersectLists expectedArgs (attrNames (functionArgs pkg.override)));
diff --git a/nixos/modules/programs/winbox.nix b/nixos/modules/programs/winbox.nix
index d4be0a08d8716..16021302e55a6 100644
--- a/nixos/modules/programs/winbox.nix
+++ b/nixos/modules/programs/winbox.nix
@@ -10,7 +10,7 @@ let
 in
 {
   options.programs.winbox = {
-    enable = lib.mkEnableOption ("MikroTik Winbox");
+    enable = lib.mkEnableOption "MikroTik Winbox";
     package = lib.mkPackageOption pkgs "winbox" { };
 
     openFirewall = lib.mkOption {
diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
index 07b4633bccd24..c9646d5cee069 100644
--- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
+++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
@@ -37,7 +37,7 @@ in
 
         # https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
         type = lib.types.listOf (
-          lib.types.enum ([
+          lib.types.enum [
             "main"
             "brackets"
             "pattern"
@@ -45,7 +45,7 @@ in
             "regexp"
             "root"
             "line"
-          ])
+          ]
         );
 
         description = ''
diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix
index 92c5457973760..68d607c5e4924 100644
--- a/nixos/modules/security/acme/default.nix
+++ b/nixos/modules/security/acme/default.nix
@@ -237,7 +237,7 @@ let
       # Create hashes for cert data directories based on configuration
       # Flags are separated to avoid collisions
       hashData =
-        with builtins;
+
         ''
           ${lib.concatStringsSep " " data.extraLegoFlags} -
           ${lib.concatStringsSep " " data.extraLegoRunFlags} -
diff --git a/nixos/modules/security/please.nix b/nixos/modules/security/please.nix
index b67f0945521af..7afdf7445849c 100644
--- a/nixos/modules/security/please.nix
+++ b/nixos/modules/security/please.nix
@@ -97,7 +97,7 @@ in
 
       etc."please.ini".source = ini.generate "please.ini" (
         cfg.settings
-        // (rec {
+        // rec {
           # The "root" user is allowed to do anything by default and this cannot
           # be overridden.
           root_run_as_any = {
@@ -113,7 +113,7 @@ in
           root_list_as_any = root_run_as_any // {
             type = "list";
           };
-        })
+        }
       );
     };
 
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 3f861ef7a2575..e46d42f847f31 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -296,11 +296,11 @@ in
         where = parentWrapperDir;
         what = "tmpfs";
         type = "tmpfs";
-        options = lib.concatStringsSep "," ([
+        options = lib.concatStringsSep "," [
           "nodev"
           "mode=755"
           "size=${config.security.wrapperDirSize}"
-        ]);
+        ];
       }
     ];
 
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index ace47e862aade..5bcade8ec5a61 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -157,7 +157,7 @@ in
 
     controls = lib.mkOption {
       type = lib.types.attrsOf (
-        lib.types.submodule ({
+        lib.types.submodule {
           options.name = lib.mkOption {
             type = lib.types.nullOr lib.types.str;
             default = null;
@@ -187,7 +187,7 @@ in
               The maximum volume in dB.
             '';
           };
-        })
+        }
       );
       default = { };
       example = lib.literalExpression ''
@@ -206,7 +206,7 @@ in
 
     cardAliases = lib.mkOption {
       type = lib.types.attrsOf (
-        lib.types.submodule ({
+        lib.types.submodule {
           options.driver = lib.mkOption {
             type = lib.types.str;
             description = ''
@@ -220,7 +220,7 @@ in
               The ID of the sound card
             '';
           };
-        })
+        }
       );
       default = { };
       example = lib.literalExpression ''
diff --git a/nixos/modules/services/audio/gmediarender.nix b/nixos/modules/services/audio/gmediarender.nix
index ce4223880086b..43217b9d1f05f 100644
--- a/nixos/modules/services/audio/gmediarender.nix
+++ b/nixos/modules/services/audio/gmediarender.nix
@@ -81,18 +81,21 @@ in
           SupplementaryGroups = [ "audio" ];
           ExecStart =
             "${cfg.package}/bin/gmediarender "
-            + lib.optionalString (cfg.audioDevice != null) (
-              "--gstout-audiodevice=${utils.escapeSystemdExecArg cfg.audioDevice} "
-            )
-            + lib.optionalString (cfg.audioSink != null) (
-              "--gstout-audiosink=${utils.escapeSystemdExecArg cfg.audioSink} "
-            )
-            + lib.optionalString (cfg.friendlyName != null) (
-              "--friendly-name=${utils.escapeSystemdExecArg cfg.friendlyName} "
-            )
-            + lib.optionalString (cfg.initialVolume != 0) ("--initial-volume=${toString cfg.initialVolume} ")
-            + lib.optionalString (cfg.port != null) ("--port=${toString cfg.port} ")
-            + lib.optionalString (cfg.uuid != null) ("--uuid=${utils.escapeSystemdExecArg cfg.uuid} ");
+            + lib.optionalString (
+              cfg.audioDevice != null
+            ) "--gstout-audiodevice=${utils.escapeSystemdExecArg cfg.audioDevice} "
+
+            + lib.optionalString (
+              cfg.audioSink != null
+            ) "--gstout-audiosink=${utils.escapeSystemdExecArg cfg.audioSink} "
+
+            + lib.optionalString (
+              cfg.friendlyName != null
+            ) "--friendly-name=${utils.escapeSystemdExecArg cfg.friendlyName} "
+
+            + lib.optionalString (cfg.initialVolume != 0) "--initial-volume=${toString cfg.initialVolume} "
+            + lib.optionalString (cfg.port != null) "--port=${toString cfg.port} "
+            + lib.optionalString (cfg.uuid != null) "--uuid=${utils.escapeSystemdExecArg cfg.uuid} ";
           Restart = "always";
           RuntimeDirectory = "gmediarender";
 
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index 2dffe39ba49f5..ab5d10e613b99 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -206,15 +206,13 @@ let
       {
         nativeBuildInputs = [ pkgs.makeWrapper ];
       }
-      (
-        with lib;
-        ''
-          makeWrapper "${original}" "$out/bin/${name}" \
-            ${lib.concatStringsSep " \\\n " (
-              lib.mapAttrsToList (name: value: ''--set ${name} "${value}"'') set
-            )}
-        ''
-      );
+
+      ''
+        makeWrapper "${original}" "$out/bin/${name}" \
+          ${lib.concatStringsSep " \\\n " (
+            lib.mapAttrsToList (name: value: ''--set ${name} "${value}"'') set
+          )}
+      '';
 
   mkBorgWrapper =
     name: cfg:
diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix
index 8b4c59155f4df..fa1abfe12e2e1 100644
--- a/nixos/modules/services/backup/syncoid.nix
+++ b/nixos/modules/services/backup/syncoid.nix
@@ -31,39 +31,38 @@ let
   # datasets.
   buildAllowCommand =
     permissions: dataset:
-    (
-      "-+${pkgs.writeShellScript "zfs-allow-${dataset}" ''
-        # Here we explicitly use the booted system to guarantee the stable API needed by ZFS
 
-        # Run a ZFS list on the dataset to check if it exists
-        if ${
-          lib.escapeShellArgs [
-            "/run/booted-system/sw/bin/zfs"
-            "list"
-            dataset
-          ]
-        } 2> /dev/null; then
+    "-+${pkgs.writeShellScript "zfs-allow-${dataset}" ''
+      # Here we explicitly use the booted system to guarantee the stable API needed by ZFS
+
+      # Run a ZFS list on the dataset to check if it exists
+      if ${
+        lib.escapeShellArgs [
+          "/run/booted-system/sw/bin/zfs"
+          "list"
+          dataset
+        ]
+      } 2> /dev/null; then
+        ${lib.escapeShellArgs [
+          "/run/booted-system/sw/bin/zfs"
+          "allow"
+          cfg.user
+          (lib.concatStringsSep "," permissions)
+          dataset
+        ]}
+      ${lib.optionalString ((builtins.dirOf dataset) != ".") ''
+        else
           ${lib.escapeShellArgs [
             "/run/booted-system/sw/bin/zfs"
             "allow"
             cfg.user
             (lib.concatStringsSep "," permissions)
-            dataset
+            # Remove the last part of the path
+            (builtins.dirOf dataset)
           ]}
-        ${lib.optionalString ((builtins.dirOf dataset) != ".") ''
-          else
-            ${lib.escapeShellArgs [
-              "/run/booted-system/sw/bin/zfs"
-              "allow"
-              cfg.user
-              (lib.concatStringsSep "," permissions)
-              # Remove the last part of the path
-              (builtins.dirOf dataset)
-            ]}
-        ''}
-        fi
-      ''}"
-    );
+      ''}
+      fi
+    ''}";
 
   # Function to build "zfs unallow" commands for the filesystems we've
   # delegated permissions to. Here we unallow both the target but also
@@ -73,28 +72,27 @@ let
   # since the dataset should have been created at this point.
   buildUnallowCommand =
     permissions: dataset:
-    (
-      "-+${pkgs.writeShellScript "zfs-unallow-${dataset}" ''
-        # Here we explicitly use the booted system to guarantee the stable API needed by ZFS
-        ${lib.escapeShellArgs [
+
+    "-+${pkgs.writeShellScript "zfs-unallow-${dataset}" ''
+      # Here we explicitly use the booted system to guarantee the stable API needed by ZFS
+      ${lib.escapeShellArgs [
+        "/run/booted-system/sw/bin/zfs"
+        "unallow"
+        cfg.user
+        (lib.concatStringsSep "," permissions)
+        dataset
+      ]}
+      ${lib.optionalString ((builtins.dirOf dataset) != ".") (
+        lib.escapeShellArgs [
           "/run/booted-system/sw/bin/zfs"
           "unallow"
           cfg.user
           (lib.concatStringsSep "," permissions)
-          dataset
-        ]}
-        ${lib.optionalString ((builtins.dirOf dataset) != ".") (
-          lib.escapeShellArgs [
-            "/run/booted-system/sw/bin/zfs"
-            "unallow"
-            cfg.user
-            (lib.concatStringsSep "," permissions)
-            # Remove the last part of the path
-            (builtins.dirOf dataset)
-          ]
-        )}
-      ''}"
-    );
+          # Remove the last part of the path
+          (builtins.dirOf dataset)
+        ]
+      )}
+    ''}";
 in
 {
 
diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix
index b21a4ca5c277f..e46799e3870d7 100644
--- a/nixos/modules/services/cluster/hadoop/yarn.nix
+++ b/nixos/modules/services/cluster/hadoop/yarn.nix
@@ -189,13 +189,13 @@ in
       services.hadoop.yarnSiteInternal =
         with cfg.yarn.nodemanager;
         lib.mkMerge [
-          ({
+          {
             "yarn.nodemanager.local-dirs" = lib.mkIf (localDir != null) (concatStringsSep "," localDir);
             "yarn.scheduler.maximum-allocation-vcores" = resource.maximumAllocationVCores;
             "yarn.scheduler.maximum-allocation-mb" = resource.maximumAllocationMB;
             "yarn.nodemanager.resource.cpu-vcores" = resource.cpuVCores;
             "yarn.nodemanager.resource.memory-mb" = resource.memoryMB;
-          })
+          }
           (lib.mkIf useCGroups (
             lib.warnIf (lib.versionOlder cfg.package.version "3.5.0")
               ''
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index 86e5e072aa061..b29c8ece73214 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -342,14 +342,12 @@ in
         # dns addon is enabled by default
         services.kubernetes.addons.dns.enable = lib.mkDefault true;
 
-        services.kubernetes.apiserverAddress = lib.mkDefault (
-          "https://${
-            if cfg.apiserver.advertiseAddress != null then
-              cfg.apiserver.advertiseAddress
-            else
-              "${cfg.masterAddress}:${toString cfg.apiserver.securePort}"
-          }"
-        );
+        services.kubernetes.apiserverAddress = lib.mkDefault "https://${
+          if cfg.apiserver.advertiseAddress != null then
+            cfg.apiserver.advertiseAddress
+          else
+            "${cfg.masterAddress}:${toString cfg.apiserver.securePort}"
+        }";
       }
     )
   ];
diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
index e7e13160989be..8467e4b297c1c 100644
--- a/nixos/modules/services/computing/boinc/client.nix
+++ b/nixos/modules/services/computing/boinc/client.nix
@@ -110,6 +110,6 @@ in
   };
 
   meta = {
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index 398a1c09973e6..1d00fa9ae25ff 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -245,7 +245,7 @@ in
 
       pythonPackages = lib.mkOption {
         type = lib.types.functionTo (lib.types.listOf lib.types.package);
-        default = pythonPackages: with pythonPackages; [ ];
+        default = pythonPackages: [ ];
         defaultText = lib.literalExpression "pythonPackages: with pythonPackages; [ ]";
         description = "Packages to add the to the PYTHONPATH of the buildbot process.";
         example = lib.literalExpression "pythonPackages: with pythonPackages; [ requests ]";
diff --git a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix
index 52009e6e9cefb..5617529b3939d 100644
--- a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix
@@ -200,10 +200,10 @@ in
             after = [
               "network-online.target"
             ]
-            ++ optionals (wantsDocker) [
+            ++ optionals wantsDocker [
               "docker.service"
             ]
-            ++ optionals (wantsPodman) [
+            ++ optionals wantsPodman [
               "podman.service"
             ];
             wantedBy = [
@@ -213,7 +213,7 @@ in
               optionalAttrs (instance.token != null) {
                 TOKEN = "${instance.token}";
               }
-              // optionalAttrs (wantsPodman) {
+              // optionalAttrs wantsPodman {
                 DOCKER_HOST = "unix:///run/podman/podman.sock";
               }
               // {
@@ -266,10 +266,10 @@ in
               ];
               ExecStart = "${cfg.package}/bin/act_runner daemon --config ${configFile}";
               SupplementaryGroups =
-                optionals (wantsDocker) [
+                optionals wantsDocker [
                   "docker"
                 ]
-                ++ optionals (wantsPodman) [
+                ++ optionals wantsPodman [
                   "podman"
                 ];
             }
diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index 5cce94ac6d5ef..af5dc2a00b64f 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -230,7 +230,7 @@ in
       '';
 
       type = lib.types.nullOr (
-        lib.types.submodule ({
+        lib.types.submodule {
           options = {
             certificate = lib.mkOption {
               type = lib.types.str;
@@ -258,7 +258,7 @@ in
               '';
             };
           };
-        })
+        }
       );
     };
 
@@ -274,7 +274,7 @@ in
         FoundationDB locality settings.
       '';
 
-      type = lib.types.submodule ({
+      type = lib.types.submodule {
         options = {
           machineId = lib.mkOption {
             default = null;
@@ -316,7 +316,7 @@ in
             '';
           };
         };
-      });
+      };
     };
 
     extraReadWritePaths = lib.mkOption {
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 44affdfb05863..1fc1ede6313c8 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -12,7 +12,7 @@ let
   ldapValueType =
     let
       # Can't do types.either with multiple non-overlapping submodules, so define our own
-      singleLdapValueType = lib.mkOptionType rec {
+      singleLdapValueType = lib.mkOptionType {
         name = "LDAP";
         # TODO: It would be nice to define a { secret = ...; } option, using
         # systemd's LoadCredentials for secrets. That would remove the last
@@ -357,7 +357,7 @@ in
             ]
           ) contentsFiles)
           ++ [ "${openldap}/bin/slaptest -u -F ${configDir}" ];
-          ExecStart = lib.escapeShellArgs ([
+          ExecStart = lib.escapeShellArgs [
             "${openldap}/libexec/slapd"
             "-d"
             "0"
@@ -365,7 +365,7 @@ in
             configDir
             "-h"
             (lib.concatStringsSep " " cfg.urlList)
-          ]);
+          ];
           Type = "notify";
           # Fixes an error where openldap attempts to notify from a thread
           # outside the main process:
diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index 80d51157f7d8c..0e9d7ac4379ec 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -168,7 +168,7 @@ in
 
       services.gnome.evolution-data-server = {
         enable = true;
-        plugins = with pkgs; [
+        plugins = [
           # TODO: lomiri.address-book-service
         ];
       };
diff --git a/nixos/modules/services/desktops/bamf.nix b/nixos/modules/services/desktops/bamf.nix
index 333a312199f29..cd668a07c2455 100644
--- a/nixos/modules/services/desktops/bamf.nix
+++ b/nixos/modules/services/desktops/bamf.nix
@@ -6,8 +6,8 @@
   ...
 }:
 {
-  meta = with lib; {
-    maintainers = with lib.maintainers; [ ];
+  meta = {
+    maintainers = [ ];
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/system76-scheduler.nix b/nixos/modules/services/desktops/system76-scheduler.nix
index 1a8abe810cd8b..379e4a78c9e3c 100644
--- a/nixos/modules/services/desktops/system76-scheduler.nix
+++ b/nixos/modules/services/desktops/system76-scheduler.nix
@@ -136,9 +136,9 @@ let
       ++ (optional (a.nice != null) "nice=${toString a.nice}")
       ++ (optional (a.class != null) "sched=${prioToString a.class a.prio}")
       ++ (optional (a.ioClass != null) "io=${prioToString a.ioClass a.ioPrio}")
-      ++ (optional ((builtins.length a.matchers) != 0) (
+      ++ (optional ((builtins.length a.matchers) != 0)
         "{\n${concatStringsSep "\n" (map (m: "  ${indent}${m}") a.matchers)}\n${indent}}"
-      ))
+      )
     );
 
 in
diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix
index 521f8c0a58f13..c8ebf7e81e892 100644
--- a/nixos/modules/services/desktops/tumbler.nix
+++ b/nixos/modules/services/desktops/tumbler.nix
@@ -17,8 +17,8 @@ in
     (lib.mkRemovedOptionModule [ "services" "tumbler" "package" ] "")
   ];
 
-  meta = with lib; {
-    maintainers = with lib.maintainers; [ ] ++ lib.teams.pantheon.members;
+  meta = {
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/development/athens.nix b/nixos/modules/services/development/athens.nix
index bd770293e4c78..caaacb475e9a2 100644
--- a/nixos/modules/services/development/athens.nix
+++ b/nixos/modules/services/development/athens.nix
@@ -7,7 +7,7 @@
 let
   cfg = config.services.athens;
 
-  athensConfig = lib.flip lib.recursiveUpdate cfg.extraConfig ({
+  athensConfig = lib.flip lib.recursiveUpdate cfg.extraConfig {
     GoBinary = "${cfg.goBinary}/bin/go";
     GoEnv = cfg.goEnv;
     GoBinaryEnvVars = lib.mapAttrsToList (k: v: "${k}=${v}") cfg.goBinaryEnvVars;
@@ -141,7 +141,7 @@ let
         };
       };
     };
-  });
+  };
 
   configFile = lib.pipe athensConfig [
     (lib.filterAttrsRecursive (_k: v: v != null))
diff --git a/nixos/modules/services/hardware/display.nix b/nixos/modules/services/hardware/display.nix
index 29e205c81de9e..044217b8c31d5 100644
--- a/nixos/modules/services/hardware/display.nix
+++ b/nixos/modules/services/hardware/display.nix
@@ -132,7 +132,7 @@ in
 
     hardware.display.outputs = lib.mkOption {
       type = lib.types.attrsOf (
-        lib.types.submodule ({
+        lib.types.submodule {
           options = {
             edid = lib.mkOption {
               type = with lib.types; nullOr str;
@@ -161,7 +161,7 @@ in
               '';
             };
           };
-        })
+        }
       );
       description = ''
         Hardware/kernel-level configuration of specific outputs.
diff --git a/nixos/modules/services/hardware/libinput.nix b/nixos/modules/services/hardware/libinput.nix
index 47f5a8db327ac..1cae86827d73e 100644
--- a/nixos/modules/services/hardware/libinput.nix
+++ b/nixos/modules/services/hardware/libinput.nix
@@ -370,12 +370,12 @@ in
       (
         option:
         lib.mkRenamedOptionModule
-          ([
+          [
             "services"
             "xserver"
             "libinput"
             option
-          ])
+          ]
           [
             "services"
             "libinput"
diff --git a/nixos/modules/services/logging/fluentd.nix b/nixos/modules/services/logging/fluentd.nix
index 5047a0be031e2..85f70a855723f 100644
--- a/nixos/modules/services/logging/fluentd.nix
+++ b/nixos/modules/services/logging/fluentd.nix
@@ -39,7 +39,7 @@ in
   ###### implementation
 
   config = lib.mkIf cfg.enable {
-    systemd.services.fluentd = with pkgs; {
+    systemd.services.fluentd = {
       description = "Fluentd Daemon";
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
diff --git a/nixos/modules/services/logging/heartbeat.nix b/nixos/modules/services/logging/heartbeat.nix
index e0b475e8a284f..2280c4349144e 100644
--- a/nixos/modules/services/logging/heartbeat.nix
+++ b/nixos/modules/services/logging/heartbeat.nix
@@ -64,7 +64,7 @@ in
       "d '${cfg.stateDir}' - nobody nogroup - -"
     ];
 
-    systemd.services.heartbeat = with pkgs; {
+    systemd.services.heartbeat = {
       description = "heartbeat log shipper";
       wantedBy = [ "multi-user.target" ];
       preStart = ''
diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix
index 89985a9833041..f346070441b3d 100644
--- a/nixos/modules/services/logging/promtail.nix
+++ b/nixos/modules/services/logging/promtail.nix
@@ -104,7 +104,7 @@ in
         MemoryDenyWriteExecute = true;
         PrivateUsers = true;
 
-        SupplementaryGroups = lib.optional (allowSystemdJournal) "systemd-journal";
+        SupplementaryGroups = lib.optional allowSystemdJournal "systemd-journal";
       }
       // (optionalAttrs (!pkgs.stdenv.hostPlatform.isAarch64) {
         # FIXME: figure out why this breaks on aarch64
diff --git a/nixos/modules/services/mail/listmonk.nix b/nixos/modules/services/mail/listmonk.nix
index 1000bce88d61a..543b6d09ce9f0 100644
--- a/nixos/modules/services/mail/listmonk.nix
+++ b/nixos/modules/services/mail/listmonk.nix
@@ -165,11 +165,11 @@ in
     # Default parameters from https://github.com/knadh/listmonk/blob/master/config.toml.sample
     services.listmonk.settings."app".address = lib.mkDefault "localhost:9000";
     services.listmonk.settings."db" = lib.mkMerge [
-      ({
+      {
         max_open = lib.mkDefault 25;
         max_idle = lib.mkDefault 25;
         max_lifetime = lib.mkDefault "300s";
-      })
+      }
       (lib.mkIf cfg.database.createLocally {
         host = lib.mkDefault "/run/postgresql";
         port = lib.mkDefault 5432;
diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix
index 9b28bdad020b2..90d07581de89e 100644
--- a/nixos/modules/services/mail/public-inbox.nix
+++ b/nixos/modules/services/mail/public-inbox.nix
@@ -605,7 +605,7 @@ in
           ];
         }
       )
-      ({
+      {
         public-inbox-init =
           let
             PI_CONFIG = gitIni.generate "public-inbox.ini" (
@@ -674,9 +674,9 @@ in
               };
             }
           ];
-      })
+      }
     ];
-    environment.systemPackages = with pkgs; [ cfg.package ];
+    environment.systemPackages = [ cfg.package ];
   };
   meta.maintainers = with lib.maintainers; [
     julm
diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index c31c4b0699282..b4452f1a8d529 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -129,7 +129,7 @@ in
   config = lib.mkIf cfg.enable {
     # backward compatibility: if password is set but not passwordFile, make one.
     services.roundcube.database.passwordFile = lib.mkIf (!localDB && cfg.database.password != "") (
-      lib.mkDefault ("${pkgs.writeText "roundcube-password" cfg.database.password}")
+      lib.mkDefault "${pkgs.writeText "roundcube-password" cfg.database.password}"
     );
     warnings =
       lib.optional (!localDB && cfg.database.password != "")
diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix
index 6622a2dcd1140..a45e55666a115 100644
--- a/nixos/modules/services/mail/stalwart-mail.nix
+++ b/nixos/modules/services/mail/stalwart-mail.nix
@@ -116,7 +116,7 @@ in
         in
         {
           path = "/var/cache/stalwart-mail";
-          resource = lib.mkIf (hasHttpListener) (lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip");
+          resource = lib.mkIf hasHttpListener (lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip");
         };
     };
 
diff --git a/nixos/modules/services/matrix/conduit.nix b/nixos/modules/services/matrix/conduit.nix
index 3d2738c4c3d81..0b0d467c51696 100644
--- a/nixos/modules/services/matrix/conduit.nix
+++ b/nixos/modules/services/matrix/conduit.nix
@@ -123,10 +123,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";
diff --git a/nixos/modules/services/matrix/mautrix-meta.nix b/nixos/modules/services/matrix/mautrix-meta.nix
index c2cdcc9c0886f..a0576c79edb31 100644
--- a/nixos/modules/services/matrix/mautrix-meta.nix
+++ b/nixos/modules/services/matrix/mautrix-meta.nix
@@ -619,5 +619,5 @@ in
     }
   ];
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix
index 4eb59340fc9c5..bf7fa7621a784 100644
--- a/nixos/modules/services/misc/autorandr.nix
+++ b/nixos/modules/services/misc/autorandr.nix
@@ -232,7 +232,7 @@ let
   profileToFiles =
     name: profile:
     with profile;
-    lib.mkMerge ([
+    lib.mkMerge [
       {
         "xdg/autorandr/${name}/setup".text = lib.concatStringsSep "\n" (
           lib.mapAttrsToList fingerprintToString fingerprint
@@ -244,7 +244,7 @@ let
       (lib.mapAttrs' (hookToFile "${name}/postswitch.d") hooks.postswitch)
       (lib.mapAttrs' (hookToFile "${name}/preswitch.d") hooks.preswitch)
       (lib.mapAttrs' (hookToFile "${name}/predetect.d") hooks.predetect)
-    ]);
+    ];
   fingerprintToString = name: edid: "${name} ${edid}";
   configToString =
     name: config:
@@ -373,12 +373,12 @@ in
 
     environment = {
       systemPackages = [ pkgs.autorandr ];
-      etc = lib.mkMerge ([
+      etc = lib.mkMerge [
         (lib.mapAttrs' (hookToFile "postswitch.d") cfg.hooks.postswitch)
         (lib.mapAttrs' (hookToFile "preswitch.d") cfg.hooks.preswitch)
         (lib.mapAttrs' (hookToFile "predetect.d") cfg.hooks.predetect)
         (lib.mkMerge (lib.mapAttrsToList profileToFiles cfg.profiles))
-      ]);
+      ];
     };
 
     systemd.services.autorandr = {
diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix
index b9ab598d93ddf..28817693dd183 100644
--- a/nixos/modules/services/misc/bepasty.nix
+++ b/nixos/modules/services/misc/bepasty.nix
@@ -138,7 +138,7 @@ in
     # creates gunicorn systemd service for each configured server
     systemd.services = lib.mapAttrs' (
       name: server:
-      lib.nameValuePair ("bepasty-server-${name}-gunicorn") ({
+      lib.nameValuePair "bepasty-server-${name}-gunicorn" {
         description = "Bepasty Server ${name}";
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
@@ -186,7 +186,7 @@ in
                           -k gevent
           '';
         };
-      })
+      }
     ) cfg.servers;
 
     users.users.${user} = {
diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix
index f87a05d00fc1a..8bd15895c3484 100644
--- a/nixos/modules/services/misc/cgminer.nix
+++ b/nixos/modules/services/misc/cgminer.nix
@@ -7,12 +7,12 @@
 let
   cfg = config.services.cgminer;
 
-  convType = with builtins; v: if lib.isBool v then lib.boolToString v else toString v;
+  convType = v: if lib.isBool v then lib.boolToString v else toString v;
   mergedHwConfig = lib.mapAttrsToList (
     n: v: ''"${n}": "${(lib.concatStringsSep "," (map convType v))}"''
   ) (lib.foldAttrs (n: a: [ n ] ++ a) [ ] cfg.hardware);
   mergedConfig =
-    with builtins;
+
     lib.mapAttrsToList (
       n: v: ''"${n}":  ${if lib.isBool v then convType v else ''"${convType v}"''}''
     ) cfg.config;
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 97bfe80586f84..3e7b9ac377b06 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -1699,7 +1699,7 @@ in
         filteredConfig = filterAttrs (_: v: v != null) cfg.pages.settings;
         isSecret = v: isAttrs v && v ? _secret && isString v._secret;
         mkPagesKeyValue = lib.generators.toKeyValue {
-          mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" rec {
+          mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" {
             mkValueString =
               v:
               if isInt v then
diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix
index 022efc5b98392..6d399777805c8 100644
--- a/nixos/modules/services/misc/portunus.nix
+++ b/nixos/modules/services/misc/portunus.nix
@@ -275,9 +275,9 @@ in
           PORTUNUS_SLAPD_USER = cfg.ldap.user;
           PORTUNUS_SLAPD_SCHEMA_DIR = "${cfg.ldap.package}/etc/schema";
         }
-        // (lib.optionalAttrs (cfg.seedPath != null) ({
+        // (lib.optionalAttrs (cfg.seedPath != null) {
           PORTUNUS_SEED_PATH = cfg.seedPath;
-        }))
+        })
         // (lib.optionalAttrs cfg.ldap.tls (
           let
             acmeDirectory = config.security.acme.certs."${cfg.domain}".directory;
diff --git a/nixos/modules/services/misc/redlib.nix b/nixos/modules/services/misc/redlib.nix
index 25245c441d2f1..5872842e26b0f 100644
--- a/nixos/modules/services/misc/redlib.nix
+++ b/nixos/modules/services/misc/redlib.nix
@@ -20,10 +20,10 @@ let
 
   cfg = config.services.redlib;
 
-  args = concatStringsSep " " ([
+  args = concatStringsSep " " [
     "--port ${toString cfg.port}"
     "--address ${cfg.address}"
-  ]);
+  ];
 
   boolToString' = b: if b then "on" else "off";
 in
diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix
index 8f189b22019df..f4a16f7a4894c 100644
--- a/nixos/modules/services/misc/snapper.nix
+++ b/nixos/modules/services/misc/snapper.nix
@@ -265,11 +265,11 @@ in
         }
         // (lib.mapAttrs' (
           name: subvolume:
-          lib.nameValuePair "snapper/configs/${name}" ({
+          lib.nameValuePair "snapper/configs/${name}" {
             text = lib.generators.toKeyValue { inherit mkKeyValue; } (
               lib.filterAttrs (k: v: v != defaultOf k) subvolume
             );
-          })
+          }
         ) cfg.configs)
         // (lib.optionalAttrs (cfg.filters != null) { "snapper/filters/default.txt".text = cfg.filters; });
       };
diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix
index f4f2f22a8b487..e396ccad54942 100644
--- a/nixos/modules/services/misc/synergy.nix
+++ b/nixos/modules/services/misc/synergy.nix
@@ -129,7 +129,7 @@ in
         }${
           lib.optionalString (cfgS.screenName != "") " -n ${cfgS.screenName}"
         }${lib.optionalString cfgS.tls.enable " --enable-crypto"}${
-          lib.optionalString (cfgS.tls.cert != null) (" --tls-cert ${cfgS.tls.cert}")
+          lib.optionalString (cfgS.tls.cert != null) " --tls-cert ${cfgS.tls.cert}"
         }'';
         serviceConfig.Restart = "on-failure";
       };
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 16d68279df3f9..bc42740bda449 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -51,10 +51,9 @@ let
     ];
   };
 
-  carbonOpts =
-    name: with config.ids; ''
-      --nodaemon --syslog --prefix=${name} --pidfile /run/${name}/${name}.pid ${name}
-    '';
+  carbonOpts = name: ''
+    --nodaemon --syslog --prefix=${name} --pidfile /run/${name}/${name}.pid ${name}
+  '';
 
   carbonEnv = {
     PYTHONPATH =
@@ -355,7 +354,7 @@ in
       ];
     })
 
-    (lib.mkIf cfg.web.enable ({
+    (lib.mkIf cfg.web.enable {
       systemd.services.graphiteWeb = {
         description = "Graphite Web Interface";
         wantedBy = [ "multi-user.target" ];
@@ -416,7 +415,7 @@ in
       };
 
       environment.systemPackages = [ pkgs.python3Packages.graphite-web ];
-    }))
+    })
 
     (lib.mkIf cfg.seyren.enable {
       systemd.services.seyren = {
diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix
index 7b3f8bc34ac59..1039dcf49ee32 100644
--- a/nixos/modules/services/monitoring/parsedmarc.nix
+++ b/nixos/modules/services/monitoring/parsedmarc.nix
@@ -11,7 +11,7 @@ let
   opt = options.services.parsedmarc;
   isSecret = v: isAttrs v && v ? _secret && isString v._secret;
   ini = pkgs.formats.ini {
-    mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" rec {
+    mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" {
       mkValueString =
         v:
         if isInt v then
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index fb623d3600ca6..1def6e36589fe 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -341,7 +341,7 @@ let
         "-m comment --comment ${name}-exporter -j nixos-fw-accept"
       ]);
       networking.firewall.extraInputRules = mkIf (conf.openFirewall && nftables) conf.firewallRules;
-      systemd.services."prometheus-${name}-exporter" = mkMerge ([
+      systemd.services."prometheus-${name}-exporter" = mkMerge [
         {
           wantedBy = [ "multi-user.target" ];
           after = [ "network.target" ];
@@ -378,14 +378,14 @@ let
           serviceConfig.UMask = "0077";
         }
         serviceOpts
-      ]);
+      ];
     };
 in
 {
 
   options.services.prometheus.exporters = mkOption {
     type = types.submodule {
-      options = (mkSubModules);
+      options = mkSubModules;
       imports = [
         ../../../misc/assertions.nix
         (lib.mkRenamedOptionModule [ "unifi-poller" ] [ "unpoller" ])
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/json.nix b/nixos/modules/services/monitoring/prometheus/exporters/json.nix
index 46aed2ba47934..07fa980f5bac1 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/json.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/json.nix
@@ -49,9 +49,9 @@ in
       For more information, take a look at the official documentation
       (https://github.com/prometheus-community/json_exporter) of the json_exporter.
     '')
-    ({
+    {
       options.warnings = options.warnings;
       options.assertions = options.assertions;
-    })
+    }
   ];
 }
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
index ec918e165f5aa..089282436041a 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
@@ -83,9 +83,9 @@ in
     (mkRemovedOptionModule [ "insecure" ] ''
       This option was replaced by 'prometheus.exporters.nginx.sslVerify'.
     '')
-    ({
+    {
       options.warnings = options.warnings;
       options.assertions = options.assertions;
-    })
+    }
   ];
 }
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
index 945a950ed85de..9734cb402acd1 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
@@ -188,9 +188,9 @@ in
       into the cmdline of the exporter making the connection string effectively
       world-readable.
     '')
-    ({
+    {
       options.warnings = options.warnings;
       options.assertions = options.assertions;
-    })
+    }
   ];
 }
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix b/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix
index f2d37c6b95e60..74e84ab114205 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix
@@ -18,10 +18,10 @@ in
 {
   imports = [
     (mkRemovedOptionModule [ "interval" ] "This option has been removed.")
-    ({
+    {
       options.warnings = options.warnings;
       options.assertions = options.assertions;
-    })
+    }
   ];
 
   port = 9617;
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix
index 21e03154a88f2..de8ba9d676aec 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix
@@ -111,9 +111,9 @@ in
       For more information, take a look at the official documentation
       (https://github.com/prometheus-community/json_exporter) of the json_exporter.
     '')
-    ({
+    {
       options.warnings = options.warnings;
       options.assertions = options.assertions;
-    })
+    }
   ];
 }
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix b/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix
index 73656b896085d..aab30670830a7 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix
@@ -26,10 +26,10 @@ in
     (mkRemovedOptionModule [
       "fetchType"
     ] "This option was removed, use the `unbound.host` option instead.")
-    ({
+    {
       options.warnings = options.warnings;
       options.assertions = options.assertions;
-    })
+    }
   ];
 
   port = 9167;
diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix
index 7473423843851..550e00040817e 100644
--- a/nixos/modules/services/monitoring/thanos.nix
+++ b/nixos/modules/services/monitoring/thanos.nix
@@ -774,10 +774,8 @@ in
     };
 
     query-frontend = paramsToOptions params.query-frontend // {
-      enable = mkEnableOption (
-        "the Thanos query frontend implements a service deployed in front of queriers to
-          improve query parallelization and caching."
-      );
+      enable = mkEnableOption "the Thanos query frontend implements a service deployed in front of queriers to
+          improve query parallelization and caching.";
       arguments = mkArgumentsOption "query-frontend";
     };
 
@@ -800,9 +798,7 @@ in
     };
 
     receive = paramsToOptions params.receive // {
-      enable = mkEnableOption (
-        "the Thanos receiver which accept Prometheus remote write API requests and write to local tsdb"
-      );
+      enable = mkEnableOption "the Thanos receiver which accept Prometheus remote write API requests and write to local tsdb";
       arguments = mkArgumentsOption "receive";
     };
   };
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 82854514db6ba..3d1e85ffbf74c 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -316,7 +316,7 @@ in
         ConfigurationDirectory = "bind";
         ReadWritePaths = [
           (lib.mapAttrsToList (
-            name: config: if (lib.hasPrefix "/" config.file) then ("-${dirOf config.file}") else ""
+            name: config: if (lib.hasPrefix "/" config.file) then "-${dirOf config.file}" else ""
           ) cfg.zones)
           cfg.directory
         ];
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 43ea76d5d7108..38cc7e35123f1 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -170,7 +170,7 @@ in
           '';
         };
         connectTo = lib.mkOption {
-          type = lib.types.attrsOf (lib.types.submodule (connectToSubmodule));
+          type = lib.types.attrsOf (lib.types.submodule connectToSubmodule);
           default = { };
           example = lib.literalExpression ''
             {
@@ -216,7 +216,7 @@ in
         };
 
         connectTo = lib.mkOption {
-          type = lib.types.attrsOf (lib.types.submodule (connectToSubmodule));
+          type = lib.types.attrsOf (lib.types.submodule connectToSubmodule);
           default = { };
           example = lib.literalExpression ''
             {
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index a59a494f63373..1e326e3830ba3 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -16,7 +16,7 @@ let
   enableIwd = cfg.wifi.backend == "iwd";
 in
 {
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 
   imports = [
     (lib.mkRenamedOptionModule [ "networking" "connman" ] [ "services" "connman" ])
diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix
index 82cd3e8a00dd9..a0445790ee387 100644
--- a/nixos/modules/services/networking/hans.nix
+++ b/nixos/modules/services/networking/hans.nix
@@ -37,7 +37,7 @@ in
           }
         '';
         type = lib.types.attrsOf (
-          lib.types.submodule ({
+          lib.types.submodule {
             options = {
               server = lib.mkOption {
                 type = lib.types.str;
@@ -60,7 +60,7 @@ in
               };
 
             };
-          })
+          }
         );
       };
 
diff --git a/nixos/modules/services/networking/https-dns-proxy.nix b/nixos/modules/services/networking/https-dns-proxy.nix
index 2476edf4a469e..4e8f81888cc22 100644
--- a/nixos/modules/services/networking/https-dns-proxy.nix
+++ b/nixos/modules/services/networking/https-dns-proxy.nix
@@ -136,7 +136,7 @@ in
       wants = [ "nss-lookup.target" ];
       before = [ "nss-lookup.target" ];
       wantedBy = [ "multi-user.target" ];
-      serviceConfig = rec {
+      serviceConfig = {
         Type = "exec";
         DynamicUser = true;
         ProtectHome = "tmpfs";
diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix
index 213ad696d5121..4d666d3a64f8f 100644
--- a/nixos/modules/services/networking/hylafax/options.nix
+++ b/nixos/modules/services/networking/hylafax/options.nix
@@ -54,7 +54,7 @@ let
         int
         listOf
         ;
-      innerType = coercedTo bool (x: if x then "Yes" else "No") (coercedTo int (toString) str);
+      innerType = coercedTo bool (x: if x then "Yes" else "No") (coercedTo int toString str);
     in
     attrsOf (coercedTo innerType lib.singleton (listOf innerType));
 
diff --git a/nixos/modules/services/networking/inadyn.nix b/nixos/modules/services/networking/inadyn.nix
index 5507c7b0ebc6d..384c6932aefae 100644
--- a/nixos/modules/services/networking/inadyn.nix
+++ b/nixos/modules/services/networking/inadyn.nix
@@ -89,9 +89,9 @@ in
       };
     in
     {
-      enable = lib.mkEnableOption (''
+      enable = lib.mkEnableOption ''
         synchronise your machine's IP address with a dynamic DNS provider using inadyn
-      '');
+      '';
       user = lib.mkOption {
         default = "inadyn";
         type = lib.types.str;
diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
index ed3ff28cd5f4d..763bce1a905d3 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixos/modules/services/networking/iodine.nix
@@ -56,7 +56,7 @@ in
           }
         '';
         type = lib.types.attrsOf (
-          lib.types.submodule ({
+          lib.types.submodule {
             options = {
               server = lib.mkOption {
                 type = lib.types.str;
@@ -85,7 +85,7 @@ in
                 description = "Path to a file containing the password.";
               };
             };
-          })
+          }
         );
       };
 
diff --git a/nixos/modules/services/networking/jool.nix b/nixos/modules/services/networking/jool.nix
index ea73eb1233844..2f74081adc311 100644
--- a/nixos/modules/services/networking/jool.nix
+++ b/nixos/modules/services/networking/jool.nix
@@ -289,7 +289,7 @@ in
     system.checks = lib.optional (cfg.nat64 != { } || cfg.siit != { }) (
       pkgs.runCommand "jool-validated"
         {
-          nativeBuildInputs = with pkgs.buildPackages; [ jool-cli ];
+          nativeBuildInputs = [ jool-cli ];
           preferLocalBuild = true;
         }
         (
diff --git a/nixos/modules/services/networking/nat-iptables.nix b/nixos/modules/services/networking/nat-iptables.nix
index 804dc0e0340c0..16cd8c4686b5b 100644
--- a/nixos/modules/services/networking/nat-iptables.nix
+++ b/nixos/modules/services/networking/nat-iptables.nix
@@ -219,7 +219,7 @@ in
   };
 
   config = mkIf (!config.networking.nftables.enable) (mkMerge [
-    ({ networking.firewall.extraCommands = mkBefore flushNat; })
+    { networking.firewall.extraCommands = mkBefore flushNat; }
     (mkIf config.networking.nat.enable {
 
       networking.firewall = mkIf config.networking.firewall.enable {
diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix
index a9f16e0223072..b8ee8b1238866 100644
--- a/nixos/modules/services/networking/ncps.nix
+++ b/nixos/modules/services/networking/ncps.nix
@@ -336,7 +336,7 @@ in
       ];
 
       unitConfig.RequiresMountsFor = lib.concatStringsSep " " (
-        [ "${cfg.cache.dataPath}" ] ++ lib.optional (isSqlite) dbDir
+        [ "${cfg.cache.dataPath}" ] ++ lib.optional isSqlite dbDir
       );
     };
   };
diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix
index b9d579a61c1e9..e7e4e024f8a2e 100644
--- a/nixos/modules/services/networking/nylon.nix
+++ b/nixos/modules/services/networking/nylon.nix
@@ -160,7 +160,7 @@ in
 
   ###### implementation
 
-  config = lib.mkIf (lib.length (enabledNylons) > 0) {
+  config = lib.mkIf (lib.length enabledNylons > 0) {
 
     users.users.nylon = {
       group = "nylon";
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index 25ad4b13daf27..f9ccccc2d3a12 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -297,7 +297,7 @@ in
 
     users.groups.rslsync.gid = config.ids.gids.rslsync;
 
-    systemd.services.resilio = with pkgs; {
+    systemd.services.resilio = {
       description = "Resilio Sync Service";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
diff --git a/nixos/modules/services/networking/spiped.nix b/nixos/modules/services/networking/spiped.nix
index 0be0b445ae6be..723e9296e85f0 100644
--- a/nixos/modules/services/networking/spiped.nix
+++ b/nixos/modules/services/networking/spiped.nix
@@ -21,7 +21,7 @@ in
 
       config = mkOption {
         type = types.attrsOf (
-          types.submodule ({
+          types.submodule {
             options = {
               encrypt = mkOption {
                 type = types.bool;
@@ -138,7 +138,7 @@ in
                 description = "Disable target address re-resolution.";
               };
             };
-          })
+          }
         );
 
         default = { };
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index ba232ef2744ff..370e6935f3604 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -21,7 +21,7 @@ let
     let
       # reports boolean as yes / no
       mkValueString =
-        with lib;
+
         v:
         if lib.isInt v then
           toString v
diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix
index b8a46d5150bc9..4614b4617a4fb 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix
@@ -45,13 +45,13 @@ rec {
   paramsToRenderedStrings =
     cfg: ps:
     filterEmptySets (
-      (mapParamsRecursive (
+      mapParamsRecursive (
         path: name: param:
         let
           value = attrByPath path null cfg;
         in
         optionalAttrs (value != null) (param.render name value)
-      ) ps)
+      ) ps
     );
 
   filterEmptySets =
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 7094310267392..12e9554d62198 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -376,11 +376,11 @@ in
           network: data:
           flip mapAttrs' data.hosts (
             host: text:
-            nameValuePair ("tinc/${network}/hosts/${host}") ({
+            nameValuePair "tinc/${network}/hosts/${host}" {
               mode = "0644";
               user = "tinc-${network}";
               inherit text;
-            })
+            }
           )
           // {
             "tinc/${network}/tinc.conf" = {
@@ -399,7 +399,7 @@ in
 
       systemd.services = flip mapAttrs' cfg.networks (
         network: data:
-        nameValuePair ("tinc.${network}") (
+        nameValuePair "tinc.${network}" (
           let
             version = getVersion data.package;
           in
@@ -481,11 +481,11 @@ in
 
       users.users = flip mapAttrs' cfg.networks (
         network: _:
-        nameValuePair ("tinc-${network}") ({
+        nameValuePair "tinc-${network}" {
           description = "Tinc daemon user for ${network}";
           isSystemUser = true;
           group = "tinc-${network}";
-        })
+        }
       );
       users.groups = flip mapAttrs' cfg.networks (network: _: nameValuePair "tinc-${network}" { });
     }
diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
index f5d4cbeffabb3..71a258fbfee17 100644
--- a/nixos/modules/services/networking/xinetd.nix
+++ b/nixos/modules/services/networking/xinetd.nix
@@ -65,7 +65,7 @@ in
 
       type =
         with types;
-        listOf (submodule ({
+        listOf (submodule {
 
           options = {
 
@@ -130,7 +130,7 @@ in
 
           };
 
-        }));
+        });
 
     };
 
diff --git a/nixos/modules/services/search/opensearch.nix b/nixos/modules/services/search/opensearch.nix
index eb2ec893698e0..339ab0699c0e2 100644
--- a/nixos/modules/services/search/opensearch.nix
+++ b/nixos/modules/services/search/opensearch.nix
@@ -263,7 +263,7 @@ in
         TimeoutStartSec = "infinity";
         DynamicUser = usingDefaultUserAndGroup && usingDefaultDataDir;
       }
-      // (lib.optionalAttrs (usingDefaultDataDir) {
+      // (lib.optionalAttrs usingDefaultDataDir {
         StateDirectory = "opensearch";
         StateDirectoryMode = "0700";
       });
diff --git a/nixos/modules/services/search/quickwit.nix b/nixos/modules/services/search/quickwit.nix
index 4fd74c1543e08..c87225aa32706 100644
--- a/nixos/modules/services/search/quickwit.nix
+++ b/nixos/modules/services/search/quickwit.nix
@@ -182,7 +182,7 @@ in
           "@chown"
         ];
       }
-      // (lib.optionalAttrs (usingDefaultDataDir) {
+      // (lib.optionalAttrs usingDefaultDataDir {
         StateDirectory = "quickwit";
         StateDirectoryMode = "0700";
       });
diff --git a/nixos/modules/services/security/esdm.nix b/nixos/modules/services/security/esdm.nix
index fbce629262751..398bd8a089176 100644
--- a/nixos/modules/services/security/esdm.nix
+++ b/nixos/modules/services/security/esdm.nix
@@ -42,10 +42,10 @@ in
 
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
-      ({
+      {
         systemd.packages = [ cfg.package ];
         systemd.services."esdm-server".wantedBy = [ "basic.target" ];
-      })
+      }
       # It is necessary to set those options for these services to be started by systemd in NixOS
       (lib.mkIf cfg.enableLinuxCompatServices {
         systemd.targets."esdm-linux-compat".wantedBy = [ "basic.target" ];
diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix
index b8fc71db0476c..674e075b9ad4c 100644
--- a/nixos/modules/services/system/earlyoom.nix
+++ b/nixos/modules/services/system/earlyoom.nix
@@ -23,7 +23,7 @@ let
 in
 {
   meta = {
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 
   options.services.earlyoom = {
diff --git a/nixos/modules/services/web-apps/dolibarr.nix b/nixos/modules/services/web-apps/dolibarr.nix
index 86b8bd6bc8926..1e22847063b23 100644
--- a/nixos/modules/services/web-apps/dolibarr.nix
+++ b/nixos/modules/services/web-apps/dolibarr.nix
@@ -295,7 +295,7 @@ in
       services.nginx.virtualHosts."${cfg.domain}" = mkIf (cfg.nginx != null) (
         lib.mkMerge [
           cfg.nginx
-          ({
+          {
             root = lib.mkForce "${package}/htdocs";
             locations."/".index = "index.php";
             locations."~ [^/]\\.php(/|$)" = {
@@ -304,7 +304,7 @@ in
                 fastcgi_pass unix:${config.services.phpfpm.pools.dolibarr.socket};
               '';
             };
-          })
+          }
         ]
       );
 
diff --git a/nixos/modules/services/web-apps/flarum.nix b/nixos/modules/services/web-apps/flarum.nix
index 2b5517d8af989..c4c05826d8cdc 100644
--- a/nixos/modules/services/web-apps/flarum.nix
+++ b/nixos/modules/services/web-apps/flarum.nix
@@ -90,7 +90,7 @@ in
       description = "Home directory for writable storage";
     };
 
-    database = mkOption rec {
+    database = mkOption {
       type =
         with types;
         attrsOf (oneOf [
diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix
index fe5ffa4d93308..d9045a8f21db9 100644
--- a/nixos/modules/services/web-apps/gancio.nix
+++ b/nixos/modules/services/web-apps/gancio.nix
@@ -44,7 +44,7 @@ in
       default = "gancio";
     };
 
-    settings = mkOption rec {
+    settings = mkOption {
       type = types.submodule {
         freeformType = settingsFormat.type;
         options = {
diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index a6b4e9d81386e..a577542c137f8 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -133,10 +133,11 @@ let
 
   envFile = pkgs.writeText "mastodon.env" (
     lib.concatMapStrings (s: s + "\n") (
-      (lib.concatLists (
+      lib.concatLists (
         lib.mapAttrsToList (name: value: lib.optional (value != null) ''${name}="${toString value}"'') env
-      ))
+      )
     )
+
   );
 
   mastodonTootctl =
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 48cb600b94d2b..95022fb727ebb 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -293,7 +293,7 @@ let
         'apps_paths' => [
           ${concatStrings (mapAttrsToList mkAppStoreConfig appStores)}
         ],
-        ${optionalString (showAppStoreSetting) "'appstoreenabled' => ${renderedAppStoreSetting},"}
+        ${optionalString showAppStoreSetting "'appstoreenabled' => ${renderedAppStoreSetting},"}
         ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"}
         ${optionalString (c.dbname != null) "'dbname' => '${c.dbname}',"}
         ${optionalString (c.dbhost != null) "'dbhost' => '${c.dbhost}',"}
@@ -1407,13 +1407,13 @@ in
       services.nextcloud = {
         caching.redis = lib.mkIf cfg.configureRedis true;
         settings = mkMerge [
-          ({
+          {
             datadirectory = lib.mkDefault "${datadir}/data";
             trusted_domains = [ cfg.hostName ];
             "upgrade.disable-web" = true;
             # NixOS already provides its own integrity check and the nix store is read-only, therefore Nextcloud does not need to do its own integrity checks.
             "integrity.check.disabled" = true;
-          })
+          }
           (lib.mkIf cfg.configureRedis {
             "memcache.distributed" = ''\OC\Memcache\Redis'';
             "memcache.locking" = ''\OC\Memcache\Redis'';
diff --git a/nixos/modules/services/web-apps/nifi.nix b/nixos/modules/services/web-apps/nifi.nix
index a59e5066cf48b..2ab94daa5738d 100644
--- a/nixos/modules/services/web-apps/nifi.nix
+++ b/nixos/modules/services/web-apps/nifi.nix
@@ -19,10 +19,11 @@ let
 
   envFile = pkgs.writeText "nifi.env" (
     lib.concatMapStrings (s: s + "\n") (
-      (lib.concatLists (
+      lib.concatLists (
         lib.mapAttrsToList (name: value: lib.optional (value != null) ''${name}="${toString value}"'') env
-      ))
+      )
     )
+
   );
 
   nifiEnv = pkgs.writeShellScriptBin "nifi-env" ''
diff --git a/nixos/modules/services/web-apps/oncall.nix b/nixos/modules/services/web-apps/oncall.nix
index cd842606f2786..98ddae259e7a8 100644
--- a/nixos/modules/services/web-apps/oncall.nix
+++ b/nixos/modules/services/web-apps/oncall.nix
@@ -106,10 +106,10 @@ in
 
     # Disable debug, only needed for development
     services.oncall.settings = lib.mkMerge [
-      ({
+      {
         debug = lib.mkDefault false;
         auth.debug = lib.mkDefault false;
-      })
+      }
     ];
 
     services.uwsgi = {
diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix
index 6225c7ff82085..201ac5f4dc239 100644
--- a/nixos/modules/services/web-apps/peertube.nix
+++ b/nixos/modules/services/web-apps/peertube.nix
@@ -68,10 +68,11 @@ let
 
   envFile = pkgs.writeText "peertube.env" (
     lib.concatMapStrings (s: s + "\n") (
-      (lib.concatLists (
+      lib.concatLists (
         lib.mapAttrsToList (name: value: lib.optional (value != null) ''${name}="${toString value}"'') env
-      ))
+      )
     )
+
   );
 
   peertubeEnv = pkgs.writeShellScriptBin "peertube-env" ''
diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix
index 185d4cdd1cd2f..9c51d10f8b4e5 100644
--- a/nixos/modules/services/web-apps/pixelfed.nix
+++ b/nixos/modules/services/web-apps/pixelfed.nix
@@ -243,7 +243,7 @@ in
 
     services.redis.servers.pixelfed.enable = lib.mkIf cfg.redis.createLocally true;
     services.pixelfed.settings = mkMerge [
-      ({
+      {
         APP_ENV = mkDefault "production";
         APP_DEBUG = mkDefault false;
         # https://github.com/pixelfed/pixelfed/blob/dev/app/Console/Commands/Installer.php#L312-L316
@@ -270,7 +270,7 @@ in
         LOG_CHANNEL = mkDefault "stderr";
         # TODO: find out the correct syntax?
         # TRUST_PROXIES = mkDefault "127.0.0.1/8, ::1/128";
-      })
+      }
       (mkIf (cfg.redis.createLocally) {
         BROADCAST_DRIVER = mkDefault "redis";
         CACHE_DRIVER = mkDefault "redis";
diff --git a/nixos/modules/services/web-apps/sftpgo.nix b/nixos/modules/services/web-apps/sftpgo.nix
index 2a76ccc179779..8f767b85162c7 100644
--- a/nixos/modules/services/web-apps/sftpgo.nix
+++ b/nixos/modules/services/web-apps/sftpgo.nix
@@ -358,7 +358,7 @@ in
       };
 
       serviceConfig = mkMerge [
-        ({
+        {
           Type = "simple";
           User = cfg.user;
           Group = cfg.group;
@@ -397,7 +397,7 @@ in
             "~@privileged"
           ];
           UMask = "0077";
-        })
+        }
         (mkIf hasPrivilegedPorts {
           AmbientCapabilities = "CAP_NET_BIND_SERVICE";
         })
diff --git a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix
index 43b24fdc4a96b..1face1eae84b4 100644
--- a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix
@@ -37,7 +37,7 @@ in
     listen = mkOption {
       type =
         with types;
-        listOf (submodule ({
+        listOf (submodule {
           options = {
             port = mkOption {
               type = types.port;
@@ -54,7 +54,7 @@ in
               description = "Whether to enable SSL (https) support.";
             };
           };
-        }));
+        });
       default = [ ];
       example = [
         {
diff --git a/nixos/modules/services/web-servers/hitch/default.nix b/nixos/modules/services/web-servers/hitch/default.nix
index baec5a34eb567..63c490acf46ec 100644
--- a/nixos/modules/services/web-servers/hitch/default.nix
+++ b/nixos/modules/services/web-servers/hitch/default.nix
@@ -11,11 +11,11 @@ let
     with lib;
     pkgs.writeText "hitch.conf" (
       concatStringsSep "\n" [
-        ("backend = \"${cfg.backend}\"")
+        "backend = \"${cfg.backend}\""
         (concatMapStrings (s: "frontend = \"${s}\"\n") cfg.frontend)
         (concatMapStrings (s: "pem-file = \"${s}\"\n") cfg.pem-files)
-        ("ciphers = \"${cfg.ciphers}\"")
-        ("ocsp-dir = \"${ocspDir}\"")
+        "ciphers = \"${cfg.ciphers}\""
+        "ocsp-dir = \"${ocspDir}\""
         "user = \"${cfg.user}\""
         "group = \"${cfg.group}\""
         cfg.extraConfig
diff --git a/nixos/modules/services/web-servers/pomerium.nix b/nixos/modules/services/web-servers/pomerium.nix
index 93b04425435d5..4695c0e3ccc0b 100644
--- a/nixos/modules/services/web-servers/pomerium.nix
+++ b/nixos/modules/services/web-servers/pomerium.nix
@@ -66,7 +66,7 @@ in
       cfgFile =
         if cfg.configFile != null then cfg.configFile else (format.generate "pomerium.yaml" cfg.settings);
     in
-    mkIf cfg.enable ({
+    mkIf cfg.enable {
       systemd.services.pomerium = {
         description = "Pomerium authenticating reverse proxy";
         wants = [
@@ -150,5 +150,5 @@ in
           ExecStart = "/run/current-system/systemd/bin/systemctl --no-block restart pomerium.service";
         };
       };
-    });
+    };
 }
diff --git a/nixos/modules/services/web-servers/ttyd.nix b/nixos/modules/services/web-servers/ttyd.nix
index 01baa3b22fa3a..eb3c2b918ec21 100644
--- a/nixos/modules/services/web-servers/ttyd.nix
+++ b/nixos/modules/services/web-servers/ttyd.nix
@@ -77,7 +77,7 @@ in
 
   options = {
     services.ttyd = {
-      enable = lib.mkEnableOption ("ttyd daemon");
+      enable = lib.mkEnableOption "ttyd daemon";
 
       port = mkOption {
         type = types.port;
diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index c3d4e018812d0..fcccdf6fb7999 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -42,7 +42,7 @@ let
     inherit flashbackEnabled nixos-background-dark nixos-background-light;
   };
 
-  nixos-background-info = pkgs.writeTextFile rec {
+  nixos-background-info = pkgs.writeTextFile {
     name = "nixos-background-info";
     text = ''
       <?xml version="1.0"?>
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index 165cbea6574a1..83c7d9e4e9d51 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
@@ -7,8 +7,6 @@
 
 { lib, pkgs, ... }:
 
-with lib;
-
 {
 
   config = {
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 1419a63544804..1e4a531bee1e1 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -770,7 +770,7 @@ in
             || config.services.displayManager.ly.enable
           );
       in
-      mkIf (default) (mkDefault true);
+      mkIf default (mkDefault true);
 
     services.xserver.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];
 
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index efa637ef5abff..5870093c32e5a 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -68,7 +68,7 @@ let
       # Ensure a consistent umask.
       umask 0022
 
-      ${textClosureMap id (withDrySnippets) (attrNames withDrySnippets)}
+      ${textClosureMap id withDrySnippets (attrNames withDrySnippets)}
 
     ''
     + optionalString (!onlyDry) ''
@@ -221,7 +221,7 @@ in
               set' = mapAttrs (n: v: if isString v then noDepEntry v else v) set;
               withHeadlines = addAttributeName set';
             in
-            textClosureMap id (withHeadlines) (attrNames withHeadlines)
+            textClosureMap id withHeadlines (attrNames withHeadlines)
           }
 
           exit $_status
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
index 5dfa85e4cd4cb..56e9629272218 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -403,14 +403,14 @@ in
     );
 
     systemd = lib.mkMerge [
-      ({
+      {
         tmpfiles.rules = [
           "d /run/binfmt 0755 -"
         ]
         ++ lib.mapAttrsToList (name: interpreter: "L+ /run/binfmt/${name} - - - - ${interpreter}") (
           lib.mapAttrs mkInterpreter config.boot.binfmt.registrations
         );
-      })
+      }
 
       (lib.mkIf (config.boot.binfmt.registrations != { }) {
         additionalUpstreamSystemUnits = [
diff --git a/nixos/modules/system/boot/clevis.nix b/nixos/modules/system/boot/clevis.nix
index 881a6452d9c93..8e8265ba1c30d 100644
--- a/nixos/modules/system/boot/clevis.nix
+++ b/nixos/modules/system/boot/clevis.nix
@@ -33,12 +33,12 @@ in
       description = "Encrypted devices that need to be unlocked at boot using Clevis";
       default = { };
       type = lib.types.attrsOf (
-        lib.types.submodule ({
+        lib.types.submodule {
           options.secretFile = lib.mkOption {
             description = "Clevis JWE file used to decrypt the device at boot, in concert with the chosen pin (one of TPM2, Tang server, or SSS).";
             type = lib.types.path;
           };
-        })
+        }
       );
     };
 
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 9c9c56f53f90e..e611d9040f8bf 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -1249,7 +1249,7 @@ in
         devicesWithClevis = filterAttrs (device: _: (hasAttr device clevis.devices)) luks.devices;
       in
       mkIf (clevis.enable && systemd.enable) (
-        (mapAttrs' (
+        mapAttrs' (
           name: _:
           nameValuePair "cryptsetup-clevis-${name}" {
             wantedBy = [ "systemd-cryptsetup@${utils.escapeSystemdPath name}.service" ];
@@ -1281,7 +1281,7 @@ in
               ExecStop = "${config.boot.initrd.systemd.package.util-linux}/bin/umount /clevis-${name}";
             };
           }
-        ) devicesWithClevis)
+        ) devicesWithClevis
       );
 
     environment.systemPackages = [ pkgs.cryptsetup ];
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index dac50203aa4e0..0d0aa2c2475bc 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -738,14 +738,14 @@ let
           "both"
           "any"
         ])
-        (assertValueOneOf "ActivationPolicy" ([
+        (assertValueOneOf "ActivationPolicy" [
           "up"
           "always-up"
           "manual"
           "always-down"
           "down"
           "bound"
-        ]))
+        ])
       ];
 
       sectionNetwork = checkUnitConfig "Network" [
diff --git a/nixos/modules/system/boot/shutdown.nix b/nixos/modules/system/boot/shutdown.nix
index 9121b695f5cd2..3d5ee0d06e549 100644
--- a/nixos/modules/system/boot/shutdown.nix
+++ b/nixos/modules/system/boot/shutdown.nix
@@ -5,8 +5,6 @@
   ...
 }:
 
-with lib;
-
 {
 
   # This unit saves the value of the system clock to the hardware
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 2fa9eb16d82be..a5061be22084a 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -628,7 +628,7 @@ in
         enabledUnits = filterAttrs (n: v: !elem n cfg.suppressedSystemUnits) cfg.units;
 
       in
-      ({
+      {
         "systemd/system".source = generateUnits {
           type = "system";
           units = enabledUnits;
@@ -689,7 +689,7 @@ in
         "systemd/user-preset/00-nixos.preset".text = ''
           ignore *
         '';
-      });
+      };
 
     services.dbus.enable = true;
 
diff --git a/nixos/modules/system/boot/systemd/sysusers.nix b/nixos/modules/system/boot/systemd/sysusers.nix
index 99c55467dce1e..c2d8b7cc373e4 100644
--- a/nixos/modules/system/boot/systemd/sysusers.nix
+++ b/nixos/modules/system/boot/systemd/sysusers.nix
@@ -183,9 +183,9 @@ in
     };
 
     environment.etc = lib.mkMerge [
-      ({
+      {
         "sysusers.d".source = sysusersConfig;
-      })
+      }
 
       # Statically create the symlinks to immutablePasswordFilesLocation when
       # using an immutable /etc because we will not be able to do it at
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 9bb216d113851..e6b354c06bf71 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -235,7 +235,7 @@ let
                     tries=3
                     success=false
                     while [[ $success != true ]] && [[ $tries -gt 0 ]]; do
-                      ${systemd}/bin/systemd-ask-password ${lib.optionalString cfgZfs.useKeyringForCredentials ("--keyname=zfs-$ds")} --timeout=${toString cfgZfs.passwordTimeout} "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" \
+                      ${systemd}/bin/systemd-ask-password ${lib.optionalString cfgZfs.useKeyringForCredentials "--keyname=zfs-$ds"} --timeout=${toString cfgZfs.passwordTimeout} "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" \
                         && success=true \
                         || tries=$((tries - 1))
                     done
diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
index e507a8c0e121f..326fdb36f0934 100644
--- a/nixos/modules/tasks/lvm.nix
+++ b/nixos/modules/tasks/lvm.nix
@@ -49,10 +49,10 @@ in
   };
 
   config = mkMerge [
-    ({
+    {
       # minimal configuration file to make lvmconfig/lvm2-activation-generator happy
       environment.etc."lvm/lvm.conf".text = "config {}";
-    })
+    }
     (mkIf cfg.enable {
       systemd.tmpfiles.packages = [ cfg.package.out ];
       environment.systemPackages = [ cfg.package ];
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 8e9e0e9e3b2f3..3eb60ad88a1e4 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -76,7 +76,7 @@ let
 
   interfaceNetworks = mkMerge (
     forEach interfaces (i: {
-      netdevs = mkIf i.virtual ({
+      netdevs = mkIf i.virtual {
         "40-${i.name}" = {
           netdevConfig = {
             Name = i.name;
@@ -86,7 +86,7 @@ let
             User = i.virtualOwner;
           };
         };
-      });
+      };
       networks."40-${i.name}" = {
         name = mkDefault i.name;
         DHCP = mkForce (
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index b3c0372d4e123..daad4e99e1c8d 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -469,10 +469,10 @@ let
             )
           )
 
-          ({
+          {
             options.warnings = options.warnings;
             options.assertions = options.assertions;
-          })
+          }
         ];
 
     };
diff --git a/nixos/modules/virtualisation/cloudstack-config.nix b/nixos/modules/virtualisation/cloudstack-config.nix
index bb08b68a8d39c..2e44b38b0c2de 100644
--- a/nixos/modules/virtualisation/cloudstack-config.nix
+++ b/nixos/modules/virtualisation/cloudstack-config.nix
@@ -1,7 +1,5 @@
 { lib, pkgs, ... }:
 
-with lib;
-
 {
   imports = [
     ../profiles/qemu-guest.nix
diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 3b6b887664007..b24eaac5934ea 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -257,10 +257,10 @@ in
         };
       };
 
-      socketActivation = lib.mkEnableOption (''
+      socketActivation = lib.mkEnableOption ''
         socket-activation for starting incus.service. Enabling this option
         will stop incus.service from starting automatically on boot.
-      '');
+      '';
 
       startTimeout = lib.mkOption {
         type = lib.types.ints.unsigned;
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index 498044ce43c88..5a231fb5888c0 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -48,7 +48,7 @@ in
         name = "vswitch.db";
         dontUnpack = true;
         buildPhase = "true";
-        buildInputs = with pkgs; [
+        buildInputs = [
           cfg.package
         ];
         installPhase = "mkdir -p $out";
diff --git a/nixos/modules/virtualisation/vmware-host.nix b/nixos/modules/virtualisation/vmware-host.nix
index cb7156b740474..bda91c10ba32e 100644
--- a/nixos/modules/virtualisation/vmware-host.nix
+++ b/nixos/modules/virtualisation/vmware-host.nix
@@ -44,7 +44,7 @@ in
       package = mkPackageOption pkgs "vmware-workstation" { };
       extraPackages = mkOption {
         type = with types; listOf package;
-        default = with pkgs; [ ];
+        default = [ ];
         description = "Extra packages to be used with VMware host.";
         example = "with pkgs; [ ntfs3g ]";
       };
@@ -115,7 +115,7 @@ in
         # We want to place the tmpdirs for the wrappers to the parent dir.
         wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
         chmod a+rx "$wrapperDir"
-        ${lib.concatStringsSep "\n" (vmwareWrappers)}
+        ${lib.concatStringsSep "\n" vmwareWrappers}
         if [ -L ${wrapperDir} ]; then
           # Atomically replace the symlink
           # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 79b2abdc17af9..e5a393b59db1f 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -64,7 +64,7 @@ rec {
       name = "nixos-${nixos.channel.version}";
       meta = {
         description = "Release-critical builds for the NixOS channel";
-        maintainers = with pkgs.lib.maintainers; [ ];
+        maintainers = [ ];
       };
       constituents = pkgs.lib.concatLists [
         [ "nixos.channel" ]
diff --git a/nixos/tests/clickhouse.nix b/nixos/tests/clickhouse.nix
index 80868c04e9e43..ede28e4578cab 100644
--- a/nixos/tests/clickhouse.nix
+++ b/nixos/tests/clickhouse.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { pkgs, ... }:
   {
     name = "clickhouse";
-    meta.maintainers = with pkgs.lib.maintainers; [ ];
+    meta.maintainers = [ ];
 
     nodes.machine = {
       services.clickhouse.enable = true;
diff --git a/nixos/tests/corerad.nix b/nixos/tests/corerad.nix
index 3795cdd417571..5871d6aaef172 100644
--- a/nixos/tests/corerad.nix
+++ b/nixos/tests/corerad.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({
+import ./make-test-python.nix {
   name = "corerad";
   nodes = {
     router =
@@ -97,4 +97,4 @@ import ./make-test-python.nix ({
             "corerad_build_info" in out
         ), "Build info metric was not found in Prometheus output"
   '';
-})
+}
diff --git a/nixos/tests/cosmic.nix b/nixos/tests/cosmic.nix
index 00b1f478d81e7..d98486af20975 100644
--- a/nixos/tests/cosmic.nix
+++ b/nixos/tests/cosmic.nix
@@ -69,7 +69,7 @@
       #testName: ${testName}
     ''
     + (
-      if (enableAutologin) then
+      if enableAutologin then
         ''
           with subtest("cosmic-greeter initialisation"):
               machine.wait_for_unit("graphical.target", timeout=120)
diff --git a/nixos/tests/curl-impersonate.nix b/nixos/tests/curl-impersonate.nix
index 28e741a2e19f0..8ecd0dd55fd74 100644
--- a/nixos/tests/curl-impersonate.nix
+++ b/nixos/tests/curl-impersonate.nix
@@ -134,7 +134,7 @@ import ./make-test-python.nix (
   {
     name = "curl-impersonate";
 
-    meta = with lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/documize.nix b/nixos/tests/documize.nix
index 1537047ad6799..5a82a8246fe7a 100644
--- a/nixos/tests/documize.nix
+++ b/nixos/tests/documize.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { pkgs, lib, ... }:
   {
     name = "documize";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index b83d7e150207e..4285a703eee10 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -33,7 +33,7 @@ let
 
           # Needed by nixos-rebuild due to the lack of network
           # access. Determined by trial and error.
-          system.extraDependencies = with pkgs; ([
+          system.extraDependencies = with pkgs; [
             # Needed for a nixos-rebuild.
             busybox
             cloud-utils
@@ -53,7 +53,7 @@ let
             apacheHttpd.doc
             apacheHttpd.man
             valgrind.doc
-          ]);
+          ];
 
           nixpkgs.pkgs = pkgs;
         }
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
index 719480da2e724..48e505f24c7cd 100644
--- a/nixos/tests/elk.nix
+++ b/nixos/tests/elk.nix
@@ -15,7 +15,7 @@ let
 
   mkElkTest =
     name: elk:
-    import ./make-test-python.nix ({
+    import ./make-test-python.nix {
       inherit name;
       meta = with pkgs.lib.maintainers; {
         maintainers = [
@@ -49,7 +49,7 @@ let
               journalbeat = {
                 enable = elk ? journalbeat;
                 package = elk.journalbeat;
-                extraConfig = pkgs.lib.mkOptionDefault (''
+                extraConfig = pkgs.lib.mkOptionDefault ''
                   logging:
                     to_syslog: true
                     level: warning
@@ -59,7 +59,7 @@ let
                   journalbeat.inputs:
                   - paths: []
                     seek: cursor
-                '');
+                '';
               };
 
               filebeat = {
@@ -276,7 +276,7 @@ let
                   '! curl --silent --show-error --fail-with-body "${esUrl}/_cat/indices" | grep logstash | grep ^'
               )
         '';
-    }) { inherit pkgs system; };
+    } { inherit pkgs system; };
 in
 {
   # We currently only package upstream binaries.
diff --git a/nixos/tests/etesync-dav.nix b/nixos/tests/etesync-dav.nix
index d940e65611851..ced42151e1369 100644
--- a/nixos/tests/etesync-dav.nix
+++ b/nixos/tests/etesync-dav.nix
@@ -3,7 +3,7 @@ import ./make-test-python.nix (
   {
 
     name = "etesync-dav";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/fcitx5/default.nix b/nixos/tests/fcitx5/default.nix
index 44fc4913e28da..1a8710f81c943 100644
--- a/nixos/tests/fcitx5/default.nix
+++ b/nixos/tests/fcitx5/default.nix
@@ -1,6 +1,6 @@
 import ../make-test-python.nix (
   { lib, ... }:
-  rec {
+  {
     name = "fcitx5";
     meta.maintainers = with lib.maintainers; [ nevivurn ];
 
diff --git a/nixos/tests/fenics.nix b/nixos/tests/fenics.nix
index bf991fed9b0cf..81223f3ed9649 100644
--- a/nixos/tests/fenics.nix
+++ b/nixos/tests/fenics.nix
@@ -30,7 +30,7 @@ import ./make-test-python.nix (
   {
     name = "fenics";
     meta = {
-      maintainers = with pkgs.lib.maintainers; [ ];
+      maintainers = [ ];
     };
 
     nodes = {
diff --git a/nixos/tests/flaresolverr.nix b/nixos/tests/flaresolverr.nix
index ba198ef74560c..8a602cbcfbbf2 100644
--- a/nixos/tests/flaresolverr.nix
+++ b/nixos/tests/flaresolverr.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { lib, ... }:
   {
     name = "flaresolverr";
-    meta.maintainers = with lib.maintainers; [ ];
+    meta.maintainers = [ ];
 
     nodes.machine =
       { pkgs, ... }:
diff --git a/nixos/tests/frr.nix b/nixos/tests/frr.nix
index 21e61bd768aa4..a35e6a53ada85 100644
--- a/nixos/tests/frr.nix
+++ b/nixos/tests/frr.nix
@@ -33,7 +33,7 @@ import ./make-test-python.nix (
   {
     name = "frr";
 
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/google-oslogin/default.nix b/nixos/tests/google-oslogin/default.nix
index e309f0245b503..7a9d705a6f9bd 100644
--- a/nixos/tests/google-oslogin/default.nix
+++ b/nixos/tests/google-oslogin/default.nix
@@ -15,7 +15,7 @@ import ../make-test-python.nix (
   in
   {
     name = "google-oslogin";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/gotify-server.nix b/nixos/tests/gotify-server.nix
index 55f5fe6468f5e..9346250190e8f 100644
--- a/nixos/tests/gotify-server.nix
+++ b/nixos/tests/gotify-server.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { pkgs, lib, ... }:
   {
     name = "gotify-server";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/greetd-no-shadow.nix b/nixos/tests/greetd-no-shadow.nix
index 0bbf4faa3d9c0..42927ea0ad9b3 100644
--- a/nixos/tests/greetd-no-shadow.nix
+++ b/nixos/tests/greetd-no-shadow.nix
@@ -6,7 +6,7 @@ import ./make-test-python.nix (
   }:
   {
     name = "greetd-no-shadow";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/gvisor.nix b/nixos/tests/gvisor.nix
index 905abaeedc62e..752782895b937 100644
--- a/nixos/tests/gvisor.nix
+++ b/nixos/tests/gvisor.nix
@@ -4,7 +4,7 @@ import ./make-test-python.nix (
   { pkgs, ... }:
   {
     name = "gvisor";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/hbase.nix b/nixos/tests/hbase.nix
index 12afa3a2d2210..1e9e499bada0c 100644
--- a/nixos/tests/hbase.nix
+++ b/nixos/tests/hbase.nix
@@ -23,7 +23,7 @@ import ./make-test-python.nix (
             # This setting and standalone mode are not suitable for production
             settings."hbase.unsafe.stream.capability.enforce" = "false";
           };
-          environment.systemPackages = with pkgs; [
+          environment.systemPackages = [
             package
           ];
         };
diff --git a/nixos/tests/hledger-web.nix b/nixos/tests/hledger-web.nix
index fcb3c7f656aa3..e60cce3cc7f29 100644
--- a/nixos/tests/hledger-web.nix
+++ b/nixos/tests/hledger-web.nix
@@ -10,7 +10,7 @@ import ./make-test-python.nix (
           assets:cash                -250$
     '';
   in
-  rec {
+  {
     name = "hledger-web";
     meta.maintainers = with lib.maintainers; [ marijanp ];
 
diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix
index 2dc0e850c066c..5741f23d11b01 100644
--- a/nixos/tests/installed-tests/default.nix
+++ b/nixos/tests/installed-tests/default.nix
@@ -38,7 +38,7 @@ let
     }@args:
     makeTest (
       recursiveUpdate
-        rec {
+        {
           name = tested.name;
 
           meta = {
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 89ba355a9c84e..21d523e9a7d70 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -669,7 +669,7 @@ let
             virtualisation.diskImage = "./target.qcow2";
 
             # and the same TPM options
-            virtualisation.qemu.options = mkIf (clevisTest) [
+            virtualisation.qemu.options = mkIf clevisTest [
               "-chardev socket,id=chrtpm,path=$NIX_BUILD_TOP/swtpm-sock"
               "-tpmdev emulator,id=tpm0,chardev=chrtpm"
               "-device tpm-tis,tpmdev=tpm0"
@@ -1056,7 +1056,7 @@ let
           "echo -n password | zfs create"
           + " -o encryption=aes-256-gcm -o keyformat=passphrase rpool/root",
         ''
-        + optionalString (parentDataset) ''
+        + optionalString parentDataset ''
           "echo -n password | zpool create -O mountpoint=none -O encryption=on -O keyformat=passphrase rpool /dev/vda3",
           "zfs create -o mountpoint=legacy rpool/root",
         ''
@@ -1071,7 +1071,7 @@ let
           optionalString (!parentDataset) ''
             boot.initrd.clevis.devices."rpool/root".secretFile = "/etc/nixos/clevis-secret.jwe";
           ''
-          + optionalString (parentDataset) ''
+          + optionalString parentDataset ''
             boot.initrd.clevis.devices."rpool".secretFile = "/etc/nixos/clevis-secret.jwe";
           ''
           + ''
diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix
index cc0bf895c5e36..fd765a0e5a004 100644
--- a/nixos/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
@@ -5,7 +5,7 @@ import ./make-test-python.nix (
   { pkgs, lib, ... }:
   {
     name = "ipv6";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/iscsi-multipath-root.nix b/nixos/tests/iscsi-multipath-root.nix
index 56f9e1ae7cc18..963c63fac055f 100644
--- a/nixos/tests/iscsi-multipath-root.nix
+++ b/nixos/tests/iscsi-multipath-root.nix
@@ -151,12 +151,12 @@ import ./make-test-python.nix (
           boot.initrd.network.enable = true;
           boot.loader.grub.enable = false;
 
-          boot.kernelParams = lib.mkOverride 5 ([
+          boot.kernelParams = lib.mkOverride 5 [
             "boot.shell_on_fail"
             "console=tty1"
             "ip=192.168.1.1:::255.255.255.0::ens9:none"
             "ip=192.168.2.1:::255.255.255.0::ens10:none"
-          ]);
+          ];
 
           # defaults to true, puts some code in the initrd that tries to mount an overlayfs on /nix/store
           virtualisation.writableStore = false;
diff --git a/nixos/tests/iscsi-root.nix b/nixos/tests/iscsi-root.nix
index ab0ab9f89e9b7..63c0758cf98b8 100644
--- a/nixos/tests/iscsi-root.nix
+++ b/nixos/tests/iscsi-root.nix
@@ -125,11 +125,11 @@ import ./make-test-python.nix (
         }:
         {
           boot.loader.grub.enable = false;
-          boot.kernelParams = lib.mkOverride 5 ([
+          boot.kernelParams = lib.mkOverride 5 [
             "boot.shell_on_fail"
             "console=tty1"
             "ip=${config.networking.primaryIPAddress}:::255.255.255.0::eth1:none"
-          ]);
+          ];
 
           # defaults to true, puts some code in the initrd that tries to mount an overlayfs on /nix/store
           virtualisation.writableStore = false;
diff --git a/nixos/tests/isso.nix b/nixos/tests/isso.nix
index f3af293bf75bb..b49c986142b61 100644
--- a/nixos/tests/isso.nix
+++ b/nixos/tests/isso.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { pkgs, ... }:
   {
     name = "isso";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/jenkins-cli.nix b/nixos/tests/jenkins-cli.nix
index fdd2767cf0419..5b7789fff6133 100644
--- a/nixos/tests/jenkins-cli.nix
+++ b/nixos/tests/jenkins-cli.nix
@@ -1,6 +1,6 @@
 import ./make-test-python.nix (
   { pkgs, ... }:
-  rec {
+  {
     name = "jenkins-cli";
     meta = with pkgs.lib.maintainers; {
       maintainers = [ pamplemousse ];
diff --git a/nixos/tests/kafka/base.nix b/nixos/tests/kafka/base.nix
index 961511525cdd3..c134f4139b71c 100644
--- a/nixos/tests/kafka/base.nix
+++ b/nixos/tests/kafka/base.nix
@@ -9,7 +9,7 @@ let
       kafkaPackage,
       mode ? "kraft",
     }:
-    (import ../make-test-python.nix ({
+    (import ../make-test-python.nix {
       inherit name;
       meta = with pkgs.lib.maintainers; {
         maintainers = [ nequissimus ];
@@ -20,7 +20,7 @@ let
           { ... }:
           {
             services.apache-kafka = mkMerge [
-              ({
+              {
                 enable = true;
                 package = kafkaPackage;
                 settings = {
@@ -30,7 +30,7 @@ let
                     "/var/lib/kafka/logdir2"
                   ];
                 };
-              })
+              }
               (mkIf (mode == "zookeeper") {
                 settings = {
                   "zookeeper.session.timeout.ms" = 600000;
@@ -113,7 +113,7 @@ let
             + "--from-beginning --max-messages 1"
         )
       '';
-    }));
+    });
 
 in
 with pkgs;
diff --git a/nixos/tests/locate.nix b/nixos/tests/locate.nix
index ce66d7fd3afc4..75e2a3bbf01b4 100644
--- a/nixos/tests/locate.nix
+++ b/nixos/tests/locate.nix
@@ -7,7 +7,7 @@ import ./make-test-python.nix (
     name = "locate";
     meta.maintainers = with pkgs.lib.maintainers; [ chkno ];
 
-    nodes = rec {
+    nodes = {
       a = {
         environment.systemPackages = with pkgs; [ sshfs ];
         virtualisation.fileSystems = {
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index acfb270193abf..c607420c9ab1c 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -7,7 +7,7 @@ import ./make-test-python.nix (
 
   {
     name = "login";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix
index 1bb78e0e7c91f..9081dbadc5c0f 100644
--- a/nixos/tests/lomiri.nix
+++ b/nixos/tests/lomiri.nix
@@ -99,7 +99,7 @@ let
         "lomiri-shell.service"
       ];
     in
-    rec {
+    {
       description = "Set Lomiri wallpaper to something OCR-able";
       wantedBy = lomiriServices;
       before = lomiriServices;
@@ -807,49 +807,49 @@ in
   ];
   details = [
     # messages normally has no contents
-    ({
+    {
       name = "display";
       left = 6;
       ocr = [ "Lock" ];
-    })
-    ({
+    }
+    {
       name = "bluetooth";
       left = 5;
       ocr = [ "Bluetooth" ];
-    })
-    ({
+    }
+    {
       name = "network";
       left = 4;
       ocr = [
         "Flight"
         "Wi-Fi"
       ];
-    })
-    ({
+    }
+    {
       name = "sound";
       left = 3;
       ocr = [
         "Silent"
         "Volume"
       ];
-    })
-    ({
+    }
+    {
       name = "power";
       left = 2;
       ocr = [
         "Charge"
         "Battery"
       ];
-    })
-    ({
+    }
+    {
       name = "datetime";
       left = 1;
       ocr = [
         "Time"
         "Date"
       ];
-    })
-    ({
+    }
+    {
       name = "session";
       left = 0;
       ocr = [ "Log Out" ];
@@ -859,6 +859,6 @@ in
         mouse_click(400, 240) # confirm logout
         machine.wait_until_fails("pgrep -u ${user} -f 'lomiri --mode=full-shell'")
       '';
-    })
+    }
   ];
 }
diff --git a/nixos/tests/lxc/default.nix b/nixos/tests/lxc/default.nix
index 0f67010863efc..a5578b7cfad5c 100644
--- a/nixos/tests/lxc/default.nix
+++ b/nixos/tests/lxc/default.nix
@@ -57,7 +57,7 @@ import ../make-test-python.nix (
         };
 
         # Needed for lxc
-        environment.systemPackages = with pkgs; [
+        environment.systemPackages = [
           pkgs.wget
           pkgs.dnsmasq
         ];
diff --git a/nixos/tests/mod_perl.nix b/nixos/tests/mod_perl.nix
index 677f2bcbc969f..793ffb90f2886 100644
--- a/nixos/tests/mod_perl.nix
+++ b/nixos/tests/mod_perl.nix
@@ -36,7 +36,7 @@ import ./make-test-python.nix (
               '';
               startup = pkgs.writeScript "startup.pl" ''
                 use lib "${inc}",
-                  split ":","${with pkgs.perl.pkgs; makeFullPerlPath ([ mod_perl2 ])}";
+                  split ":","${with pkgs.perl.pkgs; makeFullPerlPath [ mod_perl2 ]}";
                 1;
               '';
             in
diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix
index 4592bffec9e3d..3d315e3b984ba 100644
--- a/nixos/tests/networking-proxy.nix
+++ b/nixos/tests/networking-proxy.nix
@@ -15,7 +15,7 @@ import ./make-test-python.nix (
   { pkgs, ... }:
   {
     name = "networking-proxy";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/nfs/simple.nix b/nixos/tests/nfs/simple.nix
index a36270dda535f..3f2b8d3bbb1ce 100644
--- a/nixos/tests/nfs/simple.nix
+++ b/nixos/tests/nfs/simple.nix
@@ -25,7 +25,7 @@ import ../make-test-python.nix (
 
   {
     name = "nfs";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/nixops/default.nix b/nixos/tests/nixops/default.nix
index f389cd0d0b51a..13b9d9dfbe077 100644
--- a/nixos/tests/nixops/default.nix
+++ b/nixos/tests/nixops/default.nix
@@ -23,7 +23,7 @@ let
 
   testLegacyNetwork =
     { nixopsPkg, ... }:
-    pkgs.testers.nixosTest ({
+    pkgs.testers.nixosTest {
       name = "nixops-legacy-network";
       nodes = {
         deployer =
@@ -105,7 +105,7 @@ let
 
           deployer_do("cd ~/unicorn; nixops ssh server 'hello | figlet'")
         '';
-    });
+    };
 
   inherit (import ../ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
 
diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix
index ebd2396f95a5b..0e0de1ac2460f 100644
--- a/nixos/tests/postgresql/postgresql.nix
+++ b/nixos/tests/postgresql/postgresql.nix
@@ -15,7 +15,7 @@ let
       postgresql-clauses = makeEnsureTestFor package;
     };
 
-  test-sql = pkgs.writeText "postgresql-test" (''
+  test-sql = pkgs.writeText "postgresql-test" ''
     CREATE EXTENSION pgcrypto; -- just to check if lib loading works
     CREATE TABLE sth (
       id int
@@ -38,7 +38,7 @@ let
       }
       console.log(xs.reduce((acc, x) => acc + x, 0));
     $$ LANGUAGE plv8;
-  '');
+  '';
 
   makeTestForWithBackupAll =
     package: backupAll:
diff --git a/nixos/tests/private-gpt.nix b/nixos/tests/private-gpt.nix
index f6bfda38aabf1..c253651c6162d 100644
--- a/nixos/tests/private-gpt.nix
+++ b/nixos/tests/private-gpt.nix
@@ -5,7 +5,7 @@ import ./make-test-python.nix (
   in
   {
     name = "private-gpt";
-    meta = with lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/prowlarr.nix b/nixos/tests/prowlarr.nix
index 859ce58b3b1ba..3e7c294db94a1 100644
--- a/nixos/tests/prowlarr.nix
+++ b/nixos/tests/prowlarr.nix
@@ -3,7 +3,7 @@ import ./make-test-python.nix (
 
   {
     name = "prowlarr";
-    meta.maintainers = with lib.maintainers; [ ];
+    meta.maintainers = [ ];
 
     nodes.machine =
       { pkgs, ... }:
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index beba1d8435923..e67a0cc20dfe5 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -15,7 +15,7 @@ import ./make-test-python.nix (
   in
   {
     name = "proxy";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/qemu-vm-restrictnetwork.nix b/nixos/tests/qemu-vm-restrictnetwork.nix
index 9249f0cc12695..bba3e61beecd8 100644
--- a/nixos/tests/qemu-vm-restrictnetwork.nix
+++ b/nixos/tests/qemu-vm-restrictnetwork.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({
+import ./make-test-python.nix {
   name = "qemu-vm-restrictnetwork";
 
   nodes = {
@@ -39,4 +39,4 @@ import ./make-test-python.nix ({
       unrestricted.succeed("curl -s http://10.0.2.2:8000")
       restricted.fail("curl -s http://10.0.2.2:8000")
   '';
-})
+}
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index cade2991de613..5dae18ea94618 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -35,7 +35,7 @@ import ./make-test-python.nix (
 
   in
 
-  rec {
+  {
     name = "quake3";
     meta = with lib.maintainers; {
       maintainers = [ domenkozar ];
diff --git a/nixos/tests/scion/freestanding-deployment/default.nix b/nixos/tests/scion/freestanding-deployment/default.nix
index 7dbd10c225a5e..8edbe8027f542 100644
--- a/nixos/tests/scion/freestanding-deployment/default.nix
+++ b/nixos/tests/scion/freestanding-deployment/default.nix
@@ -9,7 +9,7 @@ import ../../make-test-python.nix (
     } (builtins.readFile ./bootstrap.sh);
 
     imports = hostId: [
-      ({
+      {
         services.scion = {
           enable = true;
           bypassBootstrapWarning = true;
@@ -32,7 +32,7 @@ import ../../make-test-python.nix (
         environment.systemPackages = [
           pkgs.scion
         ];
-      })
+      }
     ];
   in
   {
diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix
index 0c2eeb8dbf665..ef98e715986f6 100644
--- a/nixos/tests/simple.nix
+++ b/nixos/tests/simple.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({
+import ./make-test-python.nix {
   name = "simple";
 
   nodes.machine = { };
@@ -8,4 +8,4 @@ import ./make-test-python.nix ({
     machine.wait_for_unit("multi-user.target")
     machine.shutdown()
   '';
-})
+}
diff --git a/nixos/tests/soapui.nix b/nixos/tests/soapui.nix
index 834369f9dcc72..ea2ea4e04536d 100644
--- a/nixos/tests/soapui.nix
+++ b/nixos/tests/soapui.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { pkgs, ... }:
   {
     name = "soapui";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/sogo.nix b/nixos/tests/sogo.nix
index a3ad3bd5b7ac2..e57d5cf9e8ef7 100644
--- a/nixos/tests/sogo.nix
+++ b/nixos/tests/sogo.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { pkgs, ... }:
   {
     name = "sogo";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/spark/default.nix b/nixos/tests/spark/default.nix
index 9c6725d460e94..19355ef0dcb79 100644
--- a/nixos/tests/spark/default.nix
+++ b/nixos/tests/spark/default.nix
@@ -14,7 +14,7 @@ let
     };
   testSparkCluster =
     { sparkPackage, ... }:
-    pkgs.testers.nixosTest ({
+    pkgs.testers.nixosTest {
       name = "spark";
 
       nodes = {
@@ -56,6 +56,6 @@ let
         worker.succeed("spark-submit --version | systemd-cat")
         worker.succeed("spark-submit --master spark://master:7077 --executor-memory 512m --executor-cores 1 /spark_sample.py")
       '';
-    });
+    };
 in
 tests
diff --git a/nixos/tests/swayfx.nix b/nixos/tests/swayfx.nix
index 7fa5c602f520c..0e81bca6ff85a 100644
--- a/nixos/tests/swayfx.nix
+++ b/nixos/tests/swayfx.nix
@@ -3,7 +3,7 @@ import ./make-test-python.nix (
   {
     name = "swayfx";
     meta = {
-      maintainers = with lib.maintainers; [ ];
+      maintainers = [ ];
     };
 
     # testScriptWithTypes:49: error: Cannot call function of unknown type
diff --git a/nixos/tests/sympa.nix b/nixos/tests/sympa.nix
index 57284b75643eb..c040f2039e9af 100644
--- a/nixos/tests/sympa.nix
+++ b/nixos/tests/sympa.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { pkgs, lib, ... }:
   {
     name = "sympa";
-    meta.maintainers = with lib.maintainers; [ ];
+    meta.maintainers = [ ];
 
     nodes.machine =
       { ... }:
diff --git a/nixos/tests/syncthing-relay.nix b/nixos/tests/syncthing-relay.nix
index 9b44155415d29..b11e37b1acec2 100644
--- a/nixos/tests/syncthing-relay.nix
+++ b/nixos/tests/syncthing-relay.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { lib, pkgs, ... }:
   {
     name = "syncthing-relay";
-    meta.maintainers = with pkgs.lib.maintainers; [ ];
+    meta.maintainers = [ ];
 
     nodes.machine = {
       environment.systemPackages = [ pkgs.jq ];
diff --git a/nixos/tests/systemd-networkd-dhcpserver.nix b/nixos/tests/systemd-networkd-dhcpserver.nix
index 59cc2cfd52456..57f4375f28ffc 100644
--- a/nixos/tests/systemd-networkd-dhcpserver.nix
+++ b/nixos/tests/systemd-networkd-dhcpserver.nix
@@ -11,7 +11,7 @@ import ./make-test-python.nix (
   { pkgs, ... }:
   {
     name = "systemd-networkd-dhcpserver";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
     nodes = {
diff --git a/nixos/tests/tandoor-recipes.nix b/nixos/tests/tandoor-recipes.nix
index 536746e092b99..39cd59f07e9be 100644
--- a/nixos/tests/tandoor-recipes.nix
+++ b/nixos/tests/tandoor-recipes.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { lib, ... }:
   {
     name = "tandoor-recipes";
-    meta.maintainers = with lib.maintainers; [ ];
+    meta.maintainers = [ ];
 
     nodes.machine =
       { pkgs, ... }:
diff --git a/nixos/tests/tigervnc.nix b/nixos/tests/tigervnc.nix
index 05e4366045f28..4774198f5b148 100644
--- a/nixos/tests/tigervnc.nix
+++ b/nixos/tests/tigervnc.nix
@@ -7,7 +7,7 @@
 with import ../lib/testing-python.nix { inherit system pkgs; };
 makeTest {
   name = "tigervnc";
-  meta = with pkgs.lib.maintainers; {
+  meta = {
     maintainers = [ ];
   };
 
diff --git a/nixos/tests/timezone.nix b/nixos/tests/timezone.nix
index 86de47204ae89..7eaeebabc7e3f 100644
--- a/nixos/tests/timezone.nix
+++ b/nixos/tests/timezone.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { pkgs, ... }:
   {
     name = "timezone";
-    meta.maintainers = with pkgs.lib.maintainers; [ ];
+    meta.maintainers = [ ];
 
     nodes = {
       node_eutz =
diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix
index 3800a53ef196c..305a8316867f3 100644
--- a/nixos/tests/udisks2.nix
+++ b/nixos/tests/udisks2.nix
@@ -13,7 +13,7 @@ import ./make-test-python.nix (
 
   {
     name = "udisks2";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
 
diff --git a/nixos/tests/web-apps/phylactery.nix b/nixos/tests/web-apps/phylactery.nix
index 492d50d3d2d1f..85cb21236472b 100644
--- a/nixos/tests/web-apps/phylactery.nix
+++ b/nixos/tests/web-apps/phylactery.nix
@@ -6,7 +6,7 @@ import ../make-test-python.nix (
     nodes.machine =
       { ... }:
       {
-        services.phylactery = rec {
+        services.phylactery = {
           enable = true;
           port = 8080;
           library = "/tmp";
diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix
index a9dcdab805184..6926a6a41cfd3 100644
--- a/nixos/tests/xmpp/ejabberd.nix
+++ b/nixos/tests/xmpp/ejabberd.nix
@@ -11,7 +11,7 @@ import ../make-test-python.nix (
   { pkgs, ... }:
   {
     name = "ejabberd";
-    meta = with pkgs.lib.maintainers; {
+    meta = {
       maintainers = [ ];
     };
     nodes = {
diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix
index fdf598a874674..13f66bf036650 100644
--- a/nixos/tests/xrdp.nix
+++ b/nixos/tests/xrdp.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   name = "xrdp";
-  meta = with pkgs.lib.maintainers; {
+  meta = {
     maintainers = [ ];
   };
 
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index 12d9b23886f15..470d256ba5157 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -214,12 +214,12 @@ in
     kernelPackages = pkgs.linuxPackages;
   };
 
-  unstable = makeZfsTest rec {
+  unstable = makeZfsTest {
     zfsPackage = pkgs.zfs_unstable;
     kernelPackages = pkgs.linuxPackages;
   };
 
-  unstableWithSystemdStage1 = makeZfsTest rec {
+  unstableWithSystemdStage1 = makeZfsTest {
     zfsPackage = pkgs.zfs_unstable;
     kernelPackages = pkgs.linuxPackages;
     enableSystemdStage1 = true;
diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix
index fe3dd44a25e2e..09154f3f28fe3 100644
--- a/nixos/tests/zsh-history.nix
+++ b/nixos/tests/zsh-history.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   name = "zsh-history";
-  meta = with pkgs.lib.maintainers; {
+  meta = {
     maintainers = [ ];
   };
 
diff --git a/pkgs/applications/audio/bucklespring/default.nix b/pkgs/applications/audio/bucklespring/default.nix
index d853c16748b41..c2528e590c167 100644
--- a/pkgs/applications/audio/bucklespring/default.nix
+++ b/pkgs/applications/audio/bucklespring/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     openal
     alure
   ]
-  ++ optionals (legacy) [
+  ++ optionals legacy [
     libXtst
     libX11
   ]
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index bd04b9d214f6d..04b87d15b97d8 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -96,14 +96,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   # gst_plugins needed for setup-hooks
   ++ gst_plugins
-  ++ lib.optionals (withIpod) [
+  ++ lib.optionals withIpod [
     libgpod
     libplist
     usbmuxd
   ]
-  ++ lib.optionals (withMTP) [ libmtp ]
-  ++ lib.optionals (withCD) [ libcdio ]
-  ++ lib.optionals (withCloud) [ sparsehash ];
+  ++ lib.optionals withMTP [ libmtp ]
+  ++ lib.optionals withCD [ libcdio ]
+  ++ lib.optionals withCloud [ sparsehash ];
 
   postPatch = ''
     sed -i src/CMakeLists.txt \
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index d7c6027683e2f..cb5a65cc1496c 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -88,14 +88,14 @@ python3.pkgs.buildPythonApplication {
     libmodplug
     libsoup_3
   ]
-  ++ lib.optionals (withXineBackend) [ xine-lib ]
-  ++ lib.optionals (withGstreamerBackend) (
+  ++ lib.optionals withXineBackend [ xine-lib ]
+  ++ lib.optionals withGstreamerBackend (
     with gst_all_1;
     [
       gst-plugins-base
       gstreamer
     ]
-    ++ lib.optionals (withGstPlugins) [
+    ++ lib.optionals withGstPlugins [
       gst-libav
       gst-plugins-bad
       gst-plugins-good
diff --git a/pkgs/applications/display-managers/greetd/default.nix b/pkgs/applications/display-managers/greetd/default.nix
index 2a2c908d4499e..9e0134d8e8d4a 100644
--- a/pkgs/applications/display-managers/greetd/default.nix
+++ b/pkgs/applications/display-managers/greetd/default.nix
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://sr.ht/~kennylevinsen/greetd/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/display-managers/greetd/gtkgreet.nix b/pkgs/applications/display-managers/greetd/gtkgreet.nix
index 425e4c1790b3d..538aefd0e2d90 100644
--- a/pkgs/applications/display-managers/greetd/gtkgreet.nix
+++ b/pkgs/applications/display-managers/greetd/gtkgreet.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     description = "GTK based greeter for greetd, to be run under cage or similar";
     homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "gtkgreet";
   };
diff --git a/pkgs/applications/display-managers/greetd/tuigreet.nix b/pkgs/applications/display-managers/greetd/tuigreet.nix
index 19ca3c8b592d8..138aa5dc1d0c6 100644
--- a/pkgs/applications/display-managers/greetd/tuigreet.nix
+++ b/pkgs/applications/display-managers/greetd/tuigreet.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/apognu/tuigreet";
     changelog = "https://github.com/apognu/tuigreet/releases/tag/${version}";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "tuigreet";
   };
diff --git a/pkgs/applications/display-managers/greetd/wlgreet.nix b/pkgs/applications/display-managers/greetd/wlgreet.nix
index 9f5820148b322..3443247c860e8 100644
--- a/pkgs/applications/display-managers/greetd/wlgreet.nix
+++ b/pkgs/applications/display-managers/greetd/wlgreet.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "wlgreet";
     homepage = "https://git.sr.ht/~kennylevinsen/wlgreet";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix
index 17b3cabb837d4..68ed830b3eed8 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix
@@ -100,7 +100,7 @@ melpaBuild (
       '';
       license = lib.licenses.gpl3Plus;
       mainProgram = "cask";
-      maintainers = with lib.maintainers; [ ];
+      maintainers = [ ];
     };
   }
 )
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix
index 0d3903fb81f90..2bbfb02d7f960 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix
@@ -25,6 +25,6 @@ melpaBuild {
     homepage = "http://ethanschoonover.com/solarized";
     description = "Precision colors for machines and people; Emacs implementation";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
index 7eb5a731289ff..8fd622b2cb080 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
@@ -17,6 +17,6 @@ melpaBuild rec {
     homepage = "https://gitweb.gentoo.org/proj/ebuild-mode.git/";
     description = "Major modes for Gentoo package files";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix
index b0c6d1bcc0bfa..f4a9b8ec4abb3 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix
@@ -38,6 +38,6 @@ melpaBuild {
       values on to Emacs.
     '';
     license = lib.licenses.unlicense;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix
index c417988025891..0189c61d79e85 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix
@@ -20,6 +20,6 @@ melpaBuild {
     homepage = "https://github.com/emacsmirror/font-lock-plus";
     description = "Enhancements to standard library font-lock.el";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix
index 64e2c3ab07289..5dd1c43bff5ba 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix
@@ -19,6 +19,6 @@ melpaBuild {
     homepage = "https://github.com/ichernyshovvv/grid.el";
     description = "Library to put text data into boxes and manipulate them";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix
index 68e97c8e98ce7..54387744d8c2c 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix
@@ -19,6 +19,6 @@ melpaBuild {
     homepage = "https://emacswiki.org/emacs/Icicles";
     description = "Emacs library that enhances minibuffer completion";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
index 4d9f64c110ff2..5a1ba8b2829a4 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
@@ -34,6 +34,6 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/zbelial/lspce";
     description = "LSP Client for Emacs implemented as a module using Rust";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
index 4bdf1c124223f..638f5cd49b66d 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
@@ -22,6 +22,6 @@ melpaBuild {
     homepage = "http://emacswiki.org/emacs/RectangleMark";
     description = "Mark a rectangle of text with highlighting";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix
index 4c1f794c1ed31..141b21767c64c 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix
@@ -52,6 +52,6 @@ melpaBuild {
     homepage = "https://github.com/jcaw/voicemacs/";
     description = "Set of utilities for controlling Emacs by voice";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index c706d8ecc276a..e18623c40014c 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -88,7 +88,7 @@ let
               matthewbauer
               panchoh
             ];
-            "macport" = with lib.maintainers; [ ];
+            "macport" = [ ];
           }
           .${variant};
         platforms =
diff --git a/pkgs/applications/editors/jetbrains/bin/linux.nix b/pkgs/applications/editors/jetbrains/bin/linux.nix
index 123bf81d2dde7..1e85e6642a39c 100644
--- a/pkgs/applications/editors/jetbrains/bin/linux.nix
+++ b/pkgs/applications/editors/jetbrains/bin/linux.nix
@@ -92,14 +92,14 @@ lib.makeOverridable mkDerivation (
         fi
       fi
       echo -Djna.library.path=${
-        lib.makeLibraryPath ([
+        lib.makeLibraryPath [
           libsecret
           e2fsprogs
           libnotify
           # Required for Help -> Collect Logs
           # in at least rider and goland
           udev
-        ])
+        ]
       } >> $vmopts_file
     '';
 
diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix
index 256bc4630da0c..a48e568760244 100644
--- a/pkgs/applications/editors/kakoune/plugins/overrides.nix
+++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix
@@ -112,7 +112,7 @@ self: super: {
     };
   };
 
-  kakoune-rainbow = super.kakoune-rainbow.overrideAttrs (oldAttrs: rec {
+  kakoune-rainbow = super.kakoune-rainbow.overrideAttrs (oldAttrs: {
     preFixup = ''
       mkdir -p $out/bin
       mv $out/share/kak/autoload/plugins/kakoune-rainbow/bin/kak-rainbow.scm $out/bin
@@ -146,14 +146,14 @@ self: super: {
     };
   };
 
-  powerline-kak = super.powerline-kak.overrideAttrs (oldAttrs: rec {
+  powerline-kak = super.powerline-kak.overrideAttrs (oldAttrs: {
     preFixup = ''
       substituteInPlace $out/share/kak/autoload/plugins/powerline-kak/rc/modules/git.kak \
         --replace ' git ' ' ${git}/bin/git '
     '';
   });
 
-  hop-kak = rustPlatform.buildRustPackage rec {
+  hop-kak = rustPlatform.buildRustPackage {
     pname = "hop-kak";
     version = "0.2.0";
 
diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix
index 42ca99ea2aa8a..657233185bec0 100644
--- a/pkgs/applications/editors/neovim/tests/default.nix
+++ b/pkgs/applications/editors/neovim/tests/default.nix
@@ -70,9 +70,9 @@ let
     (wrapNeovimUnstable neovim-unwrapped {
       luaRcContent = "this is an invalid lua statement to break the build";
     }).overrideAttrs
-      ({
+      {
         doCheck = true;
-      });
+      };
 
   nvimAutoDisableWrap = makeNeovimConfig { };
 
@@ -101,10 +101,10 @@ let
   runTest =
     neovim-drv: buildCommand:
     runCommandLocal "test-${neovim-drv.name}"
-      ({
+      {
         nativeBuildInputs = [ ];
         meta.platforms = neovim-drv.meta.platforms;
-      })
+      }
       (
         ''
           source ${nmt}/bash-lib/assertions.sh
@@ -128,7 +128,7 @@ let
     }
   );
 in
-pkgs.recurseIntoAttrs (rec {
+pkgs.recurseIntoAttrs rec {
 
   inherit nmt;
 
@@ -213,14 +213,14 @@ pkgs.recurseIntoAttrs (rec {
     wrapRc = true;
   });
 
-  nvim_with_runtimeDeps = pkgs.neovim.overrideAttrs ({
+  nvim_with_runtimeDeps = pkgs.neovim.overrideAttrs {
     plugins = [
       pkgs.vimPlugins.hex-nvim
     ];
     autowrapRuntimeDeps = true;
     # legacy wrapper sets it to false
     wrapRc = true;
-  });
+  };
 
   nvim_with_ftplugin =
     let
@@ -409,4 +409,4 @@ pkgs.recurseIntoAttrs (rec {
   '';
 
   inherit (vimPlugins) corePlugins;
-})
+}
diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix
index da26b2a046c74..f2a42c4efec91 100644
--- a/pkgs/applications/editors/sublime/3/common.nix
+++ b/pkgs/applications/editors/sublime/3/common.nix
@@ -140,7 +140,7 @@ let
     '';
   };
 in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation {
   inherit pname;
   version = buildVersion;
 
@@ -182,4 +182,4 @@ stdenv.mkDerivation (rec {
       "i686-linux"
     ];
   };
-})
+}
diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix
index 6aff26de3622d..66c72527adccf 100644
--- a/pkgs/applications/editors/sublime/4/common.nix
+++ b/pkgs/applications/editors/sublime/4/common.nix
@@ -136,7 +136,7 @@ let
     };
   };
 in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   pname = pnameBase;
   version = buildVersion;
 
@@ -217,4 +217,4 @@ stdenv.mkDerivation (rec {
       "x86_64-linux"
     ];
   };
-})
+}
diff --git a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
index dbe41260ca06e..2918f991004ae 100644
--- a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
@@ -472,7 +472,7 @@ rec {
     let
       nativePluginsConfigs = lib.attrsets.attrValues packages;
       nonNativePlugins = (lib.optionals (plug != null) plug.plugins);
-      nativePlugins = lib.concatMap (requiredPluginsForPackage) nativePluginsConfigs;
+      nativePlugins = lib.concatMap requiredPluginsForPackage nativePluginsConfigs;
     in
     nativePlugins ++ nonNativePlugins;
 
diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
index 73cb783781676..43e1cd2398743 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
@@ -11,7 +11,7 @@
   vscode-extension-update-script,
 }:
 
-vscode-utils.buildVscodeMarketplaceExtension rec {
+vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
diff --git a/pkgs/applications/editors/vscode/extensions/updateSettings.nix b/pkgs/applications/editors/vscode/extensions/updateSettings.nix
index fe23e099b536d..e8be5b93b5227 100644
--- a/pkgs/applications/editors/vscode/extensions/updateSettings.nix
+++ b/pkgs/applications/editors/vscode/extensions/updateSettings.nix
@@ -28,7 +28,7 @@ let
   symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting ''&& mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" '';
 in
 
-writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (fileName)}'' (
+writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" fileName}'' (
   lib.optionalString (settings != { }) (
     if createIfDoesNotExists then
       ''
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index 6c3467b6e990a..580f439e35ed2 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -166,7 +166,7 @@ stdenv.mkDerivation (
           pkgs.libdrm
         ]
         ++ lib.optionals stdenv.hostPlatform.isDarwin darwinFrameworks
-        ++ lib.optionals (x11Support) (
+        ++ lib.optionals x11Support (
           with pkgs.xorg;
           [
             libX11
diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index afed2d2102a3d..f8e0e55f68bd5 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -116,7 +116,7 @@ rec {
     ]
     ++ patches-binutils-2_44-fix-wine-older-than-10_2;
 
-    updateScript = writeShellScript "update-wine-stable" (''
+    updateScript = writeShellScript "update-wine-stable" ''
       ${updateScriptPreamble}
       major=''${UPDATE_NIX_OLD_VERSION%%.*}
       latest_stable=$(get_latest_wine_version "$major.0")
@@ -128,7 +128,7 @@ rec {
       fi
 
       do_update
-    '');
+    '';
   };
 
   unstable = fetchurl rec {
diff --git a/pkgs/applications/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix
index ec42e6779e4fb..7273d9e40e393 100644
--- a/pkgs/applications/emulators/yabause/default.nix
+++ b/pkgs/applications/emulators/yabause/default.nix
@@ -54,7 +54,7 @@ mkDerivation rec {
     mainProgram = "yabause";
     homepage = "https://yabause.org/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix
index 54f2e0e064e60..d913b4d58ea41 100644
--- a/pkgs/applications/graphics/gimp/2.0/default.nix
+++ b/pkgs/applications/graphics/gimp/2.0/default.nix
@@ -211,7 +211,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "GNU Image Manipulation Program";
     homepage = "https://www.gimp.org/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
     mainProgram = "gimp";
diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix
index 311ed40220f37..6d108fa66905a 100644
--- a/pkgs/applications/graphics/qiv/default.nix
+++ b/pkgs/applications/graphics/qiv/default.nix
@@ -10,7 +10,7 @@
   libexif,
 }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   version = "2.3.3";
   pname = "qiv";
 
@@ -41,4 +41,4 @@ stdenv.mkDerivation (rec {
     platforms = platforms.linux;
     mainProgram = "qiv";
   };
-})
+}
diff --git a/pkgs/applications/maui/booth.nix b/pkgs/applications/maui/booth.nix
index d38f4b47dfbb2..a615bef0214de 100644
--- a/pkgs/applications/maui/booth.nix
+++ b/pkgs/applications/maui/booth.nix
@@ -52,6 +52,6 @@ mkDerivation {
     mainProgram = "booth";
     homepage = "https://invent.kde.org/maui/booth";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix
index b6356a6e3ff19..febabe6d25b65 100644
--- a/pkgs/applications/misc/coolreader/default.nix
+++ b/pkgs/applications/misc/coolreader/default.nix
@@ -38,7 +38,7 @@ mkDerivation rec {
     description = "Cross platform open source e-book reader";
     mainProgram = "cr3";
     license = licenses.gpl2Plus; # see https://github.com/buggins/coolreader/issues/80
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 9a3037be3be3a..378badcfc8cd5 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -18,7 +18,7 @@
   kdePackages,
 }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   pname = "CopyQ";
   version = "10.0.0";
 
@@ -73,4 +73,4 @@ stdenv.mkDerivation (rec {
     platforms = lib.platforms.linux;
     mainProgram = "copyq";
   };
-})
+}
diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix
index 0b6ebae802a30..33a9b91bdafef 100644
--- a/pkgs/applications/misc/cura/plugins.nix
+++ b/pkgs/applications/misc/cura/plugins.nix
@@ -35,7 +35,7 @@ let
         description = "Enables printing directly to OctoPrint and monitoring the process";
         homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin";
         license = licenses.agpl3Plus;
-        maintainers = with maintainers; [ ];
+        maintainers = [ ];
       };
     };
 
@@ -74,7 +74,7 @@ let
         description = "Cura plugin for HID mice such as 3Dconnexion spacemouse";
         homepage = "https://github.com/smartavionics/RawMouse";
         license = licenses.agpl3Plus;
-        maintainers = with maintainers; [ ];
+        maintainers = [ ];
       };
     };
 
diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix
index 70875941883e6..00c46dd4e7a9a 100644
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -91,6 +91,6 @@ mkDerivation rec {
     homepage = "https://www.klayout.de/";
     changelog = "https://www.klayout.de/development.html#${version}";
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/makehuman/default.nix b/pkgs/applications/misc/makehuman/default.nix
index c52ae1b813a34..51f27c3d7c10a 100644
--- a/pkgs/applications/misc/makehuman/default.nix
+++ b/pkgs/applications/misc/makehuman/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     qtbase
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = [
     pydeps
   ];
 
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 28f9189d8b215..f00b7f7d344cf 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -670,7 +670,7 @@ let
 
         patchShebangs .
       ''
-      + lib.optionalString (ungoogled) ''
+      + lib.optionalString ungoogled ''
         # Prune binaries (ungoogled only) *before* linking our own binaries:
         ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors"
       ''
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index d5f6b4ef655e0..eaf41cdf95d21 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -71,7 +71,7 @@ let
   chromium = rec {
     inherit stdenv upstream-info;
 
-    mkChromiumDerivation = callPackage ./common.nix ({
+    mkChromiumDerivation = callPackage ./common.nix {
       inherit chromiumVersionAtLeast versionRange;
       inherit
         proprietaryCodecs
@@ -106,7 +106,7 @@ let
         # As a work around until gn is updated again, we filter specifically that patch out.
         patches = lib.filter (e: lib.getName e != "LFS64.patch") oldAttrs.patches;
       });
-    });
+    };
 
     browser = callPackage ./browser.nix {
       inherit chromiumVersionAtLeast enableWideVine ungoogled;
diff --git a/pkgs/applications/networking/browsers/netsurf/buildsystem.nix b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix
index 3aa6ed08e41ce..8a0a452cf9cb3 100644
--- a/pkgs/applications/networking/browsers/netsurf/buildsystem.nix
+++ b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.netsurf-browser.org/";
     description = "NetSurf browser shared build system";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 105621a2598ab..3d5896aa623ed 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -186,7 +186,7 @@ in
     # TODO: Package and add Intel Storage Acceleration Library
     tests = nixosTests.hadoop;
   };
-  hadoop_3_3 = common rec {
+  hadoop_3_3 = common {
     pname = "hadoop";
     platformAttrs = rec {
       x86_64-linux = {
@@ -204,7 +204,7 @@ in
     # TODO: Package and add Intel Storage Acceleration Library
     tests = nixosTests.hadoop_3_3;
   };
-  hadoop2 = common rec {
+  hadoop2 = common {
     pname = "hadoop";
     platformAttrs.x86_64-linux = {
       version = "2.10.2";
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index f2d89b741fd86..cf0e5b58afa1d 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -31,7 +31,7 @@ let
       inherit (finalAttrs.hadoop) jdk;
       src = fetchzip {
         url =
-          with finalAttrs;
+
           "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
         inherit (finalAttrs) hash;
       };
@@ -101,7 +101,7 @@ in
     version = "3.5.4";
     hash = "sha256-rSr7UH1dZIkUYW6ehc/dYxlmN9yVjEKwrwLMT+uMd/0=";
   };
-  spark_3_4 = spark rec {
+  spark_3_4 = spark {
     pname = "spark";
     version = "3.4.4";
     hash = "sha256-GItHmthLhG7y0XSF3QINCyE7wYFb0+lPZmYLUuMa4Ww=";
diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix
index aeb89f52a6da2..a166110a5e34c 100644
--- a/pkgs/applications/networking/dropbox/cli.nix
+++ b/pkgs/applications/networking/dropbox/cli.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
     description = "Command line client for the dropbox daemon";
     license = lib.licenses.gpl3Plus;
     mainProgram = "dropbox";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     # NOTE: Dropbox itself only works on linux, so this is ok.
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index d1909d2be4ca2..c43315d25a994 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -6,11 +6,11 @@
 let
   mkGui =
     args:
-    callPackage (import ./gui.nix (args)) {
+    callPackage (import ./gui.nix args) {
       inherit (libsForQt5) wrapQtAppsHook;
     };
 
-  mkServer = args: callPackage (import ./server.nix (args)) { };
+  mkServer = args: callPackage (import ./server.nix args) { };
 in
 {
   guiStable = mkGui {
diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
index f1f14ad917d03..c87196309d464 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
     rev = "refs/tags/v${version}";
   };
 
-  nativeBuildInputs = with python3Packages; [ wrapQtAppsHook ];
+  nativeBuildInputs = [ wrapQtAppsHook ];
 
   build-system = with python3Packages; [ setuptools ];
 
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index cde866ff60fee..83ca717a0b17e 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -53,7 +53,7 @@ in
     };
   };
 
-  clientbuffer = zncDerivation rec {
+  clientbuffer = zncDerivation {
     pname = "znc-clientbuffer";
     version = "unstable-2021-05-30";
     module_name = "clientbuffer";
@@ -77,7 +77,7 @@ in
     };
   };
 
-  clientaway = zncDerivation rec {
+  clientaway = zncDerivation {
     pname = "znc-clientaway";
     version = "unstable-2017-04-28";
     module_name = "clientaway";
@@ -97,7 +97,7 @@ in
     };
   };
 
-  fish = zncDerivation rec {
+  fish = zncDerivation {
     pname = "znc-fish";
     version = "unstable-2017-06-26";
     module_name = "fish";
@@ -117,7 +117,7 @@ in
     };
   };
 
-  ignore = zncDerivation rec {
+  ignore = zncDerivation {
     pname = "znc-ignore";
     version = "unstable-2017-04-28";
     module_name = "ignore";
@@ -157,7 +157,7 @@ in
     };
   };
 
-  playback = zncDerivation rec {
+  playback = zncDerivation {
     pname = "znc-playback";
     version = "unstable-2015-08-04";
     module_name = "playback";
@@ -177,7 +177,7 @@ in
     };
   };
 
-  privmsg = zncDerivation rec {
+  privmsg = zncDerivation {
     pname = "znc-privmsg";
     version = "unstable-2015-02-22";
     module_name = "privmsg";
@@ -195,7 +195,7 @@ in
     };
   };
 
-  push = zncDerivation rec {
+  push = zncDerivation {
     pname = "znc-push";
     version = "unstable-2016-10-12";
     module_name = "push";
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index aad43076fb716..5d021eb770eeb 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -248,13 +248,13 @@ let
     translations = importVariant "translations.nix";
     deps = (importVariant "deps.nix") ++ [
       # TODO: Why is this needed?
-      (rec {
+      rec {
         name = "unowinreg.dll";
         url = "https://dev-www.libreoffice.org/extern/${md5name}";
         sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
         md5 = "185d60944ea767075d27247c3162b3bc";
         md5name = "${md5}-${name}";
-      })
+      }
     ];
   };
   srcs = {
diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix
index 30e7c72a145c0..890c4cb653e63 100644
--- a/pkgs/applications/science/electronics/bitscope/common.nix
+++ b/pkgs/applications/science/electronics/bitscope/common.nix
@@ -24,7 +24,7 @@ let
     wrapProgram "$out/bin/${binaryName}" \
       --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libPaths}"
   '';
-  pkg = stdenv.mkDerivation (rec {
+  pkg = stdenv.mkDerivation rec {
     inherit (attrs) version src;
 
     name = "${toolName}-${version}";
@@ -71,7 +71,7 @@ let
         cp -a usr/* "$out/"
         ${(wrapBinary libs) attrs.toolName}
       '';
-  });
+  };
 in
 buildFHSEnv {
   pname = attrs.toolName;
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix
index 8bf55470bcdfc..e8fe78012511f 100644
--- a/pkgs/applications/science/electronics/kicad/base.nix
+++ b/pkgs/applications/science/electronics/kicad/base.nix
@@ -74,7 +74,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "kicad-base";
-  version = if (stable) then kicadVersion else builtins.substring 0 10 src.rev;
+  version = if stable then kicadVersion else builtins.substring 0 10 src.rev;
 
   src = kicadSrc;
 
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
       --replace "0000000000000000000000000000000000000000" "${src.rev}"
   '';
 
-  preConfigure = optional (debug) ''
+  preConfigure = optional debug ''
     export CFLAGS="''${CFLAGS:-} -Og -ggdb"
     export CXXFLAGS="''${CXXFLAGS:-} -Og -ggdb"
   '';
@@ -115,20 +115,20 @@ stdenv.mkDerivation rec {
   ++ optionals (!withScripting) [
     "-DKICAD_SCRIPTING_WXPYTHON=OFF"
   ]
-  ++ optionals (withI18n) [
+  ++ optionals withI18n [
     "-DKICAD_BUILD_I18N=ON"
   ]
   ++ optionals (!doInstallCheck) [
     "-DKICAD_BUILD_QA_TESTS=OFF"
   ]
-  ++ optionals (debug) [
+  ++ optionals debug [
     "-DKICAD_STDLIB_DEBUG=ON"
     "-DKICAD_USE_VALGRIND=ON"
   ]
-  ++ optionals (sanitizeAddress) [
+  ++ optionals sanitizeAddress [
     "-DKICAD_SANITIZE_ADDRESS=ON"
   ]
-  ++ optionals (sanitizeThreads) [
+  ++ optionals sanitizeThreads [
     "-DKICAD_SANITIZE_THREADS=ON"
   ];
 
@@ -188,9 +188,9 @@ stdenv.mkDerivation rec {
     # This would otherwise cause a linking requirement for mbedtls.
     (nng.override { mbedtlsSupport = false; })
   ]
-  ++ optional (withScripting) wxPython
-  ++ optional (withNgspice) libngspice
-  ++ optional (debug) valgrind;
+  ++ optional withScripting wxPython
+  ++ optional withNgspice libngspice
+  ++ optional debug valgrind;
 
   # some ngspice tests attempt to write to $HOME/.cache/
   # this could be and was resolved with XDG_CACHE_HOME = "$TMP";
@@ -199,7 +199,7 @@ stdenv.mkDerivation rec {
   HOME = "$TMP";
 
   # debug builds fail all but the python test
-  doInstallCheck = !(debug);
+  doInstallCheck = !debug;
   installCheckTarget = "test";
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 50afc63be481a..b446525421620 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -81,9 +81,9 @@
 
 let
   baseName =
-    if (testing) then
+    if testing then
       "kicad-testing"
-    else if (stable) then
+    else if stable then
       "kicad"
     else
       "kicad-unstable";
@@ -186,7 +186,7 @@ stdenv.mkDerivation rec {
   };
 
   inherit pname;
-  version = if (stable) then kicadVersion else builtins.substring 0 10 src.src.rev;
+  version = if stable then kicadVersion else builtins.substring 0 10 src.src.rev;
 
   src = base;
   dontUnpack = true;
@@ -195,14 +195,14 @@ stdenv.mkDerivation rec {
   dontFixup = true;
 
   pythonPath =
-    optionals (withScripting) [
+    optionals withScripting [
       wxPython
       python.pkgs.six
       python.pkgs.requests
     ]
     ++ addonsDrvs;
 
-  nativeBuildInputs = [ makeWrapper ] ++ optionals (withScripting) [ python.pkgs.wrapPython ];
+  nativeBuildInputs = [ makeWrapper ] ++ optionals withScripting [ python.pkgs.wrapPython ];
 
   # KICAD7_TEMPLATE_DIR only works with a single path (it does not handle : separated paths)
   # but it's used to find both the templates and the symbol/footprint library tables
@@ -245,10 +245,10 @@ stdenv.mkDerivation rec {
       in
       [ "--set-default NIX_KICAD9_STOCK_DATA_PATH ${stockDataPath}" ]
     )
-    ++ optionals (with3d) [
+    ++ optionals with3d [
       "--set-default KICAD9_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels"
     ]
-    ++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ]
+    ++ optionals withNgspice [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ]
 
     # infinisil's workaround for #39493
     ++ [ "--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ];
@@ -278,13 +278,13 @@ stdenv.mkDerivation rec {
     (concatStringsSep "\n" (flatten [
       "runHook preInstall"
 
-      (optionalString (withScripting) "buildPythonPath \"${base} $pythonPath\" \n")
+      (optionalString withScripting "buildPythonPath \"${base} $pythonPath\" \n")
 
       # wrap each of the directly usable tools
       (map (
         tool:
         "makeWrapper ${base}/${bin}/${tool} $out/bin/${tool} $makeWrapperArgs"
-        + optionalString (withScripting) " --set PYTHONPATH \"$program_PYTHONPATH\""
+        + optionalString withScripting " --set PYTHONPATH \"$program_PYTHONPATH\""
       ) tools)
 
       # link in the CLI utils
@@ -312,9 +312,9 @@ stdenv.mkDerivation rec {
   meta = {
     description =
       (
-        if (stable) then
+        if stable then
           "Open Source Electronics Design Automation suite"
-        else if (testing) then
+        else if testing then
           "Open Source EDA suite, latest on stable branch"
         else
           "Open Source EDA suite, latest on master branch"
diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix
index 4672bfc848092..379fb82f6ae9f 100644
--- a/pkgs/applications/science/logic/glucose/default.nix
+++ b/pkgs/applications/science/logic/glucose/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.labri.fr/perso/lsimon/research/glucose/";
     license = if enableUnfree then licenses.unfreeRedistributable else licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix
index 7e8f209702f82..bb4a1a1529091 100644
--- a/pkgs/applications/science/logic/vampire/default.nix
+++ b/pkgs/applications/science/logic/vampire/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     mainProgram = "vampire";
     platforms = lib.platforms.unix;
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
index 2dbd5df4c123e..4fe87cd93af4b 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     "--with-perl=${perl}/bin/perl"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://pari.math.u-bordeaux.fr/";
     description = "Compiler to translate GP scripts to PARI programs";
     downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
diff --git a/pkgs/applications/science/molecular-dynamics/raspa/data.nix b/pkgs/applications/science/molecular-dynamics/raspa/data.nix
index 996bc141e7069..f61a90e11d685 100644
--- a/pkgs/applications/science/molecular-dynamics/raspa/data.nix
+++ b/pkgs/applications/science/molecular-dynamics/raspa/data.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation {
   # Keep the shebangs of the examples from being patched
   dontPatchShebangs = true;
 
-  meta = with lib; {
+  meta = {
     inherit (raspa.meta) homepage license maintainers;
     description = "Example packs and documentation of RASPA";
     outputsToInstall = [
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 92aac25623f10..30306e58c077a 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -164,9 +164,9 @@ mkDerivation rec {
       if [[ ! "$f" =~ \.zip$ ]]; then
   ''
   + lib.concatStrings (
-    lib.mapAttrsToList (k: v: (''
+    lib.mapAttrsToList (k: v: ''
       substituteInPlace $f --replace '"${k}"'  '"${lib.getBin v}/bin/${k}"'
-    '')) filters
+    '') filters
   )
   + ''
         substituteInPlace $f --replace '"pstotext"'  '"${lib.getBin ghostscript}/bin/ps2ascii"'
diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix
index 35e138f5f1953..009525ec8eb37 100644
--- a/pkgs/applications/system/coolercontrol/default.nix
+++ b/pkgs/applications/system/coolercontrol/default.nix
@@ -27,7 +27,7 @@ let
 
   applySharedDetails = drv: drv { inherit version src meta; };
 in
-rec {
+{
   coolercontrol-ui-data = applySharedDetails (callPackage ./coolercontrol-ui-data.nix { });
 
   coolercontrold = applySharedDetails (callPackage ./coolercontrold.nix { });
diff --git a/pkgs/applications/terminal-emulators/st/mcaimi-st.nix b/pkgs/applications/terminal-emulators/st/mcaimi-st.nix
index 972b6523df165..4f6612ea9a209 100644
--- a/pkgs/applications/terminal-emulators/st/mcaimi-st.nix
+++ b/pkgs/applications/terminal-emulators/st/mcaimi-st.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
     description = "Suckless Terminal fork";
     mainProgram = "st";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix
index a4d0a59d931c5..739f580ea5819 100644
--- a/pkgs/applications/version-management/blackbox/default.nix
+++ b/pkgs/applications/version-management/blackbox/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Safely store secrets in a VCS repo";
     homepage = "https://github.com/StackExchange/blackbox";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
     platforms = platforms.all;
   };
diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix
index f586b7e64cbf2..1eca35056f531 100644
--- a/pkgs/applications/version-management/sublime-merge/common.nix
+++ b/pkgs/applications/version-management/sublime-merge/common.nix
@@ -138,7 +138,7 @@ let
     };
   };
 in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   pname = pnameBase;
   version = buildVersion;
 
@@ -218,4 +218,4 @@ stdenv.mkDerivation (rec {
       "x86_64-linux"
     ];
   };
-})
+}
diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix
index 3add0df664667..9398a7235abc7 100644
--- a/pkgs/applications/video/anilibria-winmaclinux/default.nix
+++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix
@@ -87,7 +87,7 @@ mkDerivation rec {
   ++ lib.optionals withMPV [ mpv-unwrapped.dev ];
 
   desktopItems = [
-    (makeDesktopItem (rec {
+    (makeDesktopItem rec {
       name = "AniLibria";
       desktopName = name;
       icon = "anilibria";
@@ -101,7 +101,7 @@ mkDerivation rec {
       keywords = [ "anime" ];
       exec = name;
       terminal = false;
-    }))
+    })
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index 7e7d36a7ba69c..f1c4393e01b83 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -13,10 +13,10 @@ let
   # linux distros are supposed to provide pillow and pycryptodome
   requiredPythonPath =
     with kodi.pythonPackages;
-    makePythonPath ([
+    makePythonPath [
       pillow
       pycryptodome
-    ]);
+    ];
 
   # each kodi addon can potentially export a python module which should be included in PYTHONPATH
   # see any addon which supplies `passthru.pythonPath` and the corresponding entry in the addons `addon.xml`
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index e29b7b34a4f7d..24b4f947a99b3 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -216,7 +216,7 @@ stdenv.mkDerivation {
   ++ lib.optional fribidiSupport "--enable-fribidi"
   ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) "--enable-vidix"
   ++ lib.optional stdenv.hostPlatform.isLinux "--enable-fbdev"
-  ++ lib.optionals (crossBuild) [
+  ++ lib.optionals crossBuild [
     "--enable-cross-compile"
     "--disable-vidix-pcidb"
     "--with-vidix-drivers=no"
diff --git a/pkgs/applications/video/mpv/scripts/builtins.nix b/pkgs/applications/video/mpv/scripts/builtins.nix
index 5e0af3403fb2c..9263423035aa2 100644
--- a/pkgs/applications/video/mpv/scripts/builtins.nix
+++ b/pkgs/applications/video/mpv/scripts/builtins.nix
@@ -18,7 +18,7 @@ let
         dontUnpack = true;
         scriptPath = "${src}/${srcPath}";
 
-        meta = with lib; {
+        meta = {
           inherit (mpv-unwrapped.meta) license;
           homepage = "https://github.com/mpv-player/mpv/blob/v${version}/${srcPath}";
         };
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index e3bfbb4a4042b..a51c3bcc28b59 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -93,7 +93,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication {
     '';
     license = with lib.licenses; [ gpl3Plus ];
     mainProgram = "openshot-qt";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 391e1a8494abb..a835f6a7195de 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -322,7 +322,7 @@ stdenv.mkDerivation (finalAttrs: {
       ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \
       ${optionalString enableWebService "--enable-webservice"} \
       ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \
-      ${optionalString (enableKvm) "--with-kvm"} \
+      ${optionalString enableKvm "--with-kvm"} \
       ${extraConfigureFlags} \
       --disable-kmods
     sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${glib.dev}/lib/pkgconfig@' \
diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
index e47dd2fde5162..3a83551b6e511 100644
--- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs.src.meta) homepage;
     description = "Tiling X11 window manager written in modern C++";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (libX11.meta) platforms;
     mainProgram = "Hypr";
   };
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
index 8a7d7cda0a962..ff37fa26a6d7d 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
@@ -7,7 +7,7 @@
   mkHyprlandPlugin,
   nix-update-script,
 }:
-mkHyprlandPlugin hyprland rec {
+mkHyprlandPlugin hyprland {
   pluginName = "hyprsplit";
   version = "0.48.1-unstable-2025-05-03";
 
diff --git a/pkgs/build-support/checkpoint-build.nix b/pkgs/build-support/checkpoint-build.nix
index 5071ad4ac5b71..fc46565ca8756 100644
--- a/pkgs/build-support/checkpoint-build.nix
+++ b/pkgs/build-support/checkpoint-build.nix
@@ -44,7 +44,7 @@ let
     });
 in
 
-rec {
+{
   inherit mkCheckpointBuild;
   /*
     Prepare a derivation for local builds.
diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix
index b5cfc55c695eb..8b70d8e132899 100644
--- a/pkgs/build-support/kernel/make-initrd-ng.nix
+++ b/pkgs/build-support/kernel/make-initrd-ng.nix
@@ -75,7 +75,7 @@ in
       or (throw "Unrecognised compressor ${_compressorName}, please specify uInitrdCompression"),
 }:
 runCommand name
-  ({
+  {
     compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}";
     passthru = {
       compressorExecutableFunction = _compressorFunction;
@@ -98,7 +98,7 @@ runCommand name
       cpio
     ]
     ++ lib.optional makeUInitrd ubootTools;
-  })
+  }
   ''
     mkdir -p ./root/var/empty
     make-initrd-ng "$contentsPath" ./root
diff --git a/pkgs/build-support/make-darwin-bundle/default.nix b/pkgs/build-support/make-darwin-bundle/default.nix
index e6ddb4b4198c6..a18452274428e 100644
--- a/pkgs/build-support/make-darwin-bundle/default.nix
+++ b/pkgs/build-support/make-darwin-bundle/default.nix
@@ -15,7 +15,7 @@
   icon ? "", # Optional icon file.
 }:
 
-writeShellScript "make-darwin-bundle-${name}" (''
+writeShellScript "make-darwin-bundle-${name}" ''
   function makeDarwinBundlePhase() {
     mkdir -p "''${!outputBin}/Applications/${name}.app/Contents/MacOS"
     mkdir -p "''${!outputBin}/Applications/${name}.app/Contents/Resources"
@@ -28,4 +28,4 @@ writeShellScript "make-darwin-bundle-${name}" (''
   }
 
   appendToVar preDistPhases makeDarwinBundlePhase
-'')
+''
diff --git a/pkgs/build-support/nix-gitignore/default.nix b/pkgs/build-support/nix-gitignore/default.nix
index 60a854225e105..fa9bbc1ca8c41 100644
--- a/pkgs/build-support/nix-gitignore/default.nix
+++ b/pkgs/build-support/nix-gitignore/default.nix
@@ -92,7 +92,7 @@ rec {
             let
               recurse =
                 str:
-                [ (substring 0 1 str) ] ++ (optionals (str != "") (recurse (substring 1 (stringLength (str)) str)));
+                [ (substring 0 1 str) ] ++ (optionals (str != "") (recurse (substring 1 (stringLength str) str)));
             in
             str: recurse str;
           chars = s: filter (c: c != "" && !isList c) (splitString s);
diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
index 006045c206040..1155338c2fb1a 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
@@ -90,24 +90,24 @@ rec {
     };
   alloc_no_stdlib_1_3_0_features =
     f:
-    updateFeatures f ({
+    updateFeatures f {
       alloc_no_stdlib_1_3_0.default = (f.alloc_no_stdlib_1_3_0.default or true);
-    }) [ ];
+    } [ ];
   brotli_2_5_0 =
     {
       features ? (brotli_2_5_0_features { }),
     }:
     brotli_2_5_0_ {
-      dependencies = mapFeatures features ([
+      dependencies = mapFeatures features [
         alloc_no_stdlib_1_3_0
         brotli_decompressor_1_3_1
-      ]);
+      ];
       features = mkFeatures (features.brotli_2_5_0 or { });
     };
   brotli_2_5_0_features =
     f:
     updateFeatures f
-      (rec {
+      rec {
         alloc_no_stdlib_1_3_0.no-stdlib =
           (f.alloc_no_stdlib_1_3_0.no-stdlib or false)
           || (brotli_2_5_0.no-stdlib or false)
@@ -131,7 +131,7 @@ rec {
           (f.brotli_decompressor_1_3_1.seccomp or false)
           || (brotli_2_5_0.seccomp or false)
           || (f.brotli_2_5_0.seccomp or false);
-      })
+      }
       [
         alloc_no_stdlib_1_3_0_features
         brotli_decompressor_1_3_1_features
@@ -141,12 +141,12 @@ rec {
       features ? (brotli_decompressor_1_3_1_features { }),
     }:
     brotli_decompressor_1_3_1_ {
-      dependencies = mapFeatures features ([ alloc_no_stdlib_1_3_0 ]);
+      dependencies = mapFeatures features [ alloc_no_stdlib_1_3_0 ];
       features = mkFeatures (features.brotli_decompressor_1_3_1 or { });
     };
   brotli_decompressor_1_3_1_features =
     f:
-    updateFeatures f (rec {
+    updateFeatures f rec {
       alloc_no_stdlib_1_3_0.no-stdlib =
         (f.alloc_no_stdlib_1_3_0.no-stdlib or false)
         || (brotli_decompressor_1_3_1.no-stdlib or false)
@@ -157,5 +157,5 @@ rec {
         || (brotli_decompressor_1_3_1.unsafe or false)
         || (f.brotli_decompressor_1_3_1.unsafe or false);
       brotli_decompressor_1_3_1.default = (f.brotli_decompressor_1_3_1.default or true);
-    }) [ alloc_no_stdlib_1_3_0_features ];
+    } [ alloc_no_stdlib_1_3_0_features ];
 }
diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
index 4400df270666b..dcad8b8a6b118 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
@@ -92,7 +92,7 @@ rec {
     #   inject test dependencies into the build
 
     crates = {
-      "asn1-rs" = rec {
+      "asn1-rs" = {
         crateName = "asn1-rs";
         version = "0.3.1";
         edition = "2018";
@@ -160,7 +160,7 @@ rec {
           "time"
         ];
       };
-      "asn1-rs-derive" = rec {
+      "asn1-rs-derive" = {
         crateName = "asn1-rs-derive";
         version = "0.1.0";
         edition = "2018";
@@ -189,7 +189,7 @@ rec {
         ];
 
       };
-      "asn1-rs-impl" = rec {
+      "asn1-rs-impl" = {
         crateName = "asn1-rs-impl";
         version = "0.1.0";
         edition = "2018";
@@ -214,7 +214,7 @@ rec {
         ];
 
       };
-      "autocfg 0.1.7" = rec {
+      "autocfg 0.1.7" = {
         crateName = "autocfg";
         version = "0.1.7";
         edition = "2015";
@@ -224,7 +224,7 @@ rec {
         ];
 
       };
-      "autocfg 1.0.1" = rec {
+      "autocfg 1.0.1" = {
         crateName = "autocfg";
         version = "1.0.1";
         edition = "2015";
@@ -234,7 +234,7 @@ rec {
         ];
 
       };
-      "base64" = rec {
+      "base64" = {
         crateName = "base64";
         version = "0.13.0";
         edition = "2018";
@@ -251,7 +251,7 @@ rec {
           "std"
         ];
       };
-      "base64ct" = rec {
+      "base64ct" = {
         crateName = "base64ct";
         version = "1.1.1";
         edition = "2018";
@@ -263,7 +263,7 @@ rec {
           "std" = [ "alloc" ];
         };
       };
-      "bitflags" = rec {
+      "bitflags" = {
         crateName = "bitflags";
         version = "1.3.2";
         edition = "2018";
@@ -281,7 +281,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" ];
       };
-      "botan" = rec {
+      "botan" = {
         crateName = "botan";
         version = "0.8.1";
         edition = "2018";
@@ -309,7 +309,7 @@ rec {
           "vendored"
         ];
       };
-      "botan-src" = rec {
+      "botan-src" = {
         crateName = "botan-src";
         version = "0.21703.0";
         edition = "2018";
@@ -320,7 +320,7 @@ rec {
         ];
 
       };
-      "botan-sys" = rec {
+      "botan-sys" = {
         crateName = "botan-sys";
         version = "0.8.1";
         edition = "2015";
@@ -351,7 +351,7 @@ rec {
           "vendored"
         ];
       };
-      "bumpalo" = rec {
+      "bumpalo" = {
         crateName = "bumpalo";
         version = "3.9.1";
         edition = "2018";
@@ -363,7 +363,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" ];
       };
-      "byteorder" = rec {
+      "byteorder" = {
         crateName = "byteorder";
         version = "1.4.3";
         edition = "2018";
@@ -375,7 +375,7 @@ rec {
           "default" = [ "std" ];
         };
       };
-      "cc" = rec {
+      "cc" = {
         crateName = "cc";
         version = "1.0.72";
         edition = "2018";
@@ -389,7 +389,7 @@ rec {
           "parallel" = [ "jobserver" ];
         };
       };
-      "cfg-if" = rec {
+      "cfg-if" = {
         crateName = "cfg-if";
         version = "1.0.0";
         edition = "2018";
@@ -406,7 +406,7 @@ rec {
           ];
         };
       };
-      "const-oid" = rec {
+      "const-oid" = {
         crateName = "const-oid";
         version = "0.6.2";
         edition = "2018";
@@ -417,7 +417,7 @@ rec {
         features = {
         };
       };
-      "crypto-bigint" = rec {
+      "crypto-bigint" = {
         crateName = "crypto-bigint";
         version = "0.2.11";
         edition = "2018";
@@ -457,7 +457,7 @@ rec {
           "rand_core"
         ];
       };
-      "cty" = rec {
+      "cty" = {
         crateName = "cty";
         version = "0.2.2";
         edition = "2015";
@@ -467,7 +467,7 @@ rec {
         ];
 
       };
-      "data-encoding" = rec {
+      "data-encoding" = {
         crateName = "data-encoding";
         version = "2.3.2";
         edition = "2018";
@@ -485,7 +485,7 @@ rec {
           "std"
         ];
       };
-      "der" = rec {
+      "der" = {
         crateName = "der";
         version = "0.4.5";
         edition = "2018";
@@ -524,7 +524,7 @@ rec {
           "std"
         ];
       };
-      "der-parser" = rec {
+      "der-parser" = {
         crateName = "der-parser";
         version = "7.0.0";
         edition = "2018";
@@ -577,7 +577,7 @@ rec {
           "std"
         ];
       };
-      "digest" = rec {
+      "digest" = {
         crateName = "digest";
         version = "0.9.0";
         edition = "2018";
@@ -601,7 +601,7 @@ rec {
           "std"
         ];
       };
-      "displaydoc" = rec {
+      "displaydoc" = {
         crateName = "displaydoc";
         version = "0.2.3";
         edition = "2018";
@@ -632,7 +632,7 @@ rec {
           "std"
         ];
       };
-      "foreign-types" = rec {
+      "foreign-types" = {
         crateName = "foreign-types";
         version = "0.3.2";
         edition = "2015";
@@ -648,7 +648,7 @@ rec {
         ];
 
       };
-      "foreign-types-shared" = rec {
+      "foreign-types-shared" = {
         crateName = "foreign-types-shared";
         version = "0.1.1";
         edition = "2015";
@@ -658,7 +658,7 @@ rec {
         ];
 
       };
-      "generic-array" = rec {
+      "generic-array" = {
         crateName = "generic-array";
         version = "0.14.5";
         edition = "2015";
@@ -684,7 +684,7 @@ rec {
           "serde" = [ "dep:serde" ];
         };
       };
-      "getrandom" = rec {
+      "getrandom" = {
         crateName = "getrandom";
         version = "0.2.4";
         edition = "2018";
@@ -727,7 +727,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "std" ];
       };
-      "itoa" = rec {
+      "itoa" = {
         crateName = "itoa";
         version = "1.0.1";
         edition = "2018";
@@ -737,7 +737,7 @@ rec {
         ];
 
       };
-      "js-sys" = rec {
+      "js-sys" = {
         crateName = "js-sys";
         version = "0.3.56";
         edition = "2018";
@@ -753,7 +753,7 @@ rec {
         ];
 
       };
-      "lazy_static" = rec {
+      "lazy_static" = {
         crateName = "lazy_static";
         version = "1.4.0";
         edition = "2015";
@@ -777,7 +777,7 @@ rec {
           "spin_no_std"
         ];
       };
-      "libc" = rec {
+      "libc" = {
         crateName = "libc";
         version = "0.2.116";
         edition = "2015";
@@ -799,7 +799,7 @@ rec {
           "std"
         ];
       };
-      "libm" = rec {
+      "libm" = {
         crateName = "libm";
         version = "0.2.1";
         edition = "2018";
@@ -813,7 +813,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" ];
       };
-      "log" = rec {
+      "log" = {
         crateName = "log";
         version = "0.4.14";
         edition = "2015";
@@ -849,7 +849,7 @@ rec {
           "value-bag" = [ "dep:value-bag" ];
         };
       };
-      "memchr" = rec {
+      "memchr" = {
         crateName = "memchr";
         version = "2.4.1";
         edition = "2018";
@@ -871,7 +871,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "std" ];
       };
-      "minimal-lexical" = rec {
+      "minimal-lexical" = {
         crateName = "minimal-lexical";
         version = "0.2.1";
         edition = "2018";
@@ -884,7 +884,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "std" ];
       };
-      "nom" = rec {
+      "nom" = {
         crateName = "nom";
         version = "7.1.0";
         edition = "2018";
@@ -924,7 +924,7 @@ rec {
           "std"
         ];
       };
-      "num-bigint" = rec {
+      "num-bigint" = {
         crateName = "num-bigint";
         version = "0.4.3";
         edition = "2018";
@@ -968,7 +968,7 @@ rec {
           "std"
         ];
       };
-      "num-bigint-dig" = rec {
+      "num-bigint-dig" = {
         crateName = "num-bigint-dig";
         version = "0.7.0";
         edition = "2015";
@@ -1070,7 +1070,7 @@ rec {
           "zeroize"
         ];
       };
-      "num-integer" = rec {
+      "num-integer" = {
         crateName = "num-integer";
         version = "0.1.44";
         edition = "2015";
@@ -1101,7 +1101,7 @@ rec {
           "std"
         ];
       };
-      "num-iter" = rec {
+      "num-iter" = {
         crateName = "num-iter";
         version = "0.1.42";
         edition = "2015";
@@ -1139,7 +1139,7 @@ rec {
           ];
         };
       };
-      "num-traits" = rec {
+      "num-traits" = {
         crateName = "num-traits";
         version = "0.2.14";
         edition = "2015";
@@ -1171,7 +1171,7 @@ rec {
           "std"
         ];
       };
-      "num_threads" = rec {
+      "num_threads" = {
         crateName = "num_threads";
         version = "0.1.3";
         edition = "2015";
@@ -1188,7 +1188,7 @@ rec {
         ];
 
       };
-      "oid-registry" = rec {
+      "oid-registry" = {
         crateName = "oid-registry";
         version = "0.4.0";
         edition = "2018";
@@ -1228,7 +1228,7 @@ rec {
           "x962"
         ];
       };
-      "once_cell" = rec {
+      "once_cell" = {
         crateName = "once_cell";
         version = "1.9.0";
         edition = "2018";
@@ -1250,7 +1250,7 @@ rec {
           "std"
         ];
       };
-      "openssl" = rec {
+      "openssl" = {
         crateName = "openssl";
         version = "0.10.38";
         edition = "2018";
@@ -1289,7 +1289,7 @@ rec {
           "vendored" = [ "ffi/vendored" ];
         };
       };
-      "openssl-sys" = rec {
+      "openssl-sys" = {
         crateName = "openssl-sys";
         version = "0.9.72";
         edition = "2015";
@@ -1329,7 +1329,7 @@ rec {
           "vendored" = [ "openssl-src" ];
         };
       };
-      "pem" = rec {
+      "pem" = {
         crateName = "pem";
         version = "1.0.2";
         edition = "2018";
@@ -1345,7 +1345,7 @@ rec {
         ];
 
       };
-      "pem-rfc7468" = rec {
+      "pem-rfc7468" = {
         crateName = "pem-rfc7468";
         version = "0.2.4";
         edition = "2018";
@@ -1364,7 +1364,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "alloc" ];
       };
-      "pkcs1" = rec {
+      "pkcs1" = {
         crateName = "pkcs1";
         version = "0.2.4";
         edition = "2018";
@@ -1414,7 +1414,7 @@ rec {
           "zeroize"
         ];
       };
-      "pkcs8" = rec {
+      "pkcs8" = {
         crateName = "pkcs8";
         version = "0.7.6";
         edition = "2018";
@@ -1497,7 +1497,7 @@ rec {
           "zeroize"
         ];
       };
-      "pkg-config" = rec {
+      "pkg-config" = {
         crateName = "pkg-config";
         version = "0.3.24";
         edition = "2015";
@@ -1507,7 +1507,7 @@ rec {
         ];
 
       };
-      "ppv-lite86" = rec {
+      "ppv-lite86" = {
         crateName = "ppv-lite86";
         version = "0.2.16";
         edition = "2018";
@@ -1523,7 +1523,7 @@ rec {
           "std"
         ];
       };
-      "proc-macro2" = rec {
+      "proc-macro2" = {
         crateName = "proc-macro2";
         version = "1.0.36";
         edition = "2018";
@@ -1546,7 +1546,7 @@ rec {
           "proc-macro"
         ];
       };
-      "quote" = rec {
+      "quote" = {
         crateName = "quote";
         version = "1.0.15";
         edition = "2018";
@@ -1570,7 +1570,7 @@ rec {
           "proc-macro"
         ];
       };
-      "rand" = rec {
+      "rand" = {
         crateName = "rand";
         version = "0.8.4";
         edition = "2018";
@@ -1652,7 +1652,7 @@ rec {
           "std_rng"
         ];
       };
-      "rand_chacha" = rec {
+      "rand_chacha" = {
         crateName = "rand_chacha";
         version = "0.3.1";
         edition = "2018";
@@ -1682,7 +1682,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "std" ];
       };
-      "rand_core" = rec {
+      "rand_core" = {
         crateName = "rand_core";
         version = "0.6.3";
         edition = "2018";
@@ -1714,7 +1714,7 @@ rec {
           "std"
         ];
       };
-      "rand_hc" = rec {
+      "rand_hc" = {
         crateName = "rand_hc";
         version = "0.3.1";
         edition = "2018";
@@ -1730,7 +1730,7 @@ rec {
         ];
 
       };
-      "rcgen" = rec {
+      "rcgen" = {
         crateName = "rcgen";
         version = "0.9.2";
         edition = "2018";
@@ -1821,7 +1821,7 @@ rec {
           "zeroize"
         ];
       };
-      "ring" = rec {
+      "ring" = {
         crateName = "ring";
         version = "0.16.20";
         edition = "2018";
@@ -1938,7 +1938,7 @@ rec {
           "once_cell"
         ];
       };
-      "rsa" = rec {
+      "rsa" = {
         crateName = "rsa";
         version = "0.5.0";
         edition = "2018";
@@ -2062,7 +2062,7 @@ rec {
           "std"
         ];
       };
-      "rusticata-macros" = rec {
+      "rusticata-macros" = {
         crateName = "rusticata-macros";
         version = "4.0.0";
         edition = "2018";
@@ -2080,7 +2080,7 @@ rec {
         ];
 
       };
-      "smallvec" = rec {
+      "smallvec" = {
         crateName = "smallvec";
         version = "1.8.0";
         edition = "2018";
@@ -2094,7 +2094,7 @@ rec {
           "serde" = [ "dep:serde" ];
         };
       };
-      "spin" = rec {
+      "spin" = {
         crateName = "spin";
         version = "0.5.2";
         edition = "2015";
@@ -2105,7 +2105,7 @@ rec {
         ];
 
       };
-      "spki" = rec {
+      "spki" = {
         crateName = "spki";
         version = "0.4.1";
         edition = "2018";
@@ -2124,7 +2124,7 @@ rec {
           "std" = [ "der/std" ];
         };
       };
-      "subtle" = rec {
+      "subtle" = {
         crateName = "subtle";
         version = "2.4.1";
         edition = "2015";
@@ -2140,7 +2140,7 @@ rec {
           ];
         };
       };
-      "syn" = rec {
+      "syn" = {
         crateName = "syn";
         version = "1.0.86";
         edition = "2018";
@@ -2194,7 +2194,7 @@ rec {
           "visit"
         ];
       };
-      "synstructure" = rec {
+      "synstructure" = {
         crateName = "synstructure";
         version = "0.12.6";
         edition = "2018";
@@ -2244,7 +2244,7 @@ rec {
           "proc-macro"
         ];
       };
-      "thiserror" = rec {
+      "thiserror" = {
         crateName = "thiserror";
         version = "1.0.30";
         edition = "2018";
@@ -2260,7 +2260,7 @@ rec {
         ];
 
       };
-      "thiserror-impl" = rec {
+      "thiserror-impl" = {
         crateName = "thiserror-impl";
         version = "1.0.30";
         edition = "2018";
@@ -2285,7 +2285,7 @@ rec {
         ];
 
       };
-      "time" = rec {
+      "time" = {
         crateName = "time";
         version = "0.3.7";
         edition = "2018";
@@ -2357,7 +2357,7 @@ rec {
           "time-macros"
         ];
       };
-      "time-macros" = rec {
+      "time-macros" = {
         crateName = "time-macros";
         version = "0.2.3";
         edition = "2018";
@@ -2370,7 +2370,7 @@ rec {
         features = {
         };
       };
-      "typenum" = rec {
+      "typenum" = {
         crateName = "typenum";
         version = "1.15.0";
         edition = "2018";
@@ -2385,7 +2385,7 @@ rec {
           "scale_info" = [ "scale-info/derive" ];
         };
       };
-      "unicode-xid" = rec {
+      "unicode-xid" = {
         crateName = "unicode-xid";
         version = "0.2.2";
         edition = "2015";
@@ -2399,7 +2399,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" ];
       };
-      "untrusted" = rec {
+      "untrusted" = {
         crateName = "untrusted";
         version = "0.7.1";
         edition = "2018";
@@ -2410,7 +2410,7 @@ rec {
         ];
 
       };
-      "vcpkg" = rec {
+      "vcpkg" = {
         crateName = "vcpkg";
         version = "0.2.15";
         edition = "2015";
@@ -2420,7 +2420,7 @@ rec {
         ];
 
       };
-      "version_check" = rec {
+      "version_check" = {
         crateName = "version_check";
         version = "0.9.4";
         edition = "2015";
@@ -2430,7 +2430,7 @@ rec {
         ];
 
       };
-      "wasi" = rec {
+      "wasi" = {
         crateName = "wasi";
         version = "0.10.2+wasi-snapshot-preview1";
         edition = "2018";
@@ -2454,7 +2454,7 @@ rec {
           "std"
         ];
       };
-      "wasm-bindgen" = rec {
+      "wasm-bindgen" = {
         crateName = "wasm-bindgen";
         version = "0.2.79";
         edition = "2018";
@@ -2497,7 +2497,7 @@ rec {
           "std"
         ];
       };
-      "wasm-bindgen-backend" = rec {
+      "wasm-bindgen-backend" = {
         crateName = "wasm-bindgen-backend";
         version = "0.2.79";
         edition = "2018";
@@ -2541,7 +2541,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "spans" ];
       };
-      "wasm-bindgen-macro" = rec {
+      "wasm-bindgen-macro" = {
         crateName = "wasm-bindgen-macro";
         version = "0.2.79";
         edition = "2018";
@@ -2566,7 +2566,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "spans" ];
       };
-      "wasm-bindgen-macro-support" = rec {
+      "wasm-bindgen-macro-support" = {
         crateName = "wasm-bindgen-macro-support";
         version = "0.2.79";
         edition = "2018";
@@ -2606,7 +2606,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "spans" ];
       };
-      "wasm-bindgen-shared" = rec {
+      "wasm-bindgen-shared" = {
         crateName = "wasm-bindgen-shared";
         version = "0.2.79";
         edition = "2018";
@@ -2616,7 +2616,7 @@ rec {
         ];
 
       };
-      "web-sys" = rec {
+      "web-sys" = {
         crateName = "web-sys";
         version = "0.3.56";
         edition = "2018";
@@ -4083,7 +4083,7 @@ rec {
           "Window"
         ];
       };
-      "webpki" = rec {
+      "webpki" = {
         crateName = "webpki";
         version = "0.22.0";
         edition = "2018";
@@ -4111,7 +4111,7 @@ rec {
           "std"
         ];
       };
-      "winapi" = rec {
+      "winapi" = {
         crateName = "winapi";
         version = "0.3.9";
         edition = "2015";
@@ -4139,7 +4139,7 @@ rec {
           "wtypesbase"
         ];
       };
-      "winapi-i686-pc-windows-gnu" = rec {
+      "winapi-i686-pc-windows-gnu" = {
         crateName = "winapi-i686-pc-windows-gnu";
         version = "0.4.0";
         edition = "2015";
@@ -4149,7 +4149,7 @@ rec {
         ];
 
       };
-      "winapi-x86_64-pc-windows-gnu" = rec {
+      "winapi-x86_64-pc-windows-gnu" = {
         crateName = "winapi-x86_64-pc-windows-gnu";
         version = "0.4.0";
         edition = "2015";
@@ -4159,7 +4159,7 @@ rec {
         ];
 
       };
-      "x509-parser" = rec {
+      "x509-parser" = {
         crateName = "x509-parser";
         version = "0.13.0";
         edition = "2018";
@@ -4231,7 +4231,7 @@ rec {
           "verify"
         ];
       };
-      "yasna" = rec {
+      "yasna" = {
         crateName = "yasna";
         version = "0.5.0";
         edition = "2018";
@@ -4259,7 +4259,7 @@ rec {
           "time"
         ];
       };
-      "zeroize" = rec {
+      "zeroize" = {
         crateName = "zeroize";
         version = "1.4.3";
         edition = "2018";
@@ -4284,7 +4284,7 @@ rec {
           "zeroize_derive"
         ];
       };
-      "zeroize_derive" = rec {
+      "zeroize_derive" = {
         crateName = "zeroize_derive";
         version = "1.3.1";
         edition = "2018";
diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix
index 86be047af73b6..e492d03e30268 100644
--- a/pkgs/build-support/rust/lib/default.nix
+++ b/pkgs/build-support/rust/lib/default.nix
@@ -6,7 +6,7 @@
   pkgsTargetTarget,
 }:
 
-rec {
+{
   # These environment variables must be set when using `cargo-c` and
   # several other tools which do not deal well with cross
   # compilation.  The symptom of the problem they fix is errors due
diff --git a/pkgs/build-support/trivial-builders/test/references/default.nix b/pkgs/build-support/trivial-builders/test/references/default.nix
index df0366bf46ba9..34137120d62a2 100644
--- a/pkgs/build-support/trivial-builders/test/references/default.nix
+++ b/pkgs/build-support/trivial-builders/test/references/default.nix
@@ -92,7 +92,7 @@ let
         ;
     };
 
-    meta = with lib; {
+    meta = {
       mainProgram = "references-test";
     };
   });
diff --git a/pkgs/build-support/writers/aliases.nix b/pkgs/build-support/writers/aliases.nix
index 09836fbebd44a..cf369a34b8282 100644
--- a/pkgs/build-support/writers/aliases.nix
+++ b/pkgs/build-support/writers/aliases.nix
@@ -26,8 +26,8 @@ let
     ) aliases;
 
 in
-mapAliases ({
+mapAliases {
   # Cleanup before 22.05, Added 2021-12-11
   writePython2 = "Python 2 is EOL and the use of writers.writePython2 is deprecated.";
   writePython2Bin = "Python 2 is EOL and the use of writers.writePython2Bin is deprecated.";
-})
+}
diff --git a/pkgs/by-name/_0/_0verkill/package.nix b/pkgs/by-name/_0/_0verkill/package.nix
index 1992dd8cc9ae6..3d1341a63c09a 100644
--- a/pkgs/by-name/_0/_0verkill/package.nix
+++ b/pkgs/by-name/_0/_0verkill/package.nix
@@ -41,7 +41,7 @@ gccStdenv.mkDerivation {
     homepage = "https://github.com/hackndev/0verkill";
     description = "ASCII-ART bloody 2D action deathmatch-like game";
     license = with licenses; gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/by-name/_0/_0x/package.nix b/pkgs/by-name/_0/_0x/package.nix
index 27f5baebb2d9d..307eaa4c84dcc 100644
--- a/pkgs/by-name/_0/_0x/package.nix
+++ b/pkgs/by-name/_0/_0x/package.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage {
     description = "Colorful, configurable xxd";
     mainProgram = "0x";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/_4/_4th/package.nix b/pkgs/by-name/_4/_4th/package.nix
index d1a53633b6707..b73c18fd613d0 100644
--- a/pkgs/by-name/_4/_4th/package.nix
+++ b/pkgs/by-name/_4/_4th/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Portable Forth compiler";
     license = lib.licenses.lgpl3Plus;
     mainProgram = "4th";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/_4/_4ti2/package.nix b/pkgs/by-name/_4/_4ti2/package.nix
index 22ac67da8ebc2..4870ee22ae922 100644
--- a/pkgs/by-name/_4/_4ti2/package.nix
+++ b/pkgs/by-name/_4/_4ti2/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     homepage = "https://4ti2.github.io/";
     description = "Software package for algebraic, geometric and combinatorial problems on linear spaces";
     license = with licenses; [ gpl2Plus ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/_9/_9base/package.nix b/pkgs/by-name/_9/_9base/package.nix
index ff53bb89d013c..5bf13d4252066 100644
--- a/pkgs/by-name/_9/_9base/package.nix
+++ b/pkgs/by-name/_9/_9base/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
   strictDeps = true;
   nativeBuildInputs = [ pkg-config ];
-  env.NIX_CFLAGS_COMPILE = toString ([
+  env.NIX_CFLAGS_COMPILE = toString [
     # workaround build failure on -fno-common toolchains like upstream
     # gcc-10. Otherwise build fails as:
     #   ld: diffio.o:(.bss+0x16): multiple definition of `bflag'; diffdir.o:(.bss+0x6): first defined here
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
     "-D_DEFAULT_SOURCE"
     # error: call to undeclared function 'p9mbtowc'; ISO C99 and later do not support implicit function declarations
     "-Wno-error=implicit-function-declaration"
-  ]);
+  ];
   env.LDFLAGS = lib.optionalString enableStatic "-static";
   makeFlags = [
     "PREFIX=${placeholder "out"}"
diff --git a/pkgs/by-name/_9/_9menu/package.nix b/pkgs/by-name/_9/_9menu/package.nix
index 4c338160b98b7..c746d3d7c4549 100644
--- a/pkgs/by-name/_9/_9menu/package.nix
+++ b/pkgs/by-name/_9/_9menu/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     description = "Simple X11 menu program for running commands";
     mainProgram = "9menu";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = libX11.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/aa/aaphoto/package.nix b/pkgs/by-name/aa/aaphoto/package.nix
index 23805f10eadf4..540125a38ec2e 100644
--- a/pkgs/by-name/aa/aaphoto/package.nix
+++ b/pkgs/by-name/aa/aaphoto/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       one-by-one.
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "aaphoto";
   };
diff --git a/pkgs/by-name/ac/ace-of-penguins/package.nix b/pkgs/by-name/ac/ace-of-penguins/package.nix
index 0fa2cf78c9f81..86dc3fa998917 100644
--- a/pkgs/by-name/ac/ace-of-penguins/package.nix
+++ b/pkgs/by-name/ac/ace-of-penguins/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
       Martin Thornquist).
     '';
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix
index 96a8a0d0a78a0..4806b5480e15f 100644
--- a/pkgs/by-name/ac/acpica-tools/package.nix
+++ b/pkgs/by-name/ac/acpica-tools/package.nix
@@ -34,9 +34,9 @@ stdenv.mkDerivation (finalAttrs: {
     "iasl"
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString ([
+  env.NIX_CFLAGS_COMPILE = toString [
     "-O3"
-  ]);
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ac/acr/package.nix b/pkgs/by-name/ac/acr/package.nix
index 5e8297c11a606..7506b6247873b 100644
--- a/pkgs/by-name/ac/acr/package.nix
+++ b/pkgs/by-name/ac/acr/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
       m4. This means that ACR is faster, smaller and easy to use.
     '';
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/af/afterstep/package.nix b/pkgs/by-name/af/afterstep/package.nix
index 7661e5264872d..8cf78b248fa2d 100644
--- a/pkgs/by-name/af/afterstep/package.nix
+++ b/pkgs/by-name/af/afterstep/package.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
       improving aestetics, and efficient use of system resources.
     '';
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "afterstep";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/al/algol68g/package.nix b/pkgs/by-name/al/algol68g/package.nix
index edca142a99cdf..8273d3dde9c4d 100644
--- a/pkgs/by-name/al/algol68g/package.nix
+++ b/pkgs/by-name/al/algol68g/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl3Plus;
     mainProgram = "a68g";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/am/ameba/package.nix b/pkgs/by-name/am/ameba/package.nix
index f7f7f8bd98b6d..e4a802ea88cd0 100644
--- a/pkgs/by-name/am/ameba/package.nix
+++ b/pkgs/by-name/am/ameba/package.nix
@@ -25,6 +25,6 @@ crystal.buildCrystalPackage rec {
     homepage = "https://crystal-ameba.github.io";
     changelog = "https://github.com/crystal-ameba/ameba/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/am/amoco/package.nix b/pkgs/by-name/am/amoco/package.nix
index 42e76b5bd4e1a..2cc25aa242800 100644
--- a/pkgs/by-name/am/amoco/package.nix
+++ b/pkgs/by-name/am/amoco/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-3+1ssFyU7SKFJgDYBQY0kVjmTHOD71D2AjnH+4bfLXo=";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
+  nativeBuildInputs = [
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index d6abffa3745e5..e49ac9b6346ae 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -183,7 +183,7 @@ stdenv.mkDerivation {
     description = "Darktable fork minus the bloat plus some design vision";
     homepage = "https://ansel.photos/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "ansel";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/an/anthy/package.nix b/pkgs/by-name/an/anthy/package.nix
index 9c7cf466705c0..1d908acc86376 100644
--- a/pkgs/by-name/an/anthy/package.nix
+++ b/pkgs/by-name/an/anthy/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     description = "Hiragana text to Kana Kanji mixed text Japanese input method";
     homepage = "https://anthy.osdn.jp/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 
diff --git a/pkgs/by-name/an/antiprism/package.nix b/pkgs/by-name/an/antiprism/package.nix
index fda9f14208083..bccf6309f79d8 100644
--- a/pkgs/by-name/an/antiprism/package.nix
+++ b/pkgs/by-name/an/antiprism/package.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.antiprism.com";
     description = "Collection of programs for generating, manipulating, transforming and viewing polyhedra";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ap/aprx/package.nix b/pkgs/by-name/ap/aprx/package.nix
index 85185873b0ba0..6137983e193c6 100644
--- a/pkgs/by-name/ap/aprx/package.nix
+++ b/pkgs/by-name/ap/aprx/package.nix
@@ -18,11 +18,11 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ perl ];
 
-  env.NIX_CFLAGS_COMPILE = toString ([
+  env.NIX_CFLAGS_COMPILE = toString [
     "-fcommon"
     "-O2"
     "-Wno-implicit-int" # clang, gcc 14
-  ]);
+  ];
 
   configureFlags = [
     "--with-erlangstorage"
diff --git a/pkgs/by-name/ap/apt-offline/package.nix b/pkgs/by-name/ap/apt-offline/package.nix
index f132c29b4c882..640f5a7a63da1 100644
--- a/pkgs/by-name/ap/apt-offline/package.nix
+++ b/pkgs/by-name/ap/apt-offline/package.nix
@@ -52,7 +52,7 @@ python3Packages.buildPythonApplication {
     description = "Offline APT package manager";
     license = with lib.licenses; [ gpl3Plus ];
     mainProgram = "apt-offline";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
 # TODO: verify GUI and pkexec
diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix
index c4b056ac62c50..d08f9263bb217 100644
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://salsa.debian.org/apt-team/apt/-/raw/${finalAttrs.version}/debian/changelog";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "apt";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix
index 458cbb3ce6738..435edc7d3274b 100644
--- a/pkgs/by-name/ar/aranym/package.nix
+++ b/pkgs/by-name/ar/aranym/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "aranym";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ar/aravis/package.nix b/pkgs/by-name/ar/aravis/package.nix
index c619fba3975be..1e8518315d6e2 100644
--- a/pkgs/by-name/ar/aravis/package.nix
+++ b/pkgs/by-name/ar/aravis/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
       gst-plugins-bad
     ]
   )
-  ++ lib.optionals (enableViewer) [ gtk3 ];
+  ++ lib.optionals enableViewer [ gtk3 ];
 
   mesonFlags = [
   ]
diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index 8dcedf453eb22..64a6f4986672b 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Arc from The Browser Company";
     homepage = "https://arc.net/";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     knownVulnerabilities = [ "unmaintained" ];
     platforms = [
       "aarch64-darwin"
diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix
index 754bc2f164339..cf331a8f695cd 100644
--- a/pkgs/by-name/ar/arcan/package.nix
+++ b/pkgs/by-name/ar/arcan/package.nix
@@ -204,7 +204,7 @@ stdenv.mkDerivation (finalAttrs: {
       gpl2Plus
       lgpl2Plus
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ar/archi/package.nix b/pkgs/by-name/ar/archi/package.nix
index fa2e2596f62d9..9fa0132db5ae3 100644
--- a/pkgs/by-name/ar/archi/package.nix
+++ b/pkgs/by-name/ar/archi/package.nix
@@ -67,10 +67,10 @@ stdenv.mkDerivation rec {
         install -D -m755 Archi $out/libexec/Archi
         makeWrapper $out/libexec/Archi $out/bin/Archi \
           --prefix LD_LIBRARY_PATH : ${
-            lib.makeLibraryPath ([
+            lib.makeLibraryPath [
               glib
               webkitgtk_4_1
-            ])
+            ]
           } \
           --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \
           --prefix PATH : ${jdk}/bin
diff --git a/pkgs/by-name/ar/argagg/package.nix b/pkgs/by-name/ar/argagg/package.nix
index b38cd986f77fd..b38cbd6b3e450 100644
--- a/pkgs/by-name/ar/argagg/package.nix
+++ b/pkgs/by-name/ar/argagg/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
       pointers into the original command line argument C-strings.
     '';
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     badPlatforms = [ "aarch64-darwin" ];
   };
diff --git a/pkgs/by-name/ar/argbash/package.nix b/pkgs/by-name/ar/argbash/package.nix
index 9199683464483..4e8c812c81637 100644
--- a/pkgs/by-name/ar/argbash/package.nix
+++ b/pkgs/by-name/ar/argbash/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://argbash.dev/";
     description = "Bash argument parsing code generator";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/as/asciinema/package.nix b/pkgs/by-name/as/asciinema/package.nix
index f84c93eb3faad..501afd19e8976 100644
--- a/pkgs/by-name/as/asciinema/package.nix
+++ b/pkgs/by-name/as/asciinema/package.nix
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
     description = "Terminal session recorder and the best companion of asciinema.org";
     homepage = "https://asciinema.org/";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     mainProgram = "asciinema";
   };
diff --git a/pkgs/by-name/as/asl/package.nix b/pkgs/by-name/as/asl/package.nix
index 0fa9c3fd75f70..76a49b805c94e 100644
--- a/pkgs/by-name/as/asl/package.nix
+++ b/pkgs/by-name/as/asl/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
       are used in workstations and PCs.
     '';
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/by-name/as/aspino/package.nix b/pkgs/by-name/as/aspino/package.nix
index 705964d25c602..d7a857d4ca2fd 100644
--- a/pkgs/by-name/as/aspino/package.nix
+++ b/pkgs/by-name/as/aspino/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     description = "SAT/PseudoBoolean/MaxSat/ASP solver using glucose";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     license = licenses.asl20;
     homepage = "https://alviano.net/software/maxino/";
diff --git a/pkgs/by-name/as/assh/package.nix b/pkgs/by-name/as/assh/package.nix
index f66cb33959d8f..3323c8e1d1699 100644
--- a/pkgs/by-name/as/assh/package.nix
+++ b/pkgs/by-name/as/assh/package.nix
@@ -46,7 +46,7 @@ buildGoModule rec {
     homepage = "https://github.com/moul/assh";
     changelog = "https://github.com/moul/assh/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/by-name/as/assimp/package.nix b/pkgs/by-name/as/assimp/package.nix
index 33a3a0b5de58d..e39c5d0065f22 100644
--- a/pkgs/by-name/as/assimp/package.nix
+++ b/pkgs/by-name/as/assimp/package.nix
@@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DASSIMP_BUILD_ASSIMP_TOOLS=ON" ];
 
-  env.NIX_CFLAGS_COMPILE = toString ([
+  env.NIX_CFLAGS_COMPILE = toString [
     # Needed with GCC 12
     "-Wno-error=array-bounds"
-  ]);
+  ];
 
   meta = with lib; {
     description = "Library to import various 3D model formats";
diff --git a/pkgs/by-name/at/atari800/package.nix b/pkgs/by-name/at/atari800/package.nix
index edf6885117769..367feef63db6e 100644
--- a/pkgs/by-name/at/atari800/package.nix
+++ b/pkgs/by-name/at/atari800/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
       library.
     '';
     license = with lib.licenses; [ gpl2Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix
index 27b42fa2e01e9..427aac0c0c216 100644
--- a/pkgs/by-name/at/ataripp/package.nix
+++ b/pkgs/by-name/at/ataripp/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
       and the Atari 5200 game console. The emulator is auto-configurable and
       will compile on a variety of systems (Linux, Solaris, Irix).
     '';
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     license = with lib.licenses; [ gpl2Plus ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/at/atasm/package.nix b/pkgs/by-name/at/atasm/package.nix
index 5021f93eaf2b7..e48e09bf7db60 100644
--- a/pkgs/by-name/at/atasm/package.nix
+++ b/pkgs/by-name/at/atasm/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     description = "Commandline 6502 assembler compatible with Mac/65";
     license = licenses.gpl2Plus;
     changelog = "https://github.com/CycoPH/atasm/releases/tag/V${version}";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/by-name/au/auctex/package.nix b/pkgs/by-name/au/auctex/package.nix
index 837130e3e697f..e1d148e785bc0 100644
--- a/pkgs/by-name/au/auctex/package.nix
+++ b/pkgs/by-name/au/auctex/package.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  auctex = stdenv.mkDerivation (rec {
+  auctex = stdenv.mkDerivation rec {
     # Make this a valid tex(live-new) package;
     # the pkgs attribute is provided with a hack below.
     pname = "auctex";
@@ -50,7 +50,7 @@ let
       license = licenses.gpl3Plus;
       platforms = platforms.unix;
     };
-  });
+  };
 
 in
 auctex // { pkgs = [ auctex.tex ]; }
diff --git a/pkgs/by-name/au/autobase/package.nix b/pkgs/by-name/au/autobase/package.nix
index 5b2729ce28a9e..6080af77ed0fe 100644
--- a/pkgs/by-name/au/autobase/package.nix
+++ b/pkgs/by-name/au/autobase/package.nix
@@ -32,7 +32,7 @@ buildNpmPackage (finalAttrs: {
     description = "Concise multiwriter for data structures with Hypercore";
     homepage = "https://github.com/holepunchto/autobase";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     teams = with lib.teams; [ ngi ];
   };
 })
diff --git a/pkgs/by-name/au/automaticcomponenttoolkit/package.nix b/pkgs/by-name/au/automaticcomponenttoolkit/package.nix
index ab3dd790aa06f..acb21faaba5b9 100644
--- a/pkgs/by-name/au/automaticcomponenttoolkit/package.nix
+++ b/pkgs/by-name/au/automaticcomponenttoolkit/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     mainProgram = "act";
     homepage = "https://github.com/Autodesk/AutomaticComponentToolkit";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/av/avizo/package.nix b/pkgs/by-name/av/avizo/package.nix
index 47a44f05aa730..b90785b9f20c7 100644
--- a/pkgs/by-name/av/avizo/package.nix
+++ b/pkgs/by-name/av/avizo/package.nix
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    wrapProgram $out/bin/volumectl --suffix PATH : $out/bin:${lib.makeBinPath ([ pamixer ])}
-    wrapProgram $out/bin/lightctl --suffix PATH : $out/bin:${lib.makeBinPath ([ brightnessctl ])}
+    wrapProgram $out/bin/volumectl --suffix PATH : $out/bin:${lib.makeBinPath [ pamixer ]}
+    wrapProgram $out/bin/lightctl --suffix PATH : $out/bin:${lib.makeBinPath [ brightnessctl ]}
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/aw/awstats/package.nix b/pkgs/by-name/aw/awstats/package.nix
index 2bc8b3cfea452..7121925070d76 100644
--- a/pkgs/by-name/aw/awstats/package.nix
+++ b/pkgs/by-name/aw/awstats/package.nix
@@ -27,7 +27,7 @@ perlPackages.buildPerlPackage rec {
 
   propagatedBuildOutputs = [ ]; # otherwise out propagates bin -> cycle
 
-  buildInputs = with perlPackages; [ ]; # plugins will need some
+  buildInputs = [ ]; # plugins will need some
 
   preConfigure = ''
     touch Makefile.PL
diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
index d4d24be8b052a..18afb05894a34 100644
--- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
@@ -77,10 +77,10 @@ stdenv.mkDerivation (finalAttrs: {
     cmake-extras
     lomiri-schemas # lomiri schema
   ])
-  ++ (with mate; [
+  ++ [
     mate.marco # marco schema
     mate.mate-settings-daemon # mate mouse schema
-  ]);
+  ];
 
   nativeCheckInputs = [
     cppcheck
diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix
index e277fa6d81cfb..906d95b13adf6 100644
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@@ -145,7 +145,7 @@
     hash = "sha256-DOuH7BG4WrhP7SQH3GInFh7DHT0qN3JhSG76EXmNn24=";
     description = "Support for repairing Azure Virtual Machines";
     propagatedBuildInputs = with python3Packages; [ opencensus ];
-    meta.maintainers = with lib.maintainers; [ ];
+    meta.maintainers = [ ];
   };
 }
 // lib.optionalAttrs config.allowAliases {
diff --git a/pkgs/by-name/ba/backward-cpp/package.nix b/pkgs/by-name/ba/backward-cpp/package.nix
index c7acd08002f52..44ce9e1d01d09 100644
--- a/pkgs/by-name/ba/backward-cpp/package.nix
+++ b/pkgs/by-name/ba/backward-cpp/package.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/bombela/backward-cpp";
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ba/barrage/package.nix b/pkgs/by-name/ba/barrage/package.nix
index 5236b588d8f35..c07a8ddba8101 100644
--- a/pkgs/by-name/ba/barrage/package.nix
+++ b/pkgs/by-name/ba/barrage/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Destructive action game";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "barrage";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (SDL.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/ba/base16-shell-preview/package.nix b/pkgs/by-name/ba/base16-shell-preview/package.nix
index dfc760d0e8c21..c8f0dba1be1f0 100644
--- a/pkgs/by-name/ba/base16-shell-preview/package.nix
+++ b/pkgs/by-name/ba/base16-shell-preview/package.nix
@@ -26,6 +26,6 @@ python3Packages.buildPythonApplication {
     description = "Browse and preview Base16 Shell themes in your terminal";
     mainProgram = "base16-shell-preview";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ba/basu/package.nix b/pkgs/by-name/ba/basu/package.nix
index 24e27ff19c200..d78f0a98730cc 100644
--- a/pkgs/by-name/ba/basu/package.nix
+++ b/pkgs/by-name/ba/basu/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Sd-bus library, extracted from systemd";
     mainProgram = "basuctl";
     license = lib.licenses.lgpl21Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index 1e95ca7792a2d..42c2c5c388469 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -150,14 +150,14 @@ stdenv.mkDerivation (finalAttrs: {
       '';
 
   env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${
-    lib.makeLibraryPath ([
+    lib.makeLibraryPath [
       libX11
       libXrandr
       libXinerama
       libXext
       libXcursor
       libXScrnSaver
-    ])
+    ]
   }";
 
   dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath
diff --git a/pkgs/by-name/be/beyond-identity/package.nix b/pkgs/by-name/be/beyond-identity/package.nix
index b4d99eac4dbe9..c28fab441b74f 100644
--- a/pkgs/by-name/be/beyond-identity/package.nix
+++ b/pkgs/by-name/be/beyond-identity/package.nix
@@ -17,7 +17,7 @@
 let
   pname = "beyond-identity";
   version = "2.97.0-0";
-  libPath = lib.makeLibraryPath ([
+  libPath = lib.makeLibraryPath [
     glib
     glibc
     openssl
@@ -26,7 +26,7 @@ let
     gnome-keyring
     polkit
     polkit_gnome
-  ]);
+  ];
   meta = with lib; {
     description = "Passwordless MFA identities for workforces, customers, and developers";
     homepage = "https://www.beyondidentity.com";
diff --git a/pkgs/by-name/bi/bibletime/package.nix b/pkgs/by-name/bi/bibletime/package.nix
index 3633f9915698f..a85af4b23bc59 100644
--- a/pkgs/by-name/bi/bibletime/package.nix
+++ b/pkgs/by-name/bi/bibletime/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Powerful cross platform Bible study tool";
     license = lib.licenses.gpl2Plus;
     mainProgram = "bibletime";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/bi/bic/package.nix b/pkgs/by-name/bi/bic/package.nix
index 2a57ca0d54668..2279faf537e17 100644
--- a/pkgs/by-name/bi/bic/package.nix
+++ b/pkgs/by-name/bi/bic/package.nix
@@ -14,7 +14,7 @@
   pkg-config,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "bic";
   version = "1.0.0-unstable-2022-02-16";
 
diff --git a/pkgs/by-name/bi/bigpemu/package.nix b/pkgs/by-name/bi/bigpemu/package.nix
index 5803285572166..c9675700289fe 100644
--- a/pkgs/by-name/bi/bigpemu/package.nix
+++ b/pkgs/by-name/bi/bigpemu/package.nix
@@ -43,7 +43,7 @@ buildFHSEnv {
       tombert
       hughobrien
     ];
-    platforms = with lib.platforms; [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" ];
   };
   runScript = "${bigpemu-unwrapped}/bin/bigpemu";
   passthru = {
diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index f62448360f460..36e65c5f7f537 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -159,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://downloads.isc.org/isc/bind9/cur/${lib.versions.majorMinor finalAttrs.version}/doc/arm/html/notes.html#notes-for-bind-${
       lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version
     }";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
 
     outputsToInstall = [
diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix
index 32b6cda4b3c13..52721b4c6aa42 100644
--- a/pkgs/by-name/bi/bitcomet/package.nix
+++ b/pkgs/by-name/bi/bitcomet/package.nix
@@ -39,6 +39,6 @@ appimageTools.wrapType2 {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix
index 961844da41bde..5f866a0e7470d 100644
--- a/pkgs/by-name/bl/blockattack/package.nix
+++ b/pkgs/by-name/bl/blockattack/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/blockattack/blockattack-game/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "blockattack";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (SDL2.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/bl/bloomeetunes/package.nix b/pkgs/by-name/bl/bloomeetunes/package.nix
index c155618d562d9..06cbc8f327d46 100644
--- a/pkgs/by-name/bl/bloomeetunes/package.nix
+++ b/pkgs/by-name/bl/bloomeetunes/package.nix
@@ -59,7 +59,7 @@ flutter324.buildFlutterApplication rec {
     homepage = "https://github.com/HemantKArya/BloomeeTunes";
     mainProgram = "bloomee";
     license = with lib.licenses; [ gpl2Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/bl/bluejay/package.nix b/pkgs/by-name/bl/bluejay/package.nix
index b0b6126f97ebc..5eb9695c660a1 100644
--- a/pkgs/by-name/bl/bluejay/package.nix
+++ b/pkgs/by-name/bl/bluejay/package.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/EbonJaeger/bluejay/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mpl20;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/bl/bluemail/package.nix b/pkgs/by-name/bl/bluemail/package.nix
index 80535baaf5536..29ff5c5a5997e 100644
--- a/pkgs/by-name/bl/bluemail/package.nix
+++ b/pkgs/by-name/bl/bluemail/package.nix
@@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ];
     # Vendored copy of Electron.
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "bluemail";
   };
 }
diff --git a/pkgs/by-name/bl/bluez-tools/package.nix b/pkgs/by-name/bl/bluez-tools/package.nix
index 916ad45949b6f..66ddbe9288183 100644
--- a/pkgs/by-name/bl/bluez-tools/package.nix
+++ b/pkgs/by-name/bl/bluez-tools/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Set of tools to manage bluetooth devices for linux";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "bt-agent";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix
index 516a8ae7d1994..6935cbbc49855 100644
--- a/pkgs/by-name/bl/bluez/package.nix
+++ b/pkgs/by-name/bl/bluez/package.nix
@@ -184,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: {
       mit
     ];
     mainProgram = "btinfo";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix
index 2f1bff69b415c..6ae68bfdd2675 100644
--- a/pkgs/by-name/bo/bochs/package.nix
+++ b/pkgs/by-name/bo/bochs/package.nix
@@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
       Intel x86 CPU, common I/O devices, and a custom BIOS.
     '';
     license = lib.licenses.lgpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix
index 69bc48b1c852a..d7a5f5d46573b 100644
--- a/pkgs/by-name/bo/boehmgc/package.nix
+++ b/pkgs/by-name/bo/boehmgc/package.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://github.com/ivmai/bdwgc/blob/v${finalAttrs.version}/ChangeLog";
     license = "https://hboehm.info/gc/license.txt"; # non-copyleft, X11-style license
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/bo/bozohttpd/package.nix b/pkgs/by-name/bo/bozohttpd/package.nix
index f36598c627758..b1b3c5407233c 100644
--- a/pkgs/by-name/bo/bozohttpd/package.nix
+++ b/pkgs/by-name/bo/bozohttpd/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxcrypt
     openssl
   ]
-  ++ lib.optionals (luaSupport) [ lua ];
+  ++ lib.optionals luaSupport [ lua ];
 
   nativeBuildInputs = [
     bmake
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
         # unpackaged dependency: https://man.netbsd.org/blocklist.3
         "-DNO_BLOCKLIST_SUPPORT"
       ]
-      ++ lib.optionals (htpasswdSupport) [ "-DDO_HTPASSWD" ]
+      ++ lib.optionals htpasswdSupport [ "-DDO_HTPASSWD" ]
       ++ lib.optionals (!cgiSupport) [ "-DNO_CGIBIN_SUPPORT" ]
       ++ lib.optionals (!dirIndexSupport) [ "-DNO_DIRINDEX_SUPPORT" ]
       ++ lib.optionals (!dynamicContentSupport) [ "-DNO_DYNAMIC_CONTENT" ]
@@ -72,8 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
     _LDADD = lib.concatStringsSep " " (
       [ "-lm" ]
       ++ lib.optionals (stdenv.hostPlatform.libc != "libSystem") [ "-lcrypt" ]
-      ++ lib.optionals (luaSupport) [ "-llua" ]
-      ++ lib.optionals (sslSupport) [
+      ++ lib.optionals luaSupport [ "-llua" ]
+      ++ lib.optionals sslSupport [
         "-lcrypto"
         "-lssl"
       ]
diff --git a/pkgs/by-name/bq/bqn/package.nix b/pkgs/by-name/bq/bqn/package.nix
index 7b7fed4a3211a..28dac55e2b6c1 100644
--- a/pkgs/by-name/bq/bqn/package.nix
+++ b/pkgs/by-name/bq/bqn/package.nix
@@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/mlochbaum/BQN/";
     description = "Original BQN implementation in Javascript";
     license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (nodejs.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/br/brill/package.nix b/pkgs/by-name/br/brill/package.nix
index 0fd0c940a8390..a077e5a1c169f 100644
--- a/pkgs/by-name/br/brill/package.nix
+++ b/pkgs/by-name/br/brill/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     stripRoot = false;
   };
 
-  installPhase = with finalAttrs; ''
+  installPhase = ''
     runHook preInstall
 
     install -Dm644 *.ttf          -t $out/share/fonts/truetype
diff --git a/pkgs/by-name/bs/bsd-finger/package.nix b/pkgs/by-name/bs/bsd-finger/package.nix
index 7de8e315673f2..8f0a22079ca3e 100644
--- a/pkgs/by-name/bs/bsd-finger/package.nix
+++ b/pkgs/by-name/bs/bsd-finger/package.nix
@@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: {
         "daemon" = "fingerd";
       }
       .${buildProduct};
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/bt/btanks/package.nix b/pkgs/by-name/bt/btanks/package.nix
index 795733f2a24be..6a57edbf9744f 100644
--- a/pkgs/by-name/bt/btanks/package.nix
+++ b/pkgs/by-name/bt/btanks/package.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Fast 2d tank arcade game with multiplayer and split-screen modes";
     license = lib.licenses.gpl2Plus;
     mainProgram = "btanks";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (SDL.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/bu/butterfly/package.nix b/pkgs/by-name/bu/butterfly/package.nix
index 96af2dc290b8a..4a0607badc3e5 100644
--- a/pkgs/by-name/bu/butterfly/package.nix
+++ b/pkgs/by-name/bu/butterfly/package.nix
@@ -68,7 +68,7 @@ flutter329.buildFlutterApplication rec {
       cc-by-sa-40
       asl20
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = [
       "aarch64-linux"
       "x86_64-linux"
diff --git a/pkgs/by-name/by/byacc/package.nix b/pkgs/by-name/by/byacc/package.nix
index 9eb54ff223bf3..efb7dc07077dc 100644
--- a/pkgs/by-name/by/byacc/package.nix
+++ b/pkgs/by-name/by/byacc/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://invisible-island.net/byacc/CHANGES.html";
     license = lib.licenses.publicDomain;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/by/byobu/package.nix b/pkgs/by-name/by/byobu/package.nix
index 42dbc0613f901..df1b769f2b7dc 100644
--- a/pkgs/by-name/by/byobu/package.nix
+++ b/pkgs/by-name/by/byobu/package.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ gpl3Plus ];
     mainProgram = "byobu";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ca/cagebreak/package.nix b/pkgs/by-name/ca/cagebreak/package.nix
index b0611707e04f3..49601ee280cf3 100644
--- a/pkgs/by-name/ca/cagebreak/package.nix
+++ b/pkgs/by-name/ca/cagebreak/package.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/project-repo/cagebreak";
     description = "Wayland tiling compositor inspired by ratpoison";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     changelog = "https://github.com/project-repo/cagebreak/blob/${finalAttrs.version}/Changelog.md";
     mainProgram = "cagebreak";
diff --git a/pkgs/by-name/ca/calcoo/package.nix b/pkgs/by-name/ca/calcoo/package.nix
index b65c7cb118279..3c575b821ae6e 100644
--- a/pkgs/by-name/ca/calcoo/package.nix
+++ b/pkgs/by-name/ca/calcoo/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://calcoo.sourceforge.net/";
     license = lib.licenses.gpl2Plus;
     mainProgram = "calcoo";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (jdk.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/ca/calculix-ccx/package.nix b/pkgs/by-name/ca/calculix-ccx/package.nix
index 4d59d0d995244..b9ddbcee6242a 100644
--- a/pkgs/by-name/ca/calculix-ccx/package.nix
+++ b/pkgs/by-name/ca/calculix-ccx/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     description = "Three-dimensional structural finite element program";
     mainProgram = "ccx";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ca/cardboard/package.nix b/pkgs/by-name/ca/cardboard/package.nix
index 2c966d891715c..a36c32fed141a 100644
--- a/pkgs/by-name/ca/cardboard/package.nix
+++ b/pkgs/by-name/ca/cardboard/package.nix
@@ -140,7 +140,7 @@ stdenv.mkDerivation {
     description = "Scrollable, tiling Wayland compositor inspired on PaperWM";
     license = lib.licenses.gpl3Only;
     mainProgram = "cardboard";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (wayland.meta) platforms;
   };
 }
diff --git a/pkgs/by-name/ca/cat9/package.nix b/pkgs/by-name/ca/cat9/package.nix
index 293de88569c2c..87ab4e51f3f72 100644
--- a/pkgs/by-name/ca/cat9/package.nix
+++ b/pkgs/by-name/ca/cat9/package.nix
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/letoram/cat9";
     description = "User shell for LASH";
     license = with lib.licenses; [ unlicense ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ca/catamaran/package.nix b/pkgs/by-name/ca/catamaran/package.nix
index b13116b6ee223..fd723061eb321 100644
--- a/pkgs/by-name/ca/catamaran/package.nix
+++ b/pkgs/by-name/ca/catamaran/package.nix
@@ -37,6 +37,6 @@ stdenvNoCC.mkDerivation {
     '';
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cb/cbftp/package.nix b/pkgs/by-name/cb/cbftp/package.nix
index 566fb6a8354c8..3a165428ce550 100644
--- a/pkgs/by-name/cb/cbftp/package.nix
+++ b/pkgs/by-name/cb/cbftp/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       semi-graphical user interface through ncurses.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/by-name/cc/cc65/package.nix b/pkgs/by-name/cc/cc65/package.nix
index 26dfb5a45b92e..a5444ee5adc7e 100644
--- a/pkgs/by-name/cc/cc65/package.nix
+++ b/pkgs/by-name/cc/cc65/package.nix
@@ -56,7 +56,7 @@ gccStdenv.mkDerivation rec {
       shouldn't be too much work.
     '';
     license = licenses.zlib;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/cd/cddl/package.nix b/pkgs/by-name/cd/cddl/package.nix
index b58df69e6bf96..07fff5a887023 100644
--- a/pkgs/by-name/cd/cddl/package.nix
+++ b/pkgs/by-name/cd/cddl/package.nix
@@ -11,7 +11,7 @@ bundlerApp {
   gemfile = ./Gemfile;
   lockfile = ./Gemfile.lock;
 
-  gemset = lib.recursiveUpdate (import ./gemset.nix) ({
+  gemset = lib.recursiveUpdate (import ./gemset.nix) {
     "cddl" = {
       dontBuild = false;
       # setting env vars is not supported by patchShebangs
@@ -19,7 +19,7 @@ bundlerApp {
         sed -i 's\#!/usr/bin/env RUBY_THREAD_VM_STACK_SIZE=5000000\#!/usr/bin/env\' bin/cddl
       '';
     };
-  });
+  };
 
   exes = [ "cddl" ];
 
diff --git a/pkgs/by-name/ce/celeste64/package.nix b/pkgs/by-name/ce/celeste64/package.nix
index 0fd0850ecdaf8..2fb6ec64b7111 100644
--- a/pkgs/by-name/ce/celeste64/package.nix
+++ b/pkgs/by-name/ce/celeste64/package.nix
@@ -83,7 +83,7 @@ buildDotnetModule rec {
       "aarch64-linux"
       "armv7l-linux"
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "Celeste64";
     homepage = "https://github.com/ExOK/Celeste64";
     description = "Celeste 64: Fragments of the Mountain";
diff --git a/pkgs/by-name/ce/cereal_1_3_0/package.nix b/pkgs/by-name/ce/cereal_1_3_0/package.nix
index d1fb82a6267db..2f433d7f268eb 100644
--- a/pkgs/by-name/ce/cereal_1_3_0/package.nix
+++ b/pkgs/by-name/ce/cereal_1_3_0/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Header-only C++11 serialization library";
     changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ce/cereal_1_3_2/package.nix b/pkgs/by-name/ce/cereal_1_3_2/package.nix
index eaf481144c2c0..2621ae387a2c0 100644
--- a/pkgs/by-name/ce/cereal_1_3_2/package.nix
+++ b/pkgs/by-name/ce/cereal_1_3_2/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Header-only C++11 serialization library";
     changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix
index 2f9958f054172..ec23812f8ae30 100644
--- a/pkgs/by-name/cf/cfripper/package.nix
+++ b/pkgs/by-name/cf/cfripper/package.nix
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
     setuptools-scm
   ];
 
-  nativeBuildInputs = with python3.pkgs; [
+  nativeBuildInputs = [
   ];
 
   dependencies = with python3.pkgs; [
diff --git a/pkgs/by-name/ch/check-sieve/package.nix b/pkgs/by-name/ch/check-sieve/package.nix
index ac76b9a90868c..16732c0efdbe8 100644
--- a/pkgs/by-name/ch/check-sieve/package.nix
+++ b/pkgs/by-name/ch/check-sieve/package.nix
@@ -8,7 +8,7 @@
   python3,
   nix-update-script,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "check-sieve";
   version = "0.10-unstable-2025-05-06";
 
diff --git a/pkgs/by-name/ch/chemacs2/package.nix b/pkgs/by-name/ch/chemacs2/package.nix
index 1446fbb08ec7a..9bce24384d04f 100644
--- a/pkgs/by-name/ch/chemacs2/package.nix
+++ b/pkgs/by-name/ch/chemacs2/package.nix
@@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       Think of it as a bootloader for Emacs.
     '';
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ch/chemtool/package.nix b/pkgs/by-name/ch/chemtool/package.nix
index 809fefab63215..a3d57e1213ffe 100644
--- a/pkgs/by-name/ch/chemtool/package.nix
+++ b/pkgs/by-name/ch/chemtool/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
       hexagonal backdrop grids for easier alignment.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index cfb6e9e278ad0..2c02468c72990 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/CherryHQ/cherry-studio/releases/tag/v${finalAttrs.version}";
     mainProgram = "cherry-studio";
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     license = with lib.licenses; [ agpl3Only ];
   };
 })
diff --git a/pkgs/by-name/ch/chez-racket/shared.nix b/pkgs/by-name/ch/chez-racket/shared.nix
index f68063bf1a7fa..5e80c2ff7a5d2 100644
--- a/pkgs/by-name/ch/chez-racket/shared.nix
+++ b/pkgs/by-name/ch/chez-racket/shared.nix
@@ -35,10 +35,10 @@ stdenv.mkDerivation (
       export LZ4="$(find ${lz4.lib}/lib -type f | sort | head -n1)"
     '';
 
-    nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin ([
+    nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
       cctools
       darwin.autoSignDarwinBinariesHook
-    ]);
+    ];
     buildInputs = [
       libiconv
       libX11
diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix
index 852c3f9a268c6..33c907d423e76 100644
--- a/pkgs/by-name/ch/chezmoi/package.nix
+++ b/pkgs/by-name/ch/chezmoi/package.nix
@@ -46,7 +46,7 @@ let
       changelog = "https://github.com/twpayne/chezmoi/releases/tag/${argset.src.rev}";
       license = lib.licenses.mit;
       mainProgram = "chezmoi";
-      maintainers = with lib.maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/by-name/ch/chromium-bsu/package.nix b/pkgs/by-name/ch/chromium-bsu/package.nix
index 56dd8ba10bfe9..84e57c61ab1d7 100644
--- a/pkgs/by-name/ch/chromium-bsu/package.nix
+++ b/pkgs/by-name/ch/chromium-bsu/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     description = "Fast paced, arcade-style, top-scrolling space shooter";
     mainProgram = "chromium-bsu";
     license = licenses.artistic1;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ch/chsrc/package.nix b/pkgs/by-name/ch/chsrc/package.nix
index 48657350626b3..f72b2f7b7998a 100644
--- a/pkgs/by-name/ch/chsrc/package.nix
+++ b/pkgs/by-name/ch/chsrc/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
       gpl3Plus
       mit
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     mainProgram = "chsrc";
   };
diff --git a/pkgs/by-name/ci/ciano/package.nix b/pkgs/by-name/ci/ciano/package.nix
index 650526eec16fd..db6b1b7b84d6c 100644
--- a/pkgs/by-name/ci/ciano/package.nix
+++ b/pkgs/by-name/ci/ciano/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/robertsanseries/ciano";
     description = "Multimedia file converter focused on simplicity";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
index f91e6612a0040..6b36066670bd0 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation {
     homepage = "https://www.netacad.com/courses/packet-tracer";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/by-name/cl/clashtui/package.nix b/pkgs/by-name/cl/clashtui/package.nix
index 4e513703be9d4..086aec1809bea 100644
--- a/pkgs/by-name/cl/clashtui/package.nix
+++ b/pkgs/by-name/cl/clashtui/package.nix
@@ -45,6 +45,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "clashtui";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cl/clevis/package.nix b/pkgs/by-name/cl/clevis/package.nix
index 61c85751299d2..a71ac5485cf55 100644
--- a/pkgs/by-name/cl/clevis/package.nix
+++ b/pkgs/by-name/cl/clevis/package.nix
@@ -125,6 +125,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://github.com/latchset/clevis/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/co/codd/package.nix b/pkgs/by-name/co/codd/package.nix
index cf042055a3894..e76ec150994e0 100644
--- a/pkgs/by-name/co/codd/package.nix
+++ b/pkgs/by-name/co/codd/package.nix
@@ -19,7 +19,7 @@ let
 
   generated = haskellPackages.callPackage ./generated.nix { haxl = haxlJailbroken; };
 
-  derivationWithVersion = haskell.lib.compose.overrideCabal (rec {
+  derivationWithVersion = haskell.lib.compose.overrideCabal rec {
     version = "0.1.6";
     src = fetchFromGitHub {
       owner = "mzabani";
@@ -48,6 +48,6 @@ let
     changelog = "https://github.com/mzabani/codd/releases/tag/v${version}";
 
     maintainers = with lib.maintainers; [ mzabani ];
-  }) generated;
+  } generated;
 in
 haskell.lib.compose.justStaticExecutables derivationWithVersion
diff --git a/pkgs/by-name/co/code-nautilus/package.nix b/pkgs/by-name/co/code-nautilus/package.nix
index 91925d5d9d407..873a36f17f8a6 100644
--- a/pkgs/by-name/co/code-nautilus/package.nix
+++ b/pkgs/by-name/co/code-nautilus/package.nix
@@ -5,7 +5,7 @@
   nautilus-python,
   python3,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "code-nautilus";
   version = "0-unstable-2024-09-11";
 
diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix
index 186a5a3102b0f..2f8562909fb66 100644
--- a/pkgs/by-name/co/coin3d/package.nix
+++ b/pkgs/by-name/co/coin3d/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "High-level, retained-mode toolkit for effective 3D graphics development";
     mainProgram = "coin-config";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 })
diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix
index add95896414a9..f9de2e88ea757 100644
--- a/pkgs/by-name/co/composefs/package.nix
+++ b/pkgs/by-name/co/composefs/package.nix
@@ -63,9 +63,9 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
   ]
   ++ lib.optional fuseSupport fuse3
-  ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([
+  ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) [
     libcap
-  ]);
+  ];
 
   doCheck = true;
   nativeCheckInputs = [
diff --git a/pkgs/by-name/co/connman/package.nix b/pkgs/by-name/co/connman/package.nix
index 7990bf6dbef35..530daeb8c32cd 100644
--- a/pkgs/by-name/co/connman/package.nix
+++ b/pkgs/by-name/co/connman/package.nix
@@ -114,9 +114,9 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ optionals (firewallType == "iptables") [ iptables ]
   ++ optionals (firewallType == "nftables") [ libnftnl ]
-  ++ optionals (enableOpenconnect) [ openconnect ]
-  ++ optionals (enablePolkit) [ polkit ]
-  ++ optionals (enablePptp) [
+  ++ optionals enableOpenconnect [ openconnect ]
+  ++ optionals enablePolkit [ polkit ]
+  ++ optionals enablePptp [
     pptp
     ppp
   ];
@@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/about/";
     license = lib.licenses.gpl2Only;
     mainProgram = "connmanctl";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix
index 470c2535842eb..fe2128f5e77b8 100644
--- a/pkgs/by-name/co/converseen/package.nix
+++ b/pkgs/by-name/co/converseen/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://converseen.fasterland.net/";
     changelog = "https://github.com/Faster3ck/Converseen/blob/${finalAttrs.src.rev}/CHANGELOG";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "converseen";
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/co/copacetic/package.nix b/pkgs/by-name/co/copacetic/package.nix
index ea59d9723cac4..39bc4eca938f0 100644
--- a/pkgs/by-name/co/copacetic/package.nix
+++ b/pkgs/by-name/co/copacetic/package.nix
@@ -62,6 +62,6 @@ buildGoModule rec {
     description = "Tool for directly patching vulnerabilities in container images";
     license = lib.licenses.asl20;
     mainProgram = "copa";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/co/cordless/package.nix b/pkgs/by-name/co/cordless/package.nix
index f58b6752ea633..78834d5ba57a1 100644
--- a/pkgs/by-name/co/cordless/package.nix
+++ b/pkgs/by-name/co/cordless/package.nix
@@ -24,6 +24,6 @@ buildGoModule rec {
     description = "Discord terminal client";
     mainProgram = "cordless";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/co/countryguess/package.nix b/pkgs/by-name/co/countryguess/package.nix
index 22cf4135f4dbf..36982553f788c 100644
--- a/pkgs/by-name/co/countryguess/package.nix
+++ b/pkgs/by-name/co/countryguess/package.nix
@@ -5,7 +5,7 @@
   makeWrapper,
 }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
   pname = "countryguess";
   version = "0-unstable-2025-03-04";
   # upstream pyproject.toml is nonsense. Copied from another project
diff --git a/pkgs/by-name/cr/cronie/package.nix b/pkgs/by-name/cr/cronie/package.nix
index 068c4f0ca63ff..1b58dee721200 100644
--- a/pkgs/by-name/cr/cronie/package.nix
+++ b/pkgs/by-name/cr/cronie/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl21Plus
     ];
     mainProgram = "crond";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/cr/crossfire-gridarta/package.nix b/pkgs/by-name/cr/crossfire-gridarta/package.nix
index 59d274d9774b6..e9a2409c3b250 100644
--- a/pkgs/by-name/cr/crossfire-gridarta/package.nix
+++ b/pkgs/by-name/cr/crossfire-gridarta/package.nix
@@ -7,7 +7,7 @@
   gradle,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "crossfire-gridarta";
   version = "2025-04";
 
diff --git a/pkgs/by-name/cr/cryptopp/package.nix b/pkgs/by-name/cr/cryptopp/package.nix
index bb7e856d3ccee..866cd5170e822 100644
--- a/pkgs/by-name/cr/cryptopp/package.nix
+++ b/pkgs/by-name/cr/cryptopp/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   hardeningDisable = [ "fortify" ];
-  CXXFLAGS = lib.optionals (withOpenMP) [ "-fopenmp" ];
+  CXXFLAGS = lib.optionals withOpenMP [ "-fopenmp" ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/cs/csvkit/package.nix b/pkgs/by-name/cs/csvkit/package.nix
index 1c69c0be9d9ea..52cf8a05e3507 100644
--- a/pkgs/by-name/cs/csvkit/package.nix
+++ b/pkgs/by-name/cs/csvkit/package.nix
@@ -38,6 +38,6 @@ python3Packages.buildPythonApplication rec {
     description = "Suite of command-line tools for converting to and working with CSV";
     changelog = "https://github.com/wireservice/csvkit/blob/${version}/CHANGELOG.rst";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ct/ctx/package.nix b/pkgs/by-name/ct/ctx/package.nix
index d93ef15d33c84..9c3d9f487197c 100644
--- a/pkgs/by-name/ct/ctx/package.nix
+++ b/pkgs/by-name/ct/ctx/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
       a vector graphics protocol.
     '';
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/cu/cue2pops/package.nix b/pkgs/by-name/cu/cue2pops/package.nix
index d54c400cdee9b..795f89678aa38 100644
--- a/pkgs/by-name/cu/cue2pops/package.nix
+++ b/pkgs/by-name/cu/cue2pops/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     # Upstream license is unclear.
     # <https://github.com/ErikAndren/cue2pops-mac/issues/2#issuecomment-673983298>
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     mainProgram = "cue2pops";
   };
diff --git a/pkgs/by-name/cy/cyberpunk-neon/package.nix b/pkgs/by-name/cy/cyberpunk-neon/package.nix
index 9c209040827bf..bef9ca3d5dac9 100644
--- a/pkgs/by-name/cy/cyberpunk-neon/package.nix
+++ b/pkgs/by-name/cy/cyberpunk-neon/package.nix
@@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation {
     homepage = "https://github.com/Roboron3042/Cyberpunk-Neon";
     description = "Neon themes for many programs";
     license = lib.licenses.cc-by-sa-40;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/da/davix/package.nix b/pkgs/by-name/da/davix/package.nix
index 8af041600482d..5bdecbd6dff30 100644
--- a/pkgs/by-name/da/davix/package.nix
+++ b/pkgs/by-name/da/davix/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     rapidjson
   ]
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid
-  ++ lib.optional (enableThirdPartyCopy) gsoap;
+  ++ lib.optional enableThirdPartyCopy gsoap;
 
   # using the url below since the github release page states
   # "please ignore the GitHub-generated tarballs, as they are incomplete"
diff --git a/pkgs/by-name/dd/ddsmt/package.nix b/pkgs/by-name/dd/ddsmt/package.nix
index 74616fd67e15a..22e4cf83a7346 100644
--- a/pkgs/by-name/dd/ddsmt/package.nix
+++ b/pkgs/by-name/dd/ddsmt/package.nix
@@ -31,6 +31,6 @@ python3Packages.buildPythonApplication {
     description = "Delta debugger for SMT benchmarks in SMT-LIB v2";
     homepage = "https://ddsmt.readthedocs.io/";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix
index af377878b5f21..9bb4d7a53d13a 100644
--- a/pkgs/by-name/de/debianutils/package.nix
+++ b/pkgs/by-name/de/debianutils/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
       smail
     ];
     mainProgram = "ischroot";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/de/deckmaster/package.nix b/pkgs/by-name/de/deckmaster/package.nix
index 84e659b6f96ea..a3a030ae1346c 100644
--- a/pkgs/by-name/de/deckmaster/package.nix
+++ b/pkgs/by-name/de/deckmaster/package.nix
@@ -42,7 +42,7 @@ buildGoModule rec {
     homepage = "https://github.com/muesli/deckmaster";
     changelog = "https://github.com/muesli/deckmaster/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/de/denemo/package.nix b/pkgs/by-name/de/denemo/package.nix
index 837791645e1e9..ac500882d15fc 100644
--- a/pkgs/by-name/de/denemo/package.nix
+++ b/pkgs/by-name/de/denemo/package.nix
@@ -26,7 +26,7 @@
   wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "denemo";
   version = "2.6.43";
 
diff --git a/pkgs/by-name/dg/dgen-sdl/package.nix b/pkgs/by-name/dg/dgen-sdl/package.nix
index 00dfc5471012f..bb23f0687aa53 100644
--- a/pkgs/by-name/dg/dgen-sdl/package.nix
+++ b/pkgs/by-name/dg/dgen-sdl/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
       - VGM dumping
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/by-name/di/dictu/package.nix b/pkgs/by-name/di/dictu/package.nix
index 7d818a8c0b938..7d2743cb193ee 100644
--- a/pkgs/by-name/di/dictu/package.nix
+++ b/pkgs/by-name/di/dictu/package.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
     mainProgram = "dictu";
     homepage = "https://dictu-lang.com";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dictu.x86_64-darwin
   };
diff --git a/pkgs/by-name/di/dillo/package.nix b/pkgs/by-name/di/dillo/package.nix
index e32387f02ca23..5f124892b00c9 100644
--- a/pkgs/by-name/di/dillo/package.nix
+++ b/pkgs/by-name/di/dillo/package.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
       - Helps authors to comply with web standards by using the bug meter.
     '';
     mainProgram = "dillo";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix
index 985fd506bd60e..d8fdc1edcc9e6 100644
--- a/pkgs/by-name/di/discordchatexporter-cli/package.nix
+++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix
@@ -40,7 +40,7 @@ buildDotnetModule rec {
     homepage = "https://github.com/Tyrrrz/DiscordChatExporter";
     license = licenses.gpl3Plus;
     changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "discordchatexporter-cli";
   };
diff --git a/pkgs/by-name/di/disk-filltest/package.nix b/pkgs/by-name/di/disk-filltest/package.nix
index 0ad1c9d7e79fc..f106ed446f068 100644
--- a/pkgs/by-name/di/disk-filltest/package.nix
+++ b/pkgs/by-name/di/disk-filltest/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl3Plus;
     mainProgram = "disk-filltest";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/dn/dns-over-https/package.nix b/pkgs/by-name/dn/dns-over-https/package.nix
index c4c26c1d47ee8..d9a55bc7e2c4b 100644
--- a/pkgs/by-name/dn/dns-over-https/package.nix
+++ b/pkgs/by-name/dn/dns-over-https/package.nix
@@ -34,7 +34,7 @@ buildGoModule rec {
     changelog = "https://github.com/m13253/dns-over-https/releases/tag/v${version}";
     description = "High performance DNS over HTTPS client & server";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/do/docopt_cpp/package.nix b/pkgs/by-name/do/docopt_cpp/package.nix
index 2b45d2e9c15d9..37c50283f698f 100644
--- a/pkgs/by-name/do/docopt_cpp/package.nix
+++ b/pkgs/by-name/do/docopt_cpp/package.nix
@@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
       boost
     ];
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix
index 8794d3bc00d53..8400194f1ed61 100644
--- a/pkgs/by-name/do/dokieli/package.nix
+++ b/pkgs/by-name/do/dokieli/package.nix
@@ -49,10 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     makeWrapper ${nodejs}/bin/npx $out/bin/dokieli           \
       --prefix PATH : ${
-        lib.makeBinPath ([
+        lib.makeBinPath [
           nodejs
           xsel
-        ])
+        ]
       }   \
       --add-flags serve                                      \
       --chdir $out/deps/dokieli
diff --git a/pkgs/by-name/do/doomretro/package.nix b/pkgs/by-name/do/doomretro/package.nix
index b332fafe1aa57..bb7c05f0c7db2 100644
--- a/pkgs/by-name/do/doomretro/package.nix
+++ b/pkgs/by-name/do/doomretro/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl3Plus;
     mainProgram = "doomretro";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix
index 94074ca6035ee..11c63685452d9 100644
--- a/pkgs/by-name/do/doublecmd/package.nix
+++ b/pkgs/by-name/do/doublecmd/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Two-panel graphical file manager written in Pascal";
     license = lib.licenses.gpl2Plus;
     mainProgram = "doublecmd";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/dp/dpms-off/package.nix b/pkgs/by-name/dp/dpms-off/package.nix
index 2fd41461ada70..1a8cc1bf29d68 100644
--- a/pkgs/by-name/dp/dpms-off/package.nix
+++ b/pkgs/by-name/dp/dpms-off/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "dpms-off";
   version = "0.2.1";
 
diff --git a/pkgs/by-name/dt/dtrx/package.nix b/pkgs/by-name/dt/dtrx/package.nix
index 837f434fb9816..4354b252ee442 100644
--- a/pkgs/by-name/dt/dtrx/package.nix
+++ b/pkgs/by-name/dt/dtrx/package.nix
@@ -49,8 +49,8 @@ python3Packages.buildPythonApplication rec {
           xz
           lzip
         ]
-        ++ lib.optional (unzipSupport) unzip
-        ++ lib.optional (unrarSupport) unrar
+        ++ lib.optional unzipSupport unzip
+        ++ lib.optional unrarSupport unrar
       );
     in
     [
diff --git a/pkgs/by-name/du/dump/package.nix b/pkgs/by-name/du/dump/package.nix
index 18b71518ba418..7915eb2afc53b 100644
--- a/pkgs/by-name/du/dump/package.nix
+++ b/pkgs/by-name/du/dump/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     homepage = "https://dump.sourceforge.io/";
     description = "Linux Ext2 filesystem dump/restore utilities";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/du/durden/package.nix b/pkgs/by-name/du/durden/package.nix
index ec2551d8edf31..ddade15821a18 100644
--- a/pkgs/by-name/du/durden/package.nix
+++ b/pkgs/by-name/du/durden/package.nix
@@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       of the desktop environment spectrum.
     '';
     license = with lib.licenses; [ bsd3 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/dv/dvdstyler/package.nix b/pkgs/by-name/dv/dvdstyler/package.nix
index 050cc09b78b41..d845151b3e628 100644
--- a/pkgs/by-name/dv/dvdstyler/package.nix
+++ b/pkgs/by-name/dv/dvdstyler/package.nix
@@ -127,7 +127,7 @@ stdenv.mkDerivation rec {
       - customize navigation using DVD scripting
     '';
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux;
     mainProgram = "dvdstyler";
   };
diff --git a/pkgs/by-name/dx/dxa/package.nix b/pkgs/by-name/dx/dxa/package.nix
index 5ff1ca4d45b0d..9732e219ccd15 100644
--- a/pkgs/by-name/dx/dxa/package.nix
+++ b/pkgs/by-name/dx/dxa/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Andre Fachat's open-source 6502 disassembler";
     mainProgram = "dxa";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
   };
 })
diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix
index b2646abeddf0e..5071b5e7688b8 100644
--- a/pkgs/by-name/ea/earthlyls/package.nix
+++ b/pkgs/by-name/ea/earthlyls/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/glehmann/earthlyls/releases/tag/${version}";
     license = lib.licenses.mit;
     mainProgram = "earthlyls";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/ec/eclipse-mat/package.nix b/pkgs/by-name/ec/eclipse-mat/package.nix
index 5bbb87b125c5b..dc142a0004456 100644
--- a/pkgs/by-name/ec/eclipse-mat/package.nix
+++ b/pkgs/by-name/ec/eclipse-mat/package.nix
@@ -74,12 +74,12 @@ stdenv.mkDerivation rec {
     makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \
       --prefix PATH : ${jdk}/bin \
       --prefix LD_LIBRARY_PATH : ${
-        lib.makeLibraryPath ([
+        lib.makeLibraryPath [
           glib
           gtk3
           libXtst
           webkitgtk_4_1
-        ])
+        ]
       } \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
       --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration"
diff --git a/pkgs/by-name/ec/ecmtools/package.nix b/pkgs/by-name/ec/ecmtools/package.nix
index 6bc83e944b2c9..0e83b3113e5c3 100644
--- a/pkgs/by-name/ec/ecmtools/package.nix
+++ b/pkgs/by-name/ec/ecmtools/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/alucryd/ecm-tools";
     license = lib.licenses.gpl3Plus;
     mainProgram = "bin2ecm";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ec/ecryptfs/package.nix b/pkgs/by-name/ec/ecryptfs/package.nix
index d38fc3e91101c..ca7ad28850a1d 100644
--- a/pkgs/by-name/ec/ecryptfs/package.nix
+++ b/pkgs/by-name/ec/ecryptfs/package.nix
@@ -64,14 +64,14 @@ stdenv.mkDerivation rec {
     intltool
   ]
   # if python2 support is requested, it is needed at builtime as well as runtime.
-  ++ lib.optionals (enablePython) [ python2 ];
+  ++ lib.optionals enablePython [ python2 ];
   buildInputs = [
     perl
     nss
     nspr
     pam
   ]
-  ++ lib.optionals (enablePython) [ python2 ];
+  ++ lib.optionals enablePython [ python2 ];
   propagatedBuildInputs = [
     coreutils
     gettext
diff --git a/pkgs/by-name/ed/ed/package.nix b/pkgs/by-name/ed/ed/package.nix
index 334b5ddc35a1c..a789749cb5dc4 100644
--- a/pkgs/by-name/ed/ed/package.nix
+++ b/pkgs/by-name/ed/ed/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl3Plus;
     mainProgram = "ed";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ed/eddie/package.nix b/pkgs/by-name/ed/eddie/package.nix
index 104733fdb62a6..7bc1435cddad2 100644
--- a/pkgs/by-name/ed/eddie/package.nix
+++ b/pkgs/by-name/ed/eddie/package.nix
@@ -138,7 +138,7 @@ buildDotnetModule rec {
     homepage = "https://eddie.website";
     license = lib.licenses.gpl3Plus;
     mainProgram = "eddie-ui";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ed/edit/package.nix b/pkgs/by-name/ed/edit/package.nix
index 11feb412ecc2f..0ec7d6cb04dd4 100644
--- a/pkgs/by-name/ed/edit/package.nix
+++ b/pkgs/by-name/ed/edit/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
     description = "Relaxing mix of Vi and ACME";
     homepage = "https://c9x.me/edit";
     license = lib.licenses.publicDomain;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "edit";
   };
diff --git a/pkgs/by-name/ed/edlin/package.nix b/pkgs/by-name/ed/edlin/package.nix
index 114a68a7187e8..3bdcce837733f 100644
--- a/pkgs/by-name/ed/edlin/package.nix
+++ b/pkgs/by-name/ed/edlin/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://sourceforge.net/projects/freedos-edlin/";
     description = "FreeDOS line editor";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
     mainProgram = "edlin";
   };
diff --git a/pkgs/by-name/el/elan/package.nix b/pkgs/by-name/el/elan/package.nix
index 2d462ace0b282..3089a4fddc367 100644
--- a/pkgs/by-name/el/elan/package.nix
+++ b/pkgs/by-name/el/elan/package.nix
@@ -89,7 +89,7 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "elan";
   };
 }
diff --git a/pkgs/by-name/el/elvis/package.nix b/pkgs/by-name/el/elvis/package.nix
index ce4c70ee3085d..e9d699e35c41d 100644
--- a/pkgs/by-name/el/elvis/package.nix
+++ b/pkgs/by-name/el/elvis/package.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Vi clone for Unix and other operating systems";
     license = lib.licenses.free;
     mainProgram = "elvis";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/el/elvish/package.nix b/pkgs/by-name/el/elvish/package.nix
index b321018b3c319..b11d5e429c574 100644
--- a/pkgs/by-name/el/elvish/package.nix
+++ b/pkgs/by-name/el/elvish/package.nix
@@ -50,6 +50,6 @@ buildGoModule {
       status, it is already suitable for most daily interactive use.
     '';
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/em/em/package.nix b/pkgs/by-name/em/em/package.nix
index 1737f76679e4b..a7ddd59bd3754 100644
--- a/pkgs/by-name/em/em/package.nix
+++ b/pkgs/by-name/em/em/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       (such as the ITT's at QMC).
     '';
     license = licenses.publicDomain;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "em";
   };
diff --git a/pkgs/by-name/em/emacspeak/package.nix b/pkgs/by-name/em/emacspeak/package.nix
index 6be5907fe1886..a0bc83a38c076 100644
--- a/pkgs/by-name/em/emacspeak/package.nix
+++ b/pkgs/by-name/em/emacspeak/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/tvraman/emacspeak/blob/${finalAttrs.src.rev}/etc/NEWS";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "emacspeak";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     # Emacspeak requires a minimal Emacs version; let's use the broken flag
     broken = lib.versionOlder (lib.getVersion emacs) "29.1";
diff --git a/pkgs/by-name/em/emojify/package.nix b/pkgs/by-name/em/emojify/package.nix
index e337185e7856b..b36dc61ba09d5 100644
--- a/pkgs/by-name/em/emojify/package.nix
+++ b/pkgs/by-name/em/emojify/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "Emoji on the command line";
     homepage = "https://github.com/mrowa44/emojify";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     mainProgram = "emojify";
   };
diff --git a/pkgs/by-name/em/emu2/package.nix b/pkgs/by-name/em/emu2/package.nix
index d246760dd9c6c..aaa65ce47ea9f 100644
--- a/pkgs/by-name/em/emu2/package.nix
+++ b/pkgs/by-name/em/emu2/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/dmsc/emu2/";
     description = "Simple text-mode x86 + DOS emulator";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     mainProgram = "emu2";
   };
diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix
index 60361501033d8..3e3c27576298a 100644
--- a/pkgs/by-name/en/envision/package.nix
+++ b/pkgs/by-name/en/envision/package.nix
@@ -22,7 +22,7 @@ buildFHSEnv {
       stdenv.cc.libc
       gcc
     ])
-    ++ (
+    ++
       # OpenHMD dependencies
       (
         pkgs.openhmd.buildInputs
@@ -31,12 +31,12 @@ buildFHSEnv {
           meson
         ])
       )
-    )
+
     ++ (
       # OpenComposite dependencies
       pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs
     )
-    ++ (
+    ++
       # Monado dependencies
       (
         pkgs.monado.buildInputs
@@ -70,10 +70,10 @@ buildFHSEnv {
           glew
         ])
       )
-    )
-    ++ (
+
+    ++
       # SteamVR driver dependencies
-      [ pkgs.zlib ])
+      [ pkgs.zlib ]
     ++ (
       # WiVRn dependencies
       pkgs.wivrn.buildInputs
diff --git a/pkgs/by-name/fa/fasthenry/package.nix b/pkgs/by-name/fa/fasthenry/package.nix
index 20e2e68afeadd..aaea2c87ae133 100644
--- a/pkgs/by-name/fa/fasthenry/package.nix
+++ b/pkgs/by-name/fa/fasthenry/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.fastfieldsolvers.com/fasthenry2.htm";
     license = lib.licenses.lgpl2Only;
     maintainers = with lib.maintainers; [ fbeffa ];
-    platforms = with lib.platforms; lib.intersectLists (linux) (x86_64 ++ x86);
+    platforms = with lib.platforms; lib.intersectLists linux (x86_64 ++ x86);
     mainProgram = "fasthenry";
   };
 })
diff --git a/pkgs/by-name/fa/fastjar/package.nix b/pkgs/by-name/fa/fastjar/package.nix
index f7489cabea26f..86d578469a1fd 100644
--- a/pkgs/by-name/fa/fastjar/package.nix
+++ b/pkgs/by-name/fa/fastjar/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl2Plus;
     mainProgram = "fastjar";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ff/fff/package.nix b/pkgs/by-name/ff/fff/package.nix
index 3ffc8ac9f6e75..c55e9555fbe22 100644
--- a/pkgs/by-name/ff/fff/package.nix
+++ b/pkgs/by-name/ff/fff/package.nix
@@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
     sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg";
   };
 
-  pathAdd = lib.makeSearchPath "bin" ([
+  pathAdd = lib.makeSearchPath "bin" [
     xdg-utils
     file
     coreutils
     w3m
     xdotool
-  ]);
+  ];
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ bashInteractive ];
diff --git a/pkgs/by-name/fl/flam3/package.nix b/pkgs/by-name/fl/flam3/package.nix
index d664a6cfaf224..7de83084aa12d 100644
--- a/pkgs/by-name/fl/flam3/package.nix
+++ b/pkgs/by-name/fl/flam3/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
       is specified by a long string of numbers - a genetic code of sorts.
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix
index 0e271efaed0c7..2acdd34ec4829 100644
--- a/pkgs/by-name/fl/flaresolverr/package.nix
+++ b/pkgs/by-name/fl/flaresolverr/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/FlareSolverr/FlareSolverr/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = licenses.mit;
     mainProgram = "flaresolverr";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (undetected-chromedriver.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix
index cded942f65fd5..07abdd7fc795e 100644
--- a/pkgs/by-name/fl/flashprog/package.nix
+++ b/pkgs/by-name/fl/flashprog/package.nix
@@ -38,10 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     pciutils
   ]
-  ++ lib.optionals (withJlink) [
+  ++ lib.optionals withJlink [
     libjaylink
   ]
-  ++ lib.optionals (withGpio) [
+  ++ lib.optionals withGpio [
     libgpiod
   ];
 
diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
index d0c3b0a0fbc4d..1cb93c1a6a29c 100644
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@@ -32,7 +32,7 @@ let
     description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
     homepage = "https://github.com/chen08209/FlClash";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 
   libclash = buildGoModule {
diff --git a/pkgs/by-name/fl/fleng/package.nix b/pkgs/by-name/fl/fleng/package.nix
index 0257e6636ae40..d48866bb66299 100644
--- a/pkgs/by-name/fl/fleng/package.nix
+++ b/pkgs/by-name/fl/fleng/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://www.call-with-current-continuation.org/fleng/fleng.html";
     description = "Low level concurrent logic programming language descended from Prolog";
     license = lib.licenses.publicDomain;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/fl/flut-renamer/package.nix b/pkgs/by-name/fl/flut-renamer/package.nix
index 61ffe30a009de..4506a5e420728 100644
--- a/pkgs/by-name/fl/flut-renamer/package.nix
+++ b/pkgs/by-name/fl/flut-renamer/package.nix
@@ -30,6 +30,6 @@ flutter324.buildFlutterApplication rec {
     mainProgram = "flut-renamer";
     platforms = lib.platforms.linux;
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fm/fm-go/package.nix b/pkgs/by-name/fm/fm-go/package.nix
index 0983402fafb10..473759c4aa072 100644
--- a/pkgs/by-name/fm/fm-go/package.nix
+++ b/pkgs/by-name/fm/fm-go/package.nix
@@ -24,7 +24,7 @@ let
       changelog = "https://github.com/mistakenelf/fm/releases/tag/${finalAttrs.src.rev}";
       license = with lib.licenses; [ mit ];
       mainProgram = "fm";
-      maintainers = with lib.maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/by-name/fo/fopnu/package.nix b/pkgs/by-name/fo/fopnu/package.nix
index 4f354d0d16f60..dcbc0e8f25065 100644
--- a/pkgs/by-name/fo/fopnu/package.nix
+++ b/pkgs/by-name/fo/fopnu/package.nix
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation rec {
     license = licenses.unfree;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     mainProgram = "fopnu";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix
index f551bd24c91fd..50ff71c29103d 100644
--- a/pkgs/by-name/fr/free42/package.nix
+++ b/pkgs/by-name/fr/free42/package.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/thomasokken/free42";
     description = "Software clone of HP-42S Calculator";
     license = with lib.licenses; [ gpl2Only ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "free42dec";
     platforms = with lib.platforms; unix;
   };
diff --git a/pkgs/by-name/fr/freediameter/package.nix b/pkgs/by-name/fr/freediameter/package.nix
index 594de48331899..b08fd258bfe31 100644
--- a/pkgs/by-name/fr/freediameter/package.nix
+++ b/pkgs/by-name/fr/freediameter/package.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     teams = with lib.teams; [ ngi ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/fs/fsuae/package.nix b/pkgs/by-name/fs/fsuae/package.nix
index bffc46e4dab33..0d5520264c6aa 100644
--- a/pkgs/by-name/fs/fsuae/package.nix
+++ b/pkgs/by-name/fs/fsuae/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl2Plus;
     mainProgram = "fs-uae";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.systems.inspect; patternLogicalAnd patterns.isx86 patterns.isLinux;
   };
 })
diff --git a/pkgs/by-name/ft/ftgl/package.nix b/pkgs/by-name/ft/ftgl/package.nix
index 6de0411e833c7..40227f823c7c9 100644
--- a/pkgs/by-name/ft/ftgl/package.nix
+++ b/pkgs/by-name/ft/ftgl/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
       rendering modes.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/fv/fvwm3/package.nix b/pkgs/by-name/fv/fvwm3/package.nix
index 6ab018ebb4c0f..887001e5be72f 100644
--- a/pkgs/by-name/fv/fvwm3/package.nix
+++ b/pkgs/by-name/fv/fvwm3/package.nix
@@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://github.com/fvwmorg/fvwm3/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (libX11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/ga/galaxis/package.nix b/pkgs/by-name/ga/galaxis/package.nix
index b8266e9baf369..c1a4fa52e2f0a 100644
--- a/pkgs/by-name/ga/galaxis/package.nix
+++ b/pkgs/by-name/ga/galaxis/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://catb.org/~esr/galaxis/";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "galaxis";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ga/galculator/package.nix b/pkgs/by-name/ga/galculator/package.nix
index 4f86d789a1aa6..cfce3d7101523 100644
--- a/pkgs/by-name/ga/galculator/package.nix
+++ b/pkgs/by-name/ga/galculator/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl2Plus;
     mainProgram = "galculator";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (gtk3.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/ga/game-music-emu/package.nix b/pkgs/by-name/ga/game-music-emu/package.nix
index ee1f18715f39b..d466b536e8a7e 100644
--- a/pkgs/by-name/ga/game-music-emu/package.nix
+++ b/pkgs/by-name/ga/game-music-emu/package.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     description = "Collection of video game music file emulators";
     license = licenses.lgpl21Plus;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/gd/gdbm/package.nix b/pkgs/by-name/gd/gdbm/package.nix
index 45707a5a4d4b9..84aa4672d7a0e 100644
--- a/pkgs/by-name/gd/gdbm/package.nix
+++ b/pkgs/by-name/gd/gdbm/package.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl3Plus;
     mainProgram = "gdbmtool";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ge/germinal/package.nix b/pkgs/by-name/ge/germinal/package.nix
index b304492e5fd28..b420c369ff13c 100644
--- a/pkgs/by-name/ge/germinal/package.nix
+++ b/pkgs/by-name/ge/germinal/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Keruspe/Germinal";
     license = lib.licenses.gpl3Plus;
     mainProgram = "germinal";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/gf/gftp/package.nix b/pkgs/by-name/gf/gftp/package.nix
index 4d7db1e79dc82..c6dbfded4fadb 100644
--- a/pkgs/by-name/gf/gftp/package.nix
+++ b/pkgs/by-name/gf/gftp/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/masneyb/gftp";
     description = "GTK-based multithreaded FTP client for *nix-based machines";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/gi/gifgen/package.nix b/pkgs/by-name/gi/gifgen/package.nix
index 094e82198194f..ce312da2e304c 100644
--- a/pkgs/by-name/gi/gifgen/package.nix
+++ b/pkgs/by-name/gi/gifgen/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Simple high quality GIF encoding";
     homepage = "https://github.com/lukechilds/gifgen";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "gifgen";
     platforms = platforms.all;
   };
diff --git a/pkgs/by-name/gi/gimme-aws-creds/package.nix b/pkgs/by-name/gi/gimme-aws-creds/package.nix
index ade8ddb80ccef..7a85da0fa4a56 100644
--- a/pkgs/by-name/gi/gimme-aws-creds/package.nix
+++ b/pkgs/by-name/gi/gimme-aws-creds/package.nix
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-fsFYcfbLeYV6tpOGgNrFmYjcUAmdsx5zwUbvcctwFVs=";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
+  nativeBuildInputs = [
     installShellFiles
   ];
 
diff --git a/pkgs/by-name/gi/git-branchstack/package.nix b/pkgs/by-name/gi/git-branchstack/package.nix
index e7f2d24b21bfa..e751d14a0ccef 100644
--- a/pkgs/by-name/gi/git-branchstack/package.nix
+++ b/pkgs/by-name/gi/git-branchstack/package.nix
@@ -23,7 +23,7 @@ let
       homepage = "https://github.com/krobelus/git-branchstack";
       description = "Efficiently manage Git branches without leaving your local branch";
       license = lib.licenses.mit;
-      maintainers = with lib.maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/by-name/gi/git-point/package.nix b/pkgs/by-name/gi/git-point/package.nix
index f3a307e3c8267..1420708e1cbc2 100644
--- a/pkgs/by-name/gi/git-point/package.nix
+++ b/pkgs/by-name/gi/git-point/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "git-point";
   version = "0.2.2";
 
diff --git a/pkgs/by-name/gl/glpng/package.nix b/pkgs/by-name/gl/glpng/package.nix
index 30f274367e269..8f2bf13856479 100644
--- a/pkgs/by-name/gl/glpng/package.nix
+++ b/pkgs/by-name/gl/glpng/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     homepage = "https://repo.or.cz/glpng.git/blob_plain/HEAD:/glpng.htm";
     description = "PNG loader library for OpenGL";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix
index 2c7d8e70d890b..f57f0c010610a 100644
--- a/pkgs/by-name/gm/gmic-qt/package.nix
+++ b/pkgs/by-name/gm/gmic-qt/package.nix
@@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (variants.${variant}) description;
     license = lib.licenses.gpl3Plus;
     mainProgram = "gmic_qt";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/gn/gnss-sdr/package.nix b/pkgs/by-name/gn/gnss-sdr/package.nix
index 99312bd42e16c..3e012c83f89e1 100644
--- a/pkgs/by-name/gn/gnss-sdr/package.nix
+++ b/pkgs/by-name/gn/gnss-sdr/package.nix
@@ -68,7 +68,7 @@ gnuradio.pkgs.mkDerivation rec {
   ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [
     gnuradio.unwrapped.uhd
   ]
-  ++ lib.optionals (enableRawUdp) [
+  ++ lib.optionals enableRawUdp [
     libpcap
   ]
   ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
diff --git a/pkgs/by-name/gn/gnu-smalltalk/package.nix b/pkgs/by-name/gn/gnu-smalltalk/package.nix
index 07d83d8bdd132..91465acebcbf8 100644
--- a/pkgs/by-name/gn/gnu-smalltalk/package.nix
+++ b/pkgs/by-name/gn/gnu-smalltalk/package.nix
@@ -91,6 +91,6 @@ stdenv.mkDerivation rec {
       lgpl2
     ];
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/go/go-rice/package.nix b/pkgs/by-name/go/go-rice/package.nix
index 85127bc363d33..f82d0badf215f 100644
--- a/pkgs/by-name/go/go-rice/package.nix
+++ b/pkgs/by-name/go/go-rice/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
     description = "Go package that makes working with resources such as html, js, css, images, templates very easy";
     homepage = "https://github.com/GeertJohan/go.rice";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "rice";
   };
 }
diff --git a/pkgs/by-name/go/google-guest-oslogin/package.nix b/pkgs/by-name/go/google-guest-oslogin/package.nix
index cf963b728d6f4..6f305c05f2094 100644
--- a/pkgs/by-name/go/google-guest-oslogin/package.nix
+++ b/pkgs/by-name/go/google-guest-oslogin/package.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
     description = "OS Login Guest Environment for Google Compute Engine";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix
index 0555e1bbaa2c4..69f11bf93786d 100644
--- a/pkgs/by-name/go/gopeed/package.nix
+++ b/pkgs/by-name/go/gopeed/package.nix
@@ -21,7 +21,7 @@ let
     description = "Modern download manager that supports all platforms";
     homepage = "https://github.com/GopeedLab/gopeed";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 
diff --git a/pkgs/by-name/gr/gr-framework/package.nix b/pkgs/by-name/gr/gr-framework/package.nix
index 86f7c5e9ea793..a1814f091b0e3 100644
--- a/pkgs/by-name/gr/gr-framework/package.nix
+++ b/pkgs/by-name/gr/gr-framework/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     description = "GR framework is a graphics library for visualisation applications";
     homepage = "https://gr-framework.org";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/gr/grafx2/package.nix b/pkgs/by-name/gr/grafx2/package.nix
index 862bb76d26e2d..8820a3d8a32a2 100644
--- a/pkgs/by-name/gr/grafx2/package.nix
+++ b/pkgs/by-name/gr/grafx2/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "grafx2-sdl";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix
index e4e0743990aa8..4d495f7d7fea1 100644
--- a/pkgs/by-name/gr/graphicsmagick/package.nix
+++ b/pkgs/by-name/gr/graphicsmagick/package.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
       PNM, TIFF, and WebP.
     '';
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "gm";
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/gr/gretl/package.nix b/pkgs/by-name/gr/gretl/package.nix
index 2de83eae4f593..77f942da7dd14 100644
--- a/pkgs/by-name/gr/gretl/package.nix
+++ b/pkgs/by-name/gr/gretl/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
       gretl is a cross-platform software package for econometric analysis,
       written in the C programming language.
     '';
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/gt/gtklp/package.nix b/pkgs/by-name/gt/gtklp/package.nix
index f77150eb5c5c5..8b4f3b209865a 100644
--- a/pkgs/by-name/gt/gtklp/package.nix
+++ b/pkgs/by-name/gt/gtklp/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "GTK-based graphical frontend for CUPS";
     license = with lib.licenses; [ gpl2Only ];
     mainProgram = "gtklp";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix
index a62b2a4362814..4d7b4082c6df1 100644
--- a/pkgs/by-name/gu/gui-for-clash/package.nix
+++ b/pkgs/by-name/gu/gui-for-clash/package.nix
@@ -29,7 +29,7 @@ let
   metaCommon = {
     homepage = "https://github.com/GUI-for-Cores/GUI.for.Clash";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 
   frontend = stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix
index 9dcde1a8f0073..cd450a5ead66d 100644
--- a/pkgs/by-name/gu/gui-for-singbox/package.nix
+++ b/pkgs/by-name/gu/gui-for-singbox/package.nix
@@ -30,7 +30,7 @@ let
     description = "SingBox GUI program developed by vue3 + wails";
     homepage = "https://github.com/GUI-for-Cores/GUI.for.SingBox";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 
diff --git a/pkgs/by-name/gu/guile-aspell/package.nix b/pkgs/by-name/gu/guile-aspell/package.nix
index 64cfcb472bd61..2f97b3c0376b9 100644
--- a/pkgs/by-name/gu/guile-aspell/package.nix
+++ b/pkgs/by-name/gu/guile-aspell/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Guile bindings for the aspell library";
     homepage = "https://github.com/spk121/guile-aspell";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = guile.meta.platforms;
   };
 })
diff --git a/pkgs/by-name/gu/guile-commonmark/package.nix b/pkgs/by-name/gu/guile-commonmark/package.nix
index 24be48cb09107..a63214323490a 100644
--- a/pkgs/by-name/gu/guile-commonmark/package.nix
+++ b/pkgs/by-name/gu/guile-commonmark/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/OrangeShark/guile-commonmark";
     description = "Implementation of CommonMark for Guile";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = guile.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/gu/guile-reader/package.nix b/pkgs/by-name/gu/guile-reader/package.nix
index ab79f2232cc33..919a03dbf9674 100644
--- a/pkgs/by-name/gu/guile-reader/package.nix
+++ b/pkgs/by-name/gu/guile-reader/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       R5RS-derived document syntax.
     '';
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = guile.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/gu/guile-sqlite3/package.nix b/pkgs/by-name/gu/guile-sqlite3/package.nix
index 1e7e737f1725c..0ad42497517e7 100644
--- a/pkgs/by-name/gu/guile-sqlite3/package.nix
+++ b/pkgs/by-name/gu/guile-sqlite3/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://notabug.org/guile-sqlite3/guile-sqlite3";
     description = "Guile bindings for the SQLite3 database engine";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (guile.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/gx/gxemul/package.nix b/pkgs/by-name/gx/gxemul/package.nix
index df51fe643aa21..71afb6764a4a8 100644
--- a/pkgs/by-name/gx/gxemul/package.nix
+++ b/pkgs/by-name/gx/gxemul/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       unmodified "guest" operating systems to run.
     '';
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "gxemul";
   };
diff --git a/pkgs/by-name/gx/gxmessage/package.nix b/pkgs/by-name/gx/gxmessage/package.nix
index d859381ab9a3d..5583380719af6 100644
--- a/pkgs/by-name/gx/gxmessage/package.nix
+++ b/pkgs/by-name/gx/gxmessage/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "GTK enabled dropin replacement for xmessage";
     homepage = "https://trmusson.dreamhosters.com/programs.html#gxmessage";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
     mainProgram = "gxmessage";
   };
diff --git a/pkgs/by-name/gy/gyroflow/package.nix b/pkgs/by-name/gy/gyroflow/package.nix
index d7088b17f9e3b..16e082f58d019 100644
--- a/pkgs/by-name/gy/gyroflow/package.nix
+++ b/pkgs/by-name/gy/gyroflow/package.nix
@@ -119,7 +119,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   desktopItems = [
-    (makeDesktopItem ({
+    (makeDesktopItem {
       name = "gyroflow";
       desktopName = "Gyroflow";
       genericName = "Video stabilization using gyroscope data";
@@ -137,7 +137,7 @@ rustPlatform.buildRustPackage rec {
       startupNotify = true;
       startupWMClass = "gyroflow";
       prefersNonDefaultGPU = true;
-    }))
+    })
   ];
 
   meta = {
diff --git a/pkgs/by-name/ha/hachimarupop/package.nix b/pkgs/by-name/ha/hachimarupop/package.nix
index 549cced4db5cc..6ea92ed455e9b 100644
--- a/pkgs/by-name/ha/hachimarupop/package.nix
+++ b/pkgs/by-name/ha/hachimarupop/package.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation {
     homepage = "https://github.com/noriokanisawa/HachiMaruPop";
     description = "Cute, Japanese font";
     license = lib.licenses.ofl;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ha/hackedbox/package.nix b/pkgs/by-name/ha/hackedbox/package.nix
index 6a4bcff5915cf..d8ba1545d09d0 100644
--- a/pkgs/by-name/ha/hackedbox/package.nix
+++ b/pkgs/by-name/ha/hackedbox/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Bastard hacked offspring of Blackbox";
     homepage = "https://github.com/museoa/hackedbox/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (libX11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/ha/harmony-music/package.nix b/pkgs/by-name/ha/harmony-music/package.nix
index 6542d3ac9b030..236c4ae872422 100644
--- a/pkgs/by-name/ha/harmony-music/package.nix
+++ b/pkgs/by-name/ha/harmony-music/package.nix
@@ -92,7 +92,7 @@ flutter324.buildFlutterApplication rec {
     homepage = "https://github.com/anandnet/Harmony-Music";
     mainProgram = "harmonymusic";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ha/haunt/package.nix b/pkgs/by-name/ha/haunt/package.nix
index 1e11a1330b16a..291fd5e8237da 100644
--- a/pkgs/by-name/ha/haunt/package.nix
+++ b/pkgs/by-name/ha/haunt/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
       to do things that aren't provided out-of-the-box.
     '';
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (guile.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/ha/havoc/package.nix b/pkgs/by-name/ha/havoc/package.nix
index 9abe79999b439..903e91c0f8abe 100644
--- a/pkgs/by-name/ha/havoc/package.nix
+++ b/pkgs/by-name/ha/havoc/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
       publicDomain
     ];
     mainProgram = "havoc";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (wayland.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin; # fatal error: 'sys/epoll.h' file not found
   };
diff --git a/pkgs/by-name/ha/haxor-news/package.nix b/pkgs/by-name/ha/haxor-news/package.nix
index d57a43d20c950..11ba11ebd899f 100644
--- a/pkgs/by-name/ha/haxor-news/package.nix
+++ b/pkgs/by-name/ha/haxor-news/package.nix
@@ -5,7 +5,7 @@
   python3Packages,
 }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
   pname = "haxor-news";
   version = "unstable-2022-04-22";
   format = "setuptools";
diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix
index 95cfcb1cb8be5..3be5315a258bd 100644
--- a/pkgs/by-name/ha/hayabusa/package.nix
+++ b/pkgs/by-name/ha/hayabusa/package.nix
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage {
     description = "Swift rust fetch program";
     homepage = "https://github.com/notarin/hayabusa";
     license = lib.licenses.cc-by-nc-nd-40;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "hayabusa";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/hd/hdf4/package.nix b/pkgs/by-name/hd/hdf4/package.nix
index 5f369d2be4865..f8d18e9ccc047 100644
--- a/pkgs/by-name/hd/hdf4/package.nix
+++ b/pkgs/by-name/hd/hdf4/package.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Data model, library, and file format for storing and managing data";
     homepage = "https://support.hdfgroup.org/products/hdf4/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     license = licenses.bsdOriginal;
   };
diff --git a/pkgs/by-name/he/headphones-toolbox/package.nix b/pkgs/by-name/he/headphones-toolbox/package.nix
index d318822b69e22..d5e6b95655238 100644
--- a/pkgs/by-name/he/headphones-toolbox/package.nix
+++ b/pkgs/by-name/he/headphones-toolbox/package.nix
@@ -12,7 +12,7 @@
   yarnConfigHook,
 }:
 
-rustPlatform.buildRustPackage (rec {
+rustPlatform.buildRustPackage rec {
   pname = "headphones-toolbox";
   version = "0.0.7";
   tag = "test-tauri-v2-2";
@@ -57,4 +57,4 @@ rustPlatform.buildRustPackage (rec {
     ];
     platforms = lib.platforms.linux;
   };
-})
+}
diff --git a/pkgs/by-name/he/hedgemodmanager/package.nix b/pkgs/by-name/he/hedgemodmanager/package.nix
index a8d82929ad7af..b5793cd5a1604 100644
--- a/pkgs/by-name/he/hedgemodmanager/package.nix
+++ b/pkgs/by-name/he/hedgemodmanager/package.nix
@@ -48,6 +48,6 @@ buildDotnetModule (finalAttrs: {
     changelog = "https://github.com/hedge-dev/HedgeModManager/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/hi/hiddify-app/package.nix b/pkgs/by-name/hi/hiddify-app/package.nix
index 5c6c106604558..4464b4b04471f 100644
--- a/pkgs/by-name/hi/hiddify-app/package.nix
+++ b/pkgs/by-name/hi/hiddify-app/package.nix
@@ -16,7 +16,7 @@ let
       unfree # upstream adds non-free additional conditions. https://github.com/hiddify/hiddify-app/blob/0f6b15057f626016fcd7a0c075f1c8c2f606110a/LICENSE.md#additional-conditions-to-gpl-v3
       gpl3Only
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 
   libcore = buildGoModule rec {
diff --git a/pkgs/by-name/hi/higan/package.nix b/pkgs/by-name/hi/higan/package.nix
index 9947742b3b1c0..994250f2426af 100644
--- a/pkgs/by-name/hi/higan/package.nix
+++ b/pkgs/by-name/hi/higan/package.nix
@@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
       Challenge V2.
     '';
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/ho/hostctl/package.nix b/pkgs/by-name/ho/hostctl/package.nix
index a5838703674ca..272cfd3c9080c 100644
--- a/pkgs/by-name/ho/hostctl/package.nix
+++ b/pkgs/by-name/ho/hostctl/package.nix
@@ -42,7 +42,7 @@ buildGoModule rec {
     '';
     homepage = "https://guumaster.github.io/hostctl/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "hostctl";
   };
 }
diff --git a/pkgs/by-name/ht/httplib/package.nix b/pkgs/by-name/ht/httplib/package.nix
index b00be06548df6..655bcd363afe7 100644
--- a/pkgs/by-name/ht/httplib/package.nix
+++ b/pkgs/by-name/ht/httplib/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "C++ header-only HTTP/HTTPS server and client library";
     changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/hy/hyperblobs/package.nix b/pkgs/by-name/hy/hyperblobs/package.nix
index da3526954fdb0..e26eceaad46a1 100644
--- a/pkgs/by-name/hy/hyperblobs/package.nix
+++ b/pkgs/by-name/hy/hyperblobs/package.nix
@@ -42,6 +42,6 @@ buildNpmPackage (finalAttrs: {
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
     teams = with lib.teams; [ ngi ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix
index 0b1e5cf5db0f1..faf7de95740b0 100644
--- a/pkgs/by-name/hy/hyperscan/package.nix
+++ b/pkgs/by-name/hy/hyperscan/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-DBUILD_AVX512=ON"
   ]
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-DFAT_RUNTIME=ON"
-  ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON"
+  ++ lib.optional withStatic "-DBUILD_STATIC_AND_SHARED=ON"
   ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
 
   # hyperscan CMake is completely broken for chimera builds when pcre is compiled
diff --git a/pkgs/by-name/hy/hyperswarm/package.nix b/pkgs/by-name/hy/hyperswarm/package.nix
index 5c0072f448e56..b05aaeffb4303 100644
--- a/pkgs/by-name/hy/hyperswarm/package.nix
+++ b/pkgs/by-name/hy/hyperswarm/package.nix
@@ -32,6 +32,6 @@ buildNpmPackage (finalAttrs: {
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     teams = with lib.teams; [ ngi ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/if/ifwifi/package.nix b/pkgs/by-name/if/ifwifi/package.nix
index d1e9d38b723e5..545ce67703cb8 100644
--- a/pkgs/by-name/if/ifwifi/package.nix
+++ b/pkgs/by-name/if/ifwifi/package.nix
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/araujobsd/ifwifi";
     license = with licenses; [ bsd2 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # networkmanager doesn't work on darwin
     # even though the `wifiscanner` crate would work
     platforms = with platforms; linux; # ++ darwin;
diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix
index 38bf62bf443c4..df93b4f2d972a 100644
--- a/pkgs/by-name/ig/igir/package.nix
+++ b/pkgs/by-name/ig/igir/package.nix
@@ -41,7 +41,7 @@ buildNpmPackage rec {
     homepage = "https://igir.io";
     changelog = "https://github.com/emmercm/igir/releases/tag/${src.rev}";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ii/iir1/package.nix b/pkgs/by-name/ii/iir1/package.nix
index a0e6ffd1bccd6..ffa6494fcba6c 100644
--- a/pkgs/by-name/ii/iir1/package.nix
+++ b/pkgs/by-name/ii/iir1/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     downloadPage = "https://github.com/berndporr/iir1";
     changelog = "https://github.com/berndporr/iir1/releases/tag/${finalAttrs.src.rev}";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ik/ike-scan/package.nix b/pkgs/by-name/ik/ike-scan/package.nix
index 903dcd2003e72..f7386651d84f7 100644
--- a/pkgs/by-name/ik/ike-scan/package.nix
+++ b/pkgs/by-name/ik/ike-scan/package.nix
@@ -7,7 +7,7 @@
   stdenv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "ike-scan";
   version = "1.9.5-unstable-2024-09-15";
 
diff --git a/pkgs/by-name/im/imgur-screenshot/package.nix b/pkgs/by-name/im/imgur-screenshot/package.nix
index 05b338997d9ba..ed3a452666a83 100644
--- a/pkgs/by-name/im/imgur-screenshot/package.nix
+++ b/pkgs/by-name/im/imgur-screenshot/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/jomo/imgur-screenshot/";
     platforms = platforms.linux;
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "imgur-screenshot";
   };
 }
diff --git a/pkgs/by-name/im/immersed/package.nix b/pkgs/by-name/im/immersed/package.nix
index 491d6fae9d625..8ebbf66d8cbbc 100644
--- a/pkgs/by-name/im/immersed/package.nix
+++ b/pkgs/by-name/im/immersed/package.nix
@@ -9,7 +9,7 @@ let
   pname = "immersed";
   version = "10.9.0";
 
-  sources = lib.mapAttrs (_: fetchurl) (rec {
+  sources = lib.mapAttrs (_: fetchurl) rec {
     x86_64-linux = {
       url = "https://web.archive.org/web/20250725134919if_/https://static.immersed.com/dl/Immersed-x86_64.AppImage";
       hash = "sha256-plGcvZRpV+nhQ4FoYiIuLmyOg/SHJ8ZjT4Fh6UyH9W0=";
@@ -23,7 +23,7 @@ let
       hash = "sha256-lmSkatB75Bztm19aCC50qrd/NV+HQX9nBMOTxIguaqI=";
     };
     aarch64-darwin = x86_64-darwin;
-  });
+  };
 
   src = sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
 
diff --git a/pkgs/by-name/io/ios-safari-remote-debug/package.nix b/pkgs/by-name/io/ios-safari-remote-debug/package.nix
index 47f3f6d973ad8..339418666d21d 100644
--- a/pkgs/by-name/io/ios-safari-remote-debug/package.nix
+++ b/pkgs/by-name/io/ios-safari-remote-debug/package.nix
@@ -35,6 +35,6 @@ buildGoModule rec {
     homepage = "https://git.gay/besties/ios-safari-remote-debug";
     license = lib.licenses.agpl3Plus;
     mainProgram = "ios-safari-remote-debug";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ip/ipaexfont/package.nix b/pkgs/by-name/ip/ipaexfont/package.nix
index a4988a7156b27..e8128947c01c2 100644
--- a/pkgs/by-name/ip/ipaexfont/package.nix
+++ b/pkgs/by-name/ip/ipaexfont/package.nix
@@ -32,6 +32,6 @@ stdenvNoCC.mkDerivation {
     '';
     homepage = "https://moji.or.jp/ipafont/";
     license = licenses.ipa;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/is/isc-cron/package.nix b/pkgs/by-name/is/isc-cron/package.nix
index d634db1a11d71..137273c9f3932 100644
--- a/pkgs/by-name/is/isc-cron/package.nix
+++ b/pkgs/by-name/is/isc-cron/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Daemon for running commands at specific times";
     license = lib.licenses.bsd0;
     mainProgram = "cron";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/iw/iw/package.nix b/pkgs/by-name/iw/iw/package.nix
index 38228ed96d310..24f6d9ddc9131 100644
--- a/pkgs/by-name/iw/iw/package.nix
+++ b/pkgs/by-name/iw/iw/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.isc;
     mainProgram = "iw";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/j4/j4-dmenu-desktop/package.nix b/pkgs/by-name/j4/j4-dmenu-desktop/package.nix
index 7675dc1203a28..43c9e434ff268 100644
--- a/pkgs/by-name/j4/j4-dmenu-desktop/package.nix
+++ b/pkgs/by-name/j4/j4-dmenu-desktop/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/enkore/j4-dmenu-desktop";
     license = licenses.gpl3Only;
     mainProgram = "j4-dmenu-desktop";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ja/jasper-gtk-theme/package.nix b/pkgs/by-name/ja/jasper-gtk-theme/package.nix
index 33ffeaeefa716..a741fe60dce24 100644
--- a/pkgs/by-name/ja/jasper-gtk-theme/package.nix
+++ b/pkgs/by-name/ja/jasper-gtk-theme/package.nix
@@ -49,7 +49,7 @@ lib.checkListOfEnum "${pname}: theme variants"
   tweaks
 
   stdenvNoCC.mkDerivation
-  rec {
+  {
     inherit pname;
     version = "0-unstable-2025-04-02";
 
diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix
index ee237051d4824..f7e86f035920b 100644
--- a/pkgs/by-name/ja/jasper/package.nix
+++ b/pkgs/by-name/ja/jasper/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ mit ];
     mainProgram = "jasper";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/jb/jboss_mysql_jdbc/package.nix b/pkgs/by-name/jb/jboss_mysql_jdbc/package.nix
index f7559b03b348c..ba4e062660f54 100644
--- a/pkgs/by-name/jb/jboss_mysql_jdbc/package.nix
+++ b/pkgs/by-name/jb/jboss_mysql_jdbc/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     inherit (mysql_jdbc.meta)
       description
       license
diff --git a/pkgs/by-name/jh/jhentai/package.nix b/pkgs/by-name/jh/jhentai/package.nix
index e5921b5794f9b..ec32378407ea3 100644
--- a/pkgs/by-name/jh/jhentai/package.nix
+++ b/pkgs/by-name/jh/jhentai/package.nix
@@ -83,7 +83,7 @@ flutter324.buildFlutterApplication rec {
     homepage = "https://github.com/jiangtian616/JHenTai";
     mainProgram = "jhentai";
     license = with lib.licenses; [ asl20 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ji/jitsi/package.nix b/pkgs/by-name/ji/jitsi/package.nix
index e7e9fb24143fa..c7d2a47b77e6a 100644
--- a/pkgs/by-name/ji/jitsi/package.nix
+++ b/pkgs/by-name/ji/jitsi/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     categories = [ "Chat" ];
   };
 
-  libPath = lib.makeLibraryPath ([
+  libPath = lib.makeLibraryPath [
     stdenv.cc.cc # For libstdc++.
     alsa-lib
     dbus
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     xorg.libXext
     xorg.libXScrnSaver
     xorg.libXv
-  ]);
+  ];
 
   nativeBuildInputs = [ unzip ];
   buildInputs = [
diff --git a/pkgs/by-name/jo/joe/package.nix b/pkgs/by-name/jo/joe/package.nix
index 0ac9e156d3a19..4907cee12cc77 100644
--- a/pkgs/by-name/jo/joe/package.nix
+++ b/pkgs/by-name/jo/joe/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://joe-editor.sourceforge.io";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/jo/jove/package.nix b/pkgs/by-name/jo/jove/package.nix
index e2af8e44261e7..1c704986d020e 100644
--- a/pkgs/by-name/jo/jove/package.nix
+++ b/pkgs/by-name/jo/jove/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Jonathan's Own Version of Emacs";
     changelog = "https://github.com/jonmacs/jove/releases/tag/${finalAttrs.version}";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     # never built on Hydra: https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/jo/joypixels/package.nix b/pkgs/by-name/jo/joypixels/package.nix
index ad73a78cf2c17..2cf2347b5d4c7 100644
--- a/pkgs/by-name/jo/joypixels/package.nix
+++ b/pkgs/by-name/jo/joypixels/package.nix
@@ -23,7 +23,7 @@ let
       fontFile = "joypixels-android.ttf";
     };
 
-  joypixels-free-license = with systemSpecific; {
+  joypixels-free-license = {
     spdxId = "LicenseRef-JoyPixels-Free";
     fullName = "JoyPixels Free License Agreement";
     url = "https://cdn.joypixels.com/free-license.pdf";
diff --git a/pkgs/by-name/ju/jupp/package.nix b/pkgs/by-name/ju/jupp/package.nix
index 7afa43f08580c..e72539894175c 100644
--- a/pkgs/by-name/ju/jupp/package.nix
+++ b/pkgs/by-name/ju/jupp/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
       because these behave better overall.
     '';
     license = lib.licenses.gpl1Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/by-name/jw/jwasm/package.nix b/pkgs/by-name/jw/jwasm/package.nix
index 0a3a58da1b455..a367cb77e13da 100644
--- a/pkgs/by-name/jw/jwasm/package.nix
+++ b/pkgs/by-name/jw/jwasm/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/${finalAttrs.src.rev}";
     mainProgram = "jwasm";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index fde6c512a1192..a7b7341eef029 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -137,7 +137,7 @@ flutter329.buildFlutterApplication rec {
     homepage = "https://github.com/Predidit/Kazumi";
     mainProgram = "kazumi";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/kc/kconfig-frontends/package.nix b/pkgs/by-name/kc/kconfig-frontends/package.nix
index d7ec574a5963d..250a7390c0683 100644
--- a/pkgs/by-name/kc/kconfig-frontends/package.nix
+++ b/pkgs/by-name/kc/kconfig-frontends/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://bitbucket.org/nuttx/tools/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ke/kermit-terminal/package.nix b/pkgs/by-name/ke/kermit-terminal/package.nix
index c19cae129bd10..677d51238628f 100644
--- a/pkgs/by-name/ke/kermit-terminal/package.nix
+++ b/pkgs/by-name/ke/kermit-terminal/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/orhun/kermit/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl3Only;
     mainProgram = "kermit";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix
index 107a6bd9447f8..fa94bccdd1e31 100644
--- a/pkgs/by-name/ke/keyguard/package.nix
+++ b/pkgs/by-name/ke/keyguard/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/AChep/keyguard-app";
     mainProgram = "Keyguard";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     sourceProvenance = with lib.sourceTypes; [
       fromSource
       binaryBytecode
diff --git a/pkgs/by-name/ke/keystone/package.nix b/pkgs/by-name/ke/keystone/package.nix
index d06237c85f644..234c05d905d72 100644
--- a/pkgs/by-name/ke/keystone/package.nix
+++ b/pkgs/by-name/ke/keystone/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "Lightweight multi-platform, multi-architecture assembler framework";
     homepage = "https://www.keystone-engine.org";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "kstool";
     platforms = platforms.unix;
   };
diff --git a/pkgs/by-name/ki/kid3/package.nix b/pkgs/by-name/ki/kid3/package.nix
index e0a0b5a025480..d6c8bbc12d419 100644
--- a/pkgs/by-name/ki/kid3/package.nix
+++ b/pkgs/by-name/ki/kid3/package.nix
@@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
         "kid3"
       else
         "kid3-cli";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ki/killerbee/package.nix b/pkgs/by-name/ki/killerbee/package.nix
index 75b40b64e875e..51a03e71f0b3e 100644
--- a/pkgs/by-name/ki/killerbee/package.nix
+++ b/pkgs/by-name/ki/killerbee/package.nix
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
 
   build-system = with python3.pkgs; [ setuptools ];
 
-  buildInputs = with python3.pkgs; [ libgcrypt ];
+  buildInputs = [ libgcrypt ];
 
   dependencies = with python3.pkgs; [
     pyserial
diff --git a/pkgs/by-name/ki/kind-lang/package.nix b/pkgs/by-name/ki/kind-lang/package.nix
index 613d310a5dfe3..a064dcc8cad73 100644
--- a/pkgs/by-name/ki/kind-lang/package.nix
+++ b/pkgs/by-name/ki/kind-lang/package.nix
@@ -10,7 +10,7 @@ let
   ghcVersion = "ghc910";
   haskellPackages = haskell.packages.${ghcVersion};
 
-  overrides = rec {
+  overrides = {
     version = "${raw-pkg.version}-unstable-2024-12-09";
 
     postPatch = ''
diff --git a/pkgs/by-name/ki/kingstvis/package.nix b/pkgs/by-name/ki/kingstvis/package.nix
index e11cba5e1a84e..e5d310405a494 100644
--- a/pkgs/by-name/ki/kingstvis/package.nix
+++ b/pkgs/by-name/ki/kingstvis/package.nix
@@ -24,24 +24,22 @@ in
 buildFHSEnv {
   inherit pname version;
 
-  targetPkgs =
-    pkgs:
-    (with pkgs; [
-      dbus
-      fontconfig
-      freetype
-      glib
-      libGL
-      xkeyboard_config
-      xorg.libICE
-      xorg.libSM
-      xorg.libX11
-      xorg.libXext
-      xorg.libXi
-      xorg.libXrender
-      xorg.libxcb
-      zlib
-    ]);
+  targetPkgs = pkgs: [
+    dbus
+    fontconfig
+    freetype
+    glib
+    libGL
+    xkeyboard_config
+    xorg.libICE
+    xorg.libSM
+    xorg.libX11
+    xorg.libXext
+    xorg.libXi
+    xorg.libXrender
+    xorg.libxcb
+    zlib
+  ];
 
   extraInstallCommands = ''
     install -Dvm644 ${src}/Driver/99-Kingst.rules \
diff --git a/pkgs/by-name/ki/kirc/package.nix b/pkgs/by-name/ki/kirc/package.nix
index fe686ff30cb40..5e54aa140640a 100644
--- a/pkgs/by-name/ki/kirc/package.nix
+++ b/pkgs/by-name/ki/kirc/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       - Easy customized color scheme definition.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix
index 73fd7ed1ba8d7..d61b67d1a03e4 100644
--- a/pkgs/by-name/ku/kubernix/package.nix
+++ b/pkgs/by-name/ku/kubernix/package.nix
@@ -4,7 +4,7 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "kubernix";
   version = "0.2.0-unstable-2021-11-16";
 
diff --git a/pkgs/by-name/ku/kubespy/package.nix b/pkgs/by-name/ku/kubespy/package.nix
index 6a28cc19c305c..2d1550409fb9c 100644
--- a/pkgs/by-name/ku/kubespy/package.nix
+++ b/pkgs/by-name/ku/kubespy/package.nix
@@ -39,6 +39,6 @@ buildGoModule rec {
     mainProgram = "kubespy";
     homepage = "https://github.com/pulumi/kubespy";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/kv/kvmtool/package.nix b/pkgs/by-name/kv/kvmtool/package.nix
index e9b32618a57db..ff5cdd1aec77a 100644
--- a/pkgs/by-name/kv/kvmtool/package.nix
+++ b/pkgs/by-name/kv/kvmtool/package.nix
@@ -26,9 +26,9 @@ stdenv.mkDerivation {
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
     "ARCH=${stdenv.hostPlatform.linuxArch}"
   ]
-  ++ lib.optionals stdenv.hostPlatform.isAarch64 ([
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
     "LIBFDT_DIR=${dtc}/lib"
-  ]);
+  ];
 
   meta = with lib; {
     description = "Lightweight tool for hosting KVM guests";
diff --git a/pkgs/by-name/ky/kytea/package.nix b/pkgs/by-name/ky/kytea/package.nix
index a34a9c1f86387..5b8e380d96ca2 100644
--- a/pkgs/by-name/ky/kytea/package.nix
+++ b/pkgs/by-name/ky/kytea/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.asl20;
 
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 
diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix
index 596e8245b179b..e411f2833664c 100644
--- a/pkgs/by-name/la/labwc/package.nix
+++ b/pkgs/by-name/la/labwc/package.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/labwc/labwc/blob/master/NEWS.md";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "labwc";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (wayland.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/la/lavalauncher/package.nix b/pkgs/by-name/la/lavalauncher/package.nix
index 5f9c60ee55c56..871c515a3bc80 100644
--- a/pkgs/by-name/la/lavalauncher/package.nix
+++ b/pkgs/by-name/la/lavalauncher/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://git.sr.ht/~leon_plickat/lavalauncher/refs/${finalAttrs.src.rev}";
     license = lib.licenses.gpl3Plus;
     mainProgram = "lavalauncher";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (wayland.meta) platforms;
     # meson.build:52:23: ERROR: C shared or static library 'rt' not found
     # https://logs.ofborg.org/?key=nixos/nixpkgs.340239&attempt_id=1f05cada-67d2-4cfe-b6a8-4bf4571b9375
diff --git a/pkgs/by-name/lb/lbreakouthd/package.nix b/pkgs/by-name/lb/lbreakouthd/package.nix
index 8a3b8c52960eb..f3a1f2276661a 100644
--- a/pkgs/by-name/lb/lbreakouthd/package.nix
+++ b/pkgs/by-name/lb/lbreakouthd/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Widescreen Breakout clone";
     license = lib.licenses.gpl2Plus;
     mainProgram = "lbreakouthd";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (SDL2.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/ld/ldid/package.nix b/pkgs/by-name/ld/ldid/package.nix
index 5dcd0622db0b7..82e4ded896f5f 100644
--- a/pkgs/by-name/ld/ldid/package.nix
+++ b/pkgs/by-name/ld/ldid/package.nix
@@ -25,10 +25,10 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
   ];
 
-  env.NIX_LDFLAGS = toString ([
+  env.NIX_LDFLAGS = toString [
     "-lcrypto"
     "-lplist-2.0"
-  ]);
+  ];
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix
index 0b07054ce7cb9..b16ec7ef08750 100644
--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@@ -43,6 +43,6 @@ buildGoModule {
     changelog = "https://github.com/evilmartians/lefthook/raw/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     mainProgram = "lefthook";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/le/lenpaste/package.nix b/pkgs/by-name/le/lenpaste/package.nix
index 7a6f7deb39d5c..dc0a483e8ca57 100644
--- a/pkgs/by-name/le/lenpaste/package.nix
+++ b/pkgs/by-name/le/lenpaste/package.nix
@@ -34,7 +34,7 @@ buildGoModule rec {
     description = "Web service that allows you to share notes anonymously, an alternative to pastebin.com";
     homepage = "https://git.lcomrade.su/root/lenpaste";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "lenpaste";
   };
 }
diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index 4ae6ad23420a1..c6bc96c664f65 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     description = "Reference implementation of the 3D Manufacturing Format file standard";
     homepage = "https://3mf.io/";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix
index 08f53f158f141..d0a91f8d9dcc5 100644
--- a/pkgs/by-name/li/libbytesize/package.nix
+++ b/pkgs/by-name/li/libbytesize/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tiny library providing a C 'class' for working with arbitrary big sizes in bytes";
     license = lib.licenses.lgpl2Plus;
     mainProgram = "bscalc";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/li/libcaca/package.nix b/pkgs/by-name/li/libcaca/package.nix
index e652893ac182a..5b14f07081527 100644
--- a/pkgs/by-name/li/libcaca/package.nix
+++ b/pkgs/by-name/li/libcaca/package.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
       Libcaca was written by Sam Hocevar and Jean-Yves Lamoureux.
     '';
     license = licenses.wtfpl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/li/libde265/package.nix b/pkgs/by-name/li/libde265/package.nix
index 13842a96aca6a..c67f9b64836b2 100644
--- a/pkgs/by-name/li/libde265/package.nix
+++ b/pkgs/by-name/li/libde265/package.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: rec {
     mainProgram = "dec265";
     license = lib.licenses.lgpl3;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/li/libeb/package.nix b/pkgs/by-name/li/libeb/package.nix
index 0c6f380bfd450..2bf7ff792da5f 100644
--- a/pkgs/by-name/li/libeb/package.nix
+++ b/pkgs/by-name/li/libeb/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       the EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats.
     '';
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix
index ed2216680fd28..7b5e7540d1d8c 100644
--- a/pkgs/by-name/li/libedit/package.nix
+++ b/pkgs/by-name/li/libedit/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
       similar to those found in GNU Readline.
     '';
     license = with lib.licenses; [ bsd3 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/li/libev/package.nix b/pkgs/by-name/li/libev/package.nix
index 017d113225595..cf0f426f96b24 100644
--- a/pkgs/by-name/li/libev/package.nix
+++ b/pkgs/by-name/li/libev/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
 
-  configureFlags = lib.optional (static) "LDFLAGS=-static";
+  configureFlags = lib.optional static "LDFLAGS=-static";
 
   meta = {
     description = "High-performance event loop/event model with lots of features";
diff --git a/pkgs/by-name/li/libgbinder/package.nix b/pkgs/by-name/li/libgbinder/package.nix
index e7c1458e8fc4c..304b224873bcc 100644
--- a/pkgs/by-name/li/libgbinder/package.nix
+++ b/pkgs/by-name/li/libgbinder/package.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mer-hybris/libgbinder";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/li/libglibutil/package.nix b/pkgs/by-name/li/libglibutil/package.nix
index 920a71a614752..ccf6a6aa6ec79 100644
--- a/pkgs/by-name/li/libglibutil/package.nix
+++ b/pkgs/by-name/li/libglibutil/package.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     homepage = "https://git.sailfishos.org/mer-core/libglibutil";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/li/libisoburn/package.nix b/pkgs/by-name/li/libisoburn/package.nix
index b607d656f88fa..f7e4eefb7df74 100644
--- a/pkgs/by-name/li/libisoburn/package.nix
+++ b/pkgs/by-name/li/libisoburn/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://dev.lovelyhq.com/libburnia/libisoburn/src/tag/${finalAttrs.src.rev}/ChangeLog";
     license = lib.licenses.gpl2Plus;
     mainProgram = "osirrox";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (libisofs.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/li/libmpdclient/package.nix b/pkgs/by-name/li/libmpdclient/package.nix
index 6fe5ca48bb35b..4bbe0095a5d81 100644
--- a/pkgs/by-name/li/libmpdclient/package.nix
+++ b/pkgs/by-name/li/libmpdclient/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.musicpd.org/libs/libmpdclient/";
     changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/${finalAttrs.src.rev}/NEWS";
     license = with lib.licenses; [ bsd2 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/li/libnl/package.nix b/pkgs/by-name/li/libnl/package.nix
index 2038f109726f9..20e8ea5313de2 100644
--- a/pkgs/by-name/li/libnl/package.nix
+++ b/pkgs/by-name/li/libnl/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optional pythonSupport swig;
 
-  postBuild = lib.optionalString (pythonSupport) ''
+  postBuild = lib.optionalString pythonSupport ''
     cd python
     ${python.pythonOnBuildForHost.interpreter} setup.py install --prefix=../pythonlib
     cd -
diff --git a/pkgs/by-name/li/libomxil-bellagio/package.nix b/pkgs/by-name/li/libomxil-bellagio/package.nix
index 936d70f32787d..7b87b9122284b 100644
--- a/pkgs/by-name/li/libomxil-bellagio/package.nix
+++ b/pkgs/by-name/li/libomxil-bellagio/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       let
         isLLVM17 = stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17";
       in
-      "-Wno-error=absolute-value -Wno-error=enum-conversion -Wno-error=logical-not-parentheses -Wno-error=non-literal-null-conversion${lib.optionalString (isLLVM17) " -Wno-error=unused-but-set-variable"}";
+      "-Wno-error=absolute-value -Wno-error=enum-conversion -Wno-error=logical-not-parentheses -Wno-error=non-literal-null-conversion${lib.optionalString isLLVM17 " -Wno-error=unused-but-set-variable"}";
 
   meta = with lib; {
     homepage = "https://omxil.sourceforge.net/";
diff --git a/pkgs/by-name/li/libremidi/package.nix b/pkgs/by-name/li/libremidi/package.nix
index 4490619f1f716..690994c9f76b8 100644
--- a/pkgs/by-name/li/libremidi/package.nix
+++ b/pkgs/by-name/li/libremidi/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/jcelerier/libremidi";
     description = "Modern C++ MIDI real-time & file I/O library";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/li/libtcod/package.nix b/pkgs/by-name/li/libtcod/package.nix
index 75969c606f62a..fb98b42c47c53 100644
--- a/pkgs/by-name/li/libtcod/package.nix
+++ b/pkgs/by-name/li/libtcod/package.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation {
     homepage = "http://roguecentral.org/doryen/libtcod/";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/li/libusb1/package.nix b/pkgs/by-name/li/libusb1/package.nix
index 53f1333be0d20..43072694fccc1 100644
--- a/pkgs/by-name/li/libusb1/package.nix
+++ b/pkgs/by-name/li/libusb1/package.nix
@@ -43,8 +43,7 @@ stdenv.mkDerivation rec {
   dontAddDisableDepTrack = stdenv.hostPlatform.isWindows;
 
   configureFlags =
-    lib.optional (!enableUdev) "--disable-udev"
-    ++ lib.optional (withExamples) "--enable-examples-build";
+    lib.optional (!enableUdev) "--disable-udev" ++ lib.optional withExamples "--enable-examples-build";
 
   postBuild = lib.optionalString withDocs ''
     make -C doc
diff --git a/pkgs/by-name/li/libverto/package.nix b/pkgs/by-name/li/libverto/package.nix
index 7d148878bdf4e..b1a6756dd3be1 100644
--- a/pkgs/by-name/li/libverto/package.nix
+++ b/pkgs/by-name/li/libverto/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       offload the choice of the main loop to the application.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix
index 5132dd4881565..2e9a4194ef529 100644
--- a/pkgs/by-name/li/libwacom/package.nix
+++ b/pkgs/by-name/li/libwacom/package.nix
@@ -45,12 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
     udev
     libevdev
     libgudev
-    (python3.withPackages (
-      pp: with pp; [
-        pp.libevdev
-        pp.pyudev
-      ]
-    ))
+    (python3.withPackages (pp: [
+      pp.libevdev
+      pp.pyudev
+    ]))
   ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/li/libxeddsa/package.nix b/pkgs/by-name/li/libxeddsa/package.nix
index 123c8a070343d..fbc4e42246502 100644
--- a/pkgs/by-name/li/libxeddsa/package.nix
+++ b/pkgs/by-name/li/libxeddsa/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/Syndace/libxeddsa/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     teams = with lib.teams; [ ngi ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/li/libz/package.nix b/pkgs/by-name/li/libz/package.nix
index a7bca564e7837..626aa1f0f573c 100644
--- a/pkgs/by-name/li/libz/package.nix
+++ b/pkgs/by-name/li/libz/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://sortix.org/libz/";
     description = "Clean fork of zlib";
     license = [ lib.licenses.zlib ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/li/lightning/package.nix b/pkgs/by-name/li/lightning/package.nix
index 22d5982a28bdf..086ac44f3d53b 100644
--- a/pkgs/by-name/li/lightning/package.nix
+++ b/pkgs/by-name/li/lightning/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
       it abstracts over the target CPU, as it exposes to the clients a
       standardized RISC instruction set inspired by the MIPS and SPARC chips.
     '';
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     license = with lib.licenses; [ lgpl3Plus ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin; # failing tests
diff --git a/pkgs/by-name/li/limo/package.nix b/pkgs/by-name/li/limo/package.nix
index d6ee2077b7217..c466fb435c79d 100644
--- a/pkgs/by-name/li/limo/package.nix
+++ b/pkgs/by-name/li/limo/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeFeature "LIMO_INSTALL_PREFIX" (placeholder "out"))
   ]
-  ++ lib.optionals (withUnrar) [
+  ++ lib.optionals withUnrar [
     (lib.cmakeBool "USE_SYSTEM_LIBUNRAR" true)
   ]
   ++ lib.optionals (!withUnrar) [
diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix
index 5dfee0f92ad50..7bbbba3b6a094 100644
--- a/pkgs/by-name/li/linux-wallpaperengine/package.nix
+++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Almamu/linux-wallpaperengine";
     license = with lib.licenses; [ gpl3Plus ];
     mainProgram = "linux-wallpaperengine";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix
index aa85d42d15236..e56ca305cefab 100644
--- a/pkgs/by-name/li/live555/package.nix
+++ b/pkgs/by-name/li/live555/package.nix
@@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
     changelog = "http://www.live555.com/liveMedia/public/changelog.txt";
     license = with lib.licenses; [ lgpl21Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index a9cdc5e81563c..71e391fe5fcc8 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -139,11 +139,11 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   ++ optionals cudaSupport [
     (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
   ]
-  ++ optionals rocmSupport ([
+  ++ optionals rocmSupport [
     (cmakeFeature "CMAKE_HIP_COMPILER" "${rocmPackages.clr.hipClangPath}/clang++")
     # TODO: this should become `clr.gpuTargets` in the future.
     (cmakeFeature "CMAKE_HIP_ARCHITECTURES" rocmPackages.rocblas.amdgpu_targets)
-  ])
+  ]
   ++ optionals metalSupport [
     (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1")
     (cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true)
diff --git a/pkgs/by-name/lp/lpairs2/package.nix b/pkgs/by-name/lp/lpairs2/package.nix
index 1676bf86719e4..ce1248cd2e261 100644
--- a/pkgs/by-name/lp/lpairs2/package.nix
+++ b/pkgs/by-name/lp/lpairs2/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Matching the pairs - a typical Memory Game";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "lpairs2";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/lu/luckybackup/package.nix b/pkgs/by-name/lu/luckybackup/package.nix
index 725b1376ffc7e..58a318f20aa65 100644
--- a/pkgs/by-name/lu/luckybackup/package.nix
+++ b/pkgs/by-name/lu/luckybackup/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl3Plus;
     mainProgram = "luckybackup";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/lu/lukesmithxyz-st/package.nix b/pkgs/by-name/lu/lukesmithxyz-st/package.nix
index d6b91a1c9713f..c1a8ede4823eb 100644
--- a/pkgs/by-name/lu/lukesmithxyz-st/package.nix
+++ b/pkgs/by-name/lu/lukesmithxyz-st/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/LukeSmithxyz/st";
     description = "Luke Smith's fork of st";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/lz/lzsa/package.nix b/pkgs/by-name/lz/lzsa/package.nix
index 85866a2243c2f..ef06433c78601 100644
--- a/pkgs/by-name/lz/lzsa/package.nix
+++ b/pkgs/by-name/lz/lzsa/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Byte-aligned, efficient lossless packer that is optimized for fast decompression on 8-bit micros";
     mainProgram = "lzsa";
     license = with lib.licenses; [ cc0 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ma/maim/package.nix b/pkgs/by-name/ma/maim/package.nix
index 431fc3d774d0e..eca2e188eba1d 100644
--- a/pkgs/by-name/ma/maim/package.nix
+++ b/pkgs/by-name/ma/maim/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     mainProgram = "maim";
     inherit (src.meta) homepage;
     description = "Command-line screenshot utility";
diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix
index b6f3964cb52d1..0a1b99d821295 100644
--- a/pkgs/by-name/ma/mangayomi/package.nix
+++ b/pkgs/by-name/ma/mangayomi/package.nix
@@ -27,7 +27,7 @@ let
     description = "Reading manga, novels, and watching animes";
     homepage = "https://github.com/kodjodevf/mangayomi";
     license = with lib.licenses; [ asl20 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 
diff --git a/pkgs/by-name/ma/marble-shell-theme/package.nix b/pkgs/by-name/ma/marble-shell-theme/package.nix
index ec96fa07a0bab..080b71a233d9d 100644
--- a/pkgs/by-name/ma/marble-shell-theme/package.nix
+++ b/pkgs/by-name/ma/marble-shell-theme/package.nix
@@ -53,6 +53,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     homepage = "https://github.com/imarkoff/Marble-shell-theme";
     changelog = "https://github.com/imarkoff/Marble-shell-theme/releases/tag/${finalAttrs.version}";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ma/marlin-calc/package.nix b/pkgs/by-name/ma/marlin-calc/package.nix
index 6573acea72caf..3aaab1652fc1e 100644
--- a/pkgs/by-name/ma/marlin-calc/package.nix
+++ b/pkgs/by-name/ma/marlin-calc/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/eyal0/Marlin";
     description = "Marlin 3D printer timing simulator";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/marlin-calc.x86_64-darwin
     mainProgram = "marlin-calc";
diff --git a/pkgs/by-name/ma/marst/package.nix b/pkgs/by-name/ma/marst/package.nix
index 94cd0cdd2ffe7..70f3f3f8cfdbb 100644
--- a/pkgs/by-name/ma/marst/package.nix
+++ b/pkgs/by-name/ma/marst/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
         from some other representations to MARST representation.
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ma/material-cursors/package.nix b/pkgs/by-name/ma/material-cursors/package.nix
index a670713949998..47992fa6930dc 100644
--- a/pkgs/by-name/ma/material-cursors/package.nix
+++ b/pkgs/by-name/ma/material-cursors/package.nix
@@ -38,6 +38,6 @@ stdenvNoCC.mkDerivation {
     homepage = "https://github.com/varlesh/material-cursors";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ma/mattermost/build-plugin.nix b/pkgs/by-name/ma/mattermost/build-plugin.nix
index 8dd89211e2e23..730ded4136099 100644
--- a/pkgs/by-name/ma/mattermost/build-plugin.nix
+++ b/pkgs/by-name/ma/mattermost/build-plugin.nix
@@ -53,7 +53,7 @@ let
     ${lib.getExe golangci-lint} "$@"
     result=$?
     echo "golangci-lint returned: $result" >&2
-    ${lib.optionalString (ignoreGoLintWarnings) ''
+    ${lib.optionalString ignoreGoLintWarnings ''
       if [ $result != 0 ]; then
         cat <<EOF >&2
       Ignoring return value since ignoreGoLintWarnings was true.
diff --git a/pkgs/by-name/mc/mcpp/package.nix b/pkgs/by-name/mc/mcpp/package.nix
index 6ca62d1fe8c76..4b8e137a4bd3d 100644
--- a/pkgs/by-name/mc/mcpp/package.nix
+++ b/pkgs/by-name/mc/mcpp/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Matsui's C preprocessor";
     mainProgram = "mcpp";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/by-name/md/md-tangle/package.nix b/pkgs/by-name/md/md-tangle/package.nix
index 534a2d41a2e71..92297ffcdafb3 100644
--- a/pkgs/by-name/md/md-tangle/package.nix
+++ b/pkgs/by-name/md/md-tangle/package.nix
@@ -25,6 +25,6 @@ python3.pkgs.buildPythonPackage rec {
     description = "Generates (\"tangles\") source code from Markdown documents";
     mainProgram = "md-tangle";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/md/md4c/package.nix b/pkgs/by-name/md/md4c/package.nix
index 100d49e21abc4..10fe4712b78dd 100644
--- a/pkgs/by-name/md/md4c/package.nix
+++ b/pkgs/by-name/md/md4c/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://github.com/mity/md4c/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "md2html";
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/me/mediathekview/package.nix b/pkgs/by-name/me/mediathekview/package.nix
index 9c7490aee8d89..ca8a0850be487 100644
--- a/pkgs/by-name/me/mediathekview/package.nix
+++ b/pkgs/by-name/me/mediathekview/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.gpl3Plus;
     mainProgram = "mediathek";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/me/mednafen-server/package.nix b/pkgs/by-name/me/mednafen-server/package.nix
index 40302691125bd..d9e6b8c6f6ed7 100644
--- a/pkgs/by-name/me/mednafen-server/package.nix
+++ b/pkgs/by-name/me/mednafen-server/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "mednafen-server";
     homepage = "https://mednafen.github.io/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/me/mednafen/package.nix b/pkgs/by-name/me/mednafen/package.nix
index ab7665120b468..8596d5c1c4b40 100644
--- a/pkgs/by-name/me/mednafen/package.nix
+++ b/pkgs/by-name/me/mednafen/package.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl2Plus;
     mainProgram = "mednafen";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/me/mednaffe/package.nix b/pkgs/by-name/me/mednaffe/package.nix
index c21689a9be44a..0ce060463d6a0 100644
--- a/pkgs/by-name/me/mednaffe/package.nix
+++ b/pkgs/by-name/me/mednaffe/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "mednaffe";
     homepage = "https://github.com/AmatCoder/mednaffe";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/me/mepo/package.nix b/pkgs/by-name/me/mepo/package.nix
index 12601684e2bbc..bd741b5891c48 100644
--- a/pkgs/by-name/me/mepo/package.nix
+++ b/pkgs/by-name/me/mepo/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     for program in $out/bin/* ; do
       wrapProgram $program \
         --suffix PATH : $out/bin:${
-          lib.makeBinPath ([
+          lib.makeBinPath [
             busybox
             curl
             gpsd
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
             util-linux
             xwininfo
             zenity
-          ])
+          ]
         }
     done
   '';
diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix
index e8c9957eeb6b1..4db58682670cf 100644
--- a/pkgs/by-name/me/mesonlsp/package.nix
+++ b/pkgs/by-name/me/mesonlsp/package.nix
@@ -164,7 +164,7 @@ stdenv'.mkDerivation (finalAttrs: {
     changelog = "https://github.com/JCWasmx86/mesonlsp/releases/tag/v${finalAttrs.version}";
     license = licenses.gpl3Plus;
     mainProgram = "mesonlsp";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     # ../src/liblog/log.cpp:41:7: error: call to 'format' is ambiguous
     broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
diff --git a/pkgs/by-name/me/metis-prover/package.nix b/pkgs/by-name/me/metis-prover/package.nix
index 2333798257a77..7167fc8640243 100644
--- a/pkgs/by-name/me/metis-prover/package.nix
+++ b/pkgs/by-name/me/metis-prover/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     mainProgram = "metis";
     homepage = "https://www.gilith.com/research/metis/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix
index 1ea7711b30a71..b1637c3b5a7d0 100644
--- a/pkgs/by-name/mi/mihomo-party/package.nix
+++ b/pkgs/by-name/mi/mihomo-party/package.nix
@@ -86,6 +86,6 @@ stdenv.mkDerivation rec {
     ];
     license = lib.licenses.gpl3Plus;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/mj/mjpg-streamer/package.nix b/pkgs/by-name/mj/mjpg-streamer/package.nix
index 813636ec747f4..27addc586a7fc 100644
--- a/pkgs/by-name/mj/mjpg-streamer/package.nix
+++ b/pkgs/by-name/mj/mjpg-streamer/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     description = "Takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software";
     platforms = platforms.linux;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "mjpg_streamer";
   };
 }
diff --git a/pkgs/by-name/mo/modd/package.nix b/pkgs/by-name/mo/modd/package.nix
index 4fbd8979740a4..697fea21d22b5 100644
--- a/pkgs/by-name/mo/modd/package.nix
+++ b/pkgs/by-name/mo/modd/package.nix
@@ -27,6 +27,6 @@ buildGoModule {
     mainProgram = "modd";
     homepage = "https://github.com/cortesi/modd";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/mo/moe/package.nix b/pkgs/by-name/mo/moe/package.nix
index c897d3d22cdd4..329bec821eb35 100644
--- a/pkgs/by-name/mo/moe/package.nix
+++ b/pkgs/by-name/mo/moe/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
       delimiter matching, text conversion from/to UTF-8, romanization, etc.
     '';
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "moe";
   };
diff --git a/pkgs/by-name/mo/monaspace/package.nix b/pkgs/by-name/mo/monaspace/package.nix
index 2e04c1b59ea00..2330e3aed8587 100644
--- a/pkgs/by-name/mo/monaspace/package.nix
+++ b/pkgs/by-name/mo/monaspace/package.nix
@@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
     homepage = "https://monaspace.githubnext.com/";
     license = lib.licenses.ofl;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/mp/mpc/package.nix b/pkgs/by-name/mp/mpc/package.nix
index 2ebdbaf488415..6999414d814ce 100644
--- a/pkgs/by-name/mp/mpc/package.nix
+++ b/pkgs/by-name/mp/mpc/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/refs/heads/master/NEWS";
     license = lib.licenses.gpl2Plus;
     mainProgram = "mpc";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/mp/mpvc/package.nix b/pkgs/by-name/mp/mpvc/package.nix
index 7780f59e9dd97..abea95c49c735 100644
--- a/pkgs/by-name/mp/mpvc/package.nix
+++ b/pkgs/by-name/mp/mpvc/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Mpc-like control interface for mpv";
     license = lib.licenses.mit;
     mainProgram = "mpvc";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ms/msr/package.nix b/pkgs/by-name/ms/msr/package.nix
index 3ff8529f61845..e99d2cec9736f 100644
--- a/pkgs/by-name/ms/msr/package.nix
+++ b/pkgs/by-name/ms/msr/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     description = "Linux tool to display or modify x86 model-specific registers (MSRs)";
     mainProgram = "msr";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [
       "i686-linux"
       "x86_64-linux"
diff --git a/pkgs/by-name/mu/multimarkdown/package.nix b/pkgs/by-name/mu/multimarkdown/package.nix
index 20b53464d92c1..e05c6c0c0e04e 100644
--- a/pkgs/by-name/mu/multimarkdown/package.nix
+++ b/pkgs/by-name/mu/multimarkdown/package.nix
@@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
     '';
     license = with licenses; [ mit ];
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix
index 0914a795160c6..f96c36d2b59a3 100644
--- a/pkgs/by-name/mu/muon/package.nix
+++ b/pkgs/by-name/mu/muon/package.nix
@@ -137,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://muon.build/";
     description = "Implementation of Meson build system in C99";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     broken = stdenv.hostPlatform.isDarwin; # typical `ar failure`
     mainProgram = "muon";
diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix
index b58a6520e5e8b..eb90647087939 100644
--- a/pkgs/by-name/mu/mupdf/package.nix
+++ b/pkgs/by-name/mu/mupdf/package.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ]
   ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ]
-  ++ lib.optionals (enableOcr) [ "USE_TESSERACT=yes" ];
+  ++ lib.optionals enableOcr [ "USE_TESSERACT=yes" ];
 
   nativeBuildInputs = [
     pkg-config
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
       ps.libclang
     ]))
   ]
-  ++ lib.optionals (enablePython) [
+  ++ lib.optionals enablePython [
     which
     swig
   ]
@@ -164,7 +164,7 @@ stdenv.mkDerivation rec {
 
   postBuild = lib.optionalString (enableCxx || enablePython) ''
     for dir in build/*; do
-      ./scripts/mupdfwrap.py -d "$dir" -b ${lib.optionalString (enableCxx) "01"}${lib.optionalString (enablePython) "23"}
+      ./scripts/mupdfwrap.py -d "$dir" -b ${lib.optionalString enableCxx "01"}${lib.optionalString enablePython "23"}
     done
   '';
 
@@ -234,15 +234,15 @@ stdenv.mkDerivation rec {
         ln -s "$bin/bin/mupdf-gl" "$bin/bin/mupdf"
       ''
     else
-      lib.optionalString (enableX11) ''
+      lib.optionalString enableX11 ''
         ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf"
       ''
   )
-  + (lib.optionalString (enableCxx) ''
+  + (lib.optionalString enableCxx ''
     cp platform/c++/include/mupdf/*.h $out/include/mupdf
     cp build/*/libmupdfcpp.so $out/lib
   '')
-  + (lib.optionalString (enablePython) (
+  + (lib.optionalString enablePython (
     ''
       mkdir -p $out/${python3.sitePackages}/mupdf
       cp build/*/_mupdf.so $out/${python3.sitePackages}/mupdf
diff --git a/pkgs/by-name/my/myrddin/package.nix b/pkgs/by-name/my/myrddin/package.nix
index d941dfc6dcaa5..cd1708ace2cca 100644
--- a/pkgs/by-name/my/myrddin/package.nix
+++ b/pkgs/by-name/my/myrddin/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     description = "Systems language that is both powerful and fun to use";
     homepage = "https://myrlang.org/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     # darwin: never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/myrddin.x86_64-darwin
     broken =
diff --git a/pkgs/by-name/na/nanopb/runtime.nix b/pkgs/by-name/na/nanopb/runtime.nix
index fba88ee37e2cb..5b6f419596a81 100644
--- a/pkgs/by-name/na/nanopb/runtime.nix
+++ b/pkgs/by-name/na/nanopb/runtime.nix
@@ -22,7 +22,7 @@
   noStaticAssert,
 }:
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   pname = "nanopb-runtime";
   inherit src version;
 
@@ -115,4 +115,4 @@ stdenv.mkDerivation ({
     "-Dnanopb_BUILD_GENERATOR=OFF"
     "-Dnanopb_BUILD_RUNTIME=ON"
   ];
-})
+}
diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix
index f4e715411b765..b5876ec4d7c20 100644
--- a/pkgs/by-name/na/navicat-premium/package.nix
+++ b/pkgs/by-name/na/navicat-premium/package.nix
@@ -40,7 +40,7 @@ appimageTools.wrapType2 {
     description = "Database development tool that allows you to simultaneously connect to many databases";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/by-name/ne/neomutt/package.nix b/pkgs/by-name/ne/neomutt/package.nix
index 82eedbae1c279..abdee6bb6b975 100644
--- a/pkgs/by-name/ne/neomutt/package.nix
+++ b/pkgs/by-name/ne/neomutt/package.nix
@@ -36,9 +36,9 @@
   withNotmuch ? true,
 }:
 
-assert lib.warnIf (
-  enableMixmaster
-) "Support for mixmaster has been removed from neomutt since the 20241002 release" true;
+assert lib.warnIf enableMixmaster
+  "Support for mixmaster has been removed from neomutt since the 20241002 release"
+  true;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "neomutt";
diff --git a/pkgs/by-name/ne/nestopia-ue/package.nix b/pkgs/by-name/ne/nestopia-ue/package.nix
index d976ec8649bef..4f2b2b4e4ddb3 100644
--- a/pkgs/by-name/ne/nestopia-ue/package.nix
+++ b/pkgs/by-name/ne/nestopia-ue/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://raw.githubusercontent.com/0ldsk00l/nestopia/${finalAttrs.src.rev}/ChangeLog";
     license = lib.licenses.gpl2Plus;
     mainProgram = "nestopia";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ne/networkmanager_dmenu/package.nix b/pkgs/by-name/ne/networkmanager_dmenu/package.nix
index 7e39c745d1c95..b718902bf3908 100644
--- a/pkgs/by-name/ne/networkmanager_dmenu/package.nix
+++ b/pkgs/by-name/ne/networkmanager_dmenu/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Small script to manage NetworkManager connections with dmenu instead of nm-applet";
     mainProgram = "networkmanager_dmenu";
     homepage = "https://github.com/firecat53/networkmanager-dmenu";
diff --git a/pkgs/by-name/ne/nexus/package.nix b/pkgs/by-name/ne/nexus/package.nix
index 23d3aa7c9a0af..3076d36c5d3dd 100644
--- a/pkgs/by-name/ne/nexus/package.nix
+++ b/pkgs/by-name/ne/nexus/package.nix
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
       "CVE-2023-6378"
       "CVE-2023-4218"
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix
index 057aa9e93afff..5c3a0cd5c7887 100644
--- a/pkgs/by-name/ng/nghttp2/package.nix
+++ b/pkgs/by-name/ng/nghttp2/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  nativeBuildInputs = [ pkg-config ] ++ lib.optionals (enableApp) [ installShellFiles ];
+  nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableApp [ installShellFiles ];
 
   buildInputs =
     lib.optionals enableApp [
@@ -70,15 +70,15 @@ stdenv.mkDerivation rec {
       zlib
     ]
     ++ lib.optionals (enableApp && !enableHttp3) [ openssl ]
-    ++ lib.optionals (enableGetAssets) [ libxml2 ]
-    ++ lib.optionals (enableHpack) [ jansson ]
-    ++ lib.optionals (enableJemalloc) [ jemalloc ]
-    ++ lib.optionals (enableHttp3) [
+    ++ lib.optionals enableGetAssets [ libxml2 ]
+    ++ lib.optionals enableHpack [ jansson ]
+    ++ lib.optionals enableJemalloc [ jemalloc ]
+    ++ lib.optionals enableHttp3 [
       ngtcp2
       nghttp3
       quictls
     ]
-    ++ lib.optionals (enablePython) [ python3 ];
+    ++ lib.optionals enablePython [ python3 ];
 
   enableParallelBuilding = true;
 
@@ -90,11 +90,11 @@ stdenv.mkDerivation rec {
 
   # Unit tests require CUnit and setting TZDIR environment variable
   doCheck = enableTests;
-  nativeCheckInputs = lib.optionals (enableTests) [
+  nativeCheckInputs = lib.optionals enableTests [
     cunit
     tzdata
   ];
-  preCheck = lib.optionalString (enableTests) ''
+  preCheck = lib.optionalString enableTests ''
     export TZDIR=${tzdata}/share/zoneinfo
   '';
 
@@ -105,13 +105,13 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall =
-    lib.optionalString (enableApp) ''
+    lib.optionalString enableApp ''
       installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx}
     ''
     + lib.optionalString (!enableApp) ''
       rm -r $out/bin
     ''
-    + lib.optionalString (enablePython) ''
+    + lib.optionalString enablePython ''
       patchShebangs $out/share/nghttp2
     ''
     + lib.optionalString (!enablePython) ''
diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix
index 2da30a868854c..245a811de37f2 100644
--- a/pkgs/by-name/ni/nix-required-mounts/package.nix
+++ b/pkgs/by-name/ni/nix-required-mounts/package.nix
@@ -1,7 +1,7 @@
 {
   addDriverRunpath,
   allowedPatternsPath ? callPackage ./closure.nix { inherit allowedPatterns; },
-  allowedPatterns ? rec {
+  allowedPatterns ? {
     # This config is just an example.
     # When the hook observes either of the following requiredSystemFeatures:
     nvidia-gpu.onFeatures = [
diff --git a/pkgs/by-name/no/nomnatong/package.nix b/pkgs/by-name/no/nomnatong/package.nix
index 894ecc0c999da..e1c666baa7b49 100644
--- a/pkgs/by-name/no/nomnatong/package.nix
+++ b/pkgs/by-name/no/nomnatong/package.nix
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://nomfoundation.org/nom-tools/Nom-Font";
     description = "Hán-Nôm Coded Character Set and Nom Na Tong Regular Reference Font";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/no/norouter/package.nix b/pkgs/by-name/no/norouter/package.nix
index 6cd63474af382..7675656c70f29 100644
--- a/pkgs/by-name/no/norouter/package.nix
+++ b/pkgs/by-name/no/norouter/package.nix
@@ -34,7 +34,7 @@ buildGoModule rec {
     description = "Tool to handle unprivileged networking by using multiple loopback addresses";
     homepage = "https://github.com/norouter/norouter";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "norouter";
   };
 }
diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix
index cb656a5f6a3f4..82d1d8807e529 100644
--- a/pkgs/by-name/no/notcurses/package.nix
+++ b/pkgs/by-name/no/notcurses/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   ++ lib.optional multimediaSupport ffmpeg;
 
   cmakeFlags =
-    lib.optional (qrcodegenSupport) "-DUSE_QRCODEGEN=ON"
+    lib.optional qrcodegenSupport "-DUSE_QRCODEGEN=ON"
     ++ lib.optional (!multimediaSupport) "-DUSE_MULTIMEDIA=none";
 
   # https://github.com/dankamongmen/notcurses/issues/2661
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
       replacement for NCURSES on existing systems.
     '';
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (ncurses.meta) platforms;
   };
 }
diff --git a/pkgs/by-name/no/notejot/package.nix b/pkgs/by-name/no/notejot/package.nix
index 9214af6c8fa27..aa186c4cc1104 100644
--- a/pkgs/by-name/no/notejot/package.nix
+++ b/pkgs/by-name/no/notejot/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/lainsce/notejot";
     description = "Stupidly-simple notes app";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "io.github.lainsce.Notejot";
   };
diff --git a/pkgs/by-name/no/noti/package.nix b/pkgs/by-name/no/noti/package.nix
index 27b8675652c03..4cfd4316b9ea3 100644
--- a/pkgs/by-name/no/noti/package.nix
+++ b/pkgs/by-name/no/noti/package.nix
@@ -5,7 +5,7 @@
   installShellFiles,
 }:
 
-buildGoModule (finalAttrs: rec {
+buildGoModule (finalAttrs: {
   pname = "noti";
   version = "3.8.0";
 
diff --git a/pkgs/by-name/nv/nv-codec-headers/package.nix b/pkgs/by-name/nv/nv-codec-headers/package.nix
index fe14a78e3eff3..1e0ae0656ebc0 100644
--- a/pkgs/by-name/nv/nv-codec-headers/package.nix
+++ b/pkgs/by-name/nv/nv-codec-headers/package.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation {
     homepage = "https://ffmpeg.org/";
     downloadPage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix
index 684d337fc7a30..13b8439fd8e1d 100644
--- a/pkgs/by-name/nw/nwg-drawer/package.nix
+++ b/pkgs/by-name/nw/nwg-drawer/package.nix
@@ -65,7 +65,7 @@ buildGoModule {
     changelog = "https://github.com/nwg-piotr/nwg-drawer/releases/tag/${src.rev}";
     license = with lib.licenses; [ agpl3Plus ];
     mainProgram = "nwg-drawer";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/by-name/nx/nxengine-evo/assets.nix b/pkgs/by-name/nx/nxengine-evo/assets.nix
index 6d72a2dabe3d4..c8df83daea747 100644
--- a/pkgs/by-name/nx/nxengine-evo/assets.nix
+++ b/pkgs/by-name/nx/nxengine-evo/assets.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = with lib.licenses; [
       unfreeRedistributable
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/nx/nxengine-evo/package.nix b/pkgs/by-name/nx/nxengine-evo/package.nix
index 7ef2b10a3522a..385f4ad6cfca9 100644
--- a/pkgs/by-name/nx/nxengine-evo/package.nix
+++ b/pkgs/by-name/nx/nxengine-evo/package.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
       gpl3Plus
     ];
     mainProgram = "nx";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix
index 889cc1b312376..894b1bc327cd9 100644
--- a/pkgs/by-name/ob/obs-cmd/package.nix
+++ b/pkgs/by-name/ob/obs-cmd/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/grigio/obs-cmd";
     changelog = "https://github.com/grigio/obs-cmd/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "obs-cmd";
   };
 })
diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix
index d18a38134e3fe..eba15705e28db 100644
--- a/pkgs/by-name/oc/octoprint/package.nix
+++ b/pkgs/by-name/oc/octoprint/package.nix
@@ -15,7 +15,7 @@ let
 
   py = python3.override {
     self = py;
-    packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([
+    packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) [
       (
 
         self: super: {
@@ -238,7 +238,7 @@ let
       })
       (callPackage ./plugins.nix { })
       packageOverrides
-    ]);
+    ];
   };
 in
 with py.pkgs;
diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix
index 6599a4a88f7c1..87b39c4fd8dae 100644
--- a/pkgs/by-name/oc/octoprint/plugins.nix
+++ b/pkgs/by-name/oc/octoprint/plugins.nix
@@ -117,7 +117,7 @@ in
       description = "Plugin for slicing via Cura Legacy from within OctoPrint";
       homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy";
       license = licenses.agpl3Only;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -390,7 +390,7 @@ in
       description = "Better print time estimation for OctoPrint";
       homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius";
       license = licenses.agpl3Only;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -439,7 +439,7 @@ in
       description = "OctoPrint plugin to control ATX/AUX power supply";
       homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl";
       license = licenses.agpl3Only;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -595,7 +595,7 @@ in
       description = "Touch friendly interface for a small TFT module or phone for OctoPrint";
       homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI";
       license = licenses.agpl3Only;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
diff --git a/pkgs/by-name/og/oguri/package.nix b/pkgs/by-name/og/oguri/package.nix
index 057c3f8d2635b..382d864c23f3a 100644
--- a/pkgs/by-name/og/oguri/package.nix
+++ b/pkgs/by-name/og/oguri/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/vilhalmer/oguri/";
     description = "Very nice animated wallpaper daemon for Wayland compositors";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (wayland.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin; # this should be enfoced by wayland platforms in the future
   };
diff --git a/pkgs/by-name/on/onboard/package.nix b/pkgs/by-name/on/onboard/package.nix
index de90f6a4e22be..bc74824ee2fd5 100644
--- a/pkgs/by-name/on/onboard/package.nix
+++ b/pkgs/by-name/on/onboard/package.nix
@@ -197,7 +197,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     homepage = "https://launchpad.net/onboard";
     description = "Onscreen keyboard useful for tablet PC users and for mobility impaired users";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl3;
   };
 }
diff --git a/pkgs/by-name/on/oneanime/package.nix b/pkgs/by-name/on/oneanime/package.nix
index 9a01cf6c8344a..ccaa5e798a9cc 100644
--- a/pkgs/by-name/on/oneanime/package.nix
+++ b/pkgs/by-name/on/oneanime/package.nix
@@ -188,7 +188,7 @@ flutter329.buildFlutterApplication rec {
     homepage = "https://github.com/Predidit/oneAnime";
     mainProgram = "oneanime";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix
index d03bc1e07943e..768965b74a745 100644
--- a/pkgs/by-name/on/onedrivegui/package.nix
+++ b/pkgs/by-name/on/onedrivegui/package.nix
@@ -100,7 +100,7 @@ python3Packages.buildPythonApplication rec {
     description = "Simple GUI for Linux OneDrive Client, with multi-account support";
     mainProgram = "onedrivegui";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/on/onscripter-en/package.nix b/pkgs/by-name/on/onscripter-en/package.nix
index e333459d8ff9b..57c2703b691e3 100644
--- a/pkgs/by-name/on/onscripter-en/package.nix
+++ b/pkgs/by-name/on/onscripter-en/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Japanese visual novel scripting engine";
     license = lib.licenses.gpl2Plus;
     mainProgram = "onscripter-en";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/on/onthespot/package.nix b/pkgs/by-name/on/onthespot/package.nix
index 86bd42383db62..428bcad8eed19 100644
--- a/pkgs/by-name/on/onthespot/package.nix
+++ b/pkgs/by-name/on/onthespot/package.nix
@@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = true;
 
-  nativeBuildInputs = with python3.pkgs; [
+  nativeBuildInputs = [
     copyDesktopItems
     libsForQt5.wrapQtAppsHook
   ];
diff --git a/pkgs/by-name/op/open-wbo/package.nix b/pkgs/by-name/op/open-wbo/package.nix
index 207aa80669b90..a99305706303f 100644
--- a/pkgs/by-name/op/open-wbo/package.nix
+++ b/pkgs/by-name/op/open-wbo/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
     description = "State-of-the-art MaxSAT and Pseudo-Boolean solver";
     mainProgram = "open-wbo";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     license = licenses.mit;
     homepage = "http://sat.inesc-id.pt/open-wbo/";
diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix
index a703f5c189537..11598be3fb126 100644
--- a/pkgs/by-name/op/openh264/package.nix
+++ b/pkgs/by-name/op/openh264/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Codec library which supports H.264 encoding and decoding";
     changelog = "https://github.com/cisco/openh264/releases/tag/${finalAttrs.src.rev}";
     license = with lib.licenses; [ bsd2 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     # See meson.build
     platforms =
       lib.platforms.windows
diff --git a/pkgs/by-name/op/openjk/package.nix b/pkgs/by-name/op/openjk/package.nix
index 9a7c87f889a2b..5a13942c017db 100644
--- a/pkgs/by-name/op/openjk/package.nix
+++ b/pkgs/by-name/op/openjk/package.nix
@@ -117,6 +117,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/JACoders/OpenJK";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix
index 611f33f2b8fdc..b2fb885b26dda 100644
--- a/pkgs/by-name/op/openjpeg/package.nix
+++ b/pkgs/by-name/op/openjpeg/package.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
     curl
     fcgi
   ]
-  ++ lib.optional (jpipLibSupport) jdk;
+  ++ lib.optional jpipLibSupport jdk;
 
   # tests did fail on powerpc64
   doCheck = !stdenv.hostPlatform.isPower64 && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
diff --git a/pkgs/by-name/op/openmsx/package.nix b/pkgs/by-name/op/openmsx/package.nix
index bf27220983908..022a4b5654257 100644
--- a/pkgs/by-name/op/openmsx/package.nix
+++ b/pkgs/by-name/op/openmsx/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
       boost
       gpl2Plus
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "openmsx";
   };
diff --git a/pkgs/by-name/op/opensurge/package.nix b/pkgs/by-name/op/opensurge/package.nix
index a9e7decde0f5d..f488d3dd7e4de 100644
--- a/pkgs/by-name/op/opensurge/package.nix
+++ b/pkgs/by-name/op/opensurge/package.nix
@@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/alemart/opensurge/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/op/ophis/package.nix b/pkgs/by-name/op/ophis/package.nix
index a3f93a76da3f2..d453bc01a247f 100644
--- a/pkgs/by-name/op/ophis/package.nix
+++ b/pkgs/by-name/op/ophis/package.nix
@@ -36,7 +36,7 @@ let
       '';
       license = lib.licenses.mit;
       mainProgram = "ophis";
-      maintainers = with lib.maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/by-name/ot/otb/package.nix b/pkgs/by-name/ot/otb/package.nix
index f797437cb74ed..9416e4b38bcd6 100644
--- a/pkgs/by-name/ot/otb/package.nix
+++ b/pkgs/by-name/ot/otb/package.nix
@@ -34,7 +34,7 @@
   enableMiscellaneous ? true,
   enableOpenMP ? false,
   enablePython ? true,
-  extraPythonPackages ? ps: with ps; [ ],
+  extraPythonPackages ? ps: [ ],
   enableRemote ? true,
   enableShark ? true,
   enableSAR ? true,
@@ -231,9 +231,7 @@ stdenv.mkDerivation (finalAttrs: {
     ./1-otb-swig-include-itk.diff
   ];
 
-  postPatch = (
-    "substituteInPlace Modules/Core/Wrappers/SWIG/src/python/CMakeLists.txt --replace-fail '''$''{ITK_INCLUDE_DIRS}' ${otb-itk}/include/ITK-${itkMajorMinorVersion}"
-  );
+  postPatch = "substituteInPlace Modules/Core/Wrappers/SWIG/src/python/CMakeLists.txt --replace-fail '''$''{ITK_INCLUDE_DIRS}' ${otb-itk}/include/ITK-${itkMajorMinorVersion}";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/ot/otto-matic/package.nix b/pkgs/by-name/ot/otto-matic/package.nix
index f58ce12e8bd45..08595f76dce6f 100644
--- a/pkgs/by-name/ot/otto-matic/package.nix
+++ b/pkgs/by-name/ot/otto-matic/package.nix
@@ -9,7 +9,7 @@
   unstableGitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "OttoMatic";
   version = "4.0.1-unstable-2025-04-27";
 
diff --git a/pkgs/by-name/pa/pamix/package.nix b/pkgs/by-name/pa/pamix/package.nix
index cdcb4a9390e18..84398e33a7909 100644
--- a/pkgs/by-name/pa/pamix/package.nix
+++ b/pkgs/by-name/pa/pamix/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/patroclos/PAmix/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "pamix";
   };
 })
diff --git a/pkgs/by-name/pa/part-db/package.nix b/pkgs/by-name/pa/part-db/package.nix
index 1d00c12f4228f..67fe7e1b0e083 100644
--- a/pkgs/by-name/pa/part-db/package.nix
+++ b/pkgs/by-name/pa/part-db/package.nix
@@ -16,7 +16,7 @@ let
   pname = "part-db";
   version = "1.14.5";
 
-  srcWithVendor = php.buildComposerProject ({
+  srcWithVendor = php.buildComposerProject {
     inherit pname version;
 
     src = fetchFromGitHub {
@@ -50,7 +50,7 @@ let
       cd $out/
       php -d memory_limit=256M bin/console cache:warmup
     '';
-  });
+  };
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname version;
diff --git a/pkgs/by-name/pa/passwdqc/package.nix b/pkgs/by-name/pa/passwdqc/package.nix
index 3fe047aa6e1eb..1d363732f4a6c 100644
--- a/pkgs/by-name/pa/passwdqc/package.nix
+++ b/pkgs/by-name/pa/passwdqc/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.openwall.com/passwdqc/";
     description = "Passphrase strength checking and enforcement";
     license = with lib.licenses; [ bsd3 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "passwdqc";
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/pa/pax/package.nix b/pkgs/by-name/pa/pax/package.nix
index 9dbf30620d735..f3ef5f3700a77 100644
--- a/pkgs/by-name/pa/pax/package.nix
+++ b/pkgs/by-name/pa/pax/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "POSIX standard archive tool from MirBSD";
     homepage = "https://www.mirbsd.org/pax.htm";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix
index 626c2e13cda85..0eb46b565f896 100644
--- a/pkgs/by-name/pd/pdfium-binaries/package.nix
+++ b/pkgs/by-name/pd/pdfium-binaries/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/bblanchon/pdfium-binaries";
     license = with lib.licenses; [ asl20 ];
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = [
       "aarch64-linux"
       "aarch64-darwin"
diff --git a/pkgs/by-name/pd/pdftitle/package.nix b/pkgs/by-name/pd/pdftitle/package.nix
index a8a134e3b645e..582bade2b2d3d 100644
--- a/pkgs/by-name/pd/pdftitle/package.nix
+++ b/pkgs/by-name/pd/pdftitle/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
 
   build-system = with python3Packages; [ setuptools ];
 
-  dependencies = with python3Packages; [ pdfminer ];
+  dependencies = [ pdfminer ];
 
   pythonImportsCheck = [ "pdftitle" ];
 
diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix
index 3bdbfb40ced35..d5cdad9ed979c 100644
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -20,7 +20,7 @@ let
         };
       });
       # pdm requires ...... -> jbig2dec which is AGPL only
-      moto = super.moto.overridePythonAttrs (old: rec {
+      moto = super.moto.overridePythonAttrs (old: {
         doCheck = false;
       });
     };
diff --git a/pkgs/by-name/pg/pgf-pie/package.nix b/pkgs/by-name/pg/pgf-pie/package.nix
index 07bace2d8bfc6..bab0d54745d4b 100644
--- a/pkgs/by-name/pg/pgf-pie/package.nix
+++ b/pkgs/by-name/pg/pgf-pie/package.nix
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/pgf-tikz/pgf-pie";
     description = "Some LaTeX macros for pie charts using the PGF/TikZ package";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/by-name/pg/pgf-umlcd/package.nix b/pkgs/by-name/pg/pgf-umlcd/package.nix
index 0e27c34a656a6..1958a4e84f01f 100644
--- a/pkgs/by-name/pg/pgf-umlcd/package.nix
+++ b/pkgs/by-name/pg/pgf-umlcd/package.nix
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/pgf-tikz/pgf-umlcd";
     description = "Some LaTeX macros for UML Class Diagrams";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/by-name/pg/pgf-umlsd/package.nix b/pkgs/by-name/pg/pgf-umlsd/package.nix
index d9c92475783c5..7608686f43297 100644
--- a/pkgs/by-name/pg/pgf-umlsd/package.nix
+++ b/pkgs/by-name/pg/pgf-umlsd/package.nix
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation {
     homepage = "https://github.com/pgf-tikz/pgf-umlsd";
     description = "Some LaTeX macros for UML Sequence Diagrams";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/pg/pgf2/package.nix b/pkgs/by-name/pg/pgf2/package.nix
index c966046a7f09f..7e7997718f64b 100644
--- a/pkgs/by-name/pg/pgf2/package.nix
+++ b/pkgs/by-name/pg/pgf2/package.nix
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Portable Graphic Format for TeX";
     branch = lib.versions.major version;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/by-name/pg/pgf3/package.nix b/pkgs/by-name/pg/pgf3/package.nix
index 53703cdb72007..039f14693215a 100644
--- a/pkgs/by-name/pg/pgf3/package.nix
+++ b/pkgs/by-name/pg/pgf3/package.nix
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Portable Graphic Format for TeX - version ${finalAttrs.version}";
     branch = lib.versions.major version;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/by-name/pg/pgfplots/package.nix b/pkgs/by-name/pg/pgfplots/package.nix
index 2b66bc08c9c27..42841512f349a 100644
--- a/pkgs/by-name/pg/pgfplots/package.nix
+++ b/pkgs/by-name/pg/pgfplots/package.nix
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://pgfplots.sourceforge.net";
     description = "TeX package to draw plots directly in TeX in two and three dimensions";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/by-name/pi/picoscope/package.nix b/pkgs/by-name/pi/picoscope/package.nix
index 4e86f7eb13cf9..88ec4af71a5ee 100644
--- a/pkgs/by-name/pi/picoscope/package.nix
+++ b/pkgs/by-name/pi/picoscope/package.nix
@@ -93,9 +93,8 @@ let
          runHook postInstall
       '';
       meta =
-        with lib;
-        shared_meta lib
-        // {
+
+        shared_meta lib // {
           description = "library for picotech oscilloscope ${name} series";
         };
     };
diff --git a/pkgs/by-name/pi/pilipalax/package.nix b/pkgs/by-name/pi/pilipalax/package.nix
index 5c2f29f68c593..959975b2cc1d7 100644
--- a/pkgs/by-name/pi/pilipalax/package.nix
+++ b/pkgs/by-name/pi/pilipalax/package.nix
@@ -64,7 +64,7 @@ flutter324.buildFlutterApplication rec {
     homepage = "https://github.com/orz12/PiliPalaX";
     mainProgram = "pilipala";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/pi/pipeworld/package.nix b/pkgs/by-name/pi/pipeworld/package.nix
index 24d3fc661028d..ebd3f6d56caf4 100644
--- a/pkgs/by-name/pi/pipeworld/package.nix
+++ b/pkgs/by-name/pi/pipeworld/package.nix
@@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation (finalPackages: {
       terminal emulator.
     '';
     license = with lib.licenses; [ bsd3 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/pi/pius/package.nix b/pkgs/by-name/pi/pius/package.nix
index 946d4590b6fcb..e61d0be46c856 100644
--- a/pkgs/by-name/pi/pius/package.nix
+++ b/pkgs/by-name/pi/pius/package.nix
@@ -44,6 +44,6 @@ python3Packages.buildPythonApplication {
     license = lib.licenses.gpl2Only;
 
     platforms = lib.platforms.gnu ++ lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix
index ff156c8d6041b..7434c00d3c251 100644
--- a/pkgs/by-name/po/ponyc/package.nix
+++ b/pkgs/by-name/po/ponyc/package.nix
@@ -22,7 +22,7 @@
   procps,
 }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   pname = "ponyc";
   version = "0.59.0";
 
@@ -175,4 +175,4 @@ stdenv.mkDerivation (rec {
       "aarch64-darwin"
     ];
   };
-})
+}
diff --git a/pkgs/by-name/po/ponymix/package.nix b/pkgs/by-name/po/ponymix/package.nix
index 8f4cd665acd2b..6d4cfaecaeb73 100644
--- a/pkgs/by-name/po/ponymix/package.nix
+++ b/pkgs/by-name/po/ponymix/package.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     mainProgram = "ponymix";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pr/prio/package.nix b/pkgs/by-name/pr/prio/package.nix
index c9948112cdd12..d87f657de6a90 100644
--- a/pkgs/by-name/pr/prio/package.nix
+++ b/pkgs/by-name/pr/prio/package.nix
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/letoram/prio";
     description = "Plan9- Rio like Window Manager for Arcan";
     license = with lib.licenses; [ bsd3 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/pr/pritunl-client/package.nix b/pkgs/by-name/pr/pritunl-client/package.nix
index 16340c2d4ed36..8168627c8f59d 100644
--- a/pkgs/by-name/pr/pritunl-client/package.nix
+++ b/pkgs/by-name/pr/pritunl-client/package.nix
@@ -97,7 +97,7 @@ let
       in
       lib.optionalString stdenv.hostPlatform.isLinux ''
         wrapProgram $out/bin/pritunl-client-service \
-          --prefix PATH : "${lib.makeBinPath ([ openvpn-wrapped ])}"
+          --prefix PATH : "${lib.makeBinPath [ openvpn-wrapped ]}"
       '';
     passthru.updateScript = nix-update-script { };
   };
diff --git a/pkgs/by-name/pr/procmail/package.nix b/pkgs/by-name/pr/procmail/package.nix
index 86423a3ff491d..9460d4add541c 100644
--- a/pkgs/by-name/pr/procmail/package.nix
+++ b/pkgs/by-name/pr/procmail/package.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/BuGlessRB/procmail/";
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pr/proton-caller/package.nix b/pkgs/by-name/pr/proton-caller/package.nix
index 0b794b83a436f..93a4b0308fcf2 100644
--- a/pkgs/by-name/pr/proton-caller/package.nix
+++ b/pkgs/by-name/pr/proton-caller/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}";
     homepage = "https://github.com/caverym/proton-caller";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "proton-call";
   };
 }
diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix
index fd3e9f85a90bc..e9e4df03035db 100644
--- a/pkgs/by-name/pr/prowler/package.nix
+++ b/pkgs/by-name/pr/prowler/package.nix
@@ -9,7 +9,7 @@ let
     packageOverrides = self: super: {
 
       # Doesn't work with latest pydantic
-      py-ocsf-models = super.py-ocsf-models.overridePythonAttrs (oldAttrs: rec {
+      py-ocsf-models = super.py-ocsf-models.overridePythonAttrs (oldAttrs: {
         dependencies = [
           python3.pkgs.pydantic_1
           python3.pkgs.cryptography
diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix
index fae2af4421434..5d65332cfdded 100644
--- a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix
+++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix
@@ -7,7 +7,7 @@
   versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "proxmox-auto-install-assistant";
   version = "8.4.6";
 
diff --git a/pkgs/by-name/pr/pru/package.nix b/pkgs/by-name/pr/pru/package.nix
index ff063fe8dc1a2..04d51cc6a70f4 100644
--- a/pkgs/by-name/pr/pru/package.nix
+++ b/pkgs/by-name/pr/pru/package.nix
@@ -18,7 +18,7 @@ bundlerApp {
       grep etc.).
     '';
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 
   passthru.updateScript = bundlerUpdateScript "pru";
diff --git a/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix b/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix
index bdbe5f79f81f2..d6705b5932ed7 100644
--- a/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix
+++ b/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix
@@ -135,7 +135,7 @@ let
       ;
   };
 
-  pulumi-gen = mkBasePackage rec {
+  pulumi-gen = mkBasePackage {
     inherit
       src
       version
diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix
index 8789344023e5b..b1ec04cbb9489 100644
--- a/pkgs/by-name/pv/pvs-studio/package.nix
+++ b/pkgs/by-name/pv/pvs-studio/package.nix
@@ -77,6 +77,6 @@ stdenv.mkDerivation rec {
       "x86_64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/py/pysolfc/package.nix b/pkgs/by-name/py/pysolfc/package.nix
index 1c8d0b8526638..be088f184d0d4 100644
--- a/pkgs/by-name/py/pysolfc/package.nix
+++ b/pkgs/by-name/py/pysolfc/package.nix
@@ -102,6 +102,6 @@ python311Packages.buildPythonApplication rec {
     mainProgram = "pysol.py";
     homepage = "https://pysolfc.sourceforge.io";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix
index 35981f5ad35c6..a0249892f8479 100644
--- a/pkgs/by-name/py/pyspread/package.nix
+++ b/pkgs/by-name/py/pyspread/package.nix
@@ -83,6 +83,6 @@ python3.pkgs.buildPythonApplication {
     '';
     license = with lib.licenses; [ gpl3Plus ];
     mainProgram = "pyspread";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 88608eeb5a050..10fa052b26f14 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Ultimate desktop calculator";
     homepage = "http://qalculate.github.io";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     mainProgram = "qalculate-qt";
     platforms = platforms.unix;
diff --git a/pkgs/by-name/qr/qrcodegen/package.nix b/pkgs/by-name/qr/qrcodegen/package.nix
index c513d7f5088ed..09c176cb98e88 100644
--- a/pkgs/by-name/qr/qrcodegen/package.nix
+++ b/pkgs/by-name/qr/qrcodegen/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.nayuki.io/page/qr-code-generator-library";
     description = "High-quality QR Code generator library in many languages";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix
index df9a58790148a..a12c0f66a5758 100644
--- a/pkgs/by-name/qu/quickjs-ng/package.nix
+++ b/pkgs/by-name/qu/quickjs-ng/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Mighty JavaScript engine";
     license = lib.licenses.mit;
     mainProgram = "qjs";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix
index 7a8083e7c1e6b..34aa3d7dc4885 100644
--- a/pkgs/by-name/qu/qutebrowser/package.nix
+++ b/pkgs/by-name/qu/qutebrowser/package.nix
@@ -145,7 +145,7 @@ python3.pkgs.buildPythonApplication {
         # avoid persistant warning on starup
         --set QT_STYLE_OVERRIDE Fusion
         ${lib.optionalString pipewireSupport ''--prefix LD_LIBRARY_PATH : ${libPath}''}
-        ${lib.optionalString (enableVulkan) ''
+        ${lib.optionalString enableVulkan ''
           --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
           --set-default QSG_RHI_BACKEND vulkan
         ''}
diff --git a/pkgs/by-name/ra/ratpoison/package.nix b/pkgs/by-name/ra/ratpoison/package.nix
index 3ce693368117c..a410a79039bac 100644
--- a/pkgs/by-name/ra/ratpoison/package.nix
+++ b/pkgs/by-name/ra/ratpoison/package.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl2Plus;
     mainProgram = "ratpoison";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (libX11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/re/recutils/package.nix b/pkgs/by-name/re/recutils/package.nix
index 91421c9eac0d9..10ade56994b63 100644
--- a/pkgs/by-name/re/recutils/package.nix
+++ b/pkgs/by-name/re/recutils/package.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
       records, each record containing an arbitrary number of named fields.
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/re/redoflacs/package.nix b/pkgs/by-name/re/redoflacs/package.nix
index 3c9dd24957aa7..6dc5e5e155365 100644
--- a/pkgs/by-name/re/redoflacs/package.nix
+++ b/pkgs/by-name/re/redoflacs/package.nix
@@ -39,10 +39,10 @@ stdenv.mkDerivation rec {
   postFixup = ''
     wrapProgram $out/bin/redoflacs \
       --prefix PATH : ${
-        lib.makeBinPath ([
+        lib.makeBinPath [
           flac
           sox
-        ])
+        ]
       }
   '';
 
diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix
index c5ec6facfacf9..a4e0f308377cf 100644
--- a/pkgs/by-name/re/renderdoc/package.nix
+++ b/pkgs/by-name/re/renderdoc/package.nix
@@ -136,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.mit;
     mainProgram = "renderdoccmd";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.i686);
   };
 })
diff --git a/pkgs/by-name/re/resorter/package.nix b/pkgs/by-name/re/resorter/package.nix
index a575e12b1505a..73d53d950b268 100644
--- a/pkgs/by-name/re/resorter/package.nix
+++ b/pkgs/by-name/re/resorter/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/hiAndrewQuinn/resorter";
     license = with lib.licenses; [ cc0 ];
     mainProgram = "resorter";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/re/revup/package.nix b/pkgs/by-name/re/revup/package.nix
index fe47f2c58437d..e9775ef4bd4ac 100644
--- a/pkgs/by-name/re/revup/package.nix
+++ b/pkgs/by-name/re/revup/package.nix
@@ -70,7 +70,7 @@ let
       '';
       license = lib.licenses.mit;
       mainProgram = "revup";
-      maintainers = with lib.maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/by-name/rn/rng-tools/package.nix b/pkgs/by-name/rn/rng-tools/package.nix
index 5d83fea1f0312..6be6cb8d58df1 100644
--- a/pkgs/by-name/rn/rng-tools/package.nix
+++ b/pkgs/by-name/rn/rng-tools/package.nix
@@ -43,11 +43,11 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    (lib.enableFeature (withJitterEntropy) "jitterentropy")
-    (lib.withFeature (withNistBeacon) "nistbeacon")
-    (lib.withFeature (withPkcs11) "pkcs11")
-    (lib.withFeature (withRtlsdr) "rtlsdr")
-    (lib.withFeature (withQrypt) "qrypt")
+    (lib.enableFeature withJitterEntropy "jitterentropy")
+    (lib.withFeature withNistBeacon "nistbeacon")
+    (lib.withFeature withPkcs11 "pkcs11")
+    (lib.withFeature withRtlsdr "rtlsdr")
+    (lib.withFeature withQrypt "qrypt")
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/ro/robodoc/package.nix b/pkgs/by-name/ro/robodoc/package.nix
index a380bb6111cf9..4a8bb485a6f6d 100644
--- a/pkgs/by-name/ro/robodoc/package.nix
+++ b/pkgs/by-name/ro/robodoc/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
       Java -- basically any program in which you can use remarks/comments.
     '';
     license = with licenses; gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 })
diff --git a/pkgs/by-name/ro/rockbox-utility/package.nix b/pkgs/by-name/ro/rockbox-utility/package.nix
index 37e43de7b5127..8f3d8d39a5043 100644
--- a/pkgs/by-name/ro/rockbox-utility/package.nix
+++ b/pkgs/by-name/ro/rockbox-utility/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.rockbox.org";
     description = "Open source firmware for digital music players";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "RockboxUtility";
     platforms = platforms.linux;
   };
diff --git a/pkgs/by-name/ro/rootbar/package.nix b/pkgs/by-name/ro/rootbar/package.nix
index fdc02ac63b1e4..ffb12d18df474 100644
--- a/pkgs/by-name/ro/rootbar/package.nix
+++ b/pkgs/by-name/ro/rootbar/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
       was designed to address the lack of good bars for wayland.
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/ro/routersploit/package.nix b/pkgs/by-name/ro/routersploit/package.nix
index 1bb8da28873aa..eeb9a06f6c074 100644
--- a/pkgs/by-name/ro/routersploit/package.nix
+++ b/pkgs/by-name/ro/routersploit/package.nix
@@ -4,7 +4,7 @@
   python3,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication {
   pname = "routersploit";
   version = "3.4.1-unstable-2025-04-24";
   pyproject = true;
diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix
index 4ba97ffc5a7d1..292a70afacdd8 100644
--- a/pkgs/by-name/ro/roxterm/package.nix
+++ b/pkgs/by-name/ro/roxterm/package.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl3Plus
     ];
     mainProgram = "roxterm";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/rp/rpcemu/package.nix b/pkgs/by-name/rp/rpcemu/package.nix
index aa6c5e4f9d894..50e1ea55d587f 100644
--- a/pkgs/by-name/rp/rpcemu/package.nix
+++ b/pkgs/by-name/rp/rpcemu/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
       using them with RPCEmu.
     '';
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/rs/rst2html5/package.nix b/pkgs/by-name/rs/rst2html5/package.nix
index ac18b38ca5e51..cdac3c9fd9153 100644
--- a/pkgs/by-name/rs/rst2html5/package.nix
+++ b/pkgs/by-name/rs/rst2html5/package.nix
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonPackage rec {
     description = "Converts ReSTructuredText to (X)HTML5";
     homepage = "https://rst2html5.readthedocs.io/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "rst2html5";
   };
 }
diff --git a/pkgs/by-name/rx/rxvt/package.nix b/pkgs/by-name/rx/rxvt/package.nix
index 040861b42253d..7d23157139940 100644
--- a/pkgs/by-name/rx/rxvt/package.nix
+++ b/pkgs/by-name/rx/rxvt/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
       omitting some of its little-used features, like Tektronix 4014
       emulation and toolkit-style configurability.
     '';
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2;
     platforms = platforms.linux;
     knownVulnerabilities = [
diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix
index 738f7f4149640..d58acfa9782ae 100644
--- a/pkgs/by-name/sa/saber/package.nix
+++ b/pkgs/by-name/sa/saber/package.nix
@@ -76,7 +76,7 @@ flutter329.buildFlutterApplication rec {
     homepage = "https://github.com/saber-notes/saber";
     mainProgram = "saber";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = [
       "aarch64-linux"
       "x86_64-linux"
diff --git a/pkgs/by-name/sa/sage/sage-env.nix b/pkgs/by-name/sa/sage/sage-env.nix
index c8cd3d5e52e81..a41e951e47832 100644
--- a/pkgs/by-name/sa/sage/sage-env.nix
+++ b/pkgs/by-name/sa/sage/sage-env.nix
@@ -60,7 +60,7 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 let
   runtimepath = (
-    lib.makeBinPath ([
+    lib.makeBinPath [
       "@sage-local@"
       "@sage-local@/build"
       pythonEnv
@@ -96,7 +96,7 @@ let
       lcalc
       rubiks
       less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved
-    ])
+    ]
   );
 in
 writeTextFile rec {
diff --git a/pkgs/by-name/sa/salut/package.nix b/pkgs/by-name/sa/salut/package.nix
index 7ab3645ad3c6c..39384a43b24cd 100644
--- a/pkgs/by-name/sa/salut/package.nix
+++ b/pkgs/by-name/sa/salut/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage {
     description = "Sleek notification daemon for Wayland";
     homepage = "https://gitlab.com/snakedye/salut/-/wikis/Home";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "salut";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/sa/sawfish/package.nix b/pkgs/by-name/sa/sawfish/package.nix
index 6482e123d7128..3bca8006e2132 100644
--- a/pkgs/by-name/sa/sawfish/package.nix
+++ b/pkgs/by-name/sa/sawfish/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
       extensibility or redefinition.
     '';
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "sawfish";
   };
diff --git a/pkgs/by-name/sc/scd2html/package.nix b/pkgs/by-name/sc/scd2html/package.nix
index 0114287f74fc4..c1e875ba93881 100644
--- a/pkgs/by-name/sc/scd2html/package.nix
+++ b/pkgs/by-name/sc/scd2html/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "scd2html generates HTML from scdoc source files";
     homepage = "https://git.sr.ht/~bitfehler/scd2html";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "scd2html";
   };
diff --git a/pkgs/by-name/sc/scenefx/package.nix b/pkgs/by-name/sc/scenefx/package.nix
index 68cfb21b65913..237c832f43b04 100644
--- a/pkgs/by-name/sc/scenefx/package.nix
+++ b/pkgs/by-name/sc/scenefx/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects";
     homepage = "https://github.com/wlrfx/scenefx";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "scenefx";
     pkgConfigModules = [ "scenefx" ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/sc/scimark/package.nix b/pkgs/by-name/sc/scimark/package.nix
index 775c276b0f19f..305224d2fbfda 100644
--- a/pkgs/by-name/sc/scimark/package.nix
+++ b/pkgs/by-name/sc/scimark/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     downloadPage = "https://math.nist.gov/scimark2/download_c.html";
     license = lib.licenses.publicDomain;
     mainProgram = "scimark4";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/sc/scons/package.nix b/pkgs/by-name/sc/scons/package.nix
index 3f5c39877a11a..5781d12a24bd9 100644
--- a/pkgs/by-name/sc/scons/package.nix
+++ b/pkgs/by-name/sc/scons/package.nix
@@ -54,6 +54,6 @@ python3Packages.buildPythonApplication rec {
     '';
     homepage = "https://scons.org/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/se/sem/package.nix b/pkgs/by-name/se/sem/package.nix
index a44c8cba092ac..8dd7068016ccd 100644
--- a/pkgs/by-name/se/sem/package.nix
+++ b/pkgs/by-name/se/sem/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
     homepage = "https://github.com/semaphoreci/cli";
     changelog = "https://github.com/semaphoreci/cli/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/se/setconf/package.nix b/pkgs/by-name/se/setconf/package.nix
index 395fac431b864..17acd52dcad0b 100644
--- a/pkgs/by-name/se/setconf/package.nix
+++ b/pkgs/by-name/se/setconf/package.nix
@@ -25,7 +25,7 @@ let
       description = "Small utility for changing settings in configuration textfiles";
       changelog = "https://github.com/xyproto/setconf/releases/tag/${self.src.rev}";
       mainProgram = "setconf";
-      maintainers = with lib.maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/by-name/sh/sharedown/package.nix b/pkgs/by-name/sh/sharedown/package.nix
index c802351eb33d3..5d8fa6f1c6516 100644
--- a/pkgs/by-name/sh/sharedown/package.nix
+++ b/pkgs/by-name/sh/sharedown/package.nix
@@ -51,10 +51,10 @@ stdenvNoCC.mkDerivation rec {
 
   installPhase =
     let
-      binPath = lib.makeBinPath ([
+      binPath = lib.makeBinPath [
         ffmpeg
         yt-dlp
-      ]);
+      ];
 
       modules = yarn2nix-moretea.mkYarnModules rec {
         name = "Sharedown-modules-${version}";
@@ -127,7 +127,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Application to save your Sharepoint videos for offline usage";
     homepage = "https://github.com/kylon/Sharedown";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "Sharedown";
   };
diff --git a/pkgs/by-name/sh/shfm/package.nix b/pkgs/by-name/sh/shfm/package.nix
index d70fd20be3280..56d226eb95a23 100644
--- a/pkgs/by-name/sh/shfm/package.nix
+++ b/pkgs/by-name/sh/shfm/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/dylanaraps/shfm";
     description = "POSIX-shell based file manager";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     mainProgram = "shfm";
   };
diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix
index 51cdca0cfde54..2caec835639d9 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/webrtc.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "WebRTC library used by Signal";
     homepage = "https://github.com/SignalApp/webrtc";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/si/simh/package.nix b/pkgs/by-name/si/simh/package.nix
index 28d03352d3d6f..1be2b1415c95c 100644
--- a/pkgs/by-name/si/simh/package.nix
+++ b/pkgs/by-name/si/simh/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
       available copies of significant or representative software.
     '';
     license = with licenses; mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/by-name/si/simple-dlna-browser/package.nix b/pkgs/by-name/si/simple-dlna-browser/package.nix
index 0f12883dc6b0c..2f48c250e1612 100644
--- a/pkgs/by-name/si/simple-dlna-browser/package.nix
+++ b/pkgs/by-name/si/simple-dlna-browser/package.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation {
     '';
     homepage = "https://github.com/javier-lopez/learn/blob/master/sh/tools/simple-dlna-browser";
     license = lib.licenses.fair;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/si/simple-live-app/package.nix b/pkgs/by-name/si/simple-live-app/package.nix
index 1e4d6564491e5..c2f588f8a74a0 100644
--- a/pkgs/by-name/si/simple-live-app/package.nix
+++ b/pkgs/by-name/si/simple-live-app/package.nix
@@ -58,7 +58,7 @@ flutter329.buildFlutterApplication rec {
     homepage = "https://github.com/xiaoyaocz/dart_simple_live";
     mainProgram = "simple_live_app";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/sk/skribilo/package.nix b/pkgs/by-name/sk/skribilo/package.nix
index 36d47edc80e2a..827b25528a36c 100644
--- a/pkgs/by-name/sk/skribilo/package.nix
+++ b/pkgs/by-name/sk/skribilo/package.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
       conventions used in emails, Usenet and text.
     '';
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/sl/slang/package.nix b/pkgs/by-name/sl/slang/package.nix
index d5143b7a6d372..30fcd56620c93 100644
--- a/pkgs/by-name/sl/slang/package.nix
+++ b/pkgs/by-name/sl/slang/package.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.jedsoft.org/slang/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "slsh";
     platforms = platforms.unix;
   };
diff --git a/pkgs/by-name/sl/sleek-grub-theme/package.nix b/pkgs/by-name/sl/sleek-grub-theme/package.nix
index f9814c485842a..186993f6fbd29 100644
--- a/pkgs/by-name/sl/sleek-grub-theme/package.nix
+++ b/pkgs/by-name/sl/sleek-grub-theme/package.nix
@@ -17,12 +17,12 @@ stdenv.mkDerivation {
   pname = "sleek-grub-theme";
   version = "unstable-2024-08-11";
 
-  src = fetchFromGitHub ({
+  src = fetchFromGitHub {
     owner = "sandesh236";
     repo = "sleek--themes";
     rev = "0c47e645ccc2d72aa165e9d994f9d09f58de9f6d";
     hash = "sha256-H4s4CSR8DaH8RT9w40hkguNNcC0U8gHKS2FLt+FApeA=";
-  });
+  };
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index feea898d472e8..8b72d9be9e34b 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -141,7 +141,7 @@ stdenv.mkDerivation rec {
   ]
   ++ (lib.optional enableGtk2 "--disable-gtktest")
   ++ (lib.optional (!enableX11) "--disable-x11")
-  ++ (lib.optional (enableNVML) "--with-nvml");
+  ++ (lib.optional enableNVML "--with-nvml");
 
   preConfigure = ''
     patchShebangs ./doc/html/shtml2html.py
diff --git a/pkgs/by-name/sl/sly/package.nix b/pkgs/by-name/sl/sly/package.nix
index ad7dc61dfbef2..0a8b7aaaa8bd5 100644
--- a/pkgs/by-name/sl/sly/package.nix
+++ b/pkgs/by-name/sl/sly/package.nix
@@ -48,7 +48,7 @@ flutter327.buildFlutterApplication rec {
     homepage = "https://github.com/kra-mo/Sly";
     mainProgram = "sly";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/sm/smallwm/package.nix b/pkgs/by-name/sm/smallwm/package.nix
index e7cddd10e8516..b079988d298cf 100644
--- a/pkgs/by-name/sm/smallwm/package.nix
+++ b/pkgs/by-name/sm/smallwm/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/adamnew123456/SmallWM";
     license = lib.licenses.bsd2;
     mainProgram = "smallwm";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (libX11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/sm/smplayer/package.nix b/pkgs/by-name/sm/smplayer/package.nix
index 2a7573a22315a..1c14fcd17ae4d 100644
--- a/pkgs/by-name/sm/smplayer/package.nix
+++ b/pkgs/by-name/sm/smplayer/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://github.com/smplayer-dev/smplayer/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/sm/smuxi/package.nix b/pkgs/by-name/sm/smuxi/package.nix
index a48448ce2fbf8..6f2f1fd643143 100644
--- a/pkgs/by-name/sm/smuxi/package.nix
+++ b/pkgs/by-name/sm/smuxi/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     mono
     stfl
   ]
-  ++ lib.optionals (guiSupport) [
+  ++ lib.optionals guiSupport [
     gtk-sharp-2_0
     # loaded at runtime by GTK#
     gdk-pixbuf
diff --git a/pkgs/by-name/sn/sn-pro/package.nix b/pkgs/by-name/sn/sn-pro/package.nix
index 51bbee772936f..b1719a2ff9fb4 100644
--- a/pkgs/by-name/sn/sn-pro/package.nix
+++ b/pkgs/by-name/sn/sn-pro/package.nix
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec {
     description = "SN Pro Font Family";
     homepage = "https://github.com/supernotes/sn-pro";
     license = licenses.ofl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/sn/snippetexpander/package.nix b/pkgs/by-name/sn/snippetexpander/package.nix
index 3112747257ad8..f70bf164daae1 100644
--- a/pkgs/by-name/sn/snippetexpander/package.nix
+++ b/pkgs/by-name/sn/snippetexpander/package.nix
@@ -56,7 +56,7 @@ buildGoModule rec {
     description = "Your little expandable text snippet helper CLI";
     homepage = "https://snippetexpander.org";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "snippetexpander";
   };
diff --git a/pkgs/by-name/sn/snippetexpanderd/package.nix b/pkgs/by-name/sn/snippetexpanderd/package.nix
index dbab53d504167..26043f0081963 100644
--- a/pkgs/by-name/sn/snippetexpanderd/package.nix
+++ b/pkgs/by-name/sn/snippetexpanderd/package.nix
@@ -69,7 +69,7 @@ buildGoModule rec {
     description = "Your little expandable text snippet helper daemon";
     homepage = "https://snippetexpander.org";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "snippetexpanderd";
   };
diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix
index 4926187910469..4f968e5a98eca 100644
--- a/pkgs/by-name/sn/snippetexpandergui/package.nix
+++ b/pkgs/by-name/sn/snippetexpandergui/package.nix
@@ -71,7 +71,7 @@ buildGoModule rec {
     description = "Your little expandable text snippet helper GUI";
     homepage = "https://snippetexpander.org";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "snippetexpandergui";
   };
diff --git a/pkgs/by-name/sn/snippetexpanderx/package.nix b/pkgs/by-name/sn/snippetexpanderx/package.nix
index 2596a255a159a..973833c95526a 100644
--- a/pkgs/by-name/sn/snippetexpanderx/package.nix
+++ b/pkgs/by-name/sn/snippetexpanderx/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     description = "Your little expandable text snippet helper auto expander daemon";
     homepage = "https://snippetexpander.org";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "snippetexpanderx";
   };
diff --git a/pkgs/by-name/so/sonusmix/package.nix b/pkgs/by-name/so/sonusmix/package.nix
index f84d7150623f7..cee2d6b23696c 100644
--- a/pkgs/by-name/so/sonusmix/package.nix
+++ b/pkgs/by-name/so/sonusmix/package.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
     description = "Next-gen Pipewire audio routing tool";
     homepage = "https://codeberg.org/sonusmix/sonusmix";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/so/sound-of-sorting/package.nix b/pkgs/by-name/so/sound-of-sorting/package.nix
index 32306937038ca..4f01b6a418cbc 100644
--- a/pkgs/by-name/so/sound-of-sorting/package.nix
+++ b/pkgs/by-name/so/sound-of-sorting/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://panthema.net/2013/sound-of-sorting/";
     license = lib.licenses.gpl3Plus;
     mainProgram = "sound-of-sorting";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (SDL2.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/so/sov/package.nix b/pkgs/by-name/so/sov/package.nix
index e7a27e8372a30..cf5bd20096790 100644
--- a/pkgs/by-name/so/sov/package.nix
+++ b/pkgs/by-name/so/sov/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Workspace overview app for sway";
     license = lib.licenses.gpl3Only;
     mainProgram = "sov";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (wayland.meta) platforms;
     # sys/timerfd.h header inexistent
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/sp/spigot/package.nix b/pkgs/by-name/sp/spigot/package.nix
index e338da58df46d..4b86a7b6beabe 100644
--- a/pkgs/by-name/sp/spigot/package.nix
+++ b/pkgs/by-name/sp/spigot/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Command-line exact real calculator";
     mainProgram = "spigot";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/sp/spnavcfg/package.nix b/pkgs/by-name/sp/spnavcfg/package.nix
index 7c431a6a6ea13..50349ee6767d0 100644
--- a/pkgs/by-name/sp/spnavcfg/package.nix
+++ b/pkgs/by-name/sp/spnavcfg/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Interactive configuration GUI for space navigator input devices";
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "spnavcfg";
   };
 })
diff --git a/pkgs/by-name/sp/spooles/package.nix b/pkgs/by-name/sp/spooles/package.nix
index 63fe320d1c474..2a810d70d161c 100644
--- a/pkgs/by-name/sp/spooles/package.nix
+++ b/pkgs/by-name/sp/spooles/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.netlib.org/linalg/spooles/";
     description = "Library for solving sparse real and complex linear systems of equations";
     license = licenses.publicDomain;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/sr/src/package.nix b/pkgs/by-name/sr/src/package.nix
index 6787e816ea208..76c06b07cd9bd 100644
--- a/pkgs/by-name/sr/src/package.nix
+++ b/pkgs/by-name/sr/src/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://gitlab.com/esr/src/-/raw/${finalAttrs.version}/NEWS.adoc";
     license = lib.licenses.bsd2;
     mainProgram = "src";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (python3.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix b/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix
index 453606e74b764..cea5632419068 100644
--- a/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix
+++ b/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Small, fullscreen SSH askpass GUI using GTK+2";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "ssh-askpass-fullscreen";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ss/ssh-chat/package.nix b/pkgs/by-name/ss/ssh-chat/package.nix
index a6592121aae9a..510cb510839a0 100644
--- a/pkgs/by-name/ss/ssh-chat/package.nix
+++ b/pkgs/by-name/ss/ssh-chat/package.nix
@@ -22,6 +22,6 @@ buildGoModule rec {
     mainProgram = "ssh-chat";
     homepage = "https://github.com/shazow/ssh-chat";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ss/sshesame/package.nix b/pkgs/by-name/ss/sshesame/package.nix
index 5006d7e7901f6..1b0b5daf257de 100644
--- a/pkgs/by-name/ss/sshesame/package.nix
+++ b/pkgs/by-name/ss/sshesame/package.nix
@@ -37,7 +37,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/jaksi/sshesame";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "sshesame";
   };
 }
diff --git a/pkgs/by-name/st/stacktile/package.nix b/pkgs/by-name/st/stacktile/package.nix
index babcab8344bbd..d51cfcb08b1ef 100644
--- a/pkgs/by-name/st/stacktile/package.nix
+++ b/pkgs/by-name/st/stacktile/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Layout generator for the river Wayland compositor";
     license = with lib.licenses; [ gpl3Plus ];
     mainProgram = "stacktile";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/st/steghide/package.nix b/pkgs/by-name/st/steghide/package.nix
index b230015d241e1..3a1083fa62b12 100644
--- a/pkgs/by-name/st/steghide/package.nix
+++ b/pkgs/by-name/st/steghide/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/museoa/steghide";
     description = "Open source steganography program";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
     mainProgram = "steghide";
   };
diff --git a/pkgs/by-name/st/stella/package.nix b/pkgs/by-name/st/stella/package.nix
index 9e0a77bef1ebf..e2c8cfef8f219 100644
--- a/pkgs/by-name/st/stella/package.nix
+++ b/pkgs/by-name/st/stella/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/stella-emu/stella/releases/tag/${finalAttrs.src.rev}";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "stella";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/st/streamrip/package.nix b/pkgs/by-name/st/streamrip/package.nix
index 262c50c9d3741..b728592bfac37 100644
--- a/pkgs/by-name/st/streamrip/package.nix
+++ b/pkgs/by-name/st/streamrip/package.nix
@@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec {
     description = "Scriptable music downloader for Qobuz, Tidal, SoundCloud, and Deezer";
     homepage = "https://github.com/nathom/streamrip";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "rip";
   };
 }
diff --git a/pkgs/by-name/st/styx/package.nix b/pkgs/by-name/st/styx/package.nix
index 19fc5f3c22f52..6be5fae6cb14a 100644
--- a/pkgs/by-name/st/styx/package.nix
+++ b/pkgs/by-name/st/styx/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Nix based static site generator";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     homepage = "https://styx-static.github.io/styx-site/";
     downloadPage = "https://github.com/styx-static/styx/";
     platforms = platforms.all;
diff --git a/pkgs/by-name/su/substudy/package.nix b/pkgs/by-name/su/substudy/package.nix
index 618597ec23c24..a8a2e925cf8e5 100644
--- a/pkgs/by-name/su/substudy/package.nix
+++ b/pkgs/by-name/su/substudy/package.nix
@@ -42,6 +42,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "http://www.randomhacks.net/substudy";
     license = licenses.asl20;
     mainProgram = "substudy";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix
index 94df0b0f7225c..9002a65e3ba4e 100644
--- a/pkgs/by-name/su/subtitleedit/package.nix
+++ b/pkgs/by-name/su/subtitleedit/package.nix
@@ -95,6 +95,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/su/sunwait/package.nix b/pkgs/by-name/su/sunwait/package.nix
index 770e67b9f73cb..6a88538a53130 100644
--- a/pkgs/by-name/su/sunwait/package.nix
+++ b/pkgs/by-name/su/sunwait/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Calculates sunrise or sunset times with civil, nautical, astronomical and custom twilights";
     homepage = "https://github.com/risacher/sunwait";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "sunwait";
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/su/surgescript/package.nix b/pkgs/by-name/su/surgescript/package.nix
index 55c7ffd67c25e..f6e94b484a83d 100644
--- a/pkgs/by-name/su/surgescript/package.nix
+++ b/pkgs/by-name/su/surgescript/package.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/alemart/surgescript/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/sw/swayest-workstyle/package.nix b/pkgs/by-name/sw/swayest-workstyle/package.nix
index 0ad4d3c4a862a..ab70e3a68a9b1 100644
--- a/pkgs/by-name/sw/swayest-workstyle/package.nix
+++ b/pkgs/by-name/sw/swayest-workstyle/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/Lyr-7D1h/swayest_workstyle";
     license = lib.licenses.mit;
     mainProgram = "sworkstyle";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/sw/swayrbar/package.nix b/pkgs/by-name/sw/swayrbar/package.nix
index a3b3f3479e5ec..55d38175bbce7 100644
--- a/pkgs/by-name/sw/swayrbar/package.nix
+++ b/pkgs/by-name/sw/swayrbar/package.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara";
     license = with licenses; [ gpl3Plus ];
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "swayrbar";
   };
 }
diff --git a/pkgs/by-name/sw/swipe-guess/package.nix b/pkgs/by-name/sw/swipe-guess/package.nix
index 26273fb110103..d7d46749c6f62 100644
--- a/pkgs/by-name/sw/swipe-guess/package.nix
+++ b/pkgs/by-name/sw/swipe-guess/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     homepage = "https://git.sr.ht/~earboxer/swipeGuess/";
     license = lib.licenses.agpl3Only;
     mainProgram = "swipeGuess";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix
index e3a816141d297..73c789c4b61fb 100644
--- a/pkgs/by-name/ta/tabby/package.nix
+++ b/pkgs/by-name/ta/tabby/package.nix
@@ -106,9 +106,9 @@ let
   darwinBuildInputs = [
     llamaccpPackage
   ]
-  ++ optionals stdenv.hostPlatform.isDarwin ([
+  ++ optionals stdenv.hostPlatform.isDarwin [
     apple-sdk_15
-  ]);
+  ];
 
   cudaBuildInputs = [ llamaccpPackage ];
   rocmBuildInputs = [ llamaccpPackage ];
diff --git a/pkgs/by-name/ta/taler-twister/package.nix b/pkgs/by-name/ta/taler-twister/package.nix
index 0183ab9405cd0..91156eb33cb59 100644
--- a/pkgs/by-name/ta/taler-twister/package.nix
+++ b/pkgs/by-name/ta/taler-twister/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://git.taler.net/twister.git";
     description = "Fault injector for HTTP traffic";
     teams = with lib.teams; [ ngi ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     license = lib.licenses.agpl3Plus;
     mainProgram = "twister";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/te/teapot/package.nix b/pkgs/by-name/te/teapot/package.nix
index 34c24962354d4..00db63a055b27 100644
--- a/pkgs/by-name/te/teapot/package.nix
+++ b/pkgs/by-name/te/teapot/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
       systems.
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "teapot";
   };
diff --git a/pkgs/by-name/te/tecla/package.nix b/pkgs/by-name/te/tecla/package.nix
index 493133a2122c8..68787f904c6d5 100644
--- a/pkgs/by-name/te/tecla/package.nix
+++ b/pkgs/by-name/te/tecla/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://sites.astro.caltech.edu/~mcs/tecla/release.html";
     license = with lib.licenses; [ mit ];
     mainProgram = "enhance";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
index 0bfbaf2a497c6..8cc5e5617d1f1 100644
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -5,7 +5,7 @@
   withRdpClient ? true,
   extPatches ? [ ],
 }:
-buildTeleport rec {
+buildTeleport {
   version = "16.5.15";
   hash = "sha256-DqNG6gl+KdjSbkE9Bwum8az8cLCSOmZwo9xpuWafHCA=";
   vendorHash = "sha256-sZvRKLF2iZ3UpgGNUPuWMT7VTpnDa2uU0d1XjDKSmdo=";
diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix
index 660a9437e7f7d..a0792992f5be6 100644
--- a/pkgs/by-name/te/teleport_17/package.nix
+++ b/pkgs/by-name/te/teleport_17/package.nix
@@ -6,7 +6,7 @@
   extPatches ? [ ],
 }:
 
-buildTeleport rec {
+buildTeleport {
   version = "17.7.3";
   hash = "sha256-YSYkJRAeu7iPOs/gFnozZbks0Fx5srNH0VjrKvFmHZo=";
   vendorHash = "sha256-7Rb94ERtp3H1Jwyh9d7AFT06d4xXdnfe5tpdvJQrbUQ=";
diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix
index 96081e9578d76..7585fde5f5b01 100644
--- a/pkgs/by-name/te/teleport_18/package.nix
+++ b/pkgs/by-name/te/teleport_18/package.nix
@@ -6,7 +6,7 @@
   extPatches ? [ ],
 }:
 
-buildTeleport rec {
+buildTeleport {
   version = "18.2.0";
   hash = "sha256-JWgGRv9pK76u7IxwqnBcuAI93XIKfIVvme7l+a/3J7c=";
   vendorHash = "sha256-oPi/rIuwze2ZlyHfZ2MdDHHvdIaF2IZ2aklEVNRgoLo=";
diff --git a/pkgs/by-name/te/terraform-backend-git/package.nix b/pkgs/by-name/te/terraform-backend-git/package.nix
index 0df99f3ddce75..a85bafe5be8d2 100644
--- a/pkgs/by-name/te/terraform-backend-git/package.nix
+++ b/pkgs/by-name/te/terraform-backend-git/package.nix
@@ -41,6 +41,6 @@ buildGoModule rec {
     homepage = "https://github.com/plumber-cd/terraform-backend-git";
     changelog = "https://github.com/plumber-cd/terraform-backend-git/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/te/tet/package.nix b/pkgs/by-name/te/tet/package.nix
index 017e57547d72d..53081eee574e7 100644
--- a/pkgs/by-name/te/tet/package.nix
+++ b/pkgs/by-name/te/tet/package.nix
@@ -4,7 +4,7 @@
   stdenv,
 }:
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   version = "3.8";
   pname = "tet";
 
@@ -28,4 +28,4 @@ stdenv.mkDerivation ({
     platforms = lib.platforms.unix;
     maintainers = [ ];
   };
-})
+}
diff --git a/pkgs/by-name/th/the-legend-of-edgar/package.nix b/pkgs/by-name/th/the-legend-of-edgar/package.nix
index 8504e66e4eb77..abd2c35234d56 100644
--- a/pkgs/by-name/th/the-legend-of-edgar/package.nix
+++ b/pkgs/by-name/th/the-legend-of-edgar/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl1Plus;
     mainProgram = "edgar";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/ti/tickrs/package.nix b/pkgs/by-name/ti/tickrs/package.nix
index 9ab6c06cb2cc0..98a6603463dc3 100644
--- a/pkgs/by-name/ti/tickrs/package.nix
+++ b/pkgs/by-name/ti/tickrs/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/tarkah/tickrs";
     changelog = "https://github.com/tarkah/tickrs/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "tickrs";
   };
 }
diff --git a/pkgs/by-name/ti/tinyalsa/package.nix b/pkgs/by-name/ti/tinyalsa/package.nix
index 1eb5c30522686..c1d2c67a0b3c7 100644
--- a/pkgs/by-name/ti/tinyalsa/package.nix
+++ b/pkgs/by-name/ti/tinyalsa/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/tinyalsa/tinyalsa";
     description = "Tiny library to interface with ALSA in the Linux kernel";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/by-name/ti/tinyemu/package.nix b/pkgs/by-name/ti/tinyemu/package.nix
index e7dfc7cd58382..2a769cb68f22c 100644
--- a/pkgs/by-name/ti/tinyemu/package.nix
+++ b/pkgs/by-name/ti/tinyemu/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
       mit
       bsd2
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/ti/tinywm/package.nix b/pkgs/by-name/ti/tinywm/package.nix
index 7acad743f61c3..08a2003c59959 100644
--- a/pkgs/by-name/ti/tinywm/package.nix
+++ b/pkgs/by-name/ti/tinywm/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.publicDomain;
     mainProgram = "tinywm";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (libX11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/ti/tinyxml-2/package.nix b/pkgs/by-name/ti/tinyxml-2/package.nix
index 9b56e8f64d0b1..5206b1bac7da9 100644
--- a/pkgs/by-name/ti/tinyxml-2/package.nix
+++ b/pkgs/by-name/ti/tinyxml-2/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/leethomason/tinyxml2";
     changelog = "https://github.com/leethomason/tinyxml2/releases/tag/${finalAttrs.src.rev}";
     license = with lib.licenses; [ zlib ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/to/tomato-c/package.nix b/pkgs/by-name/to/tomato-c/package.nix
index 93aa532da5635..45c963273795a 100644
--- a/pkgs/by-name/to/tomato-c/package.nix
+++ b/pkgs/by-name/to/tomato-c/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/gabrielzschmitz/Tomato.C";
     description = " A pomodoro timer written in pure C";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "tomato";
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/to/toml11/package.nix b/pkgs/by-name/to/toml11/package.nix
index da90f7ab12654..472f01d79c32c 100644
--- a/pkgs/by-name/to/toml11/package.nix
+++ b/pkgs/by-name/to/toml11/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
         and Windows.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix ++ platforms.windows;
   };
 })
diff --git a/pkgs/by-name/to/tomlc99/package.nix b/pkgs/by-name/to/tomlc99/package.nix
index 876753f7ac50a..78f82708c3020 100644
--- a/pkgs/by-name/to/tomlc99/package.nix
+++ b/pkgs/by-name/to/tomlc99/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/cktan/tomlc99";
     description = "TOML v1.0.0-compliant library written in C99";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/by-name/to/tomlcpp/package.nix b/pkgs/by-name/to/tomlcpp/package.nix
index 6667ffefc2508..06d8f434dbcef 100644
--- a/pkgs/by-name/to/tomlcpp/package.nix
+++ b/pkgs/by-name/to/tomlcpp/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/cktan/tomlcpp";
     description = "No fanfare TOML C++ Library";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/by-name/tp/tp-auto-kbbl/package.nix b/pkgs/by-name/tp/tp-auto-kbbl/package.nix
index 14fd7d51b01b0..61745dfde7684 100644
--- a/pkgs/by-name/tp/tp-auto-kbbl/package.nix
+++ b/pkgs/by-name/tp/tp-auto-kbbl/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     description = "Auto toggle keyboard back-lighting on Thinkpads (and maybe other laptops) for Linux";
     homepage = "https://github.com/saibotd/tp-auto-kbbl";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "tp-auto-kbbl";
   };
diff --git a/pkgs/by-name/tr/tribler/package.nix b/pkgs/by-name/tr/tribler/package.nix
index a503f1e4cb059..96b0f2deae932 100644
--- a/pkgs/by-name/tr/tribler/package.nix
+++ b/pkgs/by-name/tr/tribler/package.nix
@@ -18,7 +18,7 @@ let
       boost = boost186;
     };
   };
-  libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python;
+  libtorrent = (python3.pkgs.toPythonModule libtorrent-rasterbar-1_2_x).python;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "tribler";
diff --git a/pkgs/by-name/tr/triehash/package.nix b/pkgs/by-name/tr/triehash/package.nix
index 8e7b435336db3..21c85bb660cea 100644
--- a/pkgs/by-name/tr/triehash/package.nix
+++ b/pkgs/by-name/tr/triehash/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/julian-klode/triehash";
     description = "Order-preserving minimal perfect hash function generator";
     license = with licenses; mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = perlPackages.perl.meta.platforms;
     mainProgram = "triehash";
   };
diff --git a/pkgs/by-name/tr/trrntzip/package.nix b/pkgs/by-name/tr/trrntzip/package.nix
index d0f5d813deeae..4d82db1ebc615 100644
--- a/pkgs/by-name/tr/trrntzip/package.nix
+++ b/pkgs/by-name/tr/trrntzip/package.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
       gpl2Plus
     ];
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/tr/truecrack/package.nix b/pkgs/by-name/tr/truecrack/package.nix
index 888ede92cd7d4..dc7a9aa2da974 100644
--- a/pkgs/by-name/tr/truecrack/package.nix
+++ b/pkgs/by-name/tr/truecrack/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     cudaPackages.cuda_cudart
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString ([
+  env.NIX_CFLAGS_COMPILE = toString [
     # Workaround build failure on -fno-common toolchains like upstream
     # gcc-10. Otherwise build fails as:
     #   ld: CpuAes.o:/build/source/src/Crypto/CpuAes.h:1233: multiple definition of
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     #   Common/Crypto.c:42:13: error: implicit declaration of function 'cpu_CipherInit'; did you mean 'CipherInit'? []
     # https://gitlab.com/kalilinux/packages/truecrack/-/commit/5b0e3a96b747013bded7b33f65bb42be2dbafc86
     "-Wno-error=implicit-function-declaration"
-  ]);
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/tt/ttyd/package.nix b/pkgs/by-name/tt/ttyd/package.nix
index d4b94827a98f5..c802eae7c1de7 100644
--- a/pkgs/by-name/tt/ttyd/package.nix
+++ b/pkgs/by-name/tt/ttyd/package.nix
@@ -13,8 +13,6 @@
   nixosTests,
 }:
 
-with builtins;
-
 stdenv.mkDerivation rec {
   pname = "ttyd";
   version = "1.7.7";
diff --git a/pkgs/by-name/tw/twolame/package.nix b/pkgs/by-name/tw/twolame/package.nix
index 70825fe7b9a41..c897d891b4faf 100644
--- a/pkgs/by-name/tw/twolame/package.nix
+++ b/pkgs/by-name/tw/twolame/package.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation {
     homepage = "https://www.twolame.org/";
     license = with licenses; [ lgpl2Plus ];
     platforms = with platforms; unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/uc/ucg/package.nix b/pkgs/by-name/uc/ucg/package.nix
index 19a820e351971..449566915a5c4 100644
--- a/pkgs/by-name/uc/ucg/package.nix
+++ b/pkgs/by-name/uc/ucg/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl3Plus;
     mainProgram = "ucg";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix
index 40bfcf94a53c5..5d20d478f71e6 100644
--- a/pkgs/by-name/uc/uclibc-ng/package.nix
+++ b/pkgs/by-name/uc/uclibc-ng/package.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
     "TARGET_ARCH=${stdenv.hostPlatform.linuxArch}"
     "VERBOSE=1"
   ]
-  ++ lib.optionals (isCross) [
+  ++ lib.optionals isCross [
     "CROSS=${stdenv.cc.targetPrefix}"
   ];
 
diff --git a/pkgs/by-name/ud/udevil/package.nix b/pkgs/by-name/ud/udevil/package.nix
index d30a5b8c767c6..2f7e13849f6e3 100644
--- a/pkgs/by-name/ud/udevil/package.nix
+++ b/pkgs/by-name/ud/udevil/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     homepage = "https://ignorantguru.github.io/udevil/";
     description = "Mount without password";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ud/udig/package.nix b/pkgs/by-name/ud/udig/package.nix
index 17696713099ad..4837f9fa4eaef 100644
--- a/pkgs/by-name/ud/udig/package.nix
+++ b/pkgs/by-name/ud/udig/package.nix
@@ -57,10 +57,10 @@ let
       makeWrapper $out/opt/udig/udig.sh $out/bin/udig \
         --prefix PATH : ${jre8}/bin \
         --prefix LD_LIBRARY_PATH : ${
-          lib.makeLibraryPath ([
+          lib.makeLibraryPath [
             libXtst
             gdal
-          ])
+          ]
         }
     '';
 
@@ -93,7 +93,7 @@ let
       mkdir -p $out/Applications/udig
       cp -R . $out/Applications/udig
       wrapProgram $out/Applications/udig/udig.app/Contents/MacOS/udig_internal \
-        --prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath ([ gdal ])}
+        --prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ gdal ]}
     '';
   };
 in
diff --git a/pkgs/by-name/uh/uhd/package.nix b/pkgs/by-name/uh/uhd/package.nix
index a21c20e92f001..083bf33186583 100644
--- a/pkgs/by-name/uh/uhd/package.nix
+++ b/pkgs/by-name/uh/uhd/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
       python3.pkgs.numpy
       python3.pkgs.setuptools
     ]
-    ++ optionals (enableUtils) [
+    ++ optionals enableUtils [
       python3.pkgs.requests
       python3.pkgs.six
 
@@ -166,11 +166,11 @@ stdenv.mkDerivation (finalAttrs: {
       boost
       libusb1
     ]
-    ++ optionals (enableExamples) [
+    ++ optionals enableExamples [
       ncurses
       ncurses.dev
     ]
-    ++ optionals (enableDpdk) [
+    ++ optionals enableDpdk [
       dpdk
     ];
 
diff --git a/pkgs/by-name/ui/uivonim/package.nix b/pkgs/by-name/ui/uivonim/package.nix
index e0ab2a1f8d18c..b3803cf3282eb 100644
--- a/pkgs/by-name/ui/uivonim/package.nix
+++ b/pkgs/by-name/ui/uivonim/package.nix
@@ -37,7 +37,7 @@ buildNpmPackage rec {
   meta = with lib; {
     homepage = "https://github.com/smolck/uivonim";
     description = "Cross-platform GUI for neovim based on electron";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     license = licenses.agpl3Only;
     mainProgram = "uivonim";
diff --git a/pkgs/by-name/un/undetected-chromedriver/package.nix b/pkgs/by-name/un/undetected-chromedriver/package.nix
index 4bf725552fadf..6ec572c9ee70a 100644
--- a/pkgs/by-name/un/undetected-chromedriver/package.nix
+++ b/pkgs/by-name/un/undetected-chromedriver/package.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = chromedriver.meta // {
     description = "Custom Selenium ChromeDriver that passes all bot mitigation systems";
     mainProgram = "undetected-chromedriver";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/un/units/package.nix b/pkgs/by-name/un/units/package.nix
index 9ae7afa4b4331..bea3a448ed0b2 100644
--- a/pkgs/by-name/un/units/package.nix
+++ b/pkgs/by-name/un/units/package.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ gpl3Plus ];
     mainProgram = "units";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ur/urjtag/package.nix b/pkgs/by-name/ur/urjtag/package.nix
index f36d09e20296b..81c78a8b2664d 100644
--- a/pkgs/by-name/ur/urjtag/package.nix
+++ b/pkgs/by-name/ur/urjtag/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
       gpl2Plus
       lgpl21Plus
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/us/usb-modeswitch/data.nix b/pkgs/by-name/us/usb-modeswitch/data.nix
index d767935592cd1..45d9a41aa84b2 100644
--- a/pkgs/by-name/us/usb-modeswitch/data.nix
+++ b/pkgs/by-name/us/usb-modeswitch/data.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   # the usb_modeswitch.d directory
   nativeBuildInputs = [ tcl ];
 
-  meta = with lib; {
+  meta = {
     description = "Device database and the rules file for 'multi-mode' USB devices";
     inherit (usb-modeswitch.meta) license maintainers platforms;
   };
diff --git a/pkgs/by-name/uu/uudeview/package.nix b/pkgs/by-name/uu/uudeview/package.nix
index 211a70b7ff117..d14e02a8eb4a6 100644
--- a/pkgs/by-name/uu/uudeview/package.nix
+++ b/pkgs/by-name/uu/uudeview/package.nix
@@ -7,7 +7,7 @@
   autoreconfHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "uudeview";
   version = "0.5.20-unstable-2025-03-20";
 
diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix
index 26015c781a430..ef219f6f19477 100644
--- a/pkgs/by-name/ux/uxn/package.nix
+++ b/pkgs/by-name/ux/uxn/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://wiki.xxiivv.com/site/uxn.html";
     description = "Assembler and emulator for the Uxn stack machine";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "uxnemu";
     inherit (SDL2.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index 5526d50f52685..851216d9629f4 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -110,7 +110,7 @@ buildDotnetModule rec {
     homepage = "https://github.com/2dust/v2rayN";
     mainProgram = "v2rayN";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index 7563832e5eb92..6cdc07d088d8d 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "High-performance data structure server that primarily serves key/value workloads";
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     changelog = "https://github.com/valkey-io/valkey/releases/tag/${finalAttrs.version}";
     mainProgram = "valkey-cli";
   };
diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix
index 6bb715a9110d2..88c4f1acf75aa 100644
--- a/pkgs/by-name/ve/venera/package.nix
+++ b/pkgs/by-name/ve/venera/package.nix
@@ -99,7 +99,7 @@ flutter329.buildFlutterApplication rec {
     homepage = "https://github.com/venera-app/venera";
     mainProgram = "venera";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/vi/viw/package.nix b/pkgs/by-name/vi/viw/package.nix
index 60528f8e1b598..ed89d5747c52d 100644
--- a/pkgs/by-name/vi/viw/package.nix
+++ b/pkgs/by-name/vi/viw/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     description = "VI Worsened, a fun and light clone of VI";
     homepage = "https://github.com/lpan/viw";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "viw";
   };
 }
diff --git a/pkgs/by-name/vk/vkd3d-proton/package.nix b/pkgs/by-name/vk/vkd3d-proton/package.nix
index d5e274cea8cde..7b5857738f87c 100644
--- a/pkgs/by-name/vk/vkd3d-proton/package.nix
+++ b/pkgs/by-name/vk/vkd3d-proton/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/HansKristian-Work/vkd3d-proton";
     description = "A fork of VKD3D, which aims to implement the full Direct3D 12 API on top of Vulkan";
     license = with lib.licenses; [ lgpl21Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (wine.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix
index 13e31f9fcb147..8eb5b281c469b 100644
--- a/pkgs/by-name/vk/vkd3d/package.nix
+++ b/pkgs/by-name/vk/vkd3d/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ lgpl21Plus ];
     mainProgram = "vkd3d-compiler";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (wine.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/vl/vlc-bin/package.nix b/pkgs/by-name/vl/vlc-bin/package.nix
index 6aed05b571ca3..85e7f1987ac7f 100644
--- a/pkgs/by-name/vl/vlc-bin/package.nix
+++ b/pkgs/by-name/vl/vlc-bin/package.nix
@@ -58,11 +58,12 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "vlc";
     maintainers = with lib.maintainers; [ pcasaretto ];
     platforms = lib.systems.inspect.patternLogicalAnd (lib.systems.inspect.patterns.isDarwin) (
-      ({
+      {
         "arm64" = lib.systems.inspect.patterns.isAarch64;
         "intel64" = lib.systems.inspect.patterns.isx86_64;
         "universal" = lib.systems.inspect.patterns.isDarwin;
-      }).${variant}
+      }
+      .${variant}
     );
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/vm/vms-empire/package.nix b/pkgs/by-name/vm/vms-empire/package.nix
index b598b5a2f9aa8..975a08e77e48b 100644
--- a/pkgs/by-name/vm/vms-empire/package.nix
+++ b/pkgs/by-name/vm/vms-empire/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl2Only;
     mainProgram = "vms-empire";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/vn/vnote/package.nix b/pkgs/by-name/vn/vnote/package.nix
index 417c30ec0b68c..71ffbc260ec38 100644
--- a/pkgs/by-name/vn/vnote/package.nix
+++ b/pkgs/by-name/vn/vnote/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "vnote";
     changelog = "https://github.com/vnotex/vnote/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.lgpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix
index 7b9cbe55c16f3..be6f1e0801b7e 100644
--- a/pkgs/by-name/vo/voicevox-core/package.nix
+++ b/pkgs/by-name/vo/voicevox-core/package.nix
@@ -64,12 +64,12 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/VOICEVOX/voicevox_core";
     license = with lib.licenses; [
       mit
-      ({
+      {
         name = "VOICEVOX Core Library Terms of Use";
         url = "https://github.com/VOICEVOX/voicevox_resource/blob/main/core/README.md";
         free = false;
         redistributable = true;
-      })
+      }
     ];
     maintainers = with lib.maintainers; [
       tomasajt
diff --git a/pkgs/by-name/vp/vp/package.nix b/pkgs/by-name/vp/vp/package.nix
index 768285c4afed7..59c1a6cb3bc67 100644
--- a/pkgs/by-name/vp/vp/package.nix
+++ b/pkgs/by-name/vp/vp/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "SDL based picture viewer/slideshow";
     license = lib.licenses.gpl3Plus;
     mainProgram = "vp";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (SDL.meta) platforms;
     hydraPlatforms = lib.platforms.linux; # build hangs on both Darwin platforms, needs investigation
   };
diff --git a/pkgs/by-name/vt/vtfedit/package.nix b/pkgs/by-name/vt/vtfedit/package.nix
index 6b8792452727b..f222b329cc136 100644
--- a/pkgs/by-name/vt/vtfedit/package.nix
+++ b/pkgs/by-name/vt/vtfedit/package.nix
@@ -75,6 +75,6 @@ stdenv.mkDerivation rec {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.lgpl21Plus;
     inherit (wine.meta) platforms;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/vt/vtm/package.nix b/pkgs/by-name/vt/vtm/package.nix
index e4d46372b5e86..4eae4234686fe 100644
--- a/pkgs/by-name/vt/vtm/package.nix
+++ b/pkgs/by-name/vt/vtm/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://vtm.netxs.online/";
     license = lib.licenses.mit;
     mainProgram = "vtm";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/vy/vym/package.nix b/pkgs/by-name/vy/vym/package.nix
index 1b54b14520297..9d42a69ef879d 100644
--- a/pkgs/by-name/vy/vym/package.nix
+++ b/pkgs/by-name/vy/vym/package.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "vym";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix
index 2902a7fe55cac..732db7abab33d 100644
--- a/pkgs/by-name/wa/waf/package.nix
+++ b/pkgs/by-name/wa/waf/package.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://gitlab.com/ita1024/waf/blob/waf-${finalAttrs.version}/ChangeLog";
     license = lib.licenses.bsd3;
     mainProgram = "waf";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (python3.meta) platforms;
     sourceProvenance = [ lib.sourceTypes.fromSource ];
   };
diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index 9cdc708575b4e..7a21e22918b46 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -46,7 +46,7 @@ let
       "x86_64-linux"
       "x86_64-darwin"
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 
   linux = stdenv.mkDerivation {
diff --git a/pkgs/by-name/wa/waybox/package.nix b/pkgs/by-name/wa/waybox/package.nix
index d31d642a33ea2..2cd19e53f2e56 100644
--- a/pkgs/by-name/wa/waybox/package.nix
+++ b/pkgs/by-name/wa/waybox/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Openbox clone on Wayland";
     license = lib.licenses.mit;
     mainProgram = "waybox";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (wayland.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix
index 42dd8bda565a7..02e79a95cfe2e 100644
--- a/pkgs/by-name/wa/waydroid-helper/package.nix
+++ b/pkgs/by-name/wa/waydroid-helper/package.nix
@@ -96,6 +96,6 @@ python3Packages.buildPythonApplication rec {
     mainProgram = "waydroid-helper";
     platforms = lib.platforms.linux;
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/wb/wbg/package.nix b/pkgs/by-name/wb/wbg/package.nix
index 320a9c7f1cc89..306b60dfbb4a6 100644
--- a/pkgs/by-name/wb/wbg/package.nix
+++ b/pkgs/by-name/wb/wbg/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     homepage = "https://codeberg.org/dnkl/wbg";
     changelog = "https://codeberg.org/dnkl/wbg/releases/tag/${version}";
     license = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux;
     mainProgram = "wbg";
   };
diff --git a/pkgs/by-name/wi/wifish/package.nix b/pkgs/by-name/wi/wifish/package.nix
index 4477e565f5ab9..2ef24944e0407 100644
--- a/pkgs/by-name/wi/wifish/package.nix
+++ b/pkgs/by-name/wi/wifish/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     description = "Simple wifi shell script for linux";
     mainProgram = "wifish";
     license = licenses.wtfpl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/by-name/wi/wiki-js/package.nix b/pkgs/by-name/wi/wiki-js/package.nix
index 159ecabc0a2d1..06778427ec87b 100644
--- a/pkgs/by-name/wi/wiki-js/package.nix
+++ b/pkgs/by-name/wi/wiki-js/package.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     homepage = "https://js.wiki/";
     description = "Modern and powerful wiki app built on Node.js";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/wi/windmill/package.nix b/pkgs/by-name/wi/windmill/package.nix
index ebcc658b9e4a3..46a0cc857d222 100644
--- a/pkgs/by-name/wi/windmill/package.nix
+++ b/pkgs/by-name/wi/windmill/package.nix
@@ -212,7 +212,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
         "web-ui"
       ];
     })
-    (./update-librusty.sh)
+    ./update-librusty.sh
   ];
 
   meta = {
diff --git a/pkgs/by-name/wi/windsend-rs/package.nix b/pkgs/by-name/wi/windsend-rs/package.nix
index 5bdbd6a79b633..a63ae7f1597db 100644
--- a/pkgs/by-name/wi/windsend-rs/package.nix
+++ b/pkgs/by-name/wi/windsend-rs/package.nix
@@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/doraemonkeys/WindSend";
     mainProgram = "wind_send";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/wi/windterm/package.nix b/pkgs/by-name/wi/windterm/package.nix
index 0fd7afc9d3e8c..1d7188b37bec9 100644
--- a/pkgs/by-name/wi/windterm/package.nix
+++ b/pkgs/by-name/wi/windterm/package.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "windterm";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 })
diff --git a/pkgs/by-name/wi/wings/package.nix b/pkgs/by-name/wi/wings/package.nix
index c6c9fb52fa5f8..026d4887e7723 100644
--- a/pkgs/by-name/wi/wings/package.nix
+++ b/pkgs/by-name/wi/wings/package.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.wings3d.com/";
     description = "Subdivision modeler inspired by Nendo and Mirai from Izware";
     license = lib.licenses.tcltk;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "wings";
   };
diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix
index ea8ce6fcf379a..991644338a25b 100644
--- a/pkgs/by-name/wi/wio/package.nix
+++ b/pkgs/by-name/wi/wio/package.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ bsd3 ];
     mainProgram = "wio";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (wayland.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/wi/with-shell/package.nix b/pkgs/by-name/wi/with-shell/package.nix
index 2b4069da27862..8019e1791d525 100644
--- a/pkgs/by-name/wi/with-shell/package.nix
+++ b/pkgs/by-name/wi/with-shell/package.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation {
       To exit use either :q or :exit.
     '';
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "with";
   };
diff --git a/pkgs/by-name/wl/wlay/package.nix b/pkgs/by-name/wl/wlay/package.nix
index 4e05f5b4f7f0a..2a529a3c62a13 100644
--- a/pkgs/by-name/wl/wlay/package.nix
+++ b/pkgs/by-name/wl/wlay/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/atx/wlay";
     description = "Graphical output management for Wayland";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (wayland.meta) platforms;
     mainProgram = "wlay";
   };
diff --git a/pkgs/by-name/wl/wlogout/package.nix b/pkgs/by-name/wl/wlogout/package.nix
index 2aeff3f107145..1dcacdf2bcdb1 100644
--- a/pkgs/by-name/wl/wlogout/package.nix
+++ b/pkgs/by-name/wl/wlogout/package.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/ArtsyMacaw/wlogout/releases/tag/${finalAttrs.src.rev}";
     license = with lib.licenses; [ mit ];
     mainProgram = "wlogout";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (wayland.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/wl/wlprop/package.nix b/pkgs/by-name/wl/wlprop/package.nix
index 2317cc541e57e..9ce6e4ed23f13 100644
--- a/pkgs/by-name/wl/wlprop/package.nix
+++ b/pkgs/by-name/wl/wlprop/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
     description = "Xprop clone for wlroots based compositors";
     homepage = "https://gist.github.com/crispyricepc/f313386043395ff06570e02af2d9a8e0";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "wlprop";
   };
diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix
index 4d05628ec553e..0cd176b210db4 100644
--- a/pkgs/by-name/wo/wootility/package.nix
+++ b/pkgs/by-name/wo/wootility/package.nix
@@ -38,9 +38,9 @@ appimageTools.wrapType2 {
   '';
 
   extraPkgs =
-    pkgs: with pkgs; ([
+    pkgs: with pkgs; [
       xorg.libxkbfile
-    ]);
+    ];
 
   meta = {
     homepage = "https://wooting.io/wootility";
diff --git a/pkgs/by-name/wo/worker/package.nix b/pkgs/by-name/wo/worker/package.nix
index fe1a7953b7b34..ac2cf660325b2 100644
--- a/pkgs/by-name/wo/worker/package.nix
+++ b/pkgs/by-name/wo/worker/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "worker";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (libX11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/x1/x11docker/package.nix b/pkgs/by-name/x1/x11docker/package.nix
index 0c151a8f05c72..cbd6ac36c2458 100644
--- a/pkgs/by-name/x1/x11docker/package.nix
+++ b/pkgs/by-name/x1/x11docker/package.nix
@@ -20,7 +20,7 @@
   weston,
   xwayland,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "x11docker";
   version = "7.6.0-unstable-2024-04-04";
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/x2/x265/package.nix b/pkgs/by-name/x2/x265/package.nix
index 54c93e9d7b692..c34f5773d0e7f 100644
--- a/pkgs/by-name/x2/x265/package.nix
+++ b/pkgs/by-name/x2/x265/package.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     cmake
     nasm
   ]
-  ++ lib.optionals (numaSupport) [ numactl ];
+  ++ lib.optionals numaSupport [ numactl ];
 
   cmakeFlags = [
     "-DENABLE_ALPHA=ON"
diff --git a/pkgs/by-name/xa/xa/package.nix b/pkgs/by-name/xa/xa/package.nix
index 97ef84c90f6e6..d9a012ad7bb12 100644
--- a/pkgs/by-name/xa/xa/package.nix
+++ b/pkgs/by-name/xa/xa/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
       - block structure for label scoping
     '';
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
   };
 })
diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix
index 39fa30efddb13..aac2c8fb916ed 100644
--- a/pkgs/by-name/xa/xarcan/package.nix
+++ b/pkgs/by-name/xa/xarcan/package.nix
@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalPackages: {
       allows running an X session as a window under Arcan.
     '';
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/xd/xdvdfs-cli/package.nix b/pkgs/by-name/xd/xdvdfs-cli/package.nix
index 852129c1be7b2..02c6e312b1e43 100644
--- a/pkgs/by-name/xd/xdvdfs-cli/package.nix
+++ b/pkgs/by-name/xd/xdvdfs-cli/package.nix
@@ -35,6 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/antangelo/xdvdfs";
     changelog = "https://github.com/antangelo/xdvdfs/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index b89fb23ea1262..e6dc3b3bc99c5 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/xemu-project/xemu/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     mainProgram = "xemu";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/xf/xfig/package.nix b/pkgs/by-name/xf/xfig/package.nix
index f53ccd161b1fa..f88b701039287 100644
--- a/pkgs/by-name/xf/xfig/package.nix
+++ b/pkgs/by-name/xf/xfig/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://sourceforge.net/p/mcj/xfig/ci/${version}/tree/CHANGES";
     description = "Interactive drawing tool for X11";
     mainProgram = "xfig";
diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix
index 13fdccfeed2a4..df0c842a65c8a 100644
--- a/pkgs/by-name/xi/xine-lib/package.nix
+++ b/pkgs/by-name/xi/xine-lib/package.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl2Plus
     ];
     # No useful mainProgram
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix
index 97192466a75d7..fa40ebbd5867f 100644
--- a/pkgs/by-name/xi/xine-ui/package.nix
+++ b/pkgs/by-name/xi/xine-ui/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Xlib-based frontend for Xine video player";
     license = lib.licenses.gpl2Plus;
     mainProgram = "xine";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/xm/xmousepasteblock/package.nix b/pkgs/by-name/xm/xmousepasteblock/package.nix
index 30a994fd81c8e..79e165bff593b 100644
--- a/pkgs/by-name/xm/xmousepasteblock/package.nix
+++ b/pkgs/by-name/xm/xmousepasteblock/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     libev
   ];
   nativeBuildInputs = [ pkg-config ];
-  meta = with lib; {
+  meta = {
     description = "Middle mouse button primary X selection/clipboard paste disabler";
     homepage = "https://github.com/milaq/XMousePasteBlock";
     license = lib.licenses.gpl2Only;
diff --git a/pkgs/by-name/xo/xosview/package.nix b/pkgs/by-name/xo/xosview/package.nix
index 4c165f639c51c..0709ee83628b6 100644
--- a/pkgs/by-name/xo/xosview/package.nix
+++ b/pkgs/by-name/xo/xosview/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Classic system monitoring tool";
     license = lib.licenses.gpl2Plus;
     mainProgram = "xosview";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 })
diff --git a/pkgs/by-name/xo/xosview2/package.nix b/pkgs/by-name/xo/xosview2/package.nix
index ea7631a7ff277..1154fac8dee0d 100644
--- a/pkgs/by-name/xo/xosview2/package.nix
+++ b/pkgs/by-name/xo/xosview2/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
       bsdOriginal
     ];
     mainProgram = "xosview2";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (libX11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/xo/xow_dongle-firmware/package.nix b/pkgs/by-name/xo/xow_dongle-firmware/package.nix
index e0cd58af04707..d08723304b2f9 100644
--- a/pkgs/by-name/xo/xow_dongle-firmware/package.nix
+++ b/pkgs/by-name/xo/xow_dongle-firmware/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   cabextract,
 }:
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
   pname = "xow_dongle-firmware";
   version = "0-unstable-2025-04-22";
 
diff --git a/pkgs/by-name/ya/yabasic/package.nix b/pkgs/by-name/ya/yabasic/package.nix
index 09146db7c8287..006ad5bc46e8d 100644
--- a/pkgs/by-name/ya/yabasic/package.nix
+++ b/pkgs/by-name/ya/yabasic/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://2484.de/yabasic/whatsnew.html";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix
index dff96effdbf12..f25a80b9205de 100644
--- a/pkgs/by-name/ya/yambar/package.nix
+++ b/pkgs/by-name/ya/yambar/package.nix
@@ -71,11 +71,11 @@ stdenv.mkDerivation (finalAttrs: {
     tllist
     udev
   ]
-  ++ lib.optionals (waylandSupport) [
+  ++ lib.optionals waylandSupport [
     wayland
     wayland-protocols
   ]
-  ++ lib.optionals (x11Support) [
+  ++ lib.optionals x11Support [
     xcbutil
     xcbutilcursor
     xcbutilerrors
@@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "yambar";
   };
diff --git a/pkgs/by-name/ya/yapesdl/package.nix b/pkgs/by-name/ya/yapesdl/package.nix
index 6accc8bc563ff..d58230544caf5 100644
--- a/pkgs/by-name/ya/yapesdl/package.nix
+++ b/pkgs/by-name/ya/yapesdl/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/calmopyrin/yapesdl/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.gpl2Plus;
     mainProgram = "yapesdl";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/ye/yeahwm/package.nix b/pkgs/by-name/ye/yeahwm/package.nix
index ca2b2be76694c..cde380a5a8983 100644
--- a/pkgs/by-name/ye/yeahwm/package.nix
+++ b/pkgs/by-name/ye/yeahwm/package.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "http://phrat.de/README";
     license = lib.licenses.isc;
     mainProgram = "yeahwm";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     broken = stdenv.hostPlatform.isLinux; # Does not build with GCC 14.
     inherit (libX11.meta) platforms;
   };
diff --git a/pkgs/by-name/ye/yex-lang/package.nix b/pkgs/by-name/ye/yex-lang/package.nix
index f610f0d01e3de..ed70d49f52e98 100644
--- a/pkgs/by-name/ye/yex-lang/package.nix
+++ b/pkgs/by-name/ye/yex-lang/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/nonamescm/yex-lang";
     description = "Functional scripting language written in rust";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "yex";
     platforms = platforms.unix;
   };
diff --git a/pkgs/by-name/yo/yojimbo/package.nix b/pkgs/by-name/yo/yojimbo/package.nix
index ce32f0bd82ea3..0f65c972c4063 100644
--- a/pkgs/by-name/yo/yojimbo/package.nix
+++ b/pkgs/by-name/yo/yojimbo/package.nix
@@ -61,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/mas-bandwidth/yojimbo";
     license = licenses.bsd3;
     platforms = platforms.x86_64;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/yt/ytree/package.nix b/pkgs/by-name/yt/ytree/package.nix
index 491ac76e1baea..4c1b3d9620eaf 100644
--- a/pkgs/by-name/yt/ytree/package.nix
+++ b/pkgs/by-name/yt/ytree/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Curses-based file manager similar to DOS Xtree(TM)";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "ytree";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/za/zammad/update.nix b/pkgs/by-name/za/zammad/update.nix
index a0c436566f754..fbda85611b4b2 100644
--- a/pkgs/by-name/za/zammad/update.nix
+++ b/pkgs/by-name/za/zammad/update.nix
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   meta = {
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     description = "Utility to generate Nix expressions for Zammad's dependencies";
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/zc/zchunk/package.nix b/pkgs/by-name/zc/zchunk/package.nix
index 3499eaf5a10ca..239df702bd2d3 100644
--- a/pkgs/by-name/zc/zchunk/package.nix
+++ b/pkgs/by-name/zc/zchunk/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.bsd2;
     mainProgram = "zck";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ze/zegrapher/package.nix b/pkgs/by-name/ze/zegrapher/package.nix
index 73043d2073990..b81906096a6c2 100644
--- a/pkgs/by-name/ze/zegrapher/package.nix
+++ b/pkgs/by-name/ze/zegrapher/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl3Plus;
     mainProgram = "ZeGrapher";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ze/zenmap/package.nix b/pkgs/by-name/ze/zenmap/package.nix
index 702ec89a866fb..4167ae9484086 100644
--- a/pkgs/by-name/ze/zenmap/package.nix
+++ b/pkgs/by-name/ze/zenmap/package.nix
@@ -8,7 +8,7 @@
   xterm,
 }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
   pname = "zenmap";
   version = nmap.version;
   pyproject = true;
diff --git a/pkgs/by-name/ze/zesarux/package.nix b/pkgs/by-name/ze/zesarux/package.nix
index 13caa94a9378e..8f0e273ee0e95 100644
--- a/pkgs/by-name/ze/zesarux/package.nix
+++ b/pkgs/by-name/ze/zesarux/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "ZX Second-Emulator And Released for UniX";
     mainProgram = "zesarux";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/zf/zfp/package.nix b/pkgs/by-name/zf/zfp/package.nix
index 91bfc3f1b64c0..a4aee973dd845 100644
--- a/pkgs/by-name/zf/zfp/package.nix
+++ b/pkgs/by-name/zf/zfp/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional enableFortran "-DBUILD_ZFORP=ON"
   ++ lib.optional enableOpenMP "-DZFP_WITH_OPENMP=ON"
   ++ lib.optional enablePython "-DBUILD_ZFPY=ON"
-  ++ ([ "-DBUILD_UTILITIES=${if enableUtilities then "ON" else "OFF"}" ]);
+  ++ [ "-DBUILD_UTILITIES=${if enableUtilities then "ON" else "OFF"}" ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix
index 0010b9718d599..3eaae4d87375e 100644
--- a/pkgs/by-name/zo/zoekt/package.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -39,7 +39,7 @@ buildGoModule {
     description = "Fast trigram based code search";
     homepage = "https://github.com/sourcegraph/zoekt";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "zoekt";
   };
 }
diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix
index 8e5a49a9d48d5..517bfd2477073 100644
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Advanced multiversioned deduplicating archiver, with HW acceleration, encryption and paranoid-level tests";
     mainProgram = "zpaqfranz";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/zs/zsh-autoenv/package.nix b/pkgs/by-name/zs/zsh-autoenv/package.nix
index 4242b74f4cf8d..2a44a83303df1 100644
--- a/pkgs/by-name/zs/zsh-autoenv/package.nix
+++ b/pkgs/by-name/zs/zsh-autoenv/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     chmod +x $out/bin/zsh-autoenv-share
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Automatically sources whitelisted .autoenv.zsh files";
     longDescription = ''
       zsh-autoenv automatically sources (known/whitelisted)
diff --git a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
index 89f960a77a79b..9bdcc2ffb9a1d 100644
--- a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
+++ b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/romkatv/powerlevel10k";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix
index 42a19082a2a5a..f9a5c275c5b4c 100644
--- a/pkgs/by-name/zx/zxtune/package.nix
+++ b/pkgs/by-name/zx/zxtune/package.nix
@@ -45,7 +45,7 @@ let
     boost
     zlib
   ]
-  ++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase);
+  ++ lib.optional withQt (if supportWayland then qt5.qtwayland else qt5.qtbase);
 in
 stdenv.mkDerivation rec {
   pname = "zxtune";
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
 
   buildPhase =
     let
-      setOptionalSupport = name: var: "support_${name}=" + (if (var) then "1" else "");
+      setOptionalSupport = name: var: "support_${name}=" + (if var then "1" else "");
       makeOptsCommon = [
         ''-j$NIX_BUILD_CORES''
         ''root.version=${src.rev}''
diff --git a/pkgs/by-name/zz/zziplib/package.nix b/pkgs/by-name/zz/zziplib/package.nix
index d37001c0f5cad..6305d69e64e62 100644
--- a/pkgs/by-name/zz/zziplib/package.nix
+++ b/pkgs/by-name/zz/zziplib/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
       lgpl2Plus
       mpl11
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
index 094b042a78a95..90ccde4c4d180 100644
--- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
+++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Simplifies the use of the video recording function integrated in gnome shell";
     homepage = "https://github.com/EasyScreenCast/EasyScreenCast";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix
index da2a8b5d4c952..05d1b5fc90876 100644
--- a/pkgs/desktops/gnome/extensions/default.nix
+++ b/pkgs/desktops/gnome/extensions/default.nix
@@ -85,7 +85,7 @@ rec {
     (extensions: extensions // (import ./manuallyPackaged.nix { inherit callPackage; }))
     # Map the extension UUIDs to readable names
     (lib.attrValues)
-    (mapReadableNames)
+    mapReadableNames
     # Add some aliases
     (
       extensions:
diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
index d55f097134fab..2fa7e168b9841 100644
--- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Icon Hider is a GNOME Shell extension for managing status area items";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = gnome-shell.meta.platforms;
     homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider";
     broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34
diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
index 32b920fce9c09..6ffa8cfc4cc36 100644
--- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "GNOME Shell TaskWarrior GUI";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     homepage = "https://github.com/cinatic/taskwhisperer";
   };
 }
diff --git a/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix
index 1bd4834fccd8e..8b5a9d33da453 100644
--- a/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix
@@ -147,11 +147,11 @@ stdenv.mkDerivation (finalAttrs: {
     ))
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString ([
+  env.NIX_CFLAGS_COMPILE = toString [
     "-I${lib.getDev telepathy-glib}/include/telepathy-1.0" # it's in telepathy-farstream's Requires.private, so it & its dependencies don't get pulled in
     "-I${lib.getDev dbus-glib}/include/dbus-1.0" # telepathy-glib dependency
     "-I${lib.getDev dbus}/include/dbus-1.0" # telepathy-glib dependency
-  ]);
+  ];
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index bf72606031ed6..ba96da66934b4 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -72,11 +72,11 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     [ ]
-    ++ lib.optionals (enableDjvu) [ "--enable-djvu" ]
-    ++ lib.optionals (enableEpub) [ "--enable-epub" ]
-    ++ lib.optionals (enablePostScript) [ "--enable-ps" ]
-    ++ lib.optionals (enableXps) [ "--enable-xps" ]
-    ++ lib.optionals (enableImages) [ "--enable-pixbuf" ];
+    ++ lib.optionals enableDjvu [ "--enable-djvu" ]
+    ++ lib.optionals enableEpub [ "--enable-epub" ]
+    ++ lib.optionals enablePostScript [ "--enable-ps" ]
+    ++ lib.optionals enableXps [ "--enable-xps" ]
+    ++ lib.optionals enableImages [ "--enable-pixbuf" ];
 
   env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix
index 8b8024a31b2b2..62691791656d2 100644
--- a/pkgs/development/beam-modules/fetch-hex.nix
+++ b/pkgs/development/beam-modules/fetch-hex.nix
@@ -11,7 +11,7 @@
   meta ? { },
 }:
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   pname = pkg;
   inherit version;
   dontBuild = true;
@@ -47,4 +47,4 @@ stdenv.mkDerivation ({
   '';
 
   inherit meta;
-})
+}
diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/pkgs/development/beam-modules/fetch-rebar-deps.nix
index 644dd1470ea77..bf6c235210746 100644
--- a/pkgs/development/beam-modules/fetch-rebar-deps.nix
+++ b/pkgs/development/beam-modules/fetch-rebar-deps.nix
@@ -12,7 +12,7 @@
   meta ? { },
 }:
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   pname = "rebar-deps-${name}";
   inherit version;
 
@@ -43,4 +43,4 @@ stdenv.mkDerivation ({
 
   impureEnvVars = lib.fetchers.proxyImpureEnvVars;
   inherit meta;
-})
+}
diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix
index 28ddfdacf9007..5c8ce99c82e8c 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/pkgs/development/compilers/chicken/5/overrides.nix
@@ -148,13 +148,13 @@ in
   };
   # missing dependency in upstream egg
   mistie = addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 ]);
-  mosquitto = addToPropagatedBuildInputs ([ pkgs.mosquitto ]);
+  mosquitto = addToPropagatedBuildInputs [ pkgs.mosquitto ];
   nanomsg = addToBuildInputs pkgs.nanomsg;
   ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ];
-  opencl = addToBuildInputs ([
+  opencl = addToBuildInputs [
     pkgs.opencl-headers
     pkgs.ocl-icd
-  ]);
+  ];
   openssl = addToBuildInputs pkgs.openssl;
   plot = addToBuildInputs pkgs.plotutils;
   postgresql = addToBuildInputsWithPkgConfig pkgs.libpq;
diff --git a/pkgs/development/compilers/cone/default.nix b/pkgs/development/compilers/cone/default.nix
index 0e95fdbc6ae53..716c5e0224909 100644
--- a/pkgs/development/compilers/cone/default.nix
+++ b/pkgs/development/compilers/cone/default.nix
@@ -38,7 +38,7 @@ llvmPackages.stdenv.mkDerivation rec {
     mainProgram = "conec";
     homepage = "https://cone.jondgoodwin.com";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix
index 2fcaa17f3c6a5..92ff75c361279 100644
--- a/pkgs/development/compilers/dotnet/wrapper.nix
+++ b/pkgs/development/compilers/dotnet/wrapper.nix
@@ -105,7 +105,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
             sdk = finalAttrs.finalPackage;
             built = stdenv.mkDerivation {
               name = "${sdk.name}-test-${name}";
-              buildInputs = [ sdk ] ++ buildInputs ++ lib.optional (usePackageSource) sdk.packages;
+              buildInputs = [ sdk ] ++ buildInputs ++ lib.optional usePackageSource sdk.packages;
               # make sure ICU works in a sandbox
               propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile;
               unpackPhase =
@@ -279,7 +279,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           command = "HOME=$(mktemp -d) dotnet " + (if type == "sdk" then "--version" else "--info");
         };
       }
-      // lib.optionalAttrs (type == "sdk") ({
+      // lib.optionalAttrs (type == "sdk") {
         console = lib.recurseIntoAttrs {
           # yes, older SDKs omit the comma
           cs = mkConsoleTests "C#" "cs" "Hello,?\\ World!";
@@ -291,6 +291,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           cs = mkWebTest "C#" "cs";
           fs = mkWebTest "F#" "fs";
         };
-      });
+      };
   };
 })
diff --git a/pkgs/development/compilers/factor-lang/0.100.nix b/pkgs/development/compilers/factor-lang/0.100.nix
index 64751dad76a91..856ce4a4e777b 100644
--- a/pkgs/development/compilers/factor-lang/0.100.nix
+++ b/pkgs/development/compilers/factor-lang/0.100.nix
@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
-callPackage ./unwrapped.nix (rec {
+callPackage ./unwrapped.nix rec {
   version = "0.100";
   src = fetchurl {
     url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip";
     hash = "sha256-ei1x6mgEoDVe1mKfoWSGC9RgZCONovAPYfIdAlOGi+0=";
   };
-})
+}
diff --git a/pkgs/development/compilers/factor-lang/0.99.nix b/pkgs/development/compilers/factor-lang/0.99.nix
index 88c234213af95..d5c1f3c82ad64 100644
--- a/pkgs/development/compilers/factor-lang/0.99.nix
+++ b/pkgs/development/compilers/factor-lang/0.99.nix
@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
-callPackage ./unwrapped.nix (rec {
+callPackage ./unwrapped.nix rec {
   version = "0.99";
   src = fetchurl {
     url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip";
     sha256 = "f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e";
   };
-})
+}
diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix
index c998490525fc6..84ecdfe0748fb 100644
--- a/pkgs/development/compilers/flutter/engine/package.nix
+++ b/pkgs/development/compilers/flutter/engine/package.nix
@@ -86,7 +86,7 @@ let
 
   llvm = symlinkJoin {
     name = "llvm";
-    paths = with llvmPackages; [
+    paths = [
       clang
       llvmPackages.llvm
     ];
diff --git a/pkgs/development/compilers/gambit/gambit-support.nix b/pkgs/development/compilers/gambit/gambit-support.nix
index 64a9b6a2bb467..c85aa26489dc8 100644
--- a/pkgs/development/compilers/gambit/gambit-support.nix
+++ b/pkgs/development/compilers/gambit/gambit-support.nix
@@ -28,7 +28,7 @@ rec {
 
   export-gambopt = params: "export GAMBOPT=${params.buildRuntimeOptions} ;";
 
-  gambit-bootstrap = import ./bootstrap.nix (pkgs);
+  gambit-bootstrap = import ./bootstrap.nix pkgs;
 
   meta = with lib; {
     description = "Optimizing Scheme to C compiler";
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
index 3b09398dc678e..96f40d6661327 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -283,7 +283,7 @@ let
     ++ lib.optionals langJit [
       "--enable-host-shared"
     ]
-    ++ lib.optionals (langD) [
+    ++ lib.optionals langD [
       "--with-target-system-zlib=yes"
     ]
     # On mips64-unknown-linux-gnu libsanitizer defines collide with
diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix
index adf73fb84425f..d04aadd8729d0 100644
--- a/pkgs/development/compilers/gcc/common/pre-configure.nix
+++ b/pkgs/development/compilers/gcc/common/pre-configure.nix
@@ -38,7 +38,7 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     (
       langFortran
       && (
-        with stdenv;
+
         (!lib.systems.equals buildPlatform hostPlatform) && (lib.systems.equals hostPlatform targetPlatform)
       )
     )
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 82d676bc8656d..71a0bf7442e81 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -301,12 +301,12 @@ pipe
           )
         )
       )
-      + optionalString targetPlatform.isAvr (''
+      + optionalString targetPlatform.isAvr ''
         makeFlagsArray+=(
            '-s' # workaround for hitting hydra log limit
            'LIMITS_H_TEST=false'
         )
-      '');
+      '';
 
       inherit
         noSysDirs
@@ -348,7 +348,7 @@ pipe
         if atLeast11 then
           let
             target =
-              optionalString (profiledCompiler) "profiled"
+              optionalString profiledCompiler "profiled"
               + optionalString (
                 (lib.systems.equals targetPlatform hostPlatform)
                 && (lib.systems.equals hostPlatform buildPlatform)
@@ -433,7 +433,7 @@ pipe
             !(targetPlatform.isLinux && targetPlatform.isx86_64 && targetPlatform.libc == "glibc")
           ) "shadowstack"
           ++ optional (!(targetPlatform.isLinux && targetPlatform.isAarch64)) "pacret"
-          ++ optionals (langFortran) [
+          ++ optionals langFortran [
             "fortify"
             "format"
           ];
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index b2f1d1ba68d26..d4e676f24eb0e 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -66,7 +66,7 @@ in
 ++ optional (!atLeast12) ./fix-bug-80431.patch
 # Pass the path to a C++ compiler directly in the Makefile.in
 ++ optional (!lib.systems.equals targetPlatform hostPlatform) ./libstdc++-target.patch
-++ optionals (noSysDirs) (
+++ optionals noSysDirs (
   [
     # Do not try looking for binaries and libraries in /lib and /usr/lib
     (if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch)
@@ -308,7 +308,7 @@ in
 ## gcc 11.0 and older ##############################################################################
 
 # openjdk build fails without this on -march=opteron; is upstream in gcc12
-++ optionals (is11) [ ./11/gcc-issue-103910.patch ]
+++ optionals is11 [ ./11/gcc-issue-103910.patch ]
 
 ## gcc 10.0 and older ##############################################################################
 
diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix
index 7956681270d13..18e86a71ebf95 100644
--- a/pkgs/development/compilers/ghc/8.10.7-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix
@@ -276,13 +276,13 @@ stdenv.mkDerivation {
           buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"'';
         in
         lib.concatStringsSep "\n" [
-          (''
+          ''
             shopt -u nullglob
             echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
             if ! test -e ${buildExeGlob}; then
               echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
             fi
-          '')
+          ''
           (lib.concatMapStringsSep "\n" (
             { fileToCheckFor, nixPackage }:
             lib.optionalString (fileToCheckFor != null) ''
@@ -526,7 +526,7 @@ stdenv.mkDerivation {
     hadrian = null;
   };
 
-  meta = rec {
+  meta = {
     homepage = "http://haskell.org/ghc";
     description = "Glasgow Haskell Compiler";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix
index 7dc6c0a626888..803e2e0990cc3 100644
--- a/pkgs/development/compilers/ghc/8.10.7.nix
+++ b/pkgs/development/compilers/ghc/8.10.7.nix
@@ -508,7 +508,7 @@ stdenv.mkDerivation (
       "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
       "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
     ]
-    ++ lib.optionals (disableLargeAddressSpace) [
+    ++ lib.optionals disableLargeAddressSpace [
       "--disable-large-address-space"
     ]
     ++ lib.optionals enableUnregisterised [
diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix
index 7837142b9a54a..8d97f6c5c90ce 100644
--- a/pkgs/development/compilers/ghc/8.6.5-binary.nix
+++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix
@@ -250,7 +250,7 @@ stdenv.mkDerivation rec {
     haskellCompilerName = "ghc-${version}";
   };
 
-  meta = rec {
+  meta = {
     license = lib.licenses.bsd3;
     platforms = [
       "x86_64-linux"
diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix
index 0e6a0b4bb6286..5f246e8125826 100644
--- a/pkgs/development/compilers/ghc/9.0.2-binary.nix
+++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix
@@ -250,13 +250,13 @@ stdenv.mkDerivation {
           buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"'';
         in
         lib.concatStringsSep "\n" [
-          (''
+          ''
             shopt -u nullglob
             echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
             if ! test -e ${buildExeGlob}; then
               echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
             fi
-          '')
+          ''
           (lib.concatMapStringsSep "\n" (
             { fileToCheckFor, nixPackage }:
             lib.optionalString (fileToCheckFor != null) ''
@@ -501,7 +501,7 @@ stdenv.mkDerivation {
     hadrian = null;
   };
 
-  meta = rec {
+  meta = {
     homepage = "http://haskell.org/ghc";
     description = "Glasgow Haskell Compiler";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/compilers/ghc/9.12.2.nix b/pkgs/development/compilers/ghc/9.12.2.nix
index abd792750dc13..40ca6681a3913 100644
--- a/pkgs/development/compilers/ghc/9.12.2.nix
+++ b/pkgs/development/compilers/ghc/9.12.2.nix
@@ -1,4 +1,4 @@
-import ./common-hadrian.nix rec {
+import ./common-hadrian.nix {
   version = "9.12.2";
   sha256 = "0e49cd5dde43f348c5716e5de9a5d7a0f8d68d945dc41cf75dfdefe65084f933";
 }
diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix
index e9354461fdad9..1ad64e5af3c96 100644
--- a/pkgs/development/compilers/ghc/9.2.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix
@@ -244,13 +244,13 @@ stdenv.mkDerivation {
           buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"'';
         in
         lib.concatStringsSep "\n" [
-          (''
+          ''
             shopt -u nullglob
             echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
             if ! test -e ${buildExeGlob}; then
               echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
             fi
-          '')
+          ''
           (lib.concatMapStringsSep "\n" (
             { fileToCheckFor, nixPackage }:
             lib.optionalString (fileToCheckFor != null) ''
@@ -486,7 +486,7 @@ stdenv.mkDerivation {
     hadrian = null;
   };
 
-  meta = rec {
+  meta = {
     homepage = "http://haskell.org/ghc";
     description = "Glasgow Haskell Compiler";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix
index 9128c3717e764..f6bf84ee6e5a5 100644
--- a/pkgs/development/compilers/ghc/9.6.3-binary.nix
+++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix
@@ -243,13 +243,13 @@ stdenv.mkDerivation {
           buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"'';
         in
         lib.concatStringsSep "\n" [
-          (''
+          ''
             shopt -u nullglob
             echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
             if ! test -e ${buildExeGlob}; then
               echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
             fi
-          '')
+          ''
           (lib.concatMapStringsSep "\n" (
             { fileToCheckFor, nixPackage }:
             lib.optionalString (fileToCheckFor != null) ''
@@ -460,7 +460,7 @@ stdenv.mkDerivation {
     hadrian = null;
   };
 
-  meta = rec {
+  meta = {
     homepage = "http://haskell.org/ghc";
     description = "Glasgow Haskell Compiler";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix
index 35e26baba9567..92fb8d70e9d57 100644
--- a/pkgs/development/compilers/ghc/9.8.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix
@@ -257,13 +257,13 @@ stdenv.mkDerivation {
           buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"'';
         in
         lib.concatStringsSep "\n" [
-          (''
+          ''
             shopt -u nullglob
             echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
             if ! test -e ${buildExeGlob}; then
               echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
             fi
-          '')
+          ''
           (lib.concatMapStringsSep "\n" (
             { fileToCheckFor, nixPackage }:
             lib.optionalString (fileToCheckFor != null) ''
@@ -475,7 +475,7 @@ stdenv.mkDerivation {
     hadrian = null;
   };
 
-  meta = rec {
+  meta = {
     homepage = "http://haskell.org/ghc";
     description = "Glasgow Haskell Compiler";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 42afd04d71670..a78c514784e1d 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -638,7 +638,7 @@ stdenv.mkDerivation (
       "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
       "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
     ]
-    ++ lib.optionals (disableLargeAddressSpace) [
+    ++ lib.optionals disableLargeAddressSpace [
       "--disable-large-address-space"
     ]
     ++ lib.optionals enableDwarf [
diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
index ec506aa7c956a..f3ba8d6ecbd8f 100644
--- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -546,7 +546,7 @@ stdenv.mkDerivation (
       "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
       "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
     ]
-    ++ lib.optionals (disableLargeAddressSpace) [
+    ++ lib.optionals disableLargeAddressSpace [
       "--disable-large-address-space"
     ]
     ++ lib.optionals enableUnregisterised [
diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
index 40ff633527ae0..bc9357747882f 100644
--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
@@ -50,7 +50,7 @@ let
 in
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "compiler-rt${lib.optionalString (haveLibc) "-libc"}";
+  pname = "compiler-rt${lib.optionalString haveLibc "-libc"}";
   inherit version;
 
   src =
@@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "COMPILER_RT_BUILD_SANITIZERS" true)
     (lib.cmakeBool "COMPILER_RT_BUILD_PROFILE" true)
   ]
-  ++ lib.optionals (noSanitizers) [
+  ++ lib.optionals noSanitizers [
     (lib.cmakeBool "COMPILER_RT_BUILD_SANITIZERS" false)
   ]
   ++ lib.optionals ((useLLVM && !haveLibcxx) || !haveLibc || bareMetal || isMusl || isDarwinStatic) [
@@ -212,12 +212,12 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (!haveLibc) [
     (lib.cmakeFeature "CMAKE_C_FLAGS" "-nodefaultlibs")
   ]
-  ++ lib.optionals (useLLVM) [
+  ++ lib.optionals useLLVM [
     (lib.cmakeBool "COMPILER_RT_BUILD_BUILTINS" true)
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     (lib.cmakeFeature "CMAKE_TRY_COMPILE_TARGET_TYPE" "STATIC_LIBRARY")
   ]
-  ++ lib.optionals (bareMetal) [
+  ++ lib.optionals bareMetal [
     (lib.cmakeFeature "COMPILER_RT_OS_DIR" "baremetal")
   ]
   ++ lib.optionals (stdenv.hostPlatform.isDarwin) (
diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix
index de68e6698cfbb..789c5cd9d1d03 100644
--- a/pkgs/development/compilers/llvm/common/libc/default.nix
+++ b/pkgs/development/compilers/llvm/common/libc/default.nix
@@ -18,14 +18,14 @@
 let
   pname = "libc";
 
-  src' = runCommand "${pname}-src-${version}" { } (''
+  src' = runCommand "${pname}-src-${version}" { } ''
     mkdir -p "$out"
     cp -r ${monorepoSrc}/cmake "$out"
     cp -r ${monorepoSrc}/runtimes "$out"
     cp -r ${monorepoSrc}/llvm "$out"
     cp -r ${monorepoSrc}/compiler-rt "$out"
     cp -r ${monorepoSrc}/${pname} "$out"
-  '');
+  '';
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname version patches;
diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix
index c8608ca26a4a3..4cd008a4be580 100644
--- a/pkgs/development/compilers/llvm/common/libunwind/default.nix
+++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation (
       + lib.optionalString (enableShared && stdenv.hostPlatform.isWindows) ''
         ln -s $out/lib/libunwind.dll.a $out/lib/libunwind_shared.dll.a
       ''
-      + lib.optionalString (doFakeLibgcc) ''
+      + lib.optionalString doFakeLibgcc ''
         ln -s $out/lib/libunwind.so $out/lib/libgcc_s.so
         ln -s $out/lib/libunwind.so $out/lib/libgcc_s.so.1
       '';
diff --git a/pkgs/development/compilers/open-watcom/wrapper.nix b/pkgs/development/compilers/open-watcom/wrapper.nix
index fe29ac1af8208..54b06d7db4fbe 100644
--- a/pkgs/development/compilers/open-watcom/wrapper.nix
+++ b/pkgs/development/compilers/open-watcom/wrapper.nix
@@ -33,7 +33,7 @@ let
             "${archToBindir}nt"
             (lib.optionalString is32bit "${archToBindir}w")
           ]
-        else if (isDarwin) then
+        else if isDarwin then
           [
             (lib.optionalString is64bit "${archToBindir}o64")
             # modern Darwin cannot execute 32-bit code anymore
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index d933d3dedc18d..d7114a6e1ecee 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -92,7 +92,7 @@ in
         buildRustPackages = (selectRustPackage pkgsBuildHost).packages.stable;
         # Analogous to stdenv
         rustPlatform = makeRustPlatform self.buildRustPackages;
-        rustc-unwrapped = self.callPackage ./rustc.nix ({
+        rustc-unwrapped = self.callPackage ./rustc.nix {
           version = rustcVersion;
           sha256 = rustcSha256;
           inherit enableRustcDev;
@@ -109,7 +109,7 @@ in
 
           # Use boot package set to break cycle
           inherit (bootstrapRustPackages) cargo rustc rustfmt;
-        });
+        };
         rustc = wrapRustcWith {
           inherit (self) rustc-unwrapped;
           sysroot = if fastCross then self.rustc-unwrapped else null;
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 709e13a0fd43c..81dfee8c8bf2a 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -91,7 +91,7 @@ let
         libiconv
         libintl
       ]
-      ++ lib.optional (withGraphviz) graphviz
+      ++ lib.optional withGraphviz graphviz
       ++ extraBuildInputs;
 
       enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 46e6acc61d09e..dfc8bab2e43fb 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -72,7 +72,7 @@ let
     bluespec = yosys-bluespec;
     ghdl = yosys-ghdl;
   }
-  // (yosys-symbiflow);
+  // yosys-symbiflow;
 
   boost_python = boost.override {
     enablePython = true;
diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
index 82ff16fe5ed43..4b6a8c3ecbd60 100644
--- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix
+++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
@@ -46,7 +46,7 @@ let
 in
 lib.genAttrs plugins (
   plugin:
-  stdenv.mkDerivation (rec {
+  stdenv.mkDerivation rec {
     pname = "yosys-symbiflow-${plugin}-plugin";
     inherit src version plugin;
     enableParallelBuilding = true;
@@ -109,5 +109,5 @@ lib.genAttrs plugins (
         thoughtpolice
       ];
     };
-  })
+  }
 )
diff --git a/pkgs/development/coq-modules/aac-tactics/default.nix b/pkgs/development/coq-modules/aac-tactics/default.nix
index db2c56c7d98ab..b14ce87b28d03 100644
--- a/pkgs/development/coq-modules/aac-tactics/default.nix
+++ b/pkgs/development/coq-modules/aac-tactics/default.nix
@@ -32,7 +32,7 @@ mkCoqDerivation {
 
   inherit version;
   defaultVersion =
-    with lib.versions;
+
     lib.switch coq.coq-version [
       {
         case = "8.20";
diff --git a/pkgs/development/coq-modules/coq-hammer/tactics.nix b/pkgs/development/coq-modules/coq-hammer/tactics.nix
index 49052b9ddf10d..e382d93a906a3 100644
--- a/pkgs/development/coq-modules/coq-hammer/tactics.nix
+++ b/pkgs/development/coq-modules/coq-hammer/tactics.nix
@@ -10,7 +10,7 @@ let
   owner = "lukaszcz";
   repo = "coqhammer";
   defaultVersion =
-    with lib.versions;
+
     lib.switch coq.coq-version [
       {
         case = "8.20";
diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix
index 4ce7f6633e628..f1774f675ba81 100644
--- a/pkgs/development/coq-modules/coqhammer/default.nix
+++ b/pkgs/development/coq-modules/coqhammer/default.nix
@@ -16,7 +16,7 @@ mkCoqDerivation {
   pname = "coqhammer";
   owner = "lukaszcz";
   defaultVersion =
-    with lib.versions;
+
     lib.switch coq.coq-version [
       {
         case = "8.15";
diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix
index 88b52f397bae4..bbce0ad81abc7 100644
--- a/pkgs/development/coq-modules/ltac2/default.nix
+++ b/pkgs/development/coq-modules/ltac2/default.nix
@@ -10,7 +10,7 @@ mkCoqDerivation {
   owner = "coq";
   inherit version;
   defaultVersion =
-    with lib.versions;
+
     lib.switch coq.coq-version [
       {
         case = "8.10";
diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
index 02103c2eb9864..19f9e82f046b5 100644
--- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
@@ -208,7 +208,7 @@ let
         }
       ] package;
       pname = if package == "single" then "mathcomp-analysis-single" else "mathcomp-${package}";
-      derivation = mkCoqDerivation ({
+      derivation = mkCoqDerivation {
         inherit
           version
           pname
@@ -254,7 +254,7 @@ let
         };
 
         passthru = lib.mapAttrs (package: deps: mathcomp_ package) packages;
-      });
+      };
       # split packages didn't exist before 0.6, so building nothing in that case
       patched-derivation1 = derivation.overrideAttrs (
         o:
diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix
index 2f2eeb52c869e..6cbd72c52fdf5 100644
--- a/pkgs/development/coq-modules/vscoq-language-server/default.nix
+++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix
@@ -35,7 +35,7 @@ let
     owner = "coq-community";
     repo = "vscoq";
   };
-  fetch = metaFetch ({
+  fetch = metaFetch {
     release."2.0.3+coq8.18".sha256 = "sha256-VXhHCP6Ni5/OcsgoI1EbJfYCpXzwkuR8kbbKrl6dfjU=";
     release."2.0.3+coq8.18".rev = "v2.0.3+coq8.18";
     release."2.1.2".rev = "v2.1.2";
@@ -51,7 +51,7 @@ let
     release."2.2.6".rev = "v2.2.6";
     release."2.2.6".sha256 = "sha256-J8nRTAwN6GBEYgqlXa2kkkrHPatXsSObQg9QUQoZhgE=";
     inherit location;
-  });
+  };
   fetched = fetch (if version != null then version else defaultVersion);
 in
 ocamlPackages.buildDunePackage {
diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix
index e778abfc8faa3..d3e6e180a724a 100644
--- a/pkgs/development/cuda-modules/cudatoolkit/default.nix
+++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix
@@ -131,7 +131,7 @@ backendStdenv.mkDerivation rec {
     xorg.libxkbfile
   ]
   ++ (lib.optionals (lib.versionAtLeast version "12") (
-    map lib.getLib ([
+    map lib.getLib [
       # Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for:
       # - `libcurl.so.4`
       curlMinimal
@@ -139,7 +139,7 @@ backendStdenv.mkDerivation rec {
       # Used by `/host-linux-x64/Scripts/WebRTCContainer/setup/neko/server/bin/neko`
       gst_all_1.gstreamer
       gst_all_1.gst-plugins-base
-    ])
+    ]
     ++ (with qt6; [
       qtmultimedia
       qttools
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 9a469ba4692af..fefaac44447cd 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1754,11 +1754,11 @@ builtins.intersectAttrs super {
         ])
       )
       (
-        super.libtorch-ffi.override ({
+        super.libtorch-ffi.override {
           c10 = pkgs.libtorch-bin;
           torch = pkgs.libtorch-bin;
           torch_cpu = pkgs.libtorch-bin;
-        })
+        }
       );
 
   # Upper bounds of text and bytestring too strict: https://github.com/zsedem/haskell-cpython/pull/24
diff --git a/pkgs/development/interpreters/dzaima-apl/default.nix b/pkgs/development/interpreters/dzaima-apl/default.nix
index a9d796d3054f0..be4182cdceaa6 100644
--- a/pkgs/development/interpreters/dzaima-apl/default.nix
+++ b/pkgs/development/interpreters/dzaima-apl/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     description =
       "APL implementation in Java" + lib.optionalString buildNativeImage ", compiled as a native image";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (jdk.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dapl-native.x86_64-darwin
   };
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 3e2a55d76c15e..276b33c0defc9 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -119,10 +119,10 @@ rec {
     patches = lib.optional stdenv.hostPlatform.isDarwin ./5.4.darwin.patch;
   };
 
-  lua5_4_compat = lua5_4.override ({
+  lua5_4_compat = lua5_4.override {
     self = lua5_4_compat;
     compat = true;
-  });
+  };
 
   lua5_3 = callPackage ./interpreter.nix {
     self = lua5_3;
@@ -134,10 +134,10 @@ rec {
     patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./5.2.darwin.patch ];
   };
 
-  lua5_3_compat = lua5_3.override ({
+  lua5_3_compat = lua5_3.override {
     self = lua5_3_compat;
     compat = true;
-  });
+  };
 
   lua5_2 = callPackage ./interpreter.nix {
     self = lua5_2;
@@ -151,10 +151,10 @@ rec {
     ++ lib.optional stdenv.hostPlatform.isDarwin ./5.2.darwin.patch;
   };
 
-  lua5_2_compat = lua5_2.override ({
+  lua5_2_compat = lua5_2.override {
     self = lua5_2_compat;
     compat = true;
-  });
+  };
 
   lua5_1 = callPackage ./interpreter.nix {
     self = lua5_1;
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 7a0e6d5e5a976..f383fc74dafe4 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.qtsvg
     libsForQt5.qscintilla
   ]
-  ++ lib.optionals (enableJava) [
+  ++ lib.optionals enableJava [
     jdk
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
diff --git a/pkgs/development/interpreters/octave/hooks/default.nix b/pkgs/development/interpreters/octave/hooks/default.nix
index 8e7acafd8489c..15005f159a59e 100644
--- a/pkgs/development/interpreters/octave/hooks/default.nix
+++ b/pkgs/development/interpreters/octave/hooks/default.nix
@@ -6,7 +6,7 @@
   makeSetupHook,
 }:
 
-rec {
+{
   writeRequiredOctavePackagesHook = callPackage (
     { }:
     makeSetupHook {
diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix
index cc5fef956dcfa..61613a5940d17 100644
--- a/pkgs/development/interpreters/php/8.1.nix
+++ b/pkgs/development/interpreters/php/8.1.nix
@@ -12,7 +12,7 @@ in
 base.withExtensions (
   { all, ... }:
   with all;
-  ([
+  [
     bcmath
     calendar
     curl
@@ -55,5 +55,5 @@ base.withExtensions (
     xmlwriter
     zip
     zlib
-  ])
+  ]
 )
diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix
index 63f25b21ba669..6e33b3ba3c604 100644
--- a/pkgs/development/interpreters/php/8.2.nix
+++ b/pkgs/development/interpreters/php/8.2.nix
@@ -12,7 +12,7 @@ in
 base.withExtensions (
   { all, ... }:
   with all;
-  ([
+  [
     bcmath
     calendar
     curl
@@ -55,5 +55,5 @@ base.withExtensions (
     xmlwriter
     zip
     zlib
-  ])
+  ]
 )
diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index 2dcebdc9e65b6..fe25d10dc5de8 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -12,7 +12,7 @@ in
 base.withExtensions (
   { all, ... }:
   with all;
-  ([
+  [
     bcmath
     calendar
     curl
@@ -55,5 +55,5 @@ base.withExtensions (
     xmlwriter
     zip
     zlib
-  ])
+  ]
 )
diff --git a/pkgs/development/interpreters/python/meta-package.nix b/pkgs/development/interpreters/python/meta-package.nix
index 2e25dff85fe0b..e3d8684331835 100644
--- a/pkgs/development/interpreters/python/meta-package.nix
+++ b/pkgs/development/interpreters/python/meta-package.nix
@@ -38,11 +38,11 @@ buildPythonPackage {
 
     [project.optional-dependencies]
     ${lib.optionalString (optional-dependencies != { }) (
-      (lib.concatStringsSep "\n" (
+      lib.concatStringsSep "\n" (
         lib.mapAttrsToList (
           group: deps: group + " = " + builtins.toJSON (map lib.getName deps)
         ) optional-dependencies
-      ))
+      )
     )}
 
     [tool.hatch.build.targets.wheel]
diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
index 5fd2c6e91dad2..a6b15b9936ea2 100644
--- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
@@ -171,7 +171,7 @@ let
       checkDrv = drv: if (isPythonModule drv) && (isMismatchedPython drv) then throwMismatch drv else drv;
 
     in
-    inputs: builtins.map (checkDrv) inputs;
+    inputs: builtins.map checkDrv inputs;
 
   # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
   self = toPythonModule (
@@ -212,7 +212,7 @@ let
           setuptoolsBuildHook
         ]
         ++ lib.optionals (format == "pyproject") [
-          (pipBuildHook)
+          pipBuildHook
         ]
         ++ lib.optionals (format == "wheel") [
           wheelUnpackHook
@@ -223,7 +223,7 @@ let
           eggInstallHook
         ]
         ++ lib.optionals (format != "other") [
-          (pipInstallHook)
+          pipInstallHook
         ]
         ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
           # This is a test, however, it should be ran independent of the checkPhase and checkInputs
diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix
index 779e2b9f683d3..ca1a1ae19ed45 100644
--- a/pkgs/development/interpreters/python/tests.nix
+++ b/pkgs/development/interpreters/python/tests.nix
@@ -22,7 +22,7 @@ let
       envs =
         let
           inherit python;
-          pythonEnv = python.withPackages (ps: with ps; [ ]);
+          pythonEnv = python.withPackages (ps: [ ]);
           pythonVirtualEnv =
             if python.isPy3k then
               python.withPackages (ps: with ps; [ virtualenv ])
diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix
index 55505f0edf42d..b1673faa74baa 100644
--- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-mkDerivation (rec {
+mkDerivation rec {
   version = "1.5.0";
   pname = "iowa-stdlib";
 
@@ -35,4 +35,4 @@ mkDerivation (rec {
       turion
     ];
   };
-})
+}
diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 6ca3c51412c8c..ae215d1d91fb0 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://confluence.ecmwf.int/display/ECC/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     description = "ECMWF library for reading and writing GRIB, BUFR and GTS abbreviated header";
   };
diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix
index 220ffdd62d510..51fae4c277fe7 100644
--- a/pkgs/development/libraries/gcr/default.nix
+++ b/pkgs/development/libraries/gcr/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     libsecret
     openssh
   ]
-  ++ lib.optionals (systemdSupport) [
+  ++ lib.optionals systemdSupport [
     systemd
   ];
 
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 0f5380d93177c..7b63b22414393 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -77,12 +77,12 @@ stdenv.mkDerivation {
     libedit
     pam
   ]
-  ++ lib.optionals (withCJSON) [ cjson ]
-  ++ lib.optionals (withCapNG) [ libcap_ng ]
-  ++ lib.optionals (withMicroHTTPD) [ libmicrohttpd ]
-  ++ lib.optionals (withOpenLDAP) [ openldap ]
-  ++ lib.optionals (withOpenSSL) [ openssl ]
-  ++ lib.optionals (withSQLite3) [ sqlite ];
+  ++ lib.optionals withCJSON [ cjson ]
+  ++ lib.optionals withCapNG [ libcap_ng ]
+  ++ lib.optionals withMicroHTTPD [ libmicrohttpd ]
+  ++ lib.optionals withOpenLDAP [ openldap ]
+  ++ lib.optionals withOpenSSL [ openssl ]
+  ++ lib.optionals withSQLite3 [ sqlite ];
 
   doCheck = true;
   nativeCheckInputs = [
@@ -103,19 +103,19 @@ stdenv.mkDerivation {
     "--without-x"
     "--disable-afs-string-to-key"
   ]
-  ++ lib.optionals (withCapNG) [
+  ++ lib.optionals withCapNG [
     "--with-capng"
   ]
-  ++ lib.optionals (withCJSON) [
+  ++ lib.optionals withCJSON [
     "--with-cjson=${cjson}"
   ]
-  ++ lib.optionals (withOpenLDAP) [
+  ++ lib.optionals withOpenLDAP [
     "--with-openldap=${openldap.dev}"
   ]
-  ++ lib.optionals (withOpenLDAPAsHDBModule) [
+  ++ lib.optionals withOpenLDAPAsHDBModule [
     "--enable-hdb-openldap-module"
   ]
-  ++ lib.optionals (withSQLite3) [
+  ++ lib.optionals withSQLite3 [
     "--with-sqlite3=${sqlite.dev}"
   ];
 
diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.77.nix b/pkgs/development/libraries/libmicrohttpd/0.9.77.nix
index 9099de95bd820..3874f77acb87a 100644
--- a/pkgs/development/libraries/libmicrohttpd/0.9.77.nix
+++ b/pkgs/development/libraries/libmicrohttpd/0.9.77.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl }:
 
-callPackage ./generic.nix (rec {
+callPackage ./generic.nix rec {
   version = "0.9.77";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
     hash = "sha256-nnAjoVESAGDSgGpupME8qZM+zk6s/FyUZNIO3dt2sKA=";
   };
-})
+}
diff --git a/pkgs/development/libraries/libmicrohttpd/1.0.nix b/pkgs/development/libraries/libmicrohttpd/1.0.nix
index 16a4f2ed884e4..2ca2ff4ebb098 100644
--- a/pkgs/development/libraries/libmicrohttpd/1.0.nix
+++ b/pkgs/development/libraries/libmicrohttpd/1.0.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl }:
 
-callPackage ./generic.nix (rec {
+callPackage ./generic.nix rec {
   version = "1.0.1";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
     hash = "sha256-qJ4J/JtN403eGfT8tPqqHOECmbmQjbETK7+h3keIK5Q=";
   };
-})
+}
diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix
index bbd92ab9e6256..9c6d2858b16b3 100644
--- a/pkgs/development/libraries/libopenshot-audio/default.nix
+++ b/pkgs/development/libraries/libopenshot-audio/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
       JUCE library.
     '';
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/development/libraries/libopenshot/default.nix b/pkgs/development/libraries/libopenshot/default.nix
index fe35ff540322f..2257c44aa579e 100644
--- a/pkgs/development/libraries/libopenshot/default.nix
+++ b/pkgs/development/libraries/libopenshot/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
       to the world. API currently supports C++, Python, and Ruby.
     '';
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index f976f94edc018..46f1dc03ff64a 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -632,7 +632,7 @@ effectiveStdenv.mkDerivation {
         inherit opencv4;
       };
     }
-    // optionalAttrs (enableCuda) {
+    // optionalAttrs enableCuda {
       no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; };
     };
   }
diff --git a/pkgs/development/libraries/prometheus-client-c/default.nix b/pkgs/development/libraries/prometheus-client-c/default.nix
index a33e20b7bd5bd..d76b47dbeee1c 100644
--- a/pkgs/development/libraries/prometheus-client-c/default.nix
+++ b/pkgs/development/libraries/prometheus-client-c/default.nix
@@ -62,7 +62,7 @@ let
       };
     };
 in
-rec {
+{
   libprom = build {
     pname = "libprom";
     subdir = "prom";
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 189562011d785..57f77518ed550 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -156,7 +156,7 @@ stdenv.mkDerivation (
       ++ lib.optional stdenv.hostPlatform.isDarwin darwinVersionInputs
       ++ lib.optional developerBuild gdb
       ++ lib.optional (cups != null) cups
-      ++ lib.optional (mysqlSupport) libmysqlclient
+      ++ lib.optional mysqlSupport libmysqlclient
       ++ lib.optional (libpq != null) libpq;
 
       nativeBuildInputs = [
@@ -168,7 +168,7 @@ stdenv.mkDerivation (
         pkg-config
         which
       ]
-      ++ lib.optionals (mysqlSupport) [ libmysqlclient ]
+      ++ lib.optionals mysqlSupport [ libmysqlclient ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
     }
@@ -339,11 +339,11 @@ stdenv.mkDerivation (
         );
       }
       // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
-        NIX_CFLAGS_COMPILE_FOR_BUILD = toString ([
+        NIX_CFLAGS_COMPILE_FOR_BUILD = toString [
           "-Wno-warn=free-nonheap-object"
           "-Wno-free-nonheap-object"
           "-w"
-        ]);
+        ];
       };
 
       prefixKey = "-prefix ";
@@ -493,7 +493,7 @@ stdenv.mkDerivation (
             "-I"
             "${cups.dev}/include"
           ]
-          ++ lib.optionals (mysqlSupport) [
+          ++ lib.optionals mysqlSupport [
             "-L"
             "${libmysqlclient}/lib"
             "-I"
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 93fd45a65d144..931e7189ea728 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -266,14 +266,14 @@ qtModule (
       sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
         src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
     ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin (''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace src/buildtools/config/mac_osx.pri \
         --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"'
 
       # Use system ffmpeg
       echo "gn_args += use_system_ffmpeg=true" >> src/core/config/mac_osx.pri
       echo "LIBS += -lavformat -lavcodec -lavutil" >> src/core/core_common.pri
-    '')
+    ''
     + postPatch;
 
     env = {
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index bfab871bc3148..e24c2c825240f 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -28,10 +28,10 @@ let
   addPackages =
     self:
     let
-      callPackage = self.newScope ({
+      callPackage = self.newScope {
         inherit (self) qtModule;
         inherit srcs python3 stdenv;
-      });
+      };
 
       # Per <https://doc.qt.io/qt-6/macos.html#supported-versions>.
       # This should reflect the highest “Build Environment” and the
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 45fdbb8da878c..6caaf7f6510db 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -286,7 +286,7 @@ qtModule {
   # Debug info is too big to link with LTO.
   separateDebugInfo = false;
 
-  meta = with lib; {
+  meta = {
     description = "Web engine based on the Chromium web browser";
     platforms = [
       "x86_64-darwin"
diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix
index a02f91e527eb6..2e3d2fb2b453d 100644
--- a/pkgs/development/libraries/soqt/default.nix
+++ b/pkgs/development/libraries/soqt/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/coin3d/soqt";
     license = licenses.bsd3;
     description = "Glue between Coin high-level 3D visualization library and Qt";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 044159f813286..fc746f8b53a20 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline";
 
-  env.NIX_CFLAGS_COMPILE = toString ([
+  env.NIX_CFLAGS_COMPILE = toString [
     "-DSQLITE_ENABLE_COLUMN_METADATA"
     "-DSQLITE_ENABLE_DBSTAT_VTAB"
     "-DSQLITE_ENABLE_JSON1"
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
     "-DSQLITE_SECURE_DELETE"
     "-DSQLITE_MAX_VARIABLE_NUMBER=250000"
     "-DSQLITE_MAX_EXPR_DEPTH=10000"
-  ]);
+  ];
 
   # Test for features which may not be available at compile time
   preBuild = ''
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index 441d3cfdda148..27144689ee2e2 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     python3
   ]
   ++
-    lib.optionals (lapackSupport)
+    lib.optionals lapackSupport
       # Check that the same index size is used for both libraries
       (
         assert (blas.isILP64 == lapack.isILP64);
@@ -46,18 +46,18 @@ stdenv.mkDerivation rec {
       )
   # KLU support is based on Suitesparse. It is tested upstream according to the
   # section 1.1.4.2 of INSTALL_GUIDE.pdf found in the source tarball.
-  ++ lib.optionals (kluSupport) [
+  ++ lib.optionals kluSupport [
     suitesparse
   ];
 
   cmakeFlags = [
     "-DEXAMPLES_INSTALL_PATH=${placeholder "examples"}/share/examples"
   ]
-  ++ lib.optionals (lapackSupport) [
+  ++ lib.optionals lapackSupport [
     "-DENABLE_LAPACK=ON"
     "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
   ]
-  ++ lib.optionals (kluSupport) [
+  ++ lib.optionals kluSupport [
     "-DENABLE_KLU=ON"
     "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include"
     "-DKLU_LIBRARY_DIR=${suitesparse}/lib"
diff --git a/pkgs/development/libraries/unqlite/default.nix b/pkgs/development/libraries/unqlite/default.nix
index 4d93dec6f352f..e88385f7ed932 100644
--- a/pkgs/development/libraries/unqlite/default.nix
+++ b/pkgs/development/libraries/unqlite/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       freely copy a database between 32-bit and 64-bit systems or between
       big-endian and little-endian architectures.
     '';
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.bsd2;
   };
 }
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index f22adc14b6002..1c14b4d1af85b 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -146,7 +146,7 @@ let
     });
 
 in
-rec {
+{
   wlroots_0_17 = generic {
     version = "0.17.4";
     hash = "sha256-AzmXf+HMX/6VAr0LpfHwfmDB9dRrrLQHt7l35K98MVo=";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 4e467290386bc..d513466f75214 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -201,7 +201,7 @@ in
     '';
   });
 
-  grug-far-nvim = prev.grug-far-nvim.overrideAttrs ({
+  grug-far-nvim = prev.grug-far-nvim.overrideAttrs {
     doCheck = lua.luaversion == "5.1" && !stdenv.hostPlatform.isDarwin;
     nativeCheckInputs = [
       final.busted
@@ -233,7 +233,7 @@ in
       runHook postCheck
     '';
 
-  });
+  };
 
   http = prev.http.overrideAttrs (oa: {
     /*
@@ -909,7 +909,7 @@ in
       lua,
       luaposix,
     }:
-    buildLuarocksPackage ({
+    buildLuarocksPackage {
       pname = "readline";
       version = "3.2-0";
       knownRockspec =
@@ -944,7 +944,7 @@ in
         license.fullName = "MIT/X11";
         broken = (luaOlder "5.1") || (luaAtLeast "5.5");
       };
-    })
+    }
   ) { };
 
   rtp-nvim = prev.rtp-nvim.overrideAttrs (oa: {
diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix
index 69647bb08aa8f..d6d5f10c1f6b4 100644
--- a/pkgs/development/ocaml-modules/cooltt/default.nix
+++ b/pkgs/development/ocaml-modules/cooltt/default.nix
@@ -43,7 +43,7 @@ let
       license = lib.licenses.asl20;
     };
   };
-  kado = buildDunePackage rec {
+  kado = buildDunePackage {
     pname = "kado";
     version = "unstable-2023-10-03";
     src = fetchFromGitHub {
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index c256f5c6c6cf7..e44293a74ccce 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -33,7 +33,7 @@ let
 in
 
 let
-  fetched = coqPackages.metaFetch ({
+  fetched = coqPackages.metaFetch {
     release."2.0.7".sha256 = "sha256-gCM+vZK6vWlhSO1VMjiWHse23mvxVwRarhxwkIQK7e0=";
     release."2.0.6".sha256 = "sha256-tRUYXQZ0VXrjIZBZ1skdzieUsww4rSNEe5ik+iKpk3U=";
     release."2.0.5".sha256 = "sha256-cHgERFqrfSg5WtUX3UxR6L+QkzS7+t6n4V+wweiEacc=";
@@ -55,7 +55,7 @@ let
       owner = "LPCIC";
       repo = "elpi";
     };
-  }) version;
+  } version;
 in
 let
   inherit (fetched) version;
diff --git a/pkgs/development/ocaml-modules/junit/default.nix b/pkgs/development/ocaml-modules/junit/default.nix
index 9604ec31e75ab..3e2bbc3f013cb 100644
--- a/pkgs/development/ocaml-modules/junit/default.nix
+++ b/pkgs/development/ocaml-modules/junit/default.nix
@@ -6,7 +6,7 @@
   tyxml,
 }:
 
-buildDunePackage (rec {
+buildDunePackage rec {
   pname = "junit";
   version = "2.3.0";
 
@@ -28,4 +28,4 @@ buildDunePackage (rec {
     maintainers = [ ];
     homepage = "https://github.com/Khady/ocaml-junit";
   };
-})
+}
diff --git a/pkgs/development/ocaml-modules/junit/ounit.nix b/pkgs/development/ocaml-modules/junit/ounit.nix
index 6e4b79eea2721..9704183c6e22b 100644
--- a/pkgs/development/ocaml-modules/junit/ounit.nix
+++ b/pkgs/development/ocaml-modules/junit/ounit.nix
@@ -4,7 +4,7 @@
   ounit2,
 }:
 
-buildDunePackage ({
+buildDunePackage {
   pname = "junit_ounit";
 
   inherit (junit) src version meta;
@@ -15,4 +15,4 @@ buildDunePackage ({
   ];
 
   doCheck = true;
-})
+}
diff --git a/pkgs/development/ocaml-modules/lutils/default.nix b/pkgs/development/ocaml-modules/lutils/default.nix
index 2130900625f53..4efb6d4e27718 100644
--- a/pkgs/development/ocaml-modules/lutils/default.nix
+++ b/pkgs/development/ocaml-modules/lutils/default.nix
@@ -22,7 +22,7 @@ buildDunePackage rec {
     num
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/";
     description = "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)";
     changelog = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/-/releases/v${version}";
diff --git a/pkgs/development/ocaml-modules/magic/default.nix b/pkgs/development/ocaml-modules/magic/default.nix
index da5415453fc93..ec6586012998c 100644
--- a/pkgs/development/ocaml-modules/magic/default.nix
+++ b/pkgs/development/ocaml-modules/magic/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Chris00/ocaml-magic";
     description = "Bindings for libmagic";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/menhir/lib.nix b/pkgs/development/ocaml-modules/menhir/lib.nix
index 6b63aabafd5f1..71aa7995fe752 100644
--- a/pkgs/development/ocaml-modules/menhir/lib.nix
+++ b/pkgs/development/ocaml-modules/menhir/lib.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  fetched = coqPackages.metaFetch ({
+  fetched = coqPackages.metaFetch {
     release."20231231".sha256 = "sha256-veB0ORHp6jdRwCyDDAfc7a7ov8sOeHUmiELdOFf/QYk=";
     release."20240715".sha256 = "sha256-9CSxAIm0aEXkwF+aj8u/bqLG30y5eDNz65EnohJPjzI=";
     releaseRev = v: "${v}";
@@ -16,7 +16,7 @@ let
       owner = "fpottier";
       repo = "menhir";
     };
-  }) version;
+  } version;
 in
 buildDunePackage {
   pname = "menhirLib";
diff --git a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix
index a48d73b341af6..2073ae6962b11 100644
--- a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix
@@ -26,7 +26,7 @@ buildDunePackage rec {
     bos
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Pretty print an OCaml cmi/cmt/cmti file in human-readable OCaml signature form";
     homepage = "https://github.com/${author}/${pname}";
     license = lib.licenses.isc;
diff --git a/pkgs/development/ocaml-modules/rdbg/default.nix b/pkgs/development/ocaml-modules/rdbg/default.nix
index 11aca2dd4e4e3..2909605e0bc9a 100644
--- a/pkgs/development/ocaml-modules/rdbg/default.nix
+++ b/pkgs/development/ocaml-modules/rdbg/default.nix
@@ -27,7 +27,7 @@ buildDunePackage rec {
     lutils
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/rdbg";
     description = "Programmable debugger that targets reactive programs for which a rdbg-plugin exists. Currently two plugins exist : one for Lustre, and one for Lutin (nb: both are synchronous programming languages)";
     license = lib.licenses.cecill21;
diff --git a/pkgs/development/python-modules/affine/default.nix b/pkgs/development/python-modules/affine/default.nix
index 50ad44f34cc16..a27c427a7ff71 100644
--- a/pkgs/development/python-modules/affine/default.nix
+++ b/pkgs/development/python-modules/affine/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Matrices describing affine transformation of the plane";
     license = licenses.bsd3;
     homepage = "https://github.com/rasterio/affine";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix
index 8aafdcf4587c8..be4bcde5e261d 100644
--- a/pkgs/development/python-modules/aiofiles/default.nix
+++ b/pkgs/development/python-modules/aiofiles/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Tinche/aiofiles";
     changelog = "https://github.com/Tinche/aiofiles/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aiohttp-utils/default.nix b/pkgs/development/python-modules/aiohttp-utils/default.nix
index 1420606516c38..5b4976bd87181 100644
--- a/pkgs/development/python-modules/aiohttp-utils/default.nix
+++ b/pkgs/development/python-modules/aiohttp-utils/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sloria/aiohttp-utils";
     changelog = "https://github.com/sloria/aiohttp-utils/blob/${src.rev}/CHANGELOG.rst";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/annotated-types/default.nix b/pkgs/development/python-modules/annotated-types/default.nix
index cd818c0676764..b75d18edbb510 100644
--- a/pkgs/development/python-modules/annotated-types/default.nix
+++ b/pkgs/development/python-modules/annotated-types/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/annotated-types/annotated-types";
     changelog = "https://github.com/annotated-types/annotated-types/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix
index a4b7b9254de36..1781088fe5afe 100644
--- a/pkgs/development/python-modules/anytree/default.nix
+++ b/pkgs/development/python-modules/anytree/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/c0fec0de/anytree";
     changelog = "https://github.com/c0fec0de/anytree/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maitnainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix
index abd1f5b5cc43c..ea1eaf1778c17 100644
--- a/pkgs/development/python-modules/apptools/default.nix
+++ b/pkgs/development/python-modules/apptools/default.nix
@@ -59,6 +59,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/enthought/apptools";
     changelog = "https://github.com/enthought/apptools/releases/tag/${version}";
     license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix
index 28170c20e92c3..7f1bc1a7ed3d2 100644
--- a/pkgs/development/python-modules/args/default.nix
+++ b/pkgs/development/python-modules/args/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Command Arguments for Humans";
     homepage = "https://github.com/kennethreitz/args";
   };
diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix
index cc85bb4611a67..6f7474e6f40e3 100644
--- a/pkgs/development/python-modules/avro3k/default.nix
+++ b/pkgs/development/python-modules/avro3k/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   doCheck = false; # No such file or directory: './run_tests.py
 
-  meta = with lib; {
+  meta = {
     description = "Serialization and RPC framework";
     mainProgram = "avro";
     homepage = "https://pypi.python.org/pypi/avro3k/";
diff --git a/pkgs/development/python-modules/azure-mgmt-mysqlflexibleservers/default.nix b/pkgs/development/python-modules/azure-mgmt-mysqlflexibleservers/default.nix
index b6c49b3b6c886..70b6a12bc284f 100644
--- a/pkgs/development/python-modules/azure-mgmt-mysqlflexibleservers/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-mysqlflexibleservers/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure Mysqlflexibleservers Management Client Library for Python";
     homepage = "https://pypi.org/project/azure-mgmt-mysqlflexibleservers/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix b/pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix
index f2aeb55a13b33..b18a41d7af01c 100644
--- a/pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-postgresqlflexibleservers/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure Postgresqlflexibleservers Management Client Library for Python";
     homepage = "https://pypi.org/project/azure-mgmt-postgresqlflexibleservers/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-storage-file-datalake/default.nix b/pkgs/development/python-modules/azure-storage-file-datalake/default.nix
index faf0f8c738f4b..8ddc795d9180d 100644
--- a/pkgs/development/python-modules/azure-storage-file-datalake/default.nix
+++ b/pkgs/development/python-modules/azure-storage-file-datalake/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure File DataLake Storage Client Library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-file-datalake";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix
index 3ac8cc7701ff6..d7acb0c644b85 100644
--- a/pkgs/development/python-modules/backports-shutil-which/default.nix
+++ b/pkgs/development/python-modules/backports-shutil-which/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Backport of shutil.which from Python 3.3";
     homepage = "https://github.com/minrk/backports.shutil_which";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix
index 5903518a6a7d5..6da00eb416465 100644
--- a/pkgs/development/python-modules/beaker/default.nix
+++ b/pkgs/development/python-modules/beaker/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     pycrypto
     cryptography
   ]
-  ++ lib.optionals (isPy27) [
+  ++ lib.optionals isPy27 [
     funcsigs
     pycryptopp
   ];
diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix
index 845a43780cb6f..35756f5100766 100644
--- a/pkgs/development/python-modules/beniget/default.nix
+++ b/pkgs/development/python-modules/beniget/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Extract semantic information about static Python code";
     homepage = "https://github.com/serge-sans-paille/beniget";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/blockbuster/default.nix b/pkgs/development/python-modules/blockbuster/default.nix
index 0560a02915a63..4f09036ab5a68 100644
--- a/pkgs/development/python-modules/blockbuster/default.nix
+++ b/pkgs/development/python-modules/blockbuster/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     description = "Utility to detect blocking calls in the async event loop";
     homepage = "https://github.com/cbornet/blockbuster";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix
index 9339066299a32..bde10650661ea 100644
--- a/pkgs/development/python-modules/bravia-tv/default.nix
+++ b/pkgs/development/python-modules/bravia-tv/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/dcnielsen90/python-bravia-tv";
     description = "Python library for Sony Bravia TV remote control";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix
index 7ca37c54bde2e..141a2115c28c5 100644
--- a/pkgs/development/python-modules/cached-property/default.nix
+++ b/pkgs/development/python-modules/cached-property/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/pydanny/cached-property/releases/tag/${version}";
     license = licenses.bsd3;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix
index ca68a3401d2ce..776b4930977fd 100644
--- a/pkgs/development/python-modules/cachelib/default.nix
+++ b/pkgs/development/python-modules/cachelib/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pallets/cachelib";
     description = "Collection of cache libraries in the same API interface";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix b/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix
index 1ad27acb28330..fbefa3cbe5277 100644
--- a/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix
+++ b/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "A collection of Sphinx extensions used by Canonical documentation";
     homepage = "https://pypi.org/project/canonical-sphinx-extensions";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index 42cc8eeeb169e..b6f11507c6c82 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -94,7 +94,7 @@ buildPythonPackage rec {
     homepage = "https://scitools.org.uk/cartopy/docs/latest/";
     changelog = "https://github.com/SciTools/cartopy/releases/tag/v${version}";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "feature_download";
   };
 }
diff --git a/pkgs/development/python-modules/cfscrape/default.nix b/pkgs/development/python-modules/cfscrape/default.nix
index c5fba3baf9174..9dd60bed97690 100644
--- a/pkgs/development/python-modules/cfscrape/default.nix
+++ b/pkgs/development/python-modules/cfscrape/default.nix
@@ -9,12 +9,12 @@ buildPythonPackage {
   pname = "cfscrape";
   version = "2.1.1";
   format = "setuptools";
-  src = fetchFromGitHub ({
+  src = fetchFromGitHub {
     owner = "Anorov";
     repo = "cloudflare-scrape";
     rev = "9692fe7ff3c17b76ddf0f4d50d3dba7d1791c9c6";
     hash = "sha256-uO8lBZonjk+mlFYoNSaz+GIN/W9yf8VL9OQ7MKfsMgI=";
-  });
+  };
 
   propagatedBuildInputs = [ requests ];
 
diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix
index 756a2ab0868bc..a45bff2e26549 100644
--- a/pkgs/development/python-modules/chai/default.nix
+++ b/pkgs/development/python-modules/chai/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
       --replace "assert_equals" "assert_equal"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Mocking, stubbing and spying framework for python";
   };
 }
diff --git a/pkgs/development/python-modules/changelog-chug/default.nix b/pkgs/development/python-modules/changelog-chug/default.nix
index 3a08569a84417..a13435f0a247e 100644
--- a/pkgs/development/python-modules/changelog-chug/default.nix
+++ b/pkgs/development/python-modules/changelog-chug/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     description = "Changelog document parser";
     homepage = "https://git.sr.ht/~bignose/changelog-chug";
     license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix
index bf4a347b92d71..63260b8f0f3d9 100644
--- a/pkgs/development/python-modules/click-plugins/default.nix
+++ b/pkgs/development/python-modules/click-plugins/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
     description = "Extension module for click to enable registering CLI commands";
     homepage = "https://github.com/click-contrib/click-plugins";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix
index 1d3c57b3edfce..b3fa6fd39f247 100644
--- a/pkgs/development/python-modules/cligj/default.nix
+++ b/pkgs/development/python-modules/cligj/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = "Click params for command line interfaces to GeoJSON";
     homepage = "https://github.com/mapbox/cligj";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/contexter/default.nix b/pkgs/development/python-modules/contexter/default.nix
index 5ca090e91901b..3690d8fff16cf 100644
--- a/pkgs/development/python-modules/contexter/default.nix
+++ b/pkgs/development/python-modules/contexter/default.nix
@@ -14,5 +14,5 @@ buildPythonPackage rec {
     sha256 = "c730890b1a915051414a6350d8ea1cddca7d01d8f756badedb30b9bf305ea0a8";
   };
 
-  meta = with lib; { };
+  meta = { };
 }
diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix
index 45fc174577aec..4cdee5db3b46b 100644
--- a/pkgs/development/python-modules/cython/default.nix
+++ b/pkgs/development/python-modules/cython/default.nix
@@ -122,7 +122,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/cython/cython/blob/${version}/CHANGES.rst";
     license = lib.licenses.asl20;
     mainProgram = "cython";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
 # TODO: investigate recursive loop when doCheck is true
diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix
index b73691b3ca24a..ff98c13dee72d 100644
--- a/pkgs/development/python-modules/dbus-next/default.nix
+++ b/pkgs/development/python-modules/dbus-next/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/altdesktop/python-dbus-next";
     changelog = "https://github.com/altdesktop/python-dbus-next/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix
index d5a11fbb784b3..8e412bc02cca6 100644
--- a/pkgs/development/python-modules/denonavr/default.nix
+++ b/pkgs/development/python-modules/denonavr/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ol-iver/denonavr";
     changelog = "https://github.com/ol-iver/denonavr/releases/tag/${src.tag}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-environ/default.nix b/pkgs/development/python-modules/django-environ/default.nix
index 47d4cf94731ff..6902020a449f8 100644
--- a/pkgs/development/python-modules/django-environ/default.nix
+++ b/pkgs/development/python-modules/django-environ/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/joke2k/django-environ/";
     changelog = "https://github.com/joke2k/django-environ/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-tree-queries/default.nix b/pkgs/development/python-modules/django-tree-queries/default.nix
index 36ffc5712e53e..6484ff054d24e 100644
--- a/pkgs/development/python-modules/django-tree-queries/default.nix
+++ b/pkgs/development/python-modules/django-tree-queries/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/feincms/django-tree-queries";
     changelog = "https://github.com/feincms/django-tree-queries/blob/${src.tag}/CHANGELOG.rst";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix
index 2789c78eca253..c318de33809cb 100644
--- a/pkgs/development/python-modules/docutils/default.nix
+++ b/pkgs/development/python-modules/docutils/default.nix
@@ -53,7 +53,7 @@ let
         psfl
         gpl3Plus
       ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/development/python-modules/donfig/default.nix b/pkgs/development/python-modules/donfig/default.nix
index 3c06c81917c77..8243191376b4f 100644
--- a/pkgs/development/python-modules/donfig/default.nix
+++ b/pkgs/development/python-modules/donfig/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pytroll/donfig";
     changelog = "https://github.com/pytroll/donfig/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dotty-dict/default.nix b/pkgs/development/python-modules/dotty-dict/default.nix
index d9ab527478952..6c3045d199a75 100644
--- a/pkgs/development/python-modules/dotty-dict/default.nix
+++ b/pkgs/development/python-modules/dotty-dict/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     homepage = "https://dotty-dict.readthedocs.io";
     changelog = "https://github.com/pawelzny/dotty_dict/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/durationpy/default.nix b/pkgs/development/python-modules/durationpy/default.nix
index 79f9bf439a79c..7987999ecd3f5 100644
--- a/pkgs/development/python-modules/durationpy/default.nix
+++ b/pkgs/development/python-modules/durationpy/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Module for converting between datetime.timedelta and Go's time.Duration strings";
     homepage = "https://github.com/icholy/durationpy";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix
index ed8cfe2a9c3c2..a9440766a2e78 100644
--- a/pkgs/development/python-modules/envisage/default.nix
+++ b/pkgs/development/python-modules/envisage/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     description = "Framework for building applications whose functionalities can be extended by adding plug-ins";
     homepage = "https://github.com/enthought/envisage";
     license = licenses.bsdOriginal;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix
index ef37dbb1c77af..168c625c2cdae 100644
--- a/pkgs/development/python-modules/etebase/default.nix
+++ b/pkgs/development/python-modules/etebase/default.nix
@@ -77,6 +77,6 @@ buildPythonPackage rec {
     homepage = "https://www.etebase.com/";
     description = "Python client library for Etebase";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix
index de54ce0ce7513..652b3f900344e 100644
--- a/pkgs/development/python-modules/fickling/default.nix
+++ b/pkgs/development/python-modules/fickling/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/trailofbits/fickling";
     changelog = "https://github.com/trailofbits/fickling/releases/tag/v${version}";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix
index bd69a1f647ac1..f9e65c5e3d6f7 100644
--- a/pkgs/development/python-modules/flux-led/default.nix
+++ b/pkgs/development/python-modules/flux-led/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/Danielhiversen/flux_led";
     changelog = "https://github.com/Danielhiversen/flux_led/releases/tag/${version}";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "flux_led";
   };
diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix
index cb1c8d7a24ef4..408e1c6378e4c 100644
--- a/pkgs/development/python-modules/forbiddenfruit/default.nix
+++ b/pkgs/development/python-modules/forbiddenfruit/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
       mit
       gpl3Plus
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix
index 24bf6109e8ace..e4805205f9927 100644
--- a/pkgs/development/python-modules/gbinder-python/default.nix
+++ b/pkgs/development/python-modules/gbinder-python/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/erfanoabdi/gbinder-python";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix
index 592e0e61c26a4..14e68d043e95f 100644
--- a/pkgs/development/python-modules/gentools/default.nix
+++ b/pkgs/development/python-modules/gentools/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://gentools.readthedocs.io/";
     changelog = "https://github.com/ariebovenberg/gentools/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix
index 9e6149fa77ac1..aa6b42250478c 100644
--- a/pkgs/development/python-modules/getmac/default.nix
+++ b/pkgs/development/python-modules/getmac/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/GhostofGoes/getmac";
     changelog = "https://github.com/GhostofGoes/getmac/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "getmac";
   };
 }
diff --git a/pkgs/development/python-modules/gistyc/default.nix b/pkgs/development/python-modules/gistyc/default.nix
index e8a0631f7e1ae..40b1177830cb0 100644
--- a/pkgs/development/python-modules/gistyc/default.nix
+++ b/pkgs/development/python-modules/gistyc/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
       blocks.
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/git-url-parse/default.nix b/pkgs/development/python-modules/git-url-parse/default.nix
index 67a0e5a38030d..ac0eb2f0f4342 100644
--- a/pkgs/development/python-modules/git-url-parse/default.nix
+++ b/pkgs/development/python-modules/git-url-parse/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/coala/git-url-parse";
     changelog = "https://github.com/coala/git-url-parse/blob/${src.rev}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/go2rtc-client/default.nix b/pkgs/development/python-modules/go2rtc-client/default.nix
index e6f51c8d7fdb1..3b850717a4d1b 100644
--- a/pkgs/development/python-modules/go2rtc-client/default.nix
+++ b/pkgs/development/python-modules/go2rtc-client/default.nix
@@ -62,6 +62,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/home-assistant-libs/python-go2rtc-client";
     changelog = "https://github.com/home-assistant-libs/python-go2rtc-client/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gocardless-pro/default.nix b/pkgs/development/python-modules/gocardless-pro/default.nix
index a2513c3e84249..44be8e427298c 100644
--- a/pkgs/development/python-modules/gocardless-pro/default.nix
+++ b/pkgs/development/python-modules/gocardless-pro/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/gocardless/gocardless-pro-python";
     changelog = "https://github.com/gocardless/gocardless-pro-python/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hid/default.nix b/pkgs/development/python-modules/hid/default.nix
index 59af2d501e9ad..6dfcb3656c934 100644
--- a/pkgs/development/python-modules/hid/default.nix
+++ b/pkgs/development/python-modules/hid/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "hidapi bindings in ctypes";
     homepage = "https://github.com/apmorton/pyhidapi";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hyrule/default.nix b/pkgs/development/python-modules/hyrule/default.nix
index ead2930ea4f52..5a44daba22fdb 100644
--- a/pkgs/development/python-modules/hyrule/default.nix
+++ b/pkgs/development/python-modules/hyrule/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/hylang/hyrule";
     changelog = "https://github.com/hylang/hyrule/releases/tag/${src.tag}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix
index b7f9e04470072..7700d9e059995 100644
--- a/pkgs/development/python-modules/import-expression/default.nix
+++ b/pkgs/development/python-modules/import-expression/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
       mit
       psfl
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "import-expression";
   };
 }
diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix
index 5d3138f582341..19a0e6b7277a2 100644
--- a/pkgs/development/python-modules/jishaku/default.nix
+++ b/pkgs/development/python-modules/jishaku/default.nix
@@ -65,7 +65,7 @@ buildPythonPackage rec {
     description = "Debugging and testing cog for discord.py bots";
     homepage = "https://jishaku.readthedocs.io/en/latest";
     changelog = "https://github.com/Gorialis/jishaku/releases/tag/${src.tag}";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "jishaku";
     license = lib.licenses.mit;
   };
diff --git a/pkgs/development/python-modules/kdl-py/default.nix b/pkgs/development/python-modules/kdl-py/default.nix
index df409677cc928..783a382dde4a7 100644
--- a/pkgs/development/python-modules/kdl-py/default.nix
+++ b/pkgs/development/python-modules/kdl-py/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     description = "Parser for the KDL language";
     homepage = "https://github.com/tabatkins/kdlpy";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "kdlreformat";
   };
 }
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index 9471af6c6c949..834e26c812e2f 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -63,7 +63,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
-    (postgresql.withPackages (p: with p; [ pgvector ]))
+    (postgresql.withPackages (p: [ pgvector ]))
     postgresqlTestHook
   ];
 
diff --git a/pkgs/development/python-modules/libsupermesh/default.nix b/pkgs/development/python-modules/libsupermesh/default.nix
index bed0e16079326..aeb349fbca7aa 100644
--- a/pkgs/development/python-modules/libsupermesh/default.nix
+++ b/pkgs/development/python-modules/libsupermesh/default.nix
@@ -12,7 +12,7 @@
   rtree,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   inherit (pkgs.libsupermesh)
     pname
     version
diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix
index 58efd89f946ae..f1cc13b44e995 100644
--- a/pkgs/development/python-modules/livereload/default.nix
+++ b/pkgs/development/python-modules/livereload/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     mainProgram = "livereload";
     homepage = "https://github.com/lepture/python-livereload";
     license = lib.licenses.bsd3;
-    maintainers = with lib; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/localimport/default.nix b/pkgs/development/python-modules/localimport/default.nix
index c267b0c81725f..6b913495a6f88 100644
--- a/pkgs/development/python-modules/localimport/default.nix
+++ b/pkgs/development/python-modules/localimport/default.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/NiklasRosenstein/py-localimport";
     description = "Isolated import of Python modules";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix
index c4629efa87511..24e752dd8d55f 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/pkgs/development/python-modules/m2r/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/miyakogi/m2r";
     description = "Markdown to reStructuredText converter";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # https://github.com/miyakogi/m2r/issues/66
     broken = versionAtLeast mistune.version "2";
   };
diff --git a/pkgs/development/python-modules/mallard-ducktype/default.nix b/pkgs/development/python-modules/mallard-ducktype/default.nix
index f13d66593ed53..791ebaa423163 100644
--- a/pkgs/development/python-modules/mallard-ducktype/default.nix
+++ b/pkgs/development/python-modules/mallard-ducktype/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Parser for the lightweight Ducktype syntax for Mallard";
     homepage = "https://github.com/projectmallard/mallard-ducktype";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix
index aa2dc068aa495..67d820774f358 100644
--- a/pkgs/development/python-modules/manim/default.nix
+++ b/pkgs/development/python-modules/manim/default.nix
@@ -184,7 +184,7 @@ let
     ]
   );
   # https://github.com/ManimCommunity/manim/pull/4037
-  av_13_1 = av.overridePythonAttrs (rec {
+  av_13_1 = av.overridePythonAttrs rec {
     version = "13.1.0";
     src = fetchFromGitHub {
       owner = "PyAV-Org";
@@ -192,7 +192,7 @@ let
       tag = "v${version}";
       hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60=";
     };
-  });
+  };
 in
 buildPythonPackage rec {
   pname = "manim";
diff --git a/pkgs/development/python-modules/mathlibtools/default.nix b/pkgs/development/python-modules/mathlibtools/default.nix
index d219d6aa9e095..6260170d6d003 100644
--- a/pkgs/development/python-modules/mathlibtools/default.nix
+++ b/pkgs/development/python-modules/mathlibtools/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/leanprover-community/mathlib-tools";
     changelog = "https://github.com/leanprover-community/mathlib-tools/raw/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix
index 540b401fcbe6a..ba304fc74e2e9 100644
--- a/pkgs/development/python-modules/mayavi/default.nix
+++ b/pkgs/development/python-modules/mayavi/default.nix
@@ -57,7 +57,7 @@ buildPythonPackage rec {
     description = "3D visualization of scientific data in Python";
     homepage = "https://github.com/enthought/mayavi";
     license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "mayavi2";
   };
 }
diff --git a/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix b/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix
index 47b82bbac73cd..8b13b03b9f704 100644
--- a/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix
+++ b/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "A tool for detecting and masking secrets";
     homepage = "https://pypi.org/project/microsoft-security-utilities-secret-masker/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mnist/default.nix b/pkgs/development/python-modules/mnist/default.nix
index 9474f170a3de2..a9fdd0ebf2b58 100644
--- a/pkgs/development/python-modules/mnist/default.nix
+++ b/pkgs/development/python-modules/mnist/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Python utilities to download and parse the MNIST dataset";
     homepage = "https://github.com/datapythonista/mnist";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/music-assistant-client/default.nix b/pkgs/development/python-modules/music-assistant-client/default.nix
index 4545ea5dd722f..448a128595c8a 100644
--- a/pkgs/development/python-modules/music-assistant-client/default.nix
+++ b/pkgs/development/python-modules/music-assistant-client/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/music-assistant/client";
     changelog = "https://github.com/music-assistant/client/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/music-assistant-models/default.nix b/pkgs/development/python-modules/music-assistant-models/default.nix
index 6cae3bad249d7..5b4155612d2d1 100644
--- a/pkgs/development/python-modules/music-assistant-models/default.nix
+++ b/pkgs/development/python-modules/music-assistant-models/default.nix
@@ -60,6 +60,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/music-assistant/models";
     changelog = "https://github.com/music-assistant/models/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 86a70c62e6507..c4f0f0d53dcb9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -44,7 +44,7 @@ let
       };
     };
 in
-rec {
+{
   mypy-boto3-accessanalyzer =
     buildMypyBoto3Package "accessanalyzer" "1.38.0"
       "sha256-y9/xQ8qsa7lI01hQTKuDBPavkQKuUX7pE4BRzwZ/bIQ=";
diff --git a/pkgs/development/python-modules/nodepy-runtime/default.nix b/pkgs/development/python-modules/nodepy-runtime/default.nix
index 57c68dccc6e10..840ce04f1dcc4 100644
--- a/pkgs/development/python-modules/nodepy-runtime/default.nix
+++ b/pkgs/development/python-modules/nodepy-runtime/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
       extra.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix
index 6c60bcfbb8ab1..122f2e19c70a2 100644
--- a/pkgs/development/python-modules/paddlepaddle/default.nix
+++ b/pkgs/development/python-modules/paddlepaddle/default.nix
@@ -35,7 +35,7 @@ let
     allHashAndPlatform."${stdenv.system}"."${cpuOrGpu}"."${pyShortVersion}"
       or (throw "${pname} has no binary-hashes.nix entry for '${stdenv.system}.${cpuOrGpu}.${pyShortVersion}' attribute");
   platform = allHashAndPlatform."${stdenv.system}".platform;
-  src = fetchPypi ({
+  src = fetchPypi {
     inherit
       version
       format
@@ -46,7 +46,7 @@ let
     dist = pyShortVersion;
     python = pyShortVersion;
     abi = pyShortVersion;
-  });
+  };
 in
 buildPythonPackage {
   inherit
diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix
index ed728e0fe1e8b..a458fda76e4e9 100644
--- a/pkgs/development/python-modules/paypalrestsdk/default.nix
+++ b/pkgs/development/python-modules/paypalrestsdk/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "paypalrestsdk" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python APIs to create, process and manage payment";
     homepage = "https://github.com/paypal/PayPal-Python-SDK";
     changelog = "https://github.com/paypal/PayPal-Python-SDK/blob/master/CHANGELOG.md";
diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix
index 0371859c5066f..cb34296f7f794 100644
--- a/pkgs/development/python-modules/pexpect/default.nix
+++ b/pkgs/development/python-modules/pexpect/default.nix
@@ -9,7 +9,7 @@
   sage,
 }:
 
-buildPythonPackage (rec {
+buildPythonPackage rec {
   pname = "pexpect";
   version = "4.9.0";
   pyproject = true;
@@ -53,4 +53,4 @@ buildPythonPackage (rec {
       any platform that supports the standard Python pty module.
     '';
   };
-})
+}
diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix
index c4e179c2d953b..55e46658d79a3 100644
--- a/pkgs/development/python-modules/piccata/default.nix
+++ b/pkgs/development/python-modules/piccata/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Simple CoAP (RFC7252) toolkit";
     homepage = "https://github.com/NordicSemiconductor/piccata";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix
index 0e66042a1d850..074e54f5be496 100644
--- a/pkgs/development/python-modules/pivy/default.nix
+++ b/pkgs/development/python-modules/pivy/default.nix
@@ -69,6 +69,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/coin3d/pivy/";
     description = "Python binding for Coin";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/playsound/default.nix b/pkgs/development/python-modules/playsound/default.nix
index 54537341ba385..fd06a196cea85 100644
--- a/pkgs/development/python-modules/playsound/default.nix
+++ b/pkgs/development/python-modules/playsound/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Pure Python, cross platform, single function module with no dependencies for playing sounds";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix
index ca6f20418c2fa..caf487a66abb9 100644
--- a/pkgs/development/python-modules/plexapi/default.nix
+++ b/pkgs/development/python-modules/plexapi/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pkkid/python-plexapi";
     changelog = "https://github.com/pkkid/python-plexapi/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/plexauth/default.nix b/pkgs/development/python-modules/plexauth/default.nix
index 7e4767c76c602..9a8b40517c236 100644
--- a/pkgs/development/python-modules/plexauth/default.nix
+++ b/pkgs/development/python-modules/plexauth/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jjlawren/python-plexauth/";
     description = "Handles the authorization flow to obtain tokens from Plex.tv via external redirection";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/plexwebsocket/default.nix b/pkgs/development/python-modules/plexwebsocket/default.nix
index c07bac70ccc9f..a9dd67f825569 100644
--- a/pkgs/development/python-modules/plexwebsocket/default.nix
+++ b/pkgs/development/python-modules/plexwebsocket/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jjlawren/python-plexwebsocket/";
     changelog = "https://github.com/jjlawren/python-plexwebsocket/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pocket/default.nix b/pkgs/development/python-modules/pocket/default.nix
index 5a03ee035bb8e..2c65e29dd9809 100644
--- a/pkgs/development/python-modules/pocket/default.nix
+++ b/pkgs/development/python-modules/pocket/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "Wrapper for the pocket API";
     homepage = "https://github.com/tapanpandita/pocket";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/protobuf/3.nix b/pkgs/development/python-modules/protobuf/3.nix
index 08bf15d93fb51..241327dd010d2 100644
--- a/pkgs/development/python-modules/protobuf/3.nix
+++ b/pkgs/development/python-modules/protobuf/3.nix
@@ -87,6 +87,6 @@ buildPythonPackage {
     description = "Protocol Buffers are Google's data interchange format";
     homepage = "https://developers.google.com/protocol-buffers/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/protobuf/4.nix b/pkgs/development/python-modules/protobuf/4.nix
index 5369f68bf2e8c..b99cdb868a3ce 100644
--- a/pkgs/development/python-modules/protobuf/4.nix
+++ b/pkgs/development/python-modules/protobuf/4.nix
@@ -130,7 +130,7 @@ buildPythonPackage {
     description = "Protocol Buffers are Google's data interchange format";
     homepage = "https://developers.google.com/protocol-buffers/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     broken = lib.versionAtLeast protobuf.version "26";
   };
 }
diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix
index 926cb058cec84..1906b2d7cb26b 100644
--- a/pkgs/development/python-modules/pure-eval/default.nix
+++ b/pkgs/development/python-modules/pure-eval/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Safely evaluate AST nodes without side effects";
     homepage = "https://github.com/alexmojaki/pure_eval";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyasynchat/default.nix b/pkgs/development/python-modules/pyasynchat/default.nix
index b8f7cd7641332..7d17b6c11dd6d 100644
--- a/pkgs/development/python-modules/pyasynchat/default.nix
+++ b/pkgs/development/python-modules/pyasynchat/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     description = "Make asynchat available for Python 3.12 onwards";
     homepage = "https://github.com/simonrob/pyasynchat";
     license = lib.licenses.psfl;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix
index 5ddc8c327ddda..53aec0ddb8496 100644
--- a/pkgs/development/python-modules/pyclip/default.nix
+++ b/pkgs/development/python-modules/pyclip/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     mainProgram = "pyclip";
     homepage = "https://github.com/spyoungtech/pyclip";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix
index 43e60d32e471f..c1f655720d2df 100644
--- a/pkgs/development/python-modules/pydash/default.nix
+++ b/pkgs/development/python-modules/pydash/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://pydash.readthedocs.io";
     changelog = "https://github.com/dgilland/pydash/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix
index c1a8766528d94..25172a3be2151 100644
--- a/pkgs/development/python-modules/pyechonest/default.nix
+++ b/pkgs/development/python-modules/pyechonest/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "1da4b3b8b457232a7eb35b59a48390b3c208759b01d596acaa71e6a172b40495";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web";
     homepage = "https://github.com/echonest/pyechonest";
   };
diff --git a/pkgs/development/python-modules/pyeiscp/default.nix b/pkgs/development/python-modules/pyeiscp/default.nix
index ea6138f3ed28c..c951f0b9ff864 100644
--- a/pkgs/development/python-modules/pyeiscp/default.nix
+++ b/pkgs/development/python-modules/pyeiscp/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage {
     description = "Python asyncio module to interface with Anthem AVM and MRX receivers";
     homepage = "https://github.com/winterscar/python-eiscp";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyepsg/default.nix b/pkgs/development/python-modules/pyepsg/default.nix
index 47cf101d674bf..72a2463712dcf 100644
--- a/pkgs/development/python-modules/pyepsg/default.nix
+++ b/pkgs/development/python-modules/pyepsg/default.nix
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "Simple Python interface to epsg.io";
     license = licenses.lgpl3;
     homepage = "https://pyepsg.readthedocs.io/en/latest/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix
index 51d7b089fa723..4389c2e165b8a 100644
--- a/pkgs/development/python-modules/pyface/default.nix
+++ b/pkgs/development/python-modules/pyface/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     description = "Traits-capable windowing framework";
     homepage = "https://github.com/enthought/pyface";
     changelog = "https://github.com/enthought/pyface/releases/tag/${version}";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.bsdOriginal;
   };
 }
diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix
index a10c181afde8a..6309fa2f22b9a 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/pkgs/development/python-modules/pyfakefs/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     homepage = "https://pyfakefs.org/";
     changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/v${version}/CHANGES.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pymatting/default.nix b/pkgs/development/python-modules/pymatting/default.nix
index 74fe384e059dd..bef86bb4b0e9a 100644
--- a/pkgs/development/python-modules/pymatting/default.nix
+++ b/pkgs/development/python-modules/pymatting/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pymatting/pymatting";
     changelog = "https://github.com/pymatting/pymatting/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pypika/default.nix b/pkgs/development/python-modules/pypika/default.nix
index 70e3d3bcb114c..0d426c2f2489d 100644
--- a/pkgs/development/python-modules/pypika/default.nix
+++ b/pkgs/development/python-modules/pypika/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Python SQL query builder";
     homepage = "https://github.com/kayak/pypika";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix
index a256e3faa1467..d0d3bc44a5b7b 100644
--- a/pkgs/development/python-modules/pyqt-builder/default.nix
+++ b/pkgs/development/python-modules/pyqt-builder/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "PEP 517 compliant build system for PyQt";
     homepage = "https://github.com/Python-PyQt/PyQt-builder";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyqtdarktheme/default.nix b/pkgs/development/python-modules/pyqtdarktheme/default.nix
index 872e22d6ef1a0..2f9b290a10abb 100644
--- a/pkgs/development/python-modules/pyqtdarktheme/default.nix
+++ b/pkgs/development/python-modules/pyqtdarktheme/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     description = "Flat dark theme for PySide and PyQt";
     homepage = "https://pyqtdarktheme.readthedocs.io/en/stable";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyquerylist/default.nix b/pkgs/development/python-modules/pyquerylist/default.nix
index 17560e05400fe..af03588470e71 100644
--- a/pkgs/development/python-modules/pyquerylist/default.nix
+++ b/pkgs/development/python-modules/pyquerylist/default.nix
@@ -11,7 +11,7 @@
   pytestCheckHook,
   fetchpatch,
 }:
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pyquerylist";
   version = "0-unstable-2025-03-03";
   pyproject = true;
diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix
index 0bd9531c0729c..b967ae55dfb6a 100644
--- a/pkgs/development/python-modules/pyscreenshot/default.nix
+++ b/pkgs/development/python-modules/pyscreenshot/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     entrypoint2
     pillow
   ]
-  ++ lib.optionals (isPy3k) [
+  ++ lib.optionals isPy3k [
     jeepney
     mss
   ];
diff --git a/pkgs/development/python-modules/pysecretsocks/default.nix b/pkgs/development/python-modules/pysecretsocks/default.nix
index 2e9a3283c525f..ae70105c00486 100644
--- a/pkgs/development/python-modules/pysecretsocks/default.nix
+++ b/pkgs/development/python-modules/pysecretsocks/default.nix
@@ -6,7 +6,7 @@
   pyasyncore,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pysecretsocks";
   version = "0.9.1-unstable-2023-11-04";
   pyproject = true;
diff --git a/pkgs/development/python-modules/pyside2-tools/default.nix b/pkgs/development/python-modules/pyside2-tools/default.nix
index ff4e9809bcdd6..367b44f482087 100644
--- a/pkgs/development/python-modules/pyside2-tools/default.nix
+++ b/pkgs/development/python-modules/pyside2-tools/default.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation {
     description = "PySide2 development tools";
     license = licenses.gpl2;
     homepage = "https://wiki.qt.io/Qt_for_Python";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix
index 1610edc6e267a..4ee0e81d36d85 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/pkgs/development/python-modules/pyside2/default.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
     description = "LGPL-licensed Python bindings for Qt";
     license = licenses.lgpl21;
     homepage = "https://wiki.qt.io/Qt_for_Python";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix
index 2153ca167fb3a..cabd94ab6abc7 100644
--- a/pkgs/development/python-modules/pyside6/default.nix
+++ b/pkgs/development/python-modules/pyside6/default.nix
@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     homepage = "https://wiki.qt.io/Qt_for_Python";
     changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/development/python-modules/pyspelling/default.nix b/pkgs/development/python-modules/pyspelling/default.nix
index 78b5871c07b1d..035152d9a37bf 100644
--- a/pkgs/development/python-modules/pyspelling/default.nix
+++ b/pkgs/development/python-modules/pyspelling/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     description = "Spell checker";
     homepage = "https://pypi.org/project/pyspelling";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyspinel/default.nix b/pkgs/development/python-modules/pyspinel/default.nix
index bc052bf3dc89c..83c57c401b468 100644
--- a/pkgs/development/python-modules/pyspinel/default.nix
+++ b/pkgs/development/python-modules/pyspinel/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Interface to the OpenThread Network Co-Processor (NCP)";
     homepage = "https://github.com/openthread/pyspinel";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pysuezv2/default.nix b/pkgs/development/python-modules/pysuezv2/default.nix
index fb5a0cc45c5cb..1825a13aa778d 100644
--- a/pkgs/development/python-modules/pysuezv2/default.nix
+++ b/pkgs/development/python-modules/pysuezv2/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jb101010-2/pySuez";
     changelog = "https://github.com/jb101010-2/pySuez/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
index 76570a0309803..5f093e3138448 100644
--- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
+++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/iwalton3/python-mpv-jsonipc";
     description = "Python API to MPV using JSON IPC";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-youtube/default.nix b/pkgs/development/python-modules/python-youtube/default.nix
index 0a335053af474..45217f234d609 100644
--- a/pkgs/development/python-modules/python-youtube/default.nix
+++ b/pkgs/development/python-modules/python-youtube/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sns-sdks/python-youtube";
     changelog = "https://github.com/sns-sdks/python-youtube/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix
index 8a589a36f7269..ffe4a1e1c8137 100644
--- a/pkgs/development/python-modules/pythonocc-core/default.nix
+++ b/pkgs/development/python-modules/pythonocc-core/default.nix
@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/tpaviot/pythonocc-core/releases/tag/${version}";
     license = licenses.lgpl3;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix
index d4d34101e7cba..02b6b29de9c71 100644
--- a/pkgs/development/python-modules/qiskit-ignis/default.nix
+++ b/pkgs/development/python-modules/qiskit-ignis/default.nix
@@ -43,9 +43,9 @@ buildPythonPackage rec {
     scikit-learn
     scipy
   ]
-  ++ lib.optionals (withCvx) [ cvxpy ]
-  ++ lib.optionals (withVisualization) [ matplotlib ]
-  ++ lib.optionals (withJit) [ numba ];
+  ++ lib.optionals withCvx [ cvxpy ]
+  ++ lib.optionals withVisualization [ matplotlib ]
+  ++ lib.optionals withJit [ numba ];
 
   # Tests
   pythonImportsCheck = [ "qiskit.ignis" ];
diff --git a/pkgs/development/python-modules/rich-toolkit/default.nix b/pkgs/development/python-modules/rich-toolkit/default.nix
index 1fe3715687a51..727a734b8955c 100644
--- a/pkgs/development/python-modules/rich-toolkit/default.nix
+++ b/pkgs/development/python-modules/rich-toolkit/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     description = "Rich toolkit for building command-line applications";
     homepage = "https://pypi.org/project/rich-toolkit";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix
index bfe0d2f8d4e29..6003a285b67dd 100644
--- a/pkgs/development/python-modules/shiboken2/default.nix
+++ b/pkgs/development/python-modules/shiboken2/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
       lgpl21
     ];
     homepage = "https://wiki.qt.io/Qt_for_Python";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     broken = python.pythonAtLeast "3.13";
   };
 }
diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
index 778a88a397b46..b55f3aa58c36f 100644
--- a/pkgs/development/python-modules/shiboken6/default.nix
+++ b/pkgs/development/python-modules/shiboken6/default.nix
@@ -67,7 +67,7 @@ stdenv'.mkDerivation (finalAttrs: {
     ];
     homepage = "https://wiki.qt.io/Qt_for_Python";
     changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix
index 5e05ad22cc804..58e6a12fb726f 100644
--- a/pkgs/development/python-modules/shippai/default.nix
+++ b/pkgs/development/python-modules/shippai/default.nix
@@ -19,6 +19,6 @@ buildPythonPackage rec {
     description = "Use Rust failures as Python exceptions";
     homepage = "https://github.com/untitaker/shippai";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 067560caee500..66960308e14aa 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     description = "Creates C++ bindings for Python modules";
     homepage = "https://riverbankcomputing.com/";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/slugid/default.nix b/pkgs/development/python-modules/slugid/default.nix
index 3e9a885a6023b..173a935448694 100644
--- a/pkgs/development/python-modules/slugid/default.nix
+++ b/pkgs/development/python-modules/slugid/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
     description = "URL-safe base64 UUID encoder for generating 22 character slugs";
     homepage = "https://github.com/taskcluster/slugid.py";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix
index b742c8d6985ad..3acc0c18504c0 100644
--- a/pkgs/development/python-modules/snuggs/default.nix
+++ b/pkgs/development/python-modules/snuggs/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     description = "S-expressions for Numpy";
     license = licenses.mit;
     homepage = "https://github.com/mapbox/snuggs";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/social-auth-app-django/default.nix b/pkgs/development/python-modules/social-auth-app-django/default.nix
index bec09abd2fe57..c96a236e882d8 100644
--- a/pkgs/development/python-modules/social-auth-app-django/default.nix
+++ b/pkgs/development/python-modules/social-auth-app-django/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/python-social-auth/social-app-django";
     changelog = "https://github.com/python-social-auth/social-app-django/blob/${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix
index 860b3981b4086..e851d7d18498a 100644
--- a/pkgs/development/python-modules/social-auth-core/default.nix
+++ b/pkgs/development/python-modules/social-auth-core/default.nix
@@ -76,6 +76,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/python-social-auth/social-core";
     changelog = "https://github.com/python-social-auth/social-core/blob/${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix
index a2b0e5afb5396..ca3b91b871fda 100644
--- a/pkgs/development/python-modules/sphinx-autoapi/default.nix
+++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix
@@ -67,6 +67,6 @@ buildPythonPackage rec {
       import the project being documented.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-remove-toctrees/default.nix b/pkgs/development/python-modules/sphinx-remove-toctrees/default.nix
index 7f381ff997bd9..05ab588decbb4 100644
--- a/pkgs/development/python-modules/sphinx-remove-toctrees/default.nix
+++ b/pkgs/development/python-modules/sphinx-remove-toctrees/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     description = "Reduce your documentation build size by selectively removing toctrees from pages";
     homepage = "https://pypi.org/project/sphinx-remove-toctrees/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-reredirects/default.nix b/pkgs/development/python-modules/sphinx-reredirects/default.nix
index 8fc57ab6d1f02..35bdce0b897ed 100644
--- a/pkgs/development/python-modules/sphinx-reredirects/default.nix
+++ b/pkgs/development/python-modules/sphinx-reredirects/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
       bsd3
       mit
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index 556f21fba7806..2d160d8d1c253 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/spyder-ide/spyder-kernels/releases";
     changelog = "https://github.com/spyder-ide/spyder-kernels/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index 7f9d22f2802bc..a7717aa98fd57 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -152,7 +152,7 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/spyder-ide/spyder/releases";
     changelog = "https://github.com/spyder-ide/spyder/blob/v${version}/changelogs/Spyder-6.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix
index 77b9e2f463c2d..5da5c4d78e364 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/pkgs/development/python-modules/sure/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     "tests/test_old_api.py" # require nose
   ];
 
-  disabledTests = lib.optionals (isPyPy) [
+  disabledTests = lib.optionals isPyPy [
     # test extension of 'dict' object is broken
     "test_should_compare_dict_with_non_orderable_key_types"
     "test_should_compare_dict_with_enum_keys"
diff --git a/pkgs/development/python-modules/tappy/default.nix b/pkgs/development/python-modules/tappy/default.nix
index 16dadf91462be..40efe1ff51176 100644
--- a/pkgs/development/python-modules/tappy/default.nix
+++ b/pkgs/development/python-modules/tappy/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage {
     changelog = "https://tappy.readthedocs.io/en/latest/releases.html";
     mainProgram = "tappy";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index c27fca9ee8e87..bf2beb7e15dbe 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -495,7 +495,7 @@ let
       # workaround for https://github.com/bazelbuild/bazel/issues/15359
       "--spawn_strategy=sandboxed"
     ]
-    ++ lib.optionals (mklSupport) [ "--config=mkl" ];
+    ++ lib.optionals mklSupport [ "--config=mkl" ];
 
     bazelTargets = [
       "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"
diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix
index 2dcdb54035a37..e5cc0476117c9 100644
--- a/pkgs/development/python-modules/tensorrt/default.nix
+++ b/pkgs/development/python-modules/tensorrt/default.nix
@@ -23,7 +23,7 @@ let
       buildVersion
   );
 in
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "tensorrt";
   version = wheelVersion;
 
diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix
index 9244644395784..aedc4cc0dc532 100644
--- a/pkgs/development/python-modules/textx/default.nix
+++ b/pkgs/development/python-modules/textx/default.nix
@@ -82,7 +82,7 @@ let
       textx-types-dsl
     ];
 
-    meta = with lib; {
+    meta = {
       inherit (textx.meta) license maintainers;
       description = "Sample textX language for testing";
       homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot;
@@ -105,7 +105,7 @@ let
       click
     ];
 
-    meta = with lib; {
+    meta = {
       inherit (textx.meta) license maintainers;
       description = "Sample textX language for testing";
       homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot;
@@ -125,7 +125,7 @@ let
     build-system = [ flit-core ];
     dependencies = [ textx ];
 
-    meta = with lib; {
+    meta = {
       inherit (textx.meta) license maintainers;
       description = "Sample textX language for testing";
       homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot;
@@ -145,7 +145,7 @@ let
     build-system = [ flit-core ];
     dependencies = [ textx ];
 
-    meta = with lib; {
+    meta = {
       inherit (textx.meta) license maintainers;
       description = "Sample textX language for testing";
       homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot;
@@ -165,7 +165,7 @@ let
     build-system = [ flit-core ];
     dependencies = [ textx ];
 
-    meta = with lib; {
+    meta = {
       inherit (textx.meta) license maintainers;
       description = "Sample textX sub-command for testing";
       homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot;
diff --git a/pkgs/development/python-modules/tinyhtml5/default.nix b/pkgs/development/python-modules/tinyhtml5/default.nix
index 13e707094e5e6..520c18f098553 100644
--- a/pkgs/development/python-modules/tinyhtml5/default.nix
+++ b/pkgs/development/python-modules/tinyhtml5/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "A tiny HTML5 parser";
     homepage = "https://github.com/CourtBouillon/tinyhtml5";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/torch/source/src.nix b/pkgs/development/python-modules/torch/source/src.nix
index c4a716112b346..7e3196313358c 100644
--- a/pkgs/development/python-modules/torch/source/src.nix
+++ b/pkgs/development/python-modules/torch/source/src.nix
@@ -5,7 +5,7 @@
   runCommand,
 }:
 assert version == "2.7.0";
-(rec {
+rec {
   src_asmjit = fetchFromGitHub {
     owner = "asmjit";
     repo = "asmjit";
@@ -715,5 +715,6 @@ assert version == "2.7.0";
   src_vcpkg_recursive = src_vcpkg;
   src_VulkanMemoryAllocator_recursive = src_VulkanMemoryAllocator;
   src_XNNPACK_recursive = src_XNNPACK;
-}).src_pytorch_recursive
+}
+.src_pytorch_recursive
 # Update using: unroll-src [version]
diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix
index f1b7e3d0823f9..7c2b1808e2295 100644
--- a/pkgs/development/python-modules/traitsui/default.nix
+++ b/pkgs/development/python-modules/traitsui/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/enthought/traitsui";
     changelog = "https://github.com/enthought/traitsui/releases/tag/${version}";
     license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/trx-python/default.nix b/pkgs/development/python-modules/trx-python/default.nix
index d3cefddc8e83f..f0741b5bfd82e 100644
--- a/pkgs/development/python-modules/trx-python/default.nix
+++ b/pkgs/development/python-modules/trx-python/default.nix
@@ -60,6 +60,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/tee-ar-ex/trx-python";
     changelog = "https://github.com/tee-ar-ex/trx-python/releases/tag/${version}";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/undetected-chromedriver/default.nix b/pkgs/development/python-modules/undetected-chromedriver/default.nix
index 7a96528c4f83a..bbee7672478bc 100644
--- a/pkgs/development/python-modules/undetected-chromedriver/default.nix
+++ b/pkgs/development/python-modules/undetected-chromedriver/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage {
     description = "Python library for the custom Selenium ChromeDriver that passes all bot mitigation systems";
     homepage = "https://github.com/ultrafunkamsterdam/undetected-chromedriver";
     license = licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/unifi-ap/default.nix b/pkgs/development/python-modules/unifi-ap/default.nix
index ffca152adf94f..fa9ae0c915b9e 100644
--- a/pkgs/development/python-modules/unifi-ap/default.nix
+++ b/pkgs/development/python-modules/unifi-ap/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Python API for UniFi accesspoints";
     homepage = "https://github.com/tofuSCHNITZEL/unifi_ap";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 92092b4ff6556..62f5719c670cf 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -71,7 +71,7 @@ buildPythonPackage rec {
     "test_bad_exe_py_info_no_raise"
   ]
   ++ lib.optionals (pythonOlder "3.11") [ "test_help" ]
-  ++ lib.optionals (isPyPy) [
+  ++ lib.optionals isPyPy [
     # encoding problems
     "test_bash"
     # permission error
diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix
index af4060ef9238d..1a80e837d8922 100644
--- a/pkgs/development/python-modules/vivisect/default.nix
+++ b/pkgs/development/python-modules/vivisect/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     msgpack
     pycparser
   ]
-  ++ lib.optionals (withGui) optional-dependencies.gui;
+  ++ lib.optionals withGui optional-dependencies.gui;
 
   optional-dependencies.gui = [
     pyqt5
diff --git a/pkgs/development/python-modules/webdavclient3/default.nix b/pkgs/development/python-modules/webdavclient3/default.nix
index 2358b08a9f5e8..e826dd8153ee4 100644
--- a/pkgs/development/python-modules/webdavclient3/default.nix
+++ b/pkgs/development/python-modules/webdavclient3/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     description = "Easy to use WebDAV Client for Python 3.x";
     homepage = "https://github.com/ezhov-evgeny/webdav-client-python-3";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "wdc";
   };
 }
diff --git a/pkgs/development/python-modules/x3dh/default.nix b/pkgs/development/python-modules/x3dh/default.nix
index 7dccc3edf2bbf..b338ff0c92ef3 100644
--- a/pkgs/development/python-modules/x3dh/default.nix
+++ b/pkgs/development/python-modules/x3dh/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/Syndace/python-x3dh/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     teams = with lib.teams; [ ngi ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xeddsa/default.nix b/pkgs/development/python-modules/xeddsa/default.nix
index fba8c0793e667..5efb2ce252bcb 100644
--- a/pkgs/development/python-modules/xeddsa/default.nix
+++ b/pkgs/development/python-modules/xeddsa/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/Syndace/python-xeddsa/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     teams = with lib.teams; [ ngi ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/zope-security/default.nix b/pkgs/development/python-modules/zope-security/default.nix
index 0e7d69093da01..a102151ee2e51 100644
--- a/pkgs/development/python-modules/zope-security/default.nix
+++ b/pkgs/development/python-modules/zope-security/default.nix
@@ -77,6 +77,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/zopefoundation/zope.security";
     changelog = "https://github.com/zopefoundation/zope.security/blob/${src.tag}/CHANGES.rst";
     license = lib.licenses.zpl21;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 5111260ad07fe..b08058d3c1adb 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -517,7 +517,7 @@ let
         xorg.libXdmcp
       ];
     GeneralizedWendland = [ pkgs.gsl ];
-    ggiraph = with pkgs; [ pkgs.libpng.dev ];
+    ggiraph = [ pkgs.libpng.dev ];
     git2r = with pkgs; [
       zlib.dev
       openssl.dev
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 99e2542913730..40a390ff5168d 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -32,7 +32,7 @@ let
         install -Dm755 $src $out/bin/amm
         sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
       ''
-      + lib.optionalString (disableRemoteLogging) ''
+      + lib.optionalString disableRemoteLogging ''
         sed -i "0,/ammonite.Main/{s|ammonite.Main'|ammonite.Main' --no-remote-logging|}" $out/bin/amm
         sed -i '1i #!/bin/sh' $out/bin/amm
       '';
diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
index 18fa145d42956..f853ef7af6ef6 100644
--- a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
+++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
@@ -11,7 +11,7 @@ in
 }:
 let
   self = packages // (overrides self packages);
-  packages = with self; {
+  packages = {
     meck = builder {
       name = "meck";
       version = "0.8.13";
diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix
index c8d4633b4716d..060ef46a99132 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix
@@ -21,7 +21,7 @@
   nixosTests,
 }:
 
-buildPythonPackage ({
+buildPythonPackage {
   pname = "buildbot_worker";
   inherit (buildbot) src version;
 
@@ -57,4 +57,4 @@ buildPythonPackage ({
     teams = [ teams.buildbot ];
     license = licenses.gpl2;
   };
-})
+}
diff --git a/pkgs/development/tools/godot/3/mono/glue.nix b/pkgs/development/tools/godot/3/mono/glue.nix
index b8901d0e386ba..e4dfc2a9fdd64 100644
--- a/pkgs/development/tools/godot/3/mono/glue.nix
+++ b/pkgs/development/tools/godot/3/mono/glue.nix
@@ -26,7 +26,7 @@
 
       patches =
         base.patches
-        ++ map (rp: ./patches + rp) ([
+        ++ map (rp: ./patches + rp) [
           # When building godot mono, a "glue version" gets baked into it, and into the mono glue code
           # generated by it. Godot mono export templates are also get a glue version baked in. If you
           # export a godot mono project using an export template for which the glue version doesn't
@@ -55,7 +55,7 @@
           # For convenience, the accompanying update-glue-version.sh script automates this work. Run it by
           # passing the godot version as an argument, e.g. "3.5.2".
           "/gen_cs_glue_version.py/hardcodeGlueVersion_${self.version}.patch"
-        ]);
+        ];
 
       outputs = [ "out" ];
 
diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index 0c5771510bf1d..c8ba44274a13c 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -117,7 +117,7 @@ let
       outputs = [
         "out"
       ]
-      ++ lib.optional (editor) "man";
+      ++ lib.optional editor "man";
       separateDebugInfo = true;
 
       # Set the build name which is part of the version. In official downloads, this
@@ -340,7 +340,7 @@ let
             version = dottedVersion;
           };
         }
-        // lib.optionalAttrs (editor) (
+        // lib.optionalAttrs editor (
           let
             pkg = finalAttrs.finalPackage;
 
diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index 21984b6e8da4e..02de6f6e1ab46 100644
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -24,10 +24,10 @@ let
     #! ${stdenv.shell}
     export GHC_PACKAGE_PATH="$(${ihaskellEnv}/bin/ghc --print-global-package-db):$GHC_PACKAGE_PATH"
     export PATH="${
-      lib.makeBinPath ([
+      lib.makeBinPath [
         ihaskellEnv
         jupyter
-      ])
+      ]
     }''${PATH:+:}$PATH"
     ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook
   '';
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index d6b5ee620eb78..1b6674f1c7cea 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -145,7 +145,7 @@ else
 
     dontStrip = true;
 
-    meta = with lib; {
+    meta = {
       description = "Software system for writing extensible parsers for programming languages";
       homepage = "https://github.com/ocaml/camlp4";
       platforms = ocaml.meta.platforms or [ ];
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 8ca4580853263..95646bc2e9562 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -134,7 +134,7 @@ let
           };
         };
     in
-    lib.mapAttrs build (grammars);
+    lib.mapAttrs build grammars;
 
   # Usage:
   # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ])
diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index f0920e8b850f6..ba2bdb30fc8e1 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -75,7 +75,7 @@ mkDerivation rec {
     homepage = "https://github.com/KDE/heaptrack";
     license = licenses.lgpl21Plus;
     mainProgram = "heaptrack_gui";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/replay-io/default.nix b/pkgs/development/tools/replay-io/default.nix
index ab15c278ddcce..029b0b9e003bd 100644
--- a/pkgs/development/tools/replay-io/default.nix
+++ b/pkgs/development/tools/replay-io/default.nix
@@ -50,7 +50,7 @@ rec {
     };
   };
 
-  replay-io = stdenv.mkDerivation rec {
+  replay-io = stdenv.mkDerivation {
     pname = "replay-io";
     version = builtins.head (builtins.match ".*/linux-gecko-(.*).tar.bz2" metadata.replay.url);
     srcs = fetchurl metadata.replay;
@@ -96,7 +96,7 @@ rec {
     };
   };
 
-  replay-node = stdenv.mkDerivation rec {
+  replay-node = stdenv.mkDerivation {
     pname = "replay-node";
     version = builtins.head (builtins.match ".*/linux-node-(.*)" metadata.replay-node.url);
     nativeBuildInputs = [
diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix
index 674281f438855..5b65360fcafdf 100644
--- a/pkgs/development/tools/wails/default.nix
+++ b/pkgs/development/tools/wails/default.nix
@@ -87,7 +87,7 @@ buildGoModule rec {
     description = "Build applications using Go + HTML + CSS + JS";
     homepage = "https://wails.io";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "wails";
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/development/web/nodejs/gyp-patches.nix b/pkgs/development/web/nodejs/gyp-patches.nix
index 9b8f98f0630fb..158115873e99f 100644
--- a/pkgs/development/web/nodejs/gyp-patches.nix
+++ b/pkgs/development/web/nodejs/gyp-patches.nix
@@ -7,7 +7,7 @@
 let
   url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch?full_index=1";
 in
-lib.optionals patch_tools ([
+lib.optionals patch_tools [
   # Fixes builds with Nix sandbox on Darwin for gyp.
   # See https://github.com/NixOS/nixpkgs/issues/261820
   # and https://github.com/nodejs/gyp-next/pull/216
@@ -17,12 +17,12 @@ lib.optionals patch_tools ([
     stripLen = 1;
     extraPrefix = "tools/gyp/";
   })
-])
-++ lib.optionals patch_npm ([
+]
+++ lib.optionals patch_npm [
   (fetchpatch2 {
     inherit url;
     hash = "sha256-1iyeeAprmWpmLafvOOXW45iZ4jWFSloWJxQ0reAKBOo=";
     stripLen = 1;
     extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
   })
-])
+]
diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix
index cd9dfe4916f08..c42be9aed44c3 100644
--- a/pkgs/games/armagetronad/default.nix
+++ b/pkgs/games/armagetronad/default.nix
@@ -226,7 +226,7 @@ let
       '';
 
       passthru =
-        if (dedicatedServer) then
+        if dedicatedServer then
           {
             # No passthru, end of the line.
             # https://www.youtube.com/watch?v=NOMa56y_Was
diff --git a/pkgs/games/cutechess/default.nix b/pkgs/games/cutechess/default.nix
index 05a75351e9e29..381af76326a0e 100644
--- a/pkgs/games/cutechess/default.nix
+++ b/pkgs/games/cutechess/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "GUI, CLI, and library for playing chess";
     homepage = "https://cutechess.com/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; (linux ++ windows);
     mainProgram = "cutechess";
   };
diff --git a/pkgs/games/flightgear/openscenegraph-flightgear.nix b/pkgs/games/flightgear/openscenegraph-flightgear.nix
index a1440f4dd253e..a78f6b8873590 100644
--- a/pkgs/games/flightgear/openscenegraph-flightgear.nix
+++ b/pkgs/games/flightgear/openscenegraph-flightgear.nix
@@ -25,7 +25,7 @@
   libXrandr,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "openscenegraph";
   version = "2024-build";
 
diff --git a/pkgs/games/npush/default.nix b/pkgs/games/npush/default.nix
index f6fd0d5efe86a..137f8d0411655 100644
--- a/pkgs/games/npush/default.nix
+++ b/pkgs/games/npush/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     description = "Sokoban-like game";
     mainProgram = "npush";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/pkgs/games/quake2/yquake2/wrapper.nix
index 6c2437d3286e0..d174dcae1e7bf 100644
--- a/pkgs/games/quake2/yquake2/wrapper.nix
+++ b/pkgs/games/quake2/yquake2/wrapper.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
 
   desktopItems = map (
     game:
-    makeDesktopItem ({
+    makeDesktopItem {
       name = game.id;
       exec = game.title;
       icon = "yamagi-quake2";
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
         "Game"
         "Shooter"
       ];
-    })
+    }
   ) games;
 
   meta = {
diff --git a/pkgs/misc/cups/drivers/brother/dcp375cw/default.nix b/pkgs/misc/cups/drivers/brother/dcp375cw/default.nix
index 57cfd2ef45fad..05e1c20a722ab 100644
--- a/pkgs/misc/cups/drivers/brother/dcp375cw/default.nix
+++ b/pkgs/misc/cups/drivers/brother/dcp375cw/default.nix
@@ -19,7 +19,7 @@ let
   version = "1.1.3";
   model = "dcp375cw";
 in
-rec {
+{
   driver = stdenv.mkDerivation {
     pname = "${model}-lpr";
     inherit version;
diff --git a/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix b/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix
index 1a1e5988f007f..7cf4e1017314f 100644
--- a/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix
+++ b/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix
@@ -19,7 +19,7 @@ let
   version = "1.1.2";
   model = "dcp9020cdw";
 in
-rec {
+{
   driver = stdenv.mkDerivation {
     pname = "${model}-lpr";
     inherit version;
diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix
index fb9ddb8589f37..dd17c353d1152 100644
--- a/pkgs/misc/documentation-highlighter/default.nix
+++ b/pkgs/misc/documentation-highlighter/default.nix
@@ -12,13 +12,13 @@ runCommand "documentation-highlighter"
       src = ./.;
       filter =
         path: type:
-        lib.elem (baseNameOf path) ([
+        lib.elem (baseNameOf path) [
           "highlight.pack.js"
           "LICENSE"
           "loader.js"
           "mono-blue.css"
           "README.md"
-        ]);
+        ];
     };
   }
   ''
diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index d509cb443db61..660349b1ac00c 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -13,7 +13,7 @@ let
   beat =
     package: extraArgs:
     buildGoModule (
-      lib.attrsets.recursiveUpdate (rec {
+      lib.attrsets.recursiveUpdate rec {
         pname = package;
         version = elk7Version;
 
@@ -38,7 +38,7 @@ let
           ];
           platforms = platforms.linux;
         };
-      }) extraArgs
+      } extraArgs
     );
 in
 rec {
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 8cc8f8200cd5b..32bc52e345fe0 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -378,7 +378,7 @@ in
     };
   };
 
-  kanagawa = mkTmuxPlugin rec {
+  kanagawa = mkTmuxPlugin {
     pluginName = "kanagawa";
     version = "0-unstable-2025-02-10";
     src = fetchFromGitHub {
@@ -408,7 +408,7 @@ in
     };
   };
 
-  mode-indicator = mkTmuxPlugin rec {
+  mode-indicator = mkTmuxPlugin {
     pluginName = "mode-indicator";
     version = "unstable-2021-10-01";
     src = fetchFromGitHub {
@@ -536,7 +536,7 @@ in
       wrapProgram $target/scripts/main.sh \
         --prefix PATH : ${
           with pkgs;
-          lib.makeBinPath ([
+          lib.makeBinPath [
             findutils
             fzf
             gnugrep
@@ -544,7 +544,7 @@ in
             ncurses
             pkgs.pass
             tmux
-          ])
+          ]
         }
     '';
 
@@ -700,13 +700,13 @@ in
       wrapProgram $target/bin/t \
         --prefix PATH : ${
           with pkgs;
-          lib.makeBinPath ([
+          lib.makeBinPath [
             fzf
             zoxide
             coreutils
             gnugrep
             gnused
-          ])
+          ]
         }
     '';
   };
@@ -947,11 +947,11 @@ in
     postInstall = ''
       wrapProgram $out/share/tmux-plugins/t-smart-tmux-session-manager/bin/t \
           --prefix PATH : ${
-            with pkgs;
-            lib.makeBinPath ([
+
+            lib.makeBinPath [
               pkgs.fzf
               pkgs.zoxide
-            ])
+            ]
           }
 
       find $target -type f -print0 | xargs -0 sed -i -e 's|fzf |${pkgs.fzf}/bin/fzf |g'
diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix
index 91fbd2aa0b688..a8088b063bde7 100644
--- a/pkgs/os-specific/bsd/freebsd/default.nix
+++ b/pkgs/os-specific/bsd/freebsd/default.nix
@@ -42,10 +42,10 @@ makeScopeWithSplicing' {
     {
       inherit branch;
     }
-    // callPackage ./package-set.nix ({
+    // callPackage ./package-set.nix {
       sourceData = versions.${self.branch} or (throw (badBranchError self.branch));
       versionData = self.sourceData.version;
       buildFreebsd = otherSplices.selfBuildHost;
       patchesRoot = ./patches + "/${self.versionData.revision}";
-    }) self;
+    } self;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/lib/default.nix b/pkgs/os-specific/bsd/freebsd/lib/default.nix
index d8d975ef71ad7..be2b7b6957f29 100644
--- a/pkgs/os-specific/bsd/freebsd/lib/default.nix
+++ b/pkgs/os-specific/bsd/freebsd/lib/default.nix
@@ -110,9 +110,9 @@
               prefixedPath = builtins.elemAt (builtins.split " |\t" (builtins.elemAt patchLines 1)) 2;
               unfixedPath = lib.path.subpath.join (lib.lists.drop 1 (lib.path.subpath.components prefixedPath));
             in
-            lib.lists.any (included: lib.path.hasPrefix (/. + ("/" + included)) (/. + ("/" + unfixedPath))) (
-              paths
-            );
+            lib.lists.any (
+              included: lib.path.hasPrefix (/. + ("/" + included)) (/. + ("/" + unfixedPath))
+            ) paths;
           filteredLines = builtins.filter filterFunc partitionedPatches;
           derive = patchLines: writeText "freebsd-patch" (lib.concatLines patchLines);
           derivedPatches = builtins.map derive filteredLines;
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix b/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix
index 5703f669d74e8..9de0f0d01c6f4 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix
@@ -9,7 +9,7 @@
   makeMinimal,
   install,
 }:
-mkDerivation ({
+mkDerivation {
   path = "usr.bin/localedef";
 
   extraPaths = [
@@ -34,4 +34,4 @@ mkDerivation ({
   '';
 
   MK_TESTS = "no";
-})
+}
diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix
index d7617f64cfc6c..0e80cfad86058 100644
--- a/pkgs/os-specific/linux/device-tree/raspberrypi.nix
+++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix
@@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation {
     # Compatible overlays that may be used
     overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays";
   };
-  meta = with lib; {
+  meta = {
     inherit (raspberrypifw.meta) homepage license;
     description = "DTBs for the Raspberry Pi";
   };
diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix
index f3a00333a7514..839f524fd5265 100644
--- a/pkgs/os-specific/linux/digimend/default.nix
+++ b/pkgs/os-specific/linux/digimend/default.nix
@@ -6,7 +6,7 @@
   kernelModuleMakeFlags,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "digimend";
   version = "13-unstable-2025-01-02";
 
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 316aa20f2aad6..a61df406481a3 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1296,8 +1296,8 @@ let
         HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support
 
         # Enable AMD's ROCm GPU compute stack
-        HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit (yes);
-        ZONE_DEVICE = lib.mkIf stdenv.hostPlatform.is64bit (yes);
+        HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit yes;
+        ZONE_DEVICE = lib.mkIf stdenv.hostPlatform.is64bit yes;
         HMM_MIRROR = yes;
         DRM_AMDGPU_USERPTR = yes;
 
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 9c184ddd60413..be56215d032a2 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -106,7 +106,7 @@ let
             HZ_1000 = yes;
 
           }
-          // lib.optionalAttrs (isLqx) {
+          // lib.optionalAttrs isLqx {
             # https://github.com/damentz/liquorix-package/commit/07b176edc002f2a7825ae181613e1f79a3650fd2
             CMDLINE_BOOL = yes;
             CMDLINE = freeform "audit=0 intel_pstate=disable amd_pstate=disable ";
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix
index a5ef9673c399c..84d35be7784bf 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix
@@ -43,7 +43,7 @@ bash.runCommand "${pname}-${version}"
         mkdir ''${out}
       '';
   }
-  (''
+  ''
     # Unpack
     tar xzf ${src}
     cd sed-${version}
@@ -64,4 +64,4 @@ bash.runCommand "${pname}-${version}"
 
     # Install
     make install
-  '')
+  ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnused/mes.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnused/mes.nix
index f11881fa290a6..51b53427023f9 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gnused/mes.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gnused/mes.nix
@@ -42,7 +42,7 @@ bash.runCommand "${pname}-${version}"
         mkdir ''${out}
       '';
   }
-  (''
+  ''
     # Unpack
     ungz --file ${src} --output sed.tar
     untar --file sed.tar
@@ -60,4 +60,4 @@ bash.runCommand "${pname}-${version}"
 
     # Install
     make install PREFIX=$out
-  '')
+  ''
diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix
index 7020dd608442a..7978e5bb5830a 100644
--- a/pkgs/os-specific/linux/mxu11x0/default.nix
+++ b/pkgs/os-specific/linux/mxu11x0/default.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  srcs = import (./srcs.nix) { inherit fetchurl; };
+  srcs = import ./srcs.nix { inherit fetchurl; };
 in
 stdenv.mkDerivation rec {
   pname = "mxu11x0";
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index d7f938625626b..2286c344ea91c 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -646,7 +646,7 @@ rec {
               description = "Elixir value";
             };
         in
-        attrsOf (attrsOf (valueType));
+        attrsOf (attrsOf valueType);
 
       lib =
         let
diff --git a/pkgs/pkgs-lib/formats/java-properties/default.nix b/pkgs/pkgs-lib/formats/java-properties/default.nix
index 18b80629ae6e7..c97e9b275d191 100644
--- a/pkgs/pkgs-lib/formats/java-properties/default.nix
+++ b/pkgs/pkgs-lib/formats/java-properties/default.nix
@@ -46,7 +46,7 @@ in
       type =
         let
           elemType =
-            oneOf ([
+            oneOf [
               # `package` isn't generalized to `path` because path values
               # are ambiguous. Are they host path strings (toString /foo/bar)
               # or should they be added to the store? ("${/foo/bar}")
@@ -56,7 +56,7 @@ in
               (coercedTo bool boolToString str)
               (coercedTo int toString str)
               (coercedTo float toString str)
-            ])
+            ]
             // {
               description = "string, package, bool, int or float";
             };
diff --git a/pkgs/servers/deconz/default.nix b/pkgs/servers/deconz/default.nix
index f2ad6d918cb90..6482c367d8ef6 100644
--- a/pkgs/servers/deconz/default.nix
+++ b/pkgs/servers/deconz/default.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     description = "Manage Zigbee network with ConBee, ConBee II or RaspBee hardware";
     homepage = "https://www.dresden-elektronik.com/wireless/software/deconz.html";
     license = licenses.unfree;
-    platforms = with platforms; [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     maintainers = with maintainers; [ bjornfor ];
     mainProgram = "deCONZ";
diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix
index a27fd3c750de4..095bef795514f 100644
--- a/pkgs/servers/etcd/3.5/default.nix
+++ b/pkgs/servers/etcd/3.5/default.nix
@@ -58,7 +58,7 @@ let
     ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ];
   };
 
-  etcdutl = buildGo123Module rec {
+  etcdutl = buildGo123Module {
     pname = "etcdutl";
 
     inherit
@@ -73,7 +73,7 @@ let
     modRoot = "./etcdutl";
   };
 
-  etcdctl = buildGo123Module rec {
+  etcdctl = buildGo123Module {
     pname = "etcdctl";
 
     inherit
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 37069221a449d..a59e65fff33f6 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -97,7 +97,7 @@ let
         };
       });
 
-      av = super.av.overridePythonAttrs (rec {
+      av = super.av.overridePythonAttrs rec {
         version = "13.1.0";
         src = fetchFromGitHub {
           owner = "PyAV-Org";
@@ -105,9 +105,9 @@ let
           tag = "v${version}";
           hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60=";
         };
-      });
+      };
 
-      brother = super.brother.overridePythonAttrs (rec {
+      brother = super.brother.overridePythonAttrs rec {
         version = "4.3.1";
         src = fetchFromGitHub {
           owner = "bieniu";
@@ -115,7 +115,7 @@ let
           tag = version;
           hash = "sha256-fWa5FNBGV8tnJ3CozMicXLGsDvnTjNzU8PdV266MeeQ=";
         };
-      });
+      };
 
       eq3btsmart = super.eq3btsmart.overridePythonAttrs (oldAttrs: rec {
         version = "1.4.1";
@@ -337,7 +337,7 @@ let
         };
       });
 
-      wolf-comm = super.wolf-comm.overridePythonAttrs (rec {
+      wolf-comm = super.wolf-comm.overridePythonAttrs rec {
         version = "0.0.23";
         src = fetchFromGitHub {
           owner = "janrothkegel";
@@ -345,7 +345,7 @@ let
           tag = version;
           hash = "sha256-LpehooW3vmohiyMwOQTFNLiNCsaLKelWQxQk8bl+y1k=";
         };
-      });
+      };
 
       # internal python packages only consumed by home-assistant itself
       hass-web-proxy-lib = self.callPackage ./python-modules/hass-web-proxy-lib { };
diff --git a/pkgs/servers/pulseaudio/hsphfpd.nix b/pkgs/servers/pulseaudio/hsphfpd.nix
index 042d711a091ac..53893cf4b58a4 100644
--- a/pkgs/servers/pulseaudio/hsphfpd.nix
+++ b/pkgs/servers/pulseaudio/hsphfpd.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
     description = "Bluetooth HSP/HFP daemon";
     homepage = "https://github.com/pali/hsphfpd-prototype";
     license = licenses.artistic1;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix
index c337761ec4d18..1b24600fe4e12 100644
--- a/pkgs/servers/pulseaudio/qpaeq.nix
+++ b/pkgs/servers/pulseaudio/qpaeq.nix
@@ -26,14 +26,14 @@ mkDerivation {
   inherit (pulseaudio) version src;
 
   buildInputs = [
-    (
-      (python3.withPackages (
-        ps: with ps; [
-          pyqt5
-          dbus-python
-        ]
-      ))
-    )
+
+    (python3.withPackages (
+      ps: with ps; [
+        pyqt5
+        dbus-python
+      ]
+    ))
+
   ];
 
   dontBuild = true;
diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix
index b434178fb28aa..d4f8bd7dd5ac4 100644
--- a/pkgs/servers/rainloop/default.nix
+++ b/pkgs/servers/rainloop/default.nix
@@ -10,7 +10,7 @@
 let
   common =
     { edition, sha256 }:
-    stdenv.mkDerivation (rec {
+    stdenv.mkDerivation rec {
       pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}";
       version = "1.16.0";
 
@@ -73,7 +73,7 @@ let
         platforms = platforms.all;
         maintainers = with maintainers; [ das_j ];
       };
-    });
+    };
 in
 {
   rainloop-community = common {
diff --git a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
index e155b32960fde..9dd44afc00c2d 100644
--- a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
@@ -53,7 +53,7 @@ buildPgrxExtension' (finalAttrs: {
     ./0002-add-feature-flags.diff
   ];
 
-  buildInputs = lib.optionals (useSystemJemalloc) [
+  buildInputs = lib.optionals useSystemJemalloc [
     rust-jemalloc-sys'
   ];
 
diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix
index 21a307b0b4bab..6a0603ec6f372 100644
--- a/pkgs/servers/varnish/digest.nix
+++ b/pkgs/servers/varnish/digest.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Digest and HMAC vmod";
     homepage = "https://github.com/varnish/libvmod-digest";
     inherit (varnish.meta) license platforms teams;
diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix
index c98d9f0fb0b2a..08a1ad6024e78 100644
--- a/pkgs/servers/varnish/dynamic.nix
+++ b/pkgs/servers/varnish/dynamic.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
   '';
   configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
 
-  meta = with lib; {
+  meta = {
     description = "Dynamic director similar to the DNS director from Varnish 3";
     homepage = "https://github.com/nigoroll/libvmod-dynamic";
     inherit (varnish.meta) license platforms teams;
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index 3bc8b6850a4d4..6d6f1cb81e566 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -43,7 +43,7 @@ let
 
       postInstall = "find $out -type f -exec remove-references-to -t ${varnish.dev} '{}' +"; # varnish.dev captured only as __FILE__ in assert messages
 
-      meta = with lib; {
+      meta = {
         description = "Collection of Varnish Cache modules (vmods) by Varnish Software";
         homepage = "https://github.com/varnish/varnish-modules";
         inherit (varnish.meta) license platforms teams;
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 40d945304d67a..a8387b70b83dd 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -52,7 +52,7 @@ let
   showWarnings = config.showDerivationWarnings;
 
   getNameWithVersion =
-    attrs: attrs.name or ("${attrs.pname or "«name-missing»"}-${attrs.version or "«version-missing»"}");
+    attrs: attrs.name or "${attrs.pname or "«name-missing»"}-${attrs.version or "«version-missing»"}";
 
   allowUnfree = config.allowUnfree || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
 
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index cf46f4dbfd787..4b559065a28d5 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -555,14 +555,14 @@ let
 
             inherit outputs;
           }
-          // optionalAttrs (__contentAddressed) {
+          // optionalAttrs __contentAddressed {
             inherit __contentAddressed;
             # Provide default values for outputHashMode and outputHashAlgo because
             # most people won't care about these anyways
             outputHashAlgo = attrs.outputHashAlgo or "sha256";
             outputHashMode = attrs.outputHashMode or "recursive";
           }
-          // optionalAttrs (enableParallelBuilding) {
+          // optionalAttrs enableParallelBuilding {
             inherit enableParallelBuilding;
             enableParallelChecking = attrs.enableParallelChecking or true;
             enableParallelInstalling = attrs.enableParallelInstalling or true;
diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix
index eb76745d038e1..a6f52963cd8a4 100644
--- a/pkgs/test/vim/default.nix
+++ b/pkgs/test/vim/default.nix
@@ -10,7 +10,7 @@ let
   packages.myVimPackage.start = with vimPlugins; [ vim-nix ];
 
 in
-pkgs.recurseIntoAttrs (rec {
+pkgs.recurseIntoAttrs {
   vim_empty_config = vimUtils.vimrcFile {
     beforePlugins = "";
     customRC = "";
@@ -28,4 +28,4 @@ pkgs.recurseIntoAttrs (rec {
     name = "vim-with-vim-addon-nix";
     vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ];
   };
-})
+}
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index f6803df66e24b..c5e7a015bd3dd 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -50,7 +50,7 @@ let
       crcmod
       numpy
     ]
-    ++ lib.optional (with-gce) google-compute-engine
+    ++ lib.optional with-gce google-compute-engine
   );
 
   data = import ./data.nix { };
diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix
index 9f77802b66ce7..2acbe776dea81 100644
--- a/pkgs/tools/filesystems/irods/common.nix
+++ b/pkgs/tools/filesystems/irods/common.nix
@@ -94,7 +94,7 @@
     patchShebangs ./packaging ./scripts
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Integrated Rule-Oriented Data System (iRODS)";
     longDescription = ''
       The Integrated Rule-Oriented Data System (iRODS) is open source data management
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
index 4ae81bfb001df..31adc1d7062de 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Vietnamese input method engine support for Fcitx";
     homepage = "https://github.com/fcitx/fcitx5-bamboo";
     license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 31e55c6e449c9..26b2af5c9ff54 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/fujiwarat/ibus-anthy";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-cangjie/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-cangjie/default.nix
index 571f9f8b901db..c4c9196784a71 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-cangjie/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-cangjie/default.nix
@@ -72,6 +72,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/Cangjians/ibus-cangjie";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index ec11ae65c8c70..8548c13dbff4e 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     mainProgram = "ibus-setup-hangul";
     homepage = "https://github.com/libhangul/ibus-hangul";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index 046a7bb6de233..8c8237c650bed 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/ibus/ibus-m17n";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/dialogbox/default.nix b/pkgs/tools/misc/dialogbox/default.nix
index a440b4d9c858d..a6f6f7d94d577 100644
--- a/pkgs/tools/misc/dialogbox/default.nix
+++ b/pkgs/tools/misc/dialogbox/default.nix
@@ -42,7 +42,7 @@ mkDerivation rec {
     homepage = "https://github.com/martynets/dialogbox/";
     description = "Qt-based scriptable engine providing GUI dialog boxes";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "dialogbox";
   };
diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix
index a6469d830b765..1c9fabfa05714 100644
--- a/pkgs/tools/misc/logstash/contrib.nix
+++ b/pkgs/tools/misc/logstash/contrib.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Community-maintained logstash plugins";
     homepage = "https://github.com/elasticsearch/logstash-contrib";
     license = lib.licenses.asl20;
diff --git a/pkgs/tools/misc/seaborn-data/default.nix b/pkgs/tools/misc/seaborn-data/default.nix
index 555c9991b63be..65a81c299c80a 100644
--- a/pkgs/tools/misc/seaborn-data/default.nix
+++ b/pkgs/tools/misc/seaborn-data/default.nix
@@ -44,8 +44,8 @@ let
     );
 in
 lib.makeScope newScope (self: {
-  exercise = makeSeabornDataPackage ({
+  exercise = makeSeabornDataPackage {
     pname = "exercise";
     hash = "sha256-icoc2HkG303A8hCoW6kZxD5qhOKIpdxErLr288o04wE=";
-  });
+  };
 })
diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix
index c2a38d10bb78f..c3857f8afd2e7 100644
--- a/pkgs/tools/package-management/apk-tools/default.nix
+++ b/pkgs/tools/package-management/apk-tools/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://gitlab.alpinelinux.org/alpine/apk-tools";
     description = "Alpine Package Keeper";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Only;
     platforms = platforms.linux;
     mainProgram = "apk";
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 8c13b48c150fd..61eac8dae09dc 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -283,7 +283,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Real-time performance monitoring tool";
     homepage = "https://www.netdata.cloud/";
     changelog = "https://github.com/netdata/netdata/releases/tag/v${version}";
-    license = [ licenses.gpl3Plus ] ++ lib.optionals (withCloudUi) [ licenses.ncul1 ];
+    license = [ licenses.gpl3Plus ] ++ lib.optionals withCloudUi [ licenses.ncul1 ];
     mainProgram = "netdata";
     platforms = platforms.unix;
     maintainers = with maintainers; [
diff --git a/pkgs/tools/system/uefitool/variants.nix b/pkgs/tools/system/uefitool/variants.nix
index 851338497472c..843d4d41339b7 100644
--- a/pkgs/tools/system/uefitool/variants.nix
+++ b/pkgs/tools/system/uefitool/variants.nix
@@ -2,7 +2,7 @@
 let
   common = opts: libsForQt5.callPackage (import ./common.nix opts) { };
 in
-rec {
+{
   new-engine = common {
     version = "A62";
     sha256 = "sha256-U89j0BV57luv1c9hoYJtisKLxFezuaGFokZ29/NJ0xg=";
@@ -12,7 +12,7 @@ rec {
       "build/UEFIExtract/UEFIExtract"
     ];
   };
-  old-engine = common rec {
+  old-engine = common {
     version = "0.28.0";
     sha256 = "1n2hd2dysi5bv2iyq40phh1jxc48gdwzs414vfbxvcharcwapnja";
     installFiles = [
diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
index e506100ecbb35..d179ef835a92b 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
@@ -46,7 +46,7 @@ lib.fix (
     buildEnv' =
       args:
       (
-        buildEnv ({ inherit (args) name paths; })
+        buildEnv { inherit (args) name paths; }
         // lib.optionalAttrs (args ? extraOutputsToInstall) { inherit (args) extraOutputsToInstall; }
       ).overrideAttrs
         (
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index db3f4b7521909..cb4f3d23cc7ed 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -59,9 +59,9 @@ let
       Cheerios = callPackage ../development/coq-modules/Cheerios { };
       coinduction = callPackage ../development/coq-modules/coinduction { };
       CoLoR = callPackage ../development/coq-modules/CoLoR (
-        (lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") {
+        lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") {
           bignums = self.bignums.override { version = "8.13.0"; };
-        })
+        }
       );
       compcert = callPackage ../development/coq-modules/compcert {
         inherit
@@ -83,9 +83,9 @@ let
       coq-record-update = callPackage ../development/coq-modules/coq-record-update { };
       coq-tactical = callPackage ../development/coq-modules/coq-tactical { };
       coqeal = callPackage ../development/coq-modules/coqeal (
-        (lib.optionalAttrs (lib.versions.range "8.13" "8.14" self.coq.coq-version) {
+        lib.optionalAttrs (lib.versions.range "8.13" "8.14" self.coq.coq-version) {
           bignums = self.bignums.override { version = "${self.coq.coq-version}.0"; };
-        })
+        }
       );
       coqhammer = callPackage ../development/coq-modules/coqhammer { };
       coqide = callPackage ../development/coq-modules/coqide { };
diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix
index d2cc6f94a960c..bedd30a20aff8 100644
--- a/pkgs/top-level/darwin-aliases.nix
+++ b/pkgs/top-level/darwin-aliases.nix
@@ -20,8 +20,6 @@ lib: self: super: pkgs:
 
 # pkgs is provided to allow packages to be moved out of the darwin attrset.
 
-with self;
-
 let
   # Removing recurseForDerivation prevents derivations of aliased attribute set
   # to appear while listing all the packages available.
@@ -96,7 +94,7 @@ let
 in
 
 stubs
-// mapAliases ({
+// mapAliases {
   ### A ###
 
   apple_sdk_10_12 = throw "darwin.apple_sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27
@@ -162,4 +160,4 @@ stubs
       ); # added 2025-04-20
   stubs = throw "'darwin.stubs.*' have been removed as they were unused"; # added 2025-04-20
   swift-corelibs-foundation = throw "'darwin.swift-corelibs-foundation' has been removed, as it was broken and is no longer used"; # added 2025-04-20
-})
+}
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 477e512153390..c9f0b72cd552c 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -118,7 +118,7 @@ rec {
       linux-pam,
       openpam,
     }:
-    buildLuaPackage rec {
+    buildLuaPackage {
       pname = "lua-pam";
       version = "unstable-2015-07-03";
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b7b6425c69cf5..cfc52eeb00f3b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8204,7 +8204,7 @@ with self;
         artistic1
         gpl1Plus
       ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
       mainProgram = "hexdump";
     };
   };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index bc93e38493d3c..619324c61fdf2 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -31,7 +31,7 @@ in
 
 ### Deprecated aliases - for backward compatibility
 
-mapAliases ({
+mapAliases {
   # Prevent incorrect Python packaging attempts.
   # Note: `{ python3, python3Packages, ... }: with python3Packages; [ ... python3 ]` still works, since `with` has lower priority.
   pythonPackages = throw "do not use pythonPackages when building Python packages, specify each used package as a separate argument"; # do not remove
@@ -847,4 +847,4 @@ mapAliases ({
   zope_testing = zope-testing; # added 2023-11-12
   zope_testrunner = zope-testrunner; # added 2024-01-06
   zxing_cpp = zxing-cpp; # added 2023-11-05
-})
+}
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 04cc8e6edd8fe..5f9467a475b09 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -46,7 +46,7 @@ in
   };
 
 }
-// (mapTestOn ({
+// (mapTestOn {
 
   aspell = all;
   at = linux;
@@ -176,4 +176,4 @@ in
   xkeyboard_config = linux;
   zip = all;
   tests-stdenv-gcc-stageCompare = linux;
-}))
+})
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 61919c78e33b0..ab21798e499a7 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -309,7 +309,7 @@ let
 
     # Fully static packages.
     # Currently uses Musl on Linux (couldn’t get static glibc to work).
-    pkgsStatic = nixpkgsFun ({
+    pkgsStatic = nixpkgsFun {
       overlays = [
         (self': super': {
           pkgsStatic = super';
@@ -328,7 +328,7 @@ let
           lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { abi = "elfv2"; }
           // stdenv.hostPlatform.gcc or { };
       };
-    });
+    };
   };
 
   # The complete chain of package set builders, applied from top to bottom.
diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix
index 6c191fbcebf00..b28a54808da1c 100644
--- a/pkgs/top-level/variants.nix
+++ b/pkgs/top-level/variants.nix
@@ -114,12 +114,12 @@ self: super: {
 
   # Full package set with rocm on cuda off
   # Mostly useful for asserting pkgs.pkgsRocm.torchWithRocm == pkgs.torchWithRocm and similar
-  pkgsRocm = nixpkgsFun ({
+  pkgsRocm = nixpkgsFun {
     config = super.config // {
       cudaSupport = false;
       rocmSupport = true;
     };
-  });
+  };
 
   # Full package set with cuda on rocm off
   # Mostly useful for asserting pkgs.pkgsCuda.torchWithCuda == pkgs.torchWithCuda and similar