diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2017-04-17 16:48:10 -0400 |
---|---|---|
committer | John Ericson <Ericson2314@Yahoo.com> | 2017-04-17 17:04:04 -0400 |
commit | 85aa5005af530fef199cc41148e374e54d70e01e (patch) | |
tree | 296a184cc5e710e197f45a91babb107bf8509eae /nixos | |
parent | f3055a3c508b6ff3e926ece201887467dc2b5d73 (diff) | |
download | nixpkgs-85aa5005af530fef199cc41148e374e54d70e01e.tar nixpkgs-85aa5005af530fef199cc41148e374e54d70e01e.tar.gz nixpkgs-85aa5005af530fef199cc41148e374e54d70e01e.tar.bz2 nixpkgs-85aa5005af530fef199cc41148e374e54d70e01e.tar.lz nixpkgs-85aa5005af530fef199cc41148e374e54d70e01e.tar.xz nixpkgs-85aa5005af530fef199cc41148e374e54d70e01e.tar.zst nixpkgs-85aa5005af530fef199cc41148e374e54d70e01e.zip |
Introduce `mapNullable` into lib and use it in a few places
Also simply some configure flag logic my grep also alerted me too.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/monitoring/graphite.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/monitoring/prometheus/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
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. ''; |