From 2e2743a8e51d04fe6a6fb3267c490a4772f0d8de Mon Sep 17 00:00:00 2001 From: liberodark Date: Sat, 19 Oct 2024 08:51:49 +0200 Subject: [PATCH] nagstamon: 3.14.0 > 3.16.0 --- pkgs/tools/misc/nagstamon/default.nix | 13 +++++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index f004ad9b42fdda..8abb8c34d60620 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -1,21 +1,26 @@ -{ lib, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages, qt6 }: pythonPackages.buildPythonApplication rec { pname = "nagstamon"; - version = "3.14.0"; + version = "3.16.0"; src = fetchurl { url = "https://github.com/HenriWahl/Nagstamon/archive/refs/tags/v${version}.tar.gz"; - sha256 = "sha256-9RxQ/rfvoyjSUsY4tmAkBdVQqZYi3X6PBzQYFIeenzA="; + sha256 = "sha256-zqa2/1mkh6Cv7TguQiNq9AGlTa7mHxlpBfgCBpoKU5Y="; }; # Test assumes darwin doCheck = false; + buildInputs = [ qt6.qtmultimedia qt6.qtbase qt6.qtsvg ]; + build-system = with pythonPackages; [ setuptools ]; - dependencies = with pythonPackages; [ configparser pyqt6 psutil requests + dependencies = with pythonPackages; [ arrow configparser pyqt6 psutil requests beautifulsoup4 keyring requests-kerberos lxml dbus-python python-dateutil pysocks ]; + # Use wrapQtAppsHook to wrap the app properly + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; + meta = with lib; { description = "Status monitor for the desktop"; homepage = "https://nagstamon.de/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a723fbddfc4aa4..bc21f177c0571d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9417,6 +9417,7 @@ with pkgs; nagstamon = callPackage ../tools/misc/nagstamon { pythonPackages = python3Packages; + qt6 = kdePackages; }; nanoemoji = with python3Packages; toPythonApplication nanoemoji;