@@ -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 \
@@ -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)
deleted file mode 100644
@@ -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)