From 2f97e6562e6b56b4900cde9c6c8bed4f66fafc07 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Thu, 2 Jan 2025 15:56:37 -0500 Subject: [PATCH 1/2] rssguard: add maintainer tebriel --- .../applications/networking/feedreaders/rssguard/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index ea7272336557..c65188fc4e0f 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { changelog = "https://github.com/martinrotter/rssguard/releases/tag/${version}"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ jluttine ]; + maintainers = with maintainers; [ + jluttine + tebriel + ]; }; } From 46655f7ca2305c0300c6126844246a4883dedd04 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Thu, 2 Jan 2025 15:56:20 -0500 Subject: [PATCH 2/2] rssguard: 4.5.3 -> 4.8.1 --- .../feedreaders/rssguard/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index c65188fc4e0f..4a4ecd52c73e 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -3,33 +3,35 @@ stdenv, fetchFromGitHub, cmake, - qtwebengine, - qttools, - wrapGAppsHook3, - wrapQtAppsHook, + kdePackages, + wrapGAppsHook4, }: stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.5.3"; + version = "4.8.1"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; tag = version; - sha256 = "sha256-eF0jPT0gQnnBWu9IKfY0DwMwotL3IEjovqnQqx9v2NA="; + sha256 = "sha256-qWxcjGl4EaLXZ0q6RVy+IKyBcqlx/yYojlGivSXy5Io="; }; buildInputs = [ - qtwebengine - qttools + kdePackages.qtwebengine + kdePackages.qttools + kdePackages.mpvqt + kdePackages.full ]; nativeBuildInputs = [ cmake - wrapGAppsHook3 - wrapQtAppsHook + wrapGAppsHook4 + kdePackages.wrapQtAppsHook + ]; + cmakeFlags = with lib; [ + (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"") ]; - qmakeFlags = [ "CONFIG+=release" ]; meta = with lib; { description = "Simple RSS/Atom feed reader with online synchronization";