From: Attila Lendvai <attila@lendvai.name>
To: 52207@debbugs.gnu.org
Cc: Attila Lendvai <attila@lendvai.name>
Subject: [bug#52207] [PATCH 2/5] gnu: python-trezor-agent: Update to 0.14.4.
Date: Tue, 30 Nov 2021 21:44:29 +0100 [thread overview]
Message-ID: <20211130204432.16295-2-attila@lendvai.name> (raw)
In-Reply-To: <20211130203722.14545-1-attila@lendvai.name>
* gnu/packages/patches/python-trezor-agent-fix-argv0.patch: Deleted.
---
gnu/local.mk | 1 -
gnu/packages/finance.scm | 8 +++---
.../python-trezor-agent-fix-argv0.patch | 27 -------------------
3 files changed, 4 insertions(+), 32 deletions(-)
delete mode 100644 gnu/packages/patches/python-trezor-agent-fix-argv0.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index a5c0486c94..b26907a211 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1681,7 +1681,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-pytorch-system-libraries.patch \
%D%/packages/patches/python-robotframework-source-date-epoch.patch \
%D%/packages/patches/python-seaborn-kde-test.patch \
- %D%/packages/patches/python-trezor-agent-fix-argv0.patch \
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \
%D%/packages/patches/python-unittest2-python3-compat.patch \
%D%/packages/patches/python-unittest2-remove-argparse.patch \
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 60ed9fc4e3..91fde909ec 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -837,7 +837,7 @@ (define-public python-trezor-agent
;; the toplevel app called trezor-agent.
(package
(name "python-trezor-agent")
- (version "0.14.2")
+ (version "0.14.4")
(source
(origin
(method git-fetch)
@@ -846,8 +846,7 @@ (define-public python-trezor-agent
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0nl44ldfw9s2v3p7g5bldfw3ds2hz9r28j42bpnp8bj0v5na3ivk"))
- (patches (search-patches "python-trezor-agent-fix-argv0.patch"))))
+ (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -866,7 +865,8 @@ (define-public python-trezor-agent
(add-installed-pythonpath inputs outputs)
(invoke "py.test"))))))
(propagated-inputs
- `(("python-configargparse" ,python-configargparse)
+ `(("python-pynacl" ,python-pynacl)
+ ("python-configargparse" ,python-configargparse)
("python-daemon" ,python-daemon)
("python-docutils" ,python-docutils)
("python-ecdsa" ,python-ecdsa)
diff --git a/gnu/packages/patches/python-trezor-agent-fix-argv0.patch b/gnu/packages/patches/python-trezor-agent-fix-argv0.patch
deleted file mode 100644
index 9462067cd5..0000000000
--- a/gnu/packages/patches/python-trezor-agent-fix-argv0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/libagent/gpg/__init__.py b/libagent/gpg/__init__.py
-index 3711bc8..67085de 100644
---- a/libagent/gpg/__init__.py
-+++ b/libagent/gpg/__init__.py
-@@ -122,15 +122,19 @@ def run_init(device_type, args):
- verify_gpg_version()
-
- # Prepare new GPG home directory for hardware-based identity
-- device_name = os.path.basename(sys.argv[0]).rsplit('-', 1)[0]
-- log.info('device name: %s', device_name)
-+ exe_name = os.path.basename(sys.argv[0])
-+ # drop the Guix wrapper's dot prefix from the name
-+ if exe_name[0] == '.' and exe_name.endswith('-real'):
-+ exe_name = exe_name[1:-5:]
-+ device_name = exe_name.rsplit('-', 1)[0]
-+ log.info('exe name: %s, device name: %s', exe_name, device_name)
- homedir = args.homedir
- if not homedir:
- homedir = os.path.expanduser('~/.gnupg/{}'.format(device_name))
-
- log.info('GPG home directory: %s', homedir)
-
-- if os.path.exists(homedir):
-+ if os.path.exists(homedir) and not args.subkey:
- log.error('GPG home directory %s exists, '
- 'remove it manually if required', homedir)
- sys.exit(1)
--
2.33.0
next prev parent reply other threads:[~2021-11-30 20:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-30 20:37 [bug#52207] [PATCH 1/5] gnu: python-daemon: Update to 2.3.0 Attila Lendvai
2021-11-30 20:44 ` Attila Lendvai [this message]
2021-11-30 20:44 ` [bug#52207] [PATCH 3/5] gnu: python-mnemonic: Update to 0.20 Attila Lendvai
2021-11-30 20:44 ` [bug#52207] [PATCH 4/5] gnu: python-trezor: Update to 0.12.4 Attila Lendvai
2021-11-30 20:44 ` [bug#52207] [PATCH 5/5] gnu: trezor-agent: Update to 0.11.0-1, aka git tag v0.14.4 Attila Lendvai
2021-12-01 15:47 ` [bug#52207] [PATCH 1/2] gnu: python-daemon: Update to 2.3.0 Attila Lendvai
2021-12-01 15:47 ` [bug#52207] [PATCH 2/2] gnu: Update Trezor support Attila Lendvai
2021-12-01 17:40 ` bug#52207: [PATCH 1/2] gnu: python-daemon: Update to 2.3.0 Nicolas Goaziou
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211130204432.16295-2-attila@lendvai.name \
--to=attila@lendvai.name \
--cc=52207@debbugs.gnu.org \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).