Merge master into staging-next (562c842d) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+18 −0

Original line number	Diff line number	Diff line
		@@ -8330,6 +8330,12 @@
		keys = [ { fingerprint = "7391 BF2D A2C3 B2C9 BE25 ACA9 C7A7 4616 F302 5DF4"; } ];
		matrix = "@felipeqq2:pub.solar";
		};
		felissedano = {
		name = "Felis Sedano";
		email = "contact@felissedano.com";
		github = "felissedano";
		githubId = 109383955;
		};
		felixalbrigtsen = {
		email = "felix@albrigtsen.it";
		github = "felixalbrigtsen";
		@@ -15289,6 +15295,12 @@
		githubId = 208297;
		name = "Luz";
		};
		lwb-2021 = {
		email = "lwb-2021@qq.com";
		github = "lwb-2021";
		githubId = 91705377;
		name = "lwb-2021";
		};
		lx = {
		email = "alex@adnab.me";
		github = "Alexis211";
		@@ -24009,6 +24021,12 @@
		githubId = 617130;
		keys = [ { fingerprint = "C4F7 46C7 B560 38D8 210F 0288 5877 DEE9 7428 557F"; } ];
		};
		skohtv = {
		name = "Skoh";
		email = "contact@skoh.dev";
		github = "skohtv";
		githubId = 101289702;
		};
		skovati = {
		github = "skovati";
		githubId = 49844593;

nixos/modules/misc/ids.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ in
		description = ''
		The user IDs used in NixOS.
		'';
		type = types.attrsOf types.int;
		type = types.attrsOf types.ints.u32;
		};

		ids.gids = lib.mkOption {
		@@ -39,7 +39,7 @@ in
		description = ''
		The group IDs used in NixOS.
		'';
		type = types.attrsOf types.int;
		type = types.attrsOf types.ints.u32;
		};

		};

nixos/modules/profiles/nix-builder-vm.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ in
		};
		hostPort = mkOption {
		default = 31022;
		type = types.int;
		type = types.port;
		example = 22;
		description = ''
		The localhost host port to forward TCP to the guest port.

nixos/modules/programs/shadow.nix

+8 −8

Original line number	Diff line number	Diff line
		@@ -77,49 +77,49 @@ in
		SYS_UID_MIN = lib.mkOption {
		description = "Range of user IDs used for the creation of system users by useradd or newusers.";
		default = 400;
		type = lib.types.int;
		type = lib.types.ints.u32;
		};

		SYS_UID_MAX = lib.mkOption {
		description = "Range of user IDs used for the creation of system users by useradd or newusers.";
		default = 999;
		type = lib.types.int;
		type = lib.types.ints.u32;
		};

		UID_MIN = lib.mkOption {
		description = "Range of user IDs used for the creation of regular users by useradd or newusers.";
		default = 1000;
		type = lib.types.int;
		type = lib.types.ints.u32;
		};

		UID_MAX = lib.mkOption {
		description = "Range of user IDs used for the creation of regular users by useradd or newusers.";
		default = 29999;
		type = lib.types.int;
		type = lib.types.ints.u32;
		};

		SYS_GID_MIN = lib.mkOption {
		description = "Range of group IDs used for the creation of system groups by useradd, groupadd, or newusers";
		default = 400;
		type = lib.types.int;
		type = lib.types.ints.u32;
		};

		SYS_GID_MAX = lib.mkOption {
		description = "Range of group IDs used for the creation of system groups by useradd, groupadd, or newusers";
		default = 999;
		type = lib.types.int;
		type = lib.types.ints.u32;
		};

		GID_MIN = lib.mkOption {
		description = "Range of group IDs used for the creation of regular groups by useradd, groupadd, or newusers.";
		default = 1000;
		type = lib.types.int;
		type = lib.types.ints.u32;
		};

		GID_MAX = lib.mkOption {
		description = "Range of group IDs used for the creation of regular groups by useradd, groupadd, or newusers.";
		default = 29999;
		type = lib.types.int;
		type = lib.types.ints.u32;
		};

		TTYGROUP = lib.mkOption {

nixos/modules/services/continuous-integration/buildbot/master.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ in

		pbPort = lib.mkOption {
		default = 9989;
		type = lib.types.either lib.types.str lib.types.int;
		type = lib.types.either lib.types.str lib.types.port;
		example = "'tcp:9990:interface=127.0.0.1'";
		description = ''
		The buildmaster will listen on a TCP port of your choosing

Admin message