diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-06-01 12:31:09 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-06-01 12:42:04 +0300 |
| commit | 64c043e63a4be97f59fd1906c47973a74eedda67 (patch) | |
| tree | 37b15dfb4830e4f874edca87b521b6e9cdc3c81b /gnu/packages/graphviz.scm | |
| parent | b1f763de54dc2b8e240d0f01f7948ce76f67243e (diff) | |
| parent | 75af73e1b7ac58770122d8831faa3a8158638bb0 (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/graphviz.scm')
| -rw-r--r-- | gnu/packages/graphviz.scm | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index dfbb28a8a9..68d0741957 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -208,9 +208,6 @@ interfaces for other technical domains.") visualization tool suite.") (license license:expat))) -(define-public python2-graphviz - (package-with-python2 python-graphviz)) - (define-public python-pygraphviz (package (name "python-pygraphviz") @@ -403,9 +400,6 @@ can be used either as a standalone application, or as a Python library.") graphs in Graphviz's DOT language, written in pure Python.") (license license:expat))) -(define-public python2-pydot - (package-with-python2 python-pydot)) - (define-public dot2tex (package (name "dot2tex") @@ -418,11 +412,33 @@ graphs in Graphviz's DOT language, written in pure Python.") "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9")))) (build-system python-build-system) (arguments - `(#:python ,python-2)) - (inputs - (list texlive-latex-preview graphviz)) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "tests" + ;; The test_semicolon test fails for unknown reason + ;; (see: + ;; https://github.com/kjellmf/dot2tex/issues/94). + "-k" "not test_semicolon"))))))) + (native-inputs (list python-pytest)) + (inputs (list graphviz)) (propagated-inputs - (list python2-pyparsing)) + (list python-pyparsing + ;; These TeX dependencies are propagated to make it easier to build + ;; the resulting generated TeX files, which \usepackage them. + texlive-bin + texlive-amsmath + texlive-latex-geometry + texlive-latex-graphics + texlive-latex-base + texlive-latex-preview + texlive-latex-xkeyval + texlive-pgf + texlive-pstricks + texlive-xcolor)) (home-page "https://github.com/kjellmf/dot2tex") (synopsis "Graphviz to LaTeX converter") (description |