From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 8FFTFf2C9GSMAwEA9RJhRA:P1 (envelope-from ) for ; Sun, 03 Sep 2023 14:58:37 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 8FFTFf2C9GSMAwEA9RJhRA (envelope-from ) for ; Sun, 03 Sep 2023 14:58:37 +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 AC07A65996 for ; Sun, 3 Sep 2023 14:58:36 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=PNq6NEKY; 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=1693745916; 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=ooddhUzq9uTGbGqLO3a2Xt5dBPYOw7T99C7oQiTtElgpSDsVsqcqOS6l+N4nUMkDKVAY+C hiOlGZXp/0xsH6WRCYYfaFkL1eT+8qjqnZ8Miz3EiUOziprJWWH+jH4QIfqK275r6/wtCL Tw+F+xnHav/IF/pj0PSqPbkrhKRqbNnYzSQAw6zWsa+laIsBPTJUI0mLLyUoZVaZ9lx5OQ SttWfBUdeWwld/jJZPxJsIEjqw821Oi0hZUuo8+AYL4AlNR9eEB+uc2jrEF0TRTgwZQRPW xoeKSzixGalVFOk2veutvkCS96weLkenB6ZE1yJ8jgpB0Rs6n2I7frpxLScNQg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=PNq6NEKY; 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=1693745916; a=rsa-sha256; cv=none; b=KB5fB4IZF+3zgv2W9RiJreV6YHK9uXuQl4U45A/DiZo2/YUxx1XFWmYidGkMoPb5BALpd+ leKjx/ljGMbexe0qqRFd2XBtLsfsnyVHAMW0dcbGRFsOs2SPuqN09NUfPcaVIQMV281ZCu wnF+7yzFlhDBcBv89acde+GgE6/h3+bvf9axvipUjxxwQKPGJQxz7W65u1G1roUY0y9s3h Qksnh1wICsWbb0rRx23paFfDwc/JT5NwOkcS7hk2/pvTF+xhICFkFHF0ThqXf+x5eV+lLs ZOnLIBeiOAybn/IN8QX6pTiQy8QxumrvfW387JE3Ro61hPrpXxlba/XNa/wQ9g== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcmfz-0001aN-LV; Sun, 03 Sep 2023 08:58:03 -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 1qcmfq-0001Xh-9y for guix-patches@gnu.org; Sun, 03 Sep 2023 08:57:55 -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 1qcmfq-0001Ne-1l for guix-patches@gnu.org; Sun, 03 Sep 2023 08:57:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qcmg0-0000o7-Bz for guix-patches@gnu.org; Sun, 03 Sep 2023 08:58:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65037] [PATCH v3 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: Sun, 03 Sep 2023 12:58: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.16937458362999 (code B ref 65037); Sun, 03 Sep 2023 12:58:04 +0000 Received: (at 65037) by debbugs.gnu.org; 3 Sep 2023 12:57:16 +0000 Received: from localhost ([127.0.0.1]:39971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcmfD-0000mG-QU for submit@debbugs.gnu.org; Sun, 03 Sep 2023 08:57:16 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:55316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcmf8-0000kl-At for 65037@debbugs.gnu.org; Sun, 03 Sep 2023 08:57:11 -0400 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-9a58dbd5daeso93967866b.2 for <65037@debbugs.gnu.org>; Sun, 03 Sep 2023 05:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693745814; x=1694350614; 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=PNq6NEKYzBWHnN4HErQ0u/uEIBvMiKzKB67gikuqbo0sSHb3nOLEbSvMiE8/8E0POg P0/oXhXrx0iX0gzhyEePwI+FBfSdX+FjVQNVyD48KG9uxHmoUgZZyMeGCPTg8d/cy7RK 3H4OXtMncsd/1BnWhrG1qaEoodMSg/II5AStE540QEyidUXsZ+O44a7MbFasqXwq55KA WqafagQy/6sX5YplrqJn88+4uTf3x7zd15bxbKRT5BlJH7f2FRfbD+w6tVEyIw/aeNYo djV6kBy1ohZs1hx2DRB+nn/ktgutvuYlNxsrBKhbG1T7o5XZ/TioQvg5aMdejVwDItgS Rrsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693745814; x=1694350614; 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=BZcZOARwy3MFJO9O9BriHPXKGQ21nPuH7pvDFvtnBqO79ki/PRxGZNnen6e0GG71J/ +Uec+/qGXnXk8VgqPWD4KebbcvZOPaL0uPQO3i3RnUQryi7p1SqX/zlKkTZ6aDvQJcyh YoCK4n9d7sQOsm3n03WFYoZv451EgFsY+f6Brkf1to6K72yLP+N6ViRjBsqft/pRkF3e lEC1wqmVueD7FaNuxqYXS8EwaM/HR6UsmOtSc/zYadr2cQwC3nowqDyGVGgCLk87ecjB H+WT6GEzcXTIPp3+7yJKQZfkocr2dd4T5tmEL8NGHzOyvSTXZZj1sURcsbzo/CZO0DCc C9ew== X-Gm-Message-State: AOJu0Yy/kdHYzbd0bug++xWD6zhgsyOfPNaC7pNAvJoMaZATBPa+TZDV 7Cf6/OZpmP+g8Gzl8ggRpNzrVQy8bgAEWw== X-Google-Smtp-Source: AGHT+IGhUo8v1ypmnprRFaEaqUNK4drTg2IJy4mQOvXo9jQfxjtiWpPedq98Zm8xI+AwUV2JydFldw== X-Received: by 2002:a17:906:9be2:b0:9a2:292d:ea63 with SMTP id de34-20020a1709069be200b009a2292dea63mr4963263ejc.37.1693745814140; Sun, 03 Sep 2023 05:56:54 -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 rn1-20020a170906d92100b00992665694f7sm4726782ejb.107.2023.09.03.05.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 05:56:53 -0700 (PDT) From: Attila Lendvai X-Google-Original-From: Attila Lendvai Date: Sun, 3 Sep 2023 14:55:50 +0200 Message-ID: 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: AC07A65996 X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: 3.27 X-Spam-Score: 3.27 X-TUID: ErnGjFRX/jMg 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