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

Merge pull request #47230 from bhipple/fix/licenses

Browse Source 
Remove dead code from stdenv check-meta license logic
This commit is contained in:
Matthew Bauer
2018-10-05 22:58:27 -05:00
committed by GitHub
parent 013bded602 0b9d9ab256
commit 93834fe194
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/generic/check-meta.nix
+2 -3
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 &&