From c178b444fa707858f14c2eb48a9157e8b515b2d4 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sun, 11 Aug 2024 14:52:44 +0200
Subject: [PATCH 1/4] 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 67744b499d8a..dcadaa7216dc 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 0984590b4ebc9a7af88df52ed80fe755fbe86544 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sun, 11 Aug 2024 14:57:32 +0200
Subject: [PATCH 2/4] lib/licenses: correct zsh to mit-modern

---
 lib/licenses.nix                            | 11 ++++++-----
 pkgs/shells/zsh/zsh-completions/default.nix |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index dcadaa7216dc..9f7297303074 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";
diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix
index a32d56bedd1f..0bb2c8726719 100644
--- a/pkgs/shells/zsh/zsh-completions/default.nix
+++ b/pkgs/shells/zsh/zsh-completions/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       bsd3
       isc
       mit
-      zsh
+      mit-modern
     ];
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.olejorgenb ];

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

---
 lib/licenses.nix                               | 5 -----
 pkgs/by-name/fr/freefilesync/package.nix       | 2 +-
 pkgs/development/libraries/libssh2/default.nix | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 9f7297303074..c79617be2166 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";
diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix
index 300752f6e467..27f345ce4c2e 100644
--- a/pkgs/by-name/fr/freefilesync/package.nix
+++ b/pkgs/by-name/fr/freefilesync/package.nix
@@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Open Source File Synchronization & Backup Software";
     homepage = "https://freefilesync.org";
-    license = [ licenses.gpl3Only licenses.openssl licenses.curl licenses.libssh2 ];
+    license = [ licenses.gpl3Only licenses.openssl licenses.curl licenses.bsd3 ];
     maintainers = with maintainers; [ wegank ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index ad7dc331b018..e548b011f66d 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     description = "Client-side C library implementing the SSH2 protocol";
     homepage = "https://www.libssh2.org";
     platforms = platforms.all;
-    license = with licenses; [ bsd3 libssh2 ];
+    license = with licenses; [ bsd3 ];
     maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }

From fddb874f91c21833f0e76fa9fbc43beaf8bcb733 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sun, 11 Aug 2024 15:59:36 +0200
Subject: [PATCH 4/4] 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 c79617be2166..6be2bc654ae2 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";