diff options
author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-03-06 23:32:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-06 23:32:13 +0100 |
commit | af6f83334e329da0750a3c7616fd967e46c4cbd6 (patch) | |
tree | b10113f11287dec761071257a9ac0310bebcdf9d /maintainers | |
parent | 9b19412297efdce233bc606f5253e0d95953fd9d (diff) | |
parent | 60de328a9ebad861174cb3b7f6ebc343f095d2f3 (diff) |
Merge pull request #293840 from philiptaron/remove-top-level-with-lib-in-maintainers
Remove top level `with lib;` in `maintainers/`
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/scripts/eval-release.nix | 7 | ||||
-rw-r--r-- | maintainers/scripts/find-tarballs.nix | 19 |
2 files changed, 18 insertions, 8 deletions
diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 4f0ca24650251..10acfe3284470 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -1,9 +1,8 @@ -# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate -# can't to do this. - -with import ../../lib; +# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate can't to do this. let + inherit (import ../../lib) isDerivation mapAttrs; + trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y); rel = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" "xbursttools" ]; 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; |