diff options
author | Daniel Schaefer <git@danielschaefer.me> | 2019-04-24 05:48:22 +0200 |
---|---|---|
committer | Daniel Schaefer <git@danielschaefer.me> | 2019-04-29 14:05:50 +0200 |
commit | 786f02f7a45621b9f628f63649ff92546aff83b7 (patch) | |
tree | 92784e131ccac4a1a63f7dbae6c228fb9d81468b /nixos/modules/services/networking/strongswan-swanctl | |
parent | 5f14e83bd6b9ef1c83b035011267dd3d40278476 (diff) | |
download | nixpkgs-786f02f7a45621b9f628f63649ff92546aff83b7.tar nixpkgs-786f02f7a45621b9f628f63649ff92546aff83b7.tar.gz nixpkgs-786f02f7a45621b9f628f63649ff92546aff83b7.tar.bz2 nixpkgs-786f02f7a45621b9f628f63649ff92546aff83b7.tar.lz nixpkgs-786f02f7a45621b9f628f63649ff92546aff83b7.tar.xz nixpkgs-786f02f7a45621b9f628f63649ff92546aff83b7.tar.zst nixpkgs-786f02f7a45621b9f628f63649ff92546aff83b7.zip |
treewide: Remove usage of isNull
isNull "is deprecated; just write e == null instead" says the Nix manual
Diffstat (limited to 'nixos/modules/services/networking/strongswan-swanctl')
-rw-r--r-- | nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/strongswan-swanctl/param-lib.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index 5e74a96664f..95a174122d0 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -56,7 +56,7 @@ rec { }; documentDefault = description : strongswanDefault : - if isNull strongswanDefault + if strongswanDefault == null then description else description + '' </para><para> diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix index fb87e81f321..193ad27f035 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix @@ -45,10 +45,10 @@ rec { filterEmptySets ( (mapParamsRecursive (path: name: param: let value = attrByPath path null cfg; - in optionalAttrs (!isNull value) (param.render name value) + in optionalAttrs (value != null) (param.render name value) ) ps)); - filterEmptySets = set : filterAttrs (n: v: !(isNull v)) (mapAttrs (name: value: + filterEmptySets = set : filterAttrs (n: v: (v != null)) (mapAttrs (name: value: if isAttrs value then let value' = filterEmptySets value; in if value' == {} |