Merge pull request #60406 from JohnAZoidberg/remove-isnull

treewide: Remove usage of isNull
2019-05-18 09:36:24 +00:00
parent d40443ba6d 786f02f7a4
commit 6cf583cf2f
52 changed files with 89 additions and 95 deletions
@@ -215,8 +215,8 @@ in {
    networking.firewall = mkIf cfg.openFirewall (if cfg.declarative then {
      allowedUDPPorts = [ serverPort ];
      allowedTCPPorts = [ serverPort ]
-        ++ optional (! isNull queryPort) queryPort
-        ++ optional (! isNull rconPort) rconPort;
+        ++ optional (queryPort != null) queryPort
+        ++ optional (rconPort != null) rconPort;
    } else {
      allowedUDPPorts = [ defaultServerPort ];
      allowedTCPPorts = [ defaultServerPort ];