Merge pull request #2250 from alexanderkjeldaas/expose-allow-unfree-option
Make the user aware of the allowUnfree option.
This commit is contained in:
commit
9bbad80dba
1 changed files with 10 additions and 1 deletions
|
@ -58,7 +58,16 @@ let
|
||||||
pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»";
|
pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»";
|
||||||
in
|
in
|
||||||
if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) then
|
if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) then
|
||||||
throw "package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate"
|
throw ''package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate.
|
||||||
|
You can set
|
||||||
|
{ nixpkgs.config.allowUnfree = true; }
|
||||||
|
in configuration.nix to override this.
|
||||||
|
If you use nix standalnd, you can add
|
||||||
|
{ config.allowUnfree = true; }
|
||||||
|
to ~/.nixpkgs/config.nix or pass
|
||||||
|
--arg config '{ allowUnfree = true; }'
|
||||||
|
on the command line.
|
||||||
|
''
|
||||||
else if !allowBroken && attrs.meta.broken or false then
|
else if !allowBroken && attrs.meta.broken or false then
|
||||||
throw "you can't use package ‘${attrs.name}’ in ${pos'} because it has been marked as broken"
|
throw "you can't use package ‘${attrs.name}’ in ${pos'} because it has been marked as broken"
|
||||||
else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then
|
else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then
|
||||||
|
|
Loading…
Reference in a new issue