From patchwork Mon Sep 9 14:28:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 67815 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E85CA27BBE2; Mon, 9 Sep 2024 15:31:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7934A27BBE9 for ; Mon, 9 Sep 2024 15:31:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snfPx-0000Zv-9s; Mon, 09 Sep 2024 10:31:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snfPv-0000Tv-Sd for guix-patches@gnu.org; Mon, 09 Sep 2024 10:30:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snfPv-0004zt-Ja for guix-patches@gnu.org; Mon, 09 Sep 2024 10:30:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=YAYkh6ea/B9xKAhGfR3AG2Yj4C8+Co191gCvQIMVaIE=; b=moJ/H7N98Tqy6zqBxOhxPGZ3k3CrNc4/TwkYg5fc6YD0Bb+lx9z+qc++mZ6dvCZujFUEyL3YZpQyqxFmk7Vqi8QN1mfxoeItljh0K62ZiYwPYMiQ+nOzRiBciqqNtSTpiaxke8XRyApSXVEwDq7i8GSKyLcPpwpA/Buw5QcmElWNIfWkrbDZg9WFsfGvuyEBEe9u9e+qAtsiCEoHcluTl4Xlc8Stq/Jc/N7+UvN3p7PZ0UrUBf64UDlnjoLu8ckiXx1c4JgGI8a63xsPOqYBiMYIefKwujfrfk6ggXJGL1XwyM/xUHpIqKZpZa9NgP553rrMe5isHoiqz+LTrEyThQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snfPz-00017U-7D for guix-patches@gnu.org; Mon, 09 Sep 2024 10:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73148] [PATCH 4/4] gnu: python-trezor-agent: Use absolute path for gpg at runtime. Resent-From: attila.lendvai@gmail.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Sep 2024 14:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73148 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 73148@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 73148-submit@debbugs.gnu.org id=B73148.17258922494260 (code B ref 73148); Mon, 09 Sep 2024 14:31:03 +0000 Received: (at 73148) by debbugs.gnu.org; 9 Sep 2024 14:30:49 +0000 Received: from localhost ([127.0.0.1]:33813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snfPl-00016b-8I for submit@debbugs.gnu.org; Mon, 09 Sep 2024 10:30:49 -0400 Received: from mail-lf1-f43.google.com ([209.85.167.43]:48514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snfPi-00015z-Ri for 73148@debbugs.gnu.org; Mon, 09 Sep 2024 10:30:47 -0400 Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-53653682246so5429871e87.1 for <73148@debbugs.gnu.org>; Mon, 09 Sep 2024 07:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725892177; x=1726496977; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YAYkh6ea/B9xKAhGfR3AG2Yj4C8+Co191gCvQIMVaIE=; b=Wr9gBzm9UqN6y/+LaE+UfOT/UD+r0LAyrFVY2vrY+fpkthFxU7Gtm/INoU7nam4hnS Gc7PlLfxtoILjYOiPDBUoyR7HXz+/EOHG1qQBGqqwvXXLhQkMnuA/ty/xZlf2dshQiCX W+HK+LD6cZbJS2sgrZTYLNTZQOwL/wS8IQW3OEcAiphllCvP6OJcd3F+aHQx3KO897jf LyI1r/VPyUgqHWr27vwxmgB1QONRcKqLQsAIU1g6+djT+x+/xLkAw6zvvnE5Q/8WM1CK JXbxw5ksoRGdC2XWq6eKdoEczVg61SIhIJXnbdrpRTCUJTEEwX4xB1hzKpvaFhP80eNJ e0qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725892177; x=1726496977; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YAYkh6ea/B9xKAhGfR3AG2Yj4C8+Co191gCvQIMVaIE=; b=ZYMwCNmJ/Q+yD2XCywG9hpbRgZ2PX1D3XeWAHbLLRpblQAbaBiBX1E3sKQIBo0h+wF bgB0g0osh9pxRJkbncEhru7oUFZUYi5t3aHUn23O5UI+tGgeciMohlC3BAelXFOH0pRD ktD9pVLHGD8tH8LJAT2cH+CUdPIfc2q8Lxxz26s2vSM/xL5f1jQSG8nEfcsg0Hr/TmdD S0y0K5X9ul26GH6V4Bw3C/Q06EPurkDetZnKnSk4lerfQA2WlsXJLt3Y37lwvaTASrCK Op9YUw4x9yPUyyII98X6CFF07TmR97Fp/OIHnwdt/cQEhvnGJaMkN+vmDWzXbsYQ+tYG muYg== X-Gm-Message-State: AOJu0YyAhDJYMIZ9Hvbf1IrIHVv8LJBZkl4AKLo6fdDQurYrsS1Ue5s1 7LWxoEODcbtvg80Ghz62R+oe7dGkKyj1JAzlzHaNr367tK8biB3p7hWn7g== X-Google-Smtp-Source: AGHT+IGV2ETPNABU2n8iEpxZBciiwKm9oBgieEVFFqv4/sxJ1FlDByEt2Dpa5PzuAlQmcZrBBHwXHg== X-Received: by 2002:a05:6512:402a:b0:530:ae22:a6f0 with SMTP id 2adb3069b0e04-536587a362dmr8327941e87.5.1725892176506; Mon, 09 Sep 2024 07:29:36 -0700 (PDT) Received: from lelap.lan (2a00-1f40-b161-3510--9a4.pool6.panelnet.hu. [2a00:1f40:b161:3510::9a4]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25a4338fsm351193766b.95.2024.09.09.07.29.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:29:35 -0700 (PDT) From: attila.lendvai@gmail.com X-Google-Original-From: attila@lendvai.name Date: Mon, 9 Sep 2024 16:28:23 +0200 Message-ID: <239309df806153135e79ff7fc76d983cbef303bd.1725892102.git.attila@lendvai.name> X-Mailer: git-send-email 2.46.0 In-Reply-To: <9f72e41ee461463d495624f1bf285b8c3ca63fc5.1725892102.git.attila@lendvai.name> References: <9f72e41ee461463d495624f1bf285b8c3ca63fc5.1725892102.git.attila@lendvai.name> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Attila Lendvai The trezor-gpg binary execs gnupg at runtime. Prior to this fix it wouldn't work in a profile where gpg wasn't in the PATH. * gnu/packages/finance.scm (python-trezor-agent): Substitute absolute path for the gpgconf binary (and with that to all gnupg binaries). Fixes #57345. Change-Id: I9acc5a31a1189d0121152c2bd9ba0ff5eb90af09 --- gnu/packages/finance.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 841f128d092..e4a5ef829ba 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -951,6 +951,11 @@ (define-public python-trezor-agent (lambda _ (substitute* "setup.py" (("'backports.shutil_which>=3.5.1',") "")))) + (add-after 'unpack 'set-gpgconf-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "libagent/gpg/keyring.py" + (("util\\.which\\('gpgconf'\\)") + (string-append "'" (search-input-file inputs "bin/gpgconf") "'"))))) (delete 'check) (add-after 'install 'check (lambda* (#:key tests? #:allow-other-keys) @@ -978,9 +983,10 @@ (define-public python-trezor-agent python-semver python-unidecode python-wheel)) - (native-inputs ; Only needed for running the tests - (list gnupg - python-mock + (inputs + (list gnupg)) + (native-inputs ; Only needed for running the tests + (list python-mock python-pytest)) (home-page "https://github.com/romanz/trezor-agent") (synopsis "Use hardware wallets as SSH and GPG agent")