From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id UBabJsm09WQT/QAAG6o9tA:P1 (envelope-from ) for ; Mon, 04 Sep 2023 12:43:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id UBabJsm09WQT/QAAG6o9tA (envelope-from ) for ; Mon, 04 Sep 2023 12:43:21 +0200 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 67C9959010 for ; Mon, 4 Sep 2023 12:43:21 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="WF7ENT/9"; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693824201; 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=nXqB3/ZInSyczDakrNdxGWD7M4PKaCrBG9eVg8yLSVs=; b=Idz5ct/y8PNgYdj7uAxOkHjuJmLAJ3144k4ERK6qJIN+GzBcLv45URWDhMG3wBf3xTAKDp 8kcA10/sLFJ7AfI8OzauuH1wDZwknmacTgkXqgqpAafugGW+e1/Qt9DZpyOllyakJJ1Z8x VCdX3BV12oaOmgtHFZyVoc9k0dHGvkI7HdBpxk3Ayycje763JDCf5pD2fRkFFum56IwbAn hsCfbehMvsRFuFZnDPZE0unIVP2uFfBtYzrT91gPHAfjnb6HriLImzJgdyxHSrT04VK/Vw YnB1pO4QbwiakzxR0JHvPMq7MwbHp6J5xwQpuxvK1nv1tylYWbQFGBa/mM7vvg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="WF7ENT/9"; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693824201; a=rsa-sha256; cv=none; b=Qz948WVKhU/+prcNkwVA4k+4/i5YD0pwbL8s+lLPbL9KLrshqj6DmjobwMD5Kd6uBq5PQK BY/cPb3Hjfkstbjo2SQsfcjypEhM9MCMvpWmoIZJKgexPwsEgmnQ6qWPpPCcpl5Ix4r0OZ Su933ayaEYZPDQJCuP7J6lEtt3oTNnwBv8IgchHyi75QLYOJXYu7ssSK2I4TYuDXYWVIOv vRednVSnadAqCf3ZWxDaLJxKOT6PwNyaXT1ILkC6UvNG5a7rsinDa2jF0FuDUu9ws28ECH eKU+tFuoc/YrXu/q9u3AcdGydEwo2PJby3Gyx1Fm7IT2Rs3lL80VwZ8f6Ns/5A== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd72S-00078j-BX; Mon, 04 Sep 2023 06:42:37 -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 1qd71y-00072S-Iv for guix-patches@gnu.org; Mon, 04 Sep 2023 06:42:07 -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 1qd71w-0007nd-BX for guix-patches@gnu.org; Mon, 04 Sep 2023 06:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qd71w-0005xZ-4X for guix-patches@gnu.org; Mon, 04 Sep 2023 06:42:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65037] [PATCH v4 6/8] gnu: trezor-agent: Fix build, change versioning scheme. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Sep 2023 10:42:04 +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.169382409022808 (code B ref 65037); Mon, 04 Sep 2023 10:42:04 +0000 Received: (at 65037) by debbugs.gnu.org; 4 Sep 2023 10:41:30 +0000 Received: from localhost ([127.0.0.1]:48836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd71N-0005vi-MB for submit@debbugs.gnu.org; Mon, 04 Sep 2023 06:41:30 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]:45189) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd71I-0005uN-2N for 65037@debbugs.gnu.org; Mon, 04 Sep 2023 06:41:25 -0400 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-500c37d479aso1980052e87.2 for <65037@debbugs.gnu.org>; Mon, 04 Sep 2023 03:41:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693824078; x=1694428878; 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=nXqB3/ZInSyczDakrNdxGWD7M4PKaCrBG9eVg8yLSVs=; b=WF7ENT/9rcoRe2TpP3EvVd+gDrYnAa3etYtk+8QbeMYsexnLtp93nIlKPDE4Tu8+gb iEmxUNqBcOPkN+mWWQIJTtkwNtrP/8bVNcIOXjiJS77Dl6Wz1nLxjdrXu67xC5iSsGzY XdqpPIzh6a7HJXHFvZFNei7iBUF/M1UzKMe+lrn7jAqW2/hp87kgCJg6GnJo6Mf+zPKr JAskawkfe1jIRPdkwwQqSZ0VtKK0RjyKV691RcworxOloMqPyQLwyk4Uh5xOSjbgCt5T jJeM/qPD9VzqGee2YxPeFFB+ABAtgIJFteTEoTKDWud4CUjLxfqe1y845NUQBQL+oDZ0 YRyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693824078; x=1694428878; 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=nXqB3/ZInSyczDakrNdxGWD7M4PKaCrBG9eVg8yLSVs=; b=XHMrKMo4VelPAOgeSKf8C7PXxfNzjg/wH6P4LlkNKaN6EXFCAZk0oHRsdJvHmCt0yf YGNpCZTNxSPkf1PDiWJrMkT94+MLwRPW3tFSXd3HHHJj07eW/MdOKcS6qi5cFWw6Xa3s /CTghYTB3IKewGI1ahVGh5IfRfKn+PjCW2z6IwzysqkZqu+LCsq9kKytFcB7lY87nnQE hTzy8N4A4alAAOfdZHoX98iG/A3n39j8d8+hx66P2LKlF3XYu7uFzoSjejVzZEa+HCcU IcWlbAwQ4qnmuUd8gHWL/NUmKETfsmL9TesHs3IQjpExzUbpnUKcu6/V93IANgpIiDL0 nsBg== X-Gm-Message-State: AOJu0YxFK2XYEYwczzwffg93y76fD36hTHdCH4IFO8YKFhdg5vMFtDKB a20PnYzRZJFdT/AuB+ng7JUOMBQCohLASQ== X-Google-Smtp-Source: AGHT+IHCwJZIS5m4HNPglUbkihXz9XAQpHhCR7Dk9kCl69gsek/z3/6Y80cUkl+GCqaHMllaAW9QEw== X-Received: by 2002:ac2:5f48:0:b0:4fd:bc33:e508 with SMTP id 8-20020ac25f48000000b004fdbc33e508mr5468241lfz.49.1693824077800; Mon, 04 Sep 2023 03:41:17 -0700 (PDT) Received: from lelap.lan (2a00-1f40-b161-2f0-6b9f-85-742e-f655.pool6.panelnet.hu. [2a00:1f40:b161:2f0:6b9f:85:742e:f655]) by smtp.gmail.com with ESMTPSA id d25-20020a056402079900b005224f840130sm5560568edy.60.2023.09.04.03.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 03:41:17 -0700 (PDT) From: Attila Lendvai X-Google-Original-From: Attila Lendvai Date: Mon, 4 Sep 2023 12:40:45 +0200 Message-ID: <24e3985f1802d9c2163a8a4e6ca6f68543416c30.1693824046.git.attila@lendvai.name> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 67C9959010 X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: 3.27 X-Spam-Score: 3.27 X-TUID: zd0nl40S3u8e 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): Copy version from python-trezor-agent which effectively updates it from 0.14.4 to 0.14.7. Copy the origin also from python-trezor-agent to effectively sync the source and the version of the two packages; something that upstream will also do in future releases. [native-inputs]: Add missing python-bech32 and python-simple-rlp so that the test suite runs clean and the build finishes. --- gnu/packages/finance.scm | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 5f3b35e754..5695ec4b63 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1206,21 +1206,21 @@ (define-public ledger-agent (define-public trezor-agent (package (name "trezor-agent") - (version "0.14.4") + ;; There are multiple Python apps/packages in the same git repo. The git + ;; tag seems to track libagent's version (which is called + ;; python-trezor-agent in the Guix namespace). Currently trezor-agent's + ;; version is set in `agents/trezor/setup.py` to a different value than + ;; libagent, but as discussed with upstream in issue + ;; https://github.com/romanz/trezor-agent/issues/369, we are copying our + ;; version from that of libagent. + (version (package-version python-trezor-agent)) (source (origin (method git-fetch) - (uri (git-reference - (url "https://github.com/romanz/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"))) + (uri (origin-uri (package-source python-trezor-agent))) (file-name (git-file-name name version)) (sha256 - (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l")) + (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0")) (modules '((guix build utils) (ice-9 ftw) @@ -1239,13 +1239,16 @@ (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 ./contrib the sanity-check phase fails. Reported + ;; upstream as https://github.com/romanz/trezor-agent/issues/429. + (delete-file-recursively "./contrib") + ;; 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 - ;; This package only has a Python script, not a Python module, so the - ;; sanity-check phase can't work. - (delete 'sanity-check) (add-after 'unpack 'relax-requirements (lambda _ (substitute* "setup.py" @@ -1268,8 +1271,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 -- 2.41.0