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 sDCPElFT6mT/lAAA9RJhRA:P1 (envelope-from ) for ; Sat, 26 Aug 2023 21:32:33 +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 sDCPElFT6mT/lAAA9RJhRA (envelope-from ) for ; Sat, 26 Aug 2023 21:32:33 +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 D1D6E5F3EA for ; Sat, 26 Aug 2023 21:32:32 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ryYIEs4a; 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=1693078353; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=90S2witmYkM3HgUBH7h/BZFucJZAA88CSyHeuawTSKY=; b=gwwl+pH+LDRrHJAEUdmT+wydtyiQxcNpAoSKnPd1dcdniLWO5HlSAxNarkCl5yU3SSFJY4 wrJaMxF+i4PgwvGwWOfxD1rDk3vrvWCWG9c54TW9otLRzCCU/fAdK9d2d7YRr5bYyIqHI/ UN8PrnDJGtfI9vg1kph36Dc6xsu4fTu+nuB3vYXy04AWxN4V8Wwdlny/FzAW51fwPMjOKc a8vvewCx7fKbBPbkRN6au+LrlA+LcCzrT4VOiTEMZedpy7EDQ99SY1b7TvijrzTeQH+ry9 YF4OxHmzAxiGUoh4mSfDPKhYB4zzo4rGKNi8ryy5T7MbjpcrWAjAtWXlslMW9A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693078353; a=rsa-sha256; cv=none; b=Mo3HzAW0dr2dADx0lDx+Y5x5uUHHLipEuKN0MK2d/h9d0+XycehlIRIXquaSmacm59G/Mo PCXyyOMpe6tKXdWqSHSetbe1xq7AjhpYoq9CWIILxx/dWDWNS/PdUfGUcLiaETgfovN2JP 1GZzsAHsgLYuwgg5/PF6S+RP7v6hSiDYoCaEo9QeTX+wjCCtktGcP0KGOzsCgi6vfQhNqW mbIe1TAn4SffFxJu7xMMkUqaSHKpAHxt3Jynwedqd5NSiZLWLy2G+0Imm7KbpOqJlIIbtF i03WF+4M9BfbatcvHiE2f9lZrerZ2dkp3oXp8rb+mB0RS8mLyzI4qmQLtbwt8g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ryYIEs4a; 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) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZz12-0008JL-EB; Sat, 26 Aug 2023 15:32:12 -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 1qZz0p-0008Hv-26 for guix-patches@gnu.org; Sat, 26 Aug 2023 15:32:00 -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 1qZz0m-0008SP-Qj for guix-patches@gnu.org; Sat, 26 Aug 2023 15:31:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qZz0s-000086-3W for guix-patches@gnu.org; Sat, 26 Aug 2023 15:32:02 -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: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Aug 2023 19:32:02 +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: Attila Lendvai , 65037@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 65037-submit@debbugs.gnu.org id=B65037.1693078281436 (code B ref 65037); Sat, 26 Aug 2023 19:32:02 +0000 Received: (at 65037) by debbugs.gnu.org; 26 Aug 2023 19:31:21 +0000 Received: from localhost ([127.0.0.1]:43479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZz0D-00006u-67 for submit@debbugs.gnu.org; Sat, 26 Aug 2023 15:31:21 -0400 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]:57714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZz0A-00006f-V5 for 65037@debbugs.gnu.org; Sat, 26 Aug 2023 15:31:20 -0400 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-5009969be25so3191842e87.3 for <65037@debbugs.gnu.org>; Sat, 26 Aug 2023 12:31:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693078267; x=1693683067; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=90S2witmYkM3HgUBH7h/BZFucJZAA88CSyHeuawTSKY=; b=ryYIEs4acxnohrMAEGsOhCibNLDxlEzHJ4ErK1CTCYdDo6hrfmo8Ix3UdB9qXQupER 7oAuop0A8EzvctNoF/eN/da+9sybE+quK3VkF0K3zzAEKhxSubnXcztvKA+Vw/yxYV/7 GgG8s2RhI+RHMeFxI2MYP/vshBv1f9IJ/ENiYrl/a1yhOUvGSriR+tbMN5q3nUVS1d/W zW7w4A3P3J14LODFfQ5sj3Xl5PuZ/LGyZAHR3PsHEGf6hncChkT6MOZu8tBOudKzc+OV N+uFUoNFyZ8ZmgNLj8OfMZWUrWjzOqf1cgwFVZzHbMwooD073FBAu54dT4PHWzZAeVJ/ 3Tiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693078267; x=1693683067; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=90S2witmYkM3HgUBH7h/BZFucJZAA88CSyHeuawTSKY=; b=RmsKa3GyhcCMq64wH6TgFppO83n9/9LrtWInjbTA2sMOtbObJa3ILZCYFltWxnaPWQ HAp7W9cVM26NmAgeYjVrE0bkvJUe6kdVvaqF1kQZfKZnJqFFeh8n4vSppqJaOd8NGE2N 00ia8Gs1ybQvAXlD5Psz762XBKtsHT+sxfNMd3UoKts+Zha/cDWDrnJh5iklHYOSACKB cw5uSY8YYsMFJMCt5jdlOsfgy5rJuUKGSPnaQg0gMmGJlRFtahh0iWZLfG2DhQR7PtFH 11Lrwm+4fT6QrjoA+b071xr/abcTGPwMDGYzmZzmhUelClRW/TgvIF0k9a6aCIR62hg3 8HAQ== X-Gm-Message-State: AOJu0Yw2JCC1AJH4WBz1tcpWwWGP/sxws3M3FiwSSBwWdOfByXEbPTeO HkuHehCyOgbcEJ+uDnq5ICE= X-Google-Smtp-Source: AGHT+IFyD7gzC2j3YURWxVpIyl9nNdEqB4uwT/NkEDv0PQUpTWaBhGJ7cA1ssvigFE72cGqq9LQ1JA== X-Received: by 2002:a05:6512:3ca2:b0:500:8257:4b34 with SMTP id h34-20020a0565123ca200b0050082574b34mr16502576lfv.68.1693078266678; Sat, 26 Aug 2023 12:31:06 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id e10-20020aa7d7ca000000b005256994e335sm2484225eds.92.2023.08.26.12.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Aug 2023 12:31:05 -0700 (PDT) Message-ID: <100d865da2eec859cc783d7755ffe44983f619fc.camel@gmail.com> From: Liliana Marie Prikler Date: Sat, 26 Aug 2023 21:31:04 +0200 In-Reply-To: References: <166ac1d1fb684844adf1370771870b3cd95bd14d.1691068294.git.attila@lendvai.name> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 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+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-Spam-Score: -5.12 X-Spam-Score: -5.12 X-Migadu-Queue-Id: D1D6E5F3EA X-Migadu-Scanner: mx1.migadu.com X-TUID: TeVoKMwK/z4B Am Donnerstag, dem 03.08.2023 um 15:11 +0200 schrieb Attila Lendvai: > Fix it by adding missing native-inputs, so that the tests finish (and > thus the > build succeeds). >=20 > Also clarify the versioning of the package in a comment, so that > later updates > will not pick the wrong version number. >=20 > * 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. =E4=BD=95=EF=BC=9F > --- > =C2=A0gnu/packages/finance.scm | 27 +++++++++++++++++++-------- > =C2=A01 file changed, 19 insertions(+), 8 deletions(-) >=20 > 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 > =C2=A0(define-public trezor-agent > =C2=A0=C2=A0 (package > =C2=A0=C2=A0=C2=A0=C2=A0 (name "trezor-agent") > -=C2=A0=C2=A0=C2=A0 (version "0.14.4") > +=C2=A0=C2=A0=C2=A0 ;; The version of trezor-agent can be found in > ./agents/trezor/setup.py. > +=C2=A0=C2=A0=C2=A0 ;; See next comment for details. > +=C2=A0=C2=A0=C2=A0 (version "0.12.0") > =C2=A0=C2=A0=C2=A0=C2=A0 (source > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (origin > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (method git-fetch) > @@ -1221,12 +1223,16 @@ (define-public trezor-agent > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 ;; The version mismatch is not a mistake.=C2=A0 Multiple > Python > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 ;; apps/packages are in the same git repo, and they > have > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 ;; different versions.=C2=A0 The git tag seems to track > libagent, > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= ;; i.e. python-trezor-agent in the Guix namespace.=C2=A0 See > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= ;; e.g. ./agents/trezor/setup.py. > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= (commit "v0.14.4"))) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= ;; which is python-trezor-agent in the Guix namespace.=C2=A0 > See > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= ;; ./agents/trezor/setup.py for the version of trezor- > agent. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= ;; > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= ;; Here we pick the latest tag in the git repo that > bumps the > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= ;; version of trezor-agent in ./agents/trezor/setup.py > to the > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= ;; version we specified above. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= (commit "v0.14.6"))) =E3=81=AF=E3=81=84=E3=80=81=E3=81=84=E3=81=BF=E3=82=8F=E3=81=8B=E3=82=93=E3= =81=AA=E3=81=84=E3=80=82 First things first, if it's one source for two packages, why don't we simply inherit that package (or at least its source) instead of doing things this roundabout way? Second, I'd do this as a multi-stage thing. First, "upgrade" trezor- agent to 0.14.6, then "downgrade" it without changing the source. This way, folks who use the builtin downgrade prevention will have a commit to point to get a newer version from. Cheers