lib.licenses: change llgpl21 to exception (#520411)

This commit is contained in:
Jo
2026-08-07 06:41:15 +00:00
committed by GitHub
4 changed files with 31 additions and 19 deletions

View File

@@ -320,6 +320,11 @@ lib.mapAttrs mkLicense (
fullName = "Buddy License";
};
bugroff = {
spdxId = "Bugroff";
fullName = "Bugroff License";
};
bzip2 = {
spdxId = "bzip2-1.0.6";
fullName = "bzip2 and libbzip2 License v1.0.6";
@@ -1039,9 +1044,9 @@ lib.mapAttrs mkLicense (
fullName = "Licence Libre du Québec Permissive version 1.1";
};
llgpl21 = {
fullName = "Lisp LGPL; GNU Lesser General Public License version 2.1 with Franz Inc. preamble for clarification of LGPL terms in context of Lisp";
url = "https://opensource.franz.com/preamble.html";
llgplPreamble = {
spdxId = "LLGPL";
fullName = "LLGPL Preamble";
};
llvm-exception = {

View File

@@ -192,20 +192,22 @@ stdenv.mkDerivation (finalAttrs: {
downloadPage = "https://github.com/acl2-devel/acl2-devel/releases";
license =
with lib.licenses;
[
# ACL2 itself is bsd3
bsd3
]
++ lib.optionals certifyBooks [
# The community books are mostly bsd3 or mit but with a few
# other things thrown in.
mit
gpl2
llgpl21
cc0
publicDomain
unfreeRedistributable
];
AND (
[
# ACL2 itself is bsd3
bsd3
]
++ lib.optionals certifyBooks [
# The community books are mostly bsd3 or mit but with a few
# other things thrown in.
mit
gpl2
(WITH lgpl21Only llgplPreamble)
cc0
publicDomain
unfreeRedistributable
]
);
maintainers = with lib.maintainers; [
kini
raskin

View File

@@ -26,7 +26,12 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Common Lisp launcher script";
license = lib.licenses.llgpl21;
license =
with lib.licenses;
OR [
(WITH lgpl21Only llgplPreamble)
bugroff
];
maintainers = with lib.maintainers; [ raskin ];
platforms = lib.platforms.unix;
};

View File

@@ -601,7 +601,7 @@ let
meta = {
description = "Functional collections library";
homepage = "https://gitlab.common-lisp.net/fset/fset/-/wikis/home";
license = pkgs.lib.licenses.llgpl21;
license = with pkgs.lib.licenses; WITH lgpl21Only llgplPreamble;
};
});