From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: Re: [PATCH] gnu: Add moreutils. Date: Sat, 31 Jan 2015 20:44:50 -0500 Message-ID: <87386ql819.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> References: <87a90yqvb6.fsf@taylan.uni.cx> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHjan-0000Qk-KB for guix-devel@gnu.org; Sat, 31 Jan 2015 20:44:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHjam-0005Y6-As for guix-devel@gnu.org; Sat, 31 Jan 2015 20:44:53 -0500 Received: from mail.fsf.org ([208.118.235.13]:54552) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHjam-0005Y0-6r for guix-devel@gnu.org; Sat, 31 Jan 2015 20:44:52 -0500 In-Reply-To: <87a90yqvb6.fsf@taylan.uni.cx> 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: =?utf-8?Q?Taylan_Ulrich_Bay=C4=B1rl=C4=B1=2FKammer?= , guix-devel@gnu.org "Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer" writes: > From c770ed88c66c10de47e8fe7f84c3df6cf7b14aa4 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..da3df89 > --- /dev/null > +++ b/gnu/packages/moreutils.scm > @@ -0,0 +1,71 @@ > +;;; GNU Guix --- Functional package management for GNU > +;;; Copyright =C2=A9 2014 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/= 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 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" > + (("PREFIX\\?=3D/usr") > + (string-append "PREFIX?=3D" out)) In GNU Make, the '?=3D' operator for variable assignment means "assign if the variable isn't already defined"[1]. So, rather than a substitution, how about just setting an environment variable? (setenv "PREFIX" out) > + (("/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")) > + (setenv "CC" "gcc"))) > + %standard-phases))) > + (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 > > Everything else looks good to me! :) [1] https://www.gnu.org/software/make/manual/html_node/Flavors.html#Flavors --=20 David Thompson Web Developer - Free Software Foundation - http://fsf.org GPG Key: 0FF1D807 Support the FSF: https://fsf.org/donate