chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #196007 from wegank/fdl11-remove

Browse Source
This commit is contained in:
Sandro
2022-11-09 22:31:50 +01:00
committed by GitHub
parent 471b34c39f 79f5174455
commit d9c3f3c0dc
68 changed files with 68 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/licenses.nix
View File

@@ -990,21 +990,6 @@ in mkLicense lset) ({
fullName = "GNU Affero General Public License v3.0";
deprecated = true;
};
fdl11 = {
spdxId = "GFDL-1.1";
fullName = "GNU Free Documentation License v1.1";
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";
deprecated = true;
};
gpl2 = {
spdxId = "GPL-2.0";
fullName = "GNU General Public License v2.0";

4
maintainers/scripts/nix-generate-from-cpan.pl
View File

@@ -61,12 +61,12 @@ 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.
gfdl_1_3 => {
licenses => [qw( fdl13 )]
licenses => [qw( fdl13Plus )]
},
# GNU General Public License, Version 1.

2
pkgs/applications/kde/akonadi-import-wizard.nix
View File

@@ -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 ];

2
pkgs/applications/kde/akonadi-notes.nix
View File

@@ -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 ];

2
pkgs/applications/kde/akonadi-search.nix
View File

@@ -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 ];

2
pkgs/applications/kde/akonadiconsole.nix
View File

@@ -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 ];

2
pkgs/applications/kde/akregator.nix
View File

@@ -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 ];

2
pkgs/applications/kde/calendarsupport.nix
View File

@@ -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 ];

2
pkgs/applications/kde/dolphin.nix
View File

@@ -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";
};

2
pkgs/applications/kde/dragon.nix
View File

@@ -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 ];
};

2
pkgs/applications/kde/eventviews.nix
View File

@@ -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 ];

2
pkgs/applications/kde/grantleetheme/default.nix
View File

@@ -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";
};

2
pkgs/applications/kde/gwenview.nix
View File

@@ -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 ];

2
pkgs/applications/kde/incidenceeditor.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kaddressbook.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kcalutils.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kdepim-runtime/default.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kdialog.nix
View File

@@ -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 ];
};

2
pkgs/applications/kde/keditbookmarks.nix
View File

@@ -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;
};

2
pkgs/applications/kde/kidentitymanagement.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kimap.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kldap.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kleopatra.nix
View File

@@ -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;
};
}

2
pkgs/applications/kde/kmail-account-wizard.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kmail.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kmailtransport.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kmbox.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kmix.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kmousetool.nix
View File

@@ -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 ];
};
}

2
pkgs/applications/kde/kmplot.nix
View File

@@ -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 ];

2
pkgs/applications/kde/konsole.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kontact.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kontactinterface.nix
View File

@@ -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 ];

2
pkgs/applications/kde/korganizer.nix
View File

@@ -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 ];

2
pkgs/applications/kde/kpat.nix
View File

@@ -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 ];
};
}

2
pkgs/applications/kde/kpimtextedit.nix
View File

@@ -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";
};

2
pkgs/applications/kde/kqtquickcharts.nix
View File

@@ -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 ];

2
pkgs/applications/kde/krdc.nix
View File

@@ -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";

2
pkgs/applications/kde/krfb.nix
View File

@@ -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 ];

2
pkgs/applications/kde/ksmtp/default.nix
View File

@@ -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 ];

2
pkgs/applications/kde/ktnef.nix
View File

@@ -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 ];

2
pkgs/applications/kde/libgravatar.nix
View File

@@ -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 ];

2
pkgs/applications/kde/libkdepim.nix
View File

@@ -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 ];

2
pkgs/applications/kde/libkgapi.nix
View File

@@ -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";
};

2
pkgs/applications/kde/libkleo.nix
View File

@@ -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 ];

2
pkgs/applications/kde/libksieve.nix
View File

@@ -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" ];

2
pkgs/applications/kde/mailcommon.nix
View File

@@ -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 ];

2
pkgs/applications/kde/mailimporter.nix
View File

@@ -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 ];

2
pkgs/applications/kde/mbox-importer.nix
View File

@@ -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 ];

2
pkgs/applications/kde/messagelib.nix
View File

@@ -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 ];

2
pkgs/applications/kde/okular.nix
View File

@@ -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;
};

2
pkgs/applications/kde/pim-data-exporter.nix
View File

@@ -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 ];

2
pkgs/applications/kde/pim-sieve-editor.nix
View File

@@ -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 ];

2
pkgs/applications/kde/pimcommon.nix
View File

@@ -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 ];

2
pkgs/applications/kde/rocs.nix
View File

@@ -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 ];
};

2
pkgs/applications/networking/newsreaders/pan/default.nix
View File

@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
homepage = "http://pan.rebelbase.com/";
maintainers = [ maintainers.eelco ];
platforms = platforms.linux;
license = with licenses; [ gpl2Only fdl11 ];
license = with licenses; [ gpl2Only fdl11Only ];
};
}

2
pkgs/applications/video/kmplayer/default.nix
View File

@@ -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 ];
};

2
pkgs/data/documentation/std-man-pages/default.nix
View File

@@ -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;
};
}

2
pkgs/desktops/mate/mate-user-guide/default.nix
View File

@@ -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;
};

2
pkgs/desktops/plasma-5/default.nix
View File

@@ -43,7 +43,7 @@ let
mit
gpl2Plus
gpl3Plus
fdl12
fdl12Plus
];
srcs = import ./srcs.nix {

2
pkgs/development/libraries/kde-frameworks/default.nix
View File

@@ -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 {

2
pkgs/development/libraries/kde-frameworks/kdav.nix
View File

@@ -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 ];

2
pkgs/development/libraries/kde-frameworks/kholidays.nix
View File

@@ -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 ];

2
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@@ -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

2
pkgs/development/libraries/qt-5/qtModule.nix
View File

@@ -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 {});

2
pkgs/development/libraries/qt-6/modules/qtbase.nix
View File

@@ -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;
};

2
pkgs/development/libraries/qt-6/qtModule.nix
View File

@@ -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 { });

2
pkgs/development/libraries/qt-mobility/default.nix
View File

@@ -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 ];
};
}