From f5f26f0bbc1d344e2849a267349d30c7e0ae2c1a Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 5 Mar 2024 17:58:20 -0800 Subject: [PATCH] Avoid `with lib;` at the top level in pkgs/top-level/release-python.nix --- pkgs/top-level/release-python.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index bc54860d45f6..81ea4d3403a7 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -21,10 +21,15 @@ }; } }: -with import ./release-lib.nix {inherit supportedSystems nixpkgsArgs; }; -with lib; - let + release-lib = import ./release-lib.nix { + inherit supportedSystems nixpkgsArgs; + }; + + inherit (release-lib) mapTestOn pkgs; + + inherit (release-lib.lib) isDerivation mapAttrs optionals; + packagePython = mapAttrs (name: value: let res = builtins.tryEval ( if isDerivation value then @@ -33,7 +38,7 @@ let packagePython value else []); - in lib.optionals res.success res.value + in optionals res.success res.value ); jobs = {