diff options
author | Felix Buehler <account@buehler.rocks> | 2023-03-05 22:08:45 +0100 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2023-03-06 22:40:04 +0100 |
commit | d10e69c86bcd415f5c4347d3c6b981241e913465 (patch) | |
tree | 2ceccb33151ff07aa71680771ca6b6d549641164 /pkgs/applications/virtualization/singularity/generic.nix | |
parent | 794f34657e066a5e8cc4bb34491fee02240c6ac4 (diff) |
treewide: deprecate isNull
https://nixos.org/manual/nix/stable/language/builtins.html#builtins-isNull
Diffstat (limited to 'pkgs/applications/virtualization/singularity/generic.nix')
-rw-r--r-- | pkgs/applications/virtualization/singularity/generic.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index f20735e45e3dc..5312dbdda0ff2 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -76,7 +76,7 @@ in let defaultPathOriginal = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"; - privileged-un-utils = if ((isNull newuidmapPath) && (isNull newgidmapPath)) then null else + privileged-un-utils = if ((newuidmapPath == null) && (newgidmapPath == null)) then null else (runCommandLocal "privileged-un-utils" { } '' mkdir -p "$out/bin" ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap" @@ -212,10 +212,10 @@ buildGoModule { rm "$file" done ''} - ${lib.optionalString enableSuid (lib.warnIf (isNull starterSuidPath) "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." '' + ${lib.optionalString enableSuid (lib.warnIf (starterSuidPath == null) "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." '' chmod +x $out/libexec/${projectName}/bin/starter-suid '')} - ${lib.optionalString (enableSuid && !isNull starterSuidPath) '' + ${lib.optionalString (enableSuid && (starterSuidPath != null)) '' mv "$out"/libexec/${projectName}/bin/starter-suid{,.orig} ln -s ${lib.escapeShellArg starterSuidPath} "$out/libexec/${projectName}/bin/starter-suid" ''} |