alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

perlPackages.Crypt{Blowfish,DES,IDEA}: Use correct license

Browse source 
Recent commit 59356f11c1 ("perlPackages: Ensure all packages have a
license", 2022-08-22) added a license field to Perl packages where the
license was missing. The above mentioned packages got assigned
`unfreeRedistributable` license, which is not precise and makes all
packages depending on them unbuildable without `NIXPKGS_ALLOW_UNFREE`.

The packages actually have a license which SPDX calls
BSD-4-Clause-Shortened (https://spdx.org/licenses/BSD-4-Clause-Shortened.html).
In this commit, we add this license to the list of allowed licenses
and change the license field of the mentioned packages.

Closes #188103
This commit is contained in:
Michal Sojka 2022-08-24 15:10:17 +02:00
parent 5e804cd8a2
commit c1b2e4a9b1
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/licenses.nix
View file

@ -148,6 +148,11 @@ in mkLicense lset) ({
fullName = ''BSD 4-clause "Original" or "Old" License''; fullName = ''BSD 4-clause "Original" or "Old" License'';
}; };
bsdOriginalShortened = {
spdxId = "BSD-4-Clause-Shortened";
fullName = "BSD 4 Clause Shortened";
};
bsdOriginalUC = { bsdOriginalUC = {
spdxId = "BSD-4-Clause-UC"; spdxId = "BSD-4-Clause-UC";
fullName = "BSD 4-Clause University of California-Specific"; fullName = "BSD 4-Clause University of California-Specific";

6
pkgs/top-level/perl-packages.nix
View file

@ -4619,7 +4619,7 @@ let
}; };
meta = { meta = {
description = "Perl Blowfish encryption module"; description = "Perl Blowfish encryption module";
license = with lib.licenses; [ unfreeRedistributable ]; license = with lib.licenses; [ bsdOriginalShortened ];
}; };
}; };
@ -4679,7 +4679,7 @@ let
}; };
meta = { meta = {
description = "Perl DES encryption module"; description = "Perl DES encryption module";
license = with lib.licenses; [ unfreeRedistributable ]; license = with lib.licenses; [ bsdOriginalShortened ];
}; };
}; };
@ -4795,7 +4795,7 @@ let
}; };
meta = { meta = {
description = "Perl interface to IDEA block cipher"; description = "Perl interface to IDEA block cipher";
license = with lib.licenses; [ unfreeRedistributable ]; license = with lib.licenses; [ bsdOriginalShortened ];
}; };
}; };