diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-05 14:18:08 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-05 14:18:08 +0100 |
| commit | c4e30cf98cef72dfa01aeaa833f3d70d24c6ae3f (patch) | |
| tree | 316252d7cdc70b4871bb028e3df3d43738fa0920 /pkgs/stdenv/generic | |
| parent | acd2d19484e5c79306110463fe621436fb228d4e (diff) | |
| parent | 03a9822405d1293e8e5dd90b5da076d9ce52265f (diff) | |
| download | nixlib-c4e30cf98cef72dfa01aeaa833f3d70d24c6ae3f.tar nixlib-c4e30cf98cef72dfa01aeaa833f3d70d24c6ae3f.tar.gz nixlib-c4e30cf98cef72dfa01aeaa833f3d70d24c6ae3f.tar.bz2 nixlib-c4e30cf98cef72dfa01aeaa833f3d70d24c6ae3f.tar.lz nixlib-c4e30cf98cef72dfa01aeaa833f3d70d24c6ae3f.tar.xz nixlib-c4e30cf98cef72dfa01aeaa833f3d70d24c6ae3f.tar.zst nixlib-c4e30cf98cef72dfa01aeaa833f3d70d24c6ae3f.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index b754230b0be9..6bd6a9bf41ef 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -36,10 +36,10 @@ let attrs ? meta.license; hasWhitelistedLicense = assert areLicenseListsValid; attrs: - hasLicense attrs && builtins.elem attrs.meta.license whitelist; + hasLicense attrs && lib.lists.any (l: builtins.elem l whitelist) (lib.lists.toList attrs.meta.license); hasBlacklistedLicense = assert areLicenseListsValid; attrs: - hasLicense attrs && builtins.elem attrs.meta.license blacklist; + hasLicense attrs && lib.lists.any (l: builtins.elem l blacklist) (lib.lists.toList attrs.meta.license); allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; @@ -75,7 +75,7 @@ let allowInsecurePredicate attrs || builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1"; - showLicense = license: license.shortName or "unknown"; + showLicense = license: toString (map (l: l.shortName or "unknown") (lib.lists.toList license)); pos_str = meta: meta.position or "«unknown-file»"; |