From f928402cbf8af48783d406fc9ddd5d9140010e74 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 15 Jan 2026 11:27:07 +0100 Subject: [PATCH] top-level/packages-info: inherit name and meta These will always be set on derivations produced by mkDerivation, so no need for the conditional code paths. --- pkgs/top-level/packages-info.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/packages-info.nix b/pkgs/top-level/packages-info.nix index 12164e90ba84..04f5f42cdfaa 100644 --- a/pkgs/top-level/packages-info.nix +++ b/pkgs/top-level/packages-info.nix @@ -16,16 +16,18 @@ let { name = lib.showAttrPath path; value = { - ${if value ? "meta" then "meta" else null} = value.meta; - ${if value ? "name" then "name" else null} = value.name; - ${if value ? "outputName" then "outputName" else null} = value.outputName; + inherit (value) + meta + name + outputName + system + ; ${if value ? "outputs" then "outputs" else null} = lib.listToAttrs ( lib.map (x: { name = x; value = null; }) value.outputs ); - ${if value ? "system" then "system" else null} = value.system; # TODO: Remove the following two fallbacks when all packages have been fixed. # Note: pname and version are *required* by repology, so do not change to # the optional pattern from above.