diff options
author | Casey Ransom <casey@dailykos.com> | 2019-06-27 13:52:16 -0400 |
---|---|---|
committer | Casey Ransom <casey@dailykos.com> | 2019-07-01 11:45:19 -0400 |
commit | 35d58c3421fea71394fa3b3e8c10bd862d76f3d8 (patch) | |
tree | 32cf12be5edaee9f8ea9e95730dbfe264439929d /nixos/modules/services | |
parent | b5478fd1a2ef442a54c36031bf3a27a96b5ea31c (diff) | |
download | nixlib-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.tar nixlib-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.tar.gz nixlib-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.tar.bz2 nixlib-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.tar.lz nixlib-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.tar.xz nixlib-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.tar.zst nixlib-35d58c3421fea71394fa3b3e8c10bd862d76f3d8.zip |
datadog-agent: fix extraIntegrations
The override that builds the custom python for integrations-core was overriding python, but pythonPackages was still being inherited from a call to `datadog-integrations-core {}`, causing service.datadog-agent.extraIntegrations to be ignored.
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/monitoring/datadog-agent.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index ce3d53fb2c17..7f78db74677c 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -42,9 +42,9 @@ let # Apply the configured extraIntegrations to the provided agent # package. See the documentation of `dd-agent/integrations-core.nix` # for detailed information on this. - datadogPkg = cfg.package.overrideAttrs(_: { - python = (pkgs.datadog-integrations-core cfg.extraIntegrations).python; - }); + datadogPkg = cfg.package.override { + pythonPackages = pkgs.datadog-integrations-core cfg.extraIntegrations; + }; in { options.services.datadog-agent = { enable = mkOption { @@ -60,7 +60,7 @@ in { defaultText = "pkgs.datadog-agent"; description = '' Which DataDog v6 agent package to use. Note that the provided - package is expected to have an overridable `python`-attribute + package is expected to have an overridable `pythonPackages`-attribute which configures the Python environment with the Datadog checks. ''; |