GNU bug report logs - #44596
[PATCH 0/2] gnu: knot-resolver: Update to 5.2.0; add "doc" output

Previous Next

Package: guix-patches;

Reported by: Simon South <simon <at> simonsouth.net>

Date: Thu, 12 Nov 2020 16:47:02 UTC

Severity: normal

Tags: patch

Done: 宋文武 <iyzsong <at> outlook.com>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: Simon South <simon <at> simonsouth.net>
To: 44596 <at> debbugs.gnu.org
Cc: Simon South <simon <at> simonsouth.net>
Subject: [bug#44596] [PATCH v2 2/2] gnu: knot-resolver: Move manual, examples to separate "doc" output
Date: Tue,  1 Dec 2020 09:45:20 -0500
* gnu/packages/dns.scm (knot-resolver)[outputs]: Add "doc" output.
[arguments]<phases>: Add "move-doc" phase, which moves the manual (in both
HTML and Info formats) and example configuration files to the "doc" output.
---
 gnu/packages/dns.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index f0c3d6a602..16313df73f 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -948,6 +948,7 @@ synthesis, and on-the-fly re-configuration.")
                (patches
                 (search-patches "knot-resolver-fix-map-command-on-32-bit.patch"))))
     (build-system meson-build-system)
+    (outputs '("out" "doc"))
     (arguments
      '(#:configure-flags '("-Ddoc=enabled")
        #:phases
@@ -962,6 +963,20 @@ synthesis, and on-the-fly re-configuration.")
          (add-after 'build 'build-doc
            (lambda _
              (invoke "ninja" "doc")))
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Move the manual and the example configuration files to the
+             ;; "doc" output.
+             (let ((out (assoc-ref outputs "out"))
+                   (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share/doc/knot-resolver"))
+               (for-each
+                (lambda (dir)
+                  (rename-file (string-append out "/share/" dir)
+                               (string-append doc "/share/" dir)))
+                '("doc/knot-resolver/examples"
+                  "doc/knot-resolver/html"
+                  "info")))))
          (add-after 'install 'wrap-binary
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
-- 
2.29.2





This bug report was last modified 4 years and 223 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.