diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-06-13 20:14:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-13 20:14:58 +0200 |
| commit | 7907dd9d6b7d3aa95b1ab1c3037ca00a72e69658 (patch) | |
| tree | 8ab8723f023dfccbe5e9d086652218ed1a62ce55 /nixos | |
| parent | c7173299ccedb4540a88288dc67c06405dca5a78 (diff) | |
| parent | ed3b102d1e51fe69d73dac210719e3a75f69fa85 (diff) | |
| download | nixlib-7907dd9d6b7d3aa95b1ab1c3037ca00a72e69658.tar nixlib-7907dd9d6b7d3aa95b1ab1c3037ca00a72e69658.tar.gz nixlib-7907dd9d6b7d3aa95b1ab1c3037ca00a72e69658.tar.bz2 nixlib-7907dd9d6b7d3aa95b1ab1c3037ca00a72e69658.tar.lz nixlib-7907dd9d6b7d3aa95b1ab1c3037ca00a72e69658.tar.xz nixlib-7907dd9d6b7d3aa95b1ab1c3037ca00a72e69658.tar.zst nixlib-7907dd9d6b7d3aa95b1ab1c3037ca00a72e69658.zip | |
Merge pull request #235924 from Stunkymonkey/remove-then-{}
treewide: use lib.optionalAttrs instead of 'then {}'Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/continuous-integration/buildkite-agents.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/mail/rspamd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/mattermost.nix | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index 7c8f77580ff6..a40b939a16c7 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -11,7 +11,7 @@ let default = null; description = lib.mdDoc description; type = types.nullOr types.lines; - } // (if example == null then {} else { inherit example; }); + } // (lib.optionalAttrs (example != null) { inherit example; }); }; mkHookOptions = hooks: listToAttrs (map mkHookOption hooks); diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index f9be9024dd4f..ca88d8122179 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -215,7 +215,7 @@ let text = v.extraConfig; }) (filterAttrs (n: v: v.extraConfig != "") cfg.workers)) - // (if cfg.extraConfig == "" then {} else { + // (lib.optionalAttrs (cfg.extraConfig != "") { "extra-config.inc".text = cfg.extraConfig; }); in diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index db5122e79f00..66e5f1695a15 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -86,8 +86,7 @@ let mattermostConf = recursiveUpdate mattermostConfWithoutPlugins ( - if mattermostPlugins == null then {} - else { + lib.optionalAttrs (mattermostPlugins != null) { PluginSettings = { Enable = true; }; |