nixos/stalwart-mail: fix incorrect config for webadmin and spam-filter#412054
Merged
happysalada merged 1 commit intoNixOS:masterfrom Jun 1, 2025
Merged
Conversation
Stalwart 0.11.0 changed the `config.resource.spam-filter` and `config.resource.webadmin` keys to be `spam-filter.resource` and `webadmin.resource` respectively. The NixOS has been updated accordingly, but unfortunately it has mistakenly used `config.spam-filter.resource` and `config.webadmin.resource`, which are incorrect and do not do anything. This commit changes the default configuration to use the correct keys. Note that due to infinite recursion, the `optionalAttrs` has been replaced with `mkIf`. Additionally, some tests were added to catch this regression in the future. Fixes NixOS#411351
github-actions
bot
added
6.topic: nixos
3 tasks
github-actions
bot
added
10.rebuild-darwin: 0
diogotcorreia
added a commit
to diogotcorreia/dotfiles
that referenced
this pull request
May 29, 2025
To revert when NixOS/nixpkgs#412054 is merged.
provokateurin
approved these changes
May 29, 2025
Member
provokateurin
left a comment
provokateurin
left a comment
There was a problem hiding this comment.
I can confirm that it fixes the issue on my server.
13 tasks
Contributor
|
IMHO we should back port this to unbreak our stable users |
Contributor
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-24.11
git worktree add -d .worktree/backport-412054-to-release-24.11 origin/release-24.11
cd .worktree/backport-412054-to-release-24.11
git switch --create backport-412054-to-release-24.11
git cherry-pick -x b7ab1fa981ffbc2adbc63de403c2b49368ca8c6b |
Contributor
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-25.05
git worktree add -d .worktree/backport-412054-to-release-25.05 origin/release-25.05
cd .worktree/backport-412054-to-release-25.05
git switch --create backport-412054-to-release-25.05
git cherry-pick -x b7ab1fa981ffbc2adbc63de403c2b49368ca8c6b |
Member
Author
|
I'll backport manually |
13 tasks
13 tasks
Member
Author
|
Skipped the 24.11 backport because it is not affected by this bug: it still has stalwart 0.10.7 while the bug was introduced in the 0.11.0 update. |
diogotcorreia
added
the
8.has: port to stable
16 tasks
diogotcorreia
added a commit
to diogotcorreia/nixpkgs
that referenced
this pull request
Sep 2, 2025
Since NixOS#411265 and NixOS#412054 were merged at the same time, the test ended up not waiting for port 80 after the service restart.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stalwart 0.11.0 changed the
config.resource.spam-filterandconfig.resource.webadminkeys to bespam-filter.resourceandwebadmin.resourcerespectively. The NixOS has been updated accordingly, but unfortunately it has mistakenly usedconfig.spam-filter.resourceandconfig.webadmin.resource, which are incorrect and do not do anything.This commit changes the default configuration to use the correct keys.
Note that due to infinite recursion, the
optionalAttrshas been replaced withmkIf.Additionally, some tests were added to catch this regression in the future.
Fixes #411351
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.