alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

licenses: remove fdl13

Browse source
This commit is contained in:
Weijia Wang 2022-10-27 22:48:13 +02:00
parent 06d0490ab3
commit 79f5174455
7 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/licenses.nix
View file

@ -985,11 +985,6 @@ in mkLicense lset) ({
fullName = "GNU Affero General Public License v3.0";
deprecated = true;
};
fdl13 = {
spdxId = "GFDL-1.3";
fullName = "GNU Free Documentation License v1.3";
deprecated = true;
};
gpl2 = {
spdxId = "GPL-2.0";
fullName = "GNU General Public License v2.0";

2
maintainers/scripts/nix-generate-from-cpan.pl
View file

@ -66,7 +66,7 @@ Readonly::Hash my %LICENSE_MAP => (
# GNU Free Documentation License, Version 1.3.
gfdl_1_3 => {
licenses => [qw( fdl13 )]
licenses => [qw( fdl13Plus )]
},
# GNU General Public License, Version 1.

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