From patchwork Sat Sep 9 10:00:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flabbergasted X-Patchwork-Id: 53685 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5E73427BBE9; Sat, 9 Sep 2023 11:01:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4EC0827BBE2 for ; Sat, 9 Sep 2023 11:01:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeuly-0002rL-4E; Sat, 09 Sep 2023 06:01:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeulv-0002qr-9k for guix-patches@gnu.org; Sat, 09 Sep 2023 06:01:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeulu-0007Oj-Ur for guix-patches@gnu.org; Sat, 09 Sep 2023 06:00:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeulx-0002I8-MO for guix-patches@gnu.org; Sat, 09 Sep 2023 06:01:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64552] [PATCH v2] gnu: Add dhex. References: <29a2c5263ac72f950491f627b6055ecb675f0068.1688931860.git.flabbergasted@nofog.net> In-Reply-To: <29a2c5263ac72f950491f627b6055ecb675f0068.1688931860.git.flabbergasted@nofog.net> Resent-From: flabbergasted Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Sep 2023 10:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64552 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 64552@debbugs.gnu.org Received: via spool by 64552-submit@debbugs.gnu.org id=B64552.16942536358753 (code B ref 64552); Sat, 09 Sep 2023 10:01:01 +0000 Received: (at 64552) by debbugs.gnu.org; 9 Sep 2023 10:00:35 +0000 Received: from localhost ([127.0.0.1]:46163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeulW-0002H7-KW for submit@debbugs.gnu.org; Sat, 09 Sep 2023 06:00:34 -0400 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]:60242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeulR-0002Go-KD for 64552@debbugs.gnu.org; Sat, 09 Sep 2023 06:00:33 -0400 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1qeulG-005H6M-Iu for 64552@debbugs.gnu.org; Sat, 09 Sep 2023 12:00:18 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nofog.net; s=selector2; h=Content-Type:MIME-Version:Message-ID:Subject:To:From:Date; bh=8tVma7O+RX6RZW4JY9eH7QwOLgHVUAQNFfS/iZZQsD0=; b=Aw0X81K1K4H43Z3Ov37E2OTAz GzxZq/+ejur+gunBCHkQdTTyc+R8e3uyRbHgsHdzG8exYCSfAZ4vP2g4JDAeB72HRDIEKvQ+T9PfU WXa1mELrLqNuJL1k94jm/FXcfjqMSTw+ioJzdIjlWzsL1AjNQuLq0G7vl5UK5//MNPL53GgaC1NJa dEowY2Q3SvygWWvHvMXmeIPh1TRQeSS1P5tkGRSf4/lMiwHy6gO/o9B0NotKD2SKHglCc3kcrAvq+ uIDThqO5Rqt149OOhsg1fiidKGUI08Sjw6Ust/CMybyinBdW3cjkgdSWCtTOb+udeg1Rm7UBrW1Xz NCqCr2J5g==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1qeulG-0004vr-74 for 64552@debbugs.gnu.org; Sat, 09 Sep 2023 12:00:18 +0200 Received: by submission02.runbox with esmtpsa [Authenticated ID (1160150)] (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) id 1qeulE-0007KI-PY for 64552@debbugs.gnu.org; Sat, 09 Sep 2023 12:00:16 +0200 Date: Sat, 9 Sep 2023 12:00:13 +0200 From: flabbergasted Message-ID: MIME-Version: 1.0 Content-Disposition: inline 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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")