GNU bug report logs - #59263
[PATCH] gnu: moreutils: Fix corrupted manual pages.

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 59263 in the body.
You can then email your comments to 59263 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: "(" <paren <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: "\(" <paren <at> disroot.org>
Subject: [PATCH] gnu: moreutils: Fix corrupted manual pages.
Date: Mon, 14 Nov 2022 18:05:17 +0000

* gnu/packages/moreutils.scm: Alphabetically sort #:USE-MODULES
  forms.  Use LICENSE: as the license prefix.
(moreutils)[source]: Add FILE-NAME.
[native-inputs](docbook-xsl): Change to DOCBOOK-XSL-NEXT.
---
 gnu/packages/moreutils.scm | 49 ++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/moreutils.scm b/gnu/packages/moreutils.scm
index aaa787c1d9..c38df45bf8 100644
--- a/gnu/packages/moreutils.scm
+++ b/gnu/packages/moreutils.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli <at> gmail.com>
 ;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2016–2018, 2020–2022 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2022 ( <paren <at> disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,34 +20,30 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages moreutils)
-  #:use-module (guix gexp)
-  #:use-module ((guix licenses) #:prefix l:)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix utils)
+  #:use-module (gnu packages docbook)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages docbook))
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils))
 
 (define-public moreutils
   (package
     (name "moreutils")
     (version "0.67")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://git.joeyh.name/index.cgi/moreutils.git/snapshot/"
-             name "-" version ".tar.gz"))
-       (sha256
-        (base32 "045d2dfvsd4sxxr2i2qvkpgvi912qj9vc4gpc8fb4hr9q912z1q3"))))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://git.joeyh.name/index.cgi/moreutils.git/snapshot/"
+                    name "-" version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "045d2dfvsd4sxxr2i2qvkpgvi912qj9vc4gpc8fb4hr9q912z1q3"))))
     (build-system gnu-build-system)
-    ;; For building the manual pages.
-    (native-inputs
-     (list docbook-xml-4.4 docbook-xsl libxml2 libxslt))
-    (inputs
-     (list perl perl-timedate perl-time-duration))
     (arguments
      (list #:phases
            #~(modify-phases %standard-phases
@@ -64,9 +61,19 @@ (define-public moreutils
                                   #$(package-version (this-package-native-input
                                                       "docbook-xsl")))
                    (string-append "CC=" #$(cc-for-target)))))
+    (inputs
+     (list perl
+           perl-timedate
+           perl-time-duration))
+    ;; For building the manual pages.
+    (native-inputs
+     (list docbook-xml-4.4
+           docbook-xsl-next     ;without -next, man pages are corrupted
+           libxml2
+           libxslt))
     (home-page "https://joeyh.name/code/moreutils/")
     (synopsis "Miscellaneous general-purpose command-line tools")
     (description
      "Moreutils is a collection of general-purpose command-line tools to
 augment the traditional Unix toolbox.")
-    (license l:gpl2+)))
+    (license license:gpl2+)))

base-commit: f572de77c4fda3347bea16b4c86d630b193291dc
-- 
2.38.1

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: "(" <paren <at> disroot.org>
Cc: 59263-done <at> debbugs.gnu.org
Subject: Re: bug#59263: [PATCH] gnu: moreutils: Fix corrupted manual pages.
Date: Sat, 19 Nov 2022 19:46:00 +0100

Hi,

"(" <paren <at> disroot.org> skribis:

> * gnu/packages/moreutils.scm: Alphabetically sort #:USE-MODULES
>   forms.  Use LICENSE: as the license prefix.
> (moreutils)[source]: Add FILE-NAME.
> [native-inputs](docbook-xsl): Change to DOCBOOK-XSL-NEXT.

Applied, thanks!

Ludo’.

Previous Next

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