Merge master into staging-nixos (659f1aba) · Commits · nix / nixpkgs

doc/release-notes/rl-2511.section.md

+2 −0

Original line number	Diff line number	Diff line
		@@ -225,6 +225,8 @@

		- `rocmPackages.triton` has been removed in favor of `python3Packages.triton`.

		- `oink` service no longer accepts `settings.apiKey` and `settings.secretApiKey` options as these have been replaced by `apiKeyFile` and `secretApiKeyFile`.

		- `linpinyin`, which is used for Chinese character input, has migrated from the unmaintained BDB database format to the newer KyotoCabinet database format. If you want to migrate your user input statistics you can consider using [bdbtokyotodb](https://codeberg.org/raboof/bdbtokyotodb).

		- `go-mockery` has been updated to v3. For migration instructions see the [upstream documentation](https://vektra.github.io/mockery/latest/v3/). If v2 is still required `go-mockery_v2` has been added but will be removed on or before 2029-12-31 in-line with its [upstream support lifecycle](https://vektra.github.io/mockery/)

lib/licenses.nix

+5 −0

Original line number	Diff line number	Diff line
		@@ -747,6 +747,11 @@ lib.mapAttrs mkLicense (
		fullName = "Historical Permission Notice and Disclaimer - University of California variant";
		};

		hyphenBulgarian = {
		fullName = "hyphen-bulgarian License";
		spdxId = "hyphen-bulgarian";
		};

		# Intel's license, seems free
		iasl = {
		spdxId = "Intel-ACPI";

maintainers/github-teams.json

+0 −1

Original line number	Diff line number	Diff line
		@@ -220,7 +220,6 @@
		"gshpychka": 23005347,
		"hexagonal-sun": 222664,
		"heywoodlh": 18178614,
		"iedame": 60272,
		"isabelroses": 71222764,
		"jonhermansen": 660911,
		"juliusrickert": 5007494,

maintainers/maintainer-list.nix

+21 −9

Original line number	Diff line number	Diff line
		@@ -588,7 +588,7 @@
		adamperkowski = {
		name = "Adam Perkowski";
		email = "me@adamperkowski.dev";
		matrix = "@xx0a_q:matrix.org";
		matrix = "@adam:matrix.system72.dev";
		github = "adamperkowski";
		githubId = 75480869;
		keys = [
		@@ -1156,10 +1156,11 @@
		name = "Alexandru Nechita";
		};
		alexandrutocar = {
		email = "at@myquiet.place";
		email = "alexandru.tocar@outlook.com";
		github = "alexandrutocar";
		githubId = 65486851;
		name = "Alexandru Tocar";
		keys = [ { fingerprint = "B617 DD24 3AB0 2E3F 2E67 DBFD 1305 2A85 D7A4 2AA4"; } ];
		};
		alexarice = {
		email = "alexrice999@hotmail.co.uk";
		@@ -1191,6 +1192,12 @@
		githubId = 2335822;
		name = "Alexandre Esteves";
		};
		alexland7219 = {
		email = "alexland7219@gmail.com";
		github = "alexland7219";
		githubId = 58669111;
		name = "Alexandre Ros";
		};
		alexnabokikh = {
		email = "nabokikh@duck.com";
		github = "alexnabokikh";
		@@ -10840,12 +10847,6 @@
		githubId = 1550265;
		name = "Dominic Steinitz";
		};
		iedame = {
		email = "git@ieda.me";
		github = "iedame";
		githubId = 60272;
		name = "Rafael Ieda";
		};
		if-loop69420 = {
		github = "if-loop69420";
		githubId = 81078181;
		@@ -12602,7 +12603,7 @@
		name = "Ioannis Koutras";
		};
		jolars = {
		email = "jolars@posteo.com";
		email = "johan@jolars.co";
		matrix = "@jola:mozilla.org";
		github = "jolars";
		githubId = 13087841;
		@@ -23961,6 +23962,7 @@
		githubId = 49711232;
		github = "ShyAssassin";
		email = "ShyAssassin@assassin.dev";
		keys = [ { fingerprint = "370E 8296 12AF D0E1 9A1A 88F6 AA81 2447 4716 E56D"; } ];
		};
		shyim = {
		email = "s.sayakci@gmail.com";
		@@ -28911,6 +28913,16 @@
		name = "Zexin Yuan";
		keys = [ { fingerprint = "FE16 B281 90EF 6C3F F661 6441 C2DD 1916 FE47 1BE2"; } ];
		};
		zacharyarnaise = {
		name = "Zachary Arnaise";
		github = "zacharyarnaise";
		githubId = 121795280;
		keys = [
		{
		fingerprint = "5C1A 2BE8 C6B4 AFC0 DE82 73E9 B1F3 94D8 D460 C3B2";
		}
		];
		};
		zacharyweiss = {
		name = "Zachary Weiss";
		email = "me@zachary.ws";

nixos/modules/services/backup/pgbackrest.nix

+2 −8

Original line number	Diff line number	Diff line
		@@ -83,10 +83,7 @@ let
		secretPathOption =
		with lib.types;
		lib.mkOption {
		type = nullOr (pathWith {
		inStore = false;
		absolute = true;
		});
		type = nullOr externalPath;
		default = null;
		internal = true;
		};
		@@ -142,10 +139,7 @@ in
		};

		options.sftp-private-key-file = lib.mkOption {
		type = nullOr (pathWith {
		inStore = false;
		absolute = true;
		});
		type = nullOr externalPath;
		default = null;
		description = ''
		SFTP private key file.