qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #333915 from jopejoe1/license

Browse Source 
lib/licenses: some corrections
This commit is contained in:
Sandro 2024-08-24 12:39:30 +02:00 committed by GitHub
commit 771c5644e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/licenses.nix
View File

@ -229,6 +229,7 @@ lib.mapAttrs mkLicense ({
}; };
bsl11 = { bsl11 = {
spdxId = "BUSL-1.1";
fullName = "Business Source License 1.1"; fullName = "Business Source License 1.1";
url = "https://mariadb.com/bsl11"; url = "https://mariadb.com/bsl11";
free = false; free = false;
@ -826,11 +827,6 @@ lib.mapAttrs mkLicense ({
fullName = "PNG Reference Library version 2"; fullName = "PNG Reference Library version 2";
}; };
libssh2 = {
fullName = "libssh2 License";
url = "https://www.libssh2.org/license.html";
};
libtiff = { libtiff = {
spdxId = "libtiff"; spdxId = "libtiff";
fullName = "libtiff License"; fullName = "libtiff License";
@ -872,8 +868,6 @@ lib.mapAttrs mkLicense ({
url = "https://opensource.org/licenses/MirOS"; 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 = { mit = {
spdxId = "MIT"; spdxId = "MIT";
fullName = "MIT License"; fullName = "MIT License";
@ -884,6 +878,12 @@ lib.mapAttrs mkLicense ({
fullName = "feh License"; fullName = "feh License";
}; };
mit-modern = {
# Also known as Zsh license
spdxId = "MIT-Modern-Variant";
fullName = "MIT License Modern Variant";
};
mitAdvertising = { mitAdvertising = {
spdxId = "MIT-advertising"; spdxId = "MIT-advertising";
fullName = "Enlightenment License (e16)"; fullName = "Enlightenment License (e16)";
@ -1316,11 +1316,6 @@ lib.mapAttrs mkLicense ({
fullName = "zlib License"; fullName = "zlib License";
}; };
zsh = {
url = "https://github.com/zsh-users/zsh/blob/master/LICENCE";
fullName = "Zsh License";
};
zpl20 = { zpl20 = {
spdxId = "ZPL-2.0"; spdxId = "ZPL-2.0";
fullName = "Zope Public License 2.0"; fullName = "Zope Public License 2.0";

2
pkgs/by-name/fr/freefilesync/package.nix
View File

@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; { meta = with lib; {
description = "Open Source File Synchronization & Backup Software"; description = "Open Source File Synchronization & Backup Software";
homepage = "https://freefilesync.org"; 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 ]; maintainers = with maintainers; [ wegank ];
platforms = platforms.linux; platforms = platforms.linux;
}; };

2
pkgs/development/libraries/libssh2/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
description = "Client-side C library implementing the SSH2 protocol"; description = "Client-side C library implementing the SSH2 protocol";
homepage = "https://www.libssh2.org"; homepage = "https://www.libssh2.org";
platforms = platforms.all; platforms = platforms.all;
license = with licenses; [ bsd3 libssh2 ]; license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ SuperSandro2000 ]; maintainers = with maintainers; [ SuperSandro2000 ];
}; };
} }

2
pkgs/shells/zsh/zsh-completions/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
bsd3 bsd3
isc isc
mit mit
zsh mit-modern
]; ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.olejorgenb ]; maintainers = [ lib.maintainers.olejorgenb ];