From e04cc18f18011471ffe0e693758bfcc0b4cf5393 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 4 Nov 2021 13:23:30 +0100 Subject: [PATCH] find-tarballs.nix: Avoid all passthru attrs Avoiding passthru itself was the right direction, but not a complete solution. Passthru attributes typically do not contain dependencies, but rather extra paths that are not relevant to the build itself. Whether we want to include all (passthru) test dependencies this way can be debated, but removing them makes this expression more robust. --- maintainers/scripts/find-tarballs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 52cce909918..990185bbb3b 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -37,7 +37,7 @@ let keyDrv = drv: if canEval drv.drvPath then { key = drv.drvPath; value = drv; } else { }; immediateDependenciesOf = drv: - concatLists (mapAttrsToList (n: v: derivationsIn v) (removeAttrs drv ["meta" "passthru"])); + concatLists (mapAttrsToList (n: v: derivationsIn v) (removeAttrs drv (["meta" "passthru"] ++ optionals (drv?passthru) (attrNames drv.passthru)))); derivationsIn = x: if !canEval x then []