From 786f02f7a45621b9f628f63649ff92546aff83b7 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Wed, 24 Apr 2019 05:48:22 +0200 Subject: treewide: Remove usage of isNull isNull "is deprecated; just write e == null instead" says the Nix manual --- lib/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/sources.nix') 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); -- cgit 1.4.1