From 7501beac87f5fefc84a5ca59ad9a78bffff9df9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 22 Apr 2021 10:23:43 -0300 Subject: [PATCH] mate: fix licenses --- pkgs/desktops/mate/atril/default.nix | 2 +- pkgs/desktops/mate/caja-dropbox/default.nix | 2 +- pkgs/desktops/mate/caja-extensions/default.nix | 2 +- pkgs/desktops/mate/caja/default.nix | 8 ++++---- pkgs/desktops/mate/engrampa/default.nix | 8 ++++---- pkgs/desktops/mate/eom/default.nix | 2 +- pkgs/desktops/mate/libmatekbd/default.nix | 2 +- pkgs/desktops/mate/libmatemixer/default.nix | 2 +- pkgs/desktops/mate/libmateweather/default.nix | 2 +- pkgs/desktops/mate/marco/default.nix | 2 +- pkgs/desktops/mate/mate-backgrounds/default.nix | 2 +- pkgs/desktops/mate/mate-common/default.nix | 2 +- pkgs/desktops/mate/mate-control-center/default.nix | 2 +- pkgs/desktops/mate/mate-desktop/default.nix | 2 +- pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 8 ++++---- pkgs/desktops/mate/mate-icon-theme/default.nix | 2 +- pkgs/desktops/mate/mate-media/default.nix | 2 +- pkgs/desktops/mate/mate-menus/default.nix | 2 +- pkgs/desktops/mate/mate-netbook/default.nix | 2 +- pkgs/desktops/mate/mate-notification-daemon/default.nix | 2 +- pkgs/desktops/mate/mate-panel/default.nix | 2 +- pkgs/desktops/mate/mate-power-manager/default.nix | 2 +- pkgs/desktops/mate/mate-session-manager/default.nix | 2 +- pkgs/desktops/mate/mate-settings-daemon/default.nix | 2 +- pkgs/desktops/mate/mate-terminal/default.nix | 2 +- pkgs/desktops/mate/mate-themes/default.nix | 8 ++++---- pkgs/desktops/mate/pluma/default.nix | 8 ++++---- 27 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 1a6d947153e8..7e8afde588c6 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple multi-page document viewer for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index ded175db092b..3b96f67b12a9 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Dropbox extension for Caja file manager"; homepage = "https://github.com/mate-desktop/caja-dropbox"; - license = with licenses; [ gpl3 cc-by-nd-30 ]; + license = with licenses; [ gpl3Plus cc-by-nd-30 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 99438bdd6101..5c08074f0450 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of extensions for Caja file manager"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 44721a2cab21..c533f78849cc 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "File manager for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = with lib.licenses; [ gpl2 lgpl2 ]; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 6ba30c16f59f..81d34b8b1259 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "Archive Manager for MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 75d37e5ea35d..27c120796541 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "An image viewing and cataloging program for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 92bfd4fe8339..8d0b567f1615 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Keyboard management library for MATE"; homepage = "https://github.com/mate-desktop/libmatekbd"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index bc44710e6e72..9d42c23c7148 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mixer library for MATE"; homepage = "https://github.com/mate-desktop/libmatemixer"; - license = with licenses; [ gpl2 lgpl2 ]; + license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index a88ba7c6ed31..b042df0fe1ae 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to access weather information from online services for MATE"; homepage = "https://github.com/mate-desktop/libmateweather"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index aa2ee9d4913b..b652be0f71b1 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MATE default window manager"; homepage = "https://github.com/mate-desktop/marco"; - license = [ licenses.gpl2 ]; + license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 26aedcc2818d..cfe1325b839f 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Background images and data for MATE"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2; + license = with licenses; [ gpl2Plus cc-by-sa-40 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index 57f50ad83890..58314df673ab 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Common files for development of MATE packages"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index fd675f0406c8..b94e7ecfd06d 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utilities to configure the MATE desktop"; homepage = "https://github.com/mate-desktop/mate-control-center"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 4270b0a1f921..b1b59dc6402c 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library with common API for various MATE modules"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index f0bca054ae8c..7dc4423fb6b2 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "Faenza icon theme from MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index d6c16c1c7171..cf18cf528f28 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Icon themes from MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index fa6b6e4305a0..6072e81fb3cc 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Media tools for MATE"; homepage = "https://mate-desktop.org"; - license = licenses.gpl3; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo maintainers.chpatrick ]; }; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 751dcd508594..5b11c20380a8 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Menu system for MATE"; homepage = "https://github.com/mate-desktop/mate-menus"; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index dc10cca40a41..9b7a5ae67180 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { devices with low resolution displays. ''; homepage = "https://mate-desktop.org"; - license = with licenses; [ gpl3 lgpl2Plus ]; + license = with licenses; [ gpl3Only lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 28497084fb63..62181418fdfe 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Notification daemon for MATE Desktop"; homepage = "https://github.com/mate-desktop/mate-notification-daemon"; - license = licenses.gpl2; + license = with licenses; [ gpl2Plus gpl3Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index c332b700227d..328fcfd20dee 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The MATE panel"; homepage = "https://github.com/mate-desktop/mate-panel"; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index fe74cf2505a4..3a99538d9298 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The MATE Power Manager"; homepage = "https://mate-desktop.org"; - license = licenses.gpl3; + license = with licenses; [ gpl2Plus fdl11Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ romildo chpatrick ]; }; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index bdd129e0deca..0f8ac83085d2 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MATE Desktop session manager"; homepage = "https://github.com/mate-desktop/mate-session-manager"; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index ed908759877b..6c35a1d63120 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MATE settings daemon"; homepage = "https://github.com/mate-desktop/mate-settings-daemon"; - license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2Plus gpl3Plus lgpl2Plus mit ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index d17d2fafd1b5..2c4d4223eccc 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The MATE Terminal Emulator"; homepage = "https://mate-desktop.org"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 8153ea1ec7af..6a1be82c8a6d 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { url = "https://pub.mate-desktop.org/releases/themes"; }; - meta = { + meta = with lib; { description = "A set of themes from MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.lgpl21; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = with licenses; [ lgpl21Plus lgpl3Only gpl3Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 279e443e5250..4c98c9cf5207 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "Powerful text editor for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; }