From 17718ac2552873bc9b6bbeb0c5b9469284a5d03b Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 22 Mar 2024 09:41:08 +0100 Subject: [PATCH] check-meta: fix 'predicate' instructions In the code examples for using `allowUnfreePredicate` and `allowNonSourcePredicate`, we use `lib.getName` (which removes the version) and not the local `getName` (which keeps the version). --- pkgs/stdenv/generic/check-meta.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 63c853e3dc31..298c9a23b5f6 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -181,7 +181,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}" ]; } ''; @@ -222,23 +222,23 @@ let $ export NIXPKGS_ALLOW_INSECURE=1 ${flakeNote} - b) for `nixos-rebuild` you can add ‘${getName attrs}’ to + b) for `nixos-rebuild` you can add ‘${lib.getName attrs}’ to `nixpkgs.config.permittedInsecurePackages` in the configuration.nix, like so: { nixpkgs.config.permittedInsecurePackages = [ - "${getName attrs}" + "${lib.getName attrs}" ]; } c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add - ‘${getName attrs}’ to `permittedInsecurePackages` in + ‘${lib.getName attrs}’ to `permittedInsecurePackages` in ~/.config/nixpkgs/config.nix, like so: { permittedInsecurePackages = [ - "${getName attrs}" + "${lib.getName attrs}" ]; }