diff options
| author | Guillaume Girol <symphorien@users.noreply.github.com> | 2022-02-09 19:13:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-09 19:13:10 +0000 |
| commit | 7a6506fc79e0f2efc63bf2a62c5b8c56186e2926 (patch) | |
| tree | c692346e13eaa43841ad86149b89d298e57622d4 /pkgs/tools/system | |
| parent | b330feb4349eb9e5c2e17db87750b3a7d93a596a (diff) | |
| parent | 0955a4fa354ffb5b7b341826a533c9453058d00e (diff) | |
| download | nixpkgs-7a6506fc79e0f2efc63bf2a62c5b8c56186e2926.tar nixpkgs-7a6506fc79e0f2efc63bf2a62c5b8c56186e2926.tar.gz nixpkgs-7a6506fc79e0f2efc63bf2a62c5b8c56186e2926.tar.bz2 nixpkgs-7a6506fc79e0f2efc63bf2a62c5b8c56186e2926.tar.lz nixpkgs-7a6506fc79e0f2efc63bf2a62c5b8c56186e2926.tar.xz nixpkgs-7a6506fc79e0f2efc63bf2a62c5b8c56186e2926.tar.zst nixpkgs-7a6506fc79e0f2efc63bf2a62c5b8c56186e2926.zip | |
Merge pull request #158353 from symphorien/collectd-xen-insecure-master
collectd: don't build with xen plugin by default
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/collectd/plugins.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index de8948db6c9..1455feb1c32 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -41,8 +41,8 @@ , xen , yajl , IOKit -# Defaults to `null` for all supported plugins, -# list of plugin names for a custom build +# 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 , ... }: @@ -136,7 +136,7 @@ let buildInputs = if enabledPlugins == null then builtins.concatMap pluginBuildInputs - (builtins.attrNames plugins) + (builtins.attrNames (builtins.removeAttrs plugins ["xencpu"])) else builtins.concatMap pluginBuildInputs enabledPlugins; in { inherit configureFlags buildInputs; |