summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Sojka <michal.sojka@cvut.cz>2022-08-24 15:10:17 +0200
committerMichal Sojka <michal.sojka@cvut.cz>2022-08-24 15:10:17 +0200
commitc1b2e4a9b17beab8d543b5f8e88c07e0e85641a3 (patch)
treedd2d4a7a471d490fc641c0fd498f76f35a3a00c3
parent5e804cd8a27f835a402b22e086e36e797716ef8b (diff)
perlPackages.Crypt{Blowfish,DES,IDEA}: Use correct license
Recent commit 59356f11c1f ("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
-rw-r--r--lib/licenses.nix5
-rw-r--r--pkgs/top-level/perl-packages.nix6
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix
index a376a681d58e..a4dc15c1a79c 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -148,6 +148,11 @@ in mkLicense lset) ({
fullName = ''BSD 4-clause "Original" or "Old" License'';
};
+ bsdOriginalShortened = {
+ spdxId = "BSD-4-Clause-Shortened";
+ fullName = "BSD 4 Clause Shortened";
+ };
+
bsdOriginalUC = {
spdxId = "BSD-4-Clause-UC";
fullName = "BSD 4-Clause University of California-Specific";
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a1fad8ad3371..44f1ae9be2e6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4619,7 +4619,7 @@ let
};
meta = {
description = "Perl Blowfish encryption module";
- license = with lib.licenses; [ unfreeRedistributable ];
+ license = with lib.licenses; [ bsdOriginalShortened ];
};
};
@@ -4679,7 +4679,7 @@ let
};
meta = {
description = "Perl DES encryption module";
- license = with lib.licenses; [ unfreeRedistributable ];
+ license = with lib.licenses; [ bsdOriginalShortened ];
};
};
@@ -4795,7 +4795,7 @@ let
};
meta = {
description = "Perl interface to IDEA block cipher";
- license = with lib.licenses; [ unfreeRedistributable ];
+ license = with lib.licenses; [ bsdOriginalShortened ];
};
};