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 /pkgs | |
parent | 5f14e83bd6b9ef1c83b035011267dd3d40278476 (diff) |
treewide: Remove usage of isNull
isNull "is deprecated; just write e == null instead" says the Nix manual
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/renoise/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/mailreaders/lumail/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/math/cplex/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/math/sage/sage-with-env.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/kodi/plugins.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/emacs/melpa.nix | 2 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 2 | ||||
-rw-r--r-- | pkgs/stdenv/adapters.nix | 2 | ||||
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 2 | ||||
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/b2sum/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/osquery/default.nix | 2 |
13 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 081c4ab41acb4..ddbefd129ffe3 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 79deab46912bc..bc0918737dd52 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 dae5e1b76d35b..dc0e9ea1aa5d7 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 18060f342a92a..5bb7eda47d5d3 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 91fd7eab1268d..b9976e5401968 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="." diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 96e61bbf90e5c..e2ec84c75e66b 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -31,7 +31,7 @@ in import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ ename = - if isNull(ename) + if ename == null then pname else ename; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 6b5ecc1df8afc..0d579b1681b08 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -120,7 +120,7 @@ let haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let - sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; + sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"''; in pkgs.buildPackages.stdenv.mkDerivation { name = "cabal2nix-${name}"; nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 2b9d048f77e64..4c3a2b2d588ff 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -7,7 +7,7 @@ with import ./util.nix { inherit lib; }; -stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { +stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { builder = buildScript; }) // rec { inherit name src configureFlags; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 7823d6413442d..a384e5470e483 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -128,7 +128,7 @@ rec { with the following function: isFree = license: with builtins; - if isNull license then true + if license == null then true else if isList license then lib.all isFree license else license != "non-free" && license != "unfree"; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b7d8e3ba5236b..5930a8203cb99 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -81,7 +81,7 @@ in rec { bintools = { name = "${name}-binutils"; outPath = bootstrapTools; }; }; - cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { + cc = if last == null then "/dev/null" else import ../../build-support/cc-wrapper { inherit shell; inherit (last) stdenvNoCC; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 2bccd620436a1..390c7f1123ecc 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -96,7 +96,7 @@ let inherit system; }; - cc = if isNull prevStage.gcc-unwrapped + cc = if prevStage.gcc-unwrapped == null then null else lib.makeOverridable (import ../../build-support/cc-wrapper) { name = "${name}-gcc-wrapper"; diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index f9d2855e739fc..16811d8f8897f 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ openmp ]; - buildFlags = [ (optional (isNull openmp) "NO_OPENMP=1") ]; + buildFlags = [ (optional (openmp == null) "NO_OPENMP=1") ]; installFlags = [ "PREFIX=$(out)" ]; meta = { diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 1e2882e1f1feb..1c1da724676d3 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = let gflags' = google-gflags.overrideAttrs (old: { - cmakeFlags = stdenv.lib.filter (f: isNull (builtins.match ".*STATIC.*" f)) old.cmakeFlags; + cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags; }); # use older `lvm2` source for osquery, the 2.03 sourcetree |