lib.licenses: some more cleanup (#439307)

authored by

jopejoe1 and committed by
GitHub
4d56433d 7cb966a1

+24 -23
+13 -18
lib/licenses.nix
··· 157 fullName = "Artistic License 2.0"; 158 }; 159 160 asl20 = { 161 spdxId = "Apache-2.0"; 162 fullName = "Apache License 2.0"; ··· 277 fullName = "Business Source License 1.1"; 278 free = false; 279 redistributable = true; 280 - }; 281 - 282 - caossl = { 283 - fullName = "Computer Associates Open Source Licence Version 1.0"; 284 - url = "http://jxplorer.org/licence.html"; 285 }; 286 287 cal10 = { ··· 932 fullName = "Lucent Public License v1.02"; 933 }; 934 935 miros = { 936 spdxId = "MirOS"; 937 fullName = "MirOS License"; ··· 1159 fullName = "Public Domain"; 1160 }; 1161 1162 - purdueBsd = { 1163 - fullName = "Purdue BSD-Style License"; # also known as lsof license 1164 - url = "https://enterprise.dejacode.com/licenses/public/purdue-bsd"; 1165 - }; 1166 - 1167 prosperity30 = { 1168 fullName = "Prosperity-3.0.0"; 1169 free = false; ··· 1180 fullName = "Q Public License 1.0"; 1181 }; 1182 1183 - qwt = { 1184 - fullName = "Qwt License, Version 1.0"; 1185 - url = "https://qwt.sourceforge.io/qwtlicense.html"; 1186 - }; 1187 - 1188 - radiance = { 1189 - fullName = "The Radiance Software License, Version 2.0"; 1190 - url = "https://github.com/LBNL-ETA/Radiance/blob/master/License.txt"; 1191 }; 1192 1193 ruby = {
··· 157 fullName = "Artistic License 2.0"; 158 }; 159 160 + asl11 = { 161 + spdxId = "Apache-1.1"; 162 + fullName = "Apache License 1.1"; 163 + }; 164 + 165 asl20 = { 166 spdxId = "Apache-2.0"; 167 fullName = "Apache License 2.0"; ··· 282 fullName = "Business Source License 1.1"; 283 free = false; 284 redistributable = true; 285 }; 286 287 cal10 = { ··· 932 fullName = "Lucent Public License v1.02"; 933 }; 934 935 + lsof = { 936 + spdxId = "lsof"; 937 + fullName = "lsof License"; # also known as Purdue BSD-Style License 938 + }; 939 + 940 miros = { 941 spdxId = "MirOS"; 942 fullName = "MirOS License"; ··· 1164 fullName = "Public Domain"; 1165 }; 1166 1167 prosperity30 = { 1168 fullName = "Prosperity-3.0.0"; 1169 free = false; ··· 1180 fullName = "Q Public License 1.0"; 1181 }; 1182 1183 + qwtException = { 1184 + spdxId = "Qwt-exception-1.0"; 1185 + fullName = "Qwt exception 1.0"; 1186 }; 1187 1188 ruby = {
+1 -1
pkgs/by-name/jx/jxplorer/package.nix
··· 51 meta = with lib; { 52 description = "Java Ldap Browser"; 53 homepage = "https://sourceforge.net/projects/jxplorer/"; 54 - license = lib.licenses.caossl; 55 maintainers = with maintainers; [ benwbooth ]; 56 platforms = platforms.linux; 57 mainProgram = "jxplorer";
··· 51 meta = with lib; { 52 description = "Java Ldap Browser"; 53 homepage = "https://sourceforge.net/projects/jxplorer/"; 54 + license = lib.licenses.asl11; 55 maintainers = with maintainers; [ benwbooth ]; 56 platforms = platforms.linux; 57 mainProgram = "jxplorer";
+1 -1
pkgs/by-name/ls/lsof/package.nix
··· 87 socket (IPv6/IPv4/UNIX local), or partition (by opening a file 88 from it). 89 ''; 90 - license = lib.licenses.purdueBsd; 91 maintainers = with lib.maintainers; [ dezgeg ]; 92 platforms = lib.platforms.unix; 93 };
··· 87 socket (IPv6/IPv4/UNIX local), or partition (by opening a file 88 from it). 89 ''; 90 + license = lib.licenses.lsof; 91 maintainers = with lib.maintainers; [ dezgeg ]; 92 platforms = lib.platforms.unix; 93 };
+1 -1
pkgs/by-name/ra/radiance/package.nix
··· 40 meta = { 41 description = "Validated Lighting Simulation Tool"; 42 homepage = "https://github.com/LBNL-ETA/Radiance"; 43 - license = lib.licenses.radiance; 44 maintainers = with lib.maintainers; [ robwalt ]; 45 mainProgram = "rad"; 46 };
··· 40 meta = { 41 description = "Validated Lighting Simulation Tool"; 42 homepage = "https://github.com/LBNL-ETA/Radiance"; 43 + license = lib.licenses.bsd3Lbnl; 44 maintainers = with lib.maintainers; [ robwalt ]; 45 mainProgram = "rad"; 46 };
+4 -1
pkgs/development/libraries/qwt/6_1.nix
··· 36 description = "Qt widgets for technical applications"; 37 homepage = "http://qwt.sourceforge.net/"; 38 # LGPL 2.1 plus a few exceptions (more liberal) 39 - license = licenses.qwt; 40 platforms = platforms.unix; 41 maintainers = [ maintainers.bjornfor ]; 42 };
··· 36 description = "Qt widgets for technical applications"; 37 homepage = "http://qwt.sourceforge.net/"; 38 # LGPL 2.1 plus a few exceptions (more liberal) 39 + license = with lib.licenses; [ 40 + lgpl21Only 41 + qwtException 42 + ]; 43 platforms = platforms.unix; 44 maintainers = [ maintainers.bjornfor ]; 45 };
+4 -1
pkgs/development/libraries/qwt/default.nix
··· 42 description = "Qt widgets for technical applications"; 43 homepage = "http://qwt.sourceforge.net/"; 44 # LGPL 2.1 plus a few exceptions (more liberal) 45 - license = lib.licenses.qwt; 46 platforms = platforms.unix; 47 maintainers = [ maintainers.bjornfor ]; 48 };
··· 42 description = "Qt widgets for technical applications"; 43 homepage = "http://qwt.sourceforge.net/"; 44 # LGPL 2.1 plus a few exceptions (more liberal) 45 + license = with lib.licenses; [ 46 + lgpl21Only 47 + qwtException 48 + ]; 49 platforms = platforms.unix; 50 maintainers = [ maintainers.bjornfor ]; 51 };