Merge master into staging-nixos (13f69693) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -18721,6 +18721,12 @@
		github = "noahgitsham";
		githubId = 73707948;
		};
		nobbele = {
		name = "nobbele";
		email = "realnobbele@gmail.com";
		github = "nobbele";
		githubId = 17962514;
		};
		nobbz = {
		name = "Norbert Melzer";
		email = "timmelzer+nixpkgs@gmail.com";

nixos/doc/manual/release-notes/rl-2511.section.md

+2 −0

Original line number	Diff line number	Diff line
		@@ -377,6 +377,8 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).

		- `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server.

		- `services.mattermost` has been updated to use the 10.11 ESR instead of 10.5. While this shouldn't break anyone, we also now package Mattermost 11 as mattermostLatest. Note that Mattermost 11 drops support for MySQL. The Mattermost module will assertion fail if you try to use MySQL with Mattermost 11; support for using MySQL with Mattermost will fully be removed in NixOS 26.

		- `simplesamlphp` has been removed since the package was severely outdated, unmaintained in nixpkgs and having known vulnerabilities.

		- `networking.wireless.networks.<name>` now has an option to specify SSID, hence allowing duplicated SSID setup. The BSSID option is added along side with this.

nixos/modules/services/misc/rsync.nix

+0 −9

Original line number	Diff line number	Diff line
		@@ -119,15 +119,6 @@ in
		};

		config = lib.mkIf cfg.enable {
		assertions = [
		{
		assertion = lib.all (job: job.sources != [ ]) (lib.attrValues cfg.jobs);
		message = ''
		At least one source directory must be provided to rsync.
		'';
		}
		];

		systemd = lib.mkMerge (
		lib.mapAttrsToList (
		jobName: job:

nixos/modules/services/web-apps/mattermost.nix

+7 −0

Original line number	Diff line number	Diff line
		@@ -966,6 +966,13 @@ in
		or hostname, and services.mattermost.port to specify the port separately.
		'';
		}
		{
		# Can't use MySQL on version 11.
		assertion = versionAtLeast cfg.package.version "11" -> cfg.database.driver == "postgres";
		message = ''
		Only Postgres is supported as the database driver in Mattermost 11 and later.
		'';
		}
		];
		})
		(mkIf cfg.matterircd.enable {

nixos/tests/mattermost/default.nix

+1 −52

Original line number	Diff line number	Diff line
		@@ -69,27 +69,11 @@ import ../make-test-python.nix (
		)
		extraConfig
		];

		makeMysql =
		mattermostConfig: extraConfig:
		lib.mkMerge [
		mattermostConfig
		(
		{ pkgs, config, ... }:
		{
		services.mattermost.database = {
		driver = lib.mkForce "mysql";
		peerAuth = lib.mkForce true;
		};
		}
		)
		extraConfig
		];
		in
		{
		name = "mattermost";

		nodes = rec {
		nodes = {
		postgresMutable = makeMattermost {
		mutableConfig = true;
		preferNixConfig = false;
		@@ -174,25 +158,6 @@ import ../make-test-python.nix (
		MM_SUPPORTSETTINGS_ABOUTLINK=https://nixos.org
		'';
		} { };

		mysqlMutable = makeMysql postgresMutable { };
		mysqlMostlyMutable = makeMysql postgresMostlyMutable { };
		mysqlImmutable = makeMysql postgresImmutable {
		# Let's try to use this on MySQL.
		services.mattermost.database = {
		peerAuth = lib.mkForce true;
		user = lib.mkForce "mmuser";
		name = lib.mkForce "mmuser";
		};
		};
		mysqlEnvironmentFile = makeMysql postgresEnvironmentFile {
		services.mattermost.environmentFile = lib.mkForce (
		pkgs.writeText "mattermost-env" ''
		MM_SQLSETTINGS_DATASOURCE=mattermost@unix(/run/mysqld/mysqld.sock)/mattermost?charset=utf8mb4,utf8&writeTimeout=30s
		MM_SUPPORTSETTINGS_ABOUTLINK=https://nixos.org
		''
		);
		};
		};

		testScript =
		@@ -567,22 +532,6 @@ import ../make-test-python.nix (
		shutdown_queue.task_done()
		threading.Thread(target=shutdown_worker, daemon=True).start()

		${pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 ''
		# Only run the MySQL tests on x86_64 so we don't have to debug MySQL ARM issues.
		run_mattermost_tests(
		shutdown_queue,
		"${nodes.mysqlMutable.system.build.toplevel}",
		mysqlMutable,
		"${nodes.mysqlMostlyMutable.system.build.toplevel}",
		"${nodes.mysqlMostlyMutable.services.mattermost.pluginsBundle}",
		mysqlMostlyMutable,
		"${nodes.mysqlImmutable.system.build.toplevel}",
		mysqlImmutable,
		"${nodes.mysqlEnvironmentFile.system.build.toplevel}",
		mysqlEnvironmentFile
		)
		''}

		run_mattermost_tests(
		shutdown_queue,
		"${nodes.postgresMutable.system.build.toplevel}",

Admin message