diff options
Diffstat (limited to 'gnu/packages/graphviz.scm')
| -rw-r--r-- | gnu/packages/graphviz.scm | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 40a5cf7401..8c7fd8718d 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -327,7 +327,7 @@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/predicates_init.c \ (file-name (git-file-name name version)) (sha256 (base32 "1l34ahvcz90j3j7aspp9wqvxpq10mzgq7l0sanrj142ihdnbahvy")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -350,13 +350,12 @@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/predicates_init.c \ (setenv "LD_LIBRARY_PATH" (dirname lib))))) ;; We wrap xdot, so that we don't propagate gtk+ and graphviz - (add-after 'install 'wrap + (replace 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (graphviz (assoc-ref inputs "graphviz")) + (let ((graphviz (assoc-ref inputs "graphviz")) (gi-typelib-path (getenv "GI_TYPELIB_PATH")) (python-path (getenv "GUIX_PYTHONPATH"))) - (wrap-program (string-append out "/bin/xdot") + (wrap-program (string-append #$output "/bin/xdot") `("PATH" ":" prefix (,(string-append graphviz "/bin"))) `("GI_TYPELIB_PATH" ":" prefix @@ -381,6 +380,8 @@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/predicates_init.c \ python-numpy python-pycairo python-pygobject + python-setuptools + python-wheel vulkan-loader)) (home-page "https://pypi.org/project/xdot/") (synopsis "Interactive viewer for graphviz dot files") @@ -394,32 +395,24 @@ can be used either as a standalone application, or as a Python library.") (define-public python-pydot (package (name "python-pydot") - (version "1.4.2") + (version "4.0.1") (source (origin (method url-fetch) (uri (pypi-uri "pydot" version)) (sha256 (base32 - "0z80zwldf7ffkwrpm28hixsiqp3053j7g281xd6phmnbkfiq3014")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - ;; Taken from .travis.yaml - (lambda* (#:key tests? inputs outputs #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (with-directory-excursion "test" - (invoke "python" "pydot_unittest.py")))))))) + "1maa6rvnbs1cyfc801ia1qpai6a0irgrwsp2y25y0csa3il8y562")))) + (build-system pyproject-build-system) (native-inputs - ;; For tests. - (list graphviz python-chardet)) + (list graphviz + python-chardet + python-parameterized + python-pytest + python-pytest-xdist + python-setuptools)) (propagated-inputs - ;; XXX: Two test failures with 3.0+: - ;; https://github.com/pydot/pydot/issues/277 - (list python-pyparsing-2.4.7)) + (list python-pyparsing)) (home-page "https://github.com/pydot/pydot") (synopsis "Python interface to Graphviz's DOT language") (description |