Skip to content

logrotate: do not add mail if 'mail = false' is specified#177106

Merged
aanderse merged 1 commit intoNixOS:masterfrom
martinetd:logrotate
Jun 26, 2022
Merged

logrotate: do not add mail if 'mail = false' is specified#177106
aanderse merged 1 commit intoNixOS:masterfrom
martinetd:logrotate

Conversation

@martinetd
Copy link
Member

Reported-by: Ricardo M. Correia rcorreia@wizy.org @wizeman

Description of changes

module would incorrectly pull in sendmail if mail was explicitly disabled

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jun 9, 2022
@martinetd martinetd mentioned this pull request Jun 9, 2022
5 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jun 9, 2022
Reported-by: Ricardo M. Correia <rcorreia@wizy.org>
@martinetd
Copy link
Member Author

I hadn't noticed tests failed: n.mail is not necessarily a bool (it'll often be a string in practice, the destination mail address) so adjusted the fold to work with strings.

@martinetd martinetd mentioned this pull request Jun 13, 2022
13 tasks
Copy link
Member

@wizeman wizeman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bobby285271 bobby285271 added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jun 15, 2022
@aanderse
Copy link
Member

Merging because @wizeman approved. Thanks!

@aanderse aanderse merged commit e3e82b9 into NixOS:master Jun 26, 2022
@martinetd martinetd deleted the logrotate branch November 5, 2022 01:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants