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 4KVkLteOpmF+bgAAgWs5BA (envelope-from ) for ; Tue, 30 Nov 2021 21:51:35 +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 kDHdKdeOpmEzPgAAbx9fmQ (envelope-from ) for ; Tue, 30 Nov 2021 20:51:35 +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 66DB610E43 for ; Tue, 30 Nov 2021 21:51:35 +0100 (CET) Received: from localhost ([::1]:53680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msA6A-0002Vm-HJ for larch@yhetil.org; Tue, 30 Nov 2021 15:51:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ms9zq-0007du-ER for guix-patches@gnu.org; Tue, 30 Nov 2021 15:45:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59342) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ms9zq-0007YE-59 for guix-patches@gnu.org; Tue, 30 Nov 2021 15:45:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ms9zq-0004BP-1m for guix-patches@gnu.org; Tue, 30 Nov 2021 15:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52207] [PATCH 2/5] gnu: python-trezor-agent: Update to 0.14.4. References: <20211130203722.14545-1-attila@lendvai.name> In-Reply-To: <20211130203722.14545-1-attila@lendvai.name> Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Nov 2021 20:45:01 +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.163830509316017 (code B ref 52207); Tue, 30 Nov 2021 20:45:01 +0000 Received: (at 52207) by debbugs.gnu.org; 30 Nov 2021 20:44:53 +0000 Received: from localhost ([127.0.0.1]:42649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ms9zh-0004AC-1Q for submit@debbugs.gnu.org; Tue, 30 Nov 2021 15:44:53 -0500 Received: from mail-ed1-f54.google.com ([209.85.208.54]:38851) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ms9zf-00049r-8D for 52207@debbugs.gnu.org; Tue, 30 Nov 2021 15:44:51 -0500 Received: by mail-ed1-f54.google.com with SMTP id x6so91715636edr.5 for <52207@debbugs.gnu.org>; Tue, 30 Nov 2021 12:44:51 -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:mime-version :content-transfer-encoding; bh=hM4xyAJaPsRLn3vdDyt8dcF+euNT1z+DKiMCXTrVM2E=; b=j+jRktFr9xLM90HZ332NqxHnL3kDzwa/EN1RarK3obNlzVujqNomtD+uG14/OqQdDb pQlyGSHyxkT0wV/Cz/9P+t8YFyaPUlWNsPp/jWnRd9Hr3nxhe+Sfai0AkxTBXKlAUpBd LoeOlTDcXCw9ynpRjxmInuBCrFRUiK/8m5/AlkMEAzb6QjjMoGrBxia0CkwUMvVbNlv4 l5OZB+eLsj9pfUHhpcOFIYCtJG6iGCGZSvBGSCu6LW0j4e6UMQTzkA8hyCZzcrvyuGPc XyidYrRlpBX+0QmYY4bVjrzs2FubQgbutAI6FWNECPTkL4Fm6waXsqeomKD2hkz5lUao zogQ== 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 :mime-version:content-transfer-encoding; bh=hM4xyAJaPsRLn3vdDyt8dcF+euNT1z+DKiMCXTrVM2E=; b=WWer6CPylWwdAu6kwHp13RWK6phN+QlV4PJASCgvc1nUexAhiWIrXsRhdV0FR/3yt0 K7b07ARtAD1CRVMgUGPPvmbJJ7Jbvqk+3j5lDJGB/KI7PjkfXa5bRfoTfjEHKRzP9d4G yM1C5rqC6EfMAHeMUFcIAsz1U6LmBdyJnQ3QEIVqVIEhJ9ZeRTMy156+UpQEYH813iwz 8475MwJMhtvLA93qPBA4MvN1hWJ8zoOeUq89Xyt04uuzY5jfEbmu8YVXeWIMx4yl+zHF lmcgu2Vi2u0kmPSuJ8qljBQDS4YGIQZiHJTz1pvv+zg8n3nOiGzeXUbyGofPYgjluDzz iyBQ== X-Gm-Message-State: AOAM530xUJgHoyINe8GpByLwiPayxnzATSUlrehBlvz1RCIFk8l6rOOX CNPb+vHb53Ij7Y9AAMm2XrsYgEvG9gDkVA== X-Google-Smtp-Source: ABdhPJzepGYpIj5eyUjrgxC0AoOvdpftMdKjfztzfH8Qx2l8A63PT6KWUrJHmcPNotsl1yZpq+rsvw== X-Received: by 2002:a17:906:6a18:: with SMTP id qw24mr1723891ejc.118.1638305084996; Tue, 30 Nov 2021 12:44:44 -0800 (PST) Received: from localhost.localdomain (catv-89-132-208-37.catv.broadband.hu. [89.132.208.37]) by smtp.gmail.com with ESMTPSA id hb10sm9865174ejc.9.2021.11.30.12.44.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 12:44:44 -0800 (PST) From: Attila Lendvai Date: Tue, 30 Nov 2021 21:44:29 +0100 Message-Id: <20211130204432.16295-2-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 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=1638305495; 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=hM4xyAJaPsRLn3vdDyt8dcF+euNT1z+DKiMCXTrVM2E=; b=gVf7Tw3v4v523Gv2xQNFtSJ4XqOSEv4lgAdPmnFKBJx+9pOzdJPGQ2swhCujSlubUIE8ZH 9XbAzRDWAopM28ynKUwQ8dNSKJ4QUiiJ5aRaS3fxXwP6l0RsnYLtii00V7LdJ3jw63DRxD 47JXqBnFuRWMTcs5PFtwBX+whDe/gt8noiqIQzDVDMUya1tJuiSYnop4NcpjifQMPhcSwR FvS7ZuDlGfPVS9PP9Grhmwii+P4eMycWwgi1aFa/SceEg/zjKja0sUaM9NCu2xSV9rJBoG 2czyXZBLod6cxb1B/gULr9aPp9SZZx73uqOsoJL2X+lb2vkBM2DBj6BQEBzfgw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638305495; a=rsa-sha256; cv=none; b=Fh/n4RBuxpi3LO2Uyj6dhG+3yW1CJJEVz0R36jPu/VH4ilf4Vj/G43GkKjTMa30bIywROy 1B1vge0JZTBRGC8xRV0Vo5KO34V+h/Zs1VhGtvnD87y2eN2vbP8lFX5vJ03n3owKssavTi 6GRqhEiL381MHWe8QiOR8XxTIE6Ma3CRUZ64nQnGrCKOlWTcxOZULYgtkPWCF6pNquim5u fHE3qPw+pvancCkrPte0jIywvPemIrPnysSLT9UiKi1qsW4QM5HmMenFt2V9LIQyC8wblQ emejT/YL6zYynZDJSFsfFYBHdBcSGiRup0Jkkpe0aUcXjpAh7Btc/E0Gd3XajQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=j+jRktFr; 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=j+jRktFr; 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: 66DB610E43 X-Spam-Score: -0.41 X-Migadu-Scanner: scn0.migadu.com X-TUID: QaufdnK5rAjT * 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