all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Bruno Victal <mirai@makinata.eu>
To: 66500@debbugs.gnu.org
Cc: Bruno Victal <mirai@makinata.eu>
Subject: [bug#66500] [PATCH core-updates 2/3] gnu: docbook-dsssl: Refactor install-plan.
Date: Thu, 12 Oct 2023 16:30:01 +0100	[thread overview]
Message-ID: <c699471a8b9d9597dc3dbdbd668710c812d2b22e.1697124046.git.mirai@makinata.eu> (raw)
In-Reply-To: <cover.1697124046.git.mirai@makinata.eu>

Replace custom phase with copy-build-system newly added #:output parameter.
Additionally remove extra slashes from license URIs and obsolete inputs.

* gnu/packages/docbook.scm (docbook-dsssl)[source]: Remove empty directories
from source using a snippet.
[arguments]<#:phases>: Relocate 'install-doc logic into …
<#:install-plan>: … here. Remove obsolete exclusion rules.
[native-inputs]: Remove bzip2 and tar since these are already available by
default.
[license]: Remove extraneous slash.
(docbook-dsssl-doc)[license]: Remove extraneous slash.
---
 gnu/packages/docbook.scm | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index f7dff53808..07cb06059a 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -513,31 +513,25 @@ (define-public docbook-dsssl
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1g72y2yyc2k89kzs0lvrb9n7hjayw1hdskfpplpz97pf1c99wcig"))))
+                "1g72y2yyc2k89kzs0lvrb9n7hjayw1hdskfpplpz97pf1c99wcig"))
+              (snippet
+               #~(begin
+                   ;; Remove empty directories.
+                   (rmdir "doc")
+                   (rmdir "docsrc")))))
     (build-system copy-build-system)
     (outputs '("out" "doc"))
     (arguments
      (list
       #:install-plan
-      #~`(("./" "sgml/dtd/docbook/"
-           #:exclude ("doc" "docsrc")))
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; The doc output contains 1.4 MiB of HTML documentation.
-          (add-after 'install 'install-doc
-            (lambda* (#:key inputs #:allow-other-keys)
-              (mkdir-p (string-append #$output:doc "/share/doc"))
-              (symlink (assoc-ref inputs "docbook-dsssl-doc")
-                       (format #f "~a/share/doc/~a-~a"
-                               #$output:doc #$name #$version)))))))
+      #~`(("./" "sgml/dtd/docbook/")
+          (#$(this-package-input "docbook-dsssl-doc") "./" #:output "doc"))))
     (inputs
      (list docbook-dsssl-doc))
-    (native-inputs
-     (list bzip2 tar))
     (home-page "https://docbook.org/")
     (synopsis "DSSSL style sheets for DocBook")
     (description "This package provides DSSSL style sheets for DocBook.")
-    (license (license:non-copyleft "file://README"))))
+    (license (license:non-copyleft "file:/README"))))
 
 ;;; Private variable, used as the 'doc' output of the docbook-dsssl package.
 (define docbook-dsssl-doc
@@ -560,7 +554,7 @@ (define docbook-dsssl-doc
     (home-page "https://docbook.org/")
     (synopsis "DocBook DSSSL style sheets documentation")
     (description "Documentation for the DocBook DSSSL style sheets.")
-    (license (license:non-copyleft "file://doc/LEGALNOTICE.htm"))))
+    (license (license:non-copyleft "file:/doc/LEGALNOTICE.htm"))))
 
 (define-public docbook-sgml-4.2
   (package
-- 
2.41.0





  parent reply	other threads:[~2023-10-12 15:32 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-12 15:27 [bug#66500] [PATCH core-updates 0/3] Custom output labels for copy-build-system Bruno Victal
2023-10-12 15:30 ` [bug#66500] [PATCH core-updates 1/3] build: copy-build-system: Allow specifying different output labels Bruno Victal
2023-10-19  9:46   ` Liliana Marie Prikler
2023-10-19 15:36     ` Bruno Victal
2023-10-12 15:30 ` Bruno Victal [this message]
2023-10-19  9:47   ` [bug#66500] [PATCH core-updates 2/3] gnu: docbook-dsssl: Refactor install-plan Liliana Marie Prikler
2023-10-19 15:25     ` Bruno Victal
2023-10-12 15:30 ` [bug#66500] [PATCH core-updates 3/3] gnu: docbook-dsssl: Fix script installation path Bruno Victal
2023-10-19 15:37 ` [bug#66500] [PATCH core-updates v2 0/3] Custom output labels for copy-build-system Bruno Victal
2023-10-19 15:38   ` [bug#66500] [PATCH core-updates v2 1/3] build: copy-build-system: Allow specifying different output labels Bruno Victal
2023-10-19 15:38   ` [bug#66500] [PATCH core-updates v2 2/3] gnu: docbook-dsssl: Refactor install-plan Bruno Victal
2023-10-19 15:38   ` [bug#66500] [PATCH core-updates v2 3/3] gnu: docbook-dsssl: Fix script installation path Bruno Victal
2023-12-20 21:10   ` bug#66500: [PATCH core-updates v2 0/3] Custom output labels for copy-build-system 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=c699471a8b9d9597dc3dbdbd668710c812d2b22e.1697124046.git.mirai@makinata.eu \
    --to=mirai@makinata.eu \
    --cc=66500@debbugs.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.