Merge branch 'master' into staging-next (37876dbd) · Commits · nix / nixpkgs

.github/workflows/check-by-name.yml

+7 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,13 @@ permissions:
		# We need this permission to cancel the workflow run if there's a merge conflict
		actions: write

		# Create a check-by-name concurrency group based on the pull request number. if
		# an event triggers a run on the same PR while a previous run is still in
		# progress, the previous run will be canceled and the new one will start.
		concurrency:
		group: check-by-name-${{ github.event.pull_request.number }}
		cancel-in-progress: true

		jobs:
		check:
		# This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases

maintainers/maintainer-list.nix

+0 −43

Original line number	Diff line number	Diff line
		@@ -4364,12 +4364,6 @@
		githubId = 990767;
		name = "Daniel Olsen";
		};
		danderson = {
		email = "dave@natulte.net";
		github = "danderson";
		githubId = 1918;
		name = "David Anderson";
		};
		daneads = {
		email = "me@daneads.com";
		github = "daneads";
		@@ -6504,16 +6498,6 @@
		githubId = 541748;
		name = "Felipe Espinoza";
		};
		federicoschonborn = {
		name = "Federico Damián Schonborn";
		email = "federicoschonborn@disroot.org";
		github = "FedericoSchonborn";
		githubId = 62166915;
		matrix = "@FedericoDSchonborn:matrix.org";
		keys = [
		{ fingerprint = "C43F 4052 D289 3B73 33F8 0259 E4F6 F544 DE9E 29E8"; }
		];
		};
		fedx-sudo = {
		email = "fedx-sudo@pm.me";
		github = "FedX-sudo";
		@@ -10404,15 +10388,6 @@
		github = "keenanweaver";
		githubId = 37268985;
		};
		keksbg = {
		email = "keksbg@riseup.net";
		name = "Stella";
		github = "keksbg";
		githubId = 10682187;
		keys = [{
		fingerprint = "AB42 1F18 5A19 A160 AD77 9885 3D6D CA5B 6F2C 2A7A";
		}];
		};
		keldu = {
		email = "mail@keldu.de";
		github = "keldu";
		@@ -15393,12 +15368,6 @@
		githubId = 72527881;
		name = "PassiveLemon";
		};
		patka = {
		email = "patka@patka.dev";
		github = "patka-123";
		githubId = 69802930;
		name = "patka";
		};
		patricksjackson = {
		email = "patrick@jackson.dev";
		github = "patricksjackson";
		@@ -20326,12 +20295,6 @@
		github = "tirimia";
		githubId = 11174371;
		};
		titanous = {
		email = "jonathan@titanous.com";
		github = "titanous";
		githubId = 13026;
		name = "Jonathan Rudenberg";
		};
		tjni = {
		email = "43ngvg@masqt.com";
		matrix = "@tni:matrix.org";
		@@ -20427,12 +20390,6 @@
		githubId = 74688871;
		name = "Tochukwu Ahanonu";
		};
		tokudan = {
		email = "git@danielfrank.net";
		github = "tokudan";
		githubId = 692610;
		name = "Daniel Frank";
		};
		tomahna = {
		email = "kevin.rauscher@tomahna.fr";
		github = "Tomahna";

maintainers/team-list.nix

+0 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,6 @@ with lib.maintainers; {
		budgie = {
		members = [
		bobby285271
		federicoschonborn
		];
		scope = "Maintain Budgie desktop environment";
		shortName = "Budgie";

nixos/doc/manual/release-notes/rl-2405.section.md

+47 −47

File changed.

Preview size limit exceeded, changes collapsed.

nixos/modules/services/networking/pixiecore.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ let
		cfg = config.services.pixiecore;
		in
		{
		meta.maintainers = with maintainers; [ bbigras danderson ];
		meta.maintainers = with maintainers; [ bbigras ];

		options = {
		services.pixiecore = {

Admin message