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

Remove dead code from stdenv check-meta license logic

Browse Source 
The `unfree` and `unfreeRedistributable` licenses both have `free = false`,
which will trigger the first portion of logic. This removes dead code to
simplify the logic.

As a follow-up, I plan to add an attribute `redistributable = [true|false]`,
which can be used by Hydra to determine whether a given package with a given
license can be included in the channel.
This commit is contained in:
Benjamin Hipple 2018-09-23 12:45:03 -04:00
parent 243cdbf24e
commit 0b9d9ab256
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,8 +42,7 @@ let
allowUnsupportedSystem = config.allowUnsupportedSystem or false allowUnsupportedSystem = config.allowUnsupportedSystem or false
|| builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1"; || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1";
isUnfree = licenses: lib.lists.any (l: isUnfree = licenses: lib.lists.any (l: !l.free or true) licenses;
!l.free or true || l == "unfree" || l == "unfree-redistributable") licenses;
# Alow granular checks to allow only some unfree packages # Alow granular checks to allow only some unfree packages
# Example: # Example:
@ -56,7 +55,7 @@ let
# Check whether unfree packages are allowed and if not, whether the # Check whether unfree packages are allowed and if not, whether the
# package has an unfree license and is not explicitely allowed by the # package has an unfree license and is not explicitely allowed by the
# `allowUNfreePredicate` function. # `allowUnfreePredicate` function.
hasDeniedUnfreeLicense = attrs: hasDeniedUnfreeLicense = attrs:
!allowUnfree && !allowUnfree &&
hasLicense attrs && hasLicense attrs &&