lol

Merge pull request #196007 from wegank/fdl11-remove

authored by

Sandro and committed by
GitHub
d9c3f3c0 471b34c3

+68 -83
-15
lib/licenses.nix
··· 990 990 fullName = "GNU Affero General Public License v3.0"; 991 991 deprecated = true; 992 992 }; 993 - fdl11 = { 994 - spdxId = "GFDL-1.1"; 995 - fullName = "GNU Free Documentation License v1.1"; 996 - deprecated = true; 997 - }; 998 - fdl12 = { 999 - spdxId = "GFDL-1.2"; 1000 - fullName = "GNU Free Documentation License v1.2"; 1001 - deprecated = true; 1002 - }; 1003 - fdl13 = { 1004 - spdxId = "GFDL-1.3"; 1005 - fullName = "GNU Free Documentation License v1.3"; 1006 - deprecated = true; 1007 - }; 1008 993 gpl2 = { 1009 994 spdxId = "GPL-2.0"; 1010 995 fullName = "GNU General Public License v2.0";
+2 -2
maintainers/scripts/nix-generate-from-cpan.pl
··· 61 61 62 62 # GNU Free Documentation License, Version 1.2. 63 63 gfdl_1_2 => { 64 - licenses => [qw( fdl12 )] 64 + licenses => [qw( fdl12Plus )] 65 65 }, 66 66 67 67 # GNU Free Documentation License, Version 1.3. 68 68 gfdl_1_3 => { 69 - licenses => [qw( fdl13 )] 69 + licenses => [qw( fdl13Plus )] 70 70 }, 71 71 72 72 # GNU General Public License, Version 1.
+1 -1
pkgs/applications/kde/akonadi-import-wizard.nix
··· 9 9 mkDerivation { 10 10 pname = "akonadi-import-wizard"; 11 11 meta = { 12 - license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ]; 12 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 13 13 maintainers = kdepimTeam; 14 14 }; 15 15 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/akonadi-notes.nix
··· 7 7 mkDerivation { 8 8 pname = "akonadi-notes"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = kdepimTeam; 12 12 }; 13 13 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/akonadi-search.nix
··· 8 8 mkDerivation { 9 9 pname = "akonadi-search"; 10 10 meta = { 11 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 11 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 12 12 maintainers = kdepimTeam; 13 13 }; 14 14 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/akonadiconsole.nix
··· 9 9 mkDerivation { 10 10 pname = "akonadiconsole"; 11 11 meta = { 12 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 12 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 13 13 maintainers = kdepimTeam; 14 14 }; 15 15 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/akregator.nix
··· 14 14 meta = { 15 15 homepage = "https://apps.kde.org/akregator/"; 16 16 description = "KDE feed reader"; 17 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 17 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 18 18 maintainers = kdepimTeam; 19 19 }; 20 20 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/calendarsupport.nix
··· 8 8 mkDerivation { 9 9 pname = "calendarsupport"; 10 10 meta = { 11 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 11 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 12 12 maintainers = kdepimTeam; 13 13 }; 14 14 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/dolphin.nix
··· 13 13 meta = { 14 14 homepage = "https://apps.kde.org/dolphin/"; 15 15 description = "KDE file manager"; 16 - license = with lib.licenses; [ gpl2 fdl12 ]; 16 + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; 17 17 maintainers = [ lib.maintainers.ttuegel ]; 18 18 broken = lib.versionOlder qtbase.version "5.14"; 19 19 };
+1 -1
pkgs/applications/kde/dragon.nix
··· 11 11 pname = "dragon"; 12 12 meta = { 13 13 homepage = "https://apps.kde.org/dragonplayer/"; 14 - license = with lib.licenses; [ gpl2 fdl12 ]; 14 + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; 15 15 description = "A simple media player for KDE"; 16 16 maintainers = [ lib.maintainers.jonathanreeve ]; 17 17 };
+1 -1
pkgs/applications/kde/eventviews.nix
··· 8 8 mkDerivation { 9 9 pname = "eventviews"; 10 10 meta = { 11 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 11 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 12 12 maintainers = kdepimTeam; 13 13 }; 14 14 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/grantleetheme/default.nix
··· 7 7 mkDerivation { 8 8 pname = "grantleetheme"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = kdepimTeam; 12 12 broken = lib.versionOlder qtbase.version "5.13.0"; 13 13 };
+1 -1
pkgs/applications/kde/gwenview.nix
··· 11 11 meta = { 12 12 homepage = "https://apps.kde.org/gwenview/"; 13 13 description = "KDE image viewer"; 14 - license = with lib.licenses; [ gpl2 fdl12 ]; 14 + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; 15 15 maintainers = [ lib.maintainers.ttuegel ]; 16 16 }; 17 17 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/incidenceeditor.nix
··· 8 8 mkDerivation { 9 9 pname = "incidenceeditor"; 10 10 meta = { 11 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 11 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 12 12 maintainers = kdepimTeam; 13 13 }; 14 14 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kaddressbook.nix
··· 12 12 meta = { 13 13 homepage = "https://apps.kde.org/kaddressbook/"; 14 14 description = "KDE contact manager"; 15 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 15 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 16 16 maintainers = kdepimTeam; 17 17 }; 18 18 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kcalutils.nix
··· 8 8 mkDerivation { 9 9 pname = "kcalutils"; 10 10 meta = { 11 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 11 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 12 12 maintainers = kdepimTeam; 13 13 }; 14 14 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kdepim-runtime/default.nix
··· 12 12 mkDerivation { 13 13 pname = "kdepim-runtime"; 14 14 meta = { 15 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 15 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 16 16 maintainers = kdepimTeam; 17 17 }; 18 18 nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
+1 -1
pkgs/applications/kde/kdialog.nix
··· 10 10 meta = { 11 11 homepage = "https://apps.kde.org/kdialog/"; 12 12 description = "Display dialog boxes from shell scripts"; 13 - license = with lib.licenses; [ gpl2 fdl12 ]; 13 + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; 14 14 maintainers = with lib.maintainers; [ peterhoeg ]; 15 15 }; 16 16
+1 -1
pkgs/applications/kde/keditbookmarks.nix
··· 10 10 buildInputs = [ kio kparts kwindowsystem ]; 11 11 meta = with lib; { 12 12 homepage = "http://www.kde.org"; 13 - license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; 13 + license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ]; 14 14 maintainers = with maintainers; [ peterhoeg ]; 15 15 platforms = platforms.linux; 16 16 };
+1 -1
pkgs/applications/kde/kidentitymanagement.nix
··· 8 8 mkDerivation { 9 9 pname = "kidentitymanagement"; 10 10 meta = { 11 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 11 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 12 12 maintainers = kdepimTeam; 13 13 }; 14 14 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kimap.nix
··· 7 7 mkDerivation { 8 8 pname = "kimap"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = kdepimTeam; 12 12 }; 13 13 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kldap.nix
··· 7 7 mkDerivation { 8 8 pname = "kldap"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = kdepimTeam; 12 12 }; 13 13 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kleopatra.nix
··· 18 18 meta = { 19 19 homepage = "https://apps.kde.org/kleopatra/"; 20 20 description = "Certificate manager and unified crypto GUI"; 21 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 21 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 22 22 maintainers = kdepimTeam; 23 23 }; 24 24 }
+1 -1
pkgs/applications/kde/kmail-account-wizard.nix
··· 9 9 mkDerivation { 10 10 pname = "kmail-account-wizard"; 11 11 meta = { 12 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 12 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 13 13 maintainers = kdepimTeam; 14 14 }; 15 15 nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
+1 -1
pkgs/applications/kde/kmail.nix
··· 55 55 meta = { 56 56 homepage = "https://apps.kde.org/kmail2/"; 57 57 description = "Mail client"; 58 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 58 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 59 59 maintainers = kdepimTeam; 60 60 }; 61 61 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kmailtransport.nix
··· 9 9 mkDerivation { 10 10 pname = "kmailtransport"; 11 11 meta = { 12 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 12 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 13 13 maintainers = kdepimTeam; 14 14 }; 15 15 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kmbox.nix
··· 7 7 mkDerivation { 8 8 pname = "kmbox"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = kdepimTeam; 12 12 }; 13 13 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kmix.nix
··· 10 10 meta = { 11 11 homepage = "https://apps.kde.org/kmix/"; 12 12 description = "Sound mixer"; 13 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 13 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 14 14 maintainers = [ lib.maintainers.rongcuid ]; 15 15 }; 16 16 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kmousetool.nix
··· 28 28 meta = { 29 29 homepage = "https://github.com/KDE/kmousetool"; 30 30 description = "Program that clicks the mouse for you"; 31 - license = with lib.licenses; [ gpl2 fdl12 ]; 31 + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; 32 32 maintainers = [ lib.maintainers.jayesh-bhoot ]; 33 33 }; 34 34 }
+1 -1
pkgs/applications/kde/kmplot.nix
··· 7 7 meta = { 8 8 homepage = "https://apps.kde.org/kmplot/"; 9 9 description = "Mathematical function plotter"; 10 - license = with lib.licenses; [ gpl2Plus fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; 11 11 maintainers = [ lib.maintainers.orivej ]; 12 12 }; 13 13 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/konsole.nix
··· 12 12 meta = { 13 13 homepage = "https://apps.kde.org/konsole/"; 14 14 description = "KDE terminal emulator"; 15 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 15 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 16 16 maintainers = with lib.maintainers; [ ttuegel turion ]; 17 17 }; 18 18 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kontact.nix
··· 12 12 meta = { 13 13 homepage = "https://apps.kde.org/kontact/"; 14 14 description = "Personal information manager"; 15 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 15 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 16 16 maintainers = kdepimTeam; 17 17 }; 18 18 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kontactinterface.nix
··· 7 7 mkDerivation { 8 8 pname = "kontactinterface"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = kdepimTeam; 12 12 }; 13 13 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/korganizer.nix
··· 15 15 meta = { 16 16 homepage = "https://apps.kde.org/korganizer/"; 17 17 description = "Personal organizer"; 18 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 18 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 19 19 maintainers = kdepimTeam; 20 20 }; 21 21 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/kpat.nix
··· 21 21 freecell-solver 22 22 ]; 23 23 meta = { 24 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 24 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 25 25 maintainers = with lib.maintainers; [ rnhmjoj ]; 26 26 }; 27 27 }
+1 -1
pkgs/applications/kde/kpimtextedit.nix
··· 9 9 mkDerivation { 10 10 pname = "kpimtextedit"; 11 11 meta = { 12 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 12 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 13 13 maintainers = kdepimTeam; 14 14 broken = lib.versionOlder qtbase.version "5.13.0"; 15 15 };
+1 -1
pkgs/applications/kde/kqtquickcharts.nix
··· 7 7 mkDerivation { 8 8 pname = "kqtquickcharts"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = [ lib.maintainers.ttuegel ]; 12 12 }; 13 13 nativeBuildInputs = [ extra-cmake-modules ];
+1 -1
pkgs/applications/kde/krdc.nix
··· 19 19 meta = with lib; { 20 20 homepage = "http://www.kde.org"; 21 21 description = "Remote desktop client"; 22 - license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; 22 + license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ]; 23 23 maintainers = with maintainers; [ peterhoeg ]; 24 24 platforms = platforms.linux; 25 25 broken = lib.versionOlder qtbase.version "5.14";
+1 -1
pkgs/applications/kde/krfb.nix
··· 11 11 meta = { 12 12 homepage = "https://apps.kde.org/krfb/"; 13 13 description = "Desktop sharing (VNC)"; 14 - license = with lib.licenses; [ gpl2 fdl12 ]; 14 + license = with lib.licenses; [ gpl2Plus fdl12Plus ]; 15 15 maintainers = with lib.maintainers; [ jerith666 ]; 16 16 }; 17 17 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/ksmtp/default.nix
··· 7 7 mkDerivation { 8 8 pname = "ksmtp"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = kdepimTeam; 12 12 }; 13 13 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/ktnef.nix
··· 7 7 mkDerivation { 8 8 pname = "ktnef"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = kdepimTeam; 12 12 }; 13 13 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/libgravatar.nix
··· 7 7 mkDerivation { 8 8 pname = "libgravatar"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = kdepimTeam; 12 12 }; 13 13 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/libkdepim.nix
··· 9 9 mkDerivation { 10 10 pname = "libkdepim"; 11 11 meta = { 12 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 12 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 13 13 maintainers = kdepimTeam; 14 14 }; 15 15 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/libkgapi.nix
··· 8 8 mkDerivation { 9 9 pname = "libkgapi"; 10 10 meta = { 11 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 11 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 12 12 maintainers = kdepimTeam; 13 13 broken = lib.versionOlder qtbase.version "5.14.0"; 14 14 };
+1 -1
pkgs/applications/kde/libkleo.nix
··· 8 8 mkDerivation { 9 9 pname = "libkleo"; 10 10 meta = { 11 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 11 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 12 12 maintainers = kdepimTeam; 13 13 }; 14 14 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/libksieve.nix
··· 9 9 mkDerivation { 10 10 pname = "libksieve"; 11 11 meta = { 12 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 12 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 13 13 maintainers = kdepimTeam; 14 14 }; 15 15 outputs = [ "out" "dev" ];
+1 -1
pkgs/applications/kde/mailcommon.nix
··· 9 9 mkDerivation { 10 10 pname = "mailcommon"; 11 11 meta = { 12 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 12 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 13 13 maintainers = kdepimTeam; 14 14 }; 15 15 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/mailimporter.nix
··· 8 8 mkDerivation { 9 9 pname = "mailimporter"; 10 10 meta = { 11 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 11 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 12 12 maintainers = kdepimTeam; 13 13 }; 14 14 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/mbox-importer.nix
··· 7 7 mkDerivation { 8 8 pname = "mbox-importer"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = kdepimTeam; 12 12 }; 13 13 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/messagelib.nix
··· 11 11 mkDerivation { 12 12 pname = "messagelib"; 13 13 meta = { 14 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 14 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 15 15 maintainers = kdepimTeam; 16 16 }; 17 17 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/okular.nix
··· 30 30 meta = with lib; { 31 31 homepage = "http://www.kde.org"; 32 32 description = "KDE document viewer"; 33 - license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; 33 + license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ]; 34 34 maintainers = with maintainers; [ ttuegel turion ]; 35 35 platforms = lib.platforms.linux; 36 36 };
+1 -1
pkgs/applications/kde/pim-data-exporter.nix
··· 12 12 meta = { 13 13 homepage = "https://apps.kde.org/pimdataexporter/"; 14 14 description = "Saves and restores all data from PIM apps"; 15 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 15 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 16 16 maintainers = kdepimTeam; 17 17 }; 18 18 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/pim-sieve-editor.nix
··· 8 8 mkDerivation { 9 9 pname = "pim-sieve-editor"; 10 10 meta = { 11 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 11 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 12 12 maintainers = kdepimTeam; 13 13 }; 14 14 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/pimcommon.nix
··· 10 10 mkDerivation { 11 11 pname = "pimcommon"; 12 12 meta = { 13 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 13 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 14 14 maintainers = kdepimTeam; 15 15 }; 16 16 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/applications/kde/rocs.nix
··· 11 11 meta = with lib; { 12 12 homepage = "https://edu.kde.org/rocs/"; 13 13 description = "A graph theory IDE."; 14 - license = with licenses; [ gpl2 lgpl21 fdl12 ]; 14 + license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 15 15 platforms = lib.platforms.linux; 16 16 maintainers = with maintainers; [ knairda ]; 17 17 };
+1 -1
pkgs/applications/networking/newsreaders/pan/default.nix
··· 58 58 homepage = "http://pan.rebelbase.com/"; 59 59 maintainers = [ maintainers.eelco ]; 60 60 platforms = platforms.linux; 61 - license = with licenses; [ gpl2Only fdl11 ]; 61 + license = with licenses; [ gpl2Only fdl11Only ]; 62 62 }; 63 63 }
+1 -1
pkgs/applications/video/kmplayer/default.nix
··· 41 41 42 42 meta = with lib; { 43 43 description = "MPlayer front-end for KDE"; 44 - license = with licenses; [ gpl2 lgpl2 fdl12 ]; 44 + license = with licenses; [ gpl2Plus lgpl2Plus fdl12Plus ]; 45 45 homepage = "https://kmplayer.kde.org/"; 46 46 maintainers = with maintainers; [ sander zraexy ]; 47 47 };
+1 -1
pkgs/data/documentation/std-man-pages/default.nix
··· 19 19 meta = with lib; { 20 20 description = "GCC C++ STD manual pages"; 21 21 homepage = "https://gcc.gnu.org/"; 22 - license = with licenses; [ fdl12Plus ]; 22 + license = with licenses; [ fdl13Plus ]; 23 23 platforms = platforms.unix; 24 24 }; 25 25 }
+1 -1
pkgs/desktops/mate/mate-user-guide/default.nix
··· 39 39 meta = with lib; { 40 40 description = "MATE User Guide"; 41 41 homepage = "https://mate-desktop.org"; 42 - license = with licenses; [ gpl2Plus fdl12 ]; 42 + license = with licenses; [ gpl2Plus fdl11Plus ]; 43 43 platforms = platforms.unix; 44 44 maintainers = teams.mate.members; 45 45 };
+1 -1
pkgs/desktops/plasma-5/default.nix
··· 43 43 mit 44 44 gpl2Plus 45 45 gpl3Plus 46 - fdl12 46 + fdl12Plus 47 47 ]; 48 48 49 49 srcs = import ./srcs.nix {
+1 -1
pkgs/development/libraries/kde-frameworks/default.nix
··· 32 32 broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; 33 33 maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; 34 34 license = with lib.licenses; [ 35 - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 35 + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12Plus 36 36 ]; 37 37 38 38 srcs = import ./srcs.nix {
+1 -1
pkgs/development/libraries/kde-frameworks/kdav.nix
··· 7 7 mkDerivation { 8 8 pname = "kdav"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 }; 12 12 nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 13 13 buildInputs = [ kcoreaddons kio qtxmlpatterns ];
+1 -1
pkgs/development/libraries/kde-frameworks/kholidays.nix
··· 7 7 mkDerivation { 8 8 pname = "kholidays"; 9 9 meta = { 10 - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; 10 + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = with lib.maintainers; [ bkchr ]; 12 12 }; 13 13 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -1
pkgs/development/libraries/qt-5/modules/qtbase.nix
··· 368 368 meta = with lib; { 369 369 homepage = "https://www.qt.io/"; 370 370 description = "A cross-platform application framework for C++"; 371 - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; 371 + license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; 372 372 maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; 373 373 platforms = platforms.unix; 374 374 # Qt5 is broken on aarch64-darwin
+1 -1
pkgs/development/libraries/qt-5/qtModule.nix
··· 70 70 meta = { 71 71 homepage = "https://www.qt.io"; 72 72 description = "A cross-platform application framework for C++"; 73 - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; 73 + license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; 74 74 maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; 75 75 platforms = platforms.unix; 76 76 } // (args.meta or {});
+1 -1
pkgs/development/libraries/qt-6/modules/qtbase.nix
··· 257 257 meta = with lib; { 258 258 homepage = "https://www.qt.io/"; 259 259 description = "A cross-platform application framework for C++"; 260 - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; 260 + license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; 261 261 maintainers = with maintainers; [ milahu nickcao LunNova ]; 262 262 platforms = platforms.linux; 263 263 };
+1 -1
pkgs/development/libraries/qt-6/qtModule.nix
··· 81 81 meta = with lib; { 82 82 homepage = "https://www.qt.io/"; 83 83 description = "A cross-platform application framework for C++"; 84 - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; 84 + license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; 85 85 maintainers = with maintainers; [ milahu nickcao ]; 86 86 platforms = platforms.linux; 87 87 } // (args.meta or { });
+1 -1
pkgs/development/libraries/qt-mobility/default.nix
··· 47 47 homepage = "http://qt.nokia.com/products/qt-addons/mobility"; 48 48 maintainers = [ maintainers.qknight ]; 49 49 platforms = platforms.linux; 50 - license = with licenses; [ bsd3 fdl13 gpl3 lgpl21 ]; 50 + license = with licenses; [ bsd3 fdl13Plus gpl3Plus lgpl21Plus ]; 51 51 }; 52 52 } 53 53