GNU bug report logs - #72416
[PATCH] gnu: usbrelay: Update to 1.2.1.

Previous Next

Package: guix-patches;

Reported by: Evgeny Pisemsky <mail <at> pisemsky.site>

Date: Fri, 2 Aug 2024 08:32:02 UTC

Severity: normal

Tags: patch

Done: Christopher Baines <mail <at> cbaines.net>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 72416 in the body.
You can then email your comments to 72416 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#72416; Package guix-patches. (Fri, 02 Aug 2024 08:32:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to Evgeny Pisemsky <mail <at> pisemsky.site>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Fri, 02 Aug 2024 08:32:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Evgeny Pisemsky <mail <at> pisemsky.site>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: usbrelay: Update to 1.2.1.
Date: Fri, 02 Aug 2024 11:30:29 +0300

[0001-gnu-usbrelay-Update-to-1.2.1.patch (text/x-patch, inline)]
From 523d0096745e8e649b966101f528b402ec06fc48 Mon Sep 17 00:00:00 2001
Message-ID: <523d0096745e8e649b966101f528b402ec06fc48.1722586951.git.mail <at> pisemsky.site>
From: Evgeny Pisemsky <mail <at> pisemsky.site>
Date: Fri, 2 Aug 2024 11:00:11 +0300
Subject: [PATCH] gnu: usbrelay: Update to 1.2.1.

* gnu/packages/hardware.scm (usbrelay): Update to 1.2.1.

