Merge remote-tracking branch 'origin/staging-next' into staging (0cb3a504) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+12 −0

Original line number	Diff line number	Diff line
		@@ -6094,6 +6094,12 @@
		name = "David Wood";
		keys = [ { fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154"; } ];
		};
		davidweisse = {
		name = "David Weiße";
		github = "davidweisse";
		githubId = 98460960;
		email = "david.weisse@gmx.net";
		};
		davisrichard437 = {
		email = "davisrichard437@gmail.com";
		github = "davisrichard437";
		@@ -26614,6 +26620,12 @@
		githubId = 633969;
		name = "Miroslav Vadkerti";
		};
		ths-on = {
		email = "thore.sommer@tum.de";
		github = "THS-on";
		githubId = 10854414;
		name = "Thore Sommer";
		};
		thtrf = {
		email = "thtrf@proton.me";
		github = "thtrf";

nixos/modules/services/games/terraria.nix

+5 −1

Original line number	Diff line number	Diff line
		@@ -64,6 +64,10 @@ in
		'';
		};

		package = lib.mkPackageOption pkgs "terraria" {
		default = "terraria-server";
		};

		port = lib.mkOption {
		type = lib.types.port;
		default = 7777;
		@@ -178,7 +182,7 @@ in
		Type = "forking";
		GuessMainPID = true;
		UMask = 7;
		ExecStart = "${tmuxCmd} new -d ${pkgs.terraria-server}/bin/TerrariaServer ${lib.concatStringsSep " " flags}";
		ExecStart = "${tmuxCmd} new -d ${lib.getExe cfg.package} ${lib.concatStringsSep " " flags}";
		ExecStop = "${stopScript} $MAINPID";
		};
		};

nixos/tests/all-tests.nix

+4 −1

Original line number	Diff line number	Diff line
		@@ -950,7 +950,10 @@ in
		mealie = runTest ./mealie.nix;
		mediamtx = runTest ./mediamtx.nix;
		mediatomb = runTest ./mediatomb.nix;
		mediawiki = handleTest ./mediawiki.nix { };
		mediawiki = import ./mediawiki.nix {
		inherit (pkgs) lib;
		inherit runTest;
		};
		meilisearch = runTest ./meilisearch.nix;
		memcached = runTest ./memcached.nix;
		merecat = runTest ./merecat.nix;

nixos/tests/mediawiki.nix

+27 −25

Original line number	Diff line number	Diff line
		{
		system ? builtins.currentSystem,
		config ? { },
		pkgs ? import ../.. { inherit system config; },
		}:
		{ lib, runTest }:

		let
		shared = {
		shared =
		{ pkgs, ... }:
		{
		services.mediawiki.enable = true;
		services.mediawiki.httpd.virtualHost.hostName = "localhost";
		services.mediawiki.httpd.virtualHost.adminAddr = "root@example.com";
		@@ -19,13 +17,17 @@ let
		};
		};

		testLib = import ../lib/testing-python.nix {
		inherit system pkgs;
		extraConfigurations = [ shared ];
		makeTest =
		t:
		runTest {
		imports = [
		{ nodes.machine.imports = [ shared ]; }
		t
		];
		};
		in
		{
		mysql = testLib.makeTest {
		mysql = makeTest {
		name = "mediawiki-mysql";
		nodes.machine = {
		services.mediawiki.database.type = "mysql";
		@@ -40,7 +42,7 @@ in
		'';
		};

		postgresql = testLib.makeTest {
		postgresql = makeTest {
		name = "mediawiki-postgres";
		nodes.machine = {
		services.mediawiki.database.type = "postgres";
		@@ -55,7 +57,7 @@ in
		'';
		};

		nohttpd = testLib.makeTest {
		nohttpd = makeTest {
		name = "mediawiki-nohttpd";
		nodes.machine = {
		services.mediawiki.webserver = "none";
		@@ -72,12 +74,12 @@ in
		'QUERY_STRING=title=Main_Page',
		"REQUEST_METHOD=GET",
		);
		page = machine.succeed(f"{' '.join(env)} ${pkgs.fcgi}/bin/cgi-fcgi -bind -connect ${nodes.machine.services.phpfpm.pools.mediawiki.socket}")
		page = machine.succeed(f"{' '.join(env)} ${lib.getExe nodes.machine.nixpkgs.pkgs.fcgi} -bind -connect ${nodes.machine.services.phpfpm.pools.mediawiki.socket}")
		assert "MediaWiki has been installed" in page, f"no 'MediaWiki has been installed' in:\n{page}"
		'';
		};

		nginx = testLib.makeTest {
		nginx = makeTest {
		name = "mediawiki-nginx";
		nodes.machine = {
		services.mediawiki.webserver = "nginx";

nixos/tests/nextcloud/with-mail.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ runTest (
		stalwart =
		{ pkgs, ... }:
		{
		imports = [ ../stalwart/stalwart-mail-config.nix ];
		imports = [ ../stalwart/stalwart-config.nix ];

		networking.firewall.allowedTCPPorts = [ 587 ];

Admin message