From 33f92fb5652cee673eed10c102c62216d5d26d37 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 1 Sep 2025 21:29:40 +0200 Subject: [PATCH] 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 ]; };