From 29f441773047e39e77d0b17ace887e0f3284ea33 Mon Sep 17 00:00:00 2001 From: vieta Date: Thu, 23 May 2024 22:07:26 +0200 Subject: [PATCH 1/3] lib/licenses: sort xskat --- lib/licenses.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 7d2a22bc25a4..77a191e8cad3 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1261,6 +1261,11 @@ in mkLicense lset) ({ fullName = "xinetd License"; }; + xskat = { + spdxId = "XSkat"; + fullName = "XSkat License"; + }; + zlib = { spdxId = "Zlib"; fullName = "zlib License"; @@ -1276,10 +1281,6 @@ in mkLicense lset) ({ fullName = "Zope Public License 2.1"; }; - xskat = { - spdxId = "XSkat"; - fullName = "XSkat License"; - }; } // { # TODO: remove legacy aliases apsl10 = { From 15718cc856f7f856cf16dcfcc6c356475760ea4c Mon Sep 17 00:00:00 2001 From: vieta Date: Thu, 23 May 2024 22:08:28 +0200 Subject: [PATCH 2/3] lib/license: add zsh license --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 77a191e8cad3..16efe6a0d0be 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1271,6 +1271,11 @@ in mkLicense lset) ({ fullName = "zlib License"; }; + zsh = { + url = "https://github.com/zsh-users/zsh/blob/master/LICENCE"; + fulllName = "Zsh License"; + }; + zpl20 = { spdxId = "ZPL-2.0"; fullName = "Zope Public License 2.0"; From 4e8412889f48f84fabc79203ffcf1bb49d0522ea Mon Sep 17 00:00:00 2001 From: vieta Date: Thu, 23 May 2024 22:10:16 +0200 Subject: [PATCH 3/3] zsh-completions: add licenses --- pkgs/shells/zsh/zsh-completions/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 1873c38fb9a1..a32d56bedd1f 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -22,8 +22,13 @@ stdenv.mkDerivation rec { meta = { description = "Additional completion definitions for zsh"; homepage = "https://github.com/zsh-users/zsh-completions"; - license = lib.licenses.free; - + license = with lib.licenses; [ + asl20 + bsd3 + isc + mit + zsh + ]; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.olejorgenb ]; };