diff options
author | Robin Gloster <mail@glob.in> | 2019-05-18 09:36:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-18 09:36:24 +0000 |
commit | 6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6 (patch) | |
tree | 6590fc8630f685b81d4f1a5487a54b31785f3c8b /pkgs/applications | |
parent | d40443ba6de52faf08bb33198c6e501f46b85a89 (diff) | |
parent | 786f02f7a45621b9f628f63649ff92546aff83b7 (diff) | |
download | nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.tar nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.tar.gz nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.tar.bz2 nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.tar.lz nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.tar.xz nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.tar.zst nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.zip |
Merge pull request #60406 from JohnAZoidberg/remove-isnull
treewide: Remove usage of isNull
Diffstat (limited to 'pkgs/applications')
5 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 081c4ab41acb..ddbefd129ffe 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "x86_64-linux" then - if builtins.isNull releasePath then + if releasePath == null then fetchurl { url = "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2"; sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { else releasePath else if stdenv.hostPlatform.system == "i686-linux" then - if builtins.isNull releasePath then + if releasePath == null then fetchurl { url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2"; sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 79deab46912b..bc0918737dd5 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -10,7 +10,7 @@ let alternativeConfig = builtins.toFile "lumail2.lua" (builtins.readFile alternativeGlobalConfigFilePath); - globalConfig = if isNull alternativeGlobalConfigFilePath then '' + globalConfig = if alternativeGlobalConfigFilePath == null then '' mkdir -p $out/etc/lumail2 cp global.config.lua $out/etc/lumail2.lua for n in ./lib/*.lua; do diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index dae5e1b76d35..dc0e9ea1aa5d 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "128"; src = - if builtins.isNull releasePath then + if releasePath == null then throw '' This nix expression requires that the cplex installer is already downloaded to your machine. Get it from IBM: diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 18060f342a92..5bb7eda47d5d 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -59,7 +59,7 @@ let # return the names of all dependencies in the transitive closure transitiveClosure = dep: - if isNull dep then + if dep == null then # propagatedBuildInputs might contain null # (although that might be considered a programming error in the derivation) [] diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 91fd7eab1268..b9976e540196 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -59,7 +59,7 @@ let self = rec { extraRuntimeDependencies = [ ]; installPhase = '' - ${if isNull sourceDir then "" else "cd $src/$sourceDir"} + ${if sourceDir == null then "" else "cd $src/$sourceDir"} d=$out${pluginDir}/${namespace} mkdir -p $d sauce="." |