From ce8b7f42d47503e8dcdb1ad6e2f9d4badde1e395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 2 Apr 2026 19:53:24 +0200 Subject: [PATCH] collectd: remove ... from inputs This avoids that overrides accepts anything silently. --- pkgs/tools/system/collectd/default.nix | 6 +++--- pkgs/tools/system/collectd/plugins.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 86b5b8415753..f9359ae08dc7 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -11,10 +11,10 @@ flex, perl, nixosTests, - ... -}@args: + enabledPlugins ? null, +}: let - plugins = callPackage ./plugins.nix args; + plugins = callPackage ./plugins.nix { inherit enabledPlugins; }; in stdenv.mkDerivation (finalAttrs: { pname = "collectd"; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 2f8ba6c56b42..b871112d14bf 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -45,7 +45,6 @@ # Defaults to `null` for all supported plugins (except xen, which is marked as # insecure), otherwise a list of plugin names for a custom build enabledPlugins ? null, - ... }: let