Refactored 'patch-catalog.xml to reduce code duplication.
The catalog for docbook-xsl hosted on the CDN [1] have entries for the 'http'
scheme yet when building from source only 'https' entries are generated.
Patch the XML catalog to provide them both.
[1]: <https://cdn.docbook.org/release/xsl/current/catalog.xml>
* gnu/packages/docbook.scm (docbook-xsl)[arguments]<#:phases>: Rename
'patch-catalog-xml to 'patch-catalog.xml. Refactor this phase for
deduplication and add 'https' entries.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Using xml/dtd/docbook as installation path had two problems:
* The paths would conflict in profile, which made it impossible
for two different docbook-xml packages to coexist within the XML_CATALOG_FILES
variable.
* It was technically incorrect since non-DTD schemas were also placed here.
This commit makes docbook-xml use versioned paths instead.
Additionally the store URI for docbook-xml-4.1.2 was adjusted to conform to
RFC8089 as according to RFC1738 the double slash "//" is intended for schemes
that involve the direct use of an IP-based protocol.
* gnu/packages/docbook.scm
(docbook-xml-package, docbook-xml-4.x-package): New procedure.
(docbook-xml): Make docbook-xml an alias for docbook-xml-5.1.
(docbook-xml-5.1): New variable.
(docbook-xml-4.5, docbook-xml-4.4, docbook-xml-4.3, docbook-xml-4.2)
(docbook-xml-4.1.2): Refactor to use docbook-xml-4.x-package procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
* gnu/packages/docbook.scm
(docbook-dsssl)[build-system]: Switch to copy-build-system.
[arguments]: Add phase to install documentation as separate output.
(docbook-dsssl-doc)[build-system]: Switch to copy-build-system.
[arguments]: Adapt to new build-system.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
* gnu/packages/docbook.scm (docbook-xsl)[source]: Patch in snippet.
[arguments]: Use sxml representation for xmlc file.
Use xmlcatalog to manipulate catalog.xml instead of substitute*.
Use #:install-plan instead of replacing 'install phase.
[native-inputs]: Add docbook-xml-4.4 and libxml2, required for tests.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
The source used by the transfig package is outdated and its development
was moved into the repository used by fig2dev though the utility
`transfig' is considered obsolete and not built by default in the
fig2dev package. In practice, this is not a problem since the user is
generally after the `fig2dev' utility which was also provided in the
(now obsolete) transfig package.
Descriptions and comments pointing to the now obsolete packages are
adjusted accordingly. For texlive-latex-make, this follow upstream at
<1dcc04aaa8>.
* gnu/packages/xfig.scm: Import all of (guix licenses).
(xfig)[license]: Adjust accordingly.
(fig2dev): New variable.
(transfig): Deprecate in favor of fig2dev.
* gnu/packages/patches/transfig-gcc10-fno-common.patch: Removed file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/docbook.scm (dblatex): Update comment.
* gnu/packages/tex.scm (texlive-latex-make)[description]: Update description.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
* gnu/packages/tex.scm (texlive-overpic): New variable.
(texlive-latex-overpic): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
* gnu/packages/tex.scm (texlive-fancybox): New variable.
(texlive-latex-fancybox): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
* gnu/packages/tex.scm (texlive-changebar): New variable.
(texlive-latex-changebar): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
* gnu/packages/tex.scm (texlive-bookmark): New variable.
(texlive-latex-bookmark): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
* gnu/packages/tex.scm (texlive-footmisc): New variable.
(texlive-latex-footmisc): Deprecate variable.
(texlive-latex-xkeyval):
* gnu/packages/docbook.scm (dblatex): Use new name.
* gnu/packages/tex.scm (texlive-appendix): New variable.
(texlive-latex-appendix): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
* gnu/packages/tex.scm (texlive-anysize): New variable.
(texlive-latex-anysize): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
(sxml transforms) are unsuited here due to guile-bug #20339.
* gnu/packages/aux-files/xml/patch-catalog-xml.xsl: New file.
* Makefile.am: Register it.
* gnu/packages/docbook.scm (docbook-xml-5)[native-inputs]: Add libxslt.
[arguments]: Add phase to patch catalog.xml using XSLT.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
* gnu/packages/docbook.scm (docbook-xsl): Replace with...
(docbook-xsl-next): ... this package, adding the missing home-page, synopsis,
description and license fields to the later, and removing the inheritance.
This will allow introducing a new 'inkscape' package that can be more freely
upgraded on the main branch.
* gnu/packages/inkscape.scm (inkscape): Rename to...
(inkscape/stable): ... this, and make it a hidden package.
* gnu/packages/admin.scm (wpa-supplicant-gui)[native-inputs]: Rename inkscape
input accordingly.
* gnu/packages/docbook.scm (dblatex): Likewise.
* gnu/packages/gnome-xyz.scm (arc-theme): Likewise.
* gnu/packages/python-xyz.scm (python-matplotlib-documentation): Likewise.
(python-nbconvert): Likewise.
* gnu/packages/xfce.scm (xfdesktop): Likewise.
* gnu/packages/xorg.scm (hackneyed-x11-cursors): Likewise.
* gnu/packages/tex.scm (texlive-pdfpages): New variable.
(texlive-latex-pdfpages): Deprecate variable.
* gnu/packages/docbook.scm (dblatex): Use new name.
* gnu/packages/tex.scm (texlive-subfigure): New variable.
(texlive-latex-subfigure): Deprecated alias.
* gnu/packages/docbook.scm (dblatex): Use new name.
