[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/15: gnu: Graphviz: Absorb grafted replacement.
From: |
guix-commits |
Subject: |
12/15: gnu: Graphviz: Absorb grafted replacement. |
Date: |
Mon, 17 May 2021 15:09:57 -0400 (EDT) |
lfam pushed a commit to branch wip-ungrafting
in repository guix.
commit 81d422433c93ec4083e281c57e91a5903030071d
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Mon May 17 11:52:51 2021 -0400
gnu: Graphviz: Absorb grafted replacement.
* gnu/packages/graphviz.scm (graphviz)[source]: Use
graphviz-CVE-2020-18032.patch.
[replacement]: Remove field.
(graphviz/fixed): Remove variable.
---
gnu/packages/graphviz.scm | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 72c9665..f916dcf 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -62,13 +62,13 @@
(define-public graphviz
(package
(name "graphviz")
- (replacement graphviz/fixed)
(version "2.42.3")
(source (origin
(method url-fetch)
(uri (string-append
"https://www2.graphviz.org/Packages/stable/portable_source/"
"graphviz-" version ".tar.gz"))
+ (patches (search-patches "graphviz-CVE-2020-18032.patch"))
(sha256
(base32
"1pbswjbx3fjdlsxcm7cmlsl5bvaa3d6gcnr0cr8x3c8pag13zbwg"))))
@@ -127,15 +127,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
- 03/15: gnu: zstd: Absorb grafted replacement., (continued)
- 03/15: gnu: zstd: Absorb grafted replacement., guix-commits, 2021/05/17
- 04/15: gnu: zziplib: Absorb grafted replacement., guix-commits, 2021/05/17
- 01/15: gnu: postgresql: Absorb grafted replacement., guix-commits, 2021/05/17
- 02/15: gnu: OpenLDAP: Absorb grafted replacement., guix-commits, 2021/05/17
- 05/15: gnu: glib: Absorb grafted replacement., guix-commits, 2021/05/17
- 06/15: gnu: libtiff: Absorb grafted replacement., guix-commits, 2021/05/17
- 08/15: gnu: c-ares: Absorb grafted replacement., guix-commits, 2021/05/17
- 10/15: gnu: curl: Absorb grafted replacement., guix-commits, 2021/05/17
- 07/15: gnu: libx11: Absorb grafted replacement., guix-commits, 2021/05/17
- 11/15: gnu: MariaDB: Absorb grafted replacement., guix-commits, 2021/05/17
- 12/15: gnu: Graphviz: Absorb grafted replacement.,
guix-commits <=
- 15/15: gnu: SQLite: Absorb grafted replacement., guix-commits, 2021/05/17
- 09/15: gnu: unzip: Absorb grafted replacement., guix-commits, 2021/05/17
- 13/15: gnu: python-urllib3: Absorb grafted replacement., guix-commits, 2021/05/17
- 14/15: gnu: python-pygments: Absorb grafted replacement., guix-commits, 2021/05/17