Merge master into staging-next (88d2346a) · Commits · nix / nixpkgs

maintainers/github-teams.json

+3 −6

Original line number	Diff line number	Diff line
		@@ -170,8 +170,8 @@
		"emilazy": 18535642
		},
		"members": {
		"reckenrode": 7413633,
		"Samasaur1": 30577766,
		"reckenrode": 7413633,
		"toonn": 1486805
		},
		"name": "darwin-core"
		@@ -212,7 +212,6 @@
		"emilazy": 18535642,
		"ethancedwards8": 60861925,
		"fiddlerwoaroof": 808745,
		"frogamic": 10263813,
		"gador": 1883533,
		"griff": 4368,
		"groodt": 343415,
		@@ -277,9 +276,7 @@
		"documentation-team": {
		"description": "Maintain nixpkgs/NixOS documentation and tools for building it. https://nixos.org/community/teams/documentation",
		"id": 6590023,
		"maintainers": {
		"alejandrosame": 1078000
		},
		"maintainers": {},
		"members": {
		"hsjobeki": 50398876,
		"wamirez": 24505474
		@@ -485,9 +482,9 @@
		"wrmilling": 6162814
		},
		"members": {
		"azey7f": 41077433,
		"frederictobiasc": 26125115,
		"heywoodlh": 18178614,
		"maevii": 41077433,
		"rorosen": 76747196
		},
		"name": "k3s"

maintainers/maintainer-list.nix

+14 −8

Original line number	Diff line number	Diff line
		@@ -2809,14 +2809,6 @@
		githubId = 426541;
		name = "Tim Kleinschmidt";
		};
		azey7f = {
		email = "me@azey.net";
		github = "azey7f";
		githubId = 41077433;
		name = "azey";
		# assuming my nameservers are up: gpg --auto-key-locate clear,nodefault,cert,dane --locate-keys me@azey.net
		keys = [ { fingerprint = "2CCB 3403 43FE 8A2B 91CE 7F75 F94F 4A71 C5C2 1E8F"; } ];
		};
		azuwis = {
		email = "azuwis@gmail.com";
		github = "azuwis";
		@@ -15860,6 +15852,14 @@
		githubId = 38541651;
		name = "maeve";
		};
		maevii = {
		email = "me@maevi.net";
		github = "maevii";
		githubId = 41077433;
		name = "Maevi";
		# assuming my nameservers are up: gpg --auto-key-locate clear,nodefault,cert,dane --locate-keys me@maevi.net
		keys = [ { fingerprint = "A176 4D41 E826 A6E5 A5A1 8231 7670 F0F0 C946 12F4"; } ];
		};
		mafo = {
		email = "Marc.Fontaine@gmx.de";
		github = "MarcFontaine";
		@@ -23754,6 +23754,12 @@
		name = "Otto Sabart";
		keys = [ { fingerprint = "0AF6 4C3B 1F12 14B3 8C8C 5786 1FA2 DBE6 7438 7CC3"; } ];
		};
		sebimarkgraf = {
		email = "sebastian-markgraf@t-online.de";
		github = "sebimarkgraf";
		githubId = 24530526;
		name = "Sebastian Mossburger";
		};
		sebrut = {
		email = "kontakt@sebastian-rutofski.de";
		github = "sebrut";

pkgs/applications/editors/jetbrains/default.nix

+2 −2

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

		pycharm-community =
		lib.warnOnInstantiate
		"pycharm-comminity: PyCharm Community has been discontinued by Jetbrains. This deprecated alias uses the, no longer updated, binary build on Darwin. On Linux it uses PyCharm Open Source, built from source. Either switch to 'jetbrains.pycharm-oss' or 'jetbrains.pycharm'. See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025"
		"pycharm-community: PyCharm Community has been discontinued by Jetbrains. This deprecated alias uses the, no longer updated, binary build on Darwin. On Linux it uses PyCharm Open Source, built from source. Either switch to 'jetbrains.pycharm-oss' or 'jetbrains.pycharm'. See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025"
		(
		if stdenv.hostPlatform.isDarwin then
		pycharm-community-bin
		@@ -134,7 +134,7 @@ in

		pycharm-community-bin =
		lib.warnOnInstantiate
		"pycharm-comminity-bin: PyCharm Community has been discontinued by Jetbrains. This binary build is no longer updated. Switch to 'jetbrains.pycharm-oss' for open source builds (from source) or 'jetbrains.pycharm' for commercial builds (binary, unfree). See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025"
		"pycharm-community-bin: PyCharm Community has been discontinued by Jetbrains. This binary build is no longer updated. Switch to 'jetbrains.pycharm-oss' for open source builds (from source) or 'jetbrains.pycharm' for commercial builds (binary, unfree). See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025"
		(mkBinIde ./ides/pycharm-community.nix { inherit pyCharmCommonOverrides; });

		pycharm-community-src =

pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
		mktplcRef = {
		publisher = "sourcegraph";
		name = "amp";
		version = "0.0.1767715893";
		hash = "sha256-/r+OMv0Ilyk6Ep1nF0LMFy9e0We3XfhpQhSt+L/UoOg=";
		version = "0.0.1768263519";
		hash = "sha256-uOvvkzXvyHiJP3ZxHBJhXW/M8Ju1DjSXpwflAkKjgxs=";
		};

		meta = {

pkgs/applications/networking/cluster/rke2/builder.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -159,7 +159,7 @@ buildGoModule (finalAttrs: {
		changelog = "https://github.com/rancher/rke2/releases/tag/v${finalAttrs.version}";
		license = lib.licenses.asl20;
		maintainers = with lib.maintainers; [
		azey7f
		maevii
		rorosen
		zimbatm
		zygot

Admin message