From: David Thompson <dthompson2@worcester.edu>
To: guix-devel@gnu.org
Subject: [PATCH 3/3] gnu: Move help2man package to (gnu packages man) module
Date: Sun, 06 Apr 2014 20:45:42 -0400 [thread overview]
Message-ID: <87y4zidl1l.fsf@labrys.i-did-not-set--mail-host-address--so-tickle-me> (raw)
In-Reply-To: <871txaeznu.fsf@labrys.i-did-not-set--mail-host-address--so-tickle-me>
[-- Attachment #1: 0003-gnu-Move-help2man-package-to-gnu-packages-man-module.patch --]
[-- Type: text/x-diff, Size: 5172 bytes --]
From ef7e3f74b519df9cac77d23e97aa4371e68352fc Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson@member.fsf.org>
Date: Sun, 6 Apr 2014 20:30:37 -0400
Subject: [PATCH 3/3] gnu: Move help2man package to (gnu packages man) module.
* 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 = \
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 © 2012 Ludovic Courtès <ludo@gnu.org>
-;;;
-;;; 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 <http://www.gnu.org/licenses/>.
-
-(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 © 2012 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 David Thompson <dthompson2@worcester.edu>
;;;
;;; 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))
(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+)))
--
1.8.4
next prev parent reply other threads:[~2014-04-07 0:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-07 0:43 [PATCH 0/3] Add man-db and libpipeline David Thompson
2014-04-07 0:43 ` [PATCH 1/3] gnu: Add libpipeline David Thompson
2014-04-07 0:44 ` [PATCH 2/3] gnu: Add man-db David Thompson
2014-04-07 0:45 ` David Thompson [this message]
2014-04-07 7:47 ` [PATCH 3/3] gnu: Move help2man package to (gnu packages man) module Ludovic Courtès
2014-04-07 5:12 ` [PATCH 2/3] gnu: Add man-db Mark H Weaver
[not found] ` <87txa59xvw.fsf@labrys.i-did-not-set--mail-host-address--so-tickle-me>
2014-04-08 1:51 ` Mark H Weaver
2014-04-08 11:46 ` David Thompson
2014-04-08 12:12 ` Ludovic Courtès
2014-04-08 12:40 ` Thompson, David
2014-04-08 22:02 ` David Thompson
2014-04-08 22:55 ` Nikita Karetnikov
2014-04-07 7:46 ` [PATCH 1/3] gnu: Add libpipeline Ludovic Courtès
2014-04-09 0:52 ` [PATCH 0/3] Add man-db and libpipeline David Thompson
2014-04-09 9:32 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y4zidl1l.fsf@labrys.i-did-not-set--mail-host-address--so-tickle-me \
--to=dthompson2@worcester.edu \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.