Merge master into staging-next (4274b3d7) · Commits · nix / nixpkgs

ci/github-script/prepare.js

+1 −4

Original line number	Diff line number	Diff line
		@@ -128,10 +128,7 @@ module.exports = async ({ github, context, core, dry }) => {
		)

		// Make sure that we always check the current target as well, even if its a WIP branch.
		// If it's not a WIP branch, it was already included in either releases or secondary.
		if (classify(base.ref).type.includes('wip')) {
		secondary.push(classify(base.ref))
		}

		for (const branch of secondary) {
		const nextCandidate = await mergeBase(branch)

maintainers/maintainer-list.nix

+18 −0

Original line number	Diff line number	Diff line
		@@ -273,6 +273,12 @@
		githubId = 92977828;
		name = "Mori Zen";
		};
		_7karni = {
		email = "7karni@proton.me";
		name = "7karni";
		github = "7karni";
		githubId = 234714120;
		};
		_8-bit-fox = {
		email = "sebastian@markwaerter.de";
		github = "8-bit-fox";
		@@ -22589,6 +22595,13 @@
		githubId = 592876;
		name = "Robert W. Pearce";
		};
		rpqt = {
		email = "rpqt@rpqt.fr";
		matrix = "@rpqt:matrix.org";
		github = "rpqt";
		githubId = 49253685;
		name = "Romain Paquet";
		};
		rprecenth = {
		email = "rasmus@precenth.eu";
		github = "Prillan";
		@@ -26248,6 +26261,11 @@
		name = "Chinmay D. Pai";
		keys = [ { fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; } ];
		};
		thunze = {
		name = "Tom Hunze";
		github = "thunze";
		githubId = 22795263;
		};
		tiagolobocastro = {
		email = "tiagolobocastro@gmail.com";
		github = "tiagolobocastro";

nixos/modules/programs/fish.nix

+3 −1

Original line number	Diff line number	Diff line
		@@ -26,13 +26,15 @@ let

		envInteractiveShellInit = pkgs.writeText "interactiveShellInit" cfge.interactiveShellInit;

		# Need to use --no-config to prevent fish_indent from trying to read from config
		# See https://github.com/fish-shell/fish-shell/issues/12079
		indentFishFile =
		name: text:
		pkgs.runCommand name {
		nativeBuildInputs = [ cfg.package ];
		inherit text;
		passAsFile = [ "text" ];
		} "fish_indent < $textPath > $out";
		} "fish --no-config -c 'fish_indent $textPath' > $out";

		sourceEnv =
		file:

nixos/modules/services/networking/i2pd.nix

+34 −9

Original line number	Diff line number	Diff line
		@@ -106,10 +106,6 @@ let
		description = "Number of ElGamal/AES tags to send.";
		default = 40;
		};
		destination = mkOption {
		type = types.str;
		description = "Remote endpoint, I2P hostname or b32.i2p address.";
		};
		keys = mkOption {
		type = types.str;
		default = name + "-keys.dat";
		@@ -228,7 +224,7 @@ let
		let
		outTunOpts = [
		(sec tun.name)
		"type = client"
		(intOpt "type" tun.type)
		(intOpt "port" tun.port)
		(strOpt "destination" tun.destination)
		]
		@@ -250,14 +246,20 @@ let
		let
		inTunOpts = [
		(sec tun.name)
		"type = server"
		(intOpt "type" tun.type)
		(intOpt "port" tun.port)
		(strOpt "host" tun.address)
		]
		++ (optionals (tun ? destination) (optionalNullString "destination" tun.destination))
		++ (optionals (tun ? keys) (optionalNullString "keys" tun.keys))
		++ (optionals (tun ? inPort) (optionalNullInt "inport" tun.inPort))
		++ (optionals (tun ? accessList) (optionalEmptyList "accesslist" tun.accessList));
		++ (optionals (tun ? accessList) (optionalEmptyList "accesslist" tun.accessList))
		++ (optionals (tun ? inbound.length) (optionalNullInt "inbound.length" tun.inbound.length))
		++ (optionals (tun ? inbound.quantity) (optionalNullInt "inbound.quantity" tun.inbound.quantity))
		++ (optionals (tun ? outbound.length) (optionalNullInt "outbound.length" tun.outbound.length))
		++ (optionals (tun ? outbound.quantity) (optionalNullInt "outbound.quantity" tun.outbound.quantity))
		++ (optionals (tun ? crypto.tagsToSend) (
		optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend
		));
		in
		lib.concatStringsSep "\n" inTunOpts;

		@@ -395,7 +397,8 @@ in

		floodfill = mkEnableOption "floodfill" // {
		description = ''
		If the router is declared to be unreachable and needs introduction nodes.
		Makes your router a floodfill, that means what other routers will
		publish and get LeaseSets and RouterInfos on your router.
		'';
		};

		@@ -685,6 +688,18 @@ in
		{ name, ... }:
		{
		options = {
		type = mkOption {
		type = types.enum [
		"client"
		"udpclient"
		];
		default = "client";
		description = "Tunnel type.";
		};
		destination = mkOption {
		type = types.str;
		description = "Remote endpoint, I2P hostname or b32.i2p address.";
		};
		destinationPort = mkOption {
		type = with types; nullOr port;
		default = null;
		@@ -710,6 +725,16 @@ in
		{ name, ... }:
		{
		options = {
		type = mkOption {
		type = types.enum [
		"server"
		"http"
		"irc"
		"udpserver"
		];
		default = "server";
		description = "Tunnel type.";
		};
		inPort = mkOption {
		type = types.port;
		default = 0;

nixos/modules/services/networking/knot.nix

+5 −0

Original line number	Diff line number	Diff line
		@@ -61,10 +61,14 @@ let
		"remotes"
		"acl"
		"submission"
		"dnskey-sync"
		"policy"
		"external"
		# mod-* is above
		"template"
		"zone"
		"include"
		"clear"
		];
		secsCheck =
		let
		@@ -101,6 +105,7 @@ let
		"remotes"
		"acl"
		"submission"
		"dnskey-sync"
		"policy"
		"external"
		]

Admin message