Merge remote-tracking branch 'origin/staging-next' into staging (6ddff449) · Commits · nix / nixpkgs

ci/eval/attrpaths.nix

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		lib ? import (path + "/lib"),
		trace ? false,
		path ? ./../..,
		extraNixpkgsConfigJson ? "{}",
		}:
		let

		@@ -46,6 +47,7 @@ let

		outpaths = import ./outpaths.nix {
		inherit path;
		extraNixpkgsConfig = builtins.fromJSON extraNixpkgsConfigJson;
		attrNamesOnly = true;
		};

ci/eval/chunk.nix

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@
		myChunk,
		includeBroken,
		systems,
		extraNixpkgsConfigJson,
		}:

		let
		@@ -17,6 +18,7 @@ let
		unfiltered = import ./outpaths.nix {
		inherit path;
		inherit includeBroken systems;
		extraNixpkgsConfig = builtins.fromJSON extraNixpkgsConfigJson;
		};

		# Turns the unfiltered recursive attribute set into one that is limited to myAttrpaths

ci/eval/default.nix

+15 −15

Original line number	Diff line number	Diff line
		@@ -19,6 +19,17 @@
		nix,
		}:

		{
		# The number of attributes per chunk, see ./README.md for more info.
		chunkSize ? 5000,
		# Whether to just evaluate a single chunk for quick testing
		quickTest ? false,
		# Don't try to eval packages marked as broken.
		includeBroken ? false,
		# Customize the config used to evaluate nixpkgs
		extraNixpkgsConfig ? { },
		}:

		let
		nixpkgs =
		with lib.fileset;
		@@ -66,6 +77,7 @@ let
		"$src/ci/eval/attrpaths.nix" \
		-A paths \
		-I "$src" \
		--argstr extraNixpkgsConfigJson ${lib.escapeShellArg (builtins.toJSON extraNixpkgsConfig)} \
		--option restrict-eval true \
		--option allow-import-from-derivation false \
		--option eval-system "${evalSystem}" > $out/paths.json
		@@ -79,13 +91,6 @@ let
		evalSystem ? builtins.currentSystem,
		# The path to the `paths.json` file from `attrpathsSuperset`
		attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json",
		# The number of attributes per chunk, see ./README.md for more info.
		chunkSize ? 5000,

		# Don't try to eval packages marked as broken.
		includeBroken ? false,
		# Whether to just evaluate a single chunk for quick testing
		quickTest ? false,
		}:
		let
		singleChunk = writeShellScript "single-chunk" ''
		@@ -118,6 +123,7 @@ let
		--arg attrpathFile "${attrpathFile}" \
		--arg systems "[ \"$system\" ]" \
		--arg includeBroken ${lib.boolToString includeBroken} \
		--argstr extraNixpkgsConfigJson ${lib.escapeShellArg (builtins.toJSON extraNixpkgsConfig)} \
		-I ${nixpkgs} \
		-I ${attrpathFile} \
		> "$outputDir/result/$myChunk" \
		@@ -259,16 +265,13 @@ let
		{
		# Whether to evaluate on a specific set of systems, by default all are evaluated
		evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
		# The number of attributes per chunk, see ./README.md for more info.
		chunkSize ? 5000,
		quickTest ? false,
		}:
		symlinkJoin {
		name = "nixpkgs-eval-baseline";
		paths = map (
		evalSystem:
		singleSystem {
		inherit quickTest evalSystem chunkSize;
		inherit evalSystem;
		}
		) evalSystems;
		};
		@@ -277,9 +280,6 @@ let
		{
		# Whether to evaluate on a specific set of systems, by default all are evaluated
		evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
		# The number of attributes per chunk, see ./README.md for more info.
		chunkSize ? 5000,
		quickTest ? false,
		baseline,
		# Which maintainer should be considered the author?
		# Defaults to nixpkgs-ci which is not a maintainer and skips the check.
		@@ -300,7 +300,7 @@ let
		inherit evalSystem;
		beforeDir = baseline;
		afterDir = singleSystem {
		inherit quickTest evalSystem chunkSize;
		inherit evalSystem;
		};
		}
		) evalSystems;

ci/eval/outpaths.nix

+5 −1

Original line number	Diff line number	Diff line
		@@ -11,6 +11,9 @@

		# Set this to `null` to build for builtins.currentSystem only
		systems ? builtins.fromJSON (builtins.readFile ../supportedSystems.json),

		# Customize the config used to evaluate nixpkgs
		extraNixpkgsConfig ? { },
		}:
		let
		lib = import (path + "/lib");
		@@ -55,7 +58,8 @@ let
		true;

		inHydra = true;
		};
		}
		// extraNixpkgsConfig;

		__allowFileset = false;
		};

maintainers/maintainer-list.nix

+6 −1

Original line number	Diff line number	Diff line
		@@ -14100,7 +14100,7 @@
		};
		KunyaKud = {
		name = "KunyaKud";
		email = "KunyaKud@proton.me";
		email = "wafuu@posteo.net";
		github = "KunyaKud";
		githubId = 238898928;
		};
		@@ -24206,6 +24206,11 @@
		name = "Sebastian Kowalak";
		matrix = "@scl:tchncs.de";
		};
		skwig = {
		name = "skwig";
		github = "skwig";
		githubId = 16136203;
		};
		skyesoss = {
		name = "Skye Soss";
		matrix = "@skyesoss:matrix.org";