02/02: gnu: Update Trezor support.

[guix-commits]

ngz pushed a commit to branch master
in repository guix.

commit c7c4f8088195a8e6650904de4e16d71b98776a76
Author: Attila Lendvai <attila@lendvai.name>
AuthorDate: Wed Dec 1 18:05:26 2021 +0100

    gnu: Update Trezor support.
    
    * gnu/packages/patches/python-trezor-agent-fix-argv0.patch: Remove file.
    * gnu/local.mk (dist_patch_DATA): Apply previous removal.
    * gnu/packages/finance.scm (python-trezor-agent): Update to 0.14.4.
    [source]: Remove now useless patch.
    (python-mnemonic): Update to 0.20.
    (python-trezor): Update to 0.12.4
    (trezor-agent): Update to 0.11.0-1.
    [source]: Add file-name field.
    [arguments]: Remove trailing #T in phases.
    
    Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
---
 gnu/local.mk                                       |  1 -
 gnu/packages/finance.scm                           | 29 +++++++++++-----------
 .../patches/python-trezor-agent-fix-argv0.patch    | 27 --------------------
 3 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index d3949f3..7219f3a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1682,7 +1682,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 60ed9fc..268f7ab 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -837,7 +837,7 @@ the Monero GUI client.")
   ;; 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 @@ the Monero GUI client.")
              (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
@@ -918,13 +917,13 @@ settings.")
 (define-public python-mnemonic
   (package
     (name "python-mnemonic")
-    (version "0.19")
+    (version "0.20")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "mnemonic" version))
         (sha256
-          (base32 "0cd9prmdj8wzdmc7lxbf9lz0xrlkvak5ignag406mmfbn81fndsf"))))
+          (base32 "1xi5qvj2rvi5almf9c89rl7hz1z4ms04d53pg818i4vpkmivavvw"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-pbkdf2" ,python-pbkdf2)))
@@ -992,7 +991,7 @@ Nano dongle.")
 (define-public python-trezor
   (package
     (name "python-trezor")
-    (version "0.12.3")
+    (version "0.12.4")
     (source
      (origin
        (method git-fetch)
@@ -1001,7 +1000,7 @@ Nano dongle.")
              (commit (string-append "python/v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0wdm1y5zli6w09zbpjqc6rbcs1b4hjq007mbh7xdr17prbnqprac"))
+        (base32 "1k0zk94jnkhr4iyngjfhfvff5mibx265q81v8jhvhd3m4clzgc45"))
        (modules
         '((guix build utils)
           (srfi srfi-26)
@@ -1102,18 +1101,19 @@ the KeepKey Hardware Wallet.")
 (define-public trezor-agent
   (package
     (name "trezor-agent")
-    (version "0.11.0")
+    (version "0.11.0-1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/romanz/trezor-agent";)
-             ;; The version mismatch is not a mistake. Multiple python
+             ;; 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.2")))
+             ;; 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")))
+       (file-name (git-file-name name version))
        (sha256
         (base32 "0nl44ldfw9s2v3p7g5bldfw3ds2hz9r28j42bpnp8bj0v5na3ivk"))
        (modules
@@ -1151,8 +1151,7 @@ the KeepKey Hardware Wallet.")
                (delete-file (string-append out "/bin/.trezor_agent.py-real"))
                ;; Overwrite the wrapped one with the real thing.
                (install-file "./trezor_agent.py"
-                             (string-append out "/bin"))
-               #t))))))
+                             (string-append out "/bin"))))))))
     (build-system python-build-system)
     (inputs
      `(("python-trezor" ,python-trezor)
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 9462067..0000000
--- 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)