GNU bug report logs - #66500
[PATCH core-updates 0/3] Custom output labels for copy-build-system.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches; Reported by: Bruno Victal <mirai@HIDDEN>; Keywords: patch; dated Thu, 12 Oct 2023 15:29:02 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 66500 <at> debbugs.gnu.org:


Received: (at 66500) by debbugs.gnu.org; 19 Oct 2023 15:51:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 19 11:51:57 2023
Received: from localhost ([127.0.0.1]:37642 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qtVJU-0006I1-RO
	for submit <at> debbugs.gnu.org; Thu, 19 Oct 2023 11:51:57 -0400
Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:34940)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mirai@HIDDEN>) id 1qtVJR-0006Hr-SO
 for 66500 <at> debbugs.gnu.org; Thu, 19 Oct 2023 11:51:55 -0400
Received: from mail1.netim.hosting (unknown [185.26.106.173])
 by smtpmciv2.myservices.hosting (Postfix) with ESMTP id CD07D20CC5;
 Thu, 19 Oct 2023 17:51:25 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
 by mail1.netim.hosting (Postfix) with ESMTP id 41495800AA;
 Thu, 19 Oct 2023 17:36:12 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting
Received: from mail1.netim.hosting ([127.0.0.1])
 by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026)
 with ESMTP id mRayD9X-DG5P; Thu, 19 Oct 2023 17:36:12 +0200 (CEST)
Received: from [192.168.1.116] (unknown [10.192.1.83])
 (Authenticated sender: lumen@HIDDEN)
 by mail1.netim.hosting (Postfix) with ESMTPSA id BC2D5800A7;
 Thu, 19 Oct 2023 17:36:11 +0200 (CEST)
Message-ID: <798c0423-d685-47b9-b6a3-b209743ee28e@HIDDEN>
Date: Thu, 19 Oct 2023 16:36:03 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH core-updates 1/3] build: copy-build-system: Allow
 specifying different output labels.
Content-Language: en-US
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>
References: <cover.1697124046.git.mirai@HIDDEN>
 <b486734d4ac6f5247d216da3444d91acb7e2ebd1.1697124046.git.mirai@HIDDEN>
 <c86eeee9162d8a2a693fb552dac6df93f9d228cf.camel@HIDDEN>
From: Bruno Victal <mirai@HIDDEN>
In-Reply-To: <c86eeee9162d8a2a693fb552dac6df93f9d228cf.camel@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 66500
Cc: 66500 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi Liliana,

On 2023-10-19 10:46, Liliana Marie Prikler wrote:
> This is perhaps extremely nitpicky, but there should be a comma before
> "the @code{#:output} argument".

Addressing this with v2.

> s/for output labelled/within the output named/
> or 
> s/for output labelled \"doc\"/within the \"doc\" output/

Likewise, went for the second choice here.

> Otherwise LGTM.  Note, however, that CI doesn't like this series.

Strange, the CI complains of a merge conflict yet I didn't encounter
any issues when rebasing this to the latest core-updates [1].


[1]: guix commit d59653b7c9e43ebdbba20e2ca071429507f94c67

-- 
Furthermore, I consider that nonfree software must be eradicated.

Cheers,
Bruno.
Information forwarded to guix-patches@HIDDEN:
bug#66500; Package guix-patches. Full text available.

Message received at 66500 <at> debbugs.gnu.org:


Received: (at 66500) by debbugs.gnu.org; 19 Oct 2023 15:46:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 19 11:46:56 2023
Received: from localhost ([127.0.0.1]:37554 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qtVEd-000601-Ux
	for submit <at> debbugs.gnu.org; Thu, 19 Oct 2023 11:46:56 -0400
Received: from smtpm2.myservices.hosting ([185.26.105.233]:52578)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mirai@HIDDEN>) id 1qtVEb-0005zg-HL
 for 66500 <at> debbugs.gnu.org; Thu, 19 Oct 2023 11:46:54 -0400
Received: from mail1.netim.hosting (unknown [185.26.106.173])
 by smtpm2.myservices.hosting (Postfix) with ESMTP id CC6A520EA3
 for <66500 <at> debbugs.gnu.org>; Thu, 19 Oct 2023 17:46:25 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
 by mail1.netim.hosting (Postfix) with ESMTP id 996DA80060;
 Thu, 19 Oct 2023 17:38:27 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting
Received: from mail1.netim.hosting ([127.0.0.1])
 by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026)
 with ESMTP id 79CKE0Go3AtX; Thu, 19 Oct 2023 17:38:27 +0200 (CEST)
Received: from guix-nuc.home.arpa (unknown [10.192.1.83])
 (Authenticated sender: lumen@HIDDEN)
 by mail1.netim.hosting (Postfix) with ESMTPSA id 1435E80095;
 Thu, 19 Oct 2023 17:38:27 +0200 (CEST)
From: Bruno Victal <mirai@HIDDEN>
To: 66500 <at> debbugs.gnu.org
Subject: [PATCH core-updates v2 3/3] gnu: docbook-dsssl: Fix script
 installation path.
Date: Thu, 19 Oct 2023 16:38:20 +0100
Message-ID: <c793b8c27356d81d2a1247c0e709b5dd73bfaba8.1697729341.git.mirai@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1697729341.git.mirai@HIDDEN>
References: <cover.1697124046.git.mirai@HIDDEN>
 <cover.1697729341.git.mirai@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 66500
Cc: Bruno Victal <mirai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/docbook.scm (docbook-dsssl)[source]: Fix script permission.
[arguments]<#:install-plan>: Install script and manpage correctly.
[inputs]: Add perl.
---
 gnu/packages/docbook.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 07cb06059a..9445c86157 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -516,6 +516,7 @@ (define-public docbook-dsssl
                 "1g72y2yyc2k89kzs0lvrb9n7hjayw1hdskfpplpz97pf1c99wcig"))
               (snippet
                #~(begin
+                   (chmod "bin/collateindex.pl" #o755)
                    ;; Remove empty directories.
                    (rmdir "doc")
                    (rmdir "docsrc")))))
