From: Martin Becze <mjbecze@riseup.net>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 40666@debbugs.gnu.org
Subject: [bug#40666] [PATCH 2/2] gnu: Add trezord-udev-rules.
Date: Sat, 18 Apr 2020 22:23:16 -0500 [thread overview]
Message-ID: <bd817ec0-2783-9ecf-e7ec-2aea04b94edf@riseup.net> (raw)
In-Reply-To: <87a739akal.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
Sure thing! I here is the updated patch. Note I still need to add a new
package, since the udev rules are in a separate repo.
On 4/17/20 4:12 PM, Ludovic Courtès wrote:
> Hi Martin,
>
> Martin Becze <mjbecze@riseup.net> skribis:
>
>> * gnu/packages/finance.scm (trezord-udev-rules): New variable.
>
> I think it would be best to add a phase to ‘trezord’ that installs its
> udev rules (it’s quite common for packages to include udev rules.)
>
> WDYT?
>
> Thanks,
> Ludo’.
>
[-- Attachment #2: v2-0001-gnu-Add-trezor-common.patch --]
[-- Type: text/x-patch, Size: 3829 bytes --]
From d5f984dcb2d77f281f0acf4b418276a801235d91 Mon Sep 17 00:00:00 2001
From: Martin Becze <mjbecze@riseup.net>
Date: Wed, 15 Apr 2020 19:37:53 -0500
Subject: [PATCH v2] gnu: Add trezor-common
* gnu/packages/finance.scm (trezor-common): New variable.
(trezord): Install udev rules from trezor-common.
---
gnu/packages/finance.scm | 50 +++++++++++++++++++++++++++++++++++++---
1 file changed, 47 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index ee254c3a9f..b1f6ebcf60 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -41,6 +41,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system emacs)
#:use-module (guix build-system python)
#:use-module (guix build-system glib-or-gtk)
@@ -1165,6 +1166,35 @@ information.")
(home-page "https://grisbi.org")
(license license:gpl2+)))
+(define-public trezor-common
+ (let ((commit "bff7fdfe436c727982cc553bdfb29a9021b423b0")
+ (revision "0"))
+ (package
+ (name "trezor-common")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/trezor/trezor-common.git")
+ (commit commit)))
+ (sha256
+ (base32
+ "14mrirrn68if7ja6qdk9qlxs1hv0f21vrxy5ncnms0gx9iwakp2l"))
+ (file-name (git-file-name name version))))
+ (build-system copy-build-system)
+ (arguments
+ '(#:install-plan
+ ;; currently we only have use for the udev rules
+ '(("./udev/51-trezor.rules" "lib/udev/rules.d/"))))
+ (home-page "https://github.com/trezor/trezor-common")
+ (synopsis "This project contains files shared among Trezor projects.")
+ (description
+ "This project contains files shared among Trezor projects,
+including the udev rules for trezord")
+ (properties '((hidden? . #t)))
+ (license license:lgpl3+))))
+
(define-public trezord
(package
(name "trezord")
@@ -1173,15 +1203,29 @@ information.")
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/trezor/trezord-go.git")
- (commit (string-append "v" version))))
+ (url "https://github.com/trezor/trezord-go.git")
+ (commit (string-append "v" version))))
(sha256
(base32
"1ks1fa0027s3xp0z6qp0dxmayvrb4dwwscfhbx7da0khp153f2cp"))
(file-name (git-file-name name version))))
(build-system go-build-system)
+ (native-inputs
+ `(("trezor-common" ,trezor-common)))
(arguments
- '(#:import-path "github.com/trezor/trezord-go"))
+ '(#:import-path "github.com/trezor/trezord-go"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'install 'check
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (common (assoc-ref inputs "trezor-common"))
+ (rule-path "/lib/udev/rules.d/51-trezor.rules")
+ (input-path (string-append common rule-path))
+ (output-path (string-append out rule-path)))
+
+ ;; install the udev rules
+ (install-file input-path output-path)))))))
(home-page "https://trezor.io")
(synopsis "Trezor Communication Daemon aka Trezor Bridge (written in Go)")
(description "This allows a Trezor hardware wallet to communicate to the
--
2.26.1
next prev parent reply other threads:[~2020-04-19 3:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-16 16:17 [bug#40666] [PATCH 1/2] gnu: trezord: Update to 2.0.29 Martin Becze
2020-04-16 16:20 ` [bug#40666] [PATCH 2/2] gnu: Add trezord-udev-rules Martin Becze
2020-04-17 21:12 ` Ludovic Courtès
2020-04-19 3:23 ` Martin Becze [this message]
2020-04-19 11:06 ` bug#40666: " Ludovic Courtès
2020-04-17 21:13 ` [bug#40666] [PATCH 1/2] gnu: trezord: Update to 2.0.29 Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bd817ec0-2783-9ecf-e7ec-2aea04b94edf@riseup.net \
--to=mjbecze@riseup.net \
--cc=40666@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).