From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gKxME/GZp2F2EQAAgWs5BA (envelope-from ) for ; Wed, 01 Dec 2021 16:51:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id UJDtDvGZp2GTYgAAbx9fmQ (envelope-from ) for ; Wed, 01 Dec 2021 15:51:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B0BE429E60 for ; Wed, 1 Dec 2021 16:51:12 +0100 (CET) Received: from localhost ([::1]:53216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msRt1-0007ab-Nr for larch@yhetil.org; Wed, 01 Dec 2021 10:51:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msRst-0007W3-6m for guix-patches@gnu.org; Wed, 01 Dec 2021 10:51:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msRss-0005dc-TX for guix-patches@gnu.org; Wed, 01 Dec 2021 10:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msRss-000584-RN for guix-patches@gnu.org; Wed, 01 Dec 2021 10:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52207] [PATCH 2/2] gnu: Update Trezor support. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Dec 2021 15:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52207 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52207@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 52207-submit@debbugs.gnu.org id=B52207.163837381419617 (code B ref 52207); Wed, 01 Dec 2021 15:51:02 +0000 Received: (at 52207) by debbugs.gnu.org; 1 Dec 2021 15:50:14 +0000 Received: from localhost ([127.0.0.1]:45196 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRs5-00056K-VL for submit@debbugs.gnu.org; Wed, 01 Dec 2021 10:50:14 -0500 Received: from mail-wr1-f46.google.com ([209.85.221.46]:35675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRs4-00055r-0Q for 52207@debbugs.gnu.org; Wed, 01 Dec 2021 10:50:12 -0500 Received: by mail-wr1-f46.google.com with SMTP id i5so53290984wrb.2 for <52207@debbugs.gnu.org>; Wed, 01 Dec 2021 07:50:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VhK4oOP9R9w3plnL30MCJItX4ne5z9hevhzknL3nl8w=; b=gSssuGyaL4WzXoOX+PQjigITIJH1TCviWNyRe3h4vxY/9VC6FgUGp57rPa9u3OOZOl o7uzeHb9bX6f92L78cHuS3cYh4EggjHOpqkQtxGTbV87fV3SCFA4s27+LxY6alAmKRSy UrG/fp29Pp1sUPV9sUabQUYvDDQE0wAO+jP+AzsuXR8R49UXyoMclf599BniFWs8XMF2 HZqcdIeRojeDLz6rGcMD7DpgCkBnZypVPiAxvEy2shrcSGr1NvwBgCeSqvlxdNmYCids p7D6gPa9r+jnECZzaA7JhBcZq4X2MSXqM7LaVZbNNHaUO9NNvpZEPHUvNkM87zDa+6i4 lBYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VhK4oOP9R9w3plnL30MCJItX4ne5z9hevhzknL3nl8w=; b=EpkdGIY3PJoPiMkZML1RNwSxbILPoJlNwXeML9sZ5377RcfeNmMZxEw6C1zRgtiu37 bAzOJeH6Zr9kWy8817yoh7jVqz3lJKBPGsN/GsWAXWRzh1gv30vJtWtKSVo2mo5DSSNh 8Dz8nPp6zJNAibW/7WKefQCmBYxMDHwVsILYa/vX6bSa8iz2t9MyvgPyGtoLZiSeVUwp 3JxzEh4hbNm4ndkDAiQbWKkl7nPqFVCcorKhCiU3r5t82AD7dYoY54oOAKPypCbJSQ7R 5MPfUXrNXtNvHvkF//ZxQtBMSpguSBkdgZewbebpTeNZ2VvPHRj3iZn6402JPX5Z0TSJ f3fw== X-Gm-Message-State: AOAM531EYyIUZxWIskD7toMtG3alydx7Bmz8HdPpYsVu2D+exNWb8J7u N6jScnWX9oBTsLA9MaqKLQ7cKVWmjGGW2Q== X-Google-Smtp-Source: ABdhPJwVvxkeOilEvArV0Xk3JzW2Dlyxrdcgm+lFfjXRqCc2USlWUK3nZVGI/w+nR9bl7mAbfkGE/w== X-Received: by 2002:a5d:63ca:: with SMTP id c10mr7777253wrw.124.1638373806369; Wed, 01 Dec 2021 07:50:06 -0800 (PST) Received: from lelap.lan (catv-89-132-208-37.catv.broadband.hu. [89.132.208.37]) by smtp.gmail.com with ESMTPSA id n32sm1630785wms.1.2021.12.01.07.50.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 07:50:05 -0800 (PST) From: Attila Lendvai Date: Wed, 1 Dec 2021 16:47:08 +0100 Message-Id: <20211201154707.7865-2-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211201154707.7865-1-attila@lendvai.name> References: <20211201154707.7865-1-attila@lendvai.name> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638373872; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=VhK4oOP9R9w3plnL30MCJItX4ne5z9hevhzknL3nl8w=; b=m6fCgFLy0s3TcoRHbk6+3DRgXiqbT3r+OOhb9d3DQ/TCj/Aby16UN4JOVgPv6YEAII4VLW lwQgeJ6XLuGJhLrWYEiUXdQFwkcLkTkPSUNFjGocTAv3sZq3tF90CeGB2+k92gtUgrWRUW JUv5IL8VRyM1I6QwFD6kdosBbSV4UEMF9zsdGBlPw9ryAU1aocwrk3CXmHYDY3TDt+z6j2 aVFq1A2mF/EQl72cdw/mgUwVkCNvVJ59o89GewOWogu76HOJtm3dlQf1y9/FGeA1Qle3+A 5TV0arbSVyw9u7KlV6yqu0/EUfD5utD2S9jxo6DwRxeXcupPaNoazcw5ZdUK6w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638373872; a=rsa-sha256; cv=none; b=Ph6d0sTNXZG/Eid86XQQx37EapgpyG3n2Ysbm5lq2fyEhMpH36BX9nSBFHKXv8TXZxT/UH NrTSAvznMqdDM8thBeulv3vtiKN+kedvDjyigYNe7SDUJvITRMu5Z065E4CLTtaWwrbCNS rIMyfVg5dPnHq+pk2TlrEERZWbzvH8a5d7/szraXqToPBfN1EtqD/WEFfaACdVbnroQKuL L64UEO/9IpOtZ8brlVM0C93jPnZOnUjOfzW244kOnaOdcLxbbOEPKXCLAzDpgYl0qVXKDR nVwozjGN4h8xsxwALeabHP4sX5s6jzVeGdpsyM6CGm4M4O447CB0iq/XzfBk0w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=gSssuGya; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.41 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=gSssuGya; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B0BE429E60 X-Spam-Score: -0.41 X-Migadu-Scanner: scn0.migadu.com X-TUID: FpWhKzb/Lxqk gnu: python-trezor-agent: Update to 0.14.4. gnu: python-mnemonic: Update to 0.20. gnu: python-trezor: Update to 0.12.4. gnu: trezor-agent: Update to 0.11.0-1, aka git tag v0.14.4. * gnu/packages/patches/python-trezor-agent-fix-argv0.patch: Deleted. --- gnu/local.mk | 1 - gnu/packages/finance.scm | 35 ++++++++++--------- .../python-trezor-agent-fix-argv0.patch | 27 -------------- 3 files changed, 19 insertions(+), 44 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..68549520c2 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) @@ -918,13 +918,13 @@ (define-public trezor-gpg-pinentry-tk (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 +992,7 @@ (define-public python-btchip-python (define-public python-trezor (package (name "python-trezor") - (version "0.12.3") + (version "0.12.4") (source (origin (method git-fetch) @@ -1001,7 +1001,7 @@ (define-public python-trezor (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) @@ -1019,7 +1019,8 @@ (define-public python-trezor (string-append "./" file-name))) (scandir "./python/" (negate (cut member <> '("." "..") string=)))) - (delete-file-recursively "./python"))))) + (delete-file-recursively "./python") + #t)))) (build-system python-build-system) (propagated-inputs `(("python-attrs" ,python-attrs) @@ -1102,7 +1103,7 @@ (define-public ledger-agent (define-public trezor-agent (package (name "trezor-agent") - (version "0.11.0") + (version "0.11.0-1") (source (origin (method git-fetch) @@ -1113,9 +1114,10 @@ (define-public trezor-agent ;; 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"))) + (commit "v0.14.4"))) + (file-name (git-file-name name version)) (sha256 - (base32 "0nl44ldfw9s2v3p7g5bldfw3ds2hz9r28j42bpnp8bj0v5na3ivk")) + (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l")) (modules '((guix build utils) (ice-9 ftw) @@ -1134,7 +1136,8 @@ (define-public trezor-agent (string-append "./" file-name))) (scandir "./agents/trezor/" (negate (cut member <> '("." "..") string=)))) - (delete-file-recursively "./agents"))))) + (delete-file-recursively "./agents") + #t)))) (arguments `(#:phases (modify-phases %standard-phases @@ -1151,14 +1154,14 @@ (define-public trezor-agent (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"))) + #t))))) (build-system python-build-system) (inputs `(("python-trezor" ,python-trezor) ("python-trezor-agent" ,python-trezor-agent))) (native-inputs - `(("python-attrs" ,python-attrs))) + `(("python-attrs" ,python-attrs))) ; for the tests (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 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