treewide: remove unused with

Auto-fixed by nixf-diagnose.
This commit is contained in:
Wolfgang Walther
2025-09-01 13:00:13 +02:00
parent 90e7159c55
commit c283f32d29
1135 changed files with 1168 additions and 1186 deletions

View File

@@ -97,7 +97,6 @@ let
# https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py
# TODO: Remove the following and fix things.
"--ignore=parse-redundant-paren"
"--ignore=sema-extra-with"
"--ignore=sema-unused-def-lambda-noarg-formal"
"--ignore=sema-unused-def-lambda-witharg-arg"
"--ignore=sema-unused-def-lambda-witharg-formal"
@@ -106,6 +105,10 @@ let
"--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"
];

View File

@@ -8,7 +8,7 @@
}:
{
options = with lib; {
options = {
environment.enableAllTerminfo = lib.mkOption {
default = false;
type = lib.types.bool;

View File

@@ -114,7 +114,7 @@ in
};
meta = {
maintainers = with lib.maintainers; [ ];
maintainers = [ ];
doc = ./default.md;
};

View File

@@ -3,8 +3,6 @@
{ lib, ... }:
with lib;
{
imports = [
./netboot.nix

View File

@@ -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;

View File

@@ -9,7 +9,7 @@ let
cfg = config.programs.fuse;
in
{
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
options.programs.fuse = {
enable = lib.mkEnableOption "fuse" // {

View File

@@ -78,5 +78,5 @@ in
environment.systemPackages = lib.mkIf (!cfg.capSysNice) [ gamescope ];
};
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
}

View File

@@ -9,7 +9,7 @@ let
cfg = config.programs.labwc;
in
{
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
options.programs.labwc = {
enable = lib.mkEnableOption "labwc";

View File

@@ -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)));

View File

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

View File

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

View File

@@ -203,7 +203,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} -

View File

@@ -207,14 +207,13 @@ let
nativeBuildInputs = [ pkgs.makeWrapper ];
}
(
with lib;
''
makeWrapper "${original}" "$out/bin/${name}" \
${lib.concatStringsSep " \\\n " (
lib.mapAttrsToList (name: value: ''--set ${name} "${value}"'') set
)}
''
);
'');
# Returns a singleton list, due to usage of lib.optional
mkBorgWrapper =

View File

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

View File

@@ -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 ]";

View File

@@ -17,7 +17,7 @@ let
in
{
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
imports = [
(lib.mkRemovedOptionModule [ "services" "chromadb" "logFile" ] ''

View File

@@ -181,7 +181,7 @@ in
services.gnome.evolution-data-server = {
enable = true;
plugins = with pkgs; [
plugins = [
# TODO: lomiri.address-book-service
];
};

View File

@@ -6,8 +6,8 @@
...
}:
{
meta = with lib; {
maintainers = with lib.maintainers; [ ];
meta = {
maintainers = [ ];
};
###### interface

View File

@@ -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

View File

@@ -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 = {

View File

@@ -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 = ''

View File

@@ -676,7 +676,7 @@ in
];
})
];
environment.systemPackages = with pkgs; [ cfg.package ];
environment.systemPackages = [ cfg.package ];
};
meta.maintainers = with lib.maintainers; [
julm

View File

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

View File

@@ -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;

View File

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

View File

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

View File

@@ -130,5 +130,5 @@ in
time.timeZone = lib.mkDefault "UTC";
};
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
}

View File

@@ -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 =

View File

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

View File

