From dcceb50b55a119fd132a3ef5f62ffa1eb1add714 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 15:10:17 +0200
Subject: [PATCH 1/6] lib.licenses: add bugroff

Added to spdx in https://github.com/spdx/license-list-XML/pull/3037
---
 lib/licenses/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix
index dfd69622939a..f7f5cc5c5c25 100644
--- a/lib/licenses/licenses.nix
+++ b/lib/licenses/licenses.nix
@@ -315,6 +315,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";

From ee282178bfe608193f3156b6355046eae87ca0ee Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 15:11:05 +0200
Subject: [PATCH 2/6] lib.licenses: add llgplPreamble

---
 lib/licenses/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix
index f7f5cc5c5c25..634d10708ff9 100644
--- a/lib/licenses/licenses.nix
+++ b/lib/licenses/licenses.nix
@@ -1017,6 +1017,11 @@ lib.mapAttrs mkLicense (
       url = "https://opensource.franz.com/preamble.html";
     };
 
+    llgplPreamble = {
+      spdxId = "LLGPL";
+      fullName = "LLGPL Preamble";
+    };
+
     llvm-exception = {
       spdxId = "LLVM-exception";
       fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License

From 7bf884a90cf933f793c93ca3f6160d42f332379c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 15:13:30 +0200
Subject: [PATCH 3/6] sbclPackages.fset: make use of compound licenses

---
 pkgs/development/lisp-modules/packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index 416fb261fd12..137d2ba5aaf1 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -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;
         };
       });
 

From 92ab499a4f315db75a21df1c26028f1edb233d40 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 15:14:35 +0200
Subject: [PATCH 4/6] cl-launch: make use of compound licenses

---
 pkgs/by-name/cl/cl-launch/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cl/cl-launch/package.nix b/pkgs/by-name/cl/cl-launch/package.nix
index 5b8e9eabb12f..122cd5fe9479 100644
--- a/pkgs/by-name/cl/cl-launch/package.nix
+++ b/pkgs/by-name/cl/cl-launch/package.nix
@@ -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;
   };

From 1abbdf4b916a1cc6e3f8bd3d2cb684502a94c41e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 15:16:20 +0200
Subject: [PATCH 5/6] acl2: make use of compound licenses

---
 pkgs/by-name/ac/acl2/package.nix | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ac/acl2/package.nix b/pkgs/by-name/ac/acl2/package.nix
index f5d78743636e..34daaaf573ed 100644
--- a/pkgs/by-name/ac/acl2/package.nix
+++ b/pkgs/by-name/ac/acl2/package.nix
@@ -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

From 8a29e58f768babd9e0bf72a9c5df841edcc581b9 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 11 Jul 2026 15:17:01 +0200
Subject: [PATCH 6/6] lib.licenses: drop llgpl21

This is just a combination of lgpl21 and llgpl licenses
---
 lib/licenses/licenses.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix
index 634d10708ff9..d9d3672957c7 100644
--- a/lib/licenses/licenses.nix
+++ b/lib/licenses/licenses.nix
@@ -1012,11 +1012,6 @@ 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";