From patchwork Mon Nov 14 18:05:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 44517 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 1DF4D27BBEA; Tue, 15 Nov 2022 01:33:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 C23EB27BBE9 for ; Tue, 15 Nov 2022 01:33:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouioW-0000Tp-JP; Mon, 14 Nov 2022 18:24:28 -0500 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 1ouifV-0006BC-9E for guix-patches@gnu.org; Mon, 14 Nov 2022 18:15:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouifU-0000ae-MV for guix-patches@gnu.org; Mon, 14 Nov 2022 18:15:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ouifU-00009B-HV for guix-patches@gnu.org; Mon, 14 Nov 2022 18:15:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59263] [PATCH] gnu: moreutils: Fix corrupted manual pages. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Nov 2022 23:15:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59263@debbugs.gnu.org Cc: "\(" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166846769732723 (code B ref -1); Mon, 14 Nov 2022 23:15:08 +0000 Received: (at submit) by debbugs.gnu.org; 14 Nov 2022 23:14:57 +0000 Received: from localhost ([127.0.0.1]:51330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ouifJ-0008Vg-Bj for submit@debbugs.gnu.org; Mon, 14 Nov 2022 18:14:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:46626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ouieY-0008ND-BI for submit@debbugs.gnu.org; Mon, 14 Nov 2022 18:14:15 -0500 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 1ouieX-00025D-SV for guix-patches@gnu.org; Mon, 14 Nov 2022 18:14:10 -0500 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oudpp-0005vl-03 for guix-patches@gnu.org; Mon, 14 Nov 2022 13:05:31 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 10DDA41291; Mon, 14 Nov 2022 19:05:25 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cXgnMPYV3-fi; Mon, 14 Nov 2022 19:05:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1668449123; bh=0OjYwshgErr+LWo6u3soKxPtIUvvgSSui2WV+xCsgUY=; h=From:To:Cc:Subject:Date:From; b=XdozTsTuA3MNI+4VcLbJ7Ratflzue0Yqm3VLnWpQ7V4WDw1QsYphyfEkXv3keBIxA pYW1g2zuSIdDhAQVg8fauYE74jWC92iO+o6PqF/szLQSm5EqkAOwTF5dNYL1zrHIGG 6fubEXuvTe77Got5RKHsTAMYBVGxTsQSg4TkpwSML40EmtiHVTKNVD16uKiWxcPjvf 38xbxMczBmXnRlVp7DkZqiq0TAroYoYd+amcSmB55Wu6QRdd9W6GsTjIvcohHmzD3l d6ZnDwPaHEcZPlOMP8AqE03V80dkajv6QOY/9sH+uXflrlfPyKzjo6HteVZ0JPrEOK u9NY0rSOOM2/g== Date: Mon, 14 Nov 2022 18:05:17 +0000 Message-Id: <20221114180517.11946-1-paren@disroot.org> MIME-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" 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/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(-) base-commit: f572de77c4fda3347bea16b4c86d630b193291dc 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 ;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2016–2018, 2020–2022 Tobias Geerinckx-Rice +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,34 +20,30 @@ ;;; along with GNU Guix. If not, see . (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+)))