12/15: gnu: Graphviz: Absorb grafted replacement.

[guix-commits]

lfam pushed a commit to branch wip-ungrafting
in repository guix.

commit b3802f766890f63c6c70359acf776342d5360571
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