01/01: gnu: expat: Remove replacement.

[Leo Famulari]

lfam pushed a commit to branch core-updates-next
in repository guix.

commit b0bbf2491e346a355c1ec5584c16de7fbfa14f5e
Author: Leo Famulari <address@hidden>
Date:   Thu May 26 13:24:41 2016 -0400

    gnu: expat: Remove replacement.
    
    * gnu/packages/xml.scm (expat)[replacement]: Remove field.
    (expat/fixed): Remove variable.
---
 gnu/packages/xml.scm |   14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 9eaf71a..85d07a5 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -45,7 +45,6 @@
 (define-public expat
   (package
     (name "expat")
-    (replacement expat/fixed)
     (version "2.1.0")
     (source (origin
              (method url-fetch)
@@ -54,7 +53,9 @@
              (sha256
               (base32
                "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2"))
-             (patches (search-patches "expat-CVE-2015-1283.patch"))))
+             (patches (search-patches "expat-CVE-2015-1283.patch"
+                                      "expat-CVE-2015-1283-refix.patch"
+                                      "expat-CVE-2016-0718.patch"))))
     (build-system gnu-build-system)
     (home-page "http://www.libexpat.org/";)
     (synopsis "Stream-oriented XML parser library written in C")
@@ -64,15 +65,6 @@ stream-oriented parser in which an application registers 
handlers for
 things the parser might find in the XML document (like start tags).")
     (license license:expat)))
 
-(define expat/fixed
-  (package
-    (inherit expat)
-    (source (origin
-              (inherit (package-source expat))
-              (patches (search-patches "expat-CVE-2015-1283.patch"
-                                       "expat-CVE-2015-1283-refix.patch"
-                                       "expat-CVE-2016-0718.patch"))))))
-
 (define-public libxml2
   (package
     (name "libxml2")