From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0KmWIS2xTWHWdAEAgWs5BA (envelope-from ) for ; Fri, 24 Sep 2021 13:06:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id WEtEHS2xTWG6SAAAB5/wlQ (envelope-from ) for ; Fri, 24 Sep 2021 11:06:21 +0000 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 23B3C347B3 for ; Fri, 24 Sep 2021 13:06:21 +0200 (CEST) Received: from localhost ([::1]:46124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTj20-000765-6y for larch@yhetil.org; Fri, 24 Sep 2021 07:06:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTj1n-0006yj-Jm for guix-patches@gnu.org; Fri, 24 Sep 2021 07:06:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45230) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTj1n-00055T-Bu for guix-patches@gnu.org; Fri, 24 Sep 2021 07:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mTj1m-0002PR-Us for guix-patches@gnu.org; Fri, 24 Sep 2021 07:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50751] [PATCH 2/2] gnu: update Trezor support Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Sep 2021 11:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50751 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50751@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 50751-submit@debbugs.gnu.org id=B50751.16324815519228 (code B ref 50751); Fri, 24 Sep 2021 11:06:02 +0000 Received: (at 50751) by debbugs.gnu.org; 24 Sep 2021 11:05:51 +0000 Received: from localhost ([127.0.0.1]:56774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTj1b-0002Ol-ED for submit@debbugs.gnu.org; Fri, 24 Sep 2021 07:05:51 -0400 Received: from mail-ed1-f43.google.com ([209.85.208.43]:40943) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTj1Y-0002OW-Tt for 50751@debbugs.gnu.org; Fri, 24 Sep 2021 07:05:50 -0400 Received: by mail-ed1-f43.google.com with SMTP id g8so34606474edt.7 for <50751@debbugs.gnu.org>; Fri, 24 Sep 2021 04:05:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mqjCpC7FrZiP0uABlaJ3TjOEFDX9x3nx2Cx+VkcXpnk=; b=jeYUBNIEP9HDlit5lEvP59zEr+tGehmsen7kWg8H6VFbazF1Oqk8X2WmkEZm5aZBF6 20Zi0c6L6y6uM1fLX9j2KwKF9sng1r+5kJ1RD7U3I9xc3aD3qw2wQaXO+rSGQHvB2E+f wf6jVpwHedWOwQsAy4G2G66SBMXKUc6Qzy/JqNy3kLRov6PTH7+Z/UuA1/GgMn16nTXr ZLhJUOdHg00i/ZVB8bILZNkBez7dbucOASXl/Z+Xq7Euob7mN4fe3pcj8CBiXeC1653Z Wbkea8t9FjXg49Vip/6TOkJs6ztxC4obeHnwIJ+HBPuyDOmdzDR6dSc1JjszXAqaFPRP MWMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mqjCpC7FrZiP0uABlaJ3TjOEFDX9x3nx2Cx+VkcXpnk=; b=bKoi/uRRzyzgAdQAicvfbyZ26XqqVKdy88Gwi25Z0VkZ04qhsV0NMyh7sS+5Ug5l/m umTT6ha3oujTZZs15nd+7OzTBjUujnEdICMoegTuA2s5USrfPEQmj6X+H4TKJo9Mimo2 XUTq7JfXOLp7iRUUfktENxetnCw+wMEvC0r4RBPjcaXHX43cy/pbVweC0QCPK8NuXxcj hnBamotqg0dEpn7U/Jp+0xWEy6s2uLYqx7QEh2+EA916Sb6CySqIdq16yvm6n5nAWC/R hAsMSHmmiIoJtxtZGqOYcgcj8tZ5vs6StueiIlvmILOKnGvgOgqAlWvcOnDxOvMkDSXK aEGQ== X-Gm-Message-State: AOAM530SPNx5bm89RejNpTgJhMaKhyqYVu3eaBK1kLZXAawX5DUlHzm5 ROHymZ3E1uXM4Zht5u1b6r402mm2ieg= X-Google-Smtp-Source: ABdhPJzL9oOxDcHIEhO6faZ1lnJjVQrBRxCjx8dPDOf7/LLF4CfT3dL+qvbB5deP2H8l1t6cwsCnvA== X-Received: by 2002:a50:da84:: with SMTP id q4mr4258944edj.1.1632481543077; Fri, 24 Sep 2021 04:05:43 -0700 (PDT) Received: from lelap.lan (catv-213-222-131-28.catv.broadband.hu. [213.222.131.28]) by smtp.gmail.com with ESMTPSA id x7sm5495527ede.86.2021.09.24.04.05.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 04:05:42 -0700 (PDT) From: Attila Lendvai Date: Fri, 24 Sep 2021 13:05:06 +0200 Message-Id: <20210924110506.4676-2-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924110506.4676-1-attila@lendvai.name> References: <20210924110506.4676-1-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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632481581; 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=mqjCpC7FrZiP0uABlaJ3TjOEFDX9x3nx2Cx+VkcXpnk=; b=IIG4hwxYWBimwDq1omJUFjzEbj7rAeGghA9Y1pdZRwoq45whXPE3S0LT59oHPAl/BmaF+S 1hh0lO3lMOadkAO37DXWqxhXathCHR+S7dww/o9BQQtVOJubOJiG5cngfGTBd+/tZOwqxe hHh3evD89FOoFUrxQNr+byBUQW3tyevUIlp9IofKPBCb1JF8bZ9crUukGI7ggUXAtPvws7 R0OnEQ3SrEETTIabNtpwMURgO7eBVylbaipkEUGgN/VK6JlnVfTj3iA1LtQn9VxmZQ+McT 4gj7EOiMtugPg+Or+DcFS4Y+XlZ0OTI5tHrpSbeHF4ZQ/H822oFsoEfaT0+EpA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632481581; a=rsa-sha256; cv=none; b=s3nfJnq4knnZMm6vWiBZCwQ+snGN2onJFQhnQp6SgFi52TG4yA131Joa7aj1KjheEnQeoe sPI4EtFJpw4kFj1qyTzN0QK7FT7ILn1666V2neh2Q0jkR0VtU3zqLxGy1qaGscvXO54d3A l1pKqsS1x+QhwuTDgRE42EV5E40l2Z93MZqe14K2cZUGlOUDOUNkNy3P8a9eIDfQCq6MV8 qIDEzKsrhesNvmcWPnIg0RtY9CInVLQS+dBxhqtL4cHMwa5LNS9L0F/LHkiF4nxrEJY3E6 T2amXilT/sSyw5AxPA1lFbWFn0SWWDzaN62VhlR/pbmTYsuDP//ffNG5Ji9Zlg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=jeYUBNIE; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.21 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=jeYUBNIE; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 23B3C347B3 X-Spam-Score: 3.21 X-Migadu-Scanner: scn1.migadu.com X-TUID: esZSLcwaaAje Fetch everything from their git repos, instead of pypi. The rationale for that is that at the time of this writing one of these are not updated to the latest git tag in pipy, and this way there is one less organization/infrastructure to rely on that is inbetween the author(s) and us. * gnu/packages/finance.scm (python-trezor-agent): Update to 0.14.2. (python-trezor): Update to 0.12.3. (trezor-agent): Update to 0.11.0. (trezord): Update to 2.0.31. --- gnu/packages/finance.scm | 83 +++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 19 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index a123efe207..a8b5604249 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -833,9 +833,11 @@ the Monero GUI client.") (license license:bsd-3))) (define-public python-trezor-agent + ;; It is called 'libagent' in pypi; i.e. this is the library as opposed to + ;; the toplevel app called trezor-agent. (package (name "python-trezor-agent") - (version "0.13.1") + (version "0.14.2") (source (origin (method git-fetch) @@ -844,7 +846,7 @@ the Monero GUI client.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0q99vbfd3h85s8rnjipnmldixabqmmlk5w9karv6f0rhyi54f4zv")) + (base32 "0nl44ldfw9s2v3p7g5bldfw3ds2hz9r28j42bpnp8bj0v5na3ivk")) (patches (search-patches "trezor-agent-fix-argv0.patch")))) (build-system python-build-system) (arguments @@ -864,11 +866,12 @@ the Monero GUI client.") (add-installed-pythonpath inputs outputs) (invoke "py.test")))))) (propagated-inputs - `(("python-configargparse" ,python-configargparse) + `(("python-pynacl" ,python-pynacl) + ("python-configargparse" ,python-configargparse) ("python-daemon" ,python-daemon) ("python-docutils" ,python-docutils) ("python-ecdsa" ,python-ecdsa) - ("python-ed25519" ,python-ed25519) + ("python-hidapi" ,python-hidapi) ("python-mnemonic" ,python-mnemonic) ("python-pymsgbox" ,python-pymsgbox) ("python-semver" ,python-semver) @@ -987,16 +990,35 @@ Nano dongle.") (define-public python-trezor (package (name "python-trezor") - (version "0.12.1") + (version "0.12.3") (source (origin - (method url-fetch) - (uri (pypi-uri "trezor" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/trezor/trezor-firmware/") + (commit (string-append "python/v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1w19m9lws55k9sjhras47hpfpqwq1jm5vy135nj65yhkblygqg19")))) + (base32 "0wdm1y5zli6w09zbpjqc6rbcs1b4hjq007mbh7xdr17prbnqprac")) + (modules '((guix build utils) (srfi srfi-26) (srfi srfi-1) (ice-9 ftw))) + (snippet + '(begin + ;; Delete everything except ./python/ + (for-each delete-file-recursively + (scandir "./" (negate (cut member <> '("python" "." "..") + string=)))) + ;; Move ./python/* to the toplevel + (for-each (lambda (file-name) + (rename-file (string-append "./python/" file-name) + (string-append "./" file-name))) + (scandir "./python/" + (negate (cut member <> '("." "..") string=)))) + (delete-file-recursively "./python") + #t)))) (build-system python-build-system) (propagated-inputs - `(("python-click" ,python-click) + `(("python-attrs" ,python-attrs) + ("python-click" ,python-click) ("python-construct" ,python-construct) ("python-ecdsa" ,python-ecdsa) ("python-libusb1" ,python-libusb1) @@ -1075,16 +1097,39 @@ the KeepKey Hardware Wallet.") (define-public trezor-agent (package (name "trezor-agent") - (version "0.10.0") + (version "0.11.0") (source (origin - (method url-fetch) - (uri (pypi-uri "trezor_agent" version)) + (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.2"))) + (file-name (git-file-name name version)) (sha256 (base32 - "144657c7bn0a667dq5fv5r6j7iilxf3h9agj29v1m2qpq40g0az8")))) + "0nl44ldfw9s2v3p7g5bldfw3ds2hz9r28j42bpnp8bj0v5na3ivk")) + (modules '((guix build utils) (srfi srfi-26) (srfi srfi-1) (ice-9 ftw))) + (snippet + '(begin + ;; Delete everything except ./agents/trezor/ + (for-each delete-file-recursively + (filter (lambda (full-name) + (not (string-prefix? "./agents/trezor/" full-name))) + (find-files "."))) + ;; Move ./agents/trezor/* to the toplevel + (for-each (lambda (file-name) + (rename-file (string-append "./agents/trezor/" file-name) + (string-append "./" file-name))) + (scandir "./agents/trezor/" + (negate (cut member <> '("." "..") string=)))) + (delete-file-recursively "./agents") + #t)))) (arguments - ;; Tests fail with "AttributeError: module 'attr' has no attribute 's'". `(#:phases (modify-phases %standard-phases (add-after 'wrap 'fixup-agent-py @@ -1100,14 +1145,14 @@ the KeepKey Hardware Wallet.") (delete-file (string-append out "/bin/.trezor_agent.py-real")) ;; Overwrite the wrapped one with the real thing. (install-file "./trezor_agent.py" - (string-append out "/bin")) - #t)))))) + (string-append out "/bin"))) + #t))))) (build-system python-build-system) (inputs `(("python-trezor" ,python-trezor) ("python-trezor-agent" ,python-trezor-agent))) (native-inputs - `(("python-hidapi" ,python-hidapi))) + `(("python-attrs" ,python-attrs))) ; for the tests (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 @@ -1310,7 +1355,7 @@ trezord as a regular user instead of needing to it run as root.") (define-public trezord (package (name "trezord") - (version "2.0.30") + (version "2.0.31") (source (origin (method git-fetch) @@ -1319,7 +1364,7 @@ trezord as a regular user instead of needing to it run as root.") (commit (string-append "v" version)))) (sha256 (base32 - "1hzvk0wfgg7b4wpqjk3738yqxlv3pj5i7zxwm0jady2h97hmrqrr")) + "130nhk1pnr3xx9qkcij81mm3jxrl5zvvdqhvrgvrikqg3zlb6v5b")) (file-name (git-file-name name version)))) (build-system go-build-system) (arguments -- 2.33.0