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

Fix indentation

Browse Source
This commit is contained in:
Eelco Dolstra 2014-04-18 21:39:11 +02:00
parent 5da309fcaa
commit 1d6ac39d21
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/stdenv/generic/default.nix
View File

@ -58,16 +58,14 @@ 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 ''
You can set Package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate. You can set
{ nixpkgs.config.allowUnfree = true; } { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this. in configuration.nix to override this. If you use Nix standalone, you can add
If you use Nix standalone, you can add { config.allowUnfree = true; }
{ config.allowUnfree = true; } to ~/.nixpkgs/config.nix or pass
to ~/.nixpkgs/config.nix or pass --arg config '{ allowUnfree = true; }'
--arg config '{ allowUnfree = true; }' on the command line.''
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