From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WKaWM3tC92TVSwAAG6o9tA:P1 (envelope-from ) for ; Tue, 05 Sep 2023 17:00:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id WKaWM3tC92TVSwAAG6o9tA (envelope-from ) for ; Tue, 05 Sep 2023 17:00:11 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 779DF33609 for ; Tue, 5 Sep 2023 17:00:11 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=VoPc2UwR; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693926011; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=uI+LccbHRI4dc9211S7s+BFL68cVofgVHbkGQ3EOJi4=; b=TV4hYjgTAe6YpRsHYZHx5GpF+UWqxqmDJT6ihlsGpLu3vy9NNHCnBngKPeSuesm83COq9I wGLx9bERLr6zE0Ox+Kh92ea6hX8TGBu1d7gNZ9zGcsu6O1FexnEQqecOMnlOKDayj7Y4Kv 0f+eXkXU5yAtK6su+CrOmzymMqgNiavgCxSJu/OBXwqHwASvNTnjjwkOEW0xVOBnlfzP7a /wMZIrsSjyYyMwOLyIoN31zn72btADCay8fB266IfQnTFFdDYQENA9vOa7aOVxv9KcGhep D5ChaDdtdopTU8Wj0/gjH2m+Wq2gTvxsAWxYSFTurJ/A1GgLgt4jmg3v4msb8Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693926011; a=rsa-sha256; cv=none; b=Zw9YMXn1WuyEANJGBS/qDm1WqTQG91mKds8ZFfw/MEIJWG9bFQrZkMDxY2odK8A0sCrPfv GOBqr7PkbFlFVRb8IZzbB2qQzDDWbU4Qtcu2O1JQFFzgLCMnIiXPq5btC1QrbDWkxyVo8i pq1KG65fDvC977XeRIPERsy4TeK7vTfXQLlrmy9/VFsY07pypVzkdqwEB47zJb9TpCCL72 ObSBiR7hDdcOUOk2H3xTl34sz/yPayUcb76A9Egudpn5E27APamHdlgLa626KVoqhYzzyd uOxOTEIS5LeAni6sYTOJy/ZRrgJsiun0yq5YhbtdoQzRpv+zcM4SS9typGtLxw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=VoPc2UwR; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdXXA-0004Tj-CV; Tue, 05 Sep 2023 11:00:04 -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 1qdXX7-0004TC-UH for guix-patches@gnu.org; Tue, 05 Sep 2023 11:00:01 -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 1qdXX7-00064H-JV for guix-patches@gnu.org; Tue, 05 Sep 2023 11:00:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdXX8-0003Li-2B for guix-patches@gnu.org; Tue, 05 Sep 2023 11:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64552] [PATCH] gnu: Add dhex. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Sep 2023 15:00: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 To: flabbergasted Cc: 64552@debbugs.gnu.org Received: via spool by 64552-submit@debbugs.gnu.org id=B64552.169392596712771 (code B ref 64552); Tue, 05 Sep 2023 15:00:01 +0000 Received: (at 64552) by debbugs.gnu.org; 5 Sep 2023 14:59:27 +0000 Received: from localhost ([127.0.0.1]:57677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdXWY-0003Ju-Lk for submit@debbugs.gnu.org; Tue, 05 Sep 2023 10:59:27 -0400 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]:60905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdXWW-0003Ja-BH for 64552@debbugs.gnu.org; Tue, 05 Sep 2023 10:59:25 -0400 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-76df3d8fb4eso153302985a.1 for <64552@debbugs.gnu.org>; Tue, 05 Sep 2023 07:59:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693925958; x=1694530758; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=uI+LccbHRI4dc9211S7s+BFL68cVofgVHbkGQ3EOJi4=; b=VoPc2UwRTrY8aaDFTf+921Uix1QTXV8sOoNYfFgkyOzU6Z8c5kxLnzj5qzYh9eGkPO h/CVujSNceRsLn5D9hT8v6paBtuZPiQ/wKrrOvObFwym50Y4p0QfBXn8avF71lB6kPZ+ kjhFzdYauf+DXdqfx1/AJPb3dz99WGJKzbe9tnZ+J95jJVt2gGoxFb3Igj+EPMOajUkB vsXobGkM+6W+RlBCOlP20E22F526tZhY4aoVTKmXDiArNCD35txkdG+we3VR5AGeTIR2 /euGqjPB3werSnjlUa/Aq5Ia60H8gcmMxypYHEe6zmWkOoE7QkCRzPdk9d3mmxwXT0EK 5agg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693925958; x=1694530758; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=uI+LccbHRI4dc9211S7s+BFL68cVofgVHbkGQ3EOJi4=; b=NxANFYJpRBbfdQjhOzAKuUUez45Mmbhl1VjRzSFmxEqStWHKyU1A/wT3MjK/SimacI aeyQWB+/W7uhUo8rU0h0C9LKOxGBDQY3bptON+rPWCqkdaGNDDO9QlyB81A8qvbzxJSh FQIOUyhVMANxR4RtAkaptM/SwZc6wjbqUZ1yw6ahSl2fhGN7p8buKyCOITzuoJwKPEs5 h5a7kWmljg0H3NJLQUgOwZbro+p4/SG5o17i4MEiAE2YFnOIp39r9W7naePaJSm8EJHy aPvcD0KpMuHOWB8rn8YvtdFI761kXUiYCwTzacyd0Ub6KXKH7CP9P6iaaT5GimtToBgD WcGw== X-Gm-Message-State: AOJu0YzqyAPYkD/p+6ypnEDy7CtYBr+zyPhseU1uABo8ZC1p1hDiqusa XsNYZw8h9TfTHXV+IdWL3eLkrelvxg67pQ== X-Google-Smtp-Source: AGHT+IFdI8yjoq7L4os86FVh1DykrnFfRI6HHa3OtWSBK/cLo+WQuhgeRbCuMcVfrQvxzm3vJupjKg== X-Received: by 2002:a05:620a:2412:b0:765:a77c:7219 with SMTP id d18-20020a05620a241200b00765a77c7219mr16384068qkn.0.1693925957856; Tue, 05 Sep 2023 07:59:17 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id i2-20020a37c202000000b007682af2c8aasm4122841qkm.126.2023.09.05.07.59.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 07:59:17 -0700 (PDT) From: Maxim Cournoyer References: <29a2c5263ac72f950491f627b6055ecb675f0068.1688931860.git.flabbergasted@nofog.net> Date: Tue, 05 Sep 2023 10:59:16 -0400 In-Reply-To: <29a2c5263ac72f950491f627b6055ecb675f0068.1688931860.git.flabbergasted@nofog.net> (flabbergasted@nofog.net's message of "Mon, 10 Jul 2023 10:24:20 +0100") Message-ID: <87v8cois3f.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -5.13 X-Spam-Score: -5.13 X-Migadu-Queue-Id: 779DF33609 X-TUID: X/nTsw3zAVMj Hello, flabbergasted 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