@@ -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;
}
(

View File

@@ -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" ];

View File

@@ -21,7 +21,7 @@ let
let
# reports boolean as yes / no
mkValueString =
with lib;
v:
if lib.isInt v then
toString v

View File

@@ -10,7 +10,7 @@ let
settingsFormat = pkgs.formats.toml { };
in
{
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
options.services.hockeypuck = {
enable = lib.mkEnableOption "Hockeypuck OpenPGP Key Server";

View File

@@ -23,7 +23,7 @@ let
in
{
meta = {
maintainers = with lib.maintainers; [ ];
maintainers = [ ];
};
options.services.earlyoom = {

View File

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

View File

@@ -152,7 +152,7 @@ in
};
meta = {
maintainers = with lib.maintainers; [ ];
maintainers = [ ];
doc = ./honk.md;
};
}

View File

@@ -7,8 +7,6 @@
{ lib, pkgs, ... }:
with lib;
{
config = {

View File

@@ -5,8 +5,6 @@
...
}:
with lib;
{
# This unit saves the value of the system clock to the hardware

View File

@@ -1,7 +1,5 @@
{ lib, pkgs, ... }:
with lib;
{
imports = [
../profiles/qemu-guest.nix

View File

@@ -48,7 +48,7 @@ in
name = "vswitch.db";
dontUnpack = true;
buildPhase = "true";
buildInputs = with pkgs; [
buildInputs = [
cfg.package
];
installPhase = "mkdir -p $out";

View File

@@ -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 ]";
};

View File

@@ -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" ]

View File

@@ -2,7 +2,7 @@
{
name = "anuko-time-tracker";
meta = {
maintainers = with pkgs.lib.maintainers; [ ];
maintainers = [ ];
};
nodes = {
machine = {

View File

@@ -133,7 +133,7 @@ in
{
name = "curl-impersonate";
meta = with lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -2,7 +2,7 @@
{ lib, pkgs, ... }:
{
name = "docker-rootless";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -4,7 +4,7 @@ let
in
{
name = "docling-serve";
meta = with lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -1,7 +1,7 @@
{ pkgs, lib, ... }:
{
name = "documize";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -2,7 +2,7 @@
{
name = "etesync-dav";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -1,7 +1,7 @@
{ lib, ... }:
{
name = "flaresolverr";
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
nodes.machine =
{ pkgs, ... }:

View File

@@ -32,7 +32,7 @@ in
{
name = "frr";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -19,7 +19,7 @@ let
in
{
name = "google-oslogin";
meta = with lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -1,7 +1,7 @@
{ pkgs, lib, ... }:
{
name = "gotify-server";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -5,7 +5,7 @@
}:
{
name = "greetd-no-shadow";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -3,7 +3,7 @@
{ pkgs, ... }:
{
name = "gvisor";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -25,7 +25,7 @@ let
in
{
name = "hockeypuck";
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
nodes.machine =
{ ... }:

View File

@@ -4,7 +4,7 @@
{ pkgs, lib, ... }:
{
name = "ipv6";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -1,7 +1,7 @@
{ pkgs, ... }:
{
name = "isso";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -5,7 +5,7 @@ let
in
{
name = "jackett";
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
nodes.machine =
{ pkgs, ... }:

View File

@@ -2,7 +2,7 @@
{
name = "lidarr";
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
nodes.machine =
{ pkgs, ... }:

View File

@@ -21,7 +21,7 @@ in
machine.wait_for_open_port(${mainPort})
'';
meta = with lib.maintainers; {
meta = {
maintainers = [ ];
};
}

View File

@@ -8,7 +8,7 @@
{
_module.args.latestKernel = lib.mkDefault false;
name = "login";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -57,7 +57,7 @@ import ../make-test-python.nix (
};
# Needed for lxc
environment.systemPackages = with pkgs; [
environment.systemPackages = [
pkgs.wget
pkgs.dnsmasq
];

View File

@@ -4,7 +4,7 @@
{ pkgs, ... }:
{
name = "munin";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -14,7 +14,7 @@ in
{ pkgs, ... }:
{
name = "networking-proxy";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -25,7 +25,7 @@ import ../make-test-python.nix (
{
name = "nfs";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -5,7 +5,7 @@ let
{ pkgs, lib, ... }:
{
name = "opensearch";
meta.maintainers = with pkgs.lib.maintainers; [ ];
meta.maintainers = [ ];
nodes.machine = lib.mkMerge [
{

View File

@@ -2,7 +2,7 @@
{
name = "prowlarr";
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
nodes.machine =
{ pkgs, ... }:

View File

@@ -14,7 +14,7 @@ let
in
{
name = "proxy";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -31,7 +31,7 @@ let
in
{
name = "quake3";
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
node.pkgsReadOnly = false;

View File

@@ -2,7 +2,7 @@
{
name = "radarr";
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
nodes.machine =
{ pkgs, ... }:

View File

@@ -2,7 +2,7 @@
{
name = "scrutiny";
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
nodes = {
machine =

View File

@@ -1,7 +1,7 @@
{ pkgs, ... }:
{
name = "soapui";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -1,7 +1,7 @@
{ pkgs, ... }:
{
name = "sogo";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -2,7 +2,7 @@
{
name = "sonarr";
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
nodes.machine =
{ pkgs, ... }:

View File

@@ -4,7 +4,7 @@ let
in
{
name = "spiped";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -2,7 +2,7 @@
{
name = "swayfx";
meta = {
maintainers = with lib.maintainers; [ ];
maintainers = [ ];
};
# testScriptWithTypes:49: error: Cannot call function of unknown type

View File

@@ -1,7 +1,7 @@
{ pkgs, lib, ... }:
{
name = "sympa";
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
nodes.machine =
{ ... }:

View File

@@ -1,7 +1,7 @@
{ lib, pkgs, ... }:
{
name = "syncthing-relay";
meta.maintainers = with pkgs.lib.maintainers; [ ];
meta.maintainers = [ ];
nodes.machine = {
environment.systemPackages = [ pkgs.jq ];

View File

@@ -10,7 +10,7 @@
{ pkgs, ... }:
{
name = "systemd-networkd-dhcpserver";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};
nodes = {

View File

@@ -1,7 +1,7 @@
{ lib, ... }:
{
name = "tandoor-recipes";
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = [ ];
nodes.machine =
{ pkgs, ... }:

View File

@@ -7,7 +7,7 @@
with import ../lib/testing-python.nix { inherit system pkgs; };
makeTest {
name = "tigervnc";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -1,7 +1,7 @@
{ pkgs, ... }:
{
name = "timezone";
meta.maintainers = with pkgs.lib.maintainers; [ ];
meta.maintainers = [ ];
nodes = {
node_eutz =

View File

@@ -3,7 +3,7 @@
{
name = "tinywl";
meta = {
maintainers = with lib.maintainers; [ ];
maintainers = [ ];
};
nodes.machine =

View File

@@ -12,7 +12,7 @@ in
{
name = "udisks2";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -10,7 +10,7 @@ in
{ pkgs, ... }:
{
name = "ejabberd";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};
nodes = {

View File

@@ -1,7 +1,7 @@
{ pkgs, ... }:
{
name = "xrdp";
meta = with pkgs.lib.maintainers; {
meta = {
maintainers = [ ];
};

View File

@@ -32,6 +32,6 @@ pythonPackages.buildPythonApplication rec {
homepage = "https://github.com/pimusicbox/mopidy-musicbox-webclient";
changelog = "https://github.com/pimusicbox/mopidy-musicbox-webclient/blob/v${version}/CHANGELOG.rst";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ];
maintainers = [ ];
};
}

View File

@@ -100,7 +100,7 @@ melpaBuild (
'';
license = lib.licenses.gpl3Plus;
mainProgram = "cask";
maintainers = with lib.maintainers; [ ];
maintainers = [ ];
};
}
)

View File

@@ -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 = [ ];
};
}

View File

@@ -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 = [ ];
};
}

View File

@@ -38,6 +38,6 @@ melpaBuild {
values on to Emacs.
'';
license = lib.licenses.unlicense;
maintainers = with lib.maintainers; [ ];
maintainers = [ ];
};
}

View File

@@ -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 = [ ];
};
}

View File

@@ -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 = [ ];
};
}

View File

@@ -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 = [ ];
};
}

View File

@@ -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 = [ ];
};
}

View File

@@ -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 = [ ];
};
}

View File

@@ -47,6 +47,6 @@ melpaBuild {
meta = {
description = "Core APIs of the Emacs binding for tree-sitter";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ];
maintainers = [ ];
};
}

View File

@@ -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 = [ ];
};
}

View File

@@ -17,6 +17,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
downloadPage = "https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode";
homepage = "https://github.com/aws/aws-toolkit-vscode";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ];
maintainers = [ ];
};
})

View File

@@ -23,6 +23,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
downloadPage = "https://marketplace.visualstudio.com/items?itemName=anweber.vscode-httpyac";
homepage = "https://github.com/AnWeber/vscode-httpyac/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ];
maintainers = [ ];
};
}

Some files were not shown because too many files have changed in this diff Show More