GNU bug report logs - #64552
[PATCH] gnu: Add dhex.

Previous Next

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

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

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

From: flabbergasted <flabbergasted <at> nofog.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Add dhex.
Date: Mon, 10 Jul 2023 10:24:20 +0100

* gnu/packages/hexedit.scm (dhex): New variable.
---
 gnu/packages/hexedit.scm | 46 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index 79c14a2..002f6d0 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -29,6 +29,8 @@ (define-module (gnu packages hexedit)
   #:use-module (gnu packages ncurses)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix gexp)
+  #:use-module (guix utils)
   #:use-module (guix build-system gnu))
 
 (define-public hexedit
@@ -69,6 +71,50 @@ (define-public hexedit
     (home-page "http://rigaux.org/hexedit.html")
     (license license:gpl2+)))
 
+(define-public dhex
+  (package
+    (name "dhex")
+    (version "0.69")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://www.dettus.net/dhex/" name "_"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "06y4lrp29f2fh303ijk1xhspa1d4x4dm6hnyw3dd8szi3k6hnwsj"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f ;no tests provided
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target)))
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure) ;no configure script
+          (replace 'install ;multiple issues with provided 'make install'
+            (lambda _
+              (let ((bin (string-append #$output "/bin"))
+                    (man1 (string-append #$output
+                                         "/share/man/man1"))
+                    (man5 (string-append #$output
+                                         "/share/man/man5")))
+                (mkdir-p bin)
+                (install-file "dhex" bin)
+                (mkdir-p man1)
+                (install-file "dhex.1" man1)
+                (mkdir-p man5)
+                (install-file "dhexrc.5" man5)
+                (install-file "dhex_markers.5" man5)
+                (install-file "dhex_searchlog.5" man5)))))))
+    (inputs (list ncurses))
+    (home-page "https://www.dettus.net/dhex/")
+    (synopsis "View, edit, and diff files in hexadecimal")
+    (description
+     "Dhex is hex editor which includes a diff mode, which can be used to
+easily and conveniently compare two binary files.  It is based on ncurses
+and is themeable.")
+    (license license:gpl2)))
+
 (define-public ht
   (package
     (name "ht")

base-commit: f0ca6346a46c605a590bfd77b84e143a8c759a3b
-- 
2.40.1

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: flabbergasted <flabbergasted <at> nofog.net>
Cc: 64552 <at> debbugs.gnu.org
Subject: Re: bug#64552: [PATCH] gnu: Add dhex.
Date: Tue, 05 Sep 2023 10:59:16 -0400

Hello,

flabbergasted <flabbergasted <at> nofog.net> writes:

> * gnu/packages/hexedit.scm (dhex): New variable.
> ---
>  gnu/packages/hexedit.scm | 46 ++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 46 insertions(+)
>
> diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
> index 79c14a2..002f6d0 100644
> --- a/gnu/packages/hexedit.scm
> +++ b/gnu/packages/hexedit.scm
> @@ -29,6 +29,8 @@ (define-module (gnu packages hexedit)
>    #:use-module (gnu packages ncurses)
>    #:use-module (guix download)
>    #:use-module (guix git-download)
> +  #:use-module (guix gexp)
> +  #:use-module (guix utils)
>    #:use-module (guix build-system gnu))
>  
>  (define-public hexedit
> @@ -69,6 +71,50 @@ (define-public hexedit
>      (home-page "http://rigaux.org/hexedit.html")
>      (license license:gpl2+)))
>  
> +(define-public dhex
> +  (package
> +    (name "dhex")
> +    (version "0.69")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "https://www.dettus.net/dhex/" name "_"
> +                                  version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "06y4lrp29f2fh303ijk1xhspa1d4x4dm6hnyw3dd8szi3k6hnwsj"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     (list
> +      #:tests? #f ;no tests provided
> +      #:make-flags
> +      #~(list (string-append "CC=" #$(cc-for-target)))
> +      #:phases
> +      #~(modify-phases %standard-phases
> +          (delete 'configure) ;no configure script
> +          (replace 'install ;multiple issues with provided 'make install'
> +            (lambda _
> +              (let ((bin (string-append #$output "/bin"))
> +                    (man1 (string-append #$output
> +                                         "/share/man/man1"))
> +                    (man5 (string-append #$output
> +                                         "/share/man/man5")))
> +                (mkdir-p bin)
> +                (install-file "dhex" bin)
> +                (mkdir-p man1)
> +                (install-file "dhex.1" man1)
> +                (mkdir-p man5)
> +                (install-file "dhexrc.5" man5)
> +                (install-file "dhex_markers.5" man5)
> +                (install-file "dhex_searchlog.5" man5)))))))

install-file takes care of calling 'mkdir' for you, so you can simplify
the above.

> +    (inputs (list ncurses))
> +    (home-page "https://www.dettus.net/dhex/")
> +    (synopsis "View, edit, and diff files in hexadecimal")
> +    (description
> +     "Dhex is hex editor which includes a diff mode, which can be used to
> +easily and conveniently compare two binary files.  It is based on ncurses
> +and is themeable.")
> +    (license license:gpl2)))

This should be gpl2+, given the text reads:

--8<---------------cut here---------------start------------->8---
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
--8<---------------cut here---------------end--------------->8---

Could you please send a v2 with the above corrections?

-- 
Thanks,
Maxim

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

From: flabbergasted <flabbergasted <at> nofog.net>
To: 64552 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: Add dhex.
Date: Sat, 9 Sep 2023 12:00:13 +0200

* gnu/packages/hexedit.scm (dhex): New variable.
---
 gnu/packages/hexedit.scm | 43 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index 79c14a2..7d3f7d0 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -29,6 +29,8 @@ (define-module (gnu packages hexedit)
   #:use-module (gnu packages ncurses)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix gexp)
+  #:use-module (guix utils)
   #:use-module (guix build-system gnu))
 
 (define-public hexedit
@@ -69,6 +71,47 @@ (define-public hexedit
     (home-page "http://rigaux.org/hexedit.html")
     (license license:gpl2+)))
 
+(define-public dhex
+  (package
+    (name "dhex")
+    (version "0.69")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://www.dettus.net/dhex/" name "_"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "06y4lrp29f2fh303ijk1xhspa1d4x4dm6hnyw3dd8szi3k6hnwsj"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f ;no tests provided
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target)))
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure) ;no configure script
+          (replace 'install ;multiple issues with provided 'make install'
+            (lambda _
+              (let ((bin (string-append #$output "/bin"))
+                    (man1 (string-append #$output
+                                         "/share/man/man1"))
+                    (man5 (string-append #$output
+                                         "/share/man/man5")))
+                (install-file "dhex" bin)
+                (install-file "dhex.1" man1)
+                (install-file "dhexrc.5" man5)
+                (install-file "dhex_markers.5" man5)
+                (install-file "dhex_searchlog.5" man5)))))))
+    (inputs (list ncurses))
+    (home-page "https://www.dettus.net/dhex/")
+    (synopsis "View, edit, and diff files in hexadecimal")
+    (description
+     "Dhex is hex editor which includes a diff mode, which can be used to
+easily and conveniently compare two binary files.  It is based on ncurses
+and is themeable.")
+    (license license:gpl2+)))
+
 (define-public ht
   (package
     (name "ht")
-- 
2.41.0

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

From: flabbergasted <flabbergasted <at> nofog.net>
To: 64552 <at> debbugs.gnu.org
Subject: thank you
Date: Sat, 9 Sep 2023 12:06:13 +0200

Hi Maxim,

thank you for the suggestions! I have updated the patch.
(Apologies if I'm using the bug system incorrectly.)

Kind regards,
 (flabbergasted)

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

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: 64552-done <at> debbugs.gnu.org
Cc: flabbergasted <flabbergasted <at> nofog.net>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: Re: [PATCH] gnu: Add dhex.
Date: Wed, 26 Feb 2025 10:47:54 +0100

Hello,

> thank you for the suggestions! I have updated the patch.
> (Apologies if I'm using the bug system incorrectly.)

Applied. Thank you! (and sorry for the delay)

Regards,
-- 
Nicolas Goaziou

Previous Next

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