diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
| commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
| tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/graphviz.scm | |
| parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/graphviz.scm')
| -rw-r--r-- | gnu/packages/graphviz.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index ab39e49d7d..dfbb28a8a9 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org> -;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com> @@ -370,15 +370,14 @@ can be used either as a standalone application, or as a Python library.") (define-public python-pydot (package (name "python-pydot") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (pypi-uri "pydot" version)) (sha256 (base32 - "00az4cbf8bv447lkk9xi6pjm7gcc7ia33y4pm71fwfwis56rv76l")) - (patches (search-patches "python-pydot-regression-test.patch")))) + "0z80zwldf7ffkwrpm28hixsiqp3053j7g281xd6phmnbkfiq3014")))) (build-system python-build-system) (arguments '(#:phases @@ -389,13 +388,14 @@ can be used either as a standalone application, or as a Python library.") (when tests? (add-installed-pythonpath inputs outputs) (with-directory-excursion "test" - (invoke "python" "pydot_unittest.py"))) - #t))))) + (invoke "python" "pydot_unittest.py")))))))) (native-inputs ;; For tests. (list graphviz python-chardet)) (propagated-inputs - (list python-pyparsing)) + ;; XXX: Two test failures with 3.0+: + ;; https://github.com/pydot/pydot/issues/277 + (list python-pyparsing-2.4.7)) (home-page "https://github.com/pydot/pydot") (synopsis "Python interface to Graphviz's DOT language") (description |