public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60406 from JohnAZoidberg/remove-isnull

Browse Source 
treewide: Remove usage of isNull
This commit is contained in:
Robin Gloster
2019-05-18 09:36:24 +00:00
committed by GitHub
parent d40443ba6d 786f02f7a4
commit 6cf583cf2f
52 changed files with 89 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/virtualisation/docker-containers.nix
+3 -3
View File
@@ -174,13 +174,13 @@ let
"--rm"
"--name=%n"
"--log-driver=${container.log-driver}"
] ++ optional (! isNull container.entrypoint)
] ++ optional (container.entrypoint != null)
"--entrypoint=${escapeShellArg container.entrypoint}"
++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment)
++ map (p: "-p ${escapeShellArg p}") container.ports
++ optional (! isNull container.user) "-u ${escapeShellArg container.user}"
++ optional (container.user != null) "-u ${escapeShellArg container.user}"
++ map (v: "-v ${escapeShellArg v}") container.volumes
++ optional (! isNull container.workdir) "-w ${escapeShellArg container.workdir}"
++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}"
++ map escapeShellArg container.extraDockerOptions
++ [container.image]
++ map escapeShellArg container.cmd
nixos/modules/virtualisation/google-compute-image.nix
+1 -1
View File
@@ -51,7 +51,7 @@ in
popd
'';
format = "raw";
configFile = if isNull cfg.configFile then defaultConfigFile else cfg.configFile;
configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile;
inherit (cfg) diskSize;
inherit config lib pkgs;
};