diff options
author | Dan Callahan <dan.callahan@gmail.com> | 2024-04-10 16:15:24 +0100 |
---|---|---|
committer | Dan Callahan <dan.callahan@gmail.com> | 2024-04-10 16:15:24 +0100 |
commit | ec6c59494497d5679ed1d1d4086abacd89de8ef4 (patch) | |
tree | 06f5979653fc3db6106f7f6c4df5088a4f3d7d60 | |
parent | 6347cd23dcc2b020dd4ea5bfe5871be35e95ae63 (diff) |
stdenv/check-meta: Fix error message for disallowed unfree packages
Nixpkgs tries to print a helpful message when it blocks unfree packages, but the suggestion is subtly broken. The predicate only matches on the package's name, but the suggestion includes the full name-version pair. Fixed by formatting the message with the same function as the predicate. This issue arises because check-meta defines its own local getName with semantics divergent from lib.getName. The former includes the version, the latter does not. Example Before: Alternatively you can configure a predicate to allow specific packages: { nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "obsidian-1.5.12" ]; } Example After: Alternatively you can configure a predicate to allow specific packages: { nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "obsidian" ]; } Fixes #303116
-rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index bcb2ca249ddfd..a61f3e1ae4d0f 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -189,7 +189,7 @@ let Alternatively you can configure a predicate to allow specific packages: { nixpkgs.config.${predicateConfigAttr} = pkg: builtins.elem (lib.getName pkg) [ - "${getName attrs}" + "${lib.getName attrs}" ]; } ''; |