talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixos/mattermost: default preferNixConfig to true

Browse Source 
Now that we are disabling telemetry by default, we should attempt to
override it and other options in existing mutable configs,
if the user had a mutable config and advances their system.stateVersion.
This commit is contained in:
Morgan Jones 2025-01-25 17:43:18 -08:00 committed by Valentin Gagarin
parent fc3f7c17e2
commit 672f423d0c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -462,7 +462,10 @@ in
preferNixConfig = mkOption { preferNixConfig = mkOption {
type = types.bool; type = types.bool;
default = false; default = versionAtLeast config.system.stateVersion "25.05";
defaultText = ''
versionAtLeast config.system.stateVersion "25.05";
'';
description = '' description = ''
If both mutableConfig and this option are set, the Nix configuration If both mutableConfig and this option are set, the Nix configuration
will take precedence over any settings configured in the server will take precedence over any settings configured in the server

2
nixos/tests/mattermost/default.nix
View File

@ -94,6 +94,7 @@ import ../make-test-python.nix (
makeMattermost makeMattermost
{ {
mutableConfig = true; mutableConfig = true;
preferNixConfig = false;
settings.SupportSettings.HelpLink = "https://search.nixos.org"; settings.SupportSettings.HelpLink = "https://search.nixos.org";
} }
{ {
@ -105,7 +106,6 @@ import ../make-test-python.nix (
}; };
postgresMostlyMutable = makeMattermost { postgresMostlyMutable = makeMattermost {
mutableConfig = true; mutableConfig = true;
preferNixConfig = true;
plugins = with pkgs; [ plugins = with pkgs; [
# Build the demo plugin. # Build the demo plugin.
(mattermost.buildPlugin { (mattermost.buildPlugin {