--- Begin Message ---
|
Subject: |
[PATCH] gnu: tlpui: Update to 1.5.0-6. |
|
Date: |
Sun, 19 Feb 2023 11:16:22 +0100 |
* gnu/packages/linux.scm (tlpui): Update to 1.5.0-6.
[arguments]<#:phases>: Rename USE-TLP-INPUT into SET-ABSOLUTE-LOCATIONS to
be more accurate. Also add a new phase to skip failing tests.
[inputs]: Add LSBUTILS and PCIUTILS.
---
gnu/packages/linux.scm | 30 +++++++++++++++++++++---------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 33faf8920d..e6980388d7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -11,7 +11,7 @@
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
-;;; Copyright © 2016, 2018-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2016, 2018-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus
<rekado@elephly.net>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
@@ -7517,7 +7517,7 @@ (define (sbin-directory input-name)
(define-public tlpui
(package
(name "tlpui")
- (version "1.5.0-1")
+ (version "1.5.0-6")
(source
(origin
(method git-fetch)
@@ -7526,7 +7526,7 @@ (define-public tlpui
(commit (string-append "tlpui-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "16a6x733szsggn23ns7bj3gpvb80675plh96v4llrz0s8p3h47pg"))))
+ (base32 "0zxiciafq1xmb047jlyhipkkj4vaiw4jzbx71f6xgx559dy96paq"))))
(build-system python-build-system)
(arguments
(list
@@ -7537,16 +7537,21 @@ (define-public tlpui
(lambda _
(substitute* "setup.py"
(("/usr/") ""))))
- (add-after 'unpack 'use-tlp-input
- ;; Hard-code tlp-stat filename to avoid propagating "tlp".
+ (add-after 'unpack 'set-absolute-locations
(lambda* (#:key inputs #:allow-other-keys)
(let ((tlp-stat (search-input-file inputs "/bin/tlp-stat")))
(with-directory-excursion "tlpui"
(substitute* '("file.py" "settingshelper.py" "statui.py")
- (("which\\(\"tlp-stat\"\\)")
- (string-append "'" tlp-stat "'"))
(("\"tlp-stat\"")
- (string-append "'" tlp-stat "'")))))))
+ (string-append "'" tlp-stat "'"))
+ (("/usr/share/tlp/defaults.conf")
+ (search-input-file inputs "/share/tlp/defaults.conf")))
+ ;; Settings check if various tlp executables, lspci and
+ ;; usbutils are available. Skip this phase since we know
+ ;; for sure they are (and it avoids patching each location).
+ (substitute* "settingshelper.py"
+ (("(command_exists = ).*" _ lead)
+ (string-append lead "True\n")))))))
(add-before 'check 'fix-home-directory
(lambda _
;; Tests fail with "Permission denied:
@@ -7557,6 +7562,13 @@ (define-public tlpui
;; Connection refused" and "Error: cannot read user
;; configuration from /etc/tlp.conf or /etc/default/tlp".
(delete 'sanity-check)
+ ;; Skip two failing tests (out of 10) about configuration file
+ ;; issues.
+ (add-before 'check 'skip-failing-tests
+ (lambda _
+ (substitute* "test/test_tlp_settings.py"
+ ((".*?windowxsize = 900.*") "")
+ ((".*?windowysize = 600.*") ""))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
@@ -7569,7 +7581,7 @@ (define-public tlpui
(native-inputs
(list `(,glib "bin") gobject-introspection python-discover))
(inputs
- (list gtk+ python-pygobject tlp))
+ (list gtk+ pciutils python-pygobject tlp usbutils))
(home-page "https://github.com/d4nj1/TLPUI";)
(synopsis "User interface for TLP written in Python")
(description
base-commit: 2fb42567ebd37cb63c431100021e1a895a2ff4b6
--
2.39.1
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#61620] [PATCH] gnu: tlpui: Update to 1.5.0-6. |
|
Date: |
Wed, 08 Mar 2023 19:12:02 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) |
Hello,
Christopher Baines <mail@cbaines.net> writes:
> They are indeed not relevant to the changes here. They are detected as
> changing because the derivations do change, but that's because they
> change every time you try and compute them, rather than changing as a
> result from the patches here.
>
> I think a way to avoid this would be to have the error happen earlier,
> so rather than waiting until you try and build the derivation, try to
> detect that the builder script can't be read when it's being created. I
> can't see an easy way to do that, but I've filed an issue about it:
> https://issues.guix.gnu.org/62051
Meanwhile, this looks like a green flag for the current package, so
I applied the patch.
Thanks for the feedback.
Regards,
--
Nicolas Goaziou
--- End Message ---