From: attila.lendvai@gmail.com
To: 73148@debbugs.gnu.org
Cc: Attila Lendvai <attila@lendvai.name>
Subject: [bug#73148] [PATCH 1/4] gnu: trezor-agent: Update to 0.15.0.
Date: Mon, 9 Sep 2024 16:28:20 +0200 [thread overview]
Message-ID: <9f72e41ee461463d495624f1bf285b8c3ca63fc5.1725892102.git.attila@lendvai.name> (raw)
In-Reply-To: <D3n69Xvn6K1dDW3d6woPHlVLc3qtobPcQ618MhSzDTW3ngNMKc5haC49Zb4aVkY3n6ayDeg9FXP2GU0bhqFIw8XeUdaqCgcXJ07ExFM__ew=@lendvai.name>
From: Attila Lendvai <attila@lendvai.name>
* gnu/packages/finance.scm (python-trezor-agent): Disable the test
called test_get_agent_sock_path.
(trezor-agent): Also copy the hash from the parent package. Remove the now
unnecessary deletion of the ./contrib dir.
Change-Id: Ied03ad4c5d1266c208a1938d748eb09c52750633
---
gnu/packages/finance.scm | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 4b5b5eefd53..317842c5937 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -931,7 +931,7 @@ (define-public python-trezor-agent
;; the toplevel app called trezor-agent.
(package
(name "python-trezor-agent")
- (version "0.14.7")
+ (version "0.15.0")
(source
(origin
(method git-fetch)
@@ -940,7 +940,7 @@ (define-public python-trezor-agent
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0"))))
+ (base32 "09y55ys3x5krszh58yhl5gpdri0zrlhfld6psrmiyxfbp344asin"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -955,7 +955,15 @@ (define-public python-trezor-agent
(add-after 'install 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
- (invoke "pytest" "-v")))))))
+ (invoke "pytest" "-v"))))
+ (add-before 'check 'disable-some-tests
+ (lambda _
+ ;; The path returned by gpgconf --list-dirs agent-socket in the
+ ;; builder is /homeless-shelter/.gnupg/S.gpg-agent, while the
+ ;; test expects a /run/user/... path. Probably safe to disable.
+ (substitute* "libagent/gpg/tests/test_keyring.py"
+ (("def test_get_agent_sock_path")
+ "def _do_not_test_get_agent_sock_path")))))))
(propagated-inputs
(list python-bech32
python-configargparse
@@ -1227,8 +1235,7 @@ (define-public trezor-agent
(method git-fetch)
(uri (origin-uri (package-source python-trezor-agent)))
(file-name (git-file-name name version))
- (sha256
- (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0"))
+ (hash (origin-hash (package-source python-trezor-agent)))
(modules
'((guix build utils)
(ice-9 ftw)
@@ -1248,9 +1255,6 @@ (define-public trezor-agent
(scandir "./agents/trezor/"
(negate (cut member <> '("." "..") string=))))
(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")))))
base-commit: b82c8ceae14d5d0f4584452f34f5103ffd0e0f8d
--
2.46.0
next prev parent reply other threads:[~2024-09-09 14:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-09 14:26 [bug#73148] Update Trezor packages Attila Lendvai
2024-09-09 14:28 ` attila.lendvai [this message]
2024-09-09 14:28 ` [bug#73148] [PATCH 2/4] gnu: python-mnemonic: Update to 0.21 attila.lendvai
2024-09-09 14:28 ` [bug#73148] [PATCH 3/4] gnu: python-trezor: Update to 0.13.9 attila.lendvai
2024-09-09 14:28 ` [bug#73148] [PATCH 4/4] gnu: python-trezor-agent: Use absolute path for gpg at runtime attila.lendvai
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=9f72e41ee461463d495624f1bf285b8c3ca63fc5.1725892102.git.attila@lendvai.name \
--to=attila.lendvai@gmail.com \
--cc=73148@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.