From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id ED2FBb0G32bMFwEAqHPOHw:P1 (envelope-from ) for ; Mon, 09 Sep 2024 14:31:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id ED2FBb0G32bMFwEAqHPOHw (envelope-from ) for ; Mon, 09 Sep 2024 16:31:25 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Ib4cxNgL; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Xh4LMH9I; dmarc=fail reason="SPF not aligned (relaxed), DKIM 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=1725892284; 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=RDhuZuEuFwFjccuZVfiqG6pIEn1bkq1GxObZuVfKwo4=; b=M70Gbd1EMARQFunjd/UC+ix+ecXYjd8X6MO0rSThyAp2eJ9QIiVh1EJlOdLvWHwbmEQDe6 EyQgQ0KAEfv9LQL9Qu5qx5sqnl3zUIDx0BC1KjiyqKFHChvafAiteV0K7Kg7SToafNVlVU v8owRgcmQVsMEhepono1l7df9z33Ho1qfTa2FvT4uI/Px5qytdhV62EaqJm0ZhZujeJ+nO PYH7nv5vlOOJx3jLWYQTQUxpG1MfHDaVtFxJkf3GSUPkZ59+LhnMCIEv/s88jSf+oerbkd Ec6iXJeKLBbJWDHI7alpZKJn3FtheYABXBwV9ClFzZM3PUdtXvqtfGVBiLeLHA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725892284; a=rsa-sha256; cv=none; b=WnRNmQaCETSa3cL2e8OC4oXtXaBxnVjQd15D/2WoaDkSfstQeXwOodZ3O42yyEgWmPpaFE tRFc8iRLR7kewfDo8bzG3Dlveq8253VWzukKkd3p/ZN1PrP3HKU8xBEzrXLCnR9aUhuA6g kaBrSoliYjOpVibD6+XK2TmkUj5bi9hpGPJePVeSckFwWrTTLG8rjOAktU9pWNNUaSYrDk +eIulwa6g0ERTSoBQoC0vkG08oUUOA2KYEgVGvWMDRJKxkcUOMRs/ZsVFOmoAJcjbxs9ML Bv6l+5SRhMnNpev91R5YalqZn1lGbzXqsucpHwu5JnHLWfq4hqHqMNxuYH/t4A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Ib4cxNgL; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Xh4LMH9I; dmarc=fail reason="SPF not aligned (relaxed), DKIM 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" 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 CEE6971D34 for ; Mon, 09 Sep 2024 16:31:24 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snfPw-0000X1-K5; Mon, 09 Sep 2024 10:31: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 1snfPu-0000Oa-Ku for guix-patches@gnu.org; Mon, 09 Sep 2024 10:30:58 -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 1snfPu-0004zc-Bm for guix-patches@gnu.org; Mon, 09 Sep 2024 10:30:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=RDhuZuEuFwFjccuZVfiqG6pIEn1bkq1GxObZuVfKwo4=; b=Ib4cxNgLtkl7gdxYfvD6ok54g4IN+/j09MatYfgZoLuJXMMlJV/D8VrcKIEBrL3J52eAHOvhKErop1xA1fKXUDA3SrTGPi1vVpglUo35+Sft0672LaSx2IC4A+iNcXrLkO0beabzUnSe6KosSyF2mFt2INdE+3VUTLuPeELn0QuUYOtX3e4WeJoNNzwqq1F9/1Wqk3kbeQoTVwsaDLCAK3kgPDy2h3LNzx5ZYXaF4uqDU0tYl7GamK68vTIv+/ugdau5O6542LnIRLX2ri0Fo0rzHP6SFf+p7isMWvdwOF8Bw9Jwnb4Uenf5tO3b7hpy8I9F7+IyUY3a9pKkMrwoDQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snfPx-000176-VE for guix-patches@gnu.org; Mon, 09 Sep 2024 10:31:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73148] [PATCH 1/4] gnu: trezor-agent: Update to 0.15.0. References: In-Reply-To: Resent-From: attila.lendvai@gmail.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Sep 2024 14:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73148 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 73148@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 73148-submit@debbugs.gnu.org id=B73148.17258922404208 (code B ref 73148); Mon, 09 Sep 2024 14:31:01 +0000 Received: (at 73148) by debbugs.gnu.org; 9 Sep 2024 14:30:40 +0000 Received: from localhost ([127.0.0.1]:33804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snfPb-00015n-QZ for submit@debbugs.gnu.org; Mon, 09 Sep 2024 10:30:40 -0400 Received: from mail-ej1-f41.google.com ([209.85.218.41]:51702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snfPZ-00015X-PI for 73148@debbugs.gnu.org; Mon, 09 Sep 2024 10:30:38 -0400 Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-a8d64b27c45so86623666b.3 for <73148@debbugs.gnu.org>; Mon, 09 Sep 2024 07:30:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725892168; x=1726496968; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RDhuZuEuFwFjccuZVfiqG6pIEn1bkq1GxObZuVfKwo4=; b=Xh4LMH9IDJwwp/Gkm4Wu3MpCoxq1OSAnqyzm3W9kPkV23hg+iLnEblKFm+qXMGk/d8 y/k04XGzEpmWHUnUqS5hUGyetnFHs8N+52I9HAVsiMSz476UyGkG8r2n9IsYSCM674wX d3kZ+a8TELdtEqe9fqmqvZ1eyQDmlclR91TSgsTBthIcVFor6E6KyrrmSTe/N+bgEmpW 1ef5TZpC1kQxSnnZM+4D0KAOU1SAyif2gU9Kr5LC+kflZaA0IATQ31soquphwDoVcl/L 81aFdx2t3HO/QOLkNcFWhFn6VupFJ/RaA4LnCzYDMAh1zRCZ28NtHgMrz2kfL96rgQrZ DadQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725892168; x=1726496968; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RDhuZuEuFwFjccuZVfiqG6pIEn1bkq1GxObZuVfKwo4=; b=I89hh/qsS9uAPhHcdUw7ecBsdF5hUINinqCN5srpm9oXz/D3l/FTci3NyQ/EHA0NP6 mr38lUb1VvY/J69oVAsRb6dq7Fn1MAJfiANtRxc1jvYEEp3iKLMpRaZi/IJlDOW/Ywmx owzpZ2JdRqwL4sqWyeNNmKXd3cPIeeeLCUnXtgSICVtIjmxyCZs0rNdmHztNhlYkwG/s aey/9mYyL0G9luV9kJMolDDTX2rsIHjbdCzrbcl+5YgFx5M8lEjtUNBmrnJ/iD6BptS3 defztcN5uNTcE47fCEqybSc+WfE2v7X4OR5dx4ZV/TSgpAC3J2RDnT9VihleGhvRGuzG appQ== X-Gm-Message-State: AOJu0YzJMxufdMhFg7PtlNtNxWHWEF13Qqzh9Ibr3HuWsFV6pNVYwgF8 oGEWvwomS9qVm3ALsjqTBgY/oKMCuCzFHrD1e5VBr0vudDR4ni3vagsmkw== X-Google-Smtp-Source: AGHT+IE+S+C45TmP3nv3CMcUO/qYehf9W56rA477rjyCZZd7H+NOJRrmjUYQkhQeOkGrVes6ClJmDQ== X-Received: by 2002:a17:907:368a:b0:a86:7b71:7b77 with SMTP id a640c23a62f3a-a8a888499aamr865687766b.44.1725892167751; Mon, 09 Sep 2024 07:29:27 -0700 (PDT) Received: from lelap.lan (2a00-1f40-b161-3510--9a4.pool6.panelnet.hu. [2a00:1f40:b161:3510::9a4]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25a4338fsm351193766b.95.2024.09.09.07.29.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:29:26 -0700 (PDT) From: attila.lendvai@gmail.com X-Google-Original-From: attila@lendvai.name Date: Mon, 9 Sep 2024 16:28:20 +0200 Message-ID: <9f72e41ee461463d495624f1bf285b8c3ca63fc5.1725892102.git.attila@lendvai.name> X-Mailer: git-send-email 2.46.0 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-Spam-Score: -6.92 X-Spam-Score: -6.92 X-Migadu-Queue-Id: CEE6971D34 X-Migadu-Scanner: mx11.migadu.com X-TUID: 2VfmG19O39jK From: Attila Lendvai * gnu/packages/finance.scm (python-trezor-agent): Disable the test called test_get_agent_sock_path. (trezor-agent): Also copy the hash from the parent package. Remove the now unnecessary deletion of the ./contrib dir. Change-Id: Ied03ad4c5d1266c208a1938d748eb09c52750633 --- gnu/packages/finance.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 4b5b5eefd53..317842c5937 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -931,7 +931,7 @@ (define-public python-trezor-agent ;; the toplevel app called trezor-agent. (package (name "python-trezor-agent") - (version "0.14.7") + (version "0.15.0") (source (origin (method git-fetch) @@ -940,7 +940,7 @@ (define-public python-trezor-agent (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0")))) + (base32 "09y55ys3x5krszh58yhl5gpdri0zrlhfld6psrmiyxfbp344asin")))) (build-system python-build-system) (arguments `(#:phases @@ -955,7 +955,15 @@ (define-public python-trezor-agent (add-after 'install 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "pytest" "-v"))))))) + (invoke "pytest" "-v")))) + (add-before 'check 'disable-some-tests + (lambda _ + ;; The path returned by gpgconf --list-dirs agent-socket in the + ;; builder is /homeless-shelter/.gnupg/S.gpg-agent, while the + ;; test expects a /run/user/... path. Probably safe to disable. + (substitute* "libagent/gpg/tests/test_keyring.py" + (("def test_get_agent_sock_path") + "def _do_not_test_get_agent_sock_path"))))))) (propagated-inputs (list python-bech32 python-configargparse @@ -1227,8 +1235,7 @@ (define-public trezor-agent (method git-fetch) (uri (origin-uri (package-source python-trezor-agent))) (file-name (git-file-name name version)) - (sha256 - (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0")) + (hash (origin-hash (package-source python-trezor-agent))) (modules '((guix build utils) (ice-9 ftw) @@ -1248,9 +1255,6 @@ (define-public trezor-agent (scandir "./agents/trezor/" (negate (cut member <> '("." "..") string=)))) (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"))))) base-commit: b82c8ceae14d5d0f4584452f34f5103ffd0e0f8d -- 2.46.0