Merge master into staging-next (23ee7d59) · Commits · nix / nixpkgs

ci/eval/compare/test.nix

+1 −11

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		lib ? pkgs.lib,
		}:
		let
		fun = import ./maintainers.nix;
		fun = import ./maintainers.nix { inherit lib; };

		mockPkgs =
		{
		@@ -46,7 +46,6 @@ let
		testEmpty = {
		expr = fun {
		pkgs = mockPkgs { };
		inherit lib;
		changedFiles = [ ];
		affectedAttrPaths = [ ];
		};
		@@ -59,7 +58,6 @@ let
		testNonExistentAffected = {
		expr = fun {
		pkgs = mockPkgs { };
		inherit lib;
		changedFiles = [ "a" ];
		affectedAttrPaths = [ [ "b" ] ];
		};
		@@ -74,7 +72,6 @@ let
		pkgs = mockPkgs {
		packages = [ [ "b" ] ];
		};
		inherit lib;
		changedFiles = [ "a" ];
		affectedAttrPaths = [ [ "b" ] ];
		};
		@@ -89,7 +86,6 @@ let
		pkgs = mockPkgs {
		packages = [ [ "b" ] ];
		};
		inherit lib;
		# Also tests that subpaths work
		changedFiles = [ "b/c" ];
		affectedAttrPaths = [ [ "b" ] ];
		@@ -110,7 +106,6 @@ let
		packages = [ [ "b" ] ];
		githubTeams = false;
		};
		inherit lib;
		changedFiles = [ "b/c" ];
		affectedAttrPaths = [ [ "b" ] ];
		};
		@@ -130,7 +125,6 @@ let
		pkgs = mockPkgs {
		packages = [ [ "hello" ] ];
		};
		inherit lib;
		changedFiles = [ "pkgs/by-name/he/hello/sources.json" ];
		affectedAttrPaths = [ ];
		};
		@@ -149,7 +143,6 @@ let
		pkgs = mockPkgs {
		packages = [ [ "hello" ] ];
		};
		inherit lib;
		changedFiles = [ "pkgs/by-name/README.md" ];
		affectedAttrPaths = [ ];
		};
		@@ -164,7 +157,6 @@ let
		pkgs = mockPkgs {
		packages = [ [ "hello" ] ];
		};
		inherit lib;
		changedFiles = [
		"hello"
		"pkgs/by-name/he/hello/sources.json"
		@@ -186,7 +178,6 @@ let
		pkgs = mockPkgs {
		modules = [ "a" ];
		};
		inherit lib;
		changedFiles = [ "a" ];
		affectedAttrPaths = [ ];
		};
		@@ -206,7 +197,6 @@ let
		modules = [ "a" ];
		githubTeams = false;
		};
		inherit lib;
		changedFiles = [ "a" ];
		affectedAttrPaths = [ ];
		};

ci/github-script/lint-commits.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ async function checkCommitMessages({ github, context, core, repoPath }) {
		if (failures.size !== 0) {
		core.error(
		'Please review the guidelines at ' +
		'https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions, ' +
		'<https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions>, ' +
		'as well as the applicable area-specific guidelines linked there.',
		)
		core.setFailed('Committers: merging is discouraged.')

maintainers/maintainer-list.nix

+10 −6

Original line number	Diff line number	Diff line
		@@ -16438,12 +16438,6 @@
		githubId = 5526;
		name = "Marcus Ramberg";
		};
		marcweber = {
		email = "marco-oweber@gmx.de";
		github = "MarcWeber";
		githubId = 34086;
		name = "Marc Weber";
		};
		marenz = {
		email = "marenz@arkom.men";
		github = "marenz2569";
		@@ -30130,6 +30124,16 @@
		githubId = 39456023;
		name = "Mike Yim";
		};
		zevisert = {
		email = "dev@zevisert.ca";
		github = "zevisert";
		githubId = 11222441;
		name = "Zev Isert";
		keys = [
		{ fingerprint = "BBA2 3AB2 60EA 8DD3 9889 F234 C530 8063 6561 2531"; }
		{ fingerprint = "897B 6DF1 D6FC 152C 9347 486D 042F 1F94 C62D DB03"; }
		];
		};
		zfnmxt = {
		name = "zfnmxt";
		email = "zfnmxt@zfnmxt.com";

maintainers/scripts/vanity-manual-equalities.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,5 @@ viric viriketo@gmail.com
		Pjotr Prins pjotr.public01@thebird.nl
		Pjotr Prins pjotr.public05@thebird.nl
		Wouter den Breejen wbreejen
		MarcWeber marcweber
		Ricardo Correia Ricardo M. Correia
		ertesx@gmx.de ertes

maintainers/team-list.nix

+4 −0

Original line number	Diff line number	Diff line
		@@ -712,6 +712,10 @@ with lib.maintainers;
		enableFeatureFreezePing = true;
		};

		security-review = {
		github = "security-review";
		};

		stdenv = {
		enableFeatureFreezePing = true;
		github = "stdenv";

Admin message