diff --git a/lib/licenses.nix b/lib/licenses.nix index 53a8ef6271aa..ba0aba1959bc 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -985,11 +985,6 @@ in mkLicense lset) ({ fullName = "GNU Affero General Public License v3.0"; deprecated = true; }; - fdl13 = { - spdxId = "GFDL-1.3"; - fullName = "GNU Free Documentation License v1.3"; - deprecated = true; - }; gpl2 = { spdxId = "GPL-2.0"; fullName = "GNU General Public License v2.0"; diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl index 4e26eeda8d34..ce0599dda0e7 100755 --- a/maintainers/scripts/nix-generate-from-cpan.pl +++ b/maintainers/scripts/nix-generate-from-cpan.pl @@ -66,7 +66,7 @@ Readonly::Hash my %LICENSE_MAP => ( # GNU Free Documentation License, Version 1.3. gfdl_1_3 => { - licenses => [qw( fdl13 )] + licenses => [qw( fdl13Plus )] }, # GNU General Public License, Version 1. diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 2dd9edcf5d23..db1367f6fba5 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -368,7 +368,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.qt.io/"; description = "A cross-platform application framework for C++"; - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; + license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; platforms = platforms.unix; # Qt5 is broken on aarch64-darwin diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index b74d5e086802..9abd9fabc957 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -70,7 +70,7 @@ mkDerivation (args // { meta = { homepage = "https://www.qt.io"; description = "A cross-platform application framework for C++"; - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; + license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; platforms = platforms.unix; } // (args.meta or {}); diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 8717b94545b6..436fe4633075 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -257,7 +257,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.qt.io/"; description = "A cross-platform application framework for C++"; - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; + license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao LunNova ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index 999d69ce683a..3ef0ea191a76 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (args // { meta = with lib; { homepage = "https://www.qt.io/"; description = "A cross-platform application framework for C++"; - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; + license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao ]; platforms = platforms.linux; } // (args.meta or { }); diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index 60c1d2754d70..36e1948f09ec 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "http://qt.nokia.com/products/qt-addons/mobility"; maintainers = [ maintainers.qknight ]; platforms = platforms.linux; - license = with licenses; [ bsd3 fdl13 gpl3 lgpl21 ]; + license = with licenses; [ bsd3 fdl13Plus gpl3Plus lgpl21Plus ]; }; }