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: [PATCH] gnu: Add moreutils. Date: Sun, 01 Feb 2015 15:51:14 +0100 Message-ID: <87h9v5ptwd.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> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHvrr-0001pl-Hp for guix-devel@gnu.org; Sun, 01 Feb 2015 09:51:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHvrq-0008PV-DI for guix-devel@gnu.org; Sun, 01 Feb 2015 09:51:19 -0500 Received: from mail-we0-x22b.google.com ([2a00:1450:400c:c03::22b]:49978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHvrq-0008PK-2z for guix-devel@gnu.org; Sun, 01 Feb 2015 09:51:18 -0500 Received: by mail-we0-f171.google.com with SMTP id k11so32432626wes.2 for ; Sun, 01 Feb 2015 06:51:17 -0800 (PST) In-Reply-To: <87siepk9bl.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> (David Thompson's message of "Sun, 01 Feb 2015 09:14:38 -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: David Thompson Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain No problem; here's the updated patch. :-) I still use setenv for XML_CATALOG_FILES; is there a more correct way? (It's not a Make variable; it's for xmllint(1).) --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-moreutils.patch Content-Transfer-Encoding: quoted-printable Content-Description: gnu: Add moreutils. >From b38dd34fce834a54ccd0ae4628d8806418b41269 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-system.am (GNU_SYSTEM_MODULES): Add moreutils.scm. * gnu/packages/moreutils.scm: New file. --- gnu-system.am | 1 + gnu/packages/moreutils.scm | 71 ++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 72 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..5a09b0f --- /dev/null +++ b/gnu/packages/moreutils.scm @@ -0,0 +1,71 @@ +;;; 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 + "http://ftp.debian.org/debian/pool/main/m/moreutils/mo= reutils_" + 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 outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (docbook-xml (assoc-ref inputs "docbook-xml")) + (docbook-xsl (assoc-ref inputs "docbook-xsl"))) + (substitute* "Makefile" + (("/usr/share/xml/.*/docbook.xsl") + (string-append + docbook-xsl + "/xml/xsl/docbook-xsl-1.78.1/manpages/docbook.xsl"))) + (setenv + "XML_CATALOG_FILES" + (string-append docbook-xml "/xml/dtd/docbook/catalog.xml")))) + %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 --=-=-=--