From: Attila Lendvai <attila.lendvai@gmail.com>
To: 65037@debbugs.gnu.org
Cc: Attila Lendvai <attila@lendvai.name>
Subject: [bug#65037] [PATCH 6/7] gnu: trezor-agent: Fix build, update versioning, and the git tag.
Date: Thu, 3 Aug 2023 15:11:34 +0200 [thread overview]
Message-ID: <ff882aba8ce58e3f1d2973f2728f382288e0bab7.1691068294.git.attila@lendvai.name> (raw)
In-Reply-To: <166ac1d1fb684844adf1370771870b3cd95bd14d.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(-)
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
next prev parent reply other threads:[~2023-08-03 13:13 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-03 12:53 [bug#65037] Fix python-daemon, Trezor support Attila Lendvai
2023-08-03 13:11 ` [bug#65037] [PATCH 1/7] gnu: python-daemon: Use the git repo as source instead of pypi Attila Lendvai
2023-08-03 13:11 ` [bug#65037] [PATCH 2/7] gnu: python-daemon: Update to 3.0.1 Attila Lendvai
2023-08-26 19:02 ` Liliana Marie Prikler
2023-08-03 13:11 ` [bug#65037] [PATCH 3/7] gnu: Add python-construct-classes Attila Lendvai
2023-08-03 13:11 ` [bug#65037] [PATCH 4/7] gnu: python-trezor: Update to 0.13.7 Attila Lendvai
2023-08-26 19:07 ` Liliana Marie Prikler
2023-08-03 13:11 ` [bug#65037] [PATCH 5/7] gnu: python-trezor-agent: Update to 0.14.7 Attila Lendvai
2023-08-03 13:11 ` Attila Lendvai [this message]
2023-08-26 19:31 ` [bug#65037] [PATCH 6/7] gnu: trezor-agent: Fix build, update versioning, and the git tag Liliana Marie Prikler
2023-08-30 18:55 ` Attila Lendvai
2023-08-03 13:11 ` [bug#65037] [PATCH 7/7] gnu: trezord: Update to 2.0.33 Attila Lendvai
2023-08-26 18:58 ` [bug#65037] [PATCH 1/7] gnu: python-daemon: Use the git repo as source instead of pypi Liliana Marie Prikler
2023-08-04 8:18 ` [bug#65037] [PATCH 8/8] gnu: trezord: use new format for native-inputs Attila Lendvai
2023-08-26 18:55 ` [bug#65037] Fix python-daemon, Trezor support Liliana Marie Prikler
2023-08-30 18:57 ` [bug#65037] [PATCH v2 1/8] gnu: python-daemon: Build from git sources Attila Lendvai
2023-08-30 18:57 ` [bug#65037] [PATCH v2 2/8] gnu: python-daemon: Update to 3.0.1 Attila Lendvai
2023-08-30 18:57 ` [bug#65037] [PATCH v2 3/8] gnu: Add python-construct-classes Attila Lendvai
2023-08-30 18:57 ` [bug#65037] [PATCH v2 4/8] gnu: python-trezor: Update to 0.13.7 Attila Lendvai
2023-08-30 18:57 ` [bug#65037] [PATCH v2 5/8] gnu: python-trezor-agent: Update to 0.14.7 Attila Lendvai
2023-08-30 18:57 ` [bug#65037] [PATCH v2 6/8] gnu: trezor-agent: Fix build, change versioning scheme Attila Lendvai
2023-08-30 18:57 ` [bug#65037] [PATCH v2 7/8] gnu: trezord: Update to 2.0.33 Attila Lendvai
2023-08-30 18:57 ` [bug#65037] [PATCH v2 8/8] gnu: trezord: use new format for native-inputs Attila Lendvai
2023-09-03 12:55 ` [bug#65037] [PATCH v3 1/8] gnu: python-daemon: Build from git sources Attila Lendvai
2023-09-03 12:55 ` [bug#65037] [PATCH v3 2/8] gnu: python-daemon: Update to 3.0.1 Attila Lendvai
2023-09-03 12:55 ` [bug#65037] [PATCH v3 3/8] gnu: Add python-construct-classes Attila Lendvai
2023-09-03 12:55 ` [bug#65037] [PATCH v3 4/8] gnu: python-trezor: Update to 0.13.7 Attila Lendvai
2023-09-03 12:55 ` [bug#65037] [PATCH v3 5/8] gnu: python-trezor-agent: Update to 0.14.7 Attila Lendvai
2023-09-03 12:55 ` [bug#65037] [PATCH v3 6/8] gnu: trezor-agent: Fix build, change versioning scheme Attila Lendvai
2023-09-03 12:55 ` [bug#65037] [PATCH v3 7/8] gnu: trezord: Update to 2.0.33 Attila Lendvai
2023-09-03 12:55 ` [bug#65037] [PATCH v3 8/8] gnu: trezord: use new format for native-inputs Attila Lendvai
2023-09-04 10:40 ` [bug#65037] [PATCH v4 1/8] gnu: python-daemon: Build from git sources Attila Lendvai
2023-09-04 10:40 ` [bug#65037] [PATCH v4 2/8] gnu: python-daemon: Update to 3.0.1 Attila Lendvai
2023-09-04 10:40 ` [bug#65037] [PATCH v4 3/8] gnu: Add python-construct-classes Attila Lendvai
2023-09-04 10:40 ` [bug#65037] [PATCH v4 4/8] gnu: python-trezor: Update to 0.13.7 Attila Lendvai
2023-09-04 10:40 ` [bug#65037] [PATCH v4 5/8] gnu: python-trezor-agent: Update to 0.14.7 Attila Lendvai
2023-09-04 10:40 ` [bug#65037] [PATCH v4 6/8] gnu: trezor-agent: Fix build, change versioning scheme Attila Lendvai
2023-09-04 10:40 ` [bug#65037] [PATCH v4 7/8] gnu: trezord: Update to 2.0.33 Attila Lendvai
2023-09-04 10:40 ` [bug#65037] [PATCH v4 8/8] gnu: trezord: use new format for native-inputs Attila Lendvai
2023-09-27 15:47 ` [bug#65037] [PATCH v5 1/6] gnu: Add python-construct-classes Attila Lendvai
2023-09-27 15:47 ` [bug#65037] [PATCH v5 2/6] gnu: python-trezor: Update to 0.13.7 Attila Lendvai
2023-09-27 15:47 ` [bug#65037] [PATCH v5 3/6] gnu: python-trezor-agent: Update to 0.14.7 Attila Lendvai
2023-09-27 15:47 ` [bug#65037] [PATCH v5 4/6] gnu: trezor-agent: Fix build, change versioning scheme Attila Lendvai
2023-09-27 15:47 ` [bug#65037] [PATCH v5 5/6] gnu: trezord: Update to 2.0.33 Attila Lendvai
2023-09-27 15:47 ` [bug#65037] [PATCH v5 6/6] gnu: trezord: use new format for native-inputs Attila Lendvai
2023-10-03 14:04 ` bug#65037: [PATCH v5 1/6] gnu: Add python-construct-classes Guillaume Le Vaillant
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ff882aba8ce58e3f1d2973f2728f382288e0bab7.1691068294.git.attila@lendvai.name \
--to=attila.lendvai@gmail.com \
--cc=65037@debbugs.gnu.org \
--cc=attila@lendvai.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.