guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

08/09: gnu: python-nbconvert: Use modular texlive packages.


From: guix-commits
Subject: 08/09: gnu: python-nbconvert: Use modular texlive packages.
Date: Tue, 4 May 2021 09:17:51 -0400 (EDT)

rekado pushed a commit to branch master
in repository guix.

commit 82c5d929b9d24f6f9f8425959379d4164d48d219
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Tue May 4 15:13:38 2021 +0200

    gnu: python-nbconvert: Use modular texlive packages.
    
    * gnu/packages/python-xyz.scm (python-nbconvert)[inputs]: Remove texlive.
    [native-inputs]: Add texlive-union.
---
 gnu/packages/python-xyz.scm | 53 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 516a120..1cdce86 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10877,18 +10877,47 @@ time.")
                (setenv "HOME" "/tmp")
                (invoke "pytest" "-vv")))))))
     (inputs
-      `(("pandoc" ,pandoc)
-        ; XXX: Disabled, needs substitute*.
-        ;("inkscape" ,inkscape)
-        ("texlive" ,texlive)))
-    (native-inputs
-      `(("python-ipykernel" ,python-ipykernel)
-        ; XXX: Disabled, not in guix.
-        ;("python-pyppeteer" ,python-pyppeteer)
-        ("python-pytest" ,python-pytest)
-        ("python-pytest-cov" ,python-pytest-cov)
-        ("python-pytest-dependency"
-         ,python-pytest-dependency)))
+     `(("pandoc" ,pandoc)
+       ;; XXX: Disabled, needs substitute*.
+       ;;("inkscape" ,inkscape)
+       ))
+    (native-inputs
+     `(("python-ipykernel" ,python-ipykernel)
+       ;; XXX: Disabled, not in guix.
+       ;;("python-pyppeteer" ,python-pyppeteer)
+       ("python-pytest" ,python-pytest)
+       ("python-pytest-cov" ,python-pytest-cov)
+       ("python-pytest-dependency" ,python-pytest-dependency)
+       ("texlive" ,(texlive-union (list texlive-adjustbox
+                                        texlive-amsfonts
+                                        texlive-booktabs
+                                        texlive-caption
+                                        texlive-eurosym
+                                        texlive-fonts-rsfs
+                                        texlive-generic-ulem
+                                        texlive-iftex
+                                        texlive-jknappen
+                                        texlive-latex-amsmath
+                                        texlive-latex-enumitem
+                                        texlive-latex-fancyvrb
+                                        texlive-latex-float
+                                        texlive-latex-fontspec
+                                        texlive-latex-geometry
+                                        texlive-latex-hyperref
+                                        texlive-latex-jknapltx
+                                        texlive-latex-ms
+                                        texlive-latex-oberdiek
+                                        texlive-latex-parskip
+                                        texlive-latex-trimspaces
+                                        texlive-latex-upquote
+                                        texlive-latex-ucs
+                                        texlive-lm
+                                        texlive-mathpazo
+                                        texlive-tcolorbox
+                                        texlive-titling
+                                        texlive-tools
+                                        texlive-xcolor
+                                        texlive-zapfding)))))
     (propagated-inputs
      `(("python-bleach" ,python-bleach)
        ("python-defusedxml" ,python-defusedxml)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]