From d1d63d0dcfac80bc7610d553b943c8011a72389a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 1 Sep 2025 19:04:46 +0200 Subject: [PATCH 1/4] lib.licenses: drop in favor of bsd3Lbnl This is the same license --- lib/licenses.nix | 5 ----- pkgs/by-name/ra/radiance/package.nix | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index d5cab5fbcbf4..830294378eb3 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1175,11 +1175,6 @@ lib.mapAttrs mkLicense ( url = "https://qwt.sourceforge.io/qwtlicense.html"; }; - radiance = { - fullName = "The Radiance Software License, Version 2.0"; - url = "https://github.com/LBNL-ETA/Radiance/blob/master/License.txt"; - }; - ruby = { spdxId = "Ruby"; fullName = "Ruby License"; diff --git a/pkgs/by-name/ra/radiance/package.nix b/pkgs/by-name/ra/radiance/package.nix index 7cc51249f979..3d67eac17466 100644 --- a/pkgs/by-name/ra/radiance/package.nix +++ b/pkgs/by-name/ra/radiance/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Validated Lighting Simulation Tool"; homepage = "https://github.com/LBNL-ETA/Radiance"; - license = lib.licenses.radiance; + license = lib.licenses.bsd3Lbnl; maintainers = with lib.maintainers; [ robwalt ]; mainProgram = "rad"; }; From e85bfdae292e22de132a4e64366696ba911cc143 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 1 Sep 2025 19:12:19 +0200 Subject: [PATCH 2/4] lib.license: purdueBsd rename to lsof spdx has marked this as lsof license --- lib/licenses.nix | 10 +++++----- pkgs/by-name/ls/lsof/package.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 830294378eb3..25a46867b30f 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -922,6 +922,11 @@ lib.mapAttrs mkLicense ( fullName = "Lucent Public License v1.02"; }; + lsof = { + spdxId = "lsof"; + fullName = "lsof License"; # also known as Purdue BSD-Style License + }; + miros = { spdxId = "MirOS"; fullName = "MirOS License"; @@ -1149,11 +1154,6 @@ lib.mapAttrs mkLicense ( fullName = "Public Domain"; }; - purdueBsd = { - fullName = "Purdue BSD-Style License"; # also known as lsof license - url = "https://enterprise.dejacode.com/licenses/public/purdue-bsd"; - }; - prosperity30 = { fullName = "Prosperity-3.0.0"; free = false; diff --git a/pkgs/by-name/ls/lsof/package.nix b/pkgs/by-name/ls/lsof/package.nix index 5c8d02f446fe..f438a33b5465 100644 --- a/pkgs/by-name/ls/lsof/package.nix +++ b/pkgs/by-name/ls/lsof/package.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { socket (IPv6/IPv4/UNIX local), or partition (by opening a file from it). ''; - license = lib.licenses.purdueBsd; + license = lib.licenses.lsof; maintainers = with lib.maintainers; [ dezgeg ]; platforms = lib.platforms.unix; }; From 7e3c021be1d963ce47ac36a7f892b16dc4365f64 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 1 Sep 2025 19:28:03 +0200 Subject: [PATCH 3/4] lib.licenses: caossl rename to asl11 This is just the Apache-1.1 license so make use of it and not some random name --- lib/licenses.nix | 10 +++++----- pkgs/by-name/jx/jxplorer/package.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 25a46867b30f..103e52666bfe 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -152,6 +152,11 @@ lib.mapAttrs mkLicense ( fullName = "Artistic License 2.0"; }; + asl11 = { + spdxId = "Apache-1.1"; + fullName = "Apache License 1.1"; + }; + asl20 = { spdxId = "Apache-2.0"; fullName = "Apache License 2.0"; @@ -274,11 +279,6 @@ lib.mapAttrs mkLicense ( redistributable = true; }; - caossl = { - fullName = "Computer Associates Open Source Licence Version 1.0"; - url = "http://jxplorer.org/licence.html"; - }; - cal10 = { spdxId = "CAL-1.0"; fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)"; diff --git a/pkgs/by-name/jx/jxplorer/package.nix b/pkgs/by-name/jx/jxplorer/package.nix index eea1c6a6a7de..e0e324fb3ab8 100644 --- a/pkgs/by-name/jx/jxplorer/package.nix +++ b/pkgs/by-name/jx/jxplorer/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Java Ldap Browser"; homepage = "https://sourceforge.net/projects/jxplorer/"; - license = lib.licenses.caossl; + license = lib.licenses.asl11; maintainers = with maintainers; [ benwbooth ]; platforms = platforms.linux; mainProgram = "jxplorer"; From 33f92fb5652cee673eed10c102c62216d5d26d37 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 1 Sep 2025 21:29:40 +0200 Subject: [PATCH 4/4] lib.licenses: replace qwt with qwtException --- lib/licenses.nix | 6 +++--- pkgs/development/libraries/qwt/6_1.nix | 5 ++++- pkgs/development/libraries/qwt/default.nix | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 103e52666bfe..8be291e5bab4 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1170,9 +1170,9 @@ lib.mapAttrs mkLicense ( fullName = "Q Public License 1.0"; }; - qwt = { - fullName = "Qwt License, Version 1.0"; - url = "https://qwt.sourceforge.io/qwtlicense.html"; + qwtException = { + spdxId = "Qwt-exception-1.0"; + fullName = "Qwt exception 1.0"; }; ruby = { diff --git a/pkgs/development/libraries/qwt/6_1.nix b/pkgs/development/libraries/qwt/6_1.nix index bf5a4c35a702..e5c5196cbb73 100644 --- a/pkgs/development/libraries/qwt/6_1.nix +++ b/pkgs/development/libraries/qwt/6_1.nix @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = licenses.qwt; + license = with lib.licenses; [ + lgpl21Only + qwtException + ]; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index 7ff4c929e486..36c82a030550 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -42,7 +42,10 @@ stdenv.mkDerivation rec { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = lib.licenses.qwt; + license = with lib.licenses; [ + lgpl21Only + qwtException + ]; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; };