From 2bd2347470384860f4a420c0aefe7604e7c3e1e5 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 20:09:52 +0100 Subject: [PATCH 01/16] lib/license: add NIST-Software --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 30ca31ff71f2..ba3dabb3a625 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -894,6 +894,11 @@ in mkLicense lset) ({ url = "https://raw.githubusercontent.com/netdata/netdata/master/web/gui/v2/LICENSE.md"; }; + nistSoftware = { + spdxId = "NIST-Software"; + fullName = "NIST Software License"; + }; + nlpl = { spdxId = "NLPL"; fullName = "No Limit Public License"; From 647e3983cd740ef513d11a9d268536167c4dcb10 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 20:12:34 +0100 Subject: [PATCH 02/16] 90secondportraits: change license to zlib cc-by-sa-40 cc-by-sa-30 x11 found at https://github.com/SimonLarsen/90-Second-Portraits/blob/master/LICENSE.txt and https://github.com/SimonLarsen/90-Second-Portraits/blob/master/slam.lua#L1-L25 --- pkgs/games/90secondportraits/default.nix | 2 +- pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index 4e8cd387a0e1..bd60c836b636 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { mainProgram = "90secondportraits"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; - license = licenses.free; + license = with licenses; [ zlib cc-by-sa-40 cc-by-sa-30 /* vendored */ x11 mit ]; downloadPage = "http://tangramgames.dk/games/90secondportraits"; }; diff --git a/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix b/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix index 7647d2b9f0b0..3c18621d712d 100644 --- a/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix +++ b/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/usnistgov/SP800-90B_EntropyAssessment"; description = "Implementation of min-entropy assessment methods included in Special Publication 800-90B"; platforms = lib.platforms.linux; - license = lib.licenses.free; #this software uses the NIST software license + license = lib.licenses.nistSoftware; maintainers = with lib.maintainers; [ orichter thillux ]; }; } From 857437e930e1917526c759bb4b4bbcb7d2547382 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 20:51:31 +0100 Subject: [PATCH 03/16] alephone-apotheosis-x: change license to unfree Can't find license or source code anywhere --- pkgs/by-name/al/alephone-apotheosis-x/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alephone-apotheosis-x/package.nix b/pkgs/by-name/al/alephone-apotheosis-x/package.nix index 16bed9fad97e..566b98f9e856 100644 --- a/pkgs/by-name/al/alephone-apotheosis-x/package.nix +++ b/pkgs/by-name/al/alephone-apotheosis-x/package.nix @@ -1,4 +1,4 @@ -{ alephone, requireFile }: +{ lib, alephone, requireFile }: alephone.makeWrapper rec { pname = "apotheosis-x"; @@ -16,5 +16,6 @@ alephone.makeWrapper rec { meta = { description = "Total conversion for Marathon Infinity running on the Aleph One engine"; homepage = "https://simplici7y.com/items/apotheosis-x-5"; + license = lib.licenses.unfree; }; } From 3f16499c48b5b0ba7a16cf8d2751a8cbff8f4def Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 21:03:05 +0100 Subject: [PATCH 04/16] lib/license: add giftware --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index ba3dabb3a625..d677714d5295 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -599,6 +599,11 @@ in mkLicense lset) ({ url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception"; }; + giftware = { + spdxId = "Giftware"; + fullName = "Giftware License"; + }; + hpnd = { spdxId = "HPND"; fullName = "Historic Permission Notice and Disclaimer"; From 0eef23bd9b6cf5584a2f05f6d53fe29347939288 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 21:04:19 +0100 Subject: [PATCH 05/16] allegro: change license to giftware found at https://github.com/liballeg/allegro5/blob/4.2/docs/src/license._tx --- pkgs/development/libraries/allegro/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index d9c862443653..0318c3133d63 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A game programming library"; homepage = "https://liballeg.org/"; - license = licenses.free; # giftware + license = licenses.giftware; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; }; From 8a060c14d37487afdaed75b06338658e41a7e2c4 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 21:08:21 +0100 Subject: [PATCH 06/16] antsimulator: change license to mit found at https://github.com/johnBuffer/AntSimulator/blob/master/LICENSE --- pkgs/games/antsimulator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/antsimulator/default.nix b/pkgs/games/antsimulator/default.nix index f6b360831458..69cd7ad1894b 100644 --- a/pkgs/games/antsimulator/default.nix +++ b/pkgs/games/antsimulator/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/johnBuffer/AntSimulator"; description = "Simple Ants simulator"; mainProgram = "antsimulator"; - license = licenses.free; + license = licenses.mit; maintainers = with maintainers; [ ivar ]; platforms = platforms.unix; }; From 4534862f7c5afcbeb363e811f7d1b7e32c3bc2f2 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 21:15:23 +0100 Subject: [PATCH 07/16] arguments: change license to gpl2Plus found at https://github.com/BIC-MNI/arguments/blob/master/src/arguments.cpp --- pkgs/development/libraries/arguments/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix index bacb7662386e..524e00dc5a76 100644 --- a/pkgs/development/libraries/arguments/default.nix +++ b/pkgs/development/libraries/arguments/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Library for argument handling for MINC programs"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = licenses.gpl2Plus; }; } From d5482f9313e91beddc8143642a7289580cc8c194 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 21:27:32 +0100 Subject: [PATCH 08/16] b43FirmwareCutter: change license to bsd2 found at $src/COPYING --- pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 1e46068b2124..65e259667516 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Firmware extractor for cards supported by the b43 kernel module"; mainProgram = "b43-fwcutter"; homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; - license = lib.licenses.free; + license = lib.licenses.bsd2; platforms = lib.platforms.linux; }; } From 2fabb7f99b06757e23b99fb1e98f1ae3afbaeb55 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 21:33:30 +0100 Subject: [PATCH 09/16] babelstone-han: change license to Arphic-1999 found at https://www.babelstone.co.uk/Fonts/Han.html#License --- pkgs/data/fonts/babelstone-han/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index 9839295653d1..6dfad42d2086 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation { description = "Unicode CJK font with over 36000 Han characters"; homepage = "https://www.babelstone.co.uk/Fonts/Han.html"; - license = licenses.free; + license = licenses.arphicpl; platforms = platforms.all; maintainers = with maintainers; [ emily ]; }; From 58e1eb3b78fbb8a4f1d8247940bf4e0183d0a591 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 21:47:02 +0100 Subject: [PATCH 10/16] lib/license: add hpndUc --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index d677714d5295..a60171e55c12 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -614,6 +614,11 @@ in mkLicense lset) ({ spdxId = "HPND-sell-variant"; }; + hpndUc = { + spdxId = "HPND-UC"; + fullName = "Historical Permission Notice and Disclaimer - University of California variant"; + }; + # Intel's license, seems free iasl = { spdxId = "Intel-ACPI"; From a4fabce54bd0c5d700b6811ffdd2789974ff5253 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 21:47:46 +0100 Subject: [PATCH 11/16] bicgl: change license to hpndUc found at https://github.com/BIC-MNI/bicgl/blob/master/COPYING --- pkgs/development/libraries/science/biology/bicgl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/pkgs/development/libraries/science/biology/bicgl/default.nix index 4f98874b2595..07d64fbd97ed 100644 --- a/pkgs/development/libraries/science/biology/bicgl/default.nix +++ b/pkgs/development/libraries/science/biology/bicgl/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Brain Imaging Centre graphics library"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = licenses.hpndUc; }; } From 4de5cc5aab113e9d01455abb5c565a75c1f5ee18 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 21:50:47 +0100 Subject: [PATCH 12/16] bicpl: change license to hpndUc found at https://github.com/BIC-MNI/bicpl/blob/master/COPYING --- pkgs/development/libraries/science/biology/bicpl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix index 5cf63e342242..c15689aa606a 100644 --- a/pkgs/development/libraries/science/biology/bicpl/default.nix +++ b/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Brain Imaging Centre programming library"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = with licenses; [ hpndUc gpl3Plus ]; }; } From 178c7f61da4e1271a00de5b41354ad5489293332 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 22:00:18 +0100 Subject: [PATCH 13/16] bront_fonts: change license to bitstreamVera and ufl found at https://github.com/chrismwendt/bront/blob/master/DejaVuSansMono-LICENSE.txt and https://github.com/chrismwendt/bront/blob/master/UbuntuMono-LICENSE.txt --- pkgs/data/fonts/bront/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/bront/default.nix b/pkgs/data/fonts/bront/default.nix index d21c820f127b..36e6adb380df 100644 --- a/pkgs/data/fonts/bront/default.nix +++ b/pkgs/data/fonts/bront/default.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation { description = "Bront Fonts"; longDescription = "Ubuntu Mono Bront and DejaVu Sans Mono Bront fonts."; homepage = "https://github.com/chrismwendt/bront"; - license = licenses.free; + license = with licenses; [ bitstreamVera ufl ]; platforms = platforms.all; maintainers = [ maintainers.grburst ]; }; From d44938cf9fb5554ef3b83a953fb73ae773135760 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 22:44:59 +0100 Subject: [PATCH 14/16] chez-mit: change license to gpl3Plus found in the source files headers --- pkgs/development/chez-modules/chez-mit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix index 10407598fb96..677e7fc99194 100644 --- a/pkgs/development/chez-modules/chez-mit/default.nix +++ b/pkgs/development/chez-modules/chez-mit/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "This is a MIT/GNU Scheme compatibility library for Chez Scheme"; homepage = "https://github.com/fedeinthemix/chez-mit/"; maintainers = [ maintainers.jitwit ]; - license = licenses.free; + license = licenses.gpl3Plus; }; } From 18f02dd2b2f57b366cd1e78179057ebc51ee2c79 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 22:48:21 +0100 Subject: [PATCH 15/16] chez-srfi: change license to x11 found at https://github.com/fedeinthemix/chez-srfi/blob/master/srfi/LICENSE --- pkgs/development/chez-modules/chez-srfi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/development/chez-modules/chez-srfi/default.nix index 1780a1356c5c..d821e6d01556 100644 --- a/pkgs/development/chez-modules/chez-srfi/default.nix +++ b/pkgs/development/chez-modules/chez-srfi/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { description = "This package provides a collection of SRFI libraries for Chez Scheme"; homepage = "https://github.com/fedeinthemix/chez-srfi/"; maintainers = [ maintainers.jitwit ]; - license = licenses.free; + license = licenses.x11; }; } From 3c57e34690730b89b8b576860d0eac28290e107e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Mar 2024 22:50:55 +0100 Subject: [PATCH 16/16] conglomerate: change license to hpndUc found at https://github.com/BIC-MNI/conglomerate/blob/master/COPYING --- pkgs/applications/science/biology/conglomerate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index fe1c1f5511d1..d9092b9eeb11 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "More command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = licenses.hpndUc; }; }