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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/generators.nix | 2 | ||||
| -rw-r--r-- | lib/sources.nix | 4 | ||||
| -rw-r--r-- | lib/trivial.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/generators.nix b/lib/generators.nix index 863ba847423..a71654bec6c 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -178,7 +178,7 @@ rec { toPlist = {}: v: let isFloat = builtins.isFloat or (x: false); expr = ind: x: with builtins; - if isNull x then "" else + if x == null then "" else if isBool x then bool ind x else if isInt x then int ind x else if isString x then str ind x else diff --git a/lib/sources.nix b/lib/sources.nix index f02ddad17c6..0ffadea8f1b 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -83,7 +83,7 @@ rec { # Sometimes git stores the commitId directly in the file but # sometimes it stores something like: «ref: refs/heads/branch-name» matchRef = match "^ref: (.*)$" fileContent; - in if isNull matchRef + in if matchRef == null then fileContent else readCommitFromFile (lib.head matchRef) path # Sometimes, the file isn't there at all and has been packed away in the @@ -92,7 +92,7 @@ rec { then let fileContent = readFile packedRefsName; matchRef = match (".*\n([^\n ]*) " + file + "\n.*") fileContent; - in if isNull matchRef + in if matchRef == null then throw ("Could not find " + file + " in " + packedRefsName) else lib.head matchRef else throw ("Not a .git directory: " + path); diff --git a/lib/trivial.nix b/lib/trivial.nix index 2d682961035..f2710a6f033 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -112,7 +112,7 @@ rec { # Function to call f: # Argument to check for null before passing it to `f` - a: if isNull a then a else f a; + a: if a == null then a else f a; # Pull in some builtins not included elsewhere. inherit (builtins) |