From 661aa513a13a93dc18cbf88daec4ca89bd12d6f2 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 11:58:09 -0700 Subject: [PATCH] writers: remove with statements from aliases --- pkgs/build-support/writers/aliases.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/writers/aliases.nix b/pkgs/build-support/writers/aliases.nix index fb108a6fd857..8441abf36ce5 100644 --- a/pkgs/build-support/writers/aliases.nix +++ b/pkgs/build-support/writers/aliases.nix @@ -3,16 +3,16 @@ lib: prev: 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"] + 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; # Make sure that we are not shadowing something from