From unknown Thu Aug 14 21:46:42 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#52207 <52207@debbugs.gnu.org> To: bug#52207 <52207@debbugs.gnu.org> Subject: Status: [PATCH 1/5] gnu: python-daemon: Update to 2.3.0. Reply-To: bug#52207 <52207@debbugs.gnu.org> Date: Fri, 15 Aug 2025 04:46:42 +0000 retitle 52207 [PATCH 1/5] gnu: python-daemon: Update to 2.3.0. reassign 52207 guix-patches submitter 52207 Attila Lendvai severity 52207 normal tag 52207 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 30 15:40:55 2021 Received: (at submit) by debbugs.gnu.org; 30 Nov 2021 20:40:55 +0000 Received: from localhost ([127.0.0.1]:42636 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ms9vq-00042d-TP for submit@debbugs.gnu.org; Tue, 30 Nov 2021 15:40:55 -0500 Received: from lists.gnu.org ([209.51.188.17]:48942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ms9vo-00042S-3w for submit@debbugs.gnu.org; Tue, 30 Nov 2021 15:40:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ms9vn-000645-Ta for guix-patches@gnu.org; Tue, 30 Nov 2021 15:40:51 -0500 Received: from [2a00:1450:4864:20::530] (port=36726 helo=mail-ed1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ms9vl-0006wG-UH for guix-patches@gnu.org; Tue, 30 Nov 2021 15:40:51 -0500 Received: by mail-ed1-x530.google.com with SMTP id z5so26896358edd.3 for ; Tue, 30 Nov 2021 12:40:48 -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=C+u7IE3XIdKZ1F4C28Fl+lckSDdDZnGGnv9fhJ5wJRA=; b=gr+3gZBlNZtJDpRMN11H3hL7Meev4qr0c6Vi7YBvZSQ1AXD2l55uapk3kUNhdZgMcj ROpjxMXduVUeZEo/symb8iafudvlcI724sCnpN6GsLYrK47XwOfRtCOHbPRQsG7VoNsY FvVvGjVUdWrx409BnrDpUa/k9XCscIVKryOjUYrEEBCM8SdpIaOKjzu5YnY9Oc7Uwn19 vfrtPtsiwPcM8eKJkVvISNh1Dt9d3zoiYUr7rdlY9rEM3lEZpKysTUPYQsuqWZ7Am7IJ BIWQjx5YpIQ+QheCZop4Hyhs+artz+OKCQGQ3olMPwr2rMudmjXUI8GaoZFDdshIShRQ BN4g== 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=C+u7IE3XIdKZ1F4C28Fl+lckSDdDZnGGnv9fhJ5wJRA=; b=ZXC8WgphSNUl2FzFotu/VH0kaLULcHp0iyyESSE6auvLIlKUF5F8RWrCHVohbFU8J/ ILBfEv+6SzD3eT4+IJdOebMgbZunlEDMkIqFp/PXJblaLC2e4rIY4QbEKbGH3/Gbi9VI DwkWpWs3uGEzqVQuJXk7D2ijOnjPWoyB/96bN5gGXeonMEFP1yC/iMdxBsGhJrDNJqe+ TJh2AXGIzEHC9ilmEgXci4EyK2qPLy9WI6dqOm2a4kganXPeUMjCTvRyStRS2Co+4+gq 7fAntx8Ijxe6fKHN6jLdGV7VV+xwhdB328nkbu0dkvb4SRzS3Xf4tRhRjUQ7TJF3Ge5e qU3g== X-Gm-Message-State: AOAM532tLWMm40tDrEVywdcF09eZq9UMnpq4yEBEN8vNccUyKUi3igSp L9rxowXhK3DZ83hfgzyreu7Z7eUoJ8wGbQ== X-Google-Smtp-Source: ABdhPJxzEMS7HT+uP3zU+Erd4Ln5VSiVYRcRcVJis8UIkr16ThTYeLcYme5pzhAKPQn+QoLboOp5xA== X-Received: by 2002:a05:6402:2790:: with SMTP id b16mr2045771ede.24.1638304847503; Tue, 30 Nov 2021 12:40:47 -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 j17sm12339486edj.0.2021.11.30.12.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 12:40:46 -0800 (PST) From: Attila Lendvai To: guix-patches@gnu.org Subject: [PATCH 1/5] gnu: python-daemon: Update to 2.3.0. Date: Tue, 30 Nov 2021 21:37:20 +0100 Message-Id: <20211130203722.14545-1-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::530 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=attila.lendvai@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: submit Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) --- this patchset updates trezor support to current latest. it eliminates the argv[0] patch that was introduced in https://issues.guix.gnu.org/50751 because upstream stopped using argv[0]. issue 50751 just got pushed recently, sorry for the unfortunate timing. i was just about to send the new set of patches, but here they are. gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ffd39860d8..2f95f272c7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4103,14 +4103,14 @@ (define-public python2-joblib (define-public python-daemon (package (name "python-daemon") - (version "2.2.3") + (version "2.3.0") (source (origin (method url-fetch) (uri (pypi-uri "python-daemon" version)) (sha256 (base32 - "09fcjdjzk9ywmpnrj62iyxqgcygzdafsz41qlrk2dknzbagcmzmg")))) + "1bxfn2bq56sd4w0nm9mqy8y0905m7fc8vmhnjxlrf49vcbqr7adx")))) (build-system python-build-system) (arguments `(#:phases @@ -4125,9 +4125,11 @@ (define-public python-daemon (propagated-inputs `(("python-lockfile" ,python-lockfile))) (native-inputs - `(("python-unittest2" ,python-unittest2) + `(("python-coverage" ,python-coverage) + ("python-unittest2" ,python-unittest2) ("python-testtools" ,python-testtools) ("python-testscenarios" ,python-testscenarios) + ("python-twine" ,python-twine) ("python-mock" ,python-mock) ("python-docutils" ,python-docutils))) (home-page "https://pagure.io/python-daemon/") -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 30 15:44:53 2021 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 To: 52207@debbugs.gnu.org Subject: [PATCH 2/5] gnu: python-trezor-agent: Update to 0.14.4. 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-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 52207 Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 30 15:44:57 2021 Received: (at 52207) by debbugs.gnu.org; 30 Nov 2021 20:44:57 +0000 Received: from localhost ([127.0.0.1]:42652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ms9zl-0004AX-D6 for submit@debbugs.gnu.org; Tue, 30 Nov 2021 15:44:57 -0500 Received: from mail-ed1-f41.google.com ([209.85.208.41]:43631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ms9zg-00049u-Mh for 52207@debbugs.gnu.org; Tue, 30 Nov 2021 15:44:52 -0500 Received: by mail-ed1-f41.google.com with SMTP id o20so91516806eds.10 for <52207@debbugs.gnu.org>; Tue, 30 Nov 2021 12:44:52 -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=b1QM6NUWcLMg4hyMCyDd61TVdBOAFcqF+QjidPI21R0=; b=AXekK+sh7Z+zaKXj91FzmFfcVSLsFwz5ElVbmNQVFRxPQ4gBjP2Rrxmj2arYq0j2Si ER06nmFKJ8LrWedjUjUXohchybt3LX3AJzRuBfCMji0pbpyslQrOK61SM6nK4xv3fqDS abYBpr8/DeFpxYsdu/PYCsMbL/M6jJEfI+4LYGgZj0YUSqD8ZkNUPaEh/fLJNom2k/V7 Q7TV5j/FnY1E+sRNNi3ZJonxVNG7R1kskJ/0cGssKAWXN2Oj/ZtQ28WeiIBcj0dHa9Da Pyp/YHgNTTeshX1VX9E7O5uufHPfCq5Rp5x7ZqktPzhevvgUTgSxmFOyuhFHHAM96Dah dFBw== 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=b1QM6NUWcLMg4hyMCyDd61TVdBOAFcqF+QjidPI21R0=; b=cudj8HdmE6qqA4WRzsWSK/xhqkvaBMlnP1yIxNKas+GfyNJDxXTKV77Ya1sHxJ3NvP 4G2yz2KgiLhgVpwYpn/Di1XAWiNYJnNv0HuxmSKyOOnmxHg4K2J3b/1buox2TvF0rK2r TPSaqjQhtTcxIdIPR9Wyqt5dxNHf/3iIqTuaVuoik+o9FoZvZvgcMIaOD7cts27Ln3Qq SLXW8WbPHrUGxkOIW0CA+D++3Ts3Zk0pm+nbig5VWp7nhbUjljDwOFIPNHScTnCYdlV5 8i4W68oF63LMivcbaOTo+34Ov+kgLpFFp4pbl7oezPJAa46IChwcjed0TGUtNQi8CxsB 37jg== X-Gm-Message-State: AOAM533EdDWcaf3CPgqq7MgFeYUzHmM7oasreX/jMTjD0KIUyBCB2BXn kUedQLh4+6sJ4feCtogcGm6gG0qdOAz8PQ== X-Google-Smtp-Source: ABdhPJzD7akj06suM5BaxIDKfrLGDqgWKGWMkd4QweQBme/FMulMCy8GacP8+k3o3smjcgeKdvOT0g== X-Received: by 2002:a05:6402:f:: with SMTP id d15mr1817562edu.331.1638305087073; Tue, 30 Nov 2021 12:44:47 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 12:44:46 -0800 (PST) From: Attila Lendvai To: 52207@debbugs.gnu.org Subject: [PATCH 3/5] gnu: python-mnemonic: Update to 0.20. Date: Tue, 30 Nov 2021 21:44:30 +0100 Message-Id: <20211130204432.16295-3-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211130204432.16295-2-attila@lendvai.name> References: <20211130204432.16295-2-attila@lendvai.name> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 52207 Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 91fde909ec..b468229849 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -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))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 30 15:44:58 2021 Received: (at 52207) by debbugs.gnu.org; 30 Nov 2021 20:44:58 +0000 Received: from localhost ([127.0.0.1]:42655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ms9zl-0004AZ-KR for submit@debbugs.gnu.org; Tue, 30 Nov 2021 15:44:58 -0500 Received: from mail-ed1-f53.google.com ([209.85.208.53]:33344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ms9zi-00049w-7r for 52207@debbugs.gnu.org; Tue, 30 Nov 2021 15:44:54 -0500 Received: by mail-ed1-f53.google.com with SMTP id t5so92472454edd.0 for <52207@debbugs.gnu.org>; Tue, 30 Nov 2021 12:44:54 -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=obu6NxEI8dFH6y8juHvTPRvtR2muF5v4LKYgHggTr3Y=; b=X4rE3YH7ndFT6tfn8byYx49jVua4o3v7DCP/dZQqpPc/IWzuNz2p8rzUwVgh+Tf7zH REUMZ14OBX5M/Ok/daw5JIcASfZJS4hCWF76fYL9rhydhSUuR47ga4Tlno0zbK9+Wktv u6DTwo3qWyGaVd7Iplo6LSnz23qRHGR/Nyzo7nEg/RsS/jEo56rViFnpNnxwvznd+4HC lj08jtEJ6FMo1vujbvG8bCFbOrm0iAS0XU9WaU7JQTmLxp+QM53AOjCb9dbeCiLTMc8w klpIqCTwqDDa1EIdFYaRdWAmDO8u4f+VXxLE4Gsee9mCwQDDi2hL2Y8+NdULU80JUMHz WJAQ== 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=obu6NxEI8dFH6y8juHvTPRvtR2muF5v4LKYgHggTr3Y=; b=Blm2gf5r5wSbX0ogDwUsDjviBB8PTbhPrmbc5jXnH8ZFuCF1ncAjkxuHJTsn4ZBkkb N9YegVxSa1j9jPLt6apqRHkMUCn4hYXigY2ajG261neR4y+WJaRudd+ynhfgQN6ZCqGq BpniTyP/AT5aEprRGcNLSsAzEkyLHsXO/lDgjWkN0W9oM9iraQGgCBfOn6hsqfSaJVQk gzgrST30NXHgDPFYODm0qjmUlr5yLscNJyMhipa2c9tFtXUZQMTySCgTc5UGvRpku1Sm MvefpnkrVSxdx955e6DJwCsvM7iIz87IvgxDdedCVmWyh7mhD9puuGAglfc7+wwtH6u4 yjnw== X-Gm-Message-State: AOAM533nYVk6mgRvuZ7KzkgsA3qGFNn1Z+omrlXYaScQ/3BXwcqtJxx6 W/m3EwCTM5dDVDJdykf1mhaSXGAzNPWZdA== X-Google-Smtp-Source: ABdhPJyPLYcOqUaMp2ld5IvmeMv2Bpkj++WOd/a8RxLt+10pRpWgact3/+SvE9aCkmoMGRi2+C59Kw== X-Received: by 2002:a17:906:619:: with SMTP id s25mr1624244ejb.237.1638305088498; Tue, 30 Nov 2021 12:44:48 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 12:44:48 -0800 (PST) From: Attila Lendvai To: 52207@debbugs.gnu.org Subject: [PATCH 4/5] gnu: python-trezor: Update to 0.12.4. Date: Tue, 30 Nov 2021 21:44:31 +0100 Message-Id: <20211130204432.16295-4-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211130204432.16295-2-attila@lendvai.name> References: <20211130204432.16295-2-attila@lendvai.name> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 52207 Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) --- gnu/packages/finance.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index b468229849..9b98eafcd4 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -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) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 30 15:45:05 2021 Received: (at 52207) by debbugs.gnu.org; 30 Nov 2021 20:45:05 +0000 Received: from localhost ([127.0.0.1]:42660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ms9zt-0004ER-3B for submit@debbugs.gnu.org; Tue, 30 Nov 2021 15:45:05 -0500 Received: from mail-ed1-f41.google.com ([209.85.208.41]:37540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ms9zl-0004AA-FP for 52207@debbugs.gnu.org; Tue, 30 Nov 2021 15:44:57 -0500 Received: by mail-ed1-f41.google.com with SMTP id e3so92119218edu.4 for <52207@debbugs.gnu.org>; Tue, 30 Nov 2021 12:44:57 -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=WmpWMw7qSvs5CvJgVhJ2zNuAs8rl3naMq+0JdPfhg3k=; b=mRmpH1dJs5zwY7NidBfxX/vimey3VaNR4+TSihSlcvKPfkO/IcxuZrENzqKXKGlSVZ kYlspA35pYsr/WSEBtMGLvPcDbTFgP1In8/cxfvKZwBOUB1wsuZaLd8Rdd2tPtd42Y5B /pcNmlhxL5afhMHuOkESv0k0glVJDGtuGckfYkelaYucp+ZeBkL05q2m8nDEjI1OCYRP CoRND7K90rpqPTEgHg+qo6TCCcgw3T6HXro43dZS666L0MjQHVqwZnkSMx8ulTB4JLuH T4zHf0pfQp/37l9IipXPIGGmSu7o1tCfpA8rLLusa8ZZZKN8b7noaxK9AcYvHUzC5iy8 HDiw== 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=WmpWMw7qSvs5CvJgVhJ2zNuAs8rl3naMq+0JdPfhg3k=; b=nc94UDKyahXFplQkQMk048/ch49k2BjOC2/Rf7HCN2shEFEZjmg5VMuUCj8Hmxlgxd RqwOs9TC1+dKcGixTD2HvL0GwLTePETQjctRWJ+jjNTNyx53SZkSSG2uq85U7NepYR2b 5ygVeP3yRl/v/fqWKUn7tcXvwSGj50QSzeJljzsf3zsrUX67YvQlUVEJun4AxYvWUGCN 3/yUXAcsuWFU3DF6J+54HLLT1rr14WHAzxUK7c+Nen55wg8H6Z1qvjnbmgfRmfDVhTjY ZaeW36WLberyY55FmGGOzlZBkUnBez7BPfGGxFK6lPdaSinqzMDq0UGTA+vWvEa3EWZk If5A== X-Gm-Message-State: AOAM532Fa3Cs0q/ZJ/9dTL1V1hsIJhJr34cLBw+wLkUkieacEIkoAeJ1 faTa5hOHVT2iyeTssrLE70QMse5yK9JtrQ== X-Google-Smtp-Source: ABdhPJwZwR2+b9LkPTauI7ZM26duwtFyJsM7DjzDuYZz0utCL5FXMN1phBFWzRIRFKTuraNzonYpsw== X-Received: by 2002:a50:99c6:: with SMTP id n6mr1902350edb.171.1638305091924; Tue, 30 Nov 2021 12:44:51 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 12:44:51 -0800 (PST) From: Attila Lendvai To: 52207@debbugs.gnu.org Subject: [PATCH 5/5] gnu: trezor-agent: Update to 0.11.0-1, aka git tag v0.14.4. Date: Tue, 30 Nov 2021 21:44:32 +0100 Message-Id: <20211130204432.16295-5-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211130204432.16295-2-attila@lendvai.name> References: <20211130204432.16295-2-attila@lendvai.name> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 52207 Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) --- gnu/packages/finance.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 9b98eafcd4..68549520c2 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1103,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) @@ -1114,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) @@ -1135,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 @@ -1152,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 -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 01 10:50:07 2021 Received: (at 52207) by debbugs.gnu.org; 1 Dec 2021 15:50:08 +0000 Received: from localhost ([127.0.0.1]:45193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRrz-00055u-KH for submit@debbugs.gnu.org; Wed, 01 Dec 2021 10:50:07 -0500 Received: from mail-wr1-f44.google.com ([209.85.221.44]:37397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRrx-00054r-EL for 52207@debbugs.gnu.org; Wed, 01 Dec 2021 10:50:06 -0500 Received: by mail-wr1-f44.google.com with SMTP id d9so32432403wrw.4 for <52207@debbugs.gnu.org>; Wed, 01 Dec 2021 07:50:05 -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=urxfNcgwEq27g8ZCSKp2fIZHBM/9HxwQwdg6D9XUu34=; b=qt5wb5F6RReoY70EoHH6M0WLzusL+vAMS6qmnDyJyAQK+qROmIbxKmV4DyGGJnMBsy 6VuS1RNAUmoe+v/RUyMEsvMS/VfcwdkuQgTByEk/K7TbkZdCEOfOmcMi6BWn3HkUvf9n e7ndeOne5mDIaPUuuk/Qol55rtvfjJYux6oHijBe7JzVelqsw5NMWWGiMvwGVVPgEaxg IaCaspXKV6aWDa1GAtFJqS/rJWzaRxxPn0wvFynz2aaET3kyUTztQf8e1QGySla8SfQE yA01/4cpqLV7RbxdZyqQOhKIxcPrg6ueYYJLzX76MDK9x1Jix5ZLVW3BYqZBVxtWe0aw QPUw== 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=urxfNcgwEq27g8ZCSKp2fIZHBM/9HxwQwdg6D9XUu34=; b=YSr6GOENTwhkhTF5VhgHMgM6mHmZABxOuPQwuho3uHDu4FSGoqivGCRt7In49qULcp 3IJnXYYFcXw0DO1NgYZ/fRB92C6TAy8HCIPHXvn4C+3TLVpwkhgBMd/pAqUdzxDaLTrl uMYAAJW3e7KCy3AlLvKTICB6sn4iq/rmqbLNXdyienBybBgYj85mclvhPcWNB+KWTEot 3E+JDb0DbA8xcmHPrnXC0iQcV9ygqHRqHEsRkX1GzdXxJcKUP1YsPEn5R3XTu1iPixCf ZMGYQsw9Oa2Hs8VA5Uv3FyF6S8uByS7MXuib2mmdph7CbF5sQ/RE4Y6u9HPDPfH39hz7 P0rQ== X-Gm-Message-State: AOAM532JVQMLFBq9ctc3z4E/Q17vVLfvju4AypV1KSwBmK+mSYu78Oqe K7pcAoMyVkD6AvLo/oEBm14QtPWK/quf6A== X-Google-Smtp-Source: ABdhPJw3IdWRH3CufqHAUZh3h18u0cmH363BjbrLLiAiM0RDhyUp/jdkaNg/ECA0pChfLQH3MIlwrg== X-Received: by 2002:adf:ef4f:: with SMTP id c15mr7879607wrp.226.1638373799569; Wed, 01 Dec 2021 07:49:59 -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.49.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 07:49:58 -0800 (PST) From: Attila Lendvai To: 52207@debbugs.gnu.org Subject: [PATCH 1/2] gnu: python-daemon: Update to 2.3.0. Date: Wed, 1 Dec 2021 16:47:07 +0100 Message-Id: <20211201154707.7865-1-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 52207 Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) --- as requested, resending the patchset in only two commits (rationale: the packages are inter-dependent, and splitting the commit means that the commits would leave the repo in a broken state; thinking of git bisect, etc). gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ffd39860d8..2f95f272c7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4103,14 +4103,14 @@ (define-public python2-joblib (define-public python-daemon (package (name "python-daemon") - (version "2.2.3") + (version "2.3.0") (source (origin (method url-fetch) (uri (pypi-uri "python-daemon" version)) (sha256 (base32 - "09fcjdjzk9ywmpnrj62iyxqgcygzdafsz41qlrk2dknzbagcmzmg")))) + "1bxfn2bq56sd4w0nm9mqy8y0905m7fc8vmhnjxlrf49vcbqr7adx")))) (build-system python-build-system) (arguments `(#:phases @@ -4125,9 +4125,11 @@ (define-public python-daemon (propagated-inputs `(("python-lockfile" ,python-lockfile))) (native-inputs - `(("python-unittest2" ,python-unittest2) + `(("python-coverage" ,python-coverage) + ("python-unittest2" ,python-unittest2) ("python-testtools" ,python-testtools) ("python-testscenarios" ,python-testscenarios) + ("python-twine" ,python-twine) ("python-mock" ,python-mock) ("python-docutils" ,python-docutils))) (home-page "https://pagure.io/python-daemon/") -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 01 10:50:14 2021 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 To: 52207@debbugs.gnu.org Subject: [PATCH 2/2] gnu: Update Trezor support. 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-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 52207 Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) 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 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 01 12:40:36 2021 Received: (at 52207-done) by debbugs.gnu.org; 1 Dec 2021 17:40:36 +0000 Received: from localhost ([127.0.0.1]:45508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msTat-0001ve-VQ for submit@debbugs.gnu.org; Wed, 01 Dec 2021 12:40:36 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:59627) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msTaq-0001vP-Te for 52207-done@debbugs.gnu.org; Wed, 01 Dec 2021 12:40:33 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 0F2B360012; Wed, 1 Dec 2021 17:40:25 +0000 (UTC) From: Nicolas Goaziou To: Attila Lendvai Subject: Re: [bug#52207] [PATCH 1/2] gnu: python-daemon: Update to 2.3.0. References: <20211130203722.14545-1-attila@lendvai.name> <20211201154707.7865-1-attila@lendvai.name> Date: Wed, 01 Dec 2021 18:40:25 +0100 In-Reply-To: <20211201154707.7865-1-attila@lendvai.name> (Attila Lendvai's message of "Wed, 1 Dec 2021 16:47:07 +0100") Message-ID: <8735ncxlyu.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52207-done Cc: 52207-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Attila Lendvai writes: > as requested, resending the patchset in only two commits (rationale: > the packages are inter-dependent, and splitting the commit means that > the commits would leave the repo in a broken state; thinking of > git bisect, etc). I applied the patches, thank you. I tweaked the last one because it was based on a previous patch, not the current state of the repository. I also fixed commit messages. You may want to look at them. Regards, -- Nicolas Goaziou From unknown Thu Aug 14 21:46:42 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 30 Dec 2021 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator