diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 810ba49fd27d..f6cb97c7d157 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -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"; diff --git a/pkgs/tools/package-management/nix/vendor/2_26/componentized.nix b/pkgs/tools/package-management/nix/vendor/2_26/componentized.nix index 5ac269dda488..fc1dcf394e3b 100644 --- a/pkgs/tools/package-management/nix/vendor/2_26/componentized.nix +++ b/pkgs/tools/package-management/nix/vendor/2_26/componentized.nix @@ -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 diff --git a/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix b/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix index 98a2f1026bea..f65370e12490 100644 --- a/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix +++ b/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix @@ -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; diff --git a/pkgs/tools/package-management/nix/vendor/2_26/packaging/everything.nix b/pkgs/tools/package-management/nix/vendor/2_26/packaging/everything.nix index 0ff50ab5862c..aab58cc82509 100644 --- a/pkgs/tools/package-management/nix/vendor/2_26/packaging/everything.nix +++ b/pkgs/tools/package-management/nix/vendor/2_26/packaging/everything.nix @@ -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"