[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
120/166: gnu: python-sphinx: Propagate TexLive dependencies.
From: |
guix-commits |
Subject: |
120/166: gnu: python-sphinx: Propagate TexLive dependencies. |
Date: |
Tue, 19 Apr 2022 09:18:07 -0400 (EDT) |
apteryx pushed a commit to branch wip-ipython+polyglossia
in repository guix.
commit 39a5f5a7d12d5443ecce798a5c576e78ff3fbf36
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Apr 14 17:25:30 2022 -0400
gnu: python-sphinx: Propagate TexLive dependencies.
* gnu/packages/sphinx.scm (python-sphinx):
[propagated-inputs]: Add texlive-amsfonts, texlive-amsmath, texlive-capt-of,
texlive-carlisle, texlive-etoolbox, texlive-generic-ltxcmds,
texlive-hyperref,
texlive-latex-base, texlive-latex-cmap, texlive-latex-fancyhdr,
texlive-latex-fancyvrb, texlive-latex-fncychap, texlive-latex-float,
texlive-latex-framed, texlive-latex-geometry, texlive-latex-graphics,
texlive-latex-kvoptions, texlive-latex-needspace, texlive-latex-parskip,
texlive-latex-preview, texlive-latex-tabulary, texlive-latex-titlesec,
texlive-latex-tools, texlive-latex-upquote, texlive-latex-varwidth,
texlive-oberdiek, texlive-stringenc, texlive-wrapfig, texlive-xcolor and
texlive-zapfding.
[native-inputs]: Remove graphviz, python-mock and python-nose.
* gnu/packages/tex.scm (texlive-xcolor): Add TODO comment.
* gnu/packages/tex.scm (texlive-hyperref): Likewise.
---
gnu/packages/sphinx.scm | 47 ++++++++++++++++++++++++++++++++++++++++-------
gnu/packages/tex.scm | 10 +++++++++-
2 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 69a92b8b97..a377729397 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -17,7 +17,7 @@
;;; Copyright © 2021 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -54,7 +54,8 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages time)
#:use-module (gnu packages python-science)
- #:use-module (gnu packages graph))
+ #:use-module (gnu packages graph)
+ #:use-module (gnu packages tex))
(define-public python-sphinx
(package
@@ -95,13 +96,45 @@
python-sphinxcontrib-htmlhelp
python-sphinxcontrib-jsmath
python-sphinxcontrib-qthelp
- python-sphinxcontrib-serializinghtml))
+ python-sphinxcontrib-serializinghtml
+
+ ;; The Sphinx LaTeX library '\RequirePackage' or \\usepackage
+ ;; these:
+ texlive-amsfonts ;amsmath, amssymb, amstext
+ texlive-amsmath
+ texlive-capt-of
+ texlive-carlisle ;remreset
+ texlive-etoolbox
+ texlive-generic-ltxcmds
+ texlive-hyperref
+ ;; TODO: Remove texlive-stringenc and texlive-zapfding after
+ ;; propagating them in texlive-hyperref in next rebuild cycle.
+ texlive-stringenc
+ texlive-zapfding
+ texlive-latex-base ;alltt, atbegshi, makeidx, textcomp
+ texlive-latex-cmap
+ texlive-latex-fancyhdr
+ texlive-latex-fancyvrb
+ texlive-latex-float
+ texlive-latex-fncychap
+ texlive-latex-framed
+ texlive-latex-geometry
+ texlive-latex-graphics ;graphicx, color
+ texlive-latex-kvoptions
+ texlive-latex-needspace
+ texlive-latex-parskip
+ texlive-latex-preview
+ texlive-latex-tabulary
+ texlive-latex-titlesec
+ texlive-latex-tools ;multicol, longtable
+ texlive-latex-upquote
+ texlive-latex-varwidth
+ texlive-oberdiek ;hypcap
+ texlive-wrapfig
+ texlive-xcolor))
(native-inputs
- (list graphviz
- imagemagick ;for "convert"
+ (list imagemagick ;for "convert"
python-html5lib
- python-mock
- python-nose
python-pytest))
(home-page "https://www.sphinx-doc.org")
(synopsis "Python documentation generator")
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a861b40950..7f76eaa69c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3326,6 +3326,9 @@ used by @code{hyperref} and @code{bookmark}.")
(rename-file (string-append share
"/tex/latex/xcolor/xcolor.pro")
(string-append share
"/dvips/xcolor/xcolor.pro"))
#t)))))))
+ ;; TODO: Propagate texlive-hyperref and many others in the next rebuild
+ ;; cycle. Grep for '\usepackage' to see what packages it requires.
+ ;; (propagated-inputs (list texlive-hyperref ...))
(home-page "https://www.ctan.org/pkg/xcolor")
(synopsis "Driver-independent color extensions for LaTeX and pdfLaTeX")
(description
@@ -3449,7 +3452,12 @@ XML, using UTF-8 or a suitable 8-bit encoding.")
texlive-latex-pdftexcmds
texlive-latex-refcount
texlive-latex-rerunfilecheck
- texlive-url))
+ texlive-url
+ ;; TODO: Add this in next rebuild cycle.
+ ;;texlive-cm
+ ;;texlive-stringenc
+ ;;texlive-zapfding
+ ))
(home-page "https://www.ctan.org/pkg/hyperref")
(synopsis "Extensive support for hypertext in LaTeX")
(description
- 102/166: gnu: python-nest-asyncio: Update to 1.5.5., (continued)
- 102/166: gnu: python-nest-asyncio: Update to 1.5.5., guix-commits, 2022/04/19
- 110/166: gnu: python-bleach: Update to 5.0.0., guix-commits, 2022/04/19
- 113/166: gnu: python-nbconvert: Update to 6.5.0., guix-commits, 2022/04/19
- 115/166: gnu: python-nbval: Fix build., guix-commits, 2022/04/19
- 131/166: gnu: Add python-openapi-spec-validator., guix-commits, 2022/04/19
- 132/166: gnu: Add python-cbor2., guix-commits, 2022/04/19
- 152/166: gnu: python-pandas: Build and run tests in parallel., guix-commits, 2022/04/19
- 155/166: gnu: python-pynndescent: Update to 0.5.6., guix-commits, 2022/04/19
- 89/166: gnu: Add font-gfs-ambrosia., guix-commits, 2022/04/19
- 111/166: gnu: Add texlive-unicode-math., guix-commits, 2022/04/19
- 120/166: gnu: python-sphinx: Propagate TexLive dependencies.,
guix-commits <=
- 119/166: gnu: Add python-docrepr., guix-commits, 2022/04/19
- 130/166: gnu: Add python-openapi-schema-validator., guix-commits, 2022/04/19
- 135/166: gnu: Add python-httpx-bootstrap., guix-commits, 2022/04/19
- 147/166: gnu: Add python-jupyterlab-server., guix-commits, 2022/04/19
- 156/166: gnu: python-umap-learn: Update to 0.5.3., guix-commits, 2022/04/19
- 98/166: gnu: python-greenlet: Update to 1.1.2., guix-commits, 2022/04/19
- 158/166: gnu: python-voila: Update to 0.3.5., guix-commits, 2022/04/19
- 159/166: gnu: python-sparqlwrapper: Update to 2.0.0., guix-commits, 2022/04/19
- 160/166: gnu: python-sparqlkernel: Use gexps and fix inputs., guix-commits, 2022/04/19
- 164/166: gnu: python-types-dataclasses: Fix typo., guix-commits, 2022/04/19