public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89564 from raboof/promote-allowUnfreePredicate-in-remediation-message

Browse Source 
Promote allowUnfreePredicate in remediation message
This commit is contained in:
Timo Kaufmann 2020-11-10 19:16:56 +01:00 committed by GitHub
commit 88545323ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/stdenv/generic/check-meta.nix
View File

@ -80,9 +80,9 @@ let
pos_str = meta: meta.position or "«unknown-file»"; pos_str = meta: meta.position or "«unknown-file»";
remediation = { remediation = {
unfree = remediate_whitelist "Unfree"; unfree = remediate_whitelist "Unfree" remediate_unfree_predicate;
broken = remediate_whitelist "Broken"; broken = remediate_whitelist "Broken" (x: "");
unsupported = remediate_whitelist "UnsupportedSystem"; unsupported = remediate_whitelist "UnsupportedSystem" (x: "");
blacklisted = x: ""; blacklisted = x: "";
insecure = remediate_insecure; insecure = remediate_insecure;
broken-outputs = remediateOutputsToInstall; broken-outputs = remediateOutputsToInstall;
@ -98,7 +98,17 @@ let
Broken = "broken packages"; Broken = "broken packages";
UnsupportedSystem = "packages that are unsupported for this system"; UnsupportedSystem = "packages that are unsupported for this system";
}.${allow_attr}; }.${allow_attr};
remediate_whitelist = allow_attr: attrs: remediate_unfree_predicate = attrs:
''
Alternatively you can configure a predicate to whitelist specific packages:
{ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"${lib.getName attrs}"
];
}
'';
remediate_whitelist = allow_attr: rebuild_amendment: attrs:
'' ''
a) To temporarily allow ${remediation_phrase allow_attr}, you can use an environment variable a) To temporarily allow ${remediation_phrase allow_attr}, you can use an environment variable
for a single invocation of the nix tools. for a single invocation of the nix tools.
@ -108,7 +118,7 @@ let
b) For `nixos-rebuild` you can set b) For `nixos-rebuild` you can set
{ nixpkgs.config.allow${allow_attr} = true; } { nixpkgs.config.allow${allow_attr} = true; }
in configuration.nix to override this. in configuration.nix to override this.
${rebuild_amendment attrs}
c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
{ allow${allow_attr} = true; } { allow${allow_attr} = true; }
to ~/.config/nixpkgs/config.nix. to ~/.config/nixpkgs/config.nix.