From e98d150c0f12cd60f72f6ab1a15c44b7e3a2b886 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 23 Jul 2025 15:09:33 +0200 Subject: [PATCH] top-level/aliases: abort evaluation on check error The `aliases.nix` file is full of "expected errors", which the CI check for "does nixpkgs with aliases eval?" *must* ignore. However, this also hides an unexpected error, the check which prevents shadowing of existing attributes in all-packages.nix. By elevating this check to use `abort`, this will break the CI check for sure. --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c5b09e0da473..0f4efec3312e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -208,7 +208,7 @@ let # Make sure that we are not shadowing something from all-packages.nix. checkInPkgs = n: alias: - if builtins.hasAttr n super then throw "Alias ${n} is still in all-packages.nix" else alias; + if builtins.hasAttr n super then abort "Alias ${n} is still in all-packages.nix" else alias; mapAliases = aliases: lib.mapAttrs (n: alias: removeRecurseForDerivations (checkInPkgs n alias)) aliases;