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/config | |
| parent | 5f14e83bd6b9ef1c83b035011267dd3d40278476 (diff) | |
| download | nixlib-786f02f7a45621b9f628f63649ff92546aff83b7.tar nixlib-786f02f7a45621b9f628f63649ff92546aff83b7.tar.gz nixlib-786f02f7a45621b9f628f63649ff92546aff83b7.tar.bz2 nixlib-786f02f7a45621b9f628f63649ff92546aff83b7.tar.lz nixlib-786f02f7a45621b9f628f63649ff92546aff83b7.tar.xz nixlib-786f02f7a45621b9f628f63649ff92546aff83b7.tar.zst nixlib-786f02f7a45621b9f628f63649ff92546aff83b7.zip | |
treewide: Remove usage of isNull
isNull "is deprecated; just write e == null instead" says the Nix manual
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/fonts/fontconfig-penultimate.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/config/fonts/fontconfig.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/config/sysctl.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix index 2c18244621af..04fa8b9559a9 100644 --- a/nixos/modules/config/fonts/fontconfig-penultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix @@ -31,7 +31,7 @@ let # use latest when no version is passed makeCacheConf = { version ? null }: let - fcPackage = if builtins.isNull version + fcPackage = if version == null then "fontconfig" else "fontconfig_${version}"; makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index d79c43c0b5b9..724158f73821 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -46,7 +46,7 @@ let cfg = config.fonts.fontconfig; # use latest when no version is passed makeCacheConf = { version ? null }: let - fcPackage = if builtins.isNull version + fcPackage = if version == null then "fontconfig" else "fontconfig_${version}"; makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 74bff602a477..0c6a7e2431aa 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -8,7 +8,7 @@ let name = "sysctl option value"; check = val: let - checkType = x: isBool x || isString x || isInt x || isNull x; + checkType = x: isBool x || isString x || isInt x || x == null; in checkType val || (val._type or "" == "override" && checkType val.content); merge = loc: defs: mergeOneOption loc (filterOverrides defs); |