From cf006b7f904bd2aed4fdc0a64850d2f9b4e63b16 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 27 Sep 2025 15:29:14 +0200 Subject: [PATCH] gnu: meteo-qt: Switch to pyproject. * gnu/packages/weather.scm (meteo-qt): [build-system]: Switch to pyproject-build-system. [arguments]: Relocate, improve style. [native-inputs]: Add python-setuptools. [description]: Improve style. Change-Id: I1053de72536158860ecb0cf6edfda873a8743728 Signed-off-by: Sharlatan Hellseher --- gnu/packages/weather.scm | 52 ++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/gnu/packages/weather.scm b/gnu/packages/weather.scm index 18f392ccf54..6a89c651036 100644 --- a/gnu/packages/weather.scm +++ b/gnu/packages/weather.scm @@ -20,13 +20,14 @@ (define-module (gnu packages weather) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system go) - #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-xyz) + #:use-module (gnu packages python-build) #:use-module (gnu packages qt) #:use-module (gnu packages xml)) @@ -65,30 +66,35 @@ precipitation amount and probability.") (name "meteo-qt") (version "4.2") (source - (origin (method git-fetch) - (uri (git-reference (url "https://github.com/dglent/meteo-qt") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1cvmh5rq50dncd2fmp4amjb2hhl2mryb2ywg0zdzhz89dkjq0kdk")))) - (build-system python-build-system) - (native-inputs (list python-pyqt-6)) - (propagated-inputs (list python-lxml python-pyqt-6 python-sip)) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dglent/meteo-qt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cvmh5rq50dncd2fmp4amjb2hhl2mryb2ywg0zdzhz89dkjq0kdk")))) + (build-system pyproject-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-before 'build 'remove-translations - (lambda _ - ;; Translation processing is broken because Guix thinks lprodump - ;; is in qtbase, not qttools. So, we'll skip it and exclude - ;; qttools from the native input list until it is fixed. - (substitute* "setup.py" - (("/usr") #$output) - (("^.+lrelease-pro-qt6.+$") "") - (("^.+meteo_qt/translations.+$") ""))))))) + (list + #:tests? #f ; No tests. + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'remove-translations + (lambda _ + ;; Translation processing is broken because Guix thinks lprodump + ;; is in qtbase, not qttools. So, we'll skip it and exclude + ;; qttools from the native input list until it is fixed. + (substitute* "setup.py" + (("/usr") #$output) + (("^.+lrelease-pro-qt6.+$") "") + (("^.+meteo_qt/translations.+$") ""))))))) + (native-inputs (list python-pyqt-6 python-setuptools)) + (propagated-inputs (list python-lxml python-pyqt-6 python-sip)) (home-page "https://github.com/dglent/meteo-qt") (synopsis "Weather application for the system tray") - (description "meteo-qt is an application to display weather information in -desktop panels, desktop notifictions and its own window. Weather information is + (description + "meteo-qt is an application to display weather information in desktop +panels, desktop notifictions and its own window. Weather information is retrieved from OpenWeatherMap.") (license license:gpl3)))