From: Andrew Whatson <whatson@gmail.com>
To: 50131@debbugs.gnu.org
Cc: Andrew Whatson <whatson@gmail.com>
Subject: [bug#50131] [PATCH 1/3] gnu: Prefix licenses in docbook module.
Date: Fri, 20 Aug 2021 22:09:05 +1000 [thread overview]
Message-ID: <20210820120907.83191-1-whatson@gmail.com> (raw)
In-Reply-To: <CAPE069fYVR85Pqyw0r17BpaFHC24R8Dk6mvb1U8f9YEF7RFa8Q@mail.gmail.com>
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
next prev parent reply other threads:[~2021-08-20 12:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-20 12:03 [bug#50131] [PATCH 0/3] Add docbook2x and generate lxc man pages Andrew Whatson
2021-08-20 12:09 ` Andrew Whatson [this message]
2021-08-20 12:09 ` [bug#50131] [PATCH 2/3] gnu: Add docbook2x Andrew Whatson
2021-08-26 15:36 ` Thiago Jung Bauermann via Guix-patches via
2021-08-20 12:09 ` [bug#50131] [PATCH 3/3] gnu: Generate man pages for lxc Andrew Whatson
2021-08-26 15:49 ` Thiago Jung Bauermann via Guix-patches via
2021-08-27 4:21 ` Andrew Whatson
2021-08-27 4:15 ` [bug#50131] [PATCH 2/3 v2] gnu: Add docbook2x Andrew Whatson
2021-08-27 4:15 ` [bug#50131] [PATCH 3/3 v2] gnu: Generate man pages for lxc Andrew Whatson
2021-08-27 17:48 ` Thiago Jung Bauermann via Guix-patches via
2021-09-13 10:30 ` bug#50131: [PATCH 0/3] Add docbook2x and generate lxc man pages 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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210820120907.83191-1-whatson@gmail.com \
--to=whatson@gmail.com \
--cc=50131@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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).