Merge staging-next into staging (8fae407b) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+29 −0

Original line number	Diff line number	Diff line
		@@ -1718,6 +1718,17 @@
		githubId = 50839;
		name = "Brian Jones";
		};
		booklearner = {
		name = "booklearner";
		email = "hey@booklearner.org";
		matrix = "@booklearner:matrix.org";
		github = "booklearner";
		githubId = 103979114;
		keys = [{
		longkeyid = "ed25519/0x0C61C4E5907F76C8";
		fingerprint = "17C7 95D4 871C 2F87 83C8 053D 0C61 C4E5 907F 76C8";
		}];
		};
		bootstrap-prime = {
		email = "bootstrap.prime@gmail.com";
		github = "bootstrap-prime";
		@@ -6414,6 +6425,13 @@
		githubId = 1189739;
		name = "Julio Borja Barra";
		};
		jugendhacker = {
		name = "j.r";
		email = "j.r@jugendhacker.de";
		github = "jugendhacker";
		githubId = 12773748;
		matrix = "@j.r:chaos.jetzt";
		};
		juliendehos = {
		email = "dehos@lisic.univ-littoral.fr";
		github = "juliendehos";
		@@ -13653,6 +13671,17 @@
		email = "kirill.wedens@gmail.com";
		name = "wedens";
		};
		WeebSorceress = {
		name = "WeebSorceress";
		email = "hello@weebsorceress.anonaddy.me";
		matrix = "@weebsorceress:matrix.org";
		github = "WeebSorceress";
		githubId = 106774777;
		keys = [{
		longkeyid = "rsa4096/0x7F57344317F0FA43";
		fingerprint = "659A 9BC3 F904 EC24 1461 2EFE 7F57 3443 17F0 FA43";
		}];
		};
		wegank = {
		name = "Weijia Wang";
		email = "contact@weijia.wang";

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,13 @@
		and require manual remediation.
		</para>
		</listitem>
		<listitem>
		<para>
		memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2.
		It is now the upstream version from https://www.memtest.org/,
		as coreboot’s fork is no longer available.
		</para>
		</listitem>
		</itemizedlist>
		</section>
		</section>

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -51,4 +51,6 @@ In addition to numerous new and upgraded packages, this release has the followin

		- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.

		- memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.

		<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/services/games/asf.nix

+13 −6

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ let
		# is in theory not needed as this is already the default for default builds
		UpdateChannel = 0;
		Headless = true;
		} // lib.optionalAttrs (cfg.ipcPasswordFile != "") {
		} // lib.optionalAttrs (cfg.ipcPasswordFile != null) {
		IPCPassword = "#ipcPassword#";
		});

		@@ -94,7 +94,8 @@ in
		};

		ipcPasswordFile = mkOption {
		type = types.path;
		type = types.nullOr types.path;
		default = null;
		description = "Path to a file containig the password. The file must be readable by the <literal>asf</literal> user/group.";
		};

		@@ -159,7 +160,6 @@ in
		users = {
		users.asf = {
		home = cfg.dataDir;
		homeMode = "700";
		isSystemUser = true;
		group = "asf";
		description = "Archis-Steam-Farm service user";
		@@ -174,13 +174,17 @@ in
		wantedBy = [ "multi-user.target" ];

		serviceConfig = mkMerge [
		(mkIf (cfg.dataDir == "/var/lib/asf") { StateDirectory = "asf"; })
		(mkIf (cfg.dataDir == "/var/lib/asf") {
		StateDirectory = "asf";
		StateDirectoryMode = "700";
		})
		{
		User = "asf";
		Group = "asf";
		WorkingDirectory = cfg.dataDir;
		Type = "simple";
		ExecStart = "${cfg.package}/bin/ArchiSteamFarm --path ${cfg.dataDir} --process-required --no-restart --service --no-config-migrate";
		Restart = "always";

		# mostly copied from the default systemd service
		PrivateTmp = true;
		@@ -222,7 +226,10 @@ in
		mkdir -p config

		cp --no-preserve=mode ${asf-config} config/ASF.json

		${optionalString (cfg.ipcPasswordFile != null) ''
		${replaceSecretBin} '#ipcPassword#' '${cfg.ipcPasswordFile}' config/ASF.json
		''}

		${optionalString (cfg.ipcSettings != {}) ''
		ln -fs ${ipc-config} config/IPC.config
		@@ -243,6 +250,6 @@ in

		meta = {
		buildDocsInSandbox = false;
		maintainers = with maintainers; [ lom ];
		maintainers = with maintainers; [ lom SuperSandro2000 ];
		};
		}

nixos/tests/firefox.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {


		@contextmanager
		def audio_recording(machine: Machine) -> None:
		def record_audio(machine: Machine):
		"""
		Perform actions while recording the
		machine audio output.
		@@ -64,7 +64,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
		machine.systemctl("stop audio-recorder")


		def wait_for_sound(machine: Machine) -> None:
		def wait_for_sound(machine: Machine):
		"""
		Wait until any sound has been emitted.
		"""
		@@ -94,7 +94,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
		machine.sleep(40)

		with subtest("Check whether Firefox can play sound"):
		with audio_recording(machine):
		with record_audio(machine):
		machine.succeed(
		"firefox file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &"
		)

Admin message