diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-10 16:50:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-13 01:00:46 +0200 |
| commit | 5d4b721b7d924d434266f2ccbda1e247c9969970 (patch) | |
| tree | af3a564aa933bd7a5331c26ffd6d034a26079c41 /gnu/packages/graphviz.scm | |
| parent | 44775a7e8ddceb074efa7935e773c6aa0da88cca (diff) | |
| download | guix-patches-5d4b721b7d924d434266f2ccbda1e247c9969970.tar guix-patches-5d4b721b7d924d434266f2ccbda1e247c9969970.tar.gz | |
gnu: graphviz: Update to 2.47.1.
* gnu/packages/graphviz.scm (graphviz): Update to 2.47.1.
[source]: Adjust for new download location.
* gnu/packages/patches/graphviz-CVE-2020-18032.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/graphviz.scm')
| -rw-r--r-- | gnu/packages/graphviz.scm | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 72c96655bc..34d6434f60 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -62,16 +62,15 @@ (define-public graphviz (package (name "graphviz") - (replacement graphviz/fixed) - (version "2.42.3") + (version "2.47.1") (source (origin (method url-fetch) - (uri (string-append - "https://www2.graphviz.org/Packages/stable/portable_source/" - "graphviz-" version ".tar.gz")) + (uri (string-append "https://gitlab.com/graphviz/graphviz" + "/-/package_files/9573974/download")) + (file-name (string-append "graphviz-" version ".tar.xz")) (sha256 (base32 - "1pbswjbx3fjdlsxcm7cmlsl5bvaa3d6gcnr0cr8x3c8pag13zbwg")))) + "1hff831p300n989x1gmyzh3ix43xd2mgx01qgrrqill44n7zxfza")))) (build-system gnu-build-system) (arguments ;; FIXME: rtest/rtest.sh is a ksh script (!). Add ksh as an input. @@ -127,15 +126,6 @@ software engineering, database and web design, machine learning, and in visual interfaces for other technical domains.") (license license:epl1.0))) -(define-public graphviz/fixed - (hidden-package - (package - (inherit graphviz) - (source (origin - (inherit (package-source graphviz)) - (patches (append (search-patches "graphviz-CVE-2020-18032.patch") - (origin-patches (package-source graphviz))))))))) - ;; Older Graphviz needed for pygraphviz. See ;; https://github.com/pygraphviz/pygraphviz/issues/175 (define-public graphviz-2.38 |