diff options
| author | Marius Bakke <[email protected]> | 2017-09-02 15:57:56 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2017-09-02 15:57:56 +0200 |
| commit | 30dfac27a5642c36e7bb1ba7966566864ba2d28d (patch) | |
| tree | 3b59623014eeea1df02cda5f926d803b9a36a828 /gnu/packages/compression.scm | |
| parent | d2ee294c0400ac8f2a10f10c3c9644da513a3712 (diff) | |
| parent | 65e4109cdc96fbaee088f50d0138af8acef43141 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/compression.scm')
| -rw-r--r-- | gnu/packages/compression.scm | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 7cd9842f94..da7765b013 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver <[email protected]> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <[email protected]> ;;; Copyright © 2015, 2016 Eric Bavier <[email protected]> -;;; Copyright © 2015, 2016 Ricardo Wurmus <[email protected]> +;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <[email protected]> ;;; Copyright © 2015, 2017 Leo Famulari <[email protected]> ;;; Copyright © 2015 Jeff Mickey <[email protected]> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <[email protected]> @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Danny Milosavljevic <[email protected]> ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2016 David Craven <[email protected]> -;;; Copyright © 2016 Kei Kebreau <[email protected]> +;;; Copyright © 2016 Kei Kebreau <[email protected]> ;;; Copyright © 2016 Marius Bakke <[email protected]> ;;; Copyright © 2017 ng0 <[email protected]> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <[email protected]> @@ -758,6 +758,28 @@ the LZ4 frame format.") (define-public python2-lz4 (package-with-python2 python-lz4)) +(define-public python-lzstring + (package + (name "python-lzstring") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "lzstring" version)) + (sha256 + (base32 + "1d3ck454y41mii0gcjabpmp2skb7n0f9zk232gycqdv8z2jxakfm")))) + (build-system python-build-system) + (propagated-inputs + `(("python-future" ,python-future))) + (home-page "https://github.com/gkovacs/lz-string-python") + (synopsis "String compression") + (description "Lz-string is a string compressor library for Python.") + (license license:expat))) + +(define-public python2-lzstring + (package-with-python2 python-lzstring)) + (define-public squashfs-tools (package (name "squashfs-tools") @@ -1525,6 +1547,7 @@ manipulate, read, and write Zip archive files.") (method url-fetch) (uri (string-append "https://nih.at/libzip/libzip-" version ".tar.gz")) + (patches (search-patches "libzip-CVE-2017-12858.patch")) (sha256 (base32 "17vxj2ffsxwh8lkc6801ppmwj15jp8q58rin76znxfbx88789ybc")))) |