ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-08 14:40:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77177 from petabyteboy/feature/loaof-deprecation

Browse Source 
tree-wide: fix errors and warning related to loaOf deprecation
This commit is contained in:
worldofpeace 2020-01-07 02:10:16 -05:00 committed by GitHub
commit 04f6b5c945
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,7 +334,7 @@ in
} // optionalAttrs (cfg.group == "dovecot2") {
dovecot2.gid = config.ids.gids.dovecot2;
} // optionalAttrs (cfg.createMailUser && cfg.mailGroup != null) {
${cfg.mailgroup} = { };
${cfg.mailGroup} = { };
};
environment.etc."dovecot/modules".source = modulesDir;

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

@ -99,7 +99,7 @@ in {
};
users.groups = optionalAttrs (cfg.group == "opendkim") {
opendkimgid = config.ids.gids.opendkim;
opendkim.gid = config.ids.gids.opendkim;
};
environment.systemPackages = [ pkgs.opendkim ];

4
nixos/modules/services/mail/postfix.nix
View File

@ -665,9 +665,9 @@ in
users.groups =
optionalAttrs (group == "postfix")
{ group.gid = config.ids.gids.postfix;
{ ${group}.gid = config.ids.gids.postfix;
}
++ optionalAttrs (setgidGroup == "postdrop")
// optionalAttrs (setgidGroup == "postdrop")
{ ${setgidGroup}.gid = config.ids.gids.postdrop;
};

16
nixos/modules/services/networking/quassel.nix
View File

@ -92,17 +92,21 @@ in
message = "Quassel needs a certificate file in order to require SSL";
}];
users.users = mkIf (cfg.user == null) [
{ name = "quassel";
users.users = optionalAttrs (cfg.user == null) {
quassel = {
name = "quassel";
description = "Quassel IRC client daemon";
group = "quassel";
uid = config.ids.uids.quassel;
}];
};
};
users.groups = mkIf (cfg.user == null) [
{ name = "quassel";
users.groups = optionalAttrs (cfg.user == null) {
quassel = {
name = "quassel";
gid = config.ids.gids.quassel;
}];
};
};
systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' - ${user} - - -"