diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-10-27 22:47:29 +0200 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-10-27 22:47:29 +0200 |
commit | 06d0490ab3f6b7e65b30916ffc394ebd07215fbb (patch) | |
tree | e4e94473c9d82a26f8f3c860f13d29d6a3a77ab1 | |
parent | 84d67f05746038382426c3d72ebb7daf3fab1557 (diff) |
licenses: remove fdl12
62 files changed, 61 insertions, 66 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 61612a2c236fd..53a8ef6271aa1 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; }; - fdl12 = { - spdxId = "GFDL-1.2"; - fullName = "GNU Free Documentation License v1.2"; - deprecated = true; - }; fdl13 = { spdxId = "GFDL-1.3"; fullName = "GNU Free Documentation License v1.3"; diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl index 6494acb50da5b..4e26eeda8d34d 100755 --- a/maintainers/scripts/nix-generate-from-cpan.pl +++ b/maintainers/scripts/nix-generate-from-cpan.pl @@ -61,7 +61,7 @@ Readonly::Hash my %LICENSE_MAP => ( # GNU Free Documentation License, Version 1.2. gfdl_1_2 => { - licenses => [qw( fdl12 )] + licenses => [qw( fdl12Plus )] }, # GNU Free Documentation License, Version 1.3. diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix index 948f9e5d2a23e..370f77c383181 100644 --- a/pkgs/applications/kde/akonadi-import-wizard.nix +++ b/pkgs/applications/kde/akonadi-import-wizard.nix @@ -9,7 +9,7 @@ mkDerivation { pname = "akonadi-import-wizard"; meta = { - license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/akonadi-notes.nix b/pkgs/applications/kde/akonadi-notes.nix index 6db7e00be9b0c..1ab0ca74819f3 100644 --- a/pkgs/applications/kde/akonadi-notes.nix +++ b/pkgs/applications/kde/akonadi-notes.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "akonadi-notes"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix index 495b63abd4435..84657177f891f 100644 --- a/pkgs/applications/kde/akonadi-search.nix +++ b/pkgs/applications/kde/akonadi-search.nix @@ -8,7 +8,7 @@ mkDerivation { pname = "akonadi-search"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix index 76e5ca480b47f..bb0b8424b4e47 100644 --- a/pkgs/applications/kde/akonadiconsole.nix +++ b/pkgs/applications/kde/akonadiconsole.nix @@ -9,7 +9,7 @@ mkDerivation { pname = "akonadiconsole"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/akregator.nix b/pkgs/applications/kde/akregator.nix index 9cb23ad35ac5f..714f636341da8 100644 --- a/pkgs/applications/kde/akregator.nix +++ b/pkgs/applications/kde/akregator.nix @@ -14,7 +14,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/akregator/"; description = "KDE feed reader"; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix index 24f93ee0af753..c6a4e36c82d4d 100644 --- a/pkgs/applications/kde/calendarsupport.nix +++ b/pkgs/applications/kde/calendarsupport.nix @@ -8,7 +8,7 @@ mkDerivation { pname = "calendarsupport"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index b70f4977f587b..9e4ab1d41027c 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -13,7 +13,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/dolphin/"; description = "KDE file manager"; - license = with lib.licenses; [ gpl2 fdl12 ]; + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; maintainers = [ lib.maintainers.ttuegel ]; broken = lib.versionOlder qtbase.version "5.14"; }; diff --git a/pkgs/applications/kde/dragon.nix b/pkgs/applications/kde/dragon.nix index 4fb5583a8ff99..399205da6caaf 100644 --- a/pkgs/applications/kde/dragon.nix +++ b/pkgs/applications/kde/dragon.nix @@ -11,7 +11,7 @@ mkDerivation { pname = "dragon"; meta = { homepage = "https://apps.kde.org/dragonplayer/"; - license = with lib.licenses; [ gpl2 fdl12 ]; + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; description = "A simple media player for KDE"; maintainers = [ lib.maintainers.jonathanreeve ]; }; diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix index 1a6cc9442b96b..001c1e6cbcb92 100644 --- a/pkgs/applications/kde/eventviews.nix +++ b/pkgs/applications/kde/eventviews.nix @@ -8,7 +8,7 @@ mkDerivation { pname = "eventviews"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 517cb072f74d6..6d29d6e6d8c10 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "grantleetheme"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; broken = lib.versionOlder qtbase.version "5.13.0"; }; diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 36d46f43966d3..545b1a2b69e78 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -11,7 +11,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/gwenview/"; description = "KDE image viewer"; - license = with lib.licenses; [ gpl2 fdl12 ]; + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix index 7f2c284ad74df..9c248f199a5d2 100644 --- a/pkgs/applications/kde/incidenceeditor.nix +++ b/pkgs/applications/kde/incidenceeditor.nix @@ -8,7 +8,7 @@ mkDerivation { pname = "incidenceeditor"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix index 1a800525255cd..441a150ee170e 100644 --- a/pkgs/applications/kde/kaddressbook.nix +++ b/pkgs/applications/kde/kaddressbook.nix @@ -12,7 +12,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/kaddressbook/"; description = "KDE contact manager"; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix index 21e84dff05ff9..7da9739aad1d6 100644 --- a/pkgs/applications/kde/kcalutils.nix +++ b/pkgs/applications/kde/kcalutils.nix @@ -8,7 +8,7 @@ mkDerivation { pname = "kcalutils"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 0cc78c69aec7f..b5158bfd15491 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -12,7 +12,7 @@ mkDerivation { pname = "kdepim-runtime"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; diff --git a/pkgs/applications/kde/kdialog.nix b/pkgs/applications/kde/kdialog.nix index 015c86bc7d124..ea7393e72261b 100644 --- a/pkgs/applications/kde/kdialog.nix +++ b/pkgs/applications/kde/kdialog.nix @@ -10,7 +10,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/kdialog/"; description = "Display dialog boxes from shell scripts"; - license = with lib.licenses; [ gpl2 fdl12 ]; + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; maintainers = with lib.maintainers; [ peterhoeg ]; }; diff --git a/pkgs/applications/kde/keditbookmarks.nix b/pkgs/applications/kde/keditbookmarks.nix index 9deb1a3c01588..8bc0ec8736130 100644 --- a/pkgs/applications/kde/keditbookmarks.nix +++ b/pkgs/applications/kde/keditbookmarks.nix @@ -10,7 +10,7 @@ mkDerivation { buildInputs = [ kio kparts kwindowsystem ]; meta = with lib; { homepage = "http://www.kde.org"; - license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; + license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/pkgs/applications/kde/kidentitymanagement.nix index 789206a16390c..c2f2abcd32d01 100644 --- a/pkgs/applications/kde/kidentitymanagement.nix +++ b/pkgs/applications/kde/kidentitymanagement.nix @@ -8,7 +8,7 @@ mkDerivation { pname = "kidentitymanagement"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix index e93804bd885da..ece32e3ee0571 100644 --- a/pkgs/applications/kde/kimap.nix +++ b/pkgs/applications/kde/kimap.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "kimap"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kldap.nix b/pkgs/applications/kde/kldap.nix index 69849f757514d..6016cfd090c83 100644 --- a/pkgs/applications/kde/kldap.nix +++ b/pkgs/applications/kde/kldap.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "kldap"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix index b3444e97532f8..a02e7b08aa651 100644 --- a/pkgs/applications/kde/kleopatra.nix +++ b/pkgs/applications/kde/kleopatra.nix @@ -18,7 +18,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/kleopatra/"; description = "Certificate manager and unified crypto GUI"; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; } diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix index c0ab4ff947e9c..216586076aeca 100644 --- a/pkgs/applications/kde/kmail-account-wizard.nix +++ b/pkgs/applications/kde/kmail-account-wizard.nix @@ -9,7 +9,7 @@ mkDerivation { pname = "kmail-account-wizard"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index 341d54a6388a5..6a71529eb0f16 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -55,7 +55,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/kmail2/"; description = "Mail client"; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix index 976bd634e66a1..577beb8d5ec8e 100644 --- a/pkgs/applications/kde/kmailtransport.nix +++ b/pkgs/applications/kde/kmailtransport.nix @@ -9,7 +9,7 @@ mkDerivation { pname = "kmailtransport"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix index 6f3db970b942b..d2b4dbde8ac40 100644 --- a/pkgs/applications/kde/kmbox.nix +++ b/pkgs/applications/kde/kmbox.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "kmbox"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix index 2f85454eb67ea..352fd129ce945 100644 --- a/pkgs/applications/kde/kmix.nix +++ b/pkgs/applications/kde/kmix.nix @@ -10,7 +10,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/kmix/"; description = "Sound mixer"; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = [ lib.maintainers.rongcuid ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kmousetool.nix b/pkgs/applications/kde/kmousetool.nix index fb4323455b795..4bac765dc4b9a 100644 --- a/pkgs/applications/kde/kmousetool.nix +++ b/pkgs/applications/kde/kmousetool.nix @@ -28,7 +28,7 @@ mkDerivation { meta = { homepage = "https://github.com/KDE/kmousetool"; description = "Program that clicks the mouse for you"; - license = with lib.licenses; [ gpl2 fdl12 ]; + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; maintainers = [ lib.maintainers.jayesh-bhoot ]; }; } diff --git a/pkgs/applications/kde/kmplot.nix b/pkgs/applications/kde/kmplot.nix index a6784982580f0..9f1ab4d281190 100644 --- a/pkgs/applications/kde/kmplot.nix +++ b/pkgs/applications/kde/kmplot.nix @@ -7,7 +7,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/kmplot/"; description = "Mathematical function plotter"; - license = with lib.licenses; [ gpl2Plus fdl12 ]; + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; maintainers = [ lib.maintainers.orivej ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 23cbdf28477dc..220cd6a16d573 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -12,7 +12,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/konsole/"; description = "KDE terminal emulator"; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = with lib.maintainers; [ ttuegel turion ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix index dbdc5ba474b1c..b8ccd9415efb7 100644 --- a/pkgs/applications/kde/kontact.nix +++ b/pkgs/applications/kde/kontact.nix @@ -12,7 +12,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/kontact/"; description = "Personal information manager"; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix index 858addcd3ffa2..b680a088a6ea9 100644 --- a/pkgs/applications/kde/kontactinterface.nix +++ b/pkgs/applications/kde/kontactinterface.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "kontactinterface"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/korganizer.nix b/pkgs/applications/kde/korganizer.nix index 3eafd80cacf67..36edffb4eabdb 100644 --- a/pkgs/applications/kde/korganizer.nix +++ b/pkgs/applications/kde/korganizer.nix @@ -15,7 +15,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/korganizer/"; description = "Personal organizer"; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kpat.nix b/pkgs/applications/kde/kpat.nix index 96bd6dd542ece..3d480db6bc13f 100644 --- a/pkgs/applications/kde/kpat.nix +++ b/pkgs/applications/kde/kpat.nix @@ -21,7 +21,7 @@ mkDerivation { freecell-solver ]; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = with lib.maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix index 2948075f6963f..e42c25e7463d0 100644 --- a/pkgs/applications/kde/kpimtextedit.nix +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -9,7 +9,7 @@ mkDerivation { pname = "kpimtextedit"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; broken = lib.versionOlder qtbase.version "5.13.0"; }; diff --git a/pkgs/applications/kde/kqtquickcharts.nix b/pkgs/applications/kde/kqtquickcharts.nix index 669a38e37ca63..0560fc9da01df 100644 --- a/pkgs/applications/kde/kqtquickcharts.nix +++ b/pkgs/applications/kde/kqtquickcharts.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "kqtquickcharts"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix index 8049c6d11b495..9d9762523d974 100644 --- a/pkgs/applications/kde/krdc.nix +++ b/pkgs/applications/kde/krdc.nix @@ -19,7 +19,7 @@ mkDerivation { meta = with lib; { homepage = "http://www.kde.org"; description = "Remote desktop client"; - license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; + license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; broken = lib.versionOlder qtbase.version "5.14"; diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index 807b3508b95ab..8262febad7afb 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -11,7 +11,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/krfb/"; description = "Desktop sharing (VNC)"; - license = with lib.licenses; [ gpl2 fdl12 ]; + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; maintainers = with lib.maintainers; [ jerith666 ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix index 3bf80f4abf528..1e5a43f352132 100644 --- a/pkgs/applications/kde/ksmtp/default.nix +++ b/pkgs/applications/kde/ksmtp/default.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "ksmtp"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix index 4a29acd1e7cfa..fec85644aa715 100644 --- a/pkgs/applications/kde/ktnef.nix +++ b/pkgs/applications/kde/ktnef.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "ktnef"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/libgravatar.nix b/pkgs/applications/kde/libgravatar.nix index 51e3391b8e772..2055d7bd36b39 100644 --- a/pkgs/applications/kde/libgravatar.nix +++ b/pkgs/applications/kde/libgravatar.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "libgravatar"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/libkdepim.nix b/pkgs/applications/kde/libkdepim.nix index cc0c15a9e060f..5fafd2e1effc2 100644 --- a/pkgs/applications/kde/libkdepim.nix +++ b/pkgs/applications/kde/libkdepim.nix @@ -9,7 +9,7 @@ mkDerivation { pname = "libkdepim"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix index 979ca7e2f458d..de0be7ea49ad1 100644 --- a/pkgs/applications/kde/libkgapi.nix +++ b/pkgs/applications/kde/libkgapi.nix @@ -8,7 +8,7 @@ mkDerivation { pname = "libkgapi"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; broken = lib.versionOlder qtbase.version "5.14.0"; }; diff --git a/pkgs/applications/kde/libkleo.nix b/pkgs/applications/kde/libkleo.nix index dd17345c5f17a..0cd858ea6e0a0 100644 --- a/pkgs/applications/kde/libkleo.nix +++ b/pkgs/applications/kde/libkleo.nix @@ -8,7 +8,7 @@ mkDerivation { pname = "libkleo"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/libksieve.nix b/pkgs/applications/kde/libksieve.nix index 209647a4791fa..adc232f091d68 100644 --- a/pkgs/applications/kde/libksieve.nix +++ b/pkgs/applications/kde/libksieve.nix @@ -9,7 +9,7 @@ mkDerivation { pname = "libksieve"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix index c3a8659a735b2..af29ff41681e2 100644 --- a/pkgs/applications/kde/mailcommon.nix +++ b/pkgs/applications/kde/mailcommon.nix @@ -9,7 +9,7 @@ mkDerivation { pname = "mailcommon"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix index b1e0461a9593a..745316fbaf9ae 100644 --- a/pkgs/applications/kde/mailimporter.nix +++ b/pkgs/applications/kde/mailimporter.nix @@ -8,7 +8,7 @@ mkDerivation { pname = "mailimporter"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix index eadb27f05bc99..d51b7e99ce60b 100644 --- a/pkgs/applications/kde/mbox-importer.nix +++ b/pkgs/applications/kde/mbox-importer.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "mbox-importer"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index 6709a1f072a58..d52989d3ffc0a 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -11,7 +11,7 @@ mkDerivation { pname = "messagelib"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 51994c2868dd1..f2f5630422247 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -30,7 +30,7 @@ mkDerivation { meta = with lib; { homepage = "http://www.kde.org"; description = "KDE document viewer"; - license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; + license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ]; maintainers = with maintainers; [ ttuegel turion ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix index f13e1f667957c..c1a2270641bda 100644 --- a/pkgs/applications/kde/pim-data-exporter.nix +++ b/pkgs/applications/kde/pim-data-exporter.nix @@ -12,7 +12,7 @@ mkDerivation { meta = { homepage = "https://apps.kde.org/pimdataexporter/"; description = "Saves and restores all data from PIM apps"; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/pim-sieve-editor.nix b/pkgs/applications/kde/pim-sieve-editor.nix index 9998418ff8a3b..613a159a79290 100644 --- a/pkgs/applications/kde/pim-sieve-editor.nix +++ b/pkgs/applications/kde/pim-sieve-editor.nix @@ -8,7 +8,7 @@ mkDerivation { pname = "pim-sieve-editor"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index 40153af70e830..896c202529a67 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -10,7 +10,7 @@ mkDerivation { pname = "pimcommon"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix index 45362d556a72a..bb5cd80bca23a 100644 --- a/pkgs/applications/kde/rocs.nix +++ b/pkgs/applications/kde/rocs.nix @@ -11,7 +11,7 @@ mkDerivation { meta = with lib; { homepage = "https://edu.kde.org/rocs/"; description = "A graph theory IDE."; - license = with licenses; [ gpl2 lgpl21 fdl12 ]; + license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; platforms = lib.platforms.linux; maintainers = with maintainers; [ knairda ]; }; diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 274ff7cdeab79..986faceb82d01 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { meta = with lib; { description = "MPlayer front-end for KDE"; - license = with licenses; [ gpl2 lgpl2 fdl12 ]; + license = with licenses; [ gpl2Plus lgpl2Plus fdl12Plus ]; homepage = "https://kmplayer.kde.org/"; maintainers = with maintainers; [ sander zraexy ]; }; diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index c9ce9c2bf7646..1fd83700f85a0 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GCC C++ STD manual pages"; homepage = "https://gcc.gnu.org/"; - license = with licenses; [ fdl12Plus ]; + license = with licenses; [ fdl13Plus ]; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index d5fcd44887ac9..ab81748118068 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MATE User Guide"; homepage = "https://mate-desktop.org"; - license = with licenses; [ gpl2Plus fdl12 ]; + license = with licenses; [ gpl2Plus fdl11Plus ]; platforms = platforms.unix; maintainers = teams.mate.members; }; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index bb3119ed6d458..6396b7c6c51e0 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -43,7 +43,7 @@ let mit gpl2Plus gpl3Plus - fdl12 + fdl12Plus ]; srcs = import ./srcs.nix { diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 31bce026daa0d..2014b00b1e547 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -32,7 +32,7 @@ let broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12Plus ]; srcs = import ./srcs.nix { diff --git a/pkgs/development/libraries/kde-frameworks/kdav.nix b/pkgs/development/libraries/kde-frameworks/kdav.nix index 92d57158e3209..3149c2206625d 100644 --- a/pkgs/development/libraries/kde-frameworks/kdav.nix +++ b/pkgs/development/libraries/kde-frameworks/kdav.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "kdav"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons kio qtxmlpatterns ]; diff --git a/pkgs/development/libraries/kde-frameworks/kholidays.nix b/pkgs/development/libraries/kde-frameworks/kholidays.nix index 9484dece57ed9..81369d4ce83d3 100644 --- a/pkgs/development/libraries/kde-frameworks/kholidays.nix +++ b/pkgs/development/libraries/kde-frameworks/kholidays.nix @@ -7,7 +7,7 @@ mkDerivation { pname = "kholidays"; meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = with lib.maintainers; [ bkchr ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; |