From patchwork Thu Aug 3 13:11:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 52469 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 7D39E27BBE9; Thu, 3 Aug 2023 14:13:37 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 3CFC527BBE2 for ; Thu, 3 Aug 2023 14:13:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRY8Y-0007em-0S; Thu, 03 Aug 2023 09:13:06 -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 1qRY8W-0007di-6s for guix-patches@gnu.org; Thu, 03 Aug 2023 09:13:04 -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 1qRY8V-0006ux-Tj for guix-patches@gnu.org; Thu, 03 Aug 2023 09:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qRY8V-0004if-NL for guix-patches@gnu.org; Thu, 03 Aug 2023 09:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65037] [PATCH 6/7] gnu: trezor-agent: Fix build, update versioning, and the git tag. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Aug 2023 13:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 65037@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 65037-submit@debbugs.gnu.org id=B65037.169106832818029 (code B ref 65037); Thu, 03 Aug 2023 13:13:03 +0000 Received: (at 65037) by debbugs.gnu.org; 3 Aug 2023 13:12:08 +0000 Received: from localhost ([127.0.0.1]:51031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRY7c-0004gc-1K for submit@debbugs.gnu.org; Thu, 03 Aug 2023 09:12:08 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:61723) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRY7Z-0004f8-Iw for 65037@debbugs.gnu.org; Thu, 03 Aug 2023 09:12:06 -0400 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-9923833737eso134028966b.3 for <65037@debbugs.gnu.org>; Thu, 03 Aug 2023 06:12:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691068320; x=1691673120; 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=hybi7lXmU/Dd+aEU7OZHtF59eF2dYDQBTQ/xp1CC540=; b=msh9bedvvfN04YqxF03zi+W/tUmV+WzRughJuHfoVFCQvYWHwT7Sth19FnRvH3DNiJ 77NAiuOcf26SIBgllwGMd4GcSVeeadOIDXjn5bIurr3lo/gdhllYvyZ5QpvDJfolTDk5 Gxg6isgCQCGjGlBng+lw8rAhwuzRS3DWdpgXhMyv0JIPdAhUVqVPsoqxZ32aVT0AyGeT 8PVf7NhAaA5bkoK/ljdUsEqA52oAN37bus+ASOH30OPrLZqKU2F2+UvywSomvOmF7fJb K/hL43V4QNgt3Mc9/zp0SUJ37FKRz8Q0EISQRJV9ZOlF5egWASM3nXNRDVEY04RFZVhy BJVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691068320; x=1691673120; 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=hybi7lXmU/Dd+aEU7OZHtF59eF2dYDQBTQ/xp1CC540=; b=h7vebXeBDCEf/Y4wnAYsiCrBhZ+UjAUPR/quklO/xLtpkBNvGxkFKgzAjgpziLq+qU 9Q4slio411BOXACQQ3DCQkotqasHtmPUxb/Dqk9Y/0wCSSiGfOhncBu4uzs35E/sBI0O EJ8UV9iBB/IbxEn9fVFOyfkFXgrsM5M0qXWIb5ZMrjVjcBWE1uf8FK25nSmqI7+sTDxy X6qh22VtSXQVQL8eeE1qF9z6xl5bWLm7AvVYmkKDjPAj61A1PUU7LzOCZSJIR+KrFJpg VWiZEfqiad1MAKCO2zDt8J78YP3ehMEyUBvbbepUHKOmGWHv7KN7ECygbB16RehnGqms wVeA== X-Gm-Message-State: ABy/qLa1pcNlsO8i9O6/ut6ztVWtEnhitSwuOARBeRJf7AdQ/2GZL3Rs Hxt0U3QpbcNJmDn5LYUBEnKKLI15JdY= X-Google-Smtp-Source: APBJJlGr0fsOKtOkrVV/RemFq+94baNEolGikWjOuQ7hrFd/SPcd+d2UlyupGitQOb6Fs9XdKcWxmA== X-Received: by 2002:a17:907:7882:b0:99b:ed44:1a79 with SMTP id ku2-20020a170907788200b0099bed441a79mr8137881ejc.3.1691068319865; Thu, 03 Aug 2023 06:11:59 -0700 (PDT) Received: from lelap.lan (catv-80-98-247-145.catv.fixed.vodafone.hu. [80.98.247.145]) by smtp.gmail.com with ESMTPSA id w11-20020a1709064a0b00b0099bd0b5a2bcsm10556193eju.101.2023.08.03.06.11.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 06:11:59 -0700 (PDT) From: Attila Lendvai X-Google-Original-From: Attila Lendvai Date: Thu, 3 Aug 2023 15:11:34 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <166ac1d1fb684844adf1370771870b3cd95bd14d.1691068294.git.attila@lendvai.name> References: <166ac1d1fb684844adf1370771870b3cd95bd14d.1691068294.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 Fix it by adding missing native-inputs, so that the tests finish (and thus the build succeeds). Also clarify the versioning of the package in a comment, so that later updates will not pick the wrong version number. * gnu/packages/finance.scm (trezor-agent): Update version from 0.14.4 to 0.12.0 (!). Move the git tag from v0.14.4 to v0.14.6. --- gnu/packages/finance.scm | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 0656d72e64..807241ab8c 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1212,7 +1212,9 @@ (define-public ledger-agent (define-public trezor-agent (package (name "trezor-agent") - (version "0.14.4") + ;; The version of trezor-agent can be found in ./agents/trezor/setup.py. + ;; See next comment for details. + (version "0.12.0") (source (origin (method git-fetch) @@ -1221,12 +1223,16 @@ (define-public trezor-agent ;; 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.4"))) + ;; which is python-trezor-agent in the Guix namespace. See + ;; ./agents/trezor/setup.py for the version of trezor-agent. + ;; + ;; Here we pick the latest tag in the git repo that bumps the + ;; version of trezor-agent in ./agents/trezor/setup.py to the + ;; version we specified above. + (commit "v0.14.6"))) (file-name (git-file-name name version)) (sha256 - (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l")) + (base32 "0pjlsig2gd4m10xkfpa01fr9jswqn0s3qa7l7wgfv5714x33dimm")) (modules '((guix build utils) (ice-9 ftw) @@ -1245,7 +1251,10 @@ (define-public trezor-agent (string-append "./" file-name))) (scandir "./agents/trezor/" (negate (cut member <> '("." "..") string=)))) - (delete-file-recursively "./agents"))))) + (delete-file-recursively "./agents") + ;; Without deleting libagent setuptools complains as follows: + ;; "error: Multiple top-level packages discovered in a flat-layout: ['contrib', 'libagent']." + (delete-file-recursively "./libagent"))))) (arguments `(#:phases (modify-phases %standard-phases @@ -1274,8 +1283,10 @@ (define-public trezor-agent (build-system python-build-system) (inputs (list python-trezor python-trezor-agent)) - (native-inputs - (list python-attrs)) + (native-inputs ; Only needed for running the tests + (list python-attrs + python-bech32 + python-simple-rlp)) (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