lib.customisation: remove unsafeGetAttrPos workaround

This could have been done a while ago, minver has been > 2.3.4 for quite
some time already.
This commit is contained in:
Wolfgang Walther
2025-08-11 20:27:02 +02:00
parent 71ae9eb4a4
commit dd435697b3

View File

@@ -285,18 +285,9 @@ rec {
arg:
let
loc = builtins.unsafeGetAttrPos arg fargs;
# loc' can be removed once lib/minver.nix is >2.3.4, since that includes
# https://github.com/NixOS/nix/pull/3468 which makes loc be non-null
loc' =
if loc != null then
loc.file + ":" + toString loc.line
else if !isFunction fn then
toString (lib.filesystem.resolveDefaultNix fn)
else
"<unknown location>";
in
"Function called without required argument \"${arg}\" at "
+ "${loc'}${prettySuggestions (getSuggestions arg)}";
+ "${loc.file}:${loc.line}${prettySuggestions (getSuggestions arg)}";
# Only show the error for the first missing argument
error = errorForArg (head (attrNames missingArgs));