From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com (Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer?=) Subject: Re: docbook-xsl version number in pathname (was Re: [PATCH] gnu: Add moreutils.) Date: Mon, 02 Feb 2015 01:16:54 +0100 Message-ID: <877fw1jhft.fsf@taylan.uni.cx> References: <87a90yqvb6.fsf@taylan.uni.cx> <87386ql819.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> <87oapefai0.fsf@netris.org> <871tm9rd3i.fsf@taylan.uni.cx> <87siepk9bl.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> <87h9v5ptwd.fsf@taylan.uni.cx> <87vbjle1gi.fsf@netris.org> <87oapde144.fsf_-_@netris.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI4hG-0005Ri-VY for guix-devel@gnu.org; Sun, 01 Feb 2015 19:17:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YI4hF-0001De-EN for guix-devel@gnu.org; Sun, 01 Feb 2015 19:16:58 -0500 Received: from mail-wi0-x231.google.com ([2a00:1450:400c:c05::231]:41873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI4hF-0001Da-2D for guix-devel@gnu.org; Sun, 01 Feb 2015 19:16:57 -0500 Received: by mail-wi0-f177.google.com with SMTP id r20so12119006wiv.4 for ; Sun, 01 Feb 2015 16:16:56 -0800 (PST) In-Reply-To: <87oapde144.fsf_-_@netris.org> (Mark H. Weaver's message of "Sun, 01 Feb 2015 17:08:27 -0500") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Mark H Weaver Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Mark H Weaver writes: > I just realized, it's not good that the docbook-xsl version number is > hardcoded here. This will break the next time docbook-xsl is updated. > > Does anyone know how to improve this? > > The relevant bit in the package Makefile that is being modified is this: > > DOCBOOK2XMAN=xsltproc --param man.authors.section.enabled 0 /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl > > Can we modify this command to avoid giving the full pathname? Or should > we modify our docbook-xsl package to add a symlink that allows us to > omit the version number? > > Mark I just hacked up the following; not sure if it's OK: (let* ((docbook-xsl (assoc-ref inputs "docbook-xsl")) (files (find-files docbook-xsl "^docbook\\.xsl$"))) (find (lambda (file) (string-match "/manpages/docbook\\.xsl$" file)) files)) Updated patch: --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-moreutils.patch Content-Transfer-Encoding: quoted-printable Content-Description: patch >From d7eeccc9c6b53670aa82936add30e2b0c80ea201 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Taylan=3D20Ulrich=3D20Bay=3DC4=3DB1rl=3DC4=3DB1/Kammer?=3D Date: Sun, 1 Feb 2015 02:21:11 +0100 Subject: [PATCH] gnu: Add moreutils. * gnu/packages/moreutils.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 1 + gnu/packages/moreutils.scm | 69 ++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 70 insertions(+) create mode 100644 gnu/packages/moreutils.scm diff --git a/gnu-system.am b/gnu-system.am index 706ad57..8ae5b79 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -187,6 +187,7 @@ GNU_SYSTEM_MODULES =3D \ gnu/packages/miscfiles.scm \ gnu/packages/mit-krb5.scm \ gnu/packages/moe.scm \ + gnu/packages/moreutils.scm \ gnu/packages/mpd.scm \ gnu/packages/mp3.scm \ gnu/packages/mpi.scm \ diff --git a/gnu/packages/moreutils.scm b/gnu/packages/moreutils.scm new file mode 100644 index 0000000..0d07456 --- /dev/null +++ b/gnu/packages/moreutils.scm @@ -0,0 +1,69 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2015 Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix 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 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages moreutils) + #:use-module ((guix licenses) #:prefix l:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages perl) + #:use-module (gnu packages xml) + #:use-module (gnu packages docbook)) + +(define-public moreutils + (package + (name "moreutils") + (version "0.55") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://debian/pool/main/m/moreutils/moreutils_" + version ".orig.tar.gz")) + (sha256 + (base32 + "1dcah2jx8dbznn8966xl7sf1jrld2qfh6l6xcmx9dsnf8p8mr7fs")))) + (build-system gnu-build-system) + (inputs `(("perl" ,perl) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("docbook-xml" ,docbook-xml-4.4) + ("docbook-xsl" ,docbook-xsl))) + (arguments + `(#:phases + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys) + (use-modules (srfi srfi-1) + (ice-9 regex)) + (substitute* "Makefile" + (("/usr/share/xml/.*/docbook.xsl") + (let* ((docbook-xsl (assoc-ref inputs "docbook-xsl")) + (files (find-files docbook-xsl "^docbook\\.xsl$"))) + (find (lambda (file) + (string-match "/manpages/docbook\\.xsl$" file)) + files))))) + %standard-phases) + #:make-flags + (list (string-append "PREFIX=3D" (assoc-ref %outputs "out")) + "CC=3Dgcc"))) + (home-page "http://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+))) --=20 2.2.1 --=-=-=--