From unknown Mon Jun 23 18:27:29 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#50751 <50751@debbugs.gnu.org> To: bug#50751 <50751@debbugs.gnu.org> Subject: Status: [PATCH] gnu: update Trezor support Reply-To: bug#50751 <50751@debbugs.gnu.org> Date: Tue, 24 Jun 2025 01:27:29 +0000 retitle 50751 [PATCH] gnu: update Trezor support reassign 50751 guix-patches submitter 50751 Attila Lendvai severity 50751 normal tag 50751 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 23 04:32:14 2021 Received: (at submit) by debbugs.gnu.org; 23 Sep 2021 08:32:14 +0000 Received: from localhost ([127.0.0.1]:52660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTK9N-0002U6-Mt for submit@debbugs.gnu.org; Thu, 23 Sep 2021 04:32:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:59352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTK9L-0002Tw-A5 for submit@debbugs.gnu.org; Thu, 23 Sep 2021 04:32:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTK9L-0003zH-3Q for guix-patches@gnu.org; Thu, 23 Sep 2021 04:32:11 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:44917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTK95-0005Z4-R9 for guix-patches@gnu.org; Thu, 23 Sep 2021 04:32:10 -0400 Received: by mail-ed1-x52b.google.com with SMTP id v22so20159579edd.11 for ; Thu, 23 Sep 2021 01:31:55 -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:mime-version :content-transfer-encoding; bh=KvV/YGgTbBWlBYn5NkzqiDai+K72fi+J5CUxoOQTt8U=; b=gVnwyidAuhLOBZBYu8QnpSxeS5LzZyBg9fdrLt7k6ad+sY+RjOKW3bSW4YYbYCeP5j 8gRnP2CqUlSnLXjBz3FEa2Rj60RS0Uce98jrwBek56IiM3kgIS1JThMaz3z7xgN2U4WY 6tzYzUi+2FrqAmO3n42c7Zv8x+siFoPu4spuBqF9n8C3wAyRePEmYSfQw1+LJYTGKrE8 /rAA3tWTtSHNcCAF6RJQaRpu+GmDqtTWyXjXYOtE7WPQcWLbiMe5hC3A2X/AFPkpUdgV 7wCWYCXt+a/+ICMIwsdIFT609Yb/MFqn+EJNV79EMWpCs1dEqrDqmU+V9MB2SgN6MO8Y B3Vg== 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 :mime-version:content-transfer-encoding; bh=KvV/YGgTbBWlBYn5NkzqiDai+K72fi+J5CUxoOQTt8U=; b=KyS3Z4a90AHcqjDVAA1TFOOspH6FuCf3tSkgIzqM7fpYXWa1Yg/GkaLTb77b/aebNN 01QGbbr8Z482C19nNaKjDu/FzjxIHlbXiA+1IsLCBoiIdJ+0TiLuevtedMKt9yqP73zh I1LV3cGkZPCBXEHfIx0z9xrvlLaw+Ll5NAZtmW8adtvCOdypKWK+6NQwxopSAs62K6NI UBMpucgEHQdQqhTSp8G7bWyAHTdRkznK1uASs/WJN+dSH95564lamoVqvhScy2vdpM3O jzVxybgxT+o2i7/VXWaL2lXtS2QXy2vhO72500YWSWjpX/HmAa2/vAAJyV765VH845HJ 7Inw== X-Gm-Message-State: AOAM5339TMTLxlpbrnkLGm32E8ldUXjPXpQXRXwgWFsQHqEQqZtVV0Zq Fkw6utc7MYXdWip4I8nzPFvo5chVjyE= X-Google-Smtp-Source: ABdhPJxjxD0JKP3V8b064xREbwRgb6O81r0uCW3MP17ufW71zSIlD2sLudjcEX5NgitUrOxZTO0emA== X-Received: by 2002:a17:906:f906:: with SMTP id lc6mr3532601ejb.487.1632385914084; Thu, 23 Sep 2021 01:31:54 -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 r22sm2530603ejj.91.2021.09.23.01.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Sep 2021 01:31:53 -0700 (PDT) From: Attila Lendvai To: guix-patches@gnu.org Subject: [PATCH] gnu: update Trezor support Date: Thu, 23 Sep 2021 10:30:46 +0200 Message-Id: <20210923083045.10372-1-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=attila.lendvai@gmail.com; helo=mail-ed1-x52b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: submit Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Fetch everything from their git repos, instead of pypi. * 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/patches/trezor-agent-fix-argv0.patch: New file. --- gnu/packages/finance.scm | 84 ++++++++++++++----- .../patches/trezor-agent-fix-argv0.patch | 27 ++++++ 2 files changed, 92 insertions(+), 19 deletions(-) create mode 100644 gnu/packages/patches/trezor-agent-fix-argv0.patch diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 9b073541de..34bb73016c 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,8 @@ 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 `(#:phases @@ -863,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) @@ -986,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) @@ -1074,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 @@ -1091,14 +1137,14 @@ the KeepKey Hardware Wallet.") (let* ((out (assoc-ref outputs "out"))) ;; overwrite the wrapper 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 @@ -1301,7 +1347,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) @@ -1310,7 +1356,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 diff --git a/gnu/packages/patches/trezor-agent-fix-argv0.patch b/gnu/packages/patches/trezor-agent-fix-argv0.patch new file mode 100644 index 0000000000..9462067cd5 --- /dev/null +++ b/gnu/packages/patches/trezor-agent-fix-argv0.patch @@ -0,0 +1,27 @@ +diff --git a/libagent/gpg/__init__.py b/libagent/gpg/__init__.py +index 3711bc8..67085de 100644 +--- a/libagent/gpg/__init__.py ++++ b/libagent/gpg/__init__.py +@@ -122,15 +122,19 @@ def run_init(device_type, args): + verify_gpg_version() + + # Prepare new GPG home directory for hardware-based identity +- device_name = os.path.basename(sys.argv[0]).rsplit('-', 1)[0] +- log.info('device name: %s', device_name) ++ exe_name = os.path.basename(sys.argv[0]) ++ # drop the Guix wrapper's dot prefix from the name ++ if exe_name[0] == '.' and exe_name.endswith('-real'): ++ exe_name = exe_name[1:-5:] ++ device_name = exe_name.rsplit('-', 1)[0] ++ log.info('exe name: %s, device name: %s', exe_name, device_name) + homedir = args.homedir + if not homedir: + homedir = os.path.expanduser('~/.gnupg/{}'.format(device_name)) + + log.info('GPG home directory: %s', homedir) + +- if os.path.exists(homedir): ++ if os.path.exists(homedir) and not args.subkey: + log.error('GPG home directory %s exists, ' + 'remove it manually if required', homedir) + sys.exit(1) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 23 14:35:28 2021 Received: (at 50751) by debbugs.gnu.org; 23 Sep 2021 18:35:28 +0000 Received: from localhost ([127.0.0.1]:55850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTTZA-0001kA-31 for submit@debbugs.gnu.org; Thu, 23 Sep 2021 14:35:28 -0400 Received: from out2.migadu.com ([188.165.223.204]:43710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTTZ8-0001k1-9X for 50751@debbugs.gnu.org; Thu, 23 Sep 2021 14:35:27 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1632422124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=UfRQ5mg6ed/d9CuegJCNzUhegI5dqxC0udi0xK6HakQ=; b=QwYB0eHfnohMOUPCqQ6/2GnFmsidrZEMmpXwXxht8s+U7k6EIg0x7LXE5dsrflkVAvKTy6 29FKlfaeq+733u9e3WRoGCpZWCJMu/T+0QmjLVX7SOcah7NJo+xz9o30bbwdOUrmSlU5jZ Y0xNhgqTubMmGg4KdTSRL4jEKXGodbo= From: Sarah Morgensen To: Attila Lendvai Subject: Re: [bug#50751] [PATCH] gnu: update Trezor support References: <20210923083045.10372-1-attila@lendvai.name> Date: Thu, 23 Sep 2021 11:35:22 -0700 In-Reply-To: <20210923083045.10372-1-attila@lendvai.name> (Attila Lendvai's message of "Thu, 23 Sep 2021 10:30:46 +0200 (9 hours, 43 minutes, 37 seconds ago)") Message-ID: <86mto3kumt.fsf@mgsn.dev> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50751 Cc: 50751@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Thanks for the patch! Reading over this, I have a few comments. Attila Lendvai writes: > Fetch everything from their git repos, instead of pypi. > Given the resulting version mismatch, and having to pick apart the sources, is there a compelling reason for this? It looks like the same files are included. > * 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/patches/trezor-agent-fix-argv0.patch: New file. When at all possible, version updates should be separate commits from changes. > @@ -1091,14 +1137,14 @@ the KeepKey Hardware Wallet.") > (let* ((out (assoc-ref outputs "out"))) > ;; overwrite the wrapper with the real thing. > (install-file "./trezor_agent.py" > - (string-append out "/bin")) > - #t)))))) > + (string-append out "/bin"))) > + #t))))) This wasn't added by your patch, but it's odd that the reason for overriding the wrapper wasn't documented.... Because if we didn't overwrite the wrapper, your patch below would be unnecessary, because the wrapper sets argv[0] to the original name of the file. > diff --git a/gnu/packages/patches/trezor-agent-fix-argv0.patch b/gnu/packages/patches/trezor-agent-fix-argv0.patch > new file mode 100644 > index 0000000000..9462067cd5 > --- /dev/null > +++ b/gnu/packages/patches/trezor-agent-fix-argv0.patch > @@ -0,0 +1,27 @@ > +diff --git a/libagent/gpg/__init__.py b/libagent/gpg/__init__.py > +index 3711bc8..67085de 100644 > +--- a/libagent/gpg/__init__.py > ++++ b/libagent/gpg/__init__.py > +@@ -122,15 +122,19 @@ def run_init(device_type, args): > + verify_gpg_version() > + > + # Prepare new GPG home directory for hardware-based identity > +- device_name = os.path.basename(sys.argv[0]).rsplit('-', 1)[0] > +- log.info('device name: %s', device_name) > ++ exe_name = os.path.basename(sys.argv[0]) > ++ # drop the Guix wrapper's dot prefix from the name > ++ if exe_name[0] == '.' and exe_name.endswith('-real'): > ++ exe_name = exe_name[1:-5:] > ++ device_name = exe_name.rsplit('-', 1)[0] > ++ log.info('exe name: %s, device name: %s', exe_name, device_name) > + homedir = args.homedir > + if not homedir: > + homedir = os.path.expanduser('~/.gnupg/{}'.format(device_name)) > + > + log.info('GPG home directory: %s', homedir) > + > +- if os.path.exists(homedir): > ++ if os.path.exists(homedir) and not args.subkey: > + log.error('GPG home directory %s exists, ' > + 'remove it manually if required', homedir) > + sys.exit(1) Hope that helps, -- Sarah From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 24 07:05:13 2021 Received: (at 50751) by debbugs.gnu.org; 24 Sep 2021 11:05:13 +0000 Received: from localhost ([127.0.0.1]:56768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTj0y-0002NU-OT for submit@debbugs.gnu.org; Fri, 24 Sep 2021 07:05:12 -0400 Received: from mail-4323.protonmail.ch ([185.70.43.23]:37582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTj0u-0002N6-BC for 50751@debbugs.gnu.org; Fri, 24 Sep 2021 07:05:10 -0400 Date: Fri, 24 Sep 2021 11:05:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lendvai.name; s=protonmail2; t=1632481501; bh=WHpz5T91QzlmhNfU4iH/jEKEsCZEYOBwp7ci+9MDyj4=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=KQ9QCRsiozKJtMLL+zKxNPni13zxXadSD+w3KiYY2LRj/pF3fp6TUYgtp+DDrtoVs C5vcj2zaLruD3aHEzcCzur5AhjazTH9JEj4l8dsMo6SgbAZhLZuebjlLYB3sQJb9J+ rRRTqgoPp2SJPRAYZTgUvmqs1e89uXbpcmHsLXDEzvSTdZBLMizJnSmdStdWWIIXpU p8cAPaBnHUZprtpbVErnVhFdirVsNuZylsZ03vSUsA+FBSHGX54LLJ4i/jPmKclpyG Y/Wwum+/1dXBGZvXOEYCs7TsqE3FhFV8hAxh0TBd/9D0iXTYzxFqNB8QEOwnDPXF7u YdvsdlztucdiQ== To: Sarah Morgensen From: Attila Lendvai Subject: Re: [bug#50751] [PATCH] gnu: update Trezor support Message-ID: In-Reply-To: <86mto3kumt.fsf@mgsn.dev> References: <20210923083045.10372-1-attila@lendvai.name> <86mto3kumt.fsf@mgsn.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50751 Cc: 50751@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Attila Lendvai Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > > Fetch everything from their git repos, instead of pypi. > > Given the resulting version mismatch, and having to pick apart the > sources, is there a compelling reason for this? It looks like the same > files are included. an objective reason: one of these versions were not in pipy at the time i was working on this. a subjective reason: one less organization to rely on. if anything would happen to pipy, e.g. some random API change, then that wouldn't affect us anymore. if github went down or went hostile, then we could just change the git URL and continue with a minor glitch. > > - 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/patches/trezor-agent-fix-argv0.patch: New file. > > When at all possible, version updates should be separate commits from cha= nges. ok, makes sense, because now that i think about it, it was broken with the prior version, too. i'll resend it in two patches once i have tested th= em. > > ;; overwrite the wrapper with the real thing. > > (install-file "./trezor_agent.py" > > - (string-append out "/bin")) > > - #t)))))) > > - (string-append out "/bin"))) > > - #t))))) > > This wasn't added by your patch, but it's odd that the reason for > overriding the wrapper wasn't documented.... i have added a comment explaining the situation. thank you for the feedback! the updated patches will be coming a bit later. - attila PGP:=C2=A05D5F 45C7 DFCD 0A39 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 24 07:05:37 2021 Received: (at 50751) by debbugs.gnu.org; 24 Sep 2021 11:05:37 +0000 Received: from localhost ([127.0.0.1]:56771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTj1N-0002OF-0n for submit@debbugs.gnu.org; Fri, 24 Sep 2021 07:05:37 -0400 Received: from mail-ed1-f49.google.com ([209.85.208.49]:43955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTj1L-0002Ny-Td for 50751@debbugs.gnu.org; Fri, 24 Sep 2021 07:05:36 -0400 Received: by mail-ed1-f49.google.com with SMTP id v10so29999806edj.10 for <50751@debbugs.gnu.org>; Fri, 24 Sep 2021 04:05:35 -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:mime-version :content-transfer-encoding; bh=8xuDM3yq4KiX7RWJDXD0Q9fgM9tNFJSAE34wqtedVNg=; b=F/B48GzJFMCAozMbRRRDejKqKKCb6yOVvmt6rdvR/z8QL8L5ZFhOT6ln2DJbqc22wm BtHONfDpIgvILTy82qFfrN5c6pMPy5Z7ssoIvAdDZ5bk3n3McfASQOciWGDIE8zN4jr5 zzCXFJ3Y5GB2WAuOcoCUOmnbGTDeUbaslfxAHgWTmc+R/1J7qUcNkF0F7C+2dZB8gPIU GwkcG1WcqRyJAKCvUDm1I2yQhAajiC8XLsGEDoYwLY9uGosM1PwqNP9Z2pkLxPABovMX ZtEmNLmj0ooJVHwDEZh7NRowRoxMcTUHUDeYI0JLcAvTQjNYvLw06OG5a5fAtJbH8f8h 4G1w== 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 :mime-version:content-transfer-encoding; bh=8xuDM3yq4KiX7RWJDXD0Q9fgM9tNFJSAE34wqtedVNg=; b=bKvc/WbfI7D53qc/6VNFcYhR6RMOe8RezzVeJJzG+suWExrYj4GiRAPSah3diF89J/ QQQo7nkdph5DUfm+rNCtFtszT+km/YEJTIOQEWs7/64qXolOLJyyq5BnaoXXiHHZZEWg qNcuPYEjmzBG9bFZmd9/vgHF8I7Tgwn+PtY9EtyUK2uJ3x8bdSVC7F3cNnoaAqeGWwvR kR6Dpmj90O1uVRgI5KvxBP+J2YK3A9e3I7LeoDPwc27bJRwNSw1DmDqbYwQV9lFWPdmh 3YvAPvuA/VcQMwQ9oi2OA6v5ZmGgKdbz1BwesVyboXLfoqnUtpNJ+TIIkq5Ivf1HAm5j SWgg== X-Gm-Message-State: AOAM531MRq9I9QrLnebCUFZlUAfqQ3DcekKYVlCy0wyANIzxK9om2Vui gjsxhJmbe1dPTSGMwPcT2a2RAIvj0Gg= X-Google-Smtp-Source: ABdhPJx0OKg+TeEdc8A92nnCm5SU564WlJWobYdAuyJDiXqEWQVL0bd5ugk0QWh5e6skI19ys1szRw== X-Received: by 2002:a50:e0c3:: with SMTP id j3mr4316568edl.60.1632481530145; Fri, 24 Sep 2021 04:05:30 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 04:05:28 -0700 (PDT) From: Attila Lendvai To: 50751@debbugs.gnu.org Subject: [PATCH 1/2] gnu: python-trezor-agent: Fix key generation with trezor-gpg init Date: Fri, 24 Sep 2021 13:05:05 +0200 Message-Id: <20210924110506.4676-1-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 50751 Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) Someone with a better understanding of the python infrastructure may be able to fix it nicer, but it works. * gnu/packages/finance.scm (trezor-agent): Add comment on why the undoing of the wrapping is done, and also delete the irrelevant sideffect of the now undone wrapping. (python-trezor-agent): Add a patch that changes the python code to handle the argv[0] changed by the wrapping. * gnu/packages/patches/trezor-agent-fix-argv0.patch: New file. --- gnu/packages/finance.scm | 13 +++++++-- .../patches/trezor-agent-fix-argv0.patch | 27 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/trezor-agent-fix-argv0.patch diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 9b073541de..a123efe207 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -844,7 +844,8 @@ the Monero GUI client.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0q99vbfd3h85s8rnjipnmldixabqmmlk5w9karv6f0rhyi54f4zv")))) + (base32 "0q99vbfd3h85s8rnjipnmldixabqmmlk5w9karv6f0rhyi54f4zv")) + (patches (search-patches "trezor-agent-fix-argv0.patch")))) (build-system python-build-system) (arguments `(#:phases @@ -1089,7 +1090,15 @@ the KeepKey Hardware Wallet.") (add-after 'wrap 'fixup-agent-py (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))) - ;; overwrite the wrapper with the real thing. + ;; The wrap phase also wraps trezor_agent.py (besides the + ;; public facing executable called trezor-agent). We need to + ;; undo that wrapping. The reason this is needed is that the + ;; python easy install generates a toplevel script (?) that + ;; messes with argv[0] and then re-opens the python + ;; module. This fails when the wrapped file is actually a shell + ;; script, not a python file. + (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)))))) diff --git a/gnu/packages/patches/trezor-agent-fix-argv0.patch b/gnu/packages/patches/trezor-agent-fix-argv0.patch new file mode 100644 index 0000000000..9462067cd5 --- /dev/null +++ b/gnu/packages/patches/trezor-agent-fix-argv0.patch @@ -0,0 +1,27 @@ +diff --git a/libagent/gpg/__init__.py b/libagent/gpg/__init__.py +index 3711bc8..67085de 100644 +--- a/libagent/gpg/__init__.py ++++ b/libagent/gpg/__init__.py +@@ -122,15 +122,19 @@ def run_init(device_type, args): + verify_gpg_version() + + # Prepare new GPG home directory for hardware-based identity +- device_name = os.path.basename(sys.argv[0]).rsplit('-', 1)[0] +- log.info('device name: %s', device_name) ++ exe_name = os.path.basename(sys.argv[0]) ++ # drop the Guix wrapper's dot prefix from the name ++ if exe_name[0] == '.' and exe_name.endswith('-real'): ++ exe_name = exe_name[1:-5:] ++ device_name = exe_name.rsplit('-', 1)[0] ++ log.info('exe name: %s, device name: %s', exe_name, device_name) + homedir = args.homedir + if not homedir: + homedir = os.path.expanduser('~/.gnupg/{}'.format(device_name)) + + log.info('GPG home directory: %s', homedir) + +- if os.path.exists(homedir): ++ if os.path.exists(homedir) and not args.subkey: + log.error('GPG home directory %s exists, ' + 'remove it manually if required', homedir) + sys.exit(1) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 24 07:05:51 2021 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 To: 50751@debbugs.gnu.org Subject: [PATCH 2/2] gnu: update Trezor support 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-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 50751 Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) 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 From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 28 15:35:01 2021 Received: (at 50751) by debbugs.gnu.org; 28 Nov 2021 20:35:02 +0000 Received: from localhost ([127.0.0.1]:36413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrQt3-0003Vu-AY for submit@debbugs.gnu.org; Sun, 28 Nov 2021 15:35:01 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:54515) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrQt1-0003Vf-MX for 50751@debbugs.gnu.org; Sun, 28 Nov 2021 15:35:00 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by relay12.mail.gandi.net (Postfix) with ESMTPSA id A994C200003; Sun, 28 Nov 2021 20:34:52 +0000 (UTC) From: Nicolas Goaziou To: Attila Lendvai Subject: Re: [bug#50751] [PATCH 1/2] gnu: python-trezor-agent: Fix key generation with trezor-gpg init References: <20210923083045.10372-1-attila@lendvai.name> <20210924110506.4676-1-attila@lendvai.name> Date: Sun, 28 Nov 2021 21:34:51 +0100 In-Reply-To: <20210924110506.4676-1-attila@lendvai.name> (Attila Lendvai's message of "Fri, 24 Sep 2021 13:05:05 +0200") Message-ID: <87y258nhn8.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50751 Cc: 50751@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Attila Lendvai writes: > Someone with a better understanding of the python infrastructure may be able > to fix it nicer, but it works. > > * gnu/packages/finance.scm (trezor-agent): Add comment on why the > undoing of the wrapping is done, and also delete the irrelevant sideffect of > the now undone wrapping. > (python-trezor-agent): Add a patch that changes the python code to handle the > argv[0] changed by the wrapping. > * gnu/packages/patches/trezor-agent-fix-argv0.patch: New file. I prefixed the patch name with python-... and referenced it in local.mk. Then I applied it. Thank you. Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 28 15:35:54 2021 Received: (at 50751-done) by debbugs.gnu.org; 28 Nov 2021 20:35:54 +0000 Received: from localhost ([127.0.0.1]:36416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrQtt-0003XN-Sj for submit@debbugs.gnu.org; Sun, 28 Nov 2021 15:35:54 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:57139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrQtr-0003X9-VU for 50751-done@debbugs.gnu.org; Sun, 28 Nov 2021 15:35:52 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 54BA4240003; Sun, 28 Nov 2021 20:35:45 +0000 (UTC) From: Nicolas Goaziou To: Attila Lendvai Subject: Re: [bug#50751] [PATCH 2/2] gnu: update Trezor support References: <20210924110506.4676-1-attila@lendvai.name> <20210924110506.4676-2-attila@lendvai.name> Date: Sun, 28 Nov 2021 21:35:44 +0100 In-Reply-To: <20210924110506.4676-2-attila@lendvai.name> (Attila Lendvai's message of "Fri, 24 Sep 2021 13:05:06 +0200") Message-ID: <87tufwnhlr.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50751-done Cc: 50751-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Attila Lendvai writes: > * 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. I split the patch in four parts, and tweaked commit message. You may want to have a look at them. Thanks. Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 30 15:51:22 2021 Received: (at 50751) by debbugs.gnu.org; 30 Nov 2021 20:51:22 +0000 Received: from localhost ([127.0.0.1]:42674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msA5x-0006aM-RJ for submit@debbugs.gnu.org; Tue, 30 Nov 2021 15:51:22 -0500 Received: from mail-4018.proton.ch ([185.70.40.18]:24199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msA5v-0006a4-F2 for 50751@debbugs.gnu.org; Tue, 30 Nov 2021 15:51:20 -0500 Date: Tue, 30 Nov 2021 20:51:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lendvai.name; s=protonmail3; t=1638305472; bh=U4ob8rHCj5hB9uyluWnEwkRf3sM/OVL8ZYTOabn6DQQ=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=BTajsf3H5q1gY4/kysbXktjNgswAAnTH/gojLZuclxNz1atF5n8yXJVlMfNqai8rL dDePUF1mOP7tVHOi2D8Qo0Es0+GhAgQi46c8c/0EwABZt0pTjgeKYgpp+WU9CBZ9ij B7GUN42yyxFrB6x5/JTVE6/TL7vP+046q9LSbuFA0ZHyXqUO95pDq3475OAQ69ZQrI A/JryqOP/+r1nBGEPrx8usSTv5eFMlZh0y+up2lmqC0aJ7c3mSVqPJdPrgbAh1ndmo f3Mkb/72jAMFp/j8VZxVoapmXoTV9+3vPlpgKTe7m7HBGWWPXFyMNd3xbz8puMZl/L UyzAtB4oKPI3Q== To: Nicolas Goaziou From: Attila Lendvai Subject: Re: [bug#50751] [PATCH 1/2] gnu: python-trezor-agent: Fix key generation with trezor-gpg init Message-ID: In-Reply-To: <87y258nhn8.fsf@nicolasgoaziou.fr> References: <20210923083045.10372-1-attila@lendvai.name> <20210924110506.4676-1-attila@lendvai.name> <87y258nhn8.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50751 Cc: 50751@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Attila Lendvai Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) ouch, i already had a newer version of the patchset locally. i reported an = issue upstream, and they got rid of the argv[0] usage, and also made a new = release. i was already testing it locally but then life happened before i could send= it. i have sent the new patchset now: https://issues.guix.gnu.org/52207 re splitting the commit: i don't think it's a good idea, mostly due to git = bisect: pushing commits that may not even compile can make someone's life m= uch harder down the road. i think updating tightly interdependent packages = should happen in one commit, so that each git commit leaves the repo in a f= unctional state, and so that it can compile and run the test suite. but in spite of the above, i have sent the new patchset as separate commits= . - attila PGP:=C2=A05D5F 45C7 DFCD 0A39 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 01 10:34:32 2021 Received: (at 50751) by debbugs.gnu.org; 1 Dec 2021 15:34:32 +0000 Received: from localhost ([127.0.0.1]:45133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRcu-0004ag-3o for submit@debbugs.gnu.org; Wed, 01 Dec 2021 10:34:32 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:45361) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRcs-0004aR-87 for 50751@debbugs.gnu.org; Wed, 01 Dec 2021 10:34:31 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id DB81AFF802; Wed, 1 Dec 2021 15:34:21 +0000 (UTC) From: Nicolas Goaziou To: Attila Lendvai Subject: Re: [bug#50751] [PATCH 1/2] gnu: python-trezor-agent: Fix key generation with trezor-gpg init References: <20210923083045.10372-1-attila@lendvai.name> <20210924110506.4676-1-attila@lendvai.name> <87y258nhn8.fsf@nicolasgoaziou.fr> Date: Wed, 01 Dec 2021 16:34:20 +0100 In-Reply-To: (Attila Lendvai's message of "Tue, 30 Nov 2021 20:51:11 +0000") Message-ID: <87bl20z6df.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50751 Cc: 50751@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Attila Lendvai writes: > ouch, i already had a newer version of the patchset locally. > i reported an issue upstream, and they got rid of the argv[0] usage, > and also made a new release. It happens. > > i was already testing it locally but then life happened before i could > send it. i have sent the new patchset now: > https://issues.guix.gnu.org/52207 Great. > re splitting the commit: i don't think it's a good idea, mostly due to > git bisect: pushing commits that may not even compile can make > someone's life much harder down the road. i think updating tightly > interdependent packages should happen in one commit, so that each git > commit leaves the repo in a functional state, and so that it can > compile and run the test suite. > > but in spite of the above, i have sent the new patchset as separate > commits. I overlooked the fact that packages were interdependent, which is pretty obvious now you mention it. In that case, I agree splitting the commit was not a good idea. So... could you send the new patchset again in a single commit? Thanks, Regards, -- Nicolas Goaziou From unknown Mon Jun 23 18:27:29 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 30 Dec 2021 12:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator