From patchwork Fri Aug 20 12:09:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Whatson X-Patchwork-Id: 32194 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 B312727BC6B; Fri, 20 Aug 2021 13:10:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8F93D27BC78 for ; Fri, 20 Aug 2021 13:10:12 +0100 (BST) Received: from localhost ([::1]:51888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3Lf-0000UW-HN for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:10:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3LW-0000Ts-Ji for guix-patches@gnu.org; Fri, 20 Aug 2021 08:10:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3LW-0000xm-CK for guix-patches@gnu.org; Fri, 20 Aug 2021 08:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3LW-0001QK-84 for guix-patches@gnu.org; Fri, 20 Aug 2021 08:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50131] [PATCH 1/3] gnu: Prefix licenses in docbook module. Resent-From: Andrew Whatson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 12:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50131@debbugs.gnu.org Cc: Andrew Whatson Received: via spool by 50131-submit@debbugs.gnu.org id=B50131.16294613625384 (code B ref 50131); Fri, 20 Aug 2021 12:10:02 +0000 Received: (at 50131) by debbugs.gnu.org; 20 Aug 2021 12:09:22 +0000 Received: from localhost ([127.0.0.1]:33100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3Kr-0001Om-LD for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:09:21 -0400 Received: from mail-pf1-f180.google.com ([209.85.210.180]:41530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3Kp-0001OV-PM for 50131@debbugs.gnu.org; Fri, 20 Aug 2021 08:09:20 -0400 Received: by mail-pf1-f180.google.com with SMTP id i21so8412888pfd.8 for <50131@debbugs.gnu.org>; Fri, 20 Aug 2021 05:09:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j+3kXFHC3WN2RLRPpSpm1FtDnj5ZNpZoq3OKPAjIZv8=; b=cMNx1NeMyeM+tFtVG2GsAVJavhl7mJaD9S5sWuCQmK3bHGZM3oJEWkmfJbkzcKonW7 yYZItnFtZNAtJ0LiWZaHcO5Iwg7w3CVVUnx8Q2fDm8356pnLWr2TZoSnan9+r0C/HVqE q1SHV6UajRfFSB3PKKTpB+b571SFbH65oBxbhXi9Qh0WxSU6VMh1/tu4iYmy7/Dn2v5g R3GeogqMefx5JBrIzml4BGUv4e28+gWKSODSVH4TN2/S7yfDD4oULHaJ+ukN4oqPLJlf 4PSuTHlt/1cpCkePa3UDQB+ApdCdh1/DBAAoyLRo7r4NP7DWqi/NiYH+NcPwPjeadHU8 IX4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j+3kXFHC3WN2RLRPpSpm1FtDnj5ZNpZoq3OKPAjIZv8=; b=JOOzzgHeTrLVfOzGxIxCxmG8TZn3jU1GiGSpKJkVNxUmeWNDOBtUvn3qkMQHTSoFUj zJdmXcxzuhi32HzxzeWiGIulv2d59WbBrgV3BjRc5463Zrb6ksUT3QLG+pUmO08LfUBJ WTX2vai08bjXL+s8509r7s2eM10iiH5bvb+/7Wqoaln+RRglCu1rRGtd7sI8WKI380yT 4Q8Nnb/6RKLwck52jE2bEVqlKFb/PAJkp6/tj85XT2cougfb8SMW2y6KV/FoYfvgPofT h298vqv6ezp78M8uA3IWHCW4xCgPnAI8oPiEgxvazX8gNM2gLTlOsaLPt4/Hv4VKsj9d i+2A== X-Gm-Message-State: AOAM530tWeZDAHwP4vq6MIv8vSAp74AqfOsMStTmkPsiSVvAOimSwRRO 5X5bBWg7YM2pyqrFZUL38TjJsqgUPOo= X-Google-Smtp-Source: ABdhPJzg+5aP6v7iwetgmFeUgt50eAYanajrs/9RytshUKApSKvct04IicEA9FK5ySP/bpP1WPS0Aw== X-Received: by 2002:a63:e00b:: with SMTP id e11mr18642852pgh.190.1629461353474; Fri, 20 Aug 2021 05:09:13 -0700 (PDT) Received: from muon.fritz.box (220-235-208-141.tpgi.com.au. [220.235.208.141]) by smtp.gmail.com with ESMTPSA id gb17sm5543112pjb.26.2021.08.20.05.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 05:09:13 -0700 (PDT) From: Andrew Whatson Date: Fri, 20 Aug 2021 22:09:05 +1000 Message-Id: <20210820120907.83191-1-whatson@gmail.com> X-Mailer: git-send-email 2.32.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" X-getmail-retrieved-from-mailbox: Patches This prevents conflicts between expat package and expat license. * gnu/packages/docbook.scm (docbook-xml-5): Prefix license variable. (docbook-xsl): Likewise. (docbook-dsssl): Likewise. (docbook-dsssl-doc): Likewise. (docbook-sgml): Likewise. (iso-8879-entities): Likewise. (dblatex): Likewise. --- gnu/packages/docbook.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 1945fb6a4b..6a69f8cf89 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -31,7 +31,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages base) #:use-module (gnu packages xml) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module ((guix build utils) #:select (alist-replace)) @@ -77,7 +77,7 @@ "DocBook is general purpose XML and SGML document type particularly well suited to books and papers about computer hardware and software (though it is by no means limited to these applications.) This package provides XML DTDs.") - (license (x11-style "" "See file headers.")))) + (license (license:x11-style "" "See file headers.")))) (define-public docbook-xml (package @@ -215,7 +215,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (synopsis "DocBook XSL style sheets for document authoring") (description "This package provides XSL style sheets for DocBook.") - (license (x11-style "" "See 'COPYING' file.")))) + (license (license:x11-style "" "See 'COPYING' file.")))) (define-public docbook-dsssl (package @@ -256,7 +256,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (home-page "https://docbook.org/") (synopsis "DSSSL style sheets for DocBook") (description "This package provides DSSSL style sheets for DocBook.") - (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 @@ -294,7 +294,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (home-page "https://docbook.org/") (synopsis "DocBook DSSSL style sheets documentation") (description "Documentation for the DocBook DSSSL style sheets.") - (license (non-copyleft "file://doc/LEGALNOTICE.htm")))) + (license (license:non-copyleft "file://doc/LEGALNOTICE.htm")))) (define-public docbook-sgml (package @@ -336,7 +336,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (home-page "https://docbook.org") (synopsis "DocBook SGML style sheets for document authoring") (description "This package provides SGML style sheets for DocBook.") - (license (x11-style "" "See file headers.")))) + (license (license:x11-style "" "See file headers.")))) (define-public docbook-sgml-3.1 (package @@ -377,7 +377,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (synopsis "ISO 8879 character entities") (description "ISO 8879 character entities that are typically used in the in DocBook SGML DTDs.") - (license (x11-style "" "See file headers.")))) + (license (license:x11-style "" "See file headers.")))) (define-public dblatex (package @@ -461,7 +461,7 @@ to DVI, PostScript or PDF by translating them in pure LaTeX as a first process. MathML 2.0 markups are supported too. It started as a clone of DB2LaTeX.") ;; lib/contrib/which is under an X11 license - (license gpl2+))) + (license license:gpl2+))) ;; This is a variant of the 'dblatex' package that is not updated often. It ;; is intended to be used as a native-input at build-time only, e.g. by