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

Merge pull request #269546 from adisbladis/stdenv-meta-no-intermediate-alloc

Browse Source 
stdenv: Avoid allocating intermediate attrset when checking meta validity
This commit is contained in:
adisbladis
2023-12-12 10:57:44 +13:00
committed by GitHub
parent 6aa414bcfd 9a0a097a94
commit 1e66093cca
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/generic/check-meta.nix
+12 -7
View File
@@ -492,16 +492,21 @@ let
assertValidity = { meta, attrs }: let
validity = checkValidity attrs;
in validity // {
inherit (validity) valid;
in validity // {
# Throw an error if trying to evaluate a non-valid derivation
# or, alternatively, just output a warning message.
handled =
{
no = handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; };
warn = handleEvalWarning { inherit meta attrs; } { inherit (validity) reason errormsg; };
yes = true;
}.${validity.valid};
(
if valid == "yes" then true
else if valid == "no" then (
handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; }
)
else if valid == "warn" then (
handleEvalWarning { inherit meta attrs; } { inherit (validity) reason errormsg; }
)
else throw "Unknown validitiy: '${valid}'"
);
};
in { inherit assertValidity commonMeta; }