git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #158353 from symphorien/collectd-xen-insecure-master

collectd: don't build with xen plugin by default

commit7a6506fc79e0f2efc63bf2a62c5b8c56186e2926 authorGuillaume Girol <symphorien@users.noreply.github.com> dateWed 9 Feb 2022, 19:13 (5 years ago) parentb330feb0955a4f
1 file changed+3−3
pkgs/tools/system/collectd/plugins.nix+3−3
pkgs/tools/system/collectd/plugins.nix+3−3
@@ -41,8 +41,8 @@
4141, xen
4242, yajl
4343, IOKit
44−# Defaults to `null` for all supported plugins,
45−# list of plugin names for a custom build
44+# Defaults to `null` for all supported plugins (except xen, which is marked as
45+# insecure), otherwise a list of plugin names for a custom build
4646, enabledPlugins ? null
4747, ...
4848}:
@@ -136,7 +136,7 @@ let
136136 buildInputs =
137137 if enabledPlugins == null
138138 then builtins.concatMap pluginBuildInputs
139− (builtins.attrNames plugins)
139+ (builtins.attrNames (builtins.removeAttrs plugins ["xencpu"]))
140140 else builtins.concatMap pluginBuildInputs enabledPlugins;
141141in {
142142 inherit configureFlags buildInputs;