Fix python-daemon, Trezor support

Done

Details

4 participants

Attila Lendvai
Attila Lendvai
Guillaume Le Vaillant
Liliana Marie Prikler

Owner: unassigned

Submitted by: Attila Lendvai

Severity: normal

Attila Lendvai wrote on 3 Aug 2023 14:53

Recipients:(name . guix-patches@gnu.org)(address . guix-patches@gnu.org)

Message-ID:vmAqbbCBCny-Q9ieBWM6ep5vlV5br2AJotA5Pu1J3rDeqeCQ9On_ZbB34zCbrEnVxCeyJljZqh7c07_iOBAVmO3nBGz7NnXVU6zNadKboeY=@lendvai.name

dear Maintainers,

the ultimate intention of this series of patches is to fix Trezor support.

the reason i'm sending seemingly unrelated patches under one issue is that some of them are dependent on each other. please apply in order.

• attila lendvai

• PGP: 963F 5D5F 45C7 DFCD 0A39

“A political situation is the manifestation of a parallel psychological problem in millions of individuals. This problem is largely unconscious (which makes it a particularly dangerous one!)”

— Carl Jung (1875–1961), Letters, vol.1 pg. 535

Attila Lendvai wrote on 3 Aug 2023 15:11

[PATCH 1/7] gnu: python-daemon: Use the git repo as source instead of pypi.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:166ac1d1fb684844adf1370771870b3cd95bd14d.1691068294.git.attila@lendvai.name

---

gnu/packages/python-xyz.scm | 10 ++++++----

1 file changed, 6 insertions(+), 4 deletions(-)

