diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-10-05 22:58:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 22:58:27 -0500 |
| commit | 93834fe194271de39d42fe75885dc13a3cdad8a2 (patch) | |
| tree | 0f8715fde8fe6e0a171ace61f497ef5eb2b8f2d8 /pkgs/stdenv | |
| parent | 013bded6021d57343af1eec1f6c9eaa5d25aa85e (diff) | |
| parent | 0b9d9ab256012a9007695a174895e9d32eca809d (diff) | |
| download | nixlib-93834fe194271de39d42fe75885dc13a3cdad8a2.tar nixlib-93834fe194271de39d42fe75885dc13a3cdad8a2.tar.gz nixlib-93834fe194271de39d42fe75885dc13a3cdad8a2.tar.bz2 nixlib-93834fe194271de39d42fe75885dc13a3cdad8a2.tar.lz nixlib-93834fe194271de39d42fe75885dc13a3cdad8a2.tar.xz nixlib-93834fe194271de39d42fe75885dc13a3cdad8a2.tar.zst nixlib-93834fe194271de39d42fe75885dc13a3cdad8a2.zip | |
Merge pull request #47230 from bhipple/fix/licenses
Remove dead code from stdenv check-meta license logic
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 28b69f5c2dc9..26cd9f8beb96 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -42,8 +42,7 @@ let allowUnsupportedSystem = config.allowUnsupportedSystem or false || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1"; - isUnfree = licenses: lib.lists.any (l: - !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses; + isUnfree = licenses: lib.lists.any (l: !l.free or true) licenses; # Alow granular checks to allow only some unfree packages # Example: @@ -56,7 +55,7 @@ let # Check whether unfree packages are allowed and if not, whether the # package has an unfree license and is not explicitely allowed by the - # `allowUNfreePredicate` function. + # `allowUnfreePredicate` function. hasDeniedUnfreeLicense = attrs: !allowUnfree && hasLicense attrs && |