From 579e8fd00302f72350b7f7d43cce63012a315f39 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 20 Apr 2023 14:40:45 -0400 Subject: gnu: docbook-xml-5: Make it the default docbook-xml. * gnu/packages/docbook.scm (docbook-xml-5): Rename to... (docbook-xml): ... this, renaming the previous one to... (docbook-xml-4.5): ... this. (docbook2x) [inputs]: Replace docbook-xml with docbook-xml-4.5. * gnu/packages/freedesktop.scm (wayland) [native-inputs]: Likewise. * gnu/packages/freedesktop.scm (elogind): Likewise. * gnu/packages/databases.scm (postgresql-15): Likewise. * gnu/packages/documentation.scm (asciidoc): Likewise. * gnu/packages/networking.scm (iputils) [native-inputs]: Replace docbook-xml-5 with docbook-xml. --- gnu/packages/docbook.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/docbook.scm') diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 8778ff1718..f8a9edd769 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -50,7 +50,7 @@ #:use-module (guix build-system trivial) #:use-module (guix build-system python)) -(define-public docbook-xml-5 +(define-public docbook-xml (package (name "docbook-xml") (version "5.1") @@ -97,10 +97,9 @@ 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 (license:x11-style "" "See file headers.")))) -(define-public docbook-xml +(define-public docbook-xml-4.5 (package - (inherit docbook-xml-5) - (name "docbook-xml") + (inherit docbook-xml) (version "4.5") (source (origin (method url-fetch/zipbomb) @@ -709,7 +708,7 @@ Detect the differences in markup between two SGML files. (build-system gnu-build-system) (inputs `(("bash-minimal" ,bash-minimal) - ("docbook-xml" ,docbook-xml) + ("docbook-xml" ,docbook-xml-4.5) ("perl" ,perl) ("perl-xml-namespacesupport" ,perl-xml-namespacesupport) ("perl-xml-parser" ,perl-xml-parser) -- cgit 1.4.1