From patchwork Thu Oct 12 15:30:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54790 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D70C227BBEA; Thu, 12 Oct 2023 16:32:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1FBF227BBE2 for ; Thu, 12 Oct 2023 16:32:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqxf7-00059E-VF; Thu, 12 Oct 2023 11:31:45 -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 ) id 1qqxf3-00058h-7W for guix-patches@gnu.org; Thu, 12 Oct 2023 11:31:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqxf2-00078a-4P for guix-patches@gnu.org; Thu, 12 Oct 2023 11:31:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qqxfO-0006sP-II for guix-patches@gnu.org; Thu, 12 Oct 2023 11:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66500] [PATCH core-updates 2/3] gnu: docbook-dsssl: Refactor install-plan. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Oct 2023 15:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66500 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66500@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 66500-submit@debbugs.gnu.org id=B66500.169712467226352 (code B ref 66500); Thu, 12 Oct 2023 15:32:02 +0000 Received: (at 66500) by debbugs.gnu.org; 12 Oct 2023 15:31:12 +0000 Received: from localhost ([127.0.0.1]:44137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqxea-0006qy-Gb for submit@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 ) id 1qqxeY-0006qq-9V for 66500@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@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@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 8F5758009C; Thu, 12 Oct 2023 17:30:18 +0200 (CEST) From: Bruno Victal Date: Thu, 12 Oct 2023 16:30:01 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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