Merge master into staging-next (3f2a8dde) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -27730,6 +27730,12 @@
		githubId = 7727887;
		name = "Tomas Kala";
		};
		tomasrivera = {
		email = "tomas.riveral@icloud.com";
		github = "tomasriveral";
		githubId = 137088692;
		name = "Tomás Rivera";
		};
		tomberek = {
		email = "tomberek@gmail.com";
		matrix = "@tomberek:matrix.org";

+0 −4

Original line number	Diff line number	Diff line
		@@ -677,10 +677,6 @@ let
		};
		in
		{
		imports = [
		(lib.mkRenamedOptionModule [ "credentialsFile" ] [ "environmentFile" ])
		];

		options = {
		validMinDays = lib.mkOption {
		type = lib.types.nullOr lib.types.int;

+10 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,12 @@ in
		description = "Port the OnlyOffice document server should listen on.";
		};

		allowLocalConnections = lib.mkOption {
		type = lib.types.bool;
		default = false;
		description = "Whether to allow the document server to download files from private IP addresses.";
		};

		examplePort = lib.mkOption {
		type = lib.types.port;
		default = null;
		@@ -308,6 +314,10 @@ in
		# https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/run-document-server.sh
		FS_SECRET_STRING=$(cut -d '"' -f 2 < ${cfg.securityNonceFile})
		jq '
		${lib.optionalString cfg.allowLocalConnections ''
		.services.CoAuthoring."request-filtering-agent".allowPrivateIPAddress = true \|
		.services.CoAuthoring."request-filtering-agent".allowMetaIPAddress = true \|
		''}
		.storage.fs.secretString = "'$FS_SECRET_STRING'" \|
		.services.CoAuthoring.server.port = ${toString cfg.port} \|
		.services.CoAuthoring.sql.dbHost = "${cfg.postgresHost}" \|

+3 −3

Original line number	Diff line number	Diff line
		@@ -9,13 +9,13 @@
		}:
		mkLibretroCore {
		core = "parallel-n64";
		version = "0-unstable-2025-12-04";
		version = "0-unstable-2026-04-20";

		src = fetchFromGitHub {
		owner = "libretro";
		repo = "parallel-n64";
		rev = "1da824e13e725a7144f3245324f43d59623974f8";
		hash = "sha256-Th8VqENewfTeRTH+lONN7ZTMLQ0G6901q6ZBNMgepL4=";
		rev = "51aefbd38751563138b5fee3810ff653a78c4f24";
		hash = "sha256-E+3dcc+NgwdY23K9YqbH2El+hL1n+ihN4Sby19cYRBE=";
		};

		patches = [

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,13 +5,13 @@
		}:
		mkLibretroCore {
		core = "quicknes";
		version = "0-unstable-2026-03-31";
		version = "0-unstable-2026-04-20";

		src = fetchFromGitHub {
		owner = "libretro";
		repo = "QuickNES_Core";
		rev = "71782569078f29214017a966b0f992b9e512bf19";
		hash = "sha256-Bx1iZcrUG5B/wjeWf2hZEAIocM7dKgRwRPqpGzS2Cgc=";
		rev = "7848e1ac22b1c69d056ae4cb57710651ff1dd169";
		hash = "sha256-cgoLO1572XoDDBJiEFglWtbo3vk5EXu/U3Pn7zrxqM8=";
		};

		makefile = "Makefile";