From ba515dec26df406b4ffc903cb557ee40a6b5edae Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 6 Mar 2024 12:10:09 -0800 Subject: Avoid `with lib;` at the top level in maintainers/scripts/find-tarballs.nix Tested with ``` nix-instantiate --readonly-mode --eval --strict --show-trace --json ./maintainers/scripts/find-tarballs.nix --arg expr 'import ./maintainers/scripts/all-tarballs.nix' ``` --- maintainers/scripts/find-tarballs.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'maintainers/scripts') diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index c47b5168abd9a..cae4bec201ce0 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -1,11 +1,22 @@ # This expression returns a list of all fetchurl calls used by ‘expr’. -with import ../.. { }; -with lib; - -{ expr }: +{ expr, lib ? import ../../lib }: let + inherit (lib) + addErrorContext + attrNames + concatLists + const + filter + genericClosure + isAttrs + isDerivation + isList + mapAttrsToList + optional + optionals + ; root = expr; -- cgit 1.4.1