From 85aa5005af530fef199cc41148e374e54d70e01e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 17 Apr 2017 16:48:10 -0400 Subject: Introduce `mapNullable` into lib and use it in a few places Also simply some configure flag logic my grep also alerted me too. --- nixos/modules/services/monitoring/graphite.nix | 2 +- nixos/modules/services/monitoring/prometheus/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index c5352e5887d..98931e65bb5 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.graphite; - writeTextOrNull = f: t: if t == null then null else pkgs.writeTextDir f t; + writeTextOrNull = f: t: mapNullable (pkgs.writeTextDir f) t; dataDir = cfg.dataDir; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index cf9deccbffe..5c4a48a7db4 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -134,7 +134,7 @@ let }; }); default = null; - apply = x: if x == null then null else _filter x; + apply = x: mapNullable _filter x; description = '' Optional http login credentials for metrics scraping. ''; -- cgit 1.4.1