ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-05 20:11:43 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #235924 from Stunkymonkey/remove-then-{}

Browse Source 
treewide: use lib.optionalAttrs instead of 'then {}'
This commit is contained in:
Pol Dellaiera 2023-06-13 20:14:58 +02:00 committed by GitHub
commit 7907dd9d6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/continuous-integration/buildkite-agents.nix
View File

@ -11,7 +11,7 @@ let
default = null;
description = lib.mdDoc description;
type = types.nullOr types.lines;
} // (if example == null then {} else { inherit example; });
} // (lib.optionalAttrs (example != null) { inherit example; });
};
mkHookOptions = hooks: listToAttrs (map mkHookOption hooks);

2
nixos/modules/services/mail/rspamd.nix
View File

@ -215,7 +215,7 @@ let
text = v.extraConfig;
})
(filterAttrs (n: v: v.extraConfig != "") cfg.workers))
// (if cfg.extraConfig == "" then {} else {
// (lib.optionalAttrs (cfg.extraConfig != "") {
"extra-config.inc".text = cfg.extraConfig;
});
in

3
nixos/modules/services/web-apps/mattermost.nix
View File

@ -86,8 +86,7 @@ let
mattermostConf = recursiveUpdate
mattermostConfWithoutPlugins
(
if mattermostPlugins == null then {}
else {
lib.optionalAttrs (mattermostPlugins != null) {
PluginSettings = {
Enable = true;
};

4
pkgs/development/coq-modules/tlc/default.nix
View File

@ -23,9 +23,7 @@
maintainers = [ maintainers.vbgl ];
};
}).overrideAttrs (x:
if lib.versionAtLeast x.version "20210316"
then {}
else {
lib.optionalAttrs (lib.versionOlder x.version "20210316") {
installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ];
}
)

3
pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix
View File

@ -4,8 +4,7 @@ let
skipBuildPhase = x: {
overrides = y: ((x.overrides y) // { buildPhase = "true"; });
};
multiOverride = l: x: if l == [] then {} else
((builtins.head l) x) // (multiOverride (builtins.tail l) x);
multiOverride = l: x: pkgs.lib.optionalAttrs (l != []) ((builtins.head l) x) // (multiOverride (builtins.tail l) x);
lispName = (clwrapper.lisp.pname or (builtins.parseDrvName clwrapper.lisp.name).name);
ifLispIn = l: f: if (pkgs.lib.elem lispName l) then f else (x: {});
ifLispNotIn = l: f: if ! (pkgs.lib.elem lispName l) then f else (x: {});