public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #46834 from grahamc/check-outputs-in-meta

Browse Source 
stdenv: Validate meta.outputsToInstall
This commit is contained in:
Graham Christensen 2018-09-18 11:08:08 -04:00 committed by GitHub
commit 11c76c932f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/elf-header/default.nix
View File

@ -32,6 +32,7 @@ stdenvNoCC.mkDerivation {
''; '';
meta = libc.meta // { meta = libc.meta // {
outputsToInstall = [ "out" ];
description = "The datastructures of ELF according to the target platform's libc"; description = "The datastructures of ELF according to the target platform's libc";
longDescription = '' longDescription = ''
The Executable and Linkable Format (ELF, formerly named Extensible Linking The Executable and Linkable Format (ELF, formerly named Extensible Linking

25
pkgs/stdenv/generic/check-meta.nix
View File

@ -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; };