stdenv: Validate meta.outputsToInstall
If meta.outputsToInstall is set to include absent outputs, various tools break including channel updates and nix-env. grahamc@Morbo> nix-env -i -f . -A elf-header-real installing 'elf-header' error: this derivation has bad 'meta.outputsToInstall' This patch verifies each value in meta.outputsToInstall is a valid output. It validates this condition only if checkMeta is true. grahamc@Morbo> nix-build . -A elf-header-real error: Package ‘elf-header’ in /home/grahamc/projects/nixpkgs/pkgs/development/libraries/elf-header/default.nix:36 has invalid meta.outputsToInstall, refusing to evaluate. The package elf-header has set meta.outputsToInstall to: bin however elf-header only has the outputs: out and is missing the following ouputs: - bin (use '--show-trace' to show detailed location information) Note, now the nix-env experience is decidedly worse for users who have checkMeta set to true: grahamc@Morbo> nix-env -i -f . -A elf-header-real; echo $? 0 though since this is already an issue for unfree, broken, unsupported, and insecure validity problems I'm not sure we should do something different here.
This commit is contained in:
parent
0a30853461
commit
b80c9ce4a9
@ -81,6 +81,7 @@ let
|
|||||||
unsupported = remediate_whitelist "UnsupportedSystem";
|
unsupported = remediate_whitelist "UnsupportedSystem";
|
||||||
blacklisted = x: "";
|
blacklisted = x: "";
|
||||||
insecure = remediate_insecure;
|
insecure = remediate_insecure;
|
||||||
|
broken-outputs = remediateOutputsToInstall;
|
||||||
unknown-meta = x: "";
|
unknown-meta = x: "";
|
||||||
};
|
};
|
||||||
remediate_whitelist = allow_attr: attrs:
|
remediate_whitelist = allow_attr: attrs:
|
||||||
@ -125,6 +126,20 @@ let
|
|||||||
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
remediateOutputsToInstall = attrs: let
|
||||||
|
expectedOutputs = attrs.meta.outputsToInstall or [];
|
||||||
|
actualOutputs = attrs.outputs or [ "out" ];
|
||||||
|
missingOutputs = builtins.filter (output: ! builtins.elem output actualOutputs) expectedOutputs;
|
||||||
|
in ''
|
||||||
|
The package ${attrs.name} has set meta.outputsToInstall to: ${builtins.concatStringsSep ", " expectedOutputs}
|
||||||
|
|
||||||
|
however ${attrs.name} only has the outputs: ${builtins.concatStringsSep ", " actualOutputs}
|
||||||
|
|
||||||
|
and is missing the following ouputs:
|
||||||
|
|
||||||
|
${lib.concatStrings (builtins.map (output: " - ${output}\n") missingOutputs)}
|
||||||
|
'';
|
||||||
|
|
||||||
handleEvalIssue = attrs: { reason , errormsg ? "" }:
|
handleEvalIssue = attrs: { reason , errormsg ? "" }:
|
||||||
let
|
let
|
||||||
msg = ''
|
msg = ''
|
||||||
@ -185,6 +200,14 @@ let
|
|||||||
in anyMatch (attrs.meta.platforms or lib.platforms.all) &&
|
in anyMatch (attrs.meta.platforms or lib.platforms.all) &&
|
||||||
! anyMatch (attrs.meta.badPlatforms or []);
|
! anyMatch (attrs.meta.badPlatforms or []);
|
||||||
|
|
||||||
|
checkOutputsToInstall = attrs: let
|
||||||
|
expectedOutputs = attrs.meta.outputsToInstall or [];
|
||||||
|
actualOutputs = attrs.outputs or [ "out" ];
|
||||||
|
missingOutputs = builtins.filter (output: ! builtins.elem output actualOutputs) expectedOutputs;
|
||||||
|
in if shouldCheckMeta
|
||||||
|
then builtins.length missingOutputs > 0
|
||||||
|
else false;
|
||||||
|
|
||||||
# Check if a derivation is valid, that is whether it passes checks for
|
# Check if a derivation is valid, that is whether it passes checks for
|
||||||
# e.g brokenness or license.
|
# e.g brokenness or license.
|
||||||
#
|
#
|
||||||
@ -202,6 +225,8 @@ let
|
|||||||
{ valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.config}’"; }
|
{ valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.config}’"; }
|
||||||
else if !(hasAllowedInsecure attrs) then
|
else if !(hasAllowedInsecure attrs) then
|
||||||
{ valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }
|
{ valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }
|
||||||
|
else if checkOutputsToInstall attrs then
|
||||||
|
{ valid = false; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; }
|
||||||
else let res = checkMeta (attrs.meta or {}); in if res != [] then
|
else let res = checkMeta (attrs.meta or {}); in if res != [] then
|
||||||
{ valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }
|
{ valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }
|
||||||
else { valid = true; };
|
else { valid = true; };
|
||||||
|
Loading…
Reference in New Issue
Block a user