GNU bug report logs - #71396
[PATCH 0/2] gnu: solaar: Update to 1.1.13.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71396 in the body.
You can then email your comments to 71396 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: gemmaro <gemmaro.dev <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: gemmaro <gemmaro.dev <at> gmail.com>
Subject: [PATCH 0/2] gnu: solaar: Update to 1.1.13.
Date: Thu,  6 Jun 2024 21:24:57 +0900

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

Message #8 received at 71396 <at> debbugs.gnu.org (full text, mbox):

From: gemmaro <gemmaro.dev <at> gmail.com>
To: 71396 <at> debbugs.gnu.org
Cc: gemmaro <gemmaro.dev <at> gmail.com>
Subject: [PATCH 1/2] gnu: solaar: Update to 1.1.13.
Date: Thu,  6 Jun 2024 21:40:50 +0900

* 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 <at> ngraves.fr>
 ;;; Copyright © 2023 Tomás Ortín Fernández <tomasortin <at> mailbox.org>
 ;;; Copyright © 2024 dan <i <at> dan.games>
+;;; Copyright © 2024 gemmaro <gemmaro.dev <at> 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

Message #11 received at 71396 <at> debbugs.gnu.org (full text, mbox):

From: gemmaro <gemmaro.dev <at> gmail.com>
To: 71396 <at> debbugs.gnu.org
Cc: gemmaro <gemmaro.dev <at> gmail.com>
Subject: [PATCH 2/2] gnu: solaar: Use newer package style.
Date: Thu,  6 Jun 2024 21:40:51 +0900

* 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

Message #16 received at 71396-done <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: 71396-done <at> debbugs.gnu.org
Subject: Close
Date: Mon, 10 Jun 2024 11:58:59 +0200

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

Message #19 received at 71396 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: 71396 <at> debbugs.gnu.org
Cc: andreas <at> enge.fr, gemmaro.dev <at> gmail.com
Subject: Re: bug#71396: Close
Date: Mon, 10 Jun 2024 11:07:11 +0100

[Message part 1 (text/plain, inline)]

Andreas Enge <andreas <at> 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.

[signature.asc (application/pgp-signature, inline)]

Message #22 received at 71396 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Christopher Baines <mail <at> cbaines.net>
Cc: gemmaro.dev <at> gmail.com, 71396 <at> debbugs.gnu.org
Subject: Re: bug#71396: Close
Date: Mon, 10 Jun 2024 12:21:11 +0200

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.