Subject: bug#42159: closed (Re: [bug#42159] [PATCH] gnu: git-annex: Build and install man pages.)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 02 Jul 2020 07:52:01 +0000

Your bug report

#42159: [PATCH] gnu: git-annex: Build and install man pages.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
42159: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=42159
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#42159] [PATCH] gnu: git-annex: Build and install man pages.
From: Efraim Flashner <[email-masked]>
To: Kyle Meyer <[email-masked]>
Cc: [email-masked]
Date: Thu, 2 Jul 2020 10:50:33 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

Looks good! I was missing the man pages.

Patch pushed.

-- 
Efraim Flashner   <[email-masked]>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Subject: [PATCH] gnu: git-annex: Build and install man pages.
From: Kyle Meyer <[email-masked]>
To: [email-masked]
Cc: Kyle Meyer <[email-masked]>
Date: Wed, 1 Jul 2020 20:50:41 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/haskell-apps.scm (git-annex)[arguments]: Add phases for
building and installing the man pages.
[native-inputs]: Add perl.
---
 gnu/packages/haskell-apps.scm | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index f8bee424c3..5b6f0401e4 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2018 Arun Isaac <[email-masked]>
 ;;; Copyright © 2016, 2017 Leo Famulari <[email-masked]>
 ;;; Copyright © 2015 Paul van der Walt <[email-masked]>
-;;; Copyright © 2019 Kyle Meyer <[email-masked]>
+;;; Copyright © 2019, 2020 Kyle Meyer <[email-masked]>
 ;;; Copyright © 2015 John Soo <[email-masked]>
 ;;; Copyright © 2019, 2020 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2019 Alex Griffin <[email-masked]>
@@ -370,8 +370,7 @@ (define-public git-annex
              ;; Factor out necessary build logic from the provided
              ;; `Setup.hs' script.  The script as-is does not work because
              ;; it cannot find its dependencies, and there is no obvious way
-             ;; to tell it where to look.  Note that we do not preserve the
-             ;; code that installs man pages here.
+             ;; to tell it where to look.
              (call-with-output-file "PreConf.hs"
                (lambda (out)
                  (format out "import qualified Build.Configure as Configure~%")
@@ -385,6 +384,18 @@ (define-public git-annex
            (lambda _
              (invoke "runhaskell" "PreConf.hs")
              #t))
+         (add-after 'build 'build-manpages
+           (lambda _
+             ;; The Setup.hs rewrite above removed custom code for building
+             ;; the man pages.  In addition to that code, git-annex's source
+             ;; tree has a file that's not included in the tarball but is used
+             ;; by the Makefile to build man pages.  Copy the core bits here.
+             (call-with-output-file "Build/MakeMans.hs"
+               (lambda (out)
+                 (format out "module Main where~%")
+                 (format out "import Build.Mans~%")
+                 (format out "main = buildMansOrWarn~%")))
+             (invoke "runhaskell" "Build/MakeMans.hs")))
          (replace 'check
            (lambda _
              ;; We need to set the path so that Git recognizes
@@ -400,6 +411,14 @@ (define-public git-annex
              ;; Undo `patch-shell-for-tests'.
              (copy-file "/tmp/Shell.hs" "Utility/Shell.hs")
              (apply (assoc-ref %standard-phases 'build) args)))
+         (add-after 'install 'install-manpages
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((man (string-append (assoc-ref outputs "out")
+                                       "/man/man1/")))
+               (mkdir-p man)
+               (for-each (lambda (file) (install-file file man))
+                         (find-files "man")))
+             #t))
          (add-after 'install 'install-symlinks
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -465,7 +484,8 @@ (define-public git-annex
      `(("ghc-tasty" ,ghc-tasty)
        ("ghc-tasty-hunit" ,ghc-tasty-hunit)
        ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
-       ("ghc-tasty-rerun" ,ghc-tasty-rerun)))
+       ("ghc-tasty-rerun" ,ghc-tasty-rerun)
+       ("perl" ,perl)))
     (home-page "https://git-annex.branchable.com/")
     (synopsis "Manage files with Git, without checking in their contents")
     (description "This package allows managing files with Git, without

base-commit: 67ba9815c954d6ccef041d5dbbe2b2ba14f37474
-- 
2.27.0.383.g050319c2ae