unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#48016] [PATCH] gnu: direnv: Install manpages
@ 2021-04-25 11:43 Dion Mendel
  2021-04-25 17:44 ` bug#48016: " Leo Famulari
  0 siblings, 1 reply; 2+ messages in thread
From: Dion Mendel @ 2021-04-25 11:43 UTC (permalink / raw)
  To: 48016

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

Hi guix,

The direnv package has manpages in the source repository, yet none are 
currently installed.  This patch installs the manpages.

The patch was tested by installing and running direnv locally and 
viewing the manpages with man-db.

[-- Attachment #2: 0001-gnu-direnv-Install-manpages.patch --]
[-- Type: text/x-diff, Size: 1357 bytes --]

From 87fbd9f5d183b1912db186e7c5879566267655b8 Mon Sep 17 00:00:00 2001
From: Dion Mendel <guix@dm9.info>
Date: Sun, 25 Apr 2021 18:57:21 +0800
Subject: [PATCH] gnu: direnv: Install manpages

* gnu/packages/shellutils.scm (direnv): Install manpages.
---
 gnu/packages/shellutils.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index c7a941dfa6..ec887e40fd 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -254,6 +254,17 @@ are already there.")
              ;; so delete the extra source code here.
              (delete-file-recursively "src/github.com/direnv/direnv/vendor")
              #t))
+         (add-after 'install 'install-manpages
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (man (string-append out "/share/man/man1")))
+               (mkdir-p man)
+               (with-directory-excursion "src/github.com/direnv/direnv"
+                 (install-file "man/direnv.1" man)
+                 (install-file "man/direnv-stdlib.1" man)
+                 (install-file "man/direnv.toml.1" man)
+               )
+               #t)))
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#48016: [PATCH] gnu: direnv: Install manpages
  2021-04-25 11:43 [bug#48016] [PATCH] gnu: direnv: Install manpages Dion Mendel
@ 2021-04-25 17:44 ` Leo Famulari
  0 siblings, 0 replies; 2+ messages in thread
From: Leo Famulari @ 2021-04-25 17:44 UTC (permalink / raw)
  To: Dion Mendel; +Cc: 48016-done

On Sun, Apr 25, 2021 at 07:43:08PM +0800, Dion Mendel wrote:
> The direnv package has manpages in the source repository, yet none are
> currently installed.  This patch installs the manpages.
> 
> The patch was tested by installing and running direnv locally and viewing
> the manpages with man-db.

Good catch and thanks for the patch!

> From 87fbd9f5d183b1912db186e7c5879566267655b8 Mon Sep 17 00:00:00 2001
> From: Dion Mendel <guix@dm9.info>
> Date: Sun, 25 Apr 2021 18:57:21 +0800
> Subject: [PATCH] gnu: direnv: Install manpages
> 
> * gnu/packages/shellutils.scm (direnv): Install manpages.

I tweaked the commit message and added you to the list authors of
'gnu/packages/shellutils.scm' ...

> +         (add-after 'install 'install-manpages
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (man (string-append out "/share/man/man1")))
> +               (mkdir-p man)
> +               (with-directory-excursion "src/github.com/direnv/direnv"
> +                 (install-file "man/direnv.1" man)
> +                 (install-file "man/direnv-stdlib.1" man)
> +                 (install-file "man/direnv.toml.1" man)
> +               )
> +               #t)))

... and I also removed this #t because it will not be necessary soon
enough. I know that you were probably warned to include it, so I'm sorry
about the contradictory advice.

Pushed as 862a88612f903ffe5cca1213ba40010876d19c62




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-04-25 17:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-25 11:43 [bug#48016] [PATCH] gnu: direnv: Install manpages Dion Mendel
2021-04-25 17:44 ` bug#48016: " Leo Famulari

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).