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 /nixos/modules/services/continuous-integration | |
| 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 'nixos/modules/services/continuous-integration')
| -rw-r--r-- | nixos/modules/services/continuous-integration/buildkite-agent.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/continuous-integration/jenkins/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index 2136778aff4..12cc3d2b1cc 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -236,7 +236,7 @@ in }; assertions = [ - { assertion = cfg.hooksPath == hooksDir || all isNull (attrValues cfg.hooks); + { assertion = cfg.hooksPath == hooksDir || all (v: v == null) (attrValues cfg.hooks); message = '' Options `services.buildkite-agent.hooksPath' and `services.buildkite-agent.hooks.<name>' are mutually exclusive. diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 1eca45fbd57..ec6a36413fe 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -189,7 +189,7 @@ in { preStart = let replacePlugins = - if isNull cfg.plugins + if cfg.plugins == null then "" else let pluginCmds = lib.attrsets.mapAttrsToList |