From 18610dbffcb110a9cdf98fa39afa4f00e03dd522 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sun, 11 Aug 2024 14:52:44 +0200
Subject: [PATCH 1/5] lib/licenses: busl add spdxid

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

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 67744b499..dcadaa721 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -229,6 +229,7 @@ lib.mapAttrs mkLicense ({
   };
 
   bsl11 = {
+    spdxId = "BUSL-1.1";
     fullName = "Business Source License 1.1";
     url = "https://mariadb.com/bsl11";
     free = false;

From e68c42efccc1a82c87dea697543b9b158342f57e Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sun, 11 Aug 2024 14:57:32 +0200
Subject: [PATCH 2/5] lib/licenses: correct zsh to mit-modern

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

diff --git a/lib/licenses.nix b/lib/licenses.nix
index dcadaa721..9f7297303 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -879,6 +879,12 @@ lib.mapAttrs mkLicense ({
     fullName = "feh License";
   };
 
+  mit-modern = {
+    # Also known as Zsh license
+    spdxId = "MIT-Modern-Variant";
+    fullName = "MIT License Modern Variant";
+  };
+
   mitAdvertising = {
     spdxId = "MIT-advertising";
     fullName = "Enlightenment License (e16)";
@@ -1311,11 +1317,6 @@ lib.mapAttrs mkLicense ({
     fullName = "zlib License";
   };
 
-  zsh = {
-    url = "https://github.com/zsh-users/zsh/blob/master/LICENCE";
-    fullName = "Zsh License";
-  };
-
   zpl20 = {
     spdxId = "ZPL-2.0";
     fullName = "Zope Public License 2.0";

From ecf3a6a1b244d66691daf6b5a48b6b59f04bd7b6 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sun, 11 Aug 2024 15:55:04 +0200
Subject: [PATCH 3/5] lib/licenses: remove libssh2 equivalent to bsd3

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

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 9f7297303..c79617be2 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -821,11 +821,6 @@ lib.mapAttrs mkLicense ({
     fullName = "PNG Reference Library version 2";
   };
 
-  libssh2 = {
-    fullName = "libssh2 License";
-    url = "https://www.libssh2.org/license.html";
-  };
-
   libtiff = {
     spdxId = "libtiff";
     fullName = "libtiff License";

From 0ac468c0fc308344b2a7854f309b6bded2ff25a8 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sun, 11 Aug 2024 15:59:36 +0200
Subject: [PATCH 4/5] lib/licenses: remove incorrect comment about mit and x11

Spdx has a diffrent id for both and so do we!
---
 lib/licenses.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index c79617be2..6be2bc654 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -862,8 +862,6 @@ lib.mapAttrs mkLicense ({
     url = "https://opensource.org/licenses/MirOS";
   };
 
-  # spdx.org does not (yet) differentiate between the X11 and Expat versions
-  # for details see https://en.wikipedia.org/wiki/MIT_License#Various_versions
   mit = {
     spdxId = "MIT";
     fullName = "MIT License";

From 07063a0f40088a2cca3ccc75bfeba86b330464cf Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 16 Aug 2024 16:03:42 +0100
Subject: [PATCH 5/5] lib/types: update reference to docs

The XML docs have been migrated to markdown since bfd21cd2c1492b799facdab2e77308c34edbe9e7
---
 lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index ae482eeef..8b1d19ff2 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -219,7 +219,7 @@ rec {
     else "(${t.description})";
 
   # When adding new types don't forget to document them in
-  # nixos/doc/manual/development/option-types.xml!
+  # nixos/doc/manual/development/option-types.section.md!
   types = rec {
 
     raw = mkOptionType {