* [bug#71396] [PATCH 0/2] gnu: solaar: Update to 1.1.13.
@ 2024-06-06 12:24 gemmaro
2024-06-06 12:40 ` [bug#71396] [PATCH 1/2] " gemmaro
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: gemmaro @ 2024-06-06 12:24 UTC (permalink / raw)
To: 71396; +Cc: gemmaro
Hello,
This updates the solaar to 1.1.13.
It also uses the newer package style for the arguments.
Regards,
gemmaro.
gemmaro (2):
gnu: solaar: Update to 1.1.13.
gnu: solaar: Use newer package style.
gnu/packages/admin.scm | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
base-commit: 4ae4311b31f1687714a01196a20bdc8b5c2a5843
--
2.41.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#71396] [PATCH 1/2] gnu: solaar: Update to 1.1.13.
2024-06-06 12:24 [bug#71396] [PATCH 0/2] gnu: solaar: Update to 1.1.13 gemmaro
@ 2024-06-06 12:40 ` gemmaro
2024-06-06 12:40 ` [bug#71396] [PATCH 2/2] gnu: solaar: Use newer package style gemmaro
2024-06-10 9:58 ` bug#71396: Close Andreas Enge
2 siblings, 0 replies; 6+ messages in thread
From: gemmaro @ 2024-06-06 12:40 UTC (permalink / raw)
To: 71396; +Cc: gemmaro
* gnu/packages/admin.scm (solaar): Update to 1.1.13.
[native-inputs]: Add python-pytest.
[propagated-inputs]: Add python-dbus-python and python-evdev.
Change-Id: I616c89ba50a0e8300c08856a96959eec7d274635
---
gnu/packages/admin.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index c730d43819..212c2b3715 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -65,6 +65,7 @@
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Tomás Ortín Fernández <tomasortin@mailbox.org>
;;; Copyright © 2024 dan <i@dan.games>
+;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -4719,7 +4720,7 @@ (define-public vmtouch
(define-public solaar
(package
(name "solaar")
- (version "1.0.7")
+ (version "1.1.13")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4728,7 +4729,7 @@ (define-public solaar
(file-name (git-file-name name version))
(sha256
(base32
- "0k7mjdfvf28fay50b2hs2z4qk6s23h71wvl8777idlrz5i5f43j5"))))
+ "1fz3qgjx3ygr4clgh7iryxgvvjy510rgy8ixr2xld2wr0xa6p0mi"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -4736,9 +4737,12 @@ (define-public solaar
(add-before 'build 'setenv-PATH
(lambda _
(setenv "PYTHONPATH" "lib"))))))
+ (native-inputs (list python-pytest))
(propagated-inputs
(list python-pygobject
python-pyudev
+ python-dbus-python
+ python-evdev
;; For GUI.
python-pyyaml
python-psutil
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#71396] [PATCH 2/2] gnu: solaar: Use newer package style.
2024-06-06 12:24 [bug#71396] [PATCH 0/2] gnu: solaar: Update to 1.1.13 gemmaro
2024-06-06 12:40 ` [bug#71396] [PATCH 1/2] " gemmaro
@ 2024-06-06 12:40 ` gemmaro
2024-06-10 9:58 ` bug#71396: Close Andreas Enge
2 siblings, 0 replies; 6+ messages in thread
From: gemmaro @ 2024-06-06 12:40 UTC (permalink / raw)
To: 71396; +Cc: gemmaro
* gnu/packages/admin.scm (solaar)[arguments]: Use newer package style.
Change-Id: I9bec91e379bed709228eb2fe809205ba5a5b377f
---
gnu/packages/admin.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 212c2b3715..c1b265cf96 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4732,11 +4732,11 @@ (define-public solaar
"1fz3qgjx3ygr4clgh7iryxgvvjy510rgy8ixr2xld2wr0xa6p0mi"))))
(build-system python-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'build 'setenv-PATH
- (lambda _
- (setenv "PYTHONPATH" "lib"))))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'setenv-PATH
+ (lambda _
+ (setenv "PYTHONPATH" "lib"))))))
(native-inputs (list python-pytest))
(propagated-inputs
(list python-pygobject
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#71396: Close
2024-06-06 12:24 [bug#71396] [PATCH 0/2] gnu: solaar: Update to 1.1.13 gemmaro
2024-06-06 12:40 ` [bug#71396] [PATCH 1/2] " gemmaro
2024-06-06 12:40 ` [bug#71396] [PATCH 2/2] gnu: solaar: Use newer package style gemmaro
@ 2024-06-10 9:58 ` Andreas Enge
2024-06-10 10:07 ` [bug#71396] Close Christopher Baines
2 siblings, 1 reply; 6+ messages in thread
From: Andreas Enge @ 2024-06-10 9:58 UTC (permalink / raw)
To: 71396-done
Hello,
thanks for the update! I have applied the first patch.
Concerning the second patch, we do not need a gexp; they are similar to
quoting and unquoting and needed to stage code execution (from the package
definition to the build). Here everything is done at package definition
time. #~ is some kind of (quasi-)quoting, but there is no corresponding
unquoting #$ or #+ in the following block. (Actually, to make this even
clearer, one could replace ` by '; but this would not warrant a commit.)
Andreas
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#71396] Close
2024-06-10 9:58 ` bug#71396: Close Andreas Enge
@ 2024-06-10 10:07 ` Christopher Baines
2024-06-10 10:21 ` Andreas Enge
0 siblings, 1 reply; 6+ messages in thread
From: Christopher Baines @ 2024-06-10 10:07 UTC (permalink / raw)
To: 71396; +Cc: andreas, gemmaro.dev
[-- Attachment #1: Type: text/plain, Size: 876 bytes --]
Andreas Enge <andreas@enge.fr> writes:
> Concerning the second patch, we do not need a gexp; they are similar to
> quoting and unquoting and needed to stage code execution (from the package
> definition to the build). Here everything is done at package definition
> time. #~ is some kind of (quasi-)quoting, but there is no corresponding
> unquoting #$ or #+ in the following block. (Actually, to make this even
> clearer, one could replace ` by '; but this would not warrant a commit.)
Note that quoting vs gexps matters for package inheritance, so even
though there's no ungexp'ing happening in this pacakge, the phases could
be ungexp'ed by a package that inherits from solaar.
For this reason, I think it's important to move to using gexp's for all
phases, even the trivial ones, so that there are less issues when it
comes to package inheritance and modifying phases.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#71396] Close
2024-06-10 10:07 ` [bug#71396] Close Christopher Baines
@ 2024-06-10 10:21 ` Andreas Enge
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Enge @ 2024-06-10 10:21 UTC (permalink / raw)
To: Christopher Baines; +Cc: gemmaro.dev, 71396
Am Mon, Jun 10, 2024 at 11:07:11AM +0100 schrieb Christopher Baines:
> Note that quoting vs gexps matters for package inheritance, so even
> though there's no ungexp'ing happening in this pacakge, the phases could
> be ungexp'ed by a package that inherits from solaar.
> For this reason, I think it's important to move to using gexp's for all
> phases, even the trivial ones, so that there are less issues when it
> comes to package inheritance and modifying phases.
Good point, although most packages do not lead to inheritance; but when
they do, this issue becomes difficult to debug. Feel free to push the
second patch if you want to.
Andreas
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-10 10:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-06 12:24 [bug#71396] [PATCH 0/2] gnu: solaar: Update to 1.1.13 gemmaro
2024-06-06 12:40 ` [bug#71396] [PATCH 1/2] " gemmaro
2024-06-06 12:40 ` [bug#71396] [PATCH 2/2] gnu: solaar: Use newer package style gemmaro
2024-06-10 9:58 ` bug#71396: Close Andreas Enge
2024-06-10 10:07 ` [bug#71396] Close Christopher Baines
2024-06-10 10:21 ` Andreas Enge
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).