dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #271767 from K900/fix-callpackage-errors

Browse Source 
lib/customisation: fix callPackage error messages
This commit is contained in:
Silvan Mosberger 2023-12-03 00:41:24 +01:00 committed by GitHub
commit 8b0e496a27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/customisation.nix
View File

@ -4,11 +4,12 @@ let
inherit (builtins) inherit (builtins)
intersectAttrs; intersectAttrs;
inherit (lib) inherit (lib)
functionArgs isFunction mirrorFunctionArgs isAttrs setFunctionArgs levenshteinAtMost functionArgs isFunction mirrorFunctionArgs isAttrs setFunctionArgs
optionalAttrs attrNames levenshtein filter elemAt concatStringsSep sort take length optionalAttrs attrNames levenshtein filter elemAt concatStringsSep sort take length
filterAttrs optionalString flip pathIsDirectory head pipe isDerivation listToAttrs filterAttrs optionalString flip pathIsDirectory head pipe isDerivation listToAttrs
mapAttrs seq flatten deepSeq warnIf isInOldestRelease extends mapAttrs seq flatten deepSeq warnIf isInOldestRelease extends
; ;
inherit (lib.strings) levenshteinAtMost;
in in
rec { rec {
@ -198,7 +199,7 @@ rec {
+ "${loc'}${prettySuggestions (getSuggestions arg)}"; + "${loc'}${prettySuggestions (getSuggestions arg)}";
# Only show the error for the first missing argument # Only show the error for the first missing argument
error = errorForArg missingArgs.${head (attrNames missingArgs)}; error = errorForArg (head (attrNames missingArgs));
in if missingArgs == {} in if missingArgs == {}
then makeOverridable f allArgs then makeOverridable f allArgs