amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2020-03-04 12:04:42 +01:00
commit e32aea5472
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
44 changed files with 690 additions and 412 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/compression.scm
View file

@ -1589,6 +1589,7 @@ 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)
@ -1626,6 +1627,13 @@ 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")