01/19: gnu: zziplib: Incorporate grafted changes.

[guix-commits]

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

commit e6bd8b5e1def33beac3b6b4eb2f1f525f87ad0ea
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Mar 5 17:19:54 2020 +0100

    gnu: zziplib: Incorporate grafted changes.
    
    * gnu/packages/compression.scm (zziplib)[replacement]: Remove.
    [source](patches): New field.
    (zziplib/fixed): Remove variable.
---
 gnu/packages/compression.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 1f76f9a..b2edca4 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1580,13 +1580,13 @@ recreates the stored directory structure by default.")
   (package
     (name "zziplib")
     (version "0.13.69")
-    (replacement zziplib/fixed)
     (home-page "https://github.com/gdraheim/zziplib";)
     (source (origin
               (method git-fetch)
               (uri (git-reference (url home-page)
                                   (commit (string-append "v" version))))
               (file-name (git-file-name name version))
+              (patches (search-patches "zziplib-CVE-2018-16548.patch"))
               (sha256
                (base32
                 "0fbk9k7ryas2wh2ykwkvm1pbi40i88rfvc3dydh9xyd7w2jcki92"))))
@@ -1618,13 +1618,6 @@ recreates the stored directory structure by default.")
     ;; files carry the Zlib license; see "docs/copying.html" for details.
     (license (list license:lgpl2.0+ license:mpl1.1))))
 
-(define zziplib/fixed
-  (package
-    (inherit zziplib)
-    (source (origin
-              (inherit (package-source zziplib))
-              (patches (search-patches "zziplib-CVE-2018-16548.patch"))))))
-
 (define-public libzip
   (package
     (name "libzip")