From 951de20d443c32ec3185fdc0c24379106c7f7676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 May 2021 13:16:26 +0200 Subject: [PATCH 1/4] libsForQt5.mauikit: 1.2.1 -> 1.2.2 --- pkgs/development/libraries/mauikit/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/mauikit/default.nix b/pkgs/development/libraries/mauikit/default.nix index 38e938080ba..22155a7a52a 100644 --- a/pkgs/development/libraries/mauikit/default.nix +++ b/pkgs/development/libraries/mauikit/default.nix @@ -3,22 +3,23 @@ , fetchFromGitLab , cmake , extra-cmake-modules -, kio +, kconfig +, kcoreaddons +, ki18n , qtbase , qtquickcontrols2 -, syntax-highlighting }: mkDerivation rec { pname = "mauikit"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "mauikit"; rev = "v${version}"; - sha256 = "1wimbpbn9yqqdcjd59x83z0mw2fycjz09py2rwimfi8ldmvi5lgy"; + sha256 = "1jz0a65bbznjg7aaq19rdyp956wn6xc1x4xigfkhj6mwsvnb49av"; }; nativeBuildInputs = [ @@ -27,9 +28,10 @@ mkDerivation rec { ]; buildInputs = [ - kio + kconfig + kcoreaddons + ki18n qtquickcontrols2 - syntax-highlighting ]; meta = with lib; { From e7c501d8d6167a24a86ada58ac4e741d9cbf86ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 May 2021 13:41:38 +0200 Subject: [PATCH 2/4] libsForQt5.mauikit-filebrowsing: init at 1.2.2 --- .../mauikit-filebrowsing/default.nix | 40 +++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/mauikit-filebrowsing/default.nix diff --git a/pkgs/development/libraries/mauikit-filebrowsing/default.nix b/pkgs/development/libraries/mauikit-filebrowsing/default.nix new file mode 100644 index 00000000000..5cce0382c8f --- /dev/null +++ b/pkgs/development/libraries/mauikit-filebrowsing/default.nix @@ -0,0 +1,40 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, kconfig +, kio +, mauikit +}: + +mkDerivation rec { + pname = "mauikit-filebrowsing"; + version = "1.2.2"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "mauikit-filebrowsing"; + rev = "v${version}"; + sha256 = "1m56lil7w884wn8qycl7y55abvw2vanfy8c4g786200p6acsh3kl"; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kconfig + kio + mauikit + ]; + + meta = with lib; { + homepage = "https://invent.kde.org/maui/mauikit-filebrowsing"; + description = "MauiKit File Browsing utilities and controls"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index bfc576e6554..f20198313df 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -121,6 +121,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // mauikit = callPackage ../development/libraries/mauikit { }; + mauikit-filebrowsing = callPackage ../development/libraries/mauikit-filebrowsing { }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; openbr = callPackage ../development/libraries/openbr { }; From 2445399880376da0212b6421ef6166e5aeb727ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 May 2021 11:42:42 +0200 Subject: [PATCH 3/4] libsForQt5.applet-window-buttons: init at 0.8.1 --- .../applet-window-buttons/default.nix | 50 +++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/libraries/applet-window-buttons/default.nix diff --git a/pkgs/development/libraries/applet-window-buttons/default.nix b/pkgs/development/libraries/applet-window-buttons/default.nix new file mode 100644 index 00000000000..9ff9d6fdf23 --- /dev/null +++ b/pkgs/development/libraries/applet-window-buttons/default.nix @@ -0,0 +1,50 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, fetchpatch +, cmake +, extra-cmake-modules +, kcoreaddons +, kdeclarative +, kdecoration +, plasma-framework +}: + +mkDerivation rec { + pname = "applet-window-buttons"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "psifidotos"; + repo = "applet-window-buttons"; + rev = version; + sha256 = "0r1h4kbdv6pxj15w4n1w50g8zsl0jrc4808dyfygzwf87mghziyz"; + }; + + patches = [ + (fetchpatch { + name = "fix-compilation-error-with-plasma-5.21.patch"; + url = "https://github.com/psifidotos/applet-window-buttons/commit/dc5ed862fa3cb943f9c0d561c864ff461156a19e.patch"; + sha256 = "17bdkkmy7k402viynj2bpw281qzsn0f1w8gf98gq65wkm4sf4j6k"; + }) + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kcoreaddons + kdeclarative + kdecoration + plasma-framework + ]; + + meta = with lib; { + description = "Plasma 5 applet in order to show window buttons in your panels"; + homepage = "https://github.com/psifidotos/applet-window-buttons"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index f20198313df..f5e11a0db8b 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -53,6 +53,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // alkimia = callPackage ../development/libraries/alkimia { }; + applet-window-buttons = callPackage ../development/libraries/applet-window-buttons { }; + appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; dxflib = callPackage ../development/libraries/dxflib {}; From be9886e5c0ae74523fe4e591be9c65225091b7fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 May 2021 13:41:46 +0200 Subject: [PATCH 4/4] index-fm: 1.2.1 -> 1.2.2 --- pkgs/applications/misc/index-fm/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/index-fm/default.nix b/pkgs/applications/misc/index-fm/default.nix index 328db965001..149e571fea2 100644 --- a/pkgs/applications/misc/index-fm/default.nix +++ b/pkgs/applications/misc/index-fm/default.nix @@ -3,27 +3,28 @@ , fetchFromGitLab , cmake , extra-cmake-modules -, breeze-icons +, applet-window-buttons , karchive , kcoreaddons , ki18n , kio , kirigami2 , mauikit +, mauikit-filebrowsing , qtmultimedia , qtquickcontrols2 }: mkDerivation rec { pname = "index"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "index-fm"; rev = "v${version}"; - sha256 = "1v6z44c88cqgr3b758yq6l5d2zj1vhlnaq7v8rrhs7s5dsimzlx8"; + sha256 = "sha256-N9/Jt18QRqDMWtEfxWn22e5Ud3YMwJ9B7OQRwTvwX8g="; }; nativeBuildInputs = [ @@ -32,13 +33,14 @@ mkDerivation rec { ]; buildInputs = [ - breeze-icons + applet-window-buttons karchive kcoreaddons ki18n kio kirigami2 mauikit + mauikit-filebrowsing qtmultimedia qtquickcontrols2 ];