From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: [PATCH 3/3] gnu: Move help2man package to (gnu packages man) module Date: Sun, 06 Apr 2014 20:45:42 -0400 Message-ID: <87y4zidl1l.fsf@labrys.i-did-not-set--mail-host-address--so-tickle-me> References: <877g72ezqb.fsf@labrys.i-did-not-set--mail-host-address--so-tickle-me> <874n26ezp0.fsf@labrys.i-did-not-set--mail-host-address--so-tickle-me> <871txaeznu.fsf@labrys.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: text/x-diff; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWxh9-0006Um-Ro for guix-devel@gnu.org; Sun, 06 Apr 2014 20:45:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WWxh4-00073m-7g for guix-devel@gnu.org; Sun, 06 Apr 2014 20:45:51 -0400 Received: from na3sys009aog102.obsmtp.com ([74.125.149.69]:44756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWxh3-00073c-Tn for guix-devel@gnu.org; Sun, 06 Apr 2014 20:45:46 -0400 Received: by mail-qa0-f50.google.com with SMTP id o15so5224628qap.23 for ; Sun, 06 Apr 2014 17:45:44 -0700 (PDT) Received: from labrys (209-6-40-86.c3-0.smr-ubr1.sbo-smr.ma.cable.rcn.com. [209.6.40.86]) by mx.google.com with ESMTPSA id o11sm26609081qay.39.2014.04.06.17.45.43 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 06 Apr 2014 17:45:43 -0700 (PDT) In-Reply-To: <871txaeznu.fsf@labrys.i-did-not-set--mail-host-address--so-tickle-me> Content-Disposition: inline; filename=0003-gnu-Move-help2man-package-to-gnu-packages-man-module.patch 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: guix-devel@gnu.org >From ef7e3f74b519df9cac77d23e97aa4371e68352fc Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sun, 6 Apr 2014 20:30:37 -0400 Subject: [PATCH 3/3] gnu: Move help2man package to (gnu packages man) modul= e. * gnu/packages/man.scm (help2man): New variable. * gnu/packages/help2man.scm: Delete it. * gnu-system.am (GNU_SYSTEM_MODULES): Delete 'gnu/packages/help2man.scm'. --- gnu-system.am | 1 - gnu/packages/help2man.scm | 53 -------------------------------------------= ---- gnu/packages/man.scm | 31 +++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 54 deletions(-) delete mode 100644 gnu/packages/help2man.scm diff --git a/gnu-system.am b/gnu-system.am index 6b2a3d4..04740a0 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -107,7 +107,6 @@ GNU_SYSTEM_MODULES =3D \ gnu/packages/guile-wm.scm \ gnu/packages/gv.scm \ gnu/packages/gxmessage.scm \ - gnu/packages/help2man.scm \ gnu/packages/hugs.scm \ gnu/packages/hurd.scm \ gnu/packages/icu4c.scm \ diff --git a/gnu/packages/help2man.scm b/gnu/packages/help2man.scm deleted file mode 100644 index 9f3af7c..0000000 --- a/gnu/packages/help2man.scm +++ /dev/null @@ -1,53 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2012 Ludovic Court=C3=A8s -;;; -;;; 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 help2man) - #:use-module (guix licenses) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (guix build-system gnu) - #:use-module (gnu packages perl)) - -(define-public help2man - (package - (name "help2man") - (version "1.45.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/help2man/help2man-" - version ".tar.xz")) - (sha256 - (base32 - "1hk7ciqinq7djdb7s94y3jxh06rp8i93bpjmg4r40cniws8wf3y7")))) - (build-system gnu-build-system) - (arguments `(;; There's no `check' target. - #:tests? #f)) - (inputs - `(("perl" ,perl) - ;; TODO: Add these optional dependencies. - ;; ("perl-LocaleGettext" ,perl-LocaleGettext) - ;; ("gettext" ,gettext) - )) - (home-page "http://www.gnu.org/software/help2man/") - (synopsis "Automatically generate man pages from program --help") - (description - "GNU help2man is a program that converts the output of standard -\"--help\" and \"--version\" command-line arguments into a manual page -automatically.") - (license gpl3+))) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 47eb892..3fcca5d 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2012 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2014 David Thompson ;;; ;;; This file is part of GNU Guix. @@ -26,6 +27,7 @@ #:use-module (gnu packages groff) #:use-module (gnu packages less) #:use-module (gnu packages lynx) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config)) =20 (define-public libpipeline @@ -93,3 +95,32 @@ a flexible and convenient way.") accessed using the man command. It uses a Berkeley DB database in place of the traditional flat-text whatis databases.") (license gpl2+))) + +(define-public help2man + (package + (name "help2man") + (version "1.45.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/help2man/help2man-" + version ".tar.xz")) + (sha256 + (base32 + "1hk7ciqinq7djdb7s94y3jxh06rp8i93bpjmg4r40cniws8wf3y7")))) + (build-system gnu-build-system) + (arguments `(;; There's no `check' target. + #:tests? #f)) + (inputs + `(("perl" ,perl) + ;; TODO: Add these optional dependencies. + ;; ("perl-LocaleGettext" ,perl-LocaleGettext) + ;; ("gettext" ,gnu-gettext) + )) + (home-page "http://www.gnu.org/software/help2man/") + (synopsis "Automatically generate man pages from program --help") + (description + "GNU help2man is a program that converts the output of standard +\"--help\" and \"--version\" command-line arguments into a manual page +automatically.") + (license gpl3+))) --=20 1.8.4