From 290820f2fa4c3b936b8f0451edbeb28c4e4401e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 May 2023 23:27:19 +0200 Subject: [PATCH] maintainers/scripts/check-hydra-by-maintainer: remove pkgs.lib use --- maintainers/scripts/check-hydra-by-maintainer.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/maintainers/scripts/check-hydra-by-maintainer.nix b/maintainers/scripts/check-hydra-by-maintainer.nix index 1062230a53c9..c40729a3974e 100644 --- a/maintainers/scripts/check-hydra-by-maintainer.nix +++ b/maintainers/scripts/check-hydra-by-maintainer.nix @@ -3,15 +3,16 @@ let pkgs = import ./../../default.nix { config.allowAliases = false; }; + inherit (pkgs) lib; maintainer_ = pkgs.lib.maintainers.${maintainer}; packagesWith = cond: return: prefix: set: - (pkgs.lib.flatten - (pkgs.lib.mapAttrsToList + (lib.flatten + (lib.mapAttrsToList (name: pkg: let result = builtins.tryEval ( - if pkgs.lib.isDerivation pkg && cond name pkg then + if lib.isDerivation pkg && cond name pkg then # Skip packages whose closure fails on evaluation. # This happens for pkgs like `python27Packages.djangoql` # that have disabled Python pkgs as dependencies. @@ -44,7 +45,7 @@ let ) ) (name: name) - ("") + "" pkgs; in