ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-10 21:29:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: upower: Update to 1.90.2.

Browse source 
Upower has an extra hardware description file for use with udev.  It should be
installed under upower’s output, not eudev’s.

A test is disabled, for calling an unimplemented bluez method.  The
conditional 'adjust-test-for-excess-precision phase is included in the new
'adjust-test-suite, so that the list of phases is always the same.

* gnu/packages/gnome.scm (upower): Update to 1.90.2.
[#:configure-flags]: Set udevhwdbdir.
[#:phases] <adjust-test-for-excess-precision>: Add this phase
unconditionnally
<disable-failing-test>: Disable test_bluetooth_hidpp_mouse.
[inputs]: Remove dbus-glib.
[native-inputs]: Add dbus.
This commit is contained in:
Vivien Kraus 2023-09-19 13:32:46 +02:00 committed by Liliana Marie Prikler
parent ee554a35e0
commit b701a7018d
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/gnome.scm
View file

@ -5727,7 +5727,7 @@ (define-public geocode-glib-with-libsoup2
(define-public upower
(package
(name "upower")
(version "1.90.0")
(version "1.90.2")
(source
(origin
(method git-fetch)
@ -5736,7 +5736,7 @@ (define-public upower
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq"))
(base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d"))
(modules '((guix build utils)))
(snippet
;; Upstream commit <https://cgit.freedesktop.org/upower/commit/
@ -5759,19 +5759,25 @@ (define-public upower
;; If not specified, udev will try putting history information
;; in /gnu/store.
"-Dhistorydir=/var/lib/upower"
(string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d"))
#:phases (if (target-x86-32?)
#~(modify-phases %standard-phases
(add-after 'unpack 'adjust-test-for-excess-precision
(lambda _
;; Address test failure caused by excess precision
;; on i686:
;; <https://gitlab.freedesktop.org/upower/upower/-/issues/214>.
(substitute* "src/linux/integration-test.py"
(("assertEqual(.*)40\\.0" _ middle)
(string-append
"assertAlmostEqual" middle "40.0"))))))
#~%standard-phases)))
(string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d")
(string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d"))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'adjust-test-suite
(lambda _
;; This test calls an unimplemented bluez dbus method.
(substitute* "src/linux/integration-test.py"
(("test_bluetooth_hidpp_mouse")
"disabled_test_bluetooth_hidpp_mouse"))
#$@(if (target-x86-32?)
;; Address test failure caused by excess precision
;; on i686:
;; <https://gitlab.freedesktop.org/upower/upower/-/issues/214>.
'((substitute* "src/linux/integration-test.py"
(("assertEqual(.*)40\\.0" _ middle)
(string-append
"assertAlmostEqual" middle "40.0"))))
'()))))))
(native-inputs
(list `(,glib "bin") ; for gdbus-codegen
gobject-introspection
@ -5785,12 +5791,13 @@ (define-public upower
python-packaging
python-pygobject
umockdev
dbus
;; For man pages.
docbook-xsl
libxslt ; for 'xsltproc'
libxml2)) ; for 'XML_CATALOG_FILES'
(inputs
(list dbus-glib libgudev libusb))
(list libgudev libusb))
(propagated-inputs
;; In Requires of upower-glib.pc.
(list glib))