From 3e53f2b569c3463d314311c4c96947f0a1b9f8b9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 10:31:58 +0100 Subject: [PATCH 01/16] lib/licenses: add xskat --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index baf92007123d..f5da7f62901b 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1212,6 +1212,11 @@ in mkLicense lset) ({ spdxId = "ZPL-2.1"; fullName = "Zope Public License 2.1"; }; + + xskat = { + spdxId = "XSkat"; + fullName = "XSkat License"; + }; } // { # TODO: remove legacy aliases agpl3 = { From a16469199953d74aa4a832eded584ed98eaef72a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 10:33:32 +0100 Subject: [PATCH 02/16] xskat: change license to xskat --- pkgs/games/xskat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 6baf397ad678..0d9fc5fe312f 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Famous german card game"; platforms = platforms.unix; - license = licenses.free; + license = licenses.xskat; longDescription = "Play the german card game Skat against the AI or over IRC."; homepage = "https://web.archive.org/web/20221003060115/https://www.xskat.de/xskat.html"; }; From d4a13075248705dab85a7218ccde8cbd4817e4b2 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 10:40:02 +0100 Subject: [PATCH 03/16] lib/licenses: add xinetd --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index f5da7f62901b..5011aad543ee 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1198,6 +1198,11 @@ in mkLicense lset) ({ url = "https://mcj.sourceforge.net/authors.html#xfig"; }; + xinetd = { + spdxId = "xinetd"; + fullName = "xinetd License"; + }; + zlib = { spdxId = "Zlib"; fullName = "zlib License"; From 00aad0ecd98f6bab86cd4a791083a19d60c7112c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 10:42:15 +0100 Subject: [PATCH 04/16] xinetd: change license to xinetd --- pkgs/servers/xinetd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index d7d1c94d9de2..db8c65354d7f 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Secure replacement for inetd"; platforms = lib.platforms.linux; homepage = "https://github.com/openSUSE/xinetd"; - license = lib.licenses.free; + license = lib.licenses.xinetd; maintainers = with lib.maintainers; [ fgaz ]; }; } From a302ae8adc0a9f89e5ade805e980e32b0de41eae Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 12:11:14 +0100 Subject: [PATCH 05/16] lib/licenses: add smlnj --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 5011aad543ee..85eb7292bccf 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1051,6 +1051,11 @@ in mkLicense lset) ({ url = "https://sources.debian.org/copyright/license/debianutils/4.9.1/"; }; + smlnj = { + spdxId = "SMLNJ"; + fullName = "Standard ML of New Jersey License"; + }; + sspl = { shortName = "SSPL"; fullName = "Server Side Public License"; From 052fc6613b77a5dd24240a16756c3a25adcf1efa Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 12:13:33 +0100 Subject: [PATCH 06/16] xfontsel: change license to x11, smlnj and mit Found at https://gitlab.freedesktop.org/xorg/app/xfontsel/-/blob/master/COPYING --- pkgs/applications/misc/xfontsel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index ecafb9d5118c..6bcab225c25a 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.x.org/"; description = "Allows testing the fonts available in an X server"; - license = licenses.free; + license = with licenses; [ x11 smlnj mit ]; maintainers = with maintainers; [ viric ]; platforms = platforms.unix; }; From 03d654beb03ee8d293785629f31bc50f113c0bca Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 12:59:58 +0100 Subject: [PATCH 07/16] welkin: change license to bsd3 $src/license also see http://simile.mit.edu/welkin/ --- pkgs/tools/graphics/welkin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 111abc745be5..e825f5e5d2b8 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; hydraPlatforms = []; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.free; + license = lib.licenses.bsd3; platforms = with lib.platforms; unix; }; } From 186ff75feed99ec1b9d6b4a97465ff99cb8140a9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 13:10:16 +0100 Subject: [PATCH 08/16] vue: change license to ecl20 found at https://vue.tufts.edu/faq --- pkgs/applications/misc/vue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index db9313b6be61..4743530197b0 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = with lib.platforms; linux; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.free; # Apache License fork, actually + license = lib.licenses.ecl20; }; } From 00ed9a344cb48ceeb56e0a1fcdebcfd0cca6564d Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 13:27:44 +0100 Subject: [PATCH 09/16] virtual-ans: chnage license to unfreeRedistibutable found in $src/docs/license/Virtual ANS.txt --- pkgs/applications/audio/virtual-ans/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index 07f006aa0cc1..a14d5c5a37e2 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://warmplace.ru/soft/ans/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.free; + license = licenses.unfreeRedistributable; # I cannot test the Darwin version, so I'll leave it disabled platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ jacg ]; From 4cbf461ffd3f493ce4e6b0f0c663df087c385c4a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 13:49:40 +0100 Subject: [PATCH 10/16] vdrsymbols: change license to bitstreamVera and publicDomain --- pkgs/data/fonts/vdrsymbols/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix index 5df82b31cfe5..fd7aba9ec063 100644 --- a/pkgs/data/fonts/vdrsymbols/default.nix +++ b/pkgs/data/fonts/vdrsymbols/default.nix @@ -27,6 +27,6 @@ stdenvNoCC.mkDerivation rec { # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. # DejaVu changes are in public domain # See https://dejavu-fonts.github.io/License.html for details - license = licenses.free; + license = with licenses; [ bitstreamVera publicDomain ]; }; } From 346182c334e4f9169cc262ac79c798b895002fe0 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 27 Dec 2023 12:54:33 +0100 Subject: [PATCH 11/16] ubuntu-font-family: change license to ufl found at https://launchpad.net/ubuntu-font-family --- pkgs/data/fonts/ubuntu-font-family/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 331e34690a5e..671ba8b4b48d 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; homepage = "http://font.ubuntu.com/"; - license = licenses.free; + license = licenses.ufl; platforms = platforms.all; maintainers = [ maintainers.antono ]; }; From 95f9761fd96a64fd82ea6feb57b9cf190a636a50 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 30 Dec 2023 00:40:41 +0100 Subject: [PATCH 12/16] lib/license: add dtoa --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 85eb7292bccf..0dfd8ef5e69c 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -405,6 +405,11 @@ in mkLicense lset) ({ fullName = "Detection Rule License 1.0"; }; + dtoa = { + spdxId = "dtoa"; + fullName = "dtoa License"; + }; + eapl = { fullName = "EPSON AVASYS PUBLIC LICENSE"; url = "https://avasys.jp/hp/menu000000700/hpg000000603.htm"; From ad306fc1c89cd397c26aba7978a7eed77e515c2c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 30 Dec 2023 00:42:24 +0100 Subject: [PATCH 13/16] u9fs: change license to dtoa found at https://bitbucket.org/plan9-from-bell-labs/u9fs/src/master/LICENSE --- pkgs/servers/u9fs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index 9056b4791672..cb85a972e034 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Serve 9P from Unix"; homepage = "http://p9f.org/magic/man2html?man=u9fs§=4"; - license = licenses.free; + license = licenses.dtoa; maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; mainProgram = "u9fs"; From 4711e8868124ad860cea902b8ab6e3223e78a9e5 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 30 Dec 2023 01:00:48 +0100 Subject: [PATCH 14/16] tty-clock: change license to bsd3 found at https://github.com/xorg62/tty-clock/blob/master/LICENSE --- pkgs/tools/misc/tty-clock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index 32701caa64de..0abb0c668be0 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; homepage = "https://github.com/xorg62/tty-clock"; - license = licenses.free; + license = licenses.bsd3; description = "Digital clock in ncurses"; platforms = platforms.all; maintainers = [ maintainers.koral ]; From 3b388c963bff85c26a0b3d3c15f6685a9e3cf5b9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 30 Dec 2023 01:01:56 +0100 Subject: [PATCH 15/16] tinyxml: change license to zlib found at https://sourceforge.net/projects/tinyxml/ in license section --- pkgs/development/libraries/tinyxml/2.6.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index ebfd8e5670ff..bff932f43096 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { meta = { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; homepage = "http://www.grinninglizard.com/tinyxml/index.html"; - license = lib.licenses.free; + license = lib.licenses.zlib; platforms = lib.platforms.unix; }; } From 88c08be88ffd6266451c3a547122aa55f31a2576 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 30 Dec 2023 15:46:49 +0100 Subject: [PATCH 16/16] taskopen: change license to gpl2Plus found at https://github.com/jschlatow/taskopen/blob/master/LICENSE --- pkgs/applications/misc/taskopen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix index 88050d2f449d..54361a0fbbd5 100644 --- a/pkgs/applications/misc/taskopen/default.nix +++ b/pkgs/applications/misc/taskopen/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Script for taking notes and open urls with taskwarrior"; homepage = "https://github.com/ValiValpas/taskopen"; platforms = platforms.linux; - license = licenses.free; + license = licenses.gpl2Plus; maintainers = [ maintainers.winpat ]; }; }