@@ -524,10 +525,12 @@ (define-public docbook-dsssl
     (arguments
      (list
       #:install-plan
-      #~`(("./" "sgml/dtd/docbook/")
+      #~`(("./" "sgml/dtd/docbook/" #:exclude ("bin"))
+          ("bin/collateindex.pl" "bin/")
+          ("bin/collateindex.pl.1" "share/man/man1/")
           (#$(this-package-input "docbook-dsssl-doc") "./" #:output "doc"))))
     (inputs
-     (list docbook-dsssl-doc))
+     (list perl docbook-dsssl-doc))
     (home-page "https://docbook.org/")
     (synopsis "DSSSL style sheets for DocBook")
     (description "This package provides DSSSL style sheets for DocBook.")
-- 
2.41.0
Information forwarded to guix-patches@HIDDEN:
bug#66500; Package guix-patches. Full text available.

Message received at 66500 <at> debbugs.gnu.org:


Received: (at 66500) by debbugs.gnu.org; 19 Oct 2023 15:39:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 19 11:39:03 2023
Received: from localhost ([127.0.0.1]:37520 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qtV71-0005lq-0s
	for submit <at> debbugs.gnu.org; Thu, 19 Oct 2023 11:39:03 -0400
Received: from smtpm4.myservices.hosting ([185.26.105.235]:50406)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mirai@HIDDEN>) id 1qtV6v-0005l2-Lp
 for 66500 <at> debbugs.gnu.org; Thu, 19 Oct 2023 11:38:58 -0400
Received: from mail1.netim.hosting (unknown [185.26.106.173])
 by smtpm4.myservices.hosting (Postfix) with ESMTP id 4B21F20C0F
 for <66500 <at> debbugs.gnu.org>; Thu, 19 Oct 2023 17:38:30 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
 by mail1.netim.hosting (Postfix) with ESMTP id AB39980092;
 Thu, 19 Oct 2023 17:38:26 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting
Received: from mail1.netim.hosting ([127.0.0.1])
 by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026)
 with ESMTP id yZ_avWB8pKeX; Thu, 19 Oct 2023 17:38:26 +0200 (CEST)
Received: from guix-nuc.home.arpa (unknown [10.192.1.83])
 (Authenticated sender: lumen@HIDDEN)
 by mail1.netim.hosting (Postfix) with ESMTPSA id 156D38005B;
 Thu, 19 Oct 2023 17:38:26 +0200 (CEST)
From: Bruno Victal <mirai@HIDDEN>
To: 66500 <at> debbugs.gnu.org
Subject: [PATCH core-updates v2 1/3] build: copy-build-system: Allow
 specifying different output labels.
Date: Thu, 19 Oct 2023 16:38:18 +0100
Message-ID: <776246775170b3e26211c28d52dffadc4c076ffc.1697729341.git.mirai@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1697729341.git.mirai@HIDDEN>
References: <cover.1697124046.git.mirai@HIDDEN>
 <cover.1697729341.git.mirai@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 66500
Cc: Bruno Victal <mirai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* guix/build/copy-build-system.scm: Introduce '#:output' parameter to specify
which output label to use for a given rule.
* doc/guix.texi (Build Systems): Document it.
---
 doc/guix.texi                    |  6 ++++++
 guix/build/copy-build-system.scm | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 4afe1af6c0..4f6c4ce67a 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9460,6 +9460,9 @@ Build Systems
 If both inclusions and exclusions are specified, the exclusions are done
 on top of the inclusions.
 @end itemize
+@item When a package has multiple outputs, the @code{#:output} argument
+can be used to specify which output label the files should be installed
+to.
 @end itemize
 In all cases, the paths relative to @var{source} are preserved within
 @var{target}.
@@ -9476,6 +9479,9 @@ Build Systems
 @file{share/my-app/sub/file}.
 @item @code{("foo/sub" "share/my-app" #:include ("file"))}: Install @file{foo/sub/file} to
 @file{share/my-app/file}.
+@item @code{("foo/doc" "share/my-app/doc" #:output "doc")}: Install
+@file{"foo/doc"} to @file{"share/my-app/doc"} within the @code{"doc"}
+output.
 @end itemize
 @end defvar
 
diff --git a/guix/build/copy-build-system.scm b/guix/build/copy-build-system.scm
index fb2d1db056..25d3f4c57a 100644
--- a/guix/build/copy-build-system.scm
+++ b/guix/build/copy-build-system.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2019 Julien Lepiller <julien@HIDDEN>
 ;;; Copyright © 2020 Pierre Neidhardt <mail@HIDDEN>
 ;;; Copyright © 2021 Efraim Flashner <efraim@HIDDEN>
+;;; Copyright © 2023 Bruno Victal <mirai@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -40,9 +41,9 @@ (define* (install #:key install-plan outputs #:allow-other-keys)
 
 An install plan is a list of plans in the form:
 
-  (SOURCE TARGET [FILTERS])
+  (SOURCE TARGET [FILTERS] [#:output OUTPUT])
 
-In the above, FILTERS are optional.
+In the above, FILTERS and OUTPUT are optional.
 
 - When SOURCE matches a file or directory without trailing slash, install it to
   TARGET.
@@ -63,6 +64,9 @@ (define* (install #:key install-plan outputs #:allow-other-keys)
       If both `#:include*` and `#:exclude*` are specified, the exclusion is done
       on the inclusion list.
 
+- When a package has multiple outputs, the `#:output` argument can be used
+to specify which output label the files should be installed to.
+
 Examples:
 
 - `(\"foo/bar\" \"share/my-app/\")`: Install bar to \"share/my-app/bar\".
@@ -72,7 +76,9 @@ (define* (install #:key install-plan outputs #:allow-other-keys)
 - `(\"foo/\" \"share/my-app\" #:include (\"sub/file\"))`: Install only \"foo/sub/file\" to
 \"share/my-app/sub/file\".
 - `(\"foo/sub\" \"share/my-app\" #:include (\"file\"))`: Install \"foo/sub/file\" to
-\"share/my-app/file\"."
+\"share/my-app/file\".
+- `(\"foo/doc\" \"share/my-app/doc\" #:output \"doc\")`: Install \"foo/doc\" to
+\"share/my-app/doc\" within the \"doc\" output."
   (define (install-simple source target)
     "Install SOURCE to TARGET.
 TARGET must point to a store location.
@@ -133,8 +139,10 @@ (define* (install #:key install-plan outputs #:allow-other-keys)
                                       (string-append target "/")))
              file-list))))
 
-  (define* (install source target #:key include exclude include-regexp exclude-regexp)
-    (let ((final-target (string-append (assoc-ref outputs "out") "/" target))
+  (define* (install source target
+                    #:key include exclude include-regexp exclude-regexp
+                    (output "out"))
+    (let ((final-target (string-append (assoc-ref outputs output) "/" target))
           (filters? (or include exclude include-regexp exclude-regexp)))
       (when (and (not (file-is-directory? source))
                  filters?)
-- 
2.41.0
Information forwarded to guix-patches@HIDDEN:
bug#66500; Package guix-patches. Full text available.

Message received at 66500 <at> debbugs.gnu.org:


Received: (at 66500) by debbugs.gnu.org; 19 Oct 2023 15:38:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 19 11:38:59 2023
Received: from localhost ([127.0.0.1]:37516 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qtV6w-0005l5-IM
	for submit <at> debbugs.gnu.org; Thu, 19 Oct 2023 11:38:58 -0400
Received: from smtpm2.myservices.hosting ([185.26.105.233]:51054)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mirai@HIDDEN>) id 1qtV6t-0005kr-FK
 for 66500 <at> debbugs.gnu.org; Thu, 19 Oct 2023 11:38:56 -0400
Received: from mail1.netim.hosting (unknown [185.26.106.173])
 by smtpm2.myservices.hosting (Postfix) with ESMTP id A9D2620DE5
 for <66500 <at> debbugs.gnu.org>; Thu, 19 Oct 2023 17:38:27 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
 by mail1.netim.hosting (Postfix) with ESMTP id 28B4A80097;
 Thu, 19 Oct 2023 17:38:27 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting
Received: from mail1.netim.hosting ([127.0.0.1])
 by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026)
 with ESMTP id P-XG95C0dMs6; Thu, 19 Oct 2023 17:38:26 +0200 (CEST)
Received: from guix-nuc.home.arpa (unknown [10.192.1.83])
 (Authenticated sender: lumen@HIDDEN)
 by mail1.netim.hosting (Postfix) with ESMTPSA id 900F180060;
 Thu, 19 Oct 2023 17:38:26 +0200 (CEST)
From: Bruno Victal <mirai@HIDDEN>
To: 66500 <at> debbugs.gnu.org
Subject: [PATCH core-updates v2 2/3] gnu: docbook-dsssl: Refactor install-plan.
Date: Thu, 19 Oct 2023 16:38:19 +0100
Message-ID: <6f1ceb31701a17a39d64f9e37d37db5a1d2a9949.1697729341.git.mirai@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1697729341.git.mirai@HIDDEN>
References: <cover.1697124046.git.mirai@HIDDEN>
 <cover.1697729341.git.mirai@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 66500
Cc: Bruno Victal <mirai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

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
Information forwarded to guix-patches@HIDDEN:
bug#66500; Package guix-patches. Full text available.

Message received at 66500 <at> debbugs.gnu.org:


Received: (at 66500) by debbugs.gnu.org; 19 Oct 2023 15:38:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 19 11:38:25 2023
Received: from localhost ([127.0.0.1]:37512 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qtV6P-0005kC-8W
	for submit <at> debbugs.gnu.org; Thu, 19 Oct 2023 11:38:25 -0400
Received: from smtpm4.myservices.hosting ([185.26.105.235]:50302)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mirai@HIDDEN>) id 1qtV6N-0005k4-6j
 for 66500 <at> debbugs.gnu.org; Thu, 19 Oct 2023 11:38:23 -0400
Received: from mail1.netim.hosting (unknown [185.26.106.173])
 by smtpm4.myservices.hosting (Postfix) with ESMTP id 0FB0720C0F;
 Thu, 19 Oct 2023 17:37:54 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
 by mail1.netim.hosting (Postfix) with ESMTP id 75A9B80060;
 Thu, 19 Oct 2023 17:37:54 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting
Received: from mail1.netim.hosting ([127.0.0.1])
 by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026)
 with ESMTP id IDJNf87jJ74l; Thu, 19 Oct 2023 17:37:54 +0200 (CEST)
Received: from guix-nuc.home.arpa (unknown [10.192.1.83])
 (Authenticated sender: lumen@HIDDEN)
 by mail1.netim.hosting (Postfix) with ESMTPSA id D111B8005B;
 Thu, 19 Oct 2023 17:37:53 +0200 (CEST)
From: Bruno Victal <mirai@HIDDEN>
To: 66500 <at> debbugs.gnu.org
Subject: [PATCH core-updates v2 0/3] Custom output labels for
 copy-build-system.
Date: Thu, 19 Oct 2023 16:37:26 +0100
Message-ID: <cover.1697729341.git.mirai@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1697124046.git.mirai@HIDDEN>
References: <cover.1697124046.git.mirai@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 66500
Cc: Bruno Victal <mirai@HIDDEN>,
 Liliana Marie Prikler <liliana.prikler@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Notable changes since v1:
* Address documentation feedback.
* Rebased to solve potential merge conflicts.

Bruno Victal (3):
  build: copy-build-system: Allow specifying different output labels.
  gnu: docbook-dsssl: Refactor install-plan.
  gnu: docbook-dsssl: Fix script installation path.

 doc/guix.texi                    |  6 ++++++
 gnu/packages/docbook.scm         | 31 ++++++++++++++-----------------
 guix/build/copy-build-system.scm | 18 +++++++++++++-----
 3 files changed, 33 insertions(+), 22 deletions(-)


base-commit: d59653b7c9e43ebdbba20e2ca071429507f94c67
-- 
2.41.0
Information forwarded to guix-patches@HIDDEN:
bug#66500; Package guix-patches. Full text available.

Message received at 66500 <at> debbugs.gnu.org:


Received: (at 66500) by debbugs.gnu.org; 19 Oct 2023 15:26:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 19 11:26:30 2023
Received: from localhost ([127.0.0.1]:37499 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qtUur-0005GR-P5
	for submit <at> debbugs.gnu.org; Thu, 19 Oct 2023 11:26:30 -0400
Received: from smtpm4.myservices.hosting ([185.26.105.235]:48048)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mirai@HIDDEN>) id 1qtUun-0005GE-Jn
 for 66500 <at> debbugs.gnu.org; Thu, 19 Oct 2023 11:26:28 -0400
Received: from mail1.netim.hosting (unknown [185.26.106.173])
 by smtpm4.myservices.hosting (Postfix) with ESMTP id 7919620CB0;
 Thu, 19 Oct 2023 17:25:57 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
 by mail1.netim.hosting (Postfix) with ESMTP id EA92780092;
 Thu, 19 Oct 2023 17:25:56 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting
Received: from mail1.netim.hosting ([127.0.0.1])
 by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026)
 with ESMTP id taL4h0XLA5TM; Thu, 19 Oct 2023 17:25:56 +0200 (CEST)
Received: from [192.168.1.116] (unknown [10.192.1.83])
 (Authenticated sender: lumen@HIDDEN)
 by mail1.netim.hosting (Postfix) with ESMTPSA id 6CCA280060;
 Thu, 19 Oct 2023 17:25:56 +0200 (CEST)
Message-ID: <4790276a-ad1c-4425-b271-4ea320c17fe3@HIDDEN>
Date: Thu, 19 Oct 2023 16:25:48 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH core-updates 2/3] gnu: docbook-dsssl: Refactor
 install-plan.
Content-Language: en-US
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>
References: <cover.1697124046.git.mirai@HIDDEN>
 <c699471a8b9d9597dc3dbdbd668710c812d2b22e.1697124046.git.mirai@HIDDEN>
 <e124ed381e2887fe90e73d24c23354f20c52e5f4.camel@HIDDEN>
From: Bruno Victal <mirai@HIDDEN>
In-Reply-To: <e124ed381e2887fe90e73d24c23354f20c52e5f4.camel@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 66500
Cc: 66500 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

On 2023-10-19 10:47, Liliana Marie Prikler wrote:
> Are these extraneous slash removals really improving anything?  I
> personally type file URIs with three slashes, but that's outside the
> Guix context.

It's mostly semantical improvements as I've explained in the
(unrelated) 1d07acb5f440cb3205b2336a213163ca4584d4f6 commit message [1].

Save for applications with broken or outdated URI handling (which would
be a bug), the single slash URIs work just the same as before.


[1]: <https://git.savannah.gnu.org/cgit/guix.git/commit/?h=core-updates&id=1d07acb5f440cb3205b2336a213163ca4584d4f6>

-- 
Furthermore, I consider that nonfree software must be eradicated.

Cheers,
Bruno.
Information forwarded to guix-patches@HIDDEN:
bug#66500; Package guix-patches. Full text available.

Message received at 66500 <at> debbugs.gnu.org:


Received: (at 66500) by debbugs.gnu.org; 19 Oct 2023 09:48:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 19 05:48:21 2023
Received: from localhost ([127.0.0.1]:35850 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qtPdd-0003O2-75
	for submit <at> debbugs.gnu.org; Thu, 19 Oct 2023 05:48:21 -0400
Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:60466)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <liliana.prikler@HIDDEN>) id 1qtPda-0003N9-IT
 for 66500 <at> debbugs.gnu.org; Thu, 19 Oct 2023 05:48:19 -0400
Received: by mail-ej1-x644.google.com with SMTP id
 a640c23a62f3a-9ad8a822508so1267826466b.0
 for <66500 <at> debbugs.gnu.org>; Thu, 19 Oct 2023 02:47:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1697708866; x=1698313666; darn=debbugs.gnu.org;
 h=mime-version:user-agent:content-transfer-encoding:references
 :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date
 :message-id:reply-to;
 bh=DC5FnXP7dJexHVXPd1C5u172j9AqRN7+vs1o+10ZKrY=;
 b=F/HfBUN6nr5/Ccr/uKPiFtjq8+3p/zUpGqzlF53U2iCVEjILEoCMA42tblBB44YxhZ
 swH9PRC715i+9Z4Y8iW00qBCVd8LE/y6gkA1wy2xgnDBlsRjb0ntIMDL7V+CnivU+AIB
 D1GNRxtJqfh7xqZ9Dzl2K+zotEEamyKYhgNkNPaYg+p7lohaqj7MnZ1dxpARPaAAKcaF
 Rooc08uyDyULVLKx7Mye2EmMPi7OxL4COtwpL4Kkk4B1ZwBb0I1D0MDT76NUnefkoiGf
 2jOtpCFcNG3SNPW8rBXHopARQZdopXfCs3lfhBR6o5iRjdgD6CLG+tiISHuw7kAikmA9
 frXw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1697708866; x=1698313666;
 h=mime-version:user-agent:content-transfer-encoding:references
 :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from
 :to:cc:subject:date:message-id:reply-to;
 bh=DC5FnXP7dJexHVXPd1C5u172j9AqRN7+vs1o+10ZKrY=;
 b=RtQka7JGaziQ3dGkWYZmP7XwnlVVQw5LSYxO3dY/N1ApuJheW0qbkuOx3Y48ldZiEz
 7tFobUMdPYkUEcMF+SLntsE67OhpHhtT2VcLy0HF5FiAgr1PyEM6tvoxjQN+TP7zXGZY
 uX8wggyh9JSVrHC2WtIpA8/F6SK/Fz3HVm3lmnlGKKjT7wIjpLmrdzpincqyD3SAV80t
 fO6N5IMfo0uXo+MmC2cJ7OoQTySkTc2AKUJi6z2+ALHtE/bYm9bKluqkzBoaV4NmHlvI
 naksF1fyTTS1KB09gyVIoJxjJgSRE8fZW5I0tQc3Gp5mYEqJPXPU7QiE182ZQN06qaW3
 0gcg==
X-Gm-Message-State: AOJu0Yz99qf2n0d10TP+N6x8uoMeG3YPLPOx0o+eSy4ulB4lSs9NZznm
 TstitaD6jlblscwAwR0rXXlLUzTyZV1+yg==
X-Google-Smtp-Source: AGHT+IG1pywwtRHw1uA2yyFfBtabuyglEfF2PR1ihOnI31j58YRh7KTz8uzSehXfVvDEwXIDWIUKnQ==
X-Received: by 2002:a17:907:928c:b0:9a2:28dc:4166 with SMTP id
 bw12-20020a170907928c00b009a228dc4166mr1215104ejc.75.1697708865756; 
 Thu, 19 Oct 2023 02:47:45 -0700 (PDT)
Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
 [85.127.52.93]) by smtp.gmail.com with ESMTPSA id
 w24-20020a17090633d800b009c74c56d71dsm2840699eja.13.2023.10.19.02.47.44
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 19 Oct 2023 02:47:44 -0700 (PDT)
Message-ID: <e124ed381e2887fe90e73d24c23354f20c52e5f4.camel@HIDDEN>
Subject: Re: [PATCH core-updates 2/3] gnu: docbook-dsssl: Refactor
 install-plan.
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
To: Bruno Victal <mirai@HIDDEN>, 66500 <at> debbugs.gnu.org
Date: Thu, 19 Oct 2023 11:47:43 +0200
In-Reply-To: <c699471a8b9d9597dc3dbdbd668710c812d2b22e.1697124046.git.mirai@HIDDEN>
References: <cover.1697124046.git.mirai@HIDDEN>
 <c699471a8b9d9597dc3dbdbd668710c812d2b22e.1697124046.git.mirai@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.46.4 
MIME-Version: 1.0
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 66500
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Am Donnerstag, dem 12.10.2023 um 16:30 +0100 schrieb Bruno Victal:
> Replace custom phase with copy-build-system newly added #:output
> parameter.
> Additionally remove extra slashes from license URIs and obsolete
> inputs.
>=20
> * gnu/packages/docbook.scm (docbook-dsssl)[source]: Remove empty
> directories from source using a snippet.
> [arguments]<#:phases>: Relocate 'install-doc logic into =E2=80=A6
> <#:install-plan>: =E2=80=A6 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.
> ---
Are these extraneous slash removals really improving anything?  I
personally type file URIs with three slashes, but that's outside the
Guix context.

Cheers
Information forwarded to guix-patches@HIDDEN:
bug#66500; Package guix-patches. Full text available.

Message received at 66500 <at> debbugs.gnu.org:


Received: (at 66500) by debbugs.gnu.org; 19 Oct 2023 09:46:49 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 19 05:46:49 2023
Received: from localhost ([127.0.0.1]:35835 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qtPc8-0003J3-Qj
	for submit <at> debbugs.gnu.org; Thu, 19 Oct 2023 05:46:49 -0400
Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:56501)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <liliana.prikler@HIDDEN>) id 1qtPc4-0003Ik-1e
 for 66500 <at> debbugs.gnu.org; Thu, 19 Oct 2023 05:46:47 -0400
Received: by mail-ed1-x542.google.com with SMTP id
 4fb4d7f45d1cf-52bd9ddb741so13419514a12.0
 for <66500 <at> debbugs.gnu.org>; Thu, 19 Oct 2023 02:46:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1697708771; x=1698313571; darn=debbugs.gnu.org;
 h=mime-version:user-agent:content-transfer-encoding:references
 :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date
 :message-id:reply-to;
 bh=4PdguxofxtB/Pij8Db7wYZs0lIOuX2Z/sJMlS8p8OBs=;
 b=VOIUFyjEuBYzfFyN4timhx7RPFNrlDBqwyVbJxPhmvOP/D6kubDlpueZA7GDp4TR1g
 fk91zDxnreBn8+FMwCbGdF0ftwRTas+T7aEVka1GxmYj3MGoCF6CQoyXLMzNVsNgmx9l
 TNraRgayWcY8PhhDpI7TaDfQGe6HDINzDxDT7KrjlNiRSe74DTXDXIEH0aTbmME/MVle
 zimDDXoEww9H4IlIX3OQ6w6WdLcW25gJ4AFMvSWFCHwTl6kyDgPsG2Mv+hA5dAqoc7A6
 yijQoDUbLg+ojZsoOLg91WoHE+LtK6bJWyVVB981/ME/DgoXvHHNJfbUkXhxlvWJ0uM/
 vJMA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1697708771; x=1698313571;
 h=mime-version:user-agent:content-transfer-encoding:references
 :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from
 :to:cc:subject:date:message-id:reply-to;
 bh=4PdguxofxtB/Pij8Db7wYZs0lIOuX2Z/sJMlS8p8OBs=;
 b=CQfUCsWXvBC4hzEGNIK9RB/k7yQGKvraXQGepLy+wA9+fiy2iJXUoYKhqneEa6vpN/
 EdRTqef9ti4WKwlO9OXHRE8qYNClAVtbybNc2vw04CxPMVDpPX8OjRgAOT5glRt0F/w+
 oCUak+xsnzoydUwMhVUPPV/OAnTJ5UGEbun/n0mUwjXEbtr07DqwjNY4iRCQF5rYe4cz
 FpP0W7un1qVozkpTavQiCX6AhbC7yUKOG21keb3x92Xv0uxv0w3LXvQE4FOloxg2FKsY
 mlP7NsRKQX7aI165cTuwna6fiX6mxEFB0A+iJ/0JpAxI0kWBPFCz58kC+5yPhxL52m16
 XkMw==
X-Gm-Message-State: AOJu0Yy46+I0cqWFrrphD55vFBqthL848LFNawVP3ZxqIRiesh/8uXnw
 scAPirZLQFj6mMnqeZqu8nk=
X-Google-Smtp-Source: AGHT+IFcuqQSk57BOKoRz/m86E3HlaZmdWHkNaDSR7e5hlPZWLUzEDVwuud2pYSl7K5UJFT/g+Exvg==
X-Received: by 2002:a05:6402:2753:b0:53e:f4:ef85 with SMTP id
 z19-20020a056402275300b0053e00f4ef85mr1242268edd.10.1697708770551; 
 Thu, 19 Oct 2023 02:46:10 -0700 (PDT)
Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
 [85.127.52.93]) by smtp.gmail.com with ESMTPSA id
 m26-20020a50999a000000b00537666d307csm4236721edb.32.2023.10.19.02.46.08
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 19 Oct 2023 02:46:09 -0700 (PDT)
Message-ID: <c86eeee9162d8a2a693fb552dac6df93f9d228cf.camel@HIDDEN>
Subject: Re: [PATCH core-updates 1/3] build: copy-build-system: Allow
 specifying different output labels.
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
To: Bruno Victal <mirai@HIDDEN>, 66500 <at> debbugs.gnu.org
Date: Thu, 19 Oct 2023 11:46:07 +0200
In-Reply-To: <b486734d4ac6f5247d216da3444d91acb7e2ebd1.1697124046.git.mirai@HIDDEN>
References: <cover.1697124046.git.mirai@HIDDEN>
 <b486734d4ac6f5247d216da3444d91acb7e2ebd1.1697124046.git.mirai@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.46.4 
MIME-Version: 1.0
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 66500
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi Bruno,

Am Donnerstag, dem 12.10.2023 um 16:30 +0100 schrieb Bruno Victal:
> [...]
> +@item When a package has multiple outputs the @code{#:output}
> argument
> +can be used to specify which output label the files should be
> installed
> +to.
This is perhaps extremely nitpicky, but there should be a comma before
"the @code{#:output} argument".

> @@ -63,6 +64,9 @@ (define* (install #:key install-plan outputs
> #:allow-other-keys)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 If both `#:include*` and `#:exclude*=
` are specified, the
> exclusion is done
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 on the inclusion list.
> =C2=A0
> +- When a package has multiple outputs the `#:output` argument can be
> used
> +to specify which output label the files should be installed to.
> +
Same here.
> =C2=A0Examples:
> =C2=A0
> =C2=A0- `(\"foo/bar\" \"share/my-app/\")`: Install bar to \"share/my-
> app/bar\".
> @@ -72,7 +76,9 @@ (define* (install #:key install-plan outputs
> #:allow-other-keys)
> =C2=A0- `(\"foo/\" \"share/my-app\" #:include (\"sub/file\"))`: Install
> only \"foo/sub/file\" to
> =C2=A0\"share/my-app/sub/file\".
> =C2=A0- `(\"foo/sub\" \"share/my-app\" #:include (\"file\"))`: Install
> \"foo/sub/file\" to
> -\"share/my-app/file\"."
> +\"share/my-app/file\".
> +- `(\"foo/doc\" \"share/my-app/doc\" #:output \"doc\")`: Install
> \"foo/doc\" to
> +\"share/my-app/doc\" for output labelled \"doc\"."
s/for output labelled/within the output named/
or=20
s/for output labelled \"doc\"/within the \"doc\" output/

> =C2=A0=C2=A0 (define (install-simple source target)
> =C2=A0=C2=A0=C2=A0=C2=A0 "Install SOURCE to TARGET.
> =C2=A0TARGET must point to a store location.
> @@ -133,8 +139,10 @@ (define* (install #:key install-plan outputs
> #:allow-other-keys)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 (string-append target "/")))
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 file-list))))
> =C2=A0
> -=C2=A0 (define* (install source target #:key include exclude include-
> regexp exclude-regexp)
> -=C2=A0=C2=A0=C2=A0 (let ((final-target (string-append (assoc-ref outputs=
 "out") "/"
> target))
> +=C2=A0 (define* (install source target
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #:key include exclude include-re=
gexp exclude-
> regexp
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (output "out"))
> +=C2=A0=C2=A0=C2=A0 (let ((final-target (string-append (assoc-ref outputs=
 output)
> "/" target))
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (filters? (o=
r include exclude include-regexp exclude-
> regexp)))
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (when (and (not (file-is-directory? =
source))
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 filters?)
Otherwise LGTM.  Note, however, that CI doesn't like this series.

Cheers
Information forwarded to guix-patches@HIDDEN:
bug#66500; Package guix-patches. Full text available.

Message received at 66500 <at> debbugs.gnu.org:


Received: (at 66500) by debbugs.gnu.org; 12 Oct 2023 15:31:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 12 11:31:12 2023
Received: from localhost ([127.0.0.1]:44137 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qqxea-0006qy-Gb
	for submit <at> debbugs.gnu.org; Thu, 12 Oct 2023 11:31:12 -0400
Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:50078)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mirai@HIDDEN>) id 1qqxeY-0006qq-9V
 for 66500 <at> debbugs.gnu.org; Thu, 12 Oct 2023 11:31:11 -0400
Received: from mail1.netim.hosting (unknown [185.26.106.173])
 by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 5ED8620D99
 for <66500 <at> debbugs.gnu.org>; Thu, 12 Oct 2023 17:30:27 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
 by mail1.netim.hosting (Postfix) with ESMTP id C6CF8800A0;
 Thu, 12 Oct 2023 17:30:23 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting
Received: from mail1.netim.hosting ([127.0.0.1])
 by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026)
 with ESMTP id mpZ3JaJncPE5; Thu, 12 Oct 2023 17:30:23 +0200 (CEST)
Received: from guix-nuc.home.arpa (unknown [10.192.1.83])
 (Authenticated sender: lumen@HIDDEN)
 by mail1.netim.hosting (Postfix) with ESMTPSA id 8F5758009C;
 Thu, 12 Oct 2023 17:30:18 +0200 (CEST)
From: Bruno Victal <mirai@HIDDEN>
To: 66500 <at> debbugs.gnu.org
Subject: [PATCH core-updates 2/3] gnu: docbook-dsssl: Refactor install-plan.
Date: Thu, 12 Oct 2023 16:30:01 +0100
Message-ID: <c699471a8b9d9597dc3dbdbd668710c812d2b22e.1697124046.git.mirai@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1697124046.git.mirai@HIDDEN>
References: <cover.1697124046.git.mirai@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 66500
Cc: Bruno Victal <mirai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

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
Information forwarded to guix-patches@HIDDEN:
bug#66500; Package guix-patches. Full text available.

Message received at 66500 <at> debbugs.gnu.org:


Received: (at 66500) by debbugs.gnu.org; 12 Oct 2023 15:31:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 12 11:31:08 2023
Received: from localhost ([127.0.0.1]:44134 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qqxeW-0006qh-1i
	for submit <at> debbugs.gnu.org; Thu, 12 Oct 2023 11:31:08 -0400
Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:50060)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mirai@HIDDEN>) id 1qqxeT-0006qW-5V
 for 66500 <at> debbugs.gnu.org; Thu, 12 Oct 2023 11:31:06 -0400
Received: from mail1.netim.hosting (unknown [185.26.106.173])
 by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 4709320D94
 for <66500 <at> debbugs.gnu.org>; Thu, 12 Oct 2023 17:30:26 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
 by mail1.netim.hosting (Postfix) with ESMTP id 37D5980098;
 Thu, 12 Oct 2023 17:30:15 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting
Received: from mail1.netim.hosting ([127.0.0.1])
 by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026)
 with ESMTP id Zpz2PRl1g6Q6; Thu, 12 Oct 2023 17:30:14 +0200 (CEST)
Received: from guix-nuc.home.arpa (unknown [10.192.1.83])
 (Authenticated sender: lumen@HIDDEN)
 by mail1.netim.hosting (Postfix) with ESMTPSA id 943D980060;
 Thu, 12 Oct 2023 17:30:14 +0200 (CEST)
From: Bruno Victal <mirai@HIDDEN>
To: 66500 <at> debbugs.gnu.org
Subject: [PATCH core-updates 1/3] build: copy-build-system: Allow specifying
 different output labels.
Date: Thu, 12 Oct 2023 16:30:00 +0100
Message-ID: <b486734d4ac6f5247d216da3444d91acb7e2ebd1.1697124046.git.mirai@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1697124046.git.mirai@HIDDEN>
References: <cover.1697124046.git.mirai@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 66500
Cc: Bruno Victal <mirai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* guix/build/copy-build-system.scm: Introduce '#:output' parameter to specify
which output label to use for a given rule.
* doc/guix.texi (Build Systems): Document it.
---
 doc/guix.texi                    |  6 ++++++
 guix/build/copy-build-system.scm | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 4afe1af6c0..8e627912a0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9460,6 +9460,9 @@ Build Systems
 If both inclusions and exclusions are specified, the exclusions are done
 on top of the inclusions.
 @end itemize
+@item When a package has multiple outputs the @code{#:output} argument
+can be used to specify which output label the files should be installed
+to.
 @end itemize
 In all cases, the paths relative to @var{source} are preserved within
 @var{target}.
@@ -9476,6 +9479,9 @@ Build Systems
 @file{share/my-app/sub/file}.
 @item @code{("foo/sub" "share/my-app" #:include ("file"))}: Install @file{foo/sub/file} to
 @file{share/my-app/file}.
+@item @code{("foo/doc" "share/my-app/doc" #:output "doc")}: Install
+@file{"foo/doc"} to @file{"share/my-app/doc"} for output labelled
+@code{"doc"}.
 @end itemize
 @end defvar
 
diff --git a/guix/build/copy-build-system.scm b/guix/build/copy-build-system.scm
index fb2d1db056..152cf88224 100644
--- a/guix/build/copy-build-system.scm
+++ b/guix/build/copy-build-system.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2019 Julien Lepiller <julien@HIDDEN>
 ;;; Copyright © 2020 Pierre Neidhardt <mail@HIDDEN>
 ;;; Copyright © 2021 Efraim Flashner <efraim@HIDDEN>
+;;; Copyright © 2023 Bruno Victal <mirai@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -40,9 +41,9 @@ (define* (install #:key install-plan outputs #:allow-other-keys)
 
 An install plan is a list of plans in the form:
 
-  (SOURCE TARGET [FILTERS])
+  (SOURCE TARGET [FILTERS] [#:output OUTPUT])
 
-In the above, FILTERS are optional.
+In the above, FILTERS and OUTPUT are optional.
 
 - When SOURCE matches a file or directory without trailing slash, install it to
   TARGET.
@@ -63,6 +64,9 @@ (define* (install #:key install-plan outputs #:allow-other-keys)
       If both `#:include*` and `#:exclude*` are specified, the exclusion is done
       on the inclusion list.
 
+- When a package has multiple outputs the `#:output` argument can be used
+to specify which output label the files should be installed to.
+
 Examples:
 
 - `(\"foo/bar\" \"share/my-app/\")`: Install bar to \"share/my-app/bar\".
@@ -72,7 +76,9 @@ (define* (install #:key install-plan outputs #:allow-other-keys)
 - `(\"foo/\" \"share/my-app\" #:include (\"sub/file\"))`: Install only \"foo/sub/file\" to
 \"share/my-app/sub/file\".
 - `(\"foo/sub\" \"share/my-app\" #:include (\"file\"))`: Install \"foo/sub/file\" to
-\"share/my-app/file\"."
+\"share/my-app/file\".
+- `(\"foo/doc\" \"share/my-app/doc\" #:output \"doc\")`: Install \"foo/doc\" to
+\"share/my-app/doc\" for output labelled \"doc\"."
   (define (install-simple source target)
     "Install SOURCE to TARGET.
 TARGET must point to a store location.
@@ -133,8 +139,10 @@ (define* (install #:key install-plan outputs #:allow-other-keys)
                                       (string-append target "/")))
              file-list))))
 
-  (define* (install source target #:key include exclude include-regexp exclude-regexp)
-    (let ((final-target (string-append (assoc-ref outputs "out") "/" target))
+  (define* (install source target
+                    #:key include exclude include-regexp exclude-regexp
+                    (output "out"))
+    (let ((final-target (string-append (assoc-ref outputs output) "/" target))
           (filters? (or include exclude include-regexp exclude-regexp)))
       (when (and (not (file-is-directory? source))
                  filters?)
-- 
2.41.0
Information forwarded to guix-patches@HIDDEN:
bug#66500; Package guix-patches. Full text available.

Message received at 66500 <at> debbugs.gnu.org:


Received: (at 66500) by debbugs.gnu.org; 12 Oct 2023 15:30:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 12 11:30:57 2023
Received: from localhost ([127.0.0.1]:44130 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qqxeH-0006pp-8H
	for submit <at> debbugs.gnu.org; Thu, 12 Oct 2023 11:30:56 -0400
Received: from smtpm3.myservices.hosting ([185.26.105.234]:52088)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mirai@HIDDEN>) id 1qqxeC-0006pd-EF
 for 66500 <at> debbugs.gnu.org; Thu, 12 Oct 2023 11:30:52 -0400
Received: from mail1.netim.hosting (unknown [185.26.106.173])
 by smtpm3.myservices.hosting (Postfix) with ESMTP id CAD5620F42
 for <66500 <at> debbugs.gnu.org>; Thu, 12 Oct 2023 17:30:24 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
 by mail1.netim.hosting (Postfix) with ESMTP id 345B980060;
 Thu, 12 Oct 2023 17:30:24 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting
Received: from mail1.netim.hosting ([127.0.0.1])
 by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026)
 with ESMTP id eZFQa-nFqfua; Thu, 12 Oct 2023 17:30:23 +0200 (CEST)
Received: from guix-nuc.home.arpa (unknown [10.192.1.83])
 (Authenticated sender: lumen@HIDDEN)
 by mail1.netim.hosting (Postfix) with ESMTPSA id 1297B8009A;
 Thu, 12 Oct 2023 17:30:19 +0200 (CEST)
From: Bruno Victal <mirai@HIDDEN>
To: 66500 <at> debbugs.gnu.org
Subject: [PATCH core-updates 3/3] gnu: docbook-dsssl: Fix script installation
 path.
Date: Thu, 12 Oct 2023 16:30:02 +0100
Message-ID: <ba1b0da09da18a704b527c6211ce6d7637fc4538.1697124046.git.mirai@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1697124046.git.mirai@HIDDEN>
References: <cover.1697124046.git.mirai@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.5 (/)
X-Debbugs-Envelope-To: 66500
Cc: Bruno Victal <mirai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.5 (-)

* gnu/packages/docbook.scm (docbook-dsssl)[source]: Fix script permission.
[arguments]<#:install-plan>: Install script and manpage correctly.
[inputs]: Add perl.
---
 gnu/packages/docbook.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 07cb06059a..9445c86157 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -516,6 +516,7 @@ (define-public docbook-dsssl
                 "1g72y2yyc2k89kzs0lvrb9n7hjayw1hdskfpplpz97pf1c99wcig"))
               (snippet
                #~(begin
+                   (chmod "bin/collateindex.pl" #o755)
                    ;; Remove empty directories.
                    (rmdir "doc")
                    (rmdir "docsrc")))))
@@ -524,10 +525,12 @@ (define-public docbook-dsssl
     (arguments
      (list
       #:install-plan
-      #~`(("./" "sgml/dtd/docbook/")
+      #~`(("./" "sgml/dtd/docbook/" #:exclude ("bin"))
+          ("bin/collateindex.pl" "bin/")
+          ("bin/collateindex.pl.1" "share/man/man1/")
           (#$(this-package-input "docbook-dsssl-doc") "./" #:output "doc"))))
     (inputs
-     (list docbook-dsssl-doc))
+     (list perl docbook-dsssl-doc))
     (home-page "https://docbook.org/")
     (synopsis "DSSSL style sheets for DocBook")
     (description "This package provides DSSSL style sheets for DocBook.")
-- 
2.41.0
Information forwarded to guix-patches@HIDDEN:
bug#66500; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 12 Oct 2023 15:28:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 12 11:28:12 2023
Received: from localhost ([127.0.0.1]:44125 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qqxbf-0006jx-Ol
	for submit <at> debbugs.gnu.org; Thu, 12 Oct 2023 11:28:11 -0400
Received: from lists.gnu.org ([2001:470:142::17]:39636)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mirai@HIDDEN>) id 1qqxbe-0006jh-9w
 for submit <at> debbugs.gnu.org; Thu, 12 Oct 2023 11:28:10 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <mirai@HIDDEN>) id 1qqxbB-0003wv-PO
 for guix-patches@HIDDEN; Thu, 12 Oct 2023 11:27:41 -0400
Received: from smtpm5.myservices.hosting ([185.26.105.236])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <mirai@HIDDEN>) id 1qqxbA-0006Pq-5d
 for guix-patches@HIDDEN; Thu, 12 Oct 2023 11:27:41 -0400
Received: from mail1.netim.hosting (unknown [185.26.106.173])
 by smtpm5.myservices.hosting (Postfix) with ESMTP id 67D8120CB0
 for <guix-patches@HIDDEN>; Thu, 12 Oct 2023 17:27:37 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
 by mail1.netim.hosting (Postfix) with ESMTP id D63DD80092;
 Thu, 12 Oct 2023 17:27:33 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting
Received: from mail1.netim.hosting ([127.0.0.1])
 by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026)
 with ESMTP id mP5EiDAR0Zwz; Thu, 12 Oct 2023 17:27:33 +0200 (CEST)
Received: from guix-nuc.home.arpa (unknown [10.192.1.83])
 (Authenticated sender: lumen@HIDDEN)
 by mail1.netim.hosting (Postfix) with ESMTPSA id 6BD8A80060;
 Thu, 12 Oct 2023 17:27:31 +0200 (CEST)
From: Bruno Victal <mirai@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH core-updates 0/3] Custom output labels for copy-build-system.
Date: Thu, 12 Oct 2023 16:27:11 +0100
Message-ID: <cover.1697124046.git.mirai@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=185.26.105.236; envelope-from=mirai@HIDDEN;
 helo=smtpm5.myservices.hosting
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
Cc: Bruno Victal <mirai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)

This patch-series implements a `#:output' parameter for the rules within
a install-plan used by the copy-build-system which can be used to
selectively install some files into different outputs.

For demonstration purposes the docbook-dsssl package was refactored to
make use of this new feature, with a bonus patch that fixes an
inconsistency in the same package that was caught while testing.


Bruno Victal (3):
  build: copy-build-system: Allow specifying different output labels.
  gnu: docbook-dsssl: Refactor install-plan.
  gnu: docbook-dsssl: Fix script installation path.

 doc/guix.texi                    |  6 ++++++
 gnu/packages/docbook.scm         | 31 ++++++++++++++-----------------
 guix/build/copy-build-system.scm | 18 +++++++++++++-----
 3 files changed, 33 insertions(+), 22 deletions(-)


base-commit: 651265562bf6fea52c49596f9fb8ec380e5f0022
-- 
2.41.0
Acknowledgement sent to Bruno Victal <mirai@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#66500; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Thu, 19 Oct 2023 16:00:02 UTC

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