Change-Id: I5b889889c528d5526c8cfcc66d56b2b9d8d60437
---
 gnu/packages/hardware.scm | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 468e2adc3b..349b928713 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -1580,28 +1580,36 @@ (define-public lxi-tools
 (define-public usbrelay
   (package
     (name "usbrelay")
-    (version "1.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/darrylb123/usbrelay")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0fr3wglr2c6myg4k6ai2p5z38prclcnk2ngik15sq16fnp6qg750"))))
+    (version "1.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/darrylb123/usbrelay")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1xw2fqx4drmkvv587vkz3aicp6pw1mzxr8bjz8wad9j4c0r24cgn"))))
     (build-system gnu-build-system)
     (arguments
      (list
       #:phases #~(modify-phases %standard-phases
-                   (delete 'configure)) ;no configure script
-      #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
-                           (string-append "PREFIX=" #$output)
+                   ;; No configure script.
+                   (delete 'configure)
+                   (add-after 'install 'install-manpage
+                     (lambda _
+                       (install-file "usbrelay.1"
+                                     (string-append #$output "/share/man/man1")))))
+      #:make-flags #~(list (string-append "PREFIX=" #$output)
+                           (string-append "CC=" #$(cc-for-target))
                            (string-append "LDFLAGS=-Wl,-rpath="
                                           (string-append #$output "/lib"))
                            "LDCONFIG=true"
-                           "USBMAJOR=$(USBLIBVER)")
-      #:tests? #f))                     ;no test suite
+                           (string-append "USBMAJOR=" #$version)
+                           (string-append "USBLIBVER=" #$version)
+                           (string-append "VERSION=" #$version))
+      ;; No test suite.
+      #:tests? #f))
     (inputs (list hidapi))
     (home-page "https://github.com/darrylb123/usbrelay")
     (synopsis "Control USB relay modules")

base-commit: b20956651a53a8f23828fdeb6945e1a31e6997a8
-- 
2.45.2
Information forwarded to guix-patches <at> gnu.org:
bug#72416; Package guix-patches. (Thu, 08 Aug 2024 07:09:02 GMT) Full text and rfc822 format available.

Message #8 received at 72416 <at> debbugs.gnu.org (full text, mbox):

From: Evgeny Pisemsky <mail <at> pisemsky.site>
To: 72416 <at> debbugs.gnu.org
Subject: Improved patch with udev rules and described changes
Date: Thu, 08 Aug 2024 10:08:15 +0300

[0001-gnu-usbrelay-Update-to-1.2.1.patch (text/x-patch, inline)]
From 32639b4f86ffd3b9120bd0882ca4532280e6579e Mon Sep 17 00:00:00 2001
Message-ID: <32639b4f86ffd3b9120bd0882ca4532280e6579e.1723021106.git.mail <at> pisemsky.site>
From: Evgeny Pisemsky <mail <at> pisemsky.site>
Date: Wed, 7 Aug 2024 11:55:11 +0300
Subject: [PATCH] gnu: usbrelay: Update to 1.2.1.

* gnu/packages/hardware.scm (usbrelay): Update to 1.2.1.
[arguments]: Install manpage and udev rules, specify actual version.

Change-Id: I5b889889c528d5526c8cfcc66d56b2b9d8d60437
---
 gnu/packages/hardware.scm | 40 +++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 9db7de848e..08cf424e48 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke <at> gnu.org>
 ;;; Copyright © 2020 Brice Waegeneire <brice <at> waegenei.re>
-;;; Copyright © 2021, 2023 Evgeny Pisemsky <mail <at> pisemsky.site>
+;;; Copyright © 2021, 2023, 2024 Evgeny Pisemsky <mail <at> pisemsky.site>
 ;;; Copyright © 2021 Léo Le Bouter <lle-bout <at> zaclys.net>
 ;;; Copyright © 2021 Denis Carikli <GNUtoo <at> cyberdimension.org>
 ;;; Copyright © 2021, 2022 Petr Hodina <phodina <at> protonmail.com>
@@ -1580,28 +1580,40 @@ (define-public lxi-tools
 (define-public usbrelay
   (package
     (name "usbrelay")
-    (version "1.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/darrylb123/usbrelay")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0fr3wglr2c6myg4k6ai2p5z38prclcnk2ngik15sq16fnp6qg750"))))
+    (version "1.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/darrylb123/usbrelay")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1xw2fqx4drmkvv587vkz3aicp6pw1mzxr8bjz8wad9j4c0r24cgn"))))
     (build-system gnu-build-system)
     (arguments
      (list
       #:phases #~(modify-phases %standard-phases
-                   (delete 'configure)) ;no configure script
+                   ;; No configure script.
+                   (delete 'configure)
+                   (add-after 'install 'install-manpage
+                     (lambda _
+                       (install-file "usbrelay.1"
+                                     (string-append #$output "/share/man/man1"))))
+                   (add-after 'install-manpage 'install-udev-rules
+                     (lambda _
+                       (install-file "50-usbrelay.rules"
+                                     (string-append #$output "/lib/udev/rules.d")))))
       #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
                            (string-append "PREFIX=" #$output)
                            (string-append "LDFLAGS=-Wl,-rpath="
                                           (string-append #$output "/lib"))
                            "LDCONFIG=true"
-                           "USBMAJOR=$(USBLIBVER)")
-      #:tests? #f))                     ;no test suite
+                           (string-append "USBMAJOR=" #$version)
+                           (string-append "USBLIBVER=" #$version)
+                           (string-append "VERSION=" #$version))
+      ;; No test suite.
+      #:tests? #f))
     (inputs (list hidapi))
     (home-page "https://github.com/darrylb123/usbrelay")
     (synopsis "Control USB relay modules")

base-commit: 5e567587dd4abf51f9a6fa44f5a852dde1115ce9
-- 
2.45.2
Information forwarded to guix-patches <at> gnu.org:
bug#72416; Package guix-patches. (Fri, 09 Aug 2024 10:55:02 GMT) Full text and rfc822 format available.

Message #11 received at 72416 <at> debbugs.gnu.org (full text, mbox):

From: Evgeny Pisemsky <mail <at> pisemsky.site>
To: 72416 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: usbrelay: Update to 1.2.1.
Date: Fri, 09 Aug 2024 13:54:03 +0300

I successfully tested the patch with a real relay, including udev rules.
Reply sent to Christopher Baines <mail <at> cbaines.net>:
You have taken responsibility. (Wed, 14 Aug 2024 10:11:02 GMT) Full text and rfc822 format available.
Notification sent to Evgeny Pisemsky <mail <at> pisemsky.site>:
bug acknowledged by developer. (Wed, 14 Aug 2024 10:11:02 GMT) Full text and rfc822 format available.

Message #16 received at 72416-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Evgeny Pisemsky <mail <at> pisemsky.site>
Cc: 72416-done <at> debbugs.gnu.org
Subject: Re: [bug#72416] Improved patch with udev rules and described changes
Date: Wed, 14 Aug 2024 11:10:16 +0100

[Message part 1 (text/plain, inline)]
Evgeny Pisemsky <mail <at> pisemsky.site> writes:

> From 32639b4f86ffd3b9120bd0882ca4532280e6579e Mon Sep 17 00:00:00 2001
> Message-ID: <32639b4f86ffd3b9120bd0882ca4532280e6579e.1723021106.git.mail <at> pisemsky.site>
> From: Evgeny Pisemsky <mail <at> pisemsky.site>
> Date: Wed, 7 Aug 2024 11:55:11 +0300
> Subject: [PATCH] gnu: usbrelay: Update to 1.2.1.
>
> * gnu/packages/hardware.scm (usbrelay): Update to 1.2.1.
> [arguments]: Install manpage and udev rules, specify actual version.
>
> Change-Id: I5b889889c528d5526c8cfcc66d56b2b9d8d60437
> ---
>  gnu/packages/hardware.scm | 40 +++++++++++++++++++++++++--------------
>  1 file changed, 26 insertions(+), 14 deletions(-)

Thanks for the patch, I tweaked the indentation to make the diff clearer
and pushed this to master as ff185dc00319af1dede83df465288e73dc0e5ff5.

Chris

[signature.asc (application/pgp-signature, inline)]
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Wed, 11 Sep 2024 11:24:08 GMT) Full text and rfc822 format available.
This bug report was last modified 339 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.