Merge pull request NixOS#333915 from jopejoe1/license

lib/licenses: some corrections
Ma27 · Aug 24, 2024 · 771c564 · 771c564
2 parents 2436607 + fddb874
commit 771c564
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git 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;
@@ -826,11 +827,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";
@@ -872,8 +868,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";
@@ -884,6 +878,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)";
@@ -1316,11 +1316,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/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
@@ -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 ];
   };
 }
diff --git 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 ];