Toggle diff (26 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index db3e69fb45..0296b55a8b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5548,11 +5548,13 @@ (define-public python-daemon
     (version "2.3.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "python-daemon" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://pagure.io/python-daemon.git")
+             (commit (string-append "release/" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1bxfn2bq56sd4w0nm9mqy8y0905m7fc8vmhnjxlrf49vcbqr7adx"))))
+        (base32 "1ysynb1m9vsww2nmhcypkk08xwifc3gw5yq10h1a1i11yn27w4y6"))))
     (build-system python-build-system)
     (arguments
      `(#:phases

base-commit: c7e45139faa27b60f2c7d0a4bc140f9793d97d47
-- 
2.40.1

Attila Lendvai wrote on 3 Aug 2023 15:11

[PATCH 2/7] gnu: python-daemon: Update to 3.0.1.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:bef7133516a7660c66100ba07deee8df2c777b63.1691068294.git.attila@lendvai.name

* gnu/packages/python-xyz.scm (python-daemon): Disable two more failing
tests (3 altogether).
---
 gnu/packages/python-xyz.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Toggle diff (46 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0296b55a8b..20e19ce4f2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5545,7 +5545,7 @@ (define-public python-joblib
 (define-public python-daemon
   (package
     (name "python-daemon")
-    (version "2.3.0")
+    (version "3.0.1")
     (source
      (origin
        (method git-fetch)
@@ -5554,22 +5554,22 @@ (define-public python-daemon
              (commit (string-append "release/" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ysynb1m9vsww2nmhcypkk08xwifc3gw5yq10h1a1i11yn27w4y6"))))
+        (base32 "0kc7ig5nlbvc3xzkpiw4jv2gvi5c05fa7qa3mi6qwxa6bx8bxjl8"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
          (add-before 'check 'adjust-tests
            (lambda _
-             ;; Drop use of testtools.helpers.safe_hasattr which has
-             ;; been removed in favor of hasattr.
-             (substitute* "test/test_metadata.py"
-               (("testtools\\.helpers\\.safe_hasattr")
-                "hasattr"))
-             ;; FIXME: Determine why test fails
+             ;; FIXME: Determine why these tests fail
              (substitute* "test/test_daemon.py"
                (("test_detaches_process_context")
-                "skip_test_detaches_process_context")))))))
+                "skip_test_detaches_process_context"))
+             (substitute* "test/scaffold.py"
+               (("test_exception_types")
+                "skip_test_exception_types")
+               (("test_exception_instance")
+                "skip_test_exception_instance")))))))
     (propagated-inputs
      (list python-lockfile))
     (native-inputs
-- 
2.40.1

Attila Lendvai wrote on 3 Aug 2023 15:11

[PATCH 3/7] gnu: Add python-construct-classes.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:bb48c5610a881a10e8e7ea8e80451991418e271a.1691068294.git.attila@lendvai.name

* gnu/packages/python-xyz.scm (python-construct-classes): New variable.

---

gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (38 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 20e19ce4f2..309dd3be20 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -803,6 +803,31 @@ (define-public python-colorful
 as functions or string constants to form colored terminal output.")
     (license license:expat)))
 
+(define-public python-construct-classes
+  (package
+    (name "python-construct-classes")
+    (version "0.1.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/matejcik/construct-classes")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fmr8nfg543lyqk4164a52jb6lwpq98radicbkhhdfckq9lib2wp"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs
+     (list python-construct))
+    (native-inputs
+     (list python-poetry-core
+           python-pytest))
+    (home-page "https://github.com/matejcik/construct-classes")
+    (synopsis "Parse binary structs into dataclasses")
+    (description "This package provides a parser to parse binary structs
+into dataclasses.")
+    (license license:expat)))
+
 (define-public python-yaspin
   (package
     (name "python-yaspin")
-- 
2.40.1

Attila Lendvai wrote on 3 Aug 2023 15:11

[PATCH 4/7] gnu: python-trezor: Update to 0.13.7.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:f6cab30773ebdc52a1fb483801df42b932b6ecca.1691068294.git.attila@lendvai.name

* gnu/packages/finance.scm (python-trezor): Disable the sanity-check phase.

---

gnu/packages/finance.scm | 25 +++++++++++++++----------

1 file changed, 15 insertions(+), 10 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index e0d6bd6e2c..2d28de0ee4 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1092,7 +1092,7 @@ (define-public python-btchip-python
 (define-public python-trezor
   (package
     (name "python-trezor")
-    (version "0.13.0")
+    (version "0.13.7")
     (source
      (origin
        (method git-fetch)
@@ -1101,7 +1101,7 @@ (define-public python-trezor
              (commit (string-append "python/v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1wy584bxx5p2av4lv1bx9hl1q0b5n7hqz0hnqb9shjriarvl5ckd"))
+        (base32 "13wyl9b15c8iscfakprwfvh2akw180hfqdjww79b78ywz51y7hdh"))
        (modules
         '((guix build utils)
           (srfi srfi-26)
@@ -1127,25 +1127,30 @@ (define-public python-trezor
     (build-system python-build-system)
     (propagated-inputs
      (list python-attrs
-           ;; TOOD: Use the latest click version after release 0.13.1 or later
-           ;; is made (see:
-           ;; https://github.com/trezor/trezor-firmware/issues/2199).
-           python-click-7
-           python-construct
+           python-click
+           python-construct-classes
            python-ecdsa
            python-hidapi
            python-libusb1
            python-mnemonic
            python-requests
            python-typing-extensions))
-    (native-inputs
-     ;; For tests.
+    (native-inputs ; Only needed for running the tests
      (list protobuf
            python-black
            python-isort
+           python-pillow
            python-protobuf
            python-pyqt
-           python-pytest))
+           python-pytest
+           python-simple-rlp
+           python-wheel))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; This package only has a Python script, not a Python module, so the
+         ;; sanity-check phase can't work.
+         (delete 'sanity-check))))
     (home-page "https://github.com/trezor/python-trezor")
     (synopsis "Python library for communicating with TREZOR Hardware Wallet")
     (description "@code{trezor} is a Python library for communicating with
-- 
2.40.1

Attila Lendvai wrote on 3 Aug 2023 15:11

[PATCH 5/7] gnu: python-trezor-agent: Update to 0.14.7.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:269bf6a9ec59b1974ccefa551b162bdb31ab8b5b.1691068294.git.attila@lendvai.name

---

gnu/packages/finance.scm | 12 ++++++++----

1 file changed, 8 insertions(+), 4 deletions(-)

Toggle diff (39 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 2d28de0ee4..0656d72e64 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -923,7 +923,7 @@ (define-public python-trezor-agent
   ;; the toplevel app called trezor-agent.
   (package
     (name "python-trezor-agent")
-    (version "0.14.4")
+    (version "0.14.7")
     (source
      (origin
        (method git-fetch)
@@ -932,7 +932,7 @@ (define-public python-trezor-agent
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l"))))
+        (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -960,8 +960,12 @@ (define-public python-trezor-agent
            python-semver
            python-unidecode
            python-wheel))
-    (native-inputs
-     (list gnupg python-mock python-pytest))
+    (native-inputs ; Only needed for running the tests
+     (list gnupg
+           python-bech32
+           python-cryptography
+           python-mock
+           python-pytest))
     (home-page "https://github.com/romanz/trezor-agent")
     (synopsis "Use hardware wallets as SSH and GPG agent")
     (description
-- 
2.40.1

Attila Lendvai wrote on 3 Aug 2023 15:11

[PATCH 6/7] gnu: trezor-agent: Fix build, update versioning, and the git tag.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:ff882aba8ce58e3f1d2973f2728f382288e0bab7.1691068294.git.attila@lendvai.name

Fix it by adding missing native-inputs, so that the tests finish (and thus the

build succeeds).

Also clarify the versioning of the package in a comment, so that later updates

will not pick the wrong version number.

* gnu/packages/finance.scm (trezor-agent): Update version from 0.14.4 to

0.12.0 (!). Move the git tag from v0.14.4 to v0.14.6.

---

gnu/packages/finance.scm | 27 +++++++++++++++++++--------

1 file changed, 19 insertions(+), 8 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 0656d72e64..807241ab8c 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1212,7 +1212,9 @@ (define-public ledger-agent
 (define-public trezor-agent
   (package
     (name "trezor-agent")
-    (version "0.14.4")
+    ;; The version of trezor-agent can be found in ./agents/trezor/setup.py.
+    ;; See next comment for details.
+    (version "0.12.0")
     (source
      (origin
        (method git-fetch)
@@ -1221,12 +1223,16 @@ (define-public trezor-agent
              ;; The version mismatch is not a mistake.  Multiple Python
              ;; apps/packages are in the same git repo, and they have
              ;; different versions.  The git tag seems to track libagent,
-             ;; i.e. python-trezor-agent in the Guix namespace.  See
-             ;; e.g. ./agents/trezor/setup.py.
-             (commit "v0.14.4")))
+             ;; which is python-trezor-agent in the Guix namespace.  See
+             ;; ./agents/trezor/setup.py for the version of trezor-agent.
+             ;;
+             ;; Here we pick the latest tag in the git repo that bumps the
+             ;; version of trezor-agent in ./agents/trezor/setup.py to the
+             ;; version we specified above.
+             (commit "v0.14.6")))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l"))
+        (base32 "0pjlsig2gd4m10xkfpa01fr9jswqn0s3qa7l7wgfv5714x33dimm"))
        (modules
         '((guix build utils)
           (ice-9 ftw)
@@ -1245,7 +1251,10 @@ (define-public trezor-agent
                                     (string-append "./" file-name)))
                      (scandir "./agents/trezor/"
                               (negate (cut member <> '("." "..") string=))))
-           (delete-file-recursively "./agents")))))
+           (delete-file-recursively "./agents")
+           ;; Without deleting libagent setuptools complains as follows:
+           ;; "error: Multiple top-level packages discovered in a flat-layout: ['contrib', 'libagent']."
+           (delete-file-recursively "./libagent")))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1274,8 +1283,10 @@ (define-public trezor-agent
     (build-system python-build-system)
     (inputs
      (list python-trezor python-trezor-agent))
-    (native-inputs
-     (list python-attrs))
+    (native-inputs ; Only needed for running the tests
+     (list python-attrs
+           python-bech32
+           python-simple-rlp))
     (home-page "https://github.com/romanz/trezor-agent")
     (synopsis "Using Trezor as hardware SSH/GPG agent")
     (description "This package allows using Trezor as a hardware SSH/GPG
-- 
2.40.1

Attila Lendvai wrote on 3 Aug 2023 15:11

[PATCH 7/7] gnu: trezord: Update to 2.0.33.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:03db3fa511b9aa164be15d3ccfd2eb47b366f02d.1691068294.git.attila@lendvai.name

* gnu/packages/finance.scm (trezord): Update version and hash, specify go-1.20
as the compiler.  Mention in a comment that the minimal requirement is 1.18.
---
 gnu/packages/finance.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 807241ab8c..8a62ac2805 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1660,7 +1660,7 @@ (define-public trezord-udev-rules
 (define-public trezord
   (package
     (name "trezord")
-    (version "2.0.31")
+    (version "2.0.33")
     (source
      (origin
        (method git-fetch)
@@ -1668,11 +1668,13 @@ (define-public trezord
              (url "https://github.com/trezor/trezord-go")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "130nhk1pnr3xx9qkcij81mm3jxrl5zvvdqhvrgvrikqg3zlb6v5b"))
+        (base32 "0nnfh9qkb8ljajkxwrn3nn85zrsw10hp7c5i4zh60qgfyl0djppw"))
        (file-name (git-file-name name version))))
     (build-system go-build-system)
     (arguments
-     '(#:import-path "github.com/trezor/trezord-go"))
+     `(#:import-path "github.com/trezor/trezord-go"
+       ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca
+       #:go ,go-1.20))
     (native-inputs
      `(("github.com/gorilla-csrf" ,go-github-com-gorilla-csrf)
        ("github.com/gorilla/handlers" ,go-github-com-gorilla-handlers)
-- 
2.40.1

Attila Lendvai wrote on 4 Aug 2023 10:18

[PATCH 8/8] gnu: trezord: use new format for native-inputs.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:fef30cea6ae7ddb771882ca3478d28a0597f8d08.1691137081.git.attila@lendvai.name

---

one small addition (that disrupts the 7/7 numbering).

gnu/packages/finance.scm | 8 ++++----

1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (30 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 8a62ac2805..61b98d103d 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1676,10 +1676,10 @@ (define-public trezord
        ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca
        #:go ,go-1.20))
     (native-inputs
-     `(("github.com/gorilla-csrf" ,go-github-com-gorilla-csrf)
-       ("github.com/gorilla/handlers" ,go-github-com-gorilla-handlers)
-       ("github.com/gorilla/mux" ,go-github-com-gorilla-mux)
-       ("gopkg.in/natefinch/lumberjack.v2" ,go-gopkg-in-natefinch-lumberjack.v2)))
+     (list go-github-com-gorilla-csrf
+           go-github-com-gorilla-handlers
+           go-github-com-gorilla-mux
+           go-gopkg-in-natefinch-lumberjack.v2))
     (home-page "https://trezor.io")
     (synopsis "Trezor Communication Daemon aka Trezor Bridge (written in Go)")
     (description "This allows a Trezor hardware wallet to communicate to the

base-commit: c7e45139faa27b60f2c7d0a4bc140f9793d97d47
prerequisite-patch-id: 06efe04a27135ca3d6cf817c057b28558adc36c7
prerequisite-patch-id: 8c31ac25a4efbd194ca3b7a65a097deaa26d015a
prerequisite-patch-id: 1166ab46a52df0924076b071edc3c9c1c3357bf8
prerequisite-patch-id: accc16fc2859dae469a53b2ac993340b546c9f3e
prerequisite-patch-id: 02cfc74134e55855d6f113b3bc877cd8a9fabf58
prerequisite-patch-id: d977749e91621c81e6061d02dd6baadc575c036f
prerequisite-patch-id: a7efb6bed2b8436ef747c10a90a9937bfc64995c
-- 
2.40.1

Liliana Marie Prikler wrote on 26 Aug 2023 20:55

Re: Fix python-daemon, Trezor support

Recipients:

Message-ID:5090ca68dec8f3cc4074aa0e581fe8c440307cc3.camel@gmail.com

Am Donnerstag, dem 03.08.2023 um 12:53 +0000 schrieb Attila Lendvai:

Toggle quote (7 lines)> dear Maintainers,
> 
> the ultimate intention of this series of patches is to fix Trezor
> support.
> 
> the reason i'm sending seemingly unrelated patches under one issue is
> that some of them are dependent on each other. please apply in order.

QA says "investigate", but the failing builds appear to have been
blocked before, so we can possibly see this as green.  However [notes
to individual commits follow in separate mails]

Liliana Marie Prikler wrote on 26 Aug 2023 20:58

Re: [PATCH 1/7] gnu: python-daemon: Use the git repo as source instead of pypi.

Recipients:(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:6c94660cacdee6a996fa95b3f0ecdc1a1656fa3f.camel@gmail.com

Am Donnerstag, dem 03.08.2023 um 15:11 +0200 schrieb Attila Lendvai:

Toggle quote (1 lines)

> ---

The ChangeLog is missing.

Perhaps write

"gnu: python-daemon: Build from git sources.

* gnu/packages/python-xyz.scm (python-daemon)[source]: Use git-fetch.

[uri, sha256]: Adjust accordingly."

Cheers

Liliana Marie Prikler wrote on 26 Aug 2023 21:02

Re: [PATCH 2/7] gnu: python-daemon: Update to 3.0.1.

Recipients:(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:bac093bf3b6092d6fe9d998c0acac8f46cf53e37.camel@gmail.com

Am Donnerstag, dem 03.08.2023 um 15:11 +0200 schrieb Attila Lendvai:

Toggle quote (3 lines)

> * gnu/packages/python-xyz.scm (python-daemon): Disable two more

> failing tests (3 altogether).

> ---

Even if it's boring, actually follow the update template.

For the disabled tests, write

[arguments]<adjust-tests>:�Drop workaround for hasattr.

Also disable “test_exception_types” and “test_exception_instance”.

Cheers

Liliana Marie Prikler wrote on 26 Aug 2023 21:07

Re: [PATCH 4/7] gnu: python-trezor: Update to 0.13.7.

Recipients:(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:e298ab3c0f985463a3843a67ed508727d7189c6e.camel@gmail.com

Am Donnerstag, dem 03.08.2023 um 15:11 +0200 schrieb Attila Lendvai:

Toggle quote (3 lines)

> * gnu/packages/finance.scm (python-trezor): Disable the sanity-check

> phase.

> ---

Again, write out the ChangeLog.

Toggle quote (66 lines)> �gnu/packages/finance.scm | 25 +++++++++++++++----------
> �1 file changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
> index e0d6bd6e2c..2d28de0ee4 100644
> --- a/gnu/packages/finance.scm
> +++ b/gnu/packages/finance.scm
> @@ -1092,7 +1092,7 @@ (define-public python-btchip-python
> �(define-public python-trezor
> �� (package
> ���� (name "python-trezor")
> -��� (version "0.13.0")
> +��� (version "0.13.7")
> ���� (source
> ����� (origin
> ������� (method git-fetch)
> @@ -1101,7 +1101,7 @@ (define-public python-trezor
> ������������� (commit (string-append "python/v" version))))
> ������� (file-name (git-file-name name version))
> ������� (sha256
> -������� (base32
> "1wy584bxx5p2av4lv1bx9hl1q0b5n7hqz0hnqb9shjriarvl5ckd"))
> +������� (base32
> "13wyl9b15c8iscfakprwfvh2akw180hfqdjww79b78ywz51y7hdh"))
> ������� (modules
> �������� '((guix build utils)
> ���������� (srfi srfi-26)
> @@ -1127,25 +1127,30 @@ (define-public python-trezor
> ���� (build-system python-build-system)
> ���� (propagated-inputs
> ����� (list python-attrs
> -���������� ;; TOOD: Use the latest click version after release
> 0.13.1 or later
> -���������� ;; is made (see:
> -���������� ;;
> https://github.com/trezor/trezor-firmware/issues/2199).
> -���������� python-click-7
> -���������� python-construct
> +���������� python-click
> +���������� python-construct-classes
> ����������� python-ecdsa
> ����������� python-hidapi
> ����������� python-libusb1
> ����������� python-mnemonic
> ����������� python-requests
> ����������� python-typing-extensions))
> -��� (native-inputs
> -���� ;; For tests.
> +��� (native-inputs ; Only needed for running the tests
> ����� (list protobuf
> ����������� python-black
> ����������� python-isort
> +���������� python-pillow
> ����������� python-protobuf
> ����������� python-pyqt
> -���������� python-pytest))
> +���������� python-pytest
> +���������� python-simple-rlp
> +���������� python-wheel))
> +��� (arguments
> +���� `(#:phases
> +������ (modify-phases %standard-phases
> +�������� ;; This package only has a Python script, not a Python
> module, so the
> +�������� ;; sanity-check phase can't work.
> +�������� (delete 'sanity-check))))

IIUC the sanity check shouldn't run on scripts, but rather public
modules.  You might want to check that there isn't some unmet
dependency or write a comment that more truthfully reflects the cause
of failure, e.g. "This module requires an active Trezor blafoo to be
loaded."

Cheers

Liliana Marie Prikler wrote on 26 Aug 2023 21:31

Re: [PATCH 6/7] gnu: trezor-agent: Fix build, update versioning, and the git tag.

Recipients:(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:100d865da2eec859cc783d7755ffe44983f619fc.camel@gmail.com

Am Donnerstag, dem 03.08.2023 um 15:11 +0200 schrieb Attila Lendvai:

Toggle quote (10 lines)> Fix it by adding missing native-inputs, so that the tests finish (and
> thus the
> build succeeds).
> 
> Also clarify the versioning of the package in a comment, so that
> later updates
> will not pick the wrong version number.
> 
> * gnu/packages/finance.scm (trezor-agent): Update version from 0.14.4
> to 0.12.0 (!). Move the git tag from v0.14.4 to v0.14.6.

Toggle quote (41 lines)> ---
> �gnu/packages/finance.scm | 27 +++++++++++++++++++--------
> �1 file changed, 19 insertions(+), 8 deletions(-)
> 
> diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
> index 0656d72e64..807241ab8c 100644
> --- a/gnu/packages/finance.scm
> +++ b/gnu/packages/finance.scm
> @@ -1212,7 +1212,9 @@ (define-public ledger-agent
> �(define-public trezor-agent
> �� (package
> ���� (name "trezor-agent")
> -��� (version "0.14.4")
> +��� ;; The version of trezor-agent can be found in
> ./agents/trezor/setup.py.
> +��� ;; See next comment for details.
> +��� (version "0.12.0")
> ���� (source
> ����� (origin
> ������� (method git-fetch)
> @@ -1221,12 +1223,16 @@ (define-public trezor-agent
> ������������� ;; The version mismatch is not a mistake.� Multiple
> Python
> ������������� ;; apps/packages are in the same git repo, and they
> have
> ������������� ;; different versions.� The git tag seems to track
> libagent,
> -������������ ;; i.e. python-trezor-agent in the Guix namespace.� See
> -������������ ;; e.g. ./agents/trezor/setup.py.
> -������������ (commit "v0.14.4")))
> +������������ ;; which is python-trezor-agent in the Guix namespace.�
> See
> +������������ ;; ./agents/trezor/setup.py for the version of trezor-
> agent.
> +������������ ;;
> +������������ ;; Here we pick the latest tag in the git repo that
> bumps the
> +������������ ;; version of trezor-agent in ./agents/trezor/setup.py
> to the
> +������������ ;; version we specified above.
> +������������ (commit "v0.14.6")))

???????????

First things first, if it's one source for two packages, why don't we

simply inherit that package (or at least its source) instead of doing

things this roundabout way?

Second, I'd do this as a multi-stage thing. First, "upgrade" trezor-

agent to 0.14.6, then "downgrade" it without changing the source. This

way, folks who use the builtin downgrade prevention will have a commit

to point to get a newer version from.

Cheers

Attila Lendvai wrote on 30 Aug 2023 20:55

Recipients:(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)

Message-ID:VrrbeLRlLhSvHcsrfvsYT_xx2NLAIeeSyhmwwujIxPMq_9zJuCDqnUAEh9i-FtZlWjqFzDfYMsfL6B7EMnylB_LtpkqR22x4HQ_Y2Df5YCk=@lendvai.name

note: some of your mail displays as kanji characters for me.

Toggle quote (5 lines)

> First things first, if it's one source for two packages, why don't we

> simply inherit that package (or at least its source) instead of doing

> things this roundabout way?

i asked for clarification in https://github.com/romanz/trezor-agent/issues/369and updated the commit accordingly.

Toggle quote (5 lines)

> Second, I'd do this as a multi-stage thing. First, "upgrade" trezor-

> agent to 0.14.6, then "downgrade" it without changing the source. This

> way, folks who use the builtin downgrade prevention will have a commit

> to point to get a newer version from.

in the new commit there's no downgrade.

-- 
• attila lendvai
• PGP: 963F 5D5F 45C7 DFCD 0A39
--
“The thing worse than rebellion is the thing that causes rebellion.”
	— Frederick Douglass (1818–1895), a former slave.

Attila Lendvai wrote on 30 Aug 2023 20:57

[PATCH v2 1/8] gnu: python-daemon: Build from git sources.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:592dca15951845e42d24d5179214a3fb68c35178.1693421855.git.attila@lendvai.name

* gnu/packages/python-xyz.scm (python-daemon)[source]: Use git-fetch.
[uri, sha256]: Adjust accordingly.
---
 gnu/packages/python-xyz.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Toggle diff (26 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index db3e69fb45..0296b55a8b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5548,11 +5548,13 @@ (define-public python-daemon
     (version "2.3.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "python-daemon" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://pagure.io/python-daemon.git")
+             (commit (string-append "release/" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1bxfn2bq56sd4w0nm9mqy8y0905m7fc8vmhnjxlrf49vcbqr7adx"))))
+        (base32 "1ysynb1m9vsww2nmhcypkk08xwifc3gw5yq10h1a1i11yn27w4y6"))))
     (build-system python-build-system)
     (arguments
      `(#:phases

base-commit: c7e45139faa27b60f2c7d0a4bc140f9793d97d47
-- 
2.40.1

Attila Lendvai wrote on 30 Aug 2023 20:57

[PATCH v2 3/8] gnu: Add python-construct-classes.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:59de04e32ae9aaaed0861e7ac3131b058e34121c.1693421855.git.attila@lendvai.name

* gnu/packages/python-xyz.scm (python-construct-classes): New variable.

---

gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (38 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 20e19ce4f2..309dd3be20 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -803,6 +803,31 @@ (define-public python-colorful
 as functions or string constants to form colored terminal output.")
     (license license:expat)))
 
+(define-public python-construct-classes
+  (package
+    (name "python-construct-classes")
+    (version "0.1.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/matejcik/construct-classes")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fmr8nfg543lyqk4164a52jb6lwpq98radicbkhhdfckq9lib2wp"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs
+     (list python-construct))
+    (native-inputs
+     (list python-poetry-core
+           python-pytest))
+    (home-page "https://github.com/matejcik/construct-classes")
+    (synopsis "Parse binary structs into dataclasses")
+    (description "This package provides a parser to parse binary structs
+into dataclasses.")
+    (license license:expat)))
+
 (define-public python-yaspin
   (package
     (name "python-yaspin")
-- 
2.40.1

Attila Lendvai wrote on 30 Aug 2023 20:57

[PATCH v2 2/8] gnu: python-daemon: Update to 3.0.1.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:d2371da480659334b300aa019b20a99b5efa17d8.1693421855.git.attila@lendvai.name

* gnu/packages/python-xyz.scm (python-daemon)[arguments]<adjust-tests>: Drop
workaround for hasattr.  Also disable “test_exception_types” and
“test_exception_instance”.
---
 gnu/packages/python-xyz.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Toggle diff (46 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0296b55a8b..20e19ce4f2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5545,7 +5545,7 @@ (define-public python-joblib
 (define-public python-daemon
   (package
     (name "python-daemon")
-    (version "2.3.0")
+    (version "3.0.1")
     (source
      (origin
        (method git-fetch)
@@ -5554,22 +5554,22 @@ (define-public python-daemon
              (commit (string-append "release/" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ysynb1m9vsww2nmhcypkk08xwifc3gw5yq10h1a1i11yn27w4y6"))))
+        (base32 "0kc7ig5nlbvc3xzkpiw4jv2gvi5c05fa7qa3mi6qwxa6bx8bxjl8"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
          (add-before 'check 'adjust-tests
            (lambda _
-             ;; Drop use of testtools.helpers.safe_hasattr which has
-             ;; been removed in favor of hasattr.
-             (substitute* "test/test_metadata.py"
-               (("testtools\\.helpers\\.safe_hasattr")
-                "hasattr"))
-             ;; FIXME: Determine why test fails
+             ;; FIXME: Determine why these tests fail
              (substitute* "test/test_daemon.py"
                (("test_detaches_process_context")
-                "skip_test_detaches_process_context")))))))
+                "skip_test_detaches_process_context"))
+             (substitute* "test/scaffold.py"
+               (("test_exception_types")
+                "skip_test_exception_types")
+               (("test_exception_instance")
+                "skip_test_exception_instance")))))))
     (propagated-inputs
      (list python-lockfile))
     (native-inputs
-- 
2.40.1

Attila Lendvai wrote on 30 Aug 2023 20:57

[PATCH v2 4/8] gnu: python-trezor: Update to 0.13.7.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:164e49f4e1812c4a6f5e1da7a8c7403b08a09bfc.1693421855.git.attila@lendvai.name

* gnu/packages/finance.scm (python-trezor): Disable the sanity-check phase.

---

gnu/packages/finance.scm | 25 +++++++++++++++----------

1 file changed, 15 insertions(+), 10 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index e0d6bd6e2c..2d28de0ee4 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1092,7 +1092,7 @@ (define-public python-btchip-python
 (define-public python-trezor
   (package
     (name "python-trezor")
-    (version "0.13.0")
+    (version "0.13.7")
     (source
      (origin
        (method git-fetch)
@@ -1101,7 +1101,7 @@ (define-public python-trezor
              (commit (string-append "python/v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1wy584bxx5p2av4lv1bx9hl1q0b5n7hqz0hnqb9shjriarvl5ckd"))
+        (base32 "13wyl9b15c8iscfakprwfvh2akw180hfqdjww79b78ywz51y7hdh"))
        (modules
         '((guix build utils)
           (srfi srfi-26)
@@ -1127,25 +1127,30 @@ (define-public python-trezor
     (build-system python-build-system)
     (propagated-inputs
      (list python-attrs
-           ;; TOOD: Use the latest click version after release 0.13.1 or later
-           ;; is made (see:
-           ;; https://github.com/trezor/trezor-firmware/issues/2199).
-           python-click-7
-           python-construct
+           python-click
+           python-construct-classes
            python-ecdsa
            python-hidapi
            python-libusb1
            python-mnemonic
            python-requests
            python-typing-extensions))
-    (native-inputs
-     ;; For tests.
+    (native-inputs ; Only needed for running the tests
      (list protobuf
            python-black
            python-isort
+           python-pillow
            python-protobuf
            python-pyqt
-           python-pytest))
+           python-pytest
+           python-simple-rlp
+           python-wheel))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; This package only has a Python script, not a Python module, so the
+         ;; sanity-check phase can't work.
+         (delete 'sanity-check))))
     (home-page "https://github.com/trezor/python-trezor")
     (synopsis "Python library for communicating with TREZOR Hardware Wallet")
     (description "@code{trezor} is a Python library for communicating with
-- 
2.40.1

Attila Lendvai wrote on 30 Aug 2023 20:57

[PATCH v2 5/8] gnu: python-trezor-agent: Update to 0.14.7.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:2999c93b541e91ffe11acb81607f4bd307c88cb6.1693421855.git.attila@lendvai.name

---

gnu/packages/finance.scm | 12 ++++++++----

1 file changed, 8 insertions(+), 4 deletions(-)

Toggle diff (39 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 2d28de0ee4..0656d72e64 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -923,7 +923,7 @@ (define-public python-trezor-agent
   ;; the toplevel app called trezor-agent.
   (package
     (name "python-trezor-agent")
-    (version "0.14.4")
+    (version "0.14.7")
     (source
      (origin
        (method git-fetch)
@@ -932,7 +932,7 @@ (define-public python-trezor-agent
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l"))))
+        (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -960,8 +960,12 @@ (define-public python-trezor-agent
            python-semver
            python-unidecode
            python-wheel))
-    (native-inputs
-     (list gnupg python-mock python-pytest))
+    (native-inputs ; Only needed for running the tests
+     (list gnupg
+           python-bech32
+           python-cryptography
+           python-mock
+           python-pytest))
     (home-page "https://github.com/romanz/trezor-agent")
     (synopsis "Use hardware wallets as SSH and GPG agent")
     (description
-- 
2.40.1

Attila Lendvai wrote on 30 Aug 2023 20:57

[PATCH v2 6/8] gnu: trezor-agent: Fix build, change versioning scheme.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:84091bdb65cfa39bc05ce4e6a45fd005f7d3f0cb.1693421855.git.attila@lendvai.name

Clarify the versioning of the package in a comment, so that later updates will
not pick the wrong version number.

* gnu/packages/finance.scm (trezor-agent): Copy version from
python-trezor-agent which effectively updates it from 0.14.4 to 0.14.7.  Copy
the origin also from python-trezor-agent to effectively sync the source and
the version of the two packages; something that upstream will also do in
future releases.
[native-inputs]: Add missing python-bech32 and python-simple-rlp so that the
test suite runs clean and the build finishes.
---
 gnu/packages/finance.scm | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 0656d72e64..f595d52093 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1212,21 +1212,21 @@ (define-public ledger-agent
 (define-public trezor-agent
   (package
     (name "trezor-agent")
-    (version "0.14.4")
+    ;; There are multiple Python apps/packages in the same git repo.  The git
+    ;; tag seems to track libagent's version (which is called
+    ;; python-trezor-agent in the Guix namespace). Currently trezor-agent's
+    ;; version is set in `agents/trezor/setup.py` to a different value than
+    ;; libagent, but as discussed with upstream in issue
+    ;; https://github.com/romanz/trezor-agent/issues/369, we are copying our
+    ;; version from that of libagent.
+    (version (package-version python-trezor-agent))
     (source
      (origin
        (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/romanz/trezor-agent")
-             ;; The version mismatch is not a mistake.  Multiple Python
-             ;; apps/packages are in the same git repo, and they have
-             ;; different versions.  The git tag seems to track libagent,
-             ;; i.e. python-trezor-agent in the Guix namespace.  See
-             ;; e.g. ./agents/trezor/setup.py.
-             (commit "v0.14.4")))
+       (uri (origin-uri (package-source python-trezor-agent)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l"))
+        (base32 "0pjlsig2gd4m10xkfpa01fr9jswqn0s3qa7l7wgfv5714x33dimm"))
        (modules
         '((guix build utils)
           (ice-9 ftw)
@@ -1245,7 +1245,10 @@ (define-public trezor-agent
                                     (string-append "./" file-name)))
                      (scandir "./agents/trezor/"
                               (negate (cut member <> '("." "..") string=))))
-           (delete-file-recursively "./agents")))))
+           (delete-file-recursively "./agents")
+           ;; Without deleting libagent setuptools complains as follows:
+           ;; "error: Multiple top-level packages discovered in a flat-layout: ['contrib', 'libagent']."
+           (delete-file-recursively "./libagent")))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1274,8 +1277,10 @@ (define-public trezor-agent
     (build-system python-build-system)
     (inputs
      (list python-trezor python-trezor-agent))
-    (native-inputs
-     (list python-attrs))
+    (native-inputs ; Only needed for running the tests
+     (list python-attrs
+           python-bech32
+           python-simple-rlp))
     (home-page "https://github.com/romanz/trezor-agent")
     (synopsis "Using Trezor as hardware SSH/GPG agent")
     (description "This package allows using Trezor as a hardware SSH/GPG
-- 
2.40.1

Attila Lendvai wrote on 30 Aug 2023 20:57

[PATCH v2 7/8] gnu: trezord: Update to 2.0.33.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:703e0af63dc26fcf7a316e2bef7fa0c1519e8047.1693421855.git.attila@lendvai.name

* gnu/packages/finance.scm (trezord): Update version and hash, specify go-1.20
as the compiler.  Mention in a comment that the minimal requirement is 1.18.
---
 gnu/packages/finance.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index f595d52093..dd30bac82d 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1654,7 +1654,7 @@ (define-public trezord-udev-rules
 (define-public trezord
   (package
     (name "trezord")
-    (version "2.0.31")
+    (version "2.0.33")
     (source
      (origin
        (method git-fetch)
@@ -1662,11 +1662,13 @@ (define-public trezord
              (url "https://github.com/trezor/trezord-go")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "130nhk1pnr3xx9qkcij81mm3jxrl5zvvdqhvrgvrikqg3zlb6v5b"))
+        (base32 "0nnfh9qkb8ljajkxwrn3nn85zrsw10hp7c5i4zh60qgfyl0djppw"))
        (file-name (git-file-name name version))))
     (build-system go-build-system)
     (arguments
-     '(#:import-path "github.com/trezor/trezord-go"))
+     `(#:import-path "github.com/trezor/trezord-go"
+       ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca
+       #:go ,go-1.20))
     (native-inputs
      `(("github.com/gorilla-csrf" ,go-github-com-gorilla-csrf)
        ("github.com/gorilla/handlers" ,go-github-com-gorilla-handlers)
-- 
2.40.1

Attila Lendvai wrote on 30 Aug 2023 20:57

[PATCH v2 8/8] gnu: trezord: use new format for native-inputs.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:70127e95073e0cbc7b12d574ca57d18920b13b9d.1693421855.git.attila@lendvai.name

---

gnu/packages/finance.scm | 8 ++++----

1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (21 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index dd30bac82d..e843d9ed81 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1670,10 +1670,10 @@ (define-public trezord
        ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca
        #:go ,go-1.20))
     (native-inputs
-     `(("github.com/gorilla-csrf" ,go-github-com-gorilla-csrf)
-       ("github.com/gorilla/handlers" ,go-github-com-gorilla-handlers)
-       ("github.com/gorilla/mux" ,go-github-com-gorilla-mux)
-       ("gopkg.in/natefinch/lumberjack.v2" ,go-gopkg-in-natefinch-lumberjack.v2)))
+     (list go-github-com-gorilla-csrf
+           go-github-com-gorilla-handlers
+           go-github-com-gorilla-mux
+           go-gopkg-in-natefinch-lumberjack.v2))
     (home-page "https://trezor.io")
     (synopsis "Trezor Communication Daemon aka Trezor Bridge (written in Go)")
     (description "This allows a Trezor hardware wallet to communicate to the
-- 
2.40.1

Attila Lendvai wrote on 3 Sep 2023 14:55

[PATCH v3 2/8] gnu: python-daemon: Update to 3.0.1.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:084aa848ce998e56bb13afa235afacbf9fd56736.1693745751.git.attila@lendvai.name

* gnu/packages/python-xyz.scm (python-daemon)[arguments]<adjust-tests>: Drop
workaround for hasattr.  Also disable “test_exception_types” and
“test_exception_instance”.
---
 gnu/packages/python-xyz.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Toggle diff (46 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 69551fab09..5cc966c591 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5610,7 +5610,7 @@ (define-public python-joblib
 (define-public python-daemon
   (package
     (name "python-daemon")
-    (version "2.3.0")
+    (version "3.0.1")
     (source
      (origin
        (method git-fetch)
@@ -5619,22 +5619,22 @@ (define-public python-daemon
              (commit (string-append "release/" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ysynb1m9vsww2nmhcypkk08xwifc3gw5yq10h1a1i11yn27w4y6"))))
+        (base32 "0kc7ig5nlbvc3xzkpiw4jv2gvi5c05fa7qa3mi6qwxa6bx8bxjl8"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
          (add-before 'check 'adjust-tests
            (lambda _
-             ;; Drop use of testtools.helpers.safe_hasattr which has
-             ;; been removed in favor of hasattr.
-             (substitute* "test/test_metadata.py"
-               (("testtools\\.helpers\\.safe_hasattr")
-                "hasattr"))
-             ;; FIXME: Determine why test fails
+             ;; FIXME: Determine why these tests fail
              (substitute* "test/test_daemon.py"
                (("test_detaches_process_context")
-                "skip_test_detaches_process_context")))))))
+                "skip_test_detaches_process_context"))
+             (substitute* "test/scaffold.py"
+               (("test_exception_types")
+                "skip_test_exception_types")
+               (("test_exception_instance")
+                "skip_test_exception_instance")))))))
     (propagated-inputs
      (list python-lockfile))
     (native-inputs
-- 
2.41.0

Attila Lendvai wrote on 3 Sep 2023 14:55

[PATCH v3 1/8] gnu: python-daemon: Build from git sources.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:c3a8d601f561dfcac7062b0c27dc883848291da8.1693745751.git.attila@lendvai.name

* gnu/packages/python-xyz.scm (python-daemon)[source]: Use git-fetch.

[uri, sha256]: Adjust accordingly.

---

all raised issues should be addressed in this v3 (modulo anything i

forgot or overlooked).

gnu/packages/python-xyz.scm | 10 ++++++----

1 file changed, 6 insertions(+), 4 deletions(-)

Toggle diff (26 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index cd4319ca09..69551fab09 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5613,11 +5613,13 @@ (define-public python-daemon
     (version "2.3.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "python-daemon" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://pagure.io/python-daemon.git")
+             (commit (string-append "release/" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1bxfn2bq56sd4w0nm9mqy8y0905m7fc8vmhnjxlrf49vcbqr7adx"))))
+        (base32 "1ysynb1m9vsww2nmhcypkk08xwifc3gw5yq10h1a1i11yn27w4y6"))))
     (build-system python-build-system)
     (arguments
      `(#:phases

base-commit: 52af65cf661603b4f6bdc39c2565105577003992
-- 
2.41.0

Attila Lendvai wrote on 3 Sep 2023 14:55

[PATCH v3 3/8] gnu: Add python-construct-classes.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:0a299622afedab46783d6dbf9db130b9012a6f14.1693745751.git.attila@lendvai.name

* gnu/packages/python-xyz.scm (python-construct-classes): New variable.

---

gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (38 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5cc966c591..eeb028e9b8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -824,6 +824,31 @@ (define-public python-colorful
 as functions or string constants to form colored terminal output.")
     (license license:expat)))
 
+(define-public python-construct-classes
+  (package
+    (name "python-construct-classes")
+    (version "0.1.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/matejcik/construct-classes")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fmr8nfg543lyqk4164a52jb6lwpq98radicbkhhdfckq9lib2wp"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs
+     (list python-construct))
+    (native-inputs
+     (list python-poetry-core
+           python-pytest))
+    (home-page "https://github.com/matejcik/construct-classes")
+    (synopsis "Parse binary structs into dataclasses")
+    (description "This package provides a parser to parse binary structs
+into dataclasses.")
+    (license license:expat)))
+
 (define-public python-yaspin
   (package
     (name "python-yaspin")
-- 
2.41.0

Attila Lendvai wrote on 3 Sep 2023 14:55

[PATCH v3 5/8] gnu: python-trezor-agent: Update to 0.14.7.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:47a1a240f4703778808f991e4b233146b676e75f.1693745751.git.attila@lendvai.name

---

gnu/packages/finance.scm | 12 ++++++++----

1 file changed, 8 insertions(+), 4 deletions(-)

Toggle diff (39 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index ea7678e852..5f3b35e754 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -923,7 +923,7 @@ (define-public python-trezor-agent
   ;; the toplevel app called trezor-agent.
   (package
     (name "python-trezor-agent")
-    (version "0.14.4")
+    (version "0.14.7")
     (source
      (origin
        (method git-fetch)
@@ -932,7 +932,7 @@ (define-public python-trezor-agent
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l"))))
+        (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -960,8 +960,12 @@ (define-public python-trezor-agent
            python-semver
            python-unidecode
            python-wheel))
-    (native-inputs
-     (list gnupg python-mock python-pytest))
+    (native-inputs ; Only needed for running the tests
+     (list gnupg
+           python-bech32
+           python-cryptography
+           python-mock
+           python-pytest))
     (home-page "https://github.com/romanz/trezor-agent")
     (synopsis "Use hardware wallets as SSH and GPG agent")
     (description
-- 
2.41.0

Attila Lendvai wrote on 3 Sep 2023 14:55

[PATCH v3 6/8] gnu: trezor-agent: Fix build, change versioning scheme.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:b1ee81d274b22108cc18a6ad9301735de32faee3.1693745751.git.attila@lendvai.name

Clarify the versioning of the package in a comment, so that later updates will
not pick the wrong version number.

* gnu/packages/finance.scm (trezor-agent): Copy version from
python-trezor-agent which effectively updates it from 0.14.4 to 0.14.7.  Copy
the origin also from python-trezor-agent to effectively sync the source and
the version of the two packages; something that upstream will also do in
future releases.
[native-inputs]: Add missing python-bech32 and python-simple-rlp so that the
test suite runs clean and the build finishes.
---
 gnu/packages/finance.scm | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

Toggle diff (72 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 5f3b35e754..5695ec4b63 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1206,21 +1206,21 @@ (define-public ledger-agent
 (define-public trezor-agent
   (package
     (name "trezor-agent")
-    (version "0.14.4")
+    ;; There are multiple Python apps/packages in the same git repo.  The git
+    ;; tag seems to track libagent's version (which is called
+    ;; python-trezor-agent in the Guix namespace). Currently trezor-agent's
+    ;; version is set in `agents/trezor/setup.py` to a different value than
+    ;; libagent, but as discussed with upstream in issue
+    ;; https://github.com/romanz/trezor-agent/issues/369, we are copying our
+    ;; version from that of libagent.
+    (version (package-version python-trezor-agent))
     (source
      (origin
        (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/romanz/trezor-agent")
-             ;; The version mismatch is not a mistake.  Multiple Python
-             ;; apps/packages are in the same git repo, and they have
-             ;; different versions.  The git tag seems to track libagent,
-             ;; i.e. python-trezor-agent in the Guix namespace.  See
-             ;; e.g. ./agents/trezor/setup.py.
-             (commit "v0.14.4")))
+       (uri (origin-uri (package-source python-trezor-agent)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l"))
+        (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0"))
        (modules
         '((guix build utils)
           (ice-9 ftw)
@@ -1239,13 +1239,16 @@ (define-public trezor-agent
                                     (string-append "./" file-name)))
                      (scandir "./agents/trezor/"
                               (negate (cut member <> '("." "..") string=))))
-           (delete-file-recursively "./agents")))))
+           (delete-file-recursively "./agents")
+           ;; Without deleting ./contrib the sanity-check phase fails. Reported
+           ;; upstream as https://github.com/romanz/trezor-agent/issues/429.
+           (delete-file-recursively "./contrib")
+           ;; Without deleting ./libagent setuptools complains as follows:
+           ;; "error: Multiple top-level packages discovered in a flat-layout: ['contrib', 'libagent']."
+           (delete-file-recursively "./libagent")))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         ;; This package only has a Python script, not a Python module, so the
-         ;; sanity-check phase can't work.
-         (delete 'sanity-check)
          (add-after 'unpack 'relax-requirements
            (lambda _
              (substitute* "setup.py"
@@ -1268,8 +1271,10 @@ (define-public trezor-agent
     (build-system python-build-system)
     (inputs
      (list python-trezor python-trezor-agent))
-    (native-inputs
-     (list python-attrs))
+    (native-inputs ; Only needed for running the tests
+     (list python-attrs
+           python-bech32
+           python-simple-rlp))
     (home-page "https://github.com/romanz/trezor-agent")
     (synopsis "Using Trezor as hardware SSH/GPG agent")
     (description "This package allows using Trezor as a hardware SSH/GPG
-- 
2.41.0

Attila Lendvai wrote on 3 Sep 2023 14:55

[PATCH v3 7/8] gnu: trezord: Update to 2.0.33.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:3e66cf7e1900d2747db20931c12fc64b119867c4.1693745751.git.attila@lendvai.name

* gnu/packages/finance.scm (trezord): Update version and hash, specify go-1.20
as the compiler.  Mention in a comment that the minimal requirement is 1.18.
---
 gnu/packages/finance.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 5695ec4b63..8e34064201 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1648,7 +1648,7 @@ (define-public trezord-udev-rules
 (define-public trezord
   (package
     (name "trezord")
-    (version "2.0.31")
+    (version "2.0.33")
     (source
      (origin
        (method git-fetch)
@@ -1656,11 +1656,13 @@ (define-public trezord
              (url "https://github.com/trezor/trezord-go")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "130nhk1pnr3xx9qkcij81mm3jxrl5zvvdqhvrgvrikqg3zlb6v5b"))
+        (base32 "0nnfh9qkb8ljajkxwrn3nn85zrsw10hp7c5i4zh60qgfyl0djppw"))
        (file-name (git-file-name name version))))
     (build-system go-build-system)
     (arguments
-     '(#:import-path "github.com/trezor/trezord-go"))
+     `(#:import-path "github.com/trezor/trezord-go"
+       ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca
+       #:go ,go-1.20))
     (native-inputs
      `(("github.com/gorilla-csrf" ,go-github-com-gorilla-csrf)
        ("github.com/gorilla/handlers" ,go-github-com-gorilla-handlers)
-- 
2.41.0

Attila Lendvai wrote on 3 Sep 2023 14:55

[PATCH v3 4/8] gnu: python-trezor: Update to 0.13.7.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:d2ec245c6d1631ae4459fd0725d26cb00c0531f9.1693745751.git.attila@lendvai.name

* gnu/packages/finance.scm (python-trezor): Disable the sanity-check phase.

---

gnu/packages/finance.scm | 19 +++++++++----------

1 file changed, 9 insertions(+), 10 deletions(-)

Toggle diff (57 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 384cb90e18..ea7678e852 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1092,7 +1092,7 @@ (define-public python-btchip-python
 (define-public python-trezor
   (package
     (name "python-trezor")
-    (version "0.13.0")
+    (version "0.13.7")
     (source
      (origin
        (method git-fetch)
@@ -1101,7 +1101,7 @@ (define-public python-trezor
              (commit (string-append "python/v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1wy584bxx5p2av4lv1bx9hl1q0b5n7hqz0hnqb9shjriarvl5ckd"))
+        (base32 "13wyl9b15c8iscfakprwfvh2akw180hfqdjww79b78ywz51y7hdh"))
        (modules
         '((guix build utils)
           (srfi srfi-26)
@@ -1127,25 +1127,24 @@ (define-public python-trezor
     (build-system python-build-system)
     (propagated-inputs
      (list python-attrs
-           ;; TOOD: Use the latest click version after release 0.13.1 or later
-           ;; is made (see:
-           ;; https://github.com/trezor/trezor-firmware/issues/2199).
-           python-click-7
-           python-construct
+           python-click
+           python-construct-classes
            python-ecdsa
            python-hidapi
            python-libusb1
            python-mnemonic
            python-requests
            python-typing-extensions))
-    (native-inputs
-     ;; For tests.
+    (native-inputs ; Only needed for running the tests
      (list protobuf
            python-black
            python-isort
+           python-pillow
            python-protobuf
            python-pyqt
-           python-pytest))
+           python-pytest
+           python-simple-rlp
+           python-wheel))
     (home-page "https://github.com/trezor/python-trezor")
     (synopsis "Python library for communicating with TREZOR Hardware Wallet")
     (description "@code{trezor} is a Python library for communicating with
-- 
2.41.0

Attila Lendvai wrote on 3 Sep 2023 14:55

[PATCH v3 8/8] gnu: trezord: use new format for native-inputs.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:60920f5d3bb7b2dd8b64dc0953ad9611d11c6b46.1693745751.git.attila@lendvai.name

---

gnu/packages/finance.scm | 8 ++++----

1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (21 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 8e34064201..d40d6567a7 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1664,10 +1664,10 @@ (define-public trezord
        ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca
        #:go ,go-1.20))
     (native-inputs
-     `(("github.com/gorilla-csrf" ,go-github-com-gorilla-csrf)
-       ("github.com/gorilla/handlers" ,go-github-com-gorilla-handlers)
-       ("github.com/gorilla/mux" ,go-github-com-gorilla-mux)
-       ("gopkg.in/natefinch/lumberjack.v2" ,go-gopkg-in-natefinch-lumberjack.v2)))
+     (list go-github-com-gorilla-csrf
+           go-github-com-gorilla-handlers
+           go-github-com-gorilla-mux
+           go-gopkg-in-natefinch-lumberjack.v2))
     (home-page "https://trezor.io")
     (synopsis "Trezor Communication Daemon aka Trezor Bridge (written in Go)")
     (description "This allows a Trezor hardware wallet to communicate to the
-- 
2.41.0

Attila Lendvai wrote on 4 Sep 2023 12:40

[PATCH v4 1/8] gnu: python-daemon: Build from git sources.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:c3a8d601f561dfcac7062b0c27dc883848291da8.1693824046.git.attila@lendvai.name

* gnu/packages/python-xyz.scm (python-daemon)[source]: Use git-fetch.

[uri, sha256]: Adjust accordingly.

---

v4: edited some of the commit messages

gnu/packages/python-xyz.scm | 10 ++++++----

1 file changed, 6 insertions(+), 4 deletions(-)

Toggle diff (26 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index cd4319ca09..69551fab09 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5613,11 +5613,13 @@ (define-public python-daemon
     (version "2.3.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "python-daemon" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://pagure.io/python-daemon.git")
+             (commit (string-append "release/" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1bxfn2bq56sd4w0nm9mqy8y0905m7fc8vmhnjxlrf49vcbqr7adx"))))
+        (base32 "1ysynb1m9vsww2nmhcypkk08xwifc3gw5yq10h1a1i11yn27w4y6"))))
     (build-system python-build-system)
     (arguments
      `(#:phases

base-commit: 52af65cf661603b4f6bdc39c2565105577003992
-- 
2.41.0

Attila Lendvai wrote on 4 Sep 2023 12:40

[PATCH v4 3/8] gnu: Add python-construct-classes.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:0a299622afedab46783d6dbf9db130b9012a6f14.1693824046.git.attila@lendvai.name

* gnu/packages/python-xyz.scm (python-construct-classes): New variable.

---

gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (38 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5cc966c591..eeb028e9b8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -824,6 +824,31 @@ (define-public python-colorful
 as functions or string constants to form colored terminal output.")
     (license license:expat)))
 
+(define-public python-construct-classes
+  (package
+    (name "python-construct-classes")
+    (version "0.1.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/matejcik/construct-classes")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fmr8nfg543lyqk4164a52jb6lwpq98radicbkhhdfckq9lib2wp"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs
+     (list python-construct))
+    (native-inputs
+     (list python-poetry-core
+           python-pytest))
+    (home-page "https://github.com/matejcik/construct-classes")
+    (synopsis "Parse binary structs into dataclasses")
+    (description "This package provides a parser to parse binary structs
+into dataclasses.")
+    (license license:expat)))
+
 (define-public python-yaspin
   (package
     (name "python-yaspin")
-- 
2.41.0

Attila Lendvai wrote on 4 Sep 2023 12:40

[PATCH v4 4/8] gnu: python-trezor: Update to 0.13.7.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:9f11e3524bf5e21a8929b56f2d5cedb2e0641dfa.1693824046.git.attila@lendvai.name

* gnu/packages/finance.scm (python-trezor) [propagated-inputs]: Drop
python-click-7 kludge, add python-construct-classes instead of
python-construct.
[native-inputs]: Adjust for the tests to run cleanly.
---
 gnu/packages/finance.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Toggle diff (57 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 384cb90e18..ea7678e852 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1092,7 +1092,7 @@ (define-public python-btchip-python
 (define-public python-trezor
   (package
     (name "python-trezor")
-    (version "0.13.0")
+    (version "0.13.7")
     (source
      (origin
        (method git-fetch)
@@ -1101,7 +1101,7 @@ (define-public python-trezor
              (commit (string-append "python/v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1wy584bxx5p2av4lv1bx9hl1q0b5n7hqz0hnqb9shjriarvl5ckd"))
+        (base32 "13wyl9b15c8iscfakprwfvh2akw180hfqdjww79b78ywz51y7hdh"))
        (modules
         '((guix build utils)
           (srfi srfi-26)
@@ -1127,25 +1127,24 @@ (define-public python-trezor
     (build-system python-build-system)
     (propagated-inputs
      (list python-attrs
-           ;; TOOD: Use the latest click version after release 0.13.1 or later
-           ;; is made (see:
-           ;; https://github.com/trezor/trezor-firmware/issues/2199).
-           python-click-7
-           python-construct
+           python-click
+           python-construct-classes
            python-ecdsa
            python-hidapi
            python-libusb1
            python-mnemonic
            python-requests
            python-typing-extensions))
-    (native-inputs
-     ;; For tests.
+    (native-inputs ; Only needed for running the tests
      (list protobuf
            python-black
            python-isort
+           python-pillow
            python-protobuf
            python-pyqt
-           python-pytest))
+           python-pytest
+           python-simple-rlp
+           python-wheel))
     (home-page "https://github.com/trezor/python-trezor")
     (synopsis "Python library for communicating with TREZOR Hardware Wallet")
     (description "@code{trezor} is a Python library for communicating with
-- 
2.41.0

Attila Lendvai wrote on 4 Sep 2023 12:40

[PATCH v4 5/8] gnu: python-trezor-agent: Update to 0.14.7.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:9f2dfbe5b539f54f33e866affed74334c78a91e9.1693824046.git.attila@lendvai.name

* gnu/packages/finance.scm (python-trezor-agent) [native-inputs]: Add
python-bech32 and python-cryptography.
---
 gnu/packages/finance.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Toggle diff (39 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index ea7678e852..5f3b35e754 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -923,7 +923,7 @@ (define-public python-trezor-agent
   ;; the toplevel app called trezor-agent.
   (package
     (name "python-trezor-agent")
-    (version "0.14.4")
+    (version "0.14.7")
     (source
      (origin
        (method git-fetch)
@@ -932,7 +932,7 @@ (define-public python-trezor-agent
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l"))))
+        (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -960,8 +960,12 @@ (define-public python-trezor-agent
            python-semver
            python-unidecode
            python-wheel))
-    (native-inputs
-     (list gnupg python-mock python-pytest))
+    (native-inputs ; Only needed for running the tests
+     (list gnupg
+           python-bech32
+           python-cryptography
+           python-mock
+           python-pytest))
     (home-page "https://github.com/romanz/trezor-agent")
     (synopsis "Use hardware wallets as SSH and GPG agent")
     (description
-- 
2.41.0

Attila Lendvai wrote on 4 Sep 2023 12:40

[PATCH v4 7/8] gnu: trezord: Update to 2.0.33.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:8983bd937a02f65970429e4ffb6c9b03fb5ccf98.1693824046.git.attila@lendvai.name

* gnu/packages/finance.scm (trezord): Update version and hash, specify go-1.20
as the compiler.
---
 gnu/packages/finance.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 5695ec4b63..8e34064201 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1648,7 +1648,7 @@ (define-public trezord-udev-rules
 (define-public trezord
   (package
     (name "trezord")
-    (version "2.0.31")
+    (version "2.0.33")
     (source
      (origin
        (method git-fetch)
@@ -1656,11 +1656,13 @@ (define-public trezord
              (url "https://github.com/trezor/trezord-go")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "130nhk1pnr3xx9qkcij81mm3jxrl5zvvdqhvrgvrikqg3zlb6v5b"))
+        (base32 "0nnfh9qkb8ljajkxwrn3nn85zrsw10hp7c5i4zh60qgfyl0djppw"))
        (file-name (git-file-name name version))))
     (build-system go-build-system)
     (arguments
-     '(#:import-path "github.com/trezor/trezord-go"))
+     `(#:import-path "github.com/trezor/trezord-go"
+       ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca
+       #:go ,go-1.20))
     (native-inputs
      `(("github.com/gorilla-csrf" ,go-github-com-gorilla-csrf)
        ("github.com/gorilla/handlers" ,go-github-com-gorilla-handlers)
-- 
2.41.0

Attila Lendvai wrote on 4 Sep 2023 12:40

[PATCH v4 6/8] gnu: trezor-agent: Fix build, change versioning scheme.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:24e3985f1802d9c2163a8a4e6ca6f68543416c30.1693824046.git.attila@lendvai.name

Clarify the versioning of the package in a comment, so that later updates will
not pick the wrong version number.

* gnu/packages/finance.scm (trezor-agent): Copy version from
python-trezor-agent which effectively updates it from 0.14.4 to 0.14.7.  Copy
the origin also from python-trezor-agent to effectively sync the source and
the version of the two packages; something that upstream will also do in
future releases.
[native-inputs]: Add missing python-bech32 and python-simple-rlp so that the
test suite runs clean and the build finishes.
---
 gnu/packages/finance.scm | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

Toggle diff (72 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 5f3b35e754..5695ec4b63 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1206,21 +1206,21 @@ (define-public ledger-agent
 (define-public trezor-agent
   (package
     (name "trezor-agent")
-    (version "0.14.4")
+    ;; There are multiple Python apps/packages in the same git repo.  The git
+    ;; tag seems to track libagent's version (which is called
+    ;; python-trezor-agent in the Guix namespace). Currently trezor-agent's
+    ;; version is set in `agents/trezor/setup.py` to a different value than
+    ;; libagent, but as discussed with upstream in issue
+    ;; https://github.com/romanz/trezor-agent/issues/369, we are copying our
+    ;; version from that of libagent.
+    (version (package-version python-trezor-agent))
     (source
      (origin
        (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/romanz/trezor-agent")
-             ;; The version mismatch is not a mistake.  Multiple Python
-             ;; apps/packages are in the same git repo, and they have
-             ;; different versions.  The git tag seems to track libagent,
-             ;; i.e. python-trezor-agent in the Guix namespace.  See
-             ;; e.g. ./agents/trezor/setup.py.
-             (commit "v0.14.4")))
+       (uri (origin-uri (package-source python-trezor-agent)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l"))
+        (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0"))
        (modules
         '((guix build utils)
           (ice-9 ftw)
@@ -1239,13 +1239,16 @@ (define-public trezor-agent
                                     (string-append "./" file-name)))
                      (scandir "./agents/trezor/"
                               (negate (cut member <> '("." "..") string=))))
-           (delete-file-recursively "./agents")))))
+           (delete-file-recursively "./agents")
+           ;; Without deleting ./contrib the sanity-check phase fails. Reported
+           ;; upstream as https://github.com/romanz/trezor-agent/issues/429.
+           (delete-file-recursively "./contrib")
+           ;; Without deleting ./libagent setuptools complains as follows:
+           ;; "error: Multiple top-level packages discovered in a flat-layout: ['contrib', 'libagent']."
+           (delete-file-recursively "./libagent")))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         ;; This package only has a Python script, not a Python module, so the
-         ;; sanity-check phase can't work.
-         (delete 'sanity-check)
          (add-after 'unpack 'relax-requirements
            (lambda _
              (substitute* "setup.py"
@@ -1268,8 +1271,10 @@ (define-public trezor-agent
     (build-system python-build-system)
     (inputs
      (list python-trezor python-trezor-agent))
-    (native-inputs
-     (list python-attrs))
+    (native-inputs ; Only needed for running the tests
+     (list python-attrs
+           python-bech32
+           python-simple-rlp))
     (home-page "https://github.com/romanz/trezor-agent")
     (synopsis "Using Trezor as hardware SSH/GPG agent")
     (description "This package allows using Trezor as a hardware SSH/GPG
-- 
2.41.0

Attila Lendvai wrote on 4 Sep 2023 12:40

[PATCH v4 8/8] gnu: trezord: use new format for native-inputs.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:e4031925a7be86654db7bb138a3a0a66183c0033.1693824046.git.attila@lendvai.name

---

gnu/packages/finance.scm | 8 ++++----

1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (21 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 8e34064201..d40d6567a7 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1664,10 +1664,10 @@ (define-public trezord
        ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca
        #:go ,go-1.20))
     (native-inputs
-     `(("github.com/gorilla-csrf" ,go-github-com-gorilla-csrf)
-       ("github.com/gorilla/handlers" ,go-github-com-gorilla-handlers)
-       ("github.com/gorilla/mux" ,go-github-com-gorilla-mux)
-       ("gopkg.in/natefinch/lumberjack.v2" ,go-gopkg-in-natefinch-lumberjack.v2)))
+     (list go-github-com-gorilla-csrf
+           go-github-com-gorilla-handlers
+           go-github-com-gorilla-mux
+           go-gopkg-in-natefinch-lumberjack.v2))
     (home-page "https://trezor.io")
     (synopsis "Trezor Communication Daemon aka Trezor Bridge (written in Go)")
     (description "This allows a Trezor hardware wallet to communicate to the
-- 
2.41.0

Attila Lendvai wrote on 4 Sep 2023 12:40

[PATCH v4 2/8] gnu: python-daemon: Update to 3.0.1.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:084aa848ce998e56bb13afa235afacbf9fd56736.1693824046.git.attila@lendvai.name

* gnu/packages/python-xyz.scm (python-daemon)[arguments]<adjust-tests>: Drop
workaround for hasattr.  Also disable “test_exception_types” and
“test_exception_instance”.
---
 gnu/packages/python-xyz.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Toggle diff (46 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 69551fab09..5cc966c591 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5610,7 +5610,7 @@ (define-public python-joblib
 (define-public python-daemon
   (package
     (name "python-daemon")
-    (version "2.3.0")
+    (version "3.0.1")
     (source
      (origin
        (method git-fetch)
@@ -5619,22 +5619,22 @@ (define-public python-daemon
              (commit (string-append "release/" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ysynb1m9vsww2nmhcypkk08xwifc3gw5yq10h1a1i11yn27w4y6"))))
+        (base32 "0kc7ig5nlbvc3xzkpiw4jv2gvi5c05fa7qa3mi6qwxa6bx8bxjl8"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
          (add-before 'check 'adjust-tests
            (lambda _
-             ;; Drop use of testtools.helpers.safe_hasattr which has
-             ;; been removed in favor of hasattr.
-             (substitute* "test/test_metadata.py"
-               (("testtools\\.helpers\\.safe_hasattr")
-                "hasattr"))
-             ;; FIXME: Determine why test fails
+             ;; FIXME: Determine why these tests fail
              (substitute* "test/test_daemon.py"
                (("test_detaches_process_context")
-                "skip_test_detaches_process_context")))))))
+                "skip_test_detaches_process_context"))
+             (substitute* "test/scaffold.py"
+               (("test_exception_types")
+                "skip_test_exception_types")
+               (("test_exception_instance")
+                "skip_test_exception_instance")))))))
     (propagated-inputs
      (list python-lockfile))
     (native-inputs
-- 
2.41.0

Attila Lendvai wrote on 27 Sep 2023 17:47

[PATCH v5 1/6] gnu: Add python-construct-classes.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:d44a10d0a4db07fb2834a25a8639c55da9ae2317.1695829651.git.attila@lendvai.name

* gnu/packages/python-xyz.scm (python-construct-classes): New variable.

---

annoyingly enough, python-daemon has been fixed by someone else in master,

even though it's been failing to build for *months*, and i've sent a fix

also months ago. now, not only mbakke had to do the same changes again

(he hasn't seen my patch, looking at you debbugs...), i also had to

rebase my work once again.

nothing demotivates me more than a sense of futility...

so, once again, please find v5 below.

gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (321 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index be03c2a7da..f3cf251f5c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -834,6 +834,31 @@ (define-public python-colorful
 as functions or string constants to form colored terminal output.")
     (license license:expat)))
 
+(define-public python-construct-classes
+  (package
+    (name "python-construct-classes")
+    (version "0.1.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/matejcik/construct-classes")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fmr8nfg543lyqk4164a52jb6lwpq98radicbkhhdfckq9lib2wp"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs
+     (list python-construct))
+    (native-inputs
+     (list python-poetry-core
+           python-pytest))
+    (home-page "https://github.com/matejcik/construct-classes")
+    (synopsis "Parse binary structs into dataclasses")
+    (description "This package provides a parser to parse binary structs
+into dataclasses.")
+    (license license:expat)))
+
 (define-public python-yaspin
   (package
     (name "python-yaspin")

base-commit: 5e9db8ad3f3ba91d94f98d5b4229d01ace3b3f5a
prerequisite-patch-id: 7b8848d550d16807e196f3aaa219557b7cb8cd06
prerequisite-patch-id: b9a4bb040bf63488d76ba773968375d0e29baa8c
prerequisite-patch-id: c34426bfef46a1fd7f4fb0824ceeb608800aa20c
prerequisite-patch-id: 9053a76797798344b5ce61756bc7048a227f9399
prerequisite-patch-id: c4e28901b4995430a553284d4a8889172203ae65
prerequisite-patch-id: 5777f58093a15b55627389d2fc150df112aef771
prerequisite-patch-id: c04ee7e58fdfd57ec20dd6810a52f7650948a579
prerequisite-patch-id: e94ecd3c107e4c63c658a5fe56015b8bf3176c27
prerequisite-patch-id: db4d32d59a5582f0ed3d20d572fb50a0305c9b5b
prerequisite-patch-id: f18e5f68b072b6554aec1dccbf168ab00ca4c68d
prerequisite-patch-id: c00595819eee09b8f64ae29977c1536b2c282b88
prerequisite-patch-id: 2322b3b5ce79bdaa763075cdbb96e760168d4c63
prerequisite-patch-id: 5a948e58c6812479e27aa4ea8a03196260010f23
prerequisite-patch-id: 463e37e8cb14b0d05ea0cf9f8e646f648041aecf
prerequisite-patch-id: 6e6aa6aa49ade856fad3aabe5a4738da12cfbe83
prerequisite-patch-id: 9b9670c3a7127b5ca3e53a35e902d765c31b1c3e
prerequisite-patch-id: 22f1188138bdc587710d5f092df7569bc7cef455
prerequisite-patch-id: 6b29b149447eb454abd48365379fb33293018d50
prerequisite-patch-id: 4542d770619a41b740050686c03d1408278d2eca
prerequisite-patch-id: 4e52c597dec5fb16432a2dccae0c659417d8f714
prerequisite-patch-id: 2b596a1daa588b4a8b3bcd1b6cfca9b1c6005949
prerequisite-patch-id: a0514e6994eccfa19631b6dc7e207de6a9a76977
prerequisite-patch-id: 6339420540702ff1e3664c8fd84a882524a42511
prerequisite-patch-id: 13b46f0cb6dbe0a5c28219b9340fe25a13b7cb0a
prerequisite-patch-id: f702ee7908ff1f664ca68949c2c01622611fe592
prerequisite-patch-id: 80d1fed622f0306a9ff2f0ca55ed10a24b7f283a
prerequisite-patch-id: f7a8725b14c149069870cbeec4973f93ae2f71bb
prerequisite-patch-id: ffc48ebc601a7a590326ceba5ec4be31ea1dcda3
prerequisite-patch-id: 9e36228935f71e1996432d567242fbbf4fc1870b
prerequisite-patch-id: 7ba6c500aac45c64085dd4aeccec6a8c32b6761f
prerequisite-patch-id: a04c8addf7fd256100207d49f3a8b43695376db0
prerequisite-patch-id: 228b818d474371f7951ca13e5a1c03d510cc69a3
prerequisite-patch-id: 6129bda9a3955f54bee13de95f0df79a0fa1f293
prerequisite-patch-id: 021e35120d5e999c87b5595bf95327389d023b44
prerequisite-patch-id: 4114afccd9cd57554a2d72d1790fd86dc81ea332
prerequisite-patch-id: ccf6201b074f72a39d8316e4212be3eb6a95dfe6
prerequisite-patch-id: e66271b3dc8c462498d68ca9beb273ce0f14df44
prerequisite-patch-id: 83ed1d8c6caed9fd9d62b0869b97895f323f4beb
prerequisite-patch-id: 476dee9d91e699a0a94ad90b4cd107536610fd1c
prerequisite-patch-id: fb61ed6bb853a722fd2b2a87f1722d29ce2e5275
prerequisite-patch-id: 6e959d9c18a47f73a884dd8a45f247755b803b8d
prerequisite-patch-id: 587c89fa3f3bb8f33e0df656793121e6cdca4de2
prerequisite-patch-id: c0bdedcb95ea290b7036b5239646ab8737ee8fc3
prerequisite-patch-id: 4653095cc42bfe83fb84ce39153d654dd978e266
prerequisite-patch-id: 3a608773b8cb7bc3412694d5ca199b8f629d8260
prerequisite-patch-id: afc5306ed6431f67cb5acb7e35d06d3149dd24bb
prerequisite-patch-id: c1aff03b799213ed4a5e27022b8a0bb704677bfd
prerequisite-patch-id: 6d0a606ec0f4791b9f7804fe811ddc247a94fc3d
prerequisite-patch-id: 1c282f720a5ade12d9d8cdc574fc321b4d29fbec
prerequisite-patch-id: 17b490d8ce892558026245b009ebda7a32c8cbea
prerequisite-patch-id: c9162290fa29df5c020b99a38ac2a8dc6a78ef05
prerequisite-patch-id: a6b89688a03e41460d1332acfdeb8abd9980e7e5
prerequisite-patch-id: a7e88bbe57e9330efcaf2023d1a3d3a6d681dd07
prerequisite-patch-id: a878b8d1c6d10c196d0a8bf3c0d1379f0ce1849b
prerequisite-patch-id: 9a9aa3e05efea3b0119c0a1d6f05b15d3aaea520
prerequisite-patch-id: 38ecd7f18321a1a16649aa91db9cd693822b12e3
prerequisite-patch-id: 3120ea8a7379e50940f3755a54a0ec6b8ec6f1fa
prerequisite-patch-id: eabed58e9b75568f97ce8f5308b9b9b32287842a
prerequisite-patch-id: fac75558dfdbe970dc002d809677d29f4fe41b07
prerequisite-patch-id: c2c309167dcb2b216895eb7c2234b68aed2ff98a
prerequisite-patch-id: ac6af13950465adee68af43bb5e21d25bc1b84f8
prerequisite-patch-id: 42859de151a75a1c73dabf12e83a3f0cc94fc0e0
prerequisite-patch-id: 40e51037623c726605c7bb8a6df201d3c666f779
prerequisite-patch-id: 52fff9e6cf12b9810f2ef690e55bd2d64eda4bef
prerequisite-patch-id: 638ffa9c177da9518c80f08304ad4c5e86e594fa
prerequisite-patch-id: 245c5fbda318a158b3f70f01cb1d470b7c28cf27
prerequisite-patch-id: f7e9314697d4b59996b28947c3417f6d281c8301
prerequisite-patch-id: 3bd4fccedc1059a8b4f1294dd2241c42e1b0ef4d
prerequisite-patch-id: 73e24e9fbba69174f264c67d30abd2638d7977ee
prerequisite-patch-id: 8e036a627f55231cf78380283facaca8c6e52b22
prerequisite-patch-id: 4366ac15a66d13aa85eea4c7c9595ccf0523b73a
prerequisite-patch-id: 4220f7dccaaf6bec94ec4e66093ed0bdf28bf62a
prerequisite-patch-id: 2a3176f1db0f82acb7616d761e3e97063102df73
prerequisite-patch-id: f3f988cff2fd6d7e07adc92a0abbc9f4b29c8b3f
prerequisite-patch-id: 5ce1b26262826bdb50c7cc79e73de0fe97ce96da
prerequisite-patch-id: 61cf532100b5d67492620f11db9e4eeb4ef446f2
prerequisite-patch-id: 898f7dd88f389f79b423783fc1f3b0bf4bc1b1a4
prerequisite-patch-id: c2af88d6e2aae019f3468686b27e852e84875932
prerequisite-patch-id: 38f200eed08fe1122f38aec6c442bd515bb16353
prerequisite-patch-id: c59eddc5985b8dbac06dcac800abbc550e46e960
prerequisite-patch-id: f9fff03283b150da3759e6b7246dea9a65c214ab
prerequisite-patch-id: ae07a0422ac88c3da3a8fdd1052b160a23348885
prerequisite-patch-id: f76580567a6483e1b2d3abb9ca5d7e03ca16f661
prerequisite-patch-id: a74628f1e1a66a7452eb47161a9beec95673115d
prerequisite-patch-id: 212a3e56ce29162a24dedbb7cb4dd48bf9f89694
prerequisite-patch-id: 4f33ce94dc785c11fc0b1a99d3290136042b2a7b
prerequisite-patch-id: e20b2413bef3d007cadc4f44bb76a0aa8d13a6d3
prerequisite-patch-id: e295cdb4816eec4c99940eec831a6ccac5270bed
prerequisite-patch-id: 25cf6e694b01a45286dfdee8fc2a31727b502f55
prerequisite-patch-id: df45da63840202e89fb8d12ee51f468af3ec5d27
prerequisite-patch-id: 0c745b0d95f872289f1c0ee159bc28e0d914243b
prerequisite-patch-id: 808021fa88da189d198d2d3ce82b4842a03276ec
prerequisite-patch-id: 2c2d1af6d8006ff9f680f77af8fc14d988eb7bc6
prerequisite-patch-id: 81f546153359220dbde94e2b678a4c7f8c34ffbc
prerequisite-patch-id: c1a727cab3141db19d076e227ec44870db3acc48
prerequisite-patch-id: fb9c7a1a2f5536deaac190017ebeb7f99bbaf62a
prerequisite-patch-id: a9e7ddc8d6ad160a6fb28067239e41d7ea1caeff
prerequisite-patch-id: c0c0eeafc002963ce3b137c38f2025b1c7fb53be
prerequisite-patch-id: bed38501e0ecc5adb4e7c085126e9cb8362c99f9
prerequisite-patch-id: 844f9f29e74959439fb11aa4c69a78dabad38931
prerequisite-patch-id: aacdc91839331f279c9d4d34eded9c766b69dbbc
prerequisite-patch-id: 5d74639066df5923e347ec74d4b87defccd63eee
prerequisite-patch-id: ef6005049ceb759d527625a601986fe076681dc4
prerequisite-patch-id: c7eb724bf4ffe492a9cfa8ca104688dce1dc8a04
prerequisite-patch-id: 9757bb5615f23d03ab184b6083efed5879af0be0
prerequisite-patch-id: 9bed77455a0603a40e731a55cf7df0cd3258ab01
prerequisite-patch-id: 79490bd64a40d0526673cb34319a7f76fd6fb1bb
prerequisite-patch-id: 78306eef81c3242c8ba45e975f8d7314d11606d5
prerequisite-patch-id: 6d2f318f5a7fa77e011ab7746acf52f5dc82e8a0
prerequisite-patch-id: 2d9031ec3b8c9788eea2993346b8c6576de1ef8a
prerequisite-patch-id: b00181094406fa0eaa17375ffc8ad0e6602391a7
prerequisite-patch-id: aa60fdc20f76074b89fe9e7793d979b1b1dc483e
prerequisite-patch-id: df5aa29ef1202d19a338192ee7288a9896737a44
prerequisite-patch-id: 9c251e23c9b8afa97f7c497d1854ab22ba74a477
prerequisite-patch-id: d568cfdadbcb6dbe4e96793f2582ed615b221d79
prerequisite-patch-id: c33c3b93655866dfb5503097f955de30b869113c
prerequisite-patch-id: 608f99233ba2dd2d4715fbed06a901bbf30e9b58
prerequisite-patch-id: abf59c68f8a0be170e51723b05b0643dab77f4d5
prerequisite-patch-id: 05c98b4aabcaf9a38769c242fe0b5a2b164f23da
prerequisite-patch-id: c78848e67f8bc6b13f1c20d76df4b9d103c655e6
prerequisite-patch-id: 2668ae4ae90dd8c472586150e17af41c49b2d685
prerequisite-patch-id: be54d6bc9ee998fef72ce5e86f831f79aa58fdf0
prerequisite-patch-id: 7b700df82780f27f44af128804ba948fe353340a
prerequisite-patch-id: 24ad5945dab3ae646a59db5728ad8c4e866de3c7
prerequisite-patch-id: 6f593a4d2f8de0dd459c774f46a62e62a35ef48f
prerequisite-patch-id: 7d94a2da60c450e63cfc1a538d4c98eb41ddae5a
prerequisite-patch-id: 4423b75745d681ef7fd41451d5c6d79c4c907884
prerequisite-patch-id: e3b88ff2e48cacfe97552dead523fb9fb75bd775
prerequisite-patch-id: 0fe765db6e059e9d75512c9ff35db041a4ff687d
prerequisite-patch-id: 0fe40443f9162be65deb1af0fce395cc64733a88
prerequisite-patch-id: abb236ba2296e2e58b017cbe2f313fe17a660ada
prerequisite-patch-id: ab954a44e2cb81b1bd91208ee1961cb345c528dc
prerequisite-patch-id: 6c42e8a70f553e6cd6be307cebb6acb1b129774c
prerequisite-patch-id: dedbc9167ad152f8f5e542a0f5a833bb797f1ae0
prerequisite-patch-id: bd946af0f62ba8e3716e7f2e6dd685e7ee05e38e
prerequisite-patch-id: 6499787244d6a753b4e8789c20239f45b53a52d1
prerequisite-patch-id: 927aa2fbdaba9a92ecd64f8de4622dbf2fa86508
prerequisite-patch-id: 43ac7e223504c63294770f49026aeee4581c5f09
prerequisite-patch-id: 7cfd3bd1ae34b4a969d9199eba5d58b8bc2a4a50
prerequisite-patch-id: d437755325f5322c81d1d03927f33d1ba8523d3d
prerequisite-patch-id: 0167a8ce05cf3026a683b9f2e8cc150db76aeb66
prerequisite-patch-id: 60cf9ee9b745bb4ab9e6e084df04b243baf2fe99
prerequisite-patch-id: 123bc33d658bc933691e7ce3a6192cafa0ed2b49
prerequisite-patch-id: d61623eebb5d6b5a96bab2ba2c329ef91888e443
prerequisite-patch-id: 34d2912201b0e17b3914dbbcef7c6d6c4d16700d
prerequisite-patch-id: ad6a0dc665b02b1ade4c41c7ee21c2de20d78be7
prerequisite-patch-id: 9c53edc3426d6f4b1b00873712701d245f46489e
prerequisite-patch-id: 9c9410731fd80d05b5ce69c68f85968a8b568b83
prerequisite-patch-id: 4c66f06e325af287f61d6a581b0093a57d206457
prerequisite-patch-id: c4af6e3384404413ee9ba61a6698c1dec0dfb7d5
prerequisite-patch-id: e946dff45d86b544ad98257851e96528d5fd1b49
prerequisite-patch-id: 8fb0f88a1efab7cea925cf2db9062c89b4323b58
prerequisite-patch-id: e5bdb5fe89e62fe2801026763b4c9ace2dc0aa9b
prerequisite-patch-id: 125ca6b68bcc51f8c7251d7c1b292103b460b0b3
prerequisite-patch-id: 87bc28b3eb5e1a8f9441a1858c8996818834cd65
prerequisite-patch-id: 57d9a940dff95e4bee04a1ad8f6cad7ef554f2ff
prerequisite-patch-id: 8c6c9817b343ddd1d28cb7222bda27bbefc4e9e2
prerequisite-patch-id: eb11999f231fc4f727c6152fbb08cc04eb159bfb
prerequisite-patch-id: c07a93ba4e306f9282dba982f5082fe02dcf6ea1
prerequisite-patch-id: f65dc1bfcab9cbedaeefae4a00100a6d570e1202
prerequisite-patch-id: d1378697b23428207ae4cc2dd608df5808c3c27c
prerequisite-patch-id: 0ccbc046e5c172ea37e7fe808eb72297040eff98
prerequisite-patch-id: dfbc45410f46733a3d380070a81b910b2d7b305d
prerequisite-patch-id: 397d363d2891219fc492d0b5f16e6b70baa93b0f
prerequisite-patch-id: 01eee56f1f2420e733ae33bd39f5dfbb83206aaf
prerequisite-patch-id: b6ad7866b5505bb97ada7a9f753472d579bffe29
prerequisite-patch-id: 3e7c5aa22cc6bb3e339a6ecb409493f1aeb62000
prerequisite-patch-id: 05b64135894b24f6dc13d710f6b772fe217ca160
prerequisite-patch-id: c3d4a6b8329993ccbea640ab1f23683f59fcc299
prerequisite-patch-id: 1cd7ce03c60d65b087e7e32927a3dcb22d917891
prerequisite-patch-id: d2a8e1bc62b0ac6699a9bf5986fe7b2eeaa175cc
prerequisite-patch-id: 1fbc27612d2009eb1b9bbc02df8cf5d60c10225a
prerequisite-patch-id: 67c06616d8e3020a82731f83e2270049a05e06c7
prerequisite-patch-id: 6ecc2a1e3e2162aa57644723718a5a37363205d1
prerequisite-patch-id: 4a044bab9dc9ba88bb37018ef728099cd5be32a4
prerequisite-patch-id: 14e8a915fdd6aa622328a7b2a17b16f3259f8325
prerequisite-patch-id: 7b8586d6d1e65b2c706a0786aeadda0809a65d26
prerequisite-patch-id: 23e1d1ec006c1644efe4116ff43125d50279408d
prerequisite-patch-id: f6fd4ac8c72806e169fc93dc0095995318186791
prerequisite-patch-id: 616bcc41a9f9bcfed23f3aedb532c5f4059f54d3
prerequisite-patch-id: d9d5994805a5acd9dd5c3df21e40d464185ad838
prerequisite-patch-id: d5f7fbf3abb2bddad6441a65fa6ff51482b8d5b2
prerequisite-patch-id: 72612ec4d4a2182441ae14a504668f9538175d8b
prerequisite-patch-id: 9f1c337775791a16aa470f2b965c6e5caa59d183
prerequisite-patch-id: 3628c515672b3893ae23e417f32667a5666701e5
prerequisite-patch-id: 33be6eba0a6983f2925a9d7b7760fe9a1ac8faf2
prerequisite-patch-id: a474125444f1817cfd954e6af9a0015251c7bb8e
prerequisite-patch-id: b52d204923f04aedbe910bb0d2675d664d502933
prerequisite-patch-id: 8154229f9002f256b5ee4a507c178928664eba32
prerequisite-patch-id: ba18045d5ae7ea935f40fcf1effa210dd9f1b321
prerequisite-patch-id: 0e80b64d4c7615714021e7faf3c2e544dcd103df
prerequisite-patch-id: 5fcafa05927b681f5f3be13889fd5d31f98839a3
prerequisite-patch-id: 883848d20b75be623ee41164bbc4f04079e91182
prerequisite-patch-id: 6527835ce58b044caa9e6ec81e0d742acb986f4f
prerequisite-patch-id: d5ddac9e67069c95e60f4b3c1f5cc5d5f67adac3
prerequisite-patch-id: 62e3007c4e8e4b1ceab49c99d23e9780484d528c
prerequisite-patch-id: a1cef0802f37260e23a82f49ab1ef1b652dd9b14
prerequisite-patch-id: 07ee91c31ce7e858371ce2fbbcd892cc2694b762
prerequisite-patch-id: f5990110cbe3f566a6d94d09d41109496078c862
prerequisite-patch-id: aacf55feaaf4e768bded7c5265872275957ba495
prerequisite-patch-id: 9ca6b86aba1769c05df21cbbce267ced45cfdc9a
prerequisite-patch-id: c1264717a9212f8cff5781cfe511bf5d93a2a4bd
prerequisite-patch-id: 8f4cf4e3929ecc29b46e15ba49acaf5007635642
prerequisite-patch-id: c34d92ed451f12eafdd3fd04c8ee6004d1c94489
prerequisite-patch-id: 6b2695f8a785e7b984520f9e3efa30f9be8cb470
prerequisite-patch-id: 015219ef942267456eaf4f8c2991fbb15909930e
prerequisite-patch-id: d9ffe96b5eaa76ae86f03f2788610d9c2525e92d
prerequisite-patch-id: 20077b85de841adebf0858858bbdfeeea671b184
prerequisite-patch-id: f64bd0509da630de44da994df722c2b050f59a62
prerequisite-patch-id: 7f0348585eda25565b1fd4b0b1d8136c6cf5fed6
prerequisite-patch-id: 0069d6449d47d588d3b18aa3076c3ce95d778afe
prerequisite-patch-id: 62aad7be5eb188120f61c4019657ee8f54707811
prerequisite-patch-id: 8f630a211e536f8ea75b42a64ea3d98fb64bfed0
prerequisite-patch-id: b6ba060309b44ba91e9775f217f132d4a30c5636
prerequisite-patch-id: c31539a26842a28424a0c2e3ed6f266d5d95b3f4
prerequisite-patch-id: 11c08ff47211234b9be4a8cbbaf9d543d22ad971
prerequisite-patch-id: f64bd0509da630de44da994df722c2b050f59a62
prerequisite-patch-id: 7f0348585eda25565b1fd4b0b1d8136c6cf5fed6
prerequisite-patch-id: ee2db4df1caa625092cb05ab7990cf0e56b60e73
prerequisite-patch-id: 957e9bec822dab63be5caf18fbe3c4e89b941a27
prerequisite-patch-id: ed66fdfe9cfc6c5b01cee01a55fec9f6fc65cb24
prerequisite-patch-id: 308e3bd69203a7ead59cedbcd8870f58f84e5c48
prerequisite-patch-id: 8755a8b2d430f1c6a5ef84f1b9e0d01c787cfcf0
prerequisite-patch-id: dcae733aa36acc93159697c9163d39ec461c8f8b
prerequisite-patch-id: 35f5ac7cde006b0e5469b84dd891266be6758b6e
prerequisite-patch-id: 0d9dc3b32cbe83f110267b95f68269bda3ac3e38
prerequisite-patch-id: 38765a45ab60566a68f9221a364d5f6e09de3fc3
prerequisite-patch-id: 4112c25d3b53ade119501b0025fa9423c32e7896
prerequisite-patch-id: eccf954b0711813fe7ebefc8e4f613285bba50bf
prerequisite-patch-id: 3a4658448cd5af84faab3dd5fe98f1cea34f608e
prerequisite-patch-id: 6ebc47305f89ce05ab7c9078cabd774de913377f
prerequisite-patch-id: 2d8e921be23473c9e823bb34d006e2c23946715d
prerequisite-patch-id: 11fe65789d5c6f2a721e21d199f62758bd4eb4c8
prerequisite-patch-id: e1e560b388f317647851efb8ca91aaa9fe4bc2b6
prerequisite-patch-id: dfdc0c44741cbe5a6cc1466706276953a503dae2
prerequisite-patch-id: 21af8efa1d7de42cc8a7912c0ca44423926a62f3
prerequisite-patch-id: 5301201453798a8040ea84971c43682dce1aa182
prerequisite-patch-id: 795d20e3f1221955d408ebc4b6024b1a377c6795
prerequisite-patch-id: 018e8c43c9f682e64c562c16baa063f464da9680
prerequisite-patch-id: ddc156e819081cfff4e96741aa4d2b751dac279a
prerequisite-patch-id: 2b908e1fb84fe01c126244a3e2fd63a9be699be6
prerequisite-patch-id: f4925b34ea00dbf4115d2a19ccd65795c36db187
prerequisite-patch-id: aa1845eb46d3c05b4954111556deb6a8ae9239f5
prerequisite-patch-id: 889922dd8580bd7cf9010d83bd2e9b136340ad32
prerequisite-patch-id: f10438033dda85154d9345e650ae1baab88d8956
prerequisite-patch-id: cdc2e967510b1410f6a3a8e6b9cc70cf918066f9
prerequisite-patch-id: 1319d98fced47742864fbc020a4835304393f4e7
prerequisite-patch-id: 5b9a927ccb01b459dbf3254f35ce88ded99602f8
prerequisite-patch-id: 8adad5b93ba0ba4c39fb9f4f02ad3d2dcf5c2649
prerequisite-patch-id: bd40b81eed55db654df237fdee206ca3247540c5
prerequisite-patch-id: 7fd1453ed214523670e5e77cfe6dd09dc85ca115
prerequisite-patch-id: 87999a6349374a9e996aeae5c3866b06d766d2a4
prerequisite-patch-id: 9044aff11b3466bcc9ebb1616a6e9ef02ce0162c
prerequisite-patch-id: fcc09f25b1f4a2e5211c759e59dd3e7b7a0f0450
prerequisite-patch-id: bf96b7fb803e3dae84889868f555d163999f3b81
prerequisite-patch-id: 30211918eb5d019091d7fe68ba4e7a0e6c8fb9e3
prerequisite-patch-id: 38c5cfd08148e024ac85bb722bedcec21b1e3347
prerequisite-patch-id: 8c3d2db87e654b0056d89e54b2c5b4e367b2e036
prerequisite-patch-id: 2b6fcca647c098cdd225039fa2b513f178ade225
prerequisite-patch-id: 87eda615d2df9db3cc48224a5359e8e83823ff77
prerequisite-patch-id: eb8b5d90ae7597e606e492411238bdde2eb9c587
prerequisite-patch-id: a04adc3bbbbd5cb89e0a1944b7f4e37d246a027e
prerequisite-patch-id: 4f2c9db30edea7c74bf1ba39327162cf6a0ed400
prerequisite-patch-id: 223f4ec5eb5597e0b942a1eb6df7baa2346a6957
prerequisite-patch-id: 41278aa0b67aadf83bca1c910bf9073d6e86bac7
prerequisite-patch-id: d99309339d40d3a75a5ab8a13321fab023afc2a1
prerequisite-patch-id: b4261ea65f64418b79922d824acb9a5c0bbe5104
prerequisite-patch-id: ef251a37a5773e4faaca0e73ba82fa12412b2e85
prerequisite-patch-id: 81968c488f385d2bff2e04fc273f400d2e72e736
prerequisite-patch-id: d840976393289f0114e3dd77bc96275b68e34027
prerequisite-patch-id: 36c891fed5cbc26539b5c6f9bf299f591229534b
prerequisite-patch-id: 2ff340e458a24ed5680c3e584871637959e30885
prerequisite-patch-id: f044d956960745bdc99193ed46df601a4dbba54f
prerequisite-patch-id: e53a51c2d24b2896cf6009111ea5460d59eeddb1
prerequisite-patch-id: 4d231069522ad6ede423188d927cb301f663cbbd
prerequisite-patch-id: 597459b29f0884f0691f8f2bd759ea6b5d0483e1
prerequisite-patch-id: fdcc21e6fb347c225f20c10ef968bfac9fe959c2
prerequisite-patch-id: 6b397463ea7d256960bb872f6b18ec182208f2b9
prerequisite-patch-id: 28cf1e676b2532bf39ef0c9fbd8da4a9fbe0be4f
prerequisite-patch-id: 1a7f88a8ea7d447cd8f3e66ccd9371622a1a1c38
prerequisite-patch-id: bc466c14a6183e6f76bab3b6410cf88b71d4b533
prerequisite-patch-id: a5f003a977afba09c9e6e69cc3f36056a08e7c30
prerequisite-patch-id: 90ea83a

This message was truncated. Download the full message here.

Attila Lendvai wrote on 27 Sep 2023 17:47

[PATCH v5 3/6] gnu: python-trezor-agent: Update to 0.14.7.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:961dcc5b438a22d38424df0e20817d1327c6b9c3.1695829651.git.attila@lendvai.name

* gnu/packages/finance.scm (python-trezor-agent) [native-inputs]: Add
python-bech32 and python-cryptography.
---
 gnu/packages/finance.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Toggle diff (39 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 3a196bd783..8194b660f3 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -923,7 +923,7 @@ (define-public python-trezor-agent
   ;; the toplevel app called trezor-agent.
   (package
     (name "python-trezor-agent")
-    (version "0.14.4")
+    (version "0.14.7")
     (source
      (origin
        (method git-fetch)
@@ -932,7 +932,7 @@ (define-public python-trezor-agent
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l"))))
+        (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -960,8 +960,12 @@ (define-public python-trezor-agent
            python-semver
            python-unidecode
            python-wheel))
-    (native-inputs
-     (list gnupg python-mock python-pytest))
+    (native-inputs ; Only needed for running the tests
+     (list gnupg
+           python-bech32
+           python-cryptography
+           python-mock
+           python-pytest))
     (home-page "https://github.com/romanz/trezor-agent")
     (synopsis "Use hardware wallets as SSH and GPG agent")
     (description
-- 
2.41.0

Attila Lendvai wrote on 27 Sep 2023 17:47

[PATCH v5 2/6] gnu: python-trezor: Update to 0.13.7.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:bee735593c9b737b0a1527c592b471eb91ba4501.1695829651.git.attila@lendvai.name

* gnu/packages/finance.scm (python-trezor) [propagated-inputs]: Drop
python-click-7 kludge, add python-construct-classes instead of
python-construct.
[native-inputs]: Adjust for the tests to run cleanly.
---
 gnu/packages/finance.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Toggle diff (57 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 78bd55fc15..3a196bd783 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1092,7 +1092,7 @@ (define-public python-btchip-python
 (define-public python-trezor
   (package
     (name "python-trezor")
-    (version "0.13.0")
+    (version "0.13.7")
     (source
      (origin
        (method git-fetch)
@@ -1101,7 +1101,7 @@ (define-public python-trezor
              (commit (string-append "python/v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1wy584bxx5p2av4lv1bx9hl1q0b5n7hqz0hnqb9shjriarvl5ckd"))
+        (base32 "13wyl9b15c8iscfakprwfvh2akw180hfqdjww79b78ywz51y7hdh"))
        (modules
         '((guix build utils)
           (srfi srfi-26)
@@ -1127,25 +1127,24 @@ (define-public python-trezor
     (build-system python-build-system)
     (propagated-inputs
      (list python-attrs
-           ;; TOOD: Use the latest click version after release 0.13.1 or later
-           ;; is made (see:
-           ;; https://github.com/trezor/trezor-firmware/issues/2199).
-           python-click-7
-           python-construct
+           python-click
+           python-construct-classes
            python-ecdsa
            python-hidapi
            python-libusb1
            python-mnemonic
            python-requests
            python-typing-extensions))
-    (native-inputs
-     ;; For tests.
+    (native-inputs ; Only needed for running the tests
      (list protobuf
            python-black
            python-isort
+           python-pillow
            python-protobuf
            python-pyqt
-           python-pytest))
+           python-pytest
+           python-simple-rlp
+           python-wheel))
     (home-page "https://github.com/trezor/python-trezor")
     (synopsis "Python library for communicating with TREZOR Hardware Wallet")
     (description "@code{trezor} is a Python library for communicating with
-- 
2.41.0

Attila Lendvai wrote on 27 Sep 2023 17:47

[PATCH v5 5/6] gnu: trezord: Update to 2.0.33.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:f43f1a0798e90c9a0134be6376947d8f52ef0b92.1695829651.git.attila@lendvai.name

* gnu/packages/finance.scm (trezord): Update version and hash, specify go-1.20
as the compiler.
---
 gnu/packages/finance.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 76096ab643..4e4f9c8dc2 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1663,7 +1663,7 @@ (define-public trezord-udev-rules
 (define-public trezord
   (package
     (name "trezord")
-    (version "2.0.31")
+    (version "2.0.33")
     (source
      (origin
        (method git-fetch)
@@ -1671,11 +1671,13 @@ (define-public trezord
              (url "https://github.com/trezor/trezord-go")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "130nhk1pnr3xx9qkcij81mm3jxrl5zvvdqhvrgvrikqg3zlb6v5b"))
+        (base32 "0nnfh9qkb8ljajkxwrn3nn85zrsw10hp7c5i4zh60qgfyl0djppw"))
        (file-name (git-file-name name version))))
     (build-system go-build-system)
     (arguments
-     '(#:import-path "github.com/trezor/trezord-go"))
+     `(#:import-path "github.com/trezor/trezord-go"
+       ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca
+       #:go ,go-1.20))
     (native-inputs
      `(("github.com/gorilla-csrf" ,go-github-com-gorilla-csrf)
        ("github.com/gorilla/handlers" ,go-github-com-gorilla-handlers)
-- 
2.41.0

Attila Lendvai wrote on 27 Sep 2023 17:47

[PATCH v5 4/6] gnu: trezor-agent: Fix build, change versioning scheme.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:24be12063019018fbaeacfe80e1539d69829b2cd.1695829651.git.attila@lendvai.name

Clarify the versioning of the package in a comment, so that later updates will
not pick the wrong version number.

* gnu/packages/finance.scm (trezor-agent): Copy version from
python-trezor-agent which effectively updates it from 0.14.4 to 0.14.7.  Copy
the origin also from python-trezor-agent to effectively sync the source and
the version of the two packages; something that upstream will also do in
future releases.
[native-inputs]: Add missing python-bech32 and python-simple-rlp so that the
test suite runs clean and the build finishes.
---
 gnu/packages/finance.scm | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

Toggle diff (72 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 8194b660f3..76096ab643 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1206,21 +1206,21 @@ (define-public ledger-agent
 (define-public trezor-agent
   (package
     (name "trezor-agent")
-    (version "0.14.4")
+    ;; There are multiple Python apps/packages in the same git repo.  The git
+    ;; tag seems to track libagent's version (which is called
+    ;; python-trezor-agent in the Guix namespace). Currently trezor-agent's
+    ;; version is set in `agents/trezor/setup.py` to a different value than
+    ;; libagent, but as discussed with upstream in issue
+    ;; https://github.com/romanz/trezor-agent/issues/369, we are copying our
+    ;; version from that of libagent.
+    (version (package-version python-trezor-agent))
     (source
      (origin
        (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/romanz/trezor-agent")
-             ;; The version mismatch is not a mistake.  Multiple Python
-             ;; apps/packages are in the same git repo, and they have
-             ;; different versions.  The git tag seems to track libagent,
-             ;; i.e. python-trezor-agent in the Guix namespace.  See
-             ;; e.g. ./agents/trezor/setup.py.
-             (commit "v0.14.4")))
+       (uri (origin-uri (package-source python-trezor-agent)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l"))
+        (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0"))
        (modules
         '((guix build utils)
           (ice-9 ftw)
@@ -1239,13 +1239,16 @@ (define-public trezor-agent
                                     (string-append "./" file-name)))
                      (scandir "./agents/trezor/"
                               (negate (cut member <> '("." "..") string=))))
-           (delete-file-recursively "./agents")))))
+           (delete-file-recursively "./agents")
+           ;; Without deleting ./contrib the sanity-check phase fails. Reported
+           ;; upstream as https://github.com/romanz/trezor-agent/issues/429.
+           (delete-file-recursively "./contrib")
+           ;; Without deleting ./libagent setuptools complains as follows:
+           ;; "error: Multiple top-level packages discovered in a flat-layout: ['contrib', 'libagent']."
+           (delete-file-recursively "./libagent")))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         ;; This package only has a Python script, not a Python module, so the
-         ;; sanity-check phase can't work.
-         (delete 'sanity-check)
          (add-after 'unpack 'relax-requirements
            (lambda _
              (substitute* "setup.py"
@@ -1268,8 +1271,10 @@ (define-public trezor-agent
     (build-system python-build-system)
     (inputs
      (list python-trezor python-trezor-agent))
-    (native-inputs
-     (list python-attrs))
+    (native-inputs ; Only needed for running the tests
+     (list python-attrs
+           python-bech32
+           python-simple-rlp))
     (home-page "https://github.com/romanz/trezor-agent")
     (synopsis "Using Trezor as hardware SSH/GPG agent")
     (description "This package allows using Trezor as a hardware SSH/GPG
-- 
2.41.0

Attila Lendvai wrote on 27 Sep 2023 17:47

[PATCH v5 6/6] gnu: trezord: use new format for native-inputs.

Recipients:(address . 65037@debbugs.gnu.org)(name . Attila Lendvai)(address . attila@lendvai.name)

Message-ID:56974ce1e516b00472d956de041d21a90ff2fcee.1695829651.git.attila@lendvai.name

---

gnu/packages/finance.scm | 8 ++++----

1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (21 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 4e4f9c8dc2..862618f731 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1679,10 +1679,10 @@ (define-public trezord
        ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca
        #:go ,go-1.20))
     (native-inputs
-     `(("github.com/gorilla-csrf" ,go-github-com-gorilla-csrf)
-       ("github.com/gorilla/handlers" ,go-github-com-gorilla-handlers)
-       ("github.com/gorilla/mux" ,go-github-com-gorilla-mux)
-       ("gopkg.in/natefinch/lumberjack.v2" ,go-gopkg-in-natefinch-lumberjack.v2)))
+     (list go-github-com-gorilla-csrf
+           go-github-com-gorilla-handlers
+           go-github-com-gorilla-mux
+           go-gopkg-in-natefinch-lumberjack.v2))
     (home-page "https://trezor.io")
     (synopsis "Trezor Communication Daemon aka Trezor Bridge (written in Go)")
     (description "This allows a Trezor hardware wallet to communicate to the
-- 
2.41.0

Guillaume Le Vaillant wrote on 3 Oct 2023 16:04

Re: [bug#65037] [PATCH v5 1/6] gnu: Add python-construct-classes.

Recipients:(name . Attila Lendvai)(address . attila.lendvai@gmail.com)

Message-ID:87wmw3n6ku.fsf@kitej

Patches applied as 8036852533b26ce48e82272042ee3ac2a9974ec5 and
following with a few minor modifications (added copyright lines,
modified some commit messages).
Thanks.

-----BEGIN PGP SIGNATURE-----

iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCZRwf8Q8cZ2x2QHBvc3Rl

by5uZXQACgkQa+ggit8h/j96AQD+If43/C5FYrcuqBIHlBNyZmCrp25CPq60SU7I

qCgQ8EwA/iI22IXLt8tTcEGH8ra9Q4bZUrZTI3798J2xzvWhzEXS

=HOED

-----END PGP SIGNATURE-----

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 65037@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 65037

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date