diff options
| author | Robin Gloster <mail@glob.in> | 2019-05-18 09:36:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-18 09:36:24 +0000 |
| commit | 6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6 (patch) | |
| tree | 6590fc8630f685b81d4f1a5487a54b31785f3c8b /nixos/modules/programs | |
| parent | d40443ba6de52faf08bb33198c6e501f46b85a89 (diff) | |
| parent | 786f02f7a45621b9f628f63649ff92546aff83b7 (diff) | |
Merge pull request #60406 from JohnAZoidberg/remove-isnull
treewide: Remove usage of isNull
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/bash/bash.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/fish.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/ssmtp.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/zsh/zsh.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 27b5f9e4b642..a7e57b8608d7 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -34,7 +34,7 @@ let bashAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") - (filterAttrs (k: v: !isNull v) cfg.shellAliases) + (filterAttrs (k: v: v != null) cfg.shellAliases) ); in diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 622d2f96fe41..87f6816e4ac0 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -10,7 +10,7 @@ let fishAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") - (filterAttrs (k: v: !isNull v) cfg.shellAliases) + (filterAttrs (k: v: v != null) cfg.shellAliases) ); in diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index 44756171b74c..0e060e3f5226 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -148,7 +148,7 @@ in UseSTARTTLS=${yesNo cfg.useSTARTTLS} #Debug=YES ${optionalString (cfg.authUser != "") "AuthUser=${cfg.authUser}"} - ${optionalString (!isNull cfg.authPassFile) "AuthPassFile=${cfg.authPassFile}"} + ${optionalString (cfg.authPassFile != null) "AuthPassFile=${cfg.authPassFile}"} ''; environment.systemPackages = [pkgs.ssmtp]; diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index b7117e5f90d7..bdb37eae23ef 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -12,7 +12,7 @@ let zshAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") - (filterAttrs (k: v: !isNull v) cfg.shellAliases) + (filterAttrs (k: v: v != null) cfg.shellAliases) ); in |