diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-11-09 22:31:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-09 22:31:50 +0100 |
commit | d9c3f3c0dcf1eae056ba201a74a3f09c29ba7ff3 (patch) | |
tree | 3972ea875e1c38a12d3dabbe79363e8a22328662 /pkgs | |
parent | 471b34c39fb5e828b529a53f3a1a54284e18fc81 (diff) | |
parent | 79f517445587287d330355a6047a7a9883ffc5e5 (diff) |
Merge pull request #196007 from wegank/fdl11-remove
Diffstat (limited to 'pkgs')
66 files changed, 66 insertions, 66 deletions
diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix index 948f9e5d2a23..370f77c38318 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 6db7e00be9b0..1ab0ca74819f 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 495b63abd443..84657177f891 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 76e5ca480b47..bb0b8424b4e4 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 9cb23ad35ac5..714f636341da 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 24f93ee0af75..c6a4e36c82d4 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 b70f4977f587..9e4ab1d41027 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 4fb5583a8ff9..399205da6caa 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 1a6cc9442b96..001c1e6cbcb9 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 517cb072f74d..6d29d6e6d8c1 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 36d46f43966d..545b1a2b69e7 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 7f2c284ad74d..9c248f199a5d 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 1a800525255c..441a150ee170 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 21e84dff05ff..7da9739aad1d 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 0cc78c69aec7..b5158bfd1549 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 015c86bc7d12..ea7393e72261 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 9deb1a3c0158..8bc0ec873613 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 789206a16390..c2f2abcd32d0 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 e93804bd885d..ece32e3ee057 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 69849f757514..6016cfd090c8 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 b3444e97532f..a02e7b08aa65 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 c0ab4ff947e9..216586076aec 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 341d54a6388a..6a71529eb0f1 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 976bd634e66a..577beb8d5ec8 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 6f3db970b942..d2b4dbde8ac4 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 2f85454eb67e..352fd129ce94 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 fb4323455b79..4bac765dc4b9 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 a6784982580f..9f1ab4d28119 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 23cbdf28477d..220cd6a16d57 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/ |