From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uFqbH6GbH2FYDgAAgWs5BA (envelope-from ) for ; Fri, 20 Aug 2021 14:10:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 0PtZG6GbH2E7KgAAB5/wlQ (envelope-from ) for ; Fri, 20 Aug 2021 12:10:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 33E41D52C for ; Fri, 20 Aug 2021 14:10:09 +0200 (CEST) Received: from localhost ([::1]:51888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3Lc-0000UW-AD for larch@yhetil.org; Fri, 20 Aug 2021 08:10:08 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629461409; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=j+3kXFHC3WN2RLRPpSpm1FtDnj5ZNpZoq3OKPAjIZv8=; b=S7ZXvny0gXzD5+MTzQ3PsjAngcOTSIzajaE7ybZYCETglFxfeIxcdRl/Kj1zLbU7cMbw5/ 0Efc18UPjxp6ZRs+g8+YimAP8L7sHeaFqr8+vlMRwHyrWFq8I9S1vpuFjL7U0zqJUYiUnb oyd6ZVDjUVjeXVwggFlr7CE8k31FIq2C35+qVG19QhgUe9j2JUUKfR+smC7vAOvHM8MEgi vB6Vs1eQOHyP94tBexqtEcn5o7BUCxQs196Ozb2iS89u7czjMTxEkldFMRbZE0bGU3zH0h WjkTHE534xXtNFXtCfcqactSw6/9AkswjOuO9G5kMVuu9E/9rPYJgSmTT5X44A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629461409; a=rsa-sha256; cv=none; b=qzRN8OA2qatqzR72fohsEsVueOEBuAdnic6/3whnMFTLdnNmq+dF/xpvG982LIMj3S8uH/ O9vc/Pg5CKOXz9lYyavb+RNM8ZdaIAKJUAiDXeLsxhy5P6qwfCdwSeADBR5kb898ZbBrgz 9RM1HWoNlEH6Vop+/Saztm11yI5TC2+3gNFjQ2qBVI9TeWqTU76EqgT2cjTy4TSBKR5OyW /nFbXI4Jkq/acdWdaz3Zp0ud4k1ZBQY7AuUhO5YlX6oLzBI1o0UG/mOPaHOyfDJu+ApwY5 fL7v9cRfk7KkhePP21R3sKCHfkAEH70QqnTPCwUsRLZjfHHH5iP1OVO3d0jtJA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=cMNx1NeM; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=cMNx1NeM; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 33E41D52C X-Spam-Score: 3.68 X-Migadu-Scanner: scn0.migadu.com X-TUID: we09ycx/ULpF 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 -- 2.32.0