Skip to content

Commit

Permalink
With !allowUnfree, reject unfree-redistributable packages as well
Browse files Browse the repository at this point in the history
  • Loading branch information
@edolstra
edolstra committed Jan 24, 2013
1 parent 8dba5cd commit d9d9723
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/stdenv/generic/default.nix
View file
Expand Up @@ -41,7 +41,7 @@ let
# Add a utility function to produce derivations that use this
# stdenv and its shell.
mkDerivation = attrs:
if !allowUnfree && attrs.meta.license or "" == "unfree" then
if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable") then
throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate"
else
(derivation (
Expand Down

1 comment on commit d9d9723

@vcunat
Copy link
Member

@vcunat vcunat commented on d9d9723 Jan 24, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some time it would be nice to document what this allowUnfree should mean, as IMO the meaning could be both what it was before and after this commit (and even other possibilities). Should it be something like OSI or FSF non-approved?

Maybe in future we could have a more general filter on the licenses (if people want it, for me personally similar functionality isn't so important).

And what about unfree-redistributable-firmware? (from nixkpgs manual)

Please sign in to comment.