nixVersions.nix_2_26: Add maintainers to scope, use nix_2_24 maintainers (2be4c2c0) · Commits · nix / nixpkgs

pkgs/tools/package-management/nix/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ in lib.makeExtensible (self: ({
		self_attribute_name = "nix_2_25";
		};

		nix_2_26 = addTests "nix_2_26" (callPackage ./vendor/2_26/componentized.nix { });
		nix_2_26 = addTests "nix_2_26" (callPackage ./vendor/2_26/componentized.nix { inherit (self.nix_2_24.meta) maintainers; });

		git = common rec {
		version = "2.25.0";

+2 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@
		newScope,
		pkgs,
		stdenv,
		maintainers,
		...
		}:
		let
		@@ -27,6 +28,7 @@ let
		f = import ./packaging/components.nix {
		inherit
		lib
		maintainers
		officialRelease
		pkgs
		src

+3 −2

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		pkgs,
		src,
		officialRelease,
		maintainers,
		}:

		scope:
		@@ -195,7 +196,7 @@ let
		environments.
		'';
		license = prevAttrs.meta.license or lib.licenses.lgpl21Plus;
		maintainers = prevAttrs.meta.maintainers or [ ] ++ lib.teams.nix.members;
		maintainers = prevAttrs.meta.maintainers or [ ] ++ scope.maintainers;
		platforms = prevAttrs.meta.platforms or (lib.platforms.unix ++ lib.platforms.windows);
		};
		};
		@@ -217,7 +218,7 @@ in
		{
		version = baseVersion + versionSuffix;
		inherit versionSuffix;
		maintainers = lib.teams.nix.members;
		inherit maintainers;

		inherit filesetToSource;

+3 −1

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@
		lndir,
		buildEnv,

		maintainers,

		nix-util,
		nix-util-c,
		nix-util-tests,
		@@ -217,7 +219,7 @@ stdenv.mkDerivation (finalAttrs: {
		longDescription = nix-cli.meta.longDescription;
		homepage = nix-cli.meta.homepage;
		license = nix-cli.meta.license;
		maintainers = lib.teams.nix.members;
		maintainers = maintainers;
		platforms = nix-cli.meta.platforms;
		outputsToInstall = [
		"out"