From ba93ec21612102f61dd3b19d1ff8efa84d707947 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:19:55 -0700 Subject: [PATCH] pkgs: remove with statements in aliases --- pkgs/top-level/aliases.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a6403e6792eb..694dd8bd6f88 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -22,16 +22,16 @@ with self; let # Removing recurseForDerivation prevents derivations of aliased attribute set # to appear while listing all the packages available. - removeRecurseForDerivations = alias: with lib; + removeRecurseForDerivations = alias: if alias.recurseForDerivations or false - then removeAttrs alias [ "recurseForDerivations" ] + then lib.removeAttrs alias [ "recurseForDerivations" ] else alias; # Disabling distribution prevents top-level aliases for non-recursed package # sets from building on Hydra. - removeDistribute = alias: with lib; - if isDerivation alias then - dontDistribute alias + removeDistribute = alias: + if lib.isDerivation alias then + lib.dontDistribute alias else alias; transmission3Warning = { prefix ? "", suffix ? "" }: let