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/sources.nix | |
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/sources.nix')
-rw-r--r-- | lib/sources.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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); |