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 WJw+O5qR72SXUQAA9RJhRA:P1 (envelope-from ) for ; Wed, 30 Aug 2023 20:59:39 +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 WJw+O5qR72SXUQAA9RJhRA (envelope-from ) for ; Wed, 30 Aug 2023 20:59:39 +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 8B97858D8F for ; Wed, 30 Aug 2023 20:59:38 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=HZm6AuGg; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693421978; 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=znYOI3X1CxPb3dV4TZLn3izjoR6+vKkPWgKztb9KQsA=; b=FQvQrQOUiHalXvN+vthw8jd81MJIJfcghPzLT5YesV9oibX/Iv1tBOiMt5e9ThUzKkn6y9 +NDGfgJt3mLC0Qh7caidj3b1v9IzOfXxKfovwfpMWk2my9ljLo5+upxeijMpVLZgZQ19hI qswtst1AQnbTVU9MeWOMJDlOgvr76880RYpPtUyjJvewWeGOYPBL5fI8fIKGSptBxvl8jQ cHyktg3+CAAm4K5uAuhMYCLMioKbGsLXx+oR5Uc8Ipkz68BxWsFdVFOQV/c5IATV/7kv+a r/6o2bx1BqsRVSkXp0f7w/Mty+PhFZbpep8KiQKUg5k+7nZo8vsVXeIaN/qOxQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=HZm6AuGg; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693421978; a=rsa-sha256; cv=none; b=eef0+gkQtNUXATiLLLQOHFLPClAB/6S+k+As57L12rtBrP03XmpNyk4pX3UGjCGHw//X9n a7vkuXiSs9YlGTXFKZZgMy8uVHR8NipJzXSSCa69Rp2HI6zJS9oiHzjZaOEc3MsTGMwgIv Qpo1torhPRPbXKxkZkR7IH1OXGnsfp4gzEoyUiM7xsePw9w4QTXQc1EeICboMr1W3A2I4R xmoteiaceE2ROxpAyvvYTdSXHtFwKF7CrkqxvDukb8YbKtX8akb/kF3wL+V+oRbZSB8QQP sYfoeL6VIsKaOvVFbwFH/Cwkx/9+TMhKjk21ixc/2r+wkZI5si7SOOmybk6uYQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbQP6-0001D8-Cm; Wed, 30 Aug 2023 14:59:00 -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 1qbQP2-0001BO-PD for guix-patches@gnu.org; Wed, 30 Aug 2023 14:58:56 -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 1qbQP2-0006WQ-4A for guix-patches@gnu.org; Wed, 30 Aug 2023 14:58:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbQP9-0002kB-QG for guix-patches@gnu.org; Wed, 30 Aug 2023 14:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65037] [PATCH v2 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: Wed, 30 Aug 2023 18:59: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.169342194010487 (code B ref 65037); Wed, 30 Aug 2023 18:59:03 +0000 Received: (at 65037) by debbugs.gnu.org; 30 Aug 2023 18:59:00 +0000 Received: from localhost ([127.0.0.1]:54002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbQP6-0002ix-0q for submit@debbugs.gnu.org; Wed, 30 Aug 2023 14:59:00 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:61629) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbQOy-0002hj-Ek for 65037@debbugs.gnu.org; Wed, 30 Aug 2023 14:58:52 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-31adc5c899fso5372835f8f.2 for <65037@debbugs.gnu.org>; Wed, 30 Aug 2023 11:58:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693421919; x=1694026719; 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=znYOI3X1CxPb3dV4TZLn3izjoR6+vKkPWgKztb9KQsA=; b=HZm6AuGg0Da78ad1GVdM/UCmW/wmCvGI1aCyD8IF3MPiRv13wt6vRJGOh55arI+XOI Jh6GF9gUwIvYaTJran/67uuFGFCsvfpfo2yzqSvpks1Wj/C6OHeuBSfVnAyhGohUTlKE WiOfS+gd2G7Lpz1Kn+B4rzqWS29T5dv+GKazKV5RDOX69kKeU78+dYT0VkO/6lbUb0hz CgoqF5aNrL60RZpJUfzaGlh2dfCtk+WF6hjyOcnIMkF4wQwjJ0N6rfy7FUljtRpaz2Xt R6iMzYr32zYn0/ffBkRqNvs5vVIwVkiD1CFqsiu+0eR3H846J3VcCT0f7iW2EHD6BfC0 blmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693421919; x=1694026719; 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=znYOI3X1CxPb3dV4TZLn3izjoR6+vKkPWgKztb9KQsA=; b=SJArmPDDjNTHxOBw1By9hygy1h0lLUaMhzVhOYVeqZzE0RBPkrjeB8F4NSib39+Uuc aznNTEcbitajWCwCKkitKJbS+adIr2R3WmESHZhBZdTnqNeieV0X4kPnfpdZ6Gw2OSkN 5UUZGiSESFt6FSglmq3I0+EDq6cYIWHL2HtqB7MyVgjBxw+0lU0pdvpqJbiou/IoP5AV 7qx1GwyjzD1QbFGlFoxV73WC6qKO+GjSsm0k77APKbAEBPIjYy08ySFL1l+dAnB2RvMh PJSeFAN/1AW6PuJUwvLp50uMVgDB+I2BOtTH2f1jJEWzocjJKro6GXLalIsyEui7cVBY NzQg== X-Gm-Message-State: AOJu0YwuYspulqx8MUvAcUKajzpAmrs/eUeQ9EbTPvr1U/KeyUVgFDsP XV10NS9xRLWLPqaugRAtBJr0A1x+4XpUDQ== X-Google-Smtp-Source: AGHT+IG72ioh3YLURu4Yzuq24/uPx/mdoI+aKHWxraVgQIXbrEYpO+yQxBBq81BDh0BIX38iNU8aRA== X-Received: by 2002:adf:fb04:0:b0:317:6263:1ae2 with SMTP id c4-20020adffb04000000b0031762631ae2mr2104548wrr.63.1693421918928; Wed, 30 Aug 2023 11:58:38 -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 o15-20020a5d684f000000b003180027d67asm17361512wrw.19.2023.08.30.11.58.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 11:58:38 -0700 (PDT) From: Attila Lendvai X-Google-Original-From: Attila Lendvai Date: Wed, 30 Aug 2023 20:57:34 +0200 Message-Id: <84091bdb65cfa39bc05ce4e6a45fd005f7d3f0cb.1693421855.git.attila@lendvai.name> X-Mailer: git-send-email 2.40.1 In-Reply-To: <592dca15951845e42d24d5179214a3fb68c35178.1693421855.git.attila@lendvai.name> References: <592dca15951845e42d24d5179214a3fb68c35178.1693421855.git.attila@lendvai.name> 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-Scanner: mx1.migadu.com X-Migadu-Spam-Score: -4.63 X-Spam-Score: -4.63 X-Migadu-Queue-Id: 8B97858D8F X-TUID: cY1G2zKQ4Jcb 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 | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 0656d72e64..f595d52093 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1212,21 +1212,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 "0pjlsig2gd4m10xkfpa01fr9jswqn0s3qa7l7wgfv5714x33dimm")) (modules '((guix build utils) (ice-9 ftw) @@ -1245,7 +1245,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 +1277,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.40.1