b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #158353 from symphorien/collectd-xen-insecure-master

Browse source 
collectd: don't build with xen plugin by default
This commit is contained in:
Guillaume Girol 2022-02-09 19:13:10 +00:00 committed by GitHub
parent b330feb434 0955a4fa35
commit 7a6506fc79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/system/collectd/plugins.nix
View file

@ -41,8 +41,8 @@
, xen , xen
, yajl , yajl
, IOKit , IOKit
# Defaults to `null` for all supported plugins, # Defaults to `null` for all supported plugins (except xen, which is marked as
# list of plugin names for a custom build # insecure), otherwise a list of plugin names for a custom build
, enabledPlugins ? null , enabledPlugins ? null
, ... , ...
}: }:
@ -136,7 +136,7 @@ let
buildInputs = buildInputs =
if enabledPlugins == null if enabledPlugins == null
then builtins.concatMap pluginBuildInputs then builtins.concatMap pluginBuildInputs
(builtins.attrNames plugins) (builtins.attrNames (builtins.removeAttrs plugins ["xencpu"]))
else builtins.concatMap pluginBuildInputs enabledPlugins; else builtins.concatMap pluginBuildInputs enabledPlugins;
in { in {
inherit configureFlags buildInputs; inherit configureFlags buildInputs;