diff options
48 files changed, 183 insertions, 244 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index ae4a59af0b..f0eed694de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -416,7 +416,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/xorg.scm \ %D%/packages/xfce.scm \ %D%/packages/zile.scm \ - %D%/packages/zip.scm \ \ %D%/services.scm \ %D%/services/admin.scm \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index dc668ce131..3e4b998b1b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -79,7 +79,6 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (srfi srfi-1)) (define-public alsa-modular-synth diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index 916f7983fa..aaa0428041 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -27,11 +27,11 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) #:use-module (gnu packages flashing-tools) #:use-module (gnu packages gcc) - #:use-module (gnu packages vim) - #:use-module (gnu packages zip)) + #:use-module (gnu packages vim)) (define-public avr-binutils (package diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b9d641ec34..7f66861ead 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -96,7 +96,6 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 988154eed4..096e26ca01 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -24,8 +24,8 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages admin) - #:use-module (gnu packages perl) - #:use-module (gnu packages zip)) + #:use-module (gnu packages compression) + #:use-module (gnu packages perl)) (define-public busybox (package diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 15329b3109..704e8ad36d 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -37,7 +37,6 @@ #:use-module (gnu packages audio) #:use-module (gnu packages bison) #:use-module (gnu packages compression) - #:use-module (gnu packages zip) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index c26d02f175..e2cb712bf1 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -39,7 +39,6 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml) - #:use-module (gnu packages zip) #:use-module (guix build-system gnu)) (define-public hydra diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3742ff5865..2667ebb977 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -54,7 +54,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) - #:use-module (gnu packages zip) #:use-module (ice-9 match) #:use-module ((srfi srfi-1) #:select (last))) @@ -1337,3 +1336,158 @@ as is the decompression of data compressed in this manner. Data compressed by other implementations will only be decompressed by two threads: one performing the actual decompression, the other input and output.") (license (package-license zstd)))) + +(define-public zip + (package + (name "zip") + (version "3.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/infozip" + "/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz")) + (sha256 + (base32 + "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h")))) + (build-system gnu-build-system) + (inputs `(("bzip2" ,bzip2))) + (arguments + `(#:tests? #f ; no test target + #:make-flags (let ((out (assoc-ref %outputs "out"))) + (list "-f" "unix/Makefile" + (string-append "prefix=" out) + (string-append "MANDIR=" out "/share/man/man1"))) + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (zero? (apply system* "make" "generic_gcc" make-flags)))) + (delete 'configure)))) + (home-page "http://www.info-zip.org/Zip.html") + (synopsis "Compression and file packing utility") + (description + "Zip is a compression and file packaging/archive utility. Zip is useful +for packaging a set of files for distribution, for archiving files, and for +saving disk space by temporarily compressing unused files or directories. +Zip puts one or more compressed files into a single ZIP archive, along with +information about the files (name, path, date, time of last modification, +protection, and check information to verify file integrity). An entire +directory structure can be packed into a ZIP archive with a single command. + +Zip has one compression method (deflation) and can also store files without +compression. Zip automatically chooses the better of the two for each file. +Compression ratios of 2:1 to 3:1 are common for text files.") + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")))) + +(define-public unzip + (package (inherit zip) + (name "unzip") + (version "6.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/infozip" + "/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz")) + (sha256 + (base32 + "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83")) + (patches (search-patches "unzip-CVE-2014-8139.patch" + "unzip-CVE-2014-8140.patch" + "unzip-CVE-2014-8141.patch" + "unzip-CVE-2014-9636.patch" + "unzip-CVE-2015-7696.patch" + "unzip-CVE-2015-7697.patch" + "unzip-allow-greater-hostver-values.patch" + "unzip-initialize-symlink-flag.patch" + "unzip-remove-build-date.patch" + "unzip-attribs-overflow.patch" + "unzip-overflow-on-invalid-input.patch" + "unzip-format-secure.patch" + "unzip-overflow-long-fsize.patch")))) + (build-system gnu-build-system) + ;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (zero? (apply system* "make" + `("-j" ,(number->string + (parallel-job-count)) + ,@make-flags + "generic_gcc")))))) + #:make-flags (list "-f" "unix/Makefile" + (string-append "prefix=" %output) + (string-append "MANDIR=" %output "/share/man/man1")))) + (home-page "http://www.info-zip.org/UnZip.html") + (synopsis "Decompression and file extraction utility") + (description + "UnZip is an extraction utility for archives compressed in .zip format, +also called \"zipfiles\". + +UnZip lists, tests, or extracts files from a .zip archive. The default +behaviour (with no options) is to extract into the current directory, and +subdirectories below it, all files from the specified zipfile. UnZip +recreates the stored directory structure by default.") + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")))) + +(define-public zziplib + (package + (name "zziplib") + (version "0.13.62") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/zziplib/zziplib13/" + version "/zziplib-" + version ".tar.bz2")) + (patches (search-patches "zziplib-CVE-2017-5974.patch" + "zziplib-CVE-2017-5975.patch" + "zziplib-CVE-2017-5976.patch" + "zziplib-CVE-2017-5978.patch" + "zziplib-CVE-2017-5979.patch" + "zziplib-CVE-2017-5981.patch")) + (sha256 + (base32 + "0nsjqxw017hiyp524p9316283jlf5piixc1091gkimhz38zh7f51")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib))) + (native-inputs `(("perl" ,perl) ; for the documentation + ("pkg-config" ,pkg-config) + ;; for the documentation; Python 3 not supported, + ;; http://forums.gentoo.org/viewtopic-t-863161-start-0.html + ("python" ,python-2) + ("zip" ,zip))) ; to create test files + (arguments + `(#:parallel-tests? #f)) ; since test files are created on the fly + (home-page "http://zziplib.sourceforge.net/") + (synopsis "Library for accessing zip files") + (description + "ZZipLib is a library based on zlib for accessing zip files.") + (license license:lgpl2.0+))) + +(define-public perl-zip + (package + (name "perl-zip") + (version "1.59") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/A/AD/ADAMK/Archive-Zip-" + version ".tar.gz")) + (sha256 + (base32 + "0m31qlppg65vh32pwxkwjby02q70abx49d2yk6vfd4585fqb27cx")))) + (build-system perl-build-system) + (synopsis "Provides an interface to ZIP archive files") + (description "The Archive::Zip module allows a Perl program to create, +manipulate, read, and write Zip archive files.") + (home-page "http://search.cpan.org/~adamk/Archive-Zip-1.30/") + (license license:perl-license))) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 067ad1c3b0..7a309b0bc9 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -31,8 +31,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system trivial) - #:use-module (guix build-system python) - #:autoload (gnu packages zip) (unzip)) + #:use-module (guix build-system python)) (define-public docbook-xml (package diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index ba8eea3931..5d3d6f170b 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -37,8 +37,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages perl) - #:use-module (gnu packages xml) - #:autoload (gnu packages zip) (unzip)) + #:use-module (gnu packages xml)) (define-public asciidoc (package diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 4d61f0fccf..2ee012e3c1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -53,8 +53,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages xorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xorg)) (define-public font-inconsolata (package diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 0b98e2db0d..420d0aff28 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -25,6 +25,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages compression) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tcl) #:use-module (gnu packages readline) @@ -35,7 +36,6 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) - #:use-module (gnu packages zip) #:use-module (gnu packages perl) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gperf) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 18ce2ae4a4..34a08f6d84 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -51,7 +51,6 @@ #:use-module (gnu packages qt) #:use-module (gnu packages video) #:use-module (gnu packages compression) - #:use-module (gnu packages zip) #:use-module (gnu packages gl) #:use-module (gnu packages linux) #:use-module (gnu packages xorg) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2c5294737f..b706b57932 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -110,7 +110,6 @@ #:use-module (gnu packages compression) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages linux) - #:use-module (gnu packages zip) #:use-module (gnu packages xiph) #:use-module (gnu packages curl) #:use-module (gnu packages lua) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 7457809300..08f6187f8a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -44,7 +44,6 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix download) #:use-module (guix build utils) #:use-module (guix build-system gnu) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 34bd33813d..cef991d5f4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -132,7 +132,6 @@ #:use-module (gnu packages readline) #:use-module (gnu packages fonts) #:use-module (gnu packages qemu) - #:use-module (gnu packages zip) #:use-module (gnu packages speech) #:use-module (srfi srfi-1)) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 6809a696a0..37adc3bbd6 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -58,7 +58,6 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages zip) #:use-module (gnu packages readline)) (define-public mozjs diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4fa4033246..6c813e8a37 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -62,8 +62,7 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages video) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xorg)) (define-public blender (package diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index cf52068244..b23cd38f9e 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages aspell) #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages compression) #:use-module (gnu packages gawk) #:use-module (gnu packages gperf) #:use-module (gnu packages libffi) @@ -62,7 +63,6 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9d03e5600f..bafda1ced2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -46,7 +46,6 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix download) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index cce03eeeae..fdf3497fe6 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -55,7 +55,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7bdf97f98a..e81ee40d38 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -60,7 +60,6 @@ #:use-module (gnu packages kerberos) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (gnu packages texinfo) #:use-module ((srfi srfi-1) #:select (fold alist-delete)) #:use-module (srfi srfi-11) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 061d5f1b2e..c8a65af790 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -68,8 +68,7 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages assembly) - #:use-module (gnu packages zip)) + #:use-module (gnu packages assembly)) (define-public crossguid (let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4")) diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm index 5707b9476b..918843c077 100644 --- a/gnu/packages/ldc.scm +++ b/gnu/packages/ldc.scm @@ -35,8 +35,7 @@ #:use-module (gnu packages libedit) #:use-module (gnu packages llvm) #:use-module (gnu packages python) - #:use-module (gnu packages textutils) - #:use-module (gnu packages zip)) + #:use-module (gnu packages textutils)) (define-public rdmd (package diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 809e28e27b..bdbf3f850c 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -65,8 +65,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xorg)) (define-public ixion (package diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index cd883b23ec..4afe8c3c0e 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -26,10 +26,10 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build-system cmake) + #:use-module (gnu packages compression) #:use-module (gnu packages perl) #:use-module (gnu packages python) - #:use-module (gnu packages web) - #:use-module (gnu packages zip)) + #:use-module (gnu packages web)) (define-public hoedown (package diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 37e92b3cf4..41e6b259e9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -96,7 +96,6 @@ #:use-module (gnu packages tls) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) - #:use-module (gnu packages zip) #:use-module (srfi srfi-1)) (define-public aris diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm index bae12439f1..0770304a28 100644 --- a/gnu/packages/mc.scm +++ b/gnu/packages/mc.scm @@ -31,7 +31,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages check) #:use-module (gnu packages perl) - #:use-module (gnu packages zip)) + #:use-module (gnu packages compression)) (define-public mc (package diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index ac80a6bb9d..c136265c52 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -27,8 +27,7 @@ #:use-module (gnu packages gd) #:use-module (gnu packages image) #:use-module (gnu packages mail) - #:use-module (gnu packages perl) - #:use-module (gnu packages zip)) + #:use-module (gnu packages perl)) (define-public nagios (package diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 186dc276be..b40bbb002d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -105,7 +105,6 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xiph) - #:use-module (gnu packages zip) #:use-module ((srfi srfi-1) #:select (last))) (define-public aria-maestosa diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index b6f64bc0ef..7d569eef3e 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -44,7 +44,6 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index a11c34330d..8cee89dd49 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -37,7 +37,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages zip)) + #:use-module (gnu packages compression)) (define-public a2ps (package diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 87c4d84a87..775cab6948 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -110,7 +110,6 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages zip) #:use-module (gnu packages tcl) #:use-module (gnu packages bdw-gc) #:use-module (guix packages) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index eacfd733db..bcb715327c 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -59,7 +59,6 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages tls) #:use-module (gnu packages gl) - #:use-module (gnu packages zip) #:use-module (ice-9 match)) (define (mit-scheme-source-directory system version) diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index 675ca0ce5e..f4a50ded22 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -36,8 +37,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages xorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xorg)) (define-public smalltalk (package diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 91b91beae1..832b8dc7c5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -58,7 +58,6 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (srfi srfi-1)) diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index b971cbe3a9..79f7ca0816 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -25,10 +25,10 @@ #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages curl) + #:use-module (gnu packages compression) #:use-module (gnu packages python) #:use-module (gnu packages tls) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (srfi srfi-26)) (define-public synergy diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 21af9d7df4..eb69547a1c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -58,7 +58,6 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages zip) #:autoload (gnu packages texinfo) (texinfo) #:use-module (ice-9 ftw) #:use-module (ice-9 match) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 7bc2fc47fa..152d080599 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -38,14 +38,14 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages compression) #:use-module (gnu packages java) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages readline) - #:use-module (gnu packages slang) - #:use-module (gnu packages zip)) + #:use-module (gnu packages slang)) (define-public recode (package diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4acfb24220..ec81bc1a1e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -106,8 +106,7 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages assembly) - #:use-module (gnu packages zip)) + #:use-module (gnu packages assembly)) (define-public aalib (package diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index a10b1367ef..146f3a1fa2 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -39,7 +39,6 @@ #:use-module (gnu packages image) #:use-module (gnu packages tls) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index a6bea3588f..263c26e311 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -40,7 +40,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages tls) #:use-module (gnu packages web) - #:use-module (gnu packages zip) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm deleted file mode 100644 index 018891359b..0000000000 --- a/gnu/packages/zip.scm +++ /dev/null @@ -1,183 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. - -(define-module (gnu packages zip) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (gnu packages) - #:use-module (gnu packages compression) - #:use-module (gnu packages perl) - #:use-module (guix build-system perl) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python)) - -(define-public zip - (package - (name "zip") - (version "3.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz")) - (sha256 - (base32 - "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h")))) - (build-system gnu-build-system) - (inputs `(("bzip2" ,bzip2))) - (arguments - `(#:tests? #f ; no test target - #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "-f" "unix/Makefile" - (string-append "prefix=" out) - (string-append "MANDIR=" out "/share/man/man1"))) - #:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1)) - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda* (#:key (make-flags '()) #:allow-other-keys) - (zero? (apply system* "make" "generic_gcc" make-flags)))) - (delete 'configure)))) - (home-page "http://www.info-zip.org/Zip.html") - (synopsis "Compression and file packing utility") - (description - "Zip is a compression and file packaging/archive utility. Zip is useful -for packaging a set of files for distribution, for archiving files, and for -saving disk space by temporarily compressing unused files or directories. -Zip puts one or more compressed files into a single ZIP archive, along with -information about the files (name, path, date, time of last modification, -protection, and check information to verify file integrity). An entire -directory structure can be packed into a ZIP archive with a single command. - -Zip has one compression method (deflation) and can also store files without -compression. Zip automatically chooses the better of the two for each file. -Compression ratios of 2:1 to 3:1 are common for text files.") - (license (license:non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")))) - -(define-public unzip - (package (inherit zip) - (name "unzip") - (version "6.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz")) - (sha256 - (base32 - "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83")) - (patches (search-patches "unzip-CVE-2014-8139.patch" - "unzip-CVE-2014-8140.patch" - "unzip-CVE-2014-8141.patch" - "unzip-CVE-2014-9636.patch" - "unzip-CVE-2015-7696.patch" - "unzip-CVE-2015-7697.patch" - "unzip-allow-greater-hostver-values.patch" - "unzip-initialize-symlink-flag.patch" - "unzip-remove-build-date.patch" - "unzip-attribs-overflow.patch" - "unzip-overflow-on-invalid-input.patch" - "unzip-format-secure.patch" - "unzip-overflow-long-fsize.patch")))) - (build-system gnu-build-system) - ;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO - (arguments - `(#:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key make-flags #:allow-other-keys) - (zero? (apply system* "make" - `("-j" ,(number->string - (parallel-job-count)) - ,@make-flags - "generic_gcc")))))) - #:make-flags (list "-f" "unix/Makefile" - (string-append "prefix=" %output) - (string-append "MANDIR=" %output "/share/man/man1")))) - (home-page "http://www.info-zip.org/UnZip.html") - (synopsis "Decompression and file extraction utility") - (description - "UnZip is an extraction utility for archives compressed in .zip format, -also called \"zipfiles\". - -UnZip lists, tests, or extracts files from a .zip archive. The default -behaviour (with no options) is to extract into the current directory, and -subdirectories below it, all files from the specified zipfile. UnZip -recreates the stored directory structure by default.") - (license (license:non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")))) - -(define-public zziplib - (package - (name "zziplib") - (version "0.13.62") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/zziplib/zziplib13/" - version "/zziplib-" - version ".tar.bz2")) - (patches (search-patches "zziplib-CVE-2017-5974.patch" - "zziplib-CVE-2017-5975.patch" - "zziplib-CVE-2017-5976.patch" - "zziplib-CVE-2017-5978.patch" - "zziplib-CVE-2017-5979.patch" - "zziplib-CVE-2017-5981.patch")) - (sha256 - (base32 - "0nsjqxw017hiyp524p9316283jlf5piixc1091gkimhz38zh7f51")))) - (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib))) - (native-inputs `(("perl" ,perl) ; for the documentation - ("pkg-config" ,pkg-config) - ("python" ,python-2) ; for the documentation; Python 3 not supported, - ; http://forums.gentoo.org/viewtopic-t-863161-start-0.html - ("zip" ,zip))) ; to create test files - (arguments - `(#:parallel-tests? #f)) ; since test files are created on the fly - (home-page "http://zziplib.sourceforge.net/") - (synopsis "Library for accessing zip files") - (description - "ZZipLib is a library based on zlib for accessing zip files.") - (license license:lgpl2.0+))) - - -(define-public perl-zip - (package - (name "perl-zip") - (version "1.59") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/A/AD/ADAMK/Archive-Zip-" - version ".tar.gz")) - (sha256 - (base32 - "0m31qlppg65vh32pwxkwjby02q70abx49d2yk6vfd4585fqb27cx")))) - (build-system perl-build-system) - (synopsis "Provides an interface to ZIP archive files") - (description "The Archive::Zip module allows a Perl program to create, -manipulate, read, and write Zip archive files.") - (home-page "http://search.cpan.org/~adamk/Archive-Zip-1.30/") - (license license:perl-license))) diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 228b4e60d2..e0870a605c 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -58,7 +58,7 @@ (define (default-zip) "Return the default ZIP package." ;; Lazily resolve the binding to avoid a circular dependency. - (let ((zip-mod (resolve-interface '(gnu packages zip)))) + (let ((zip-mod (resolve-interface '(gnu packages compression)))) (module-ref zip-mod 'zip))) (define* (lower name diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index f448c302c2..d40a4985f8 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -56,13 +56,13 @@ '()) ,@inputs ,(list "tar" (module-ref (resolve-interface '(gnu packages base)) 'tar)) - ,(list "unzip" (module-ref (resolve-interface '(gnu packages zip)) 'unzip)) ,@(let ((compression (resolve-interface '(gnu packages compression)))) (map (match-lambda ((name package) (list name (module-ref compression package)))) `(("gzip" gzip) ("bzip2" bzip2) + ("unzip" unzip) ("xz" xz)))))) (build-inputs native-inputs) (outputs outputs) diff --git a/guix/download.scm b/guix/download.scm index bed1f502cf..c1da515477 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -528,7 +528,7 @@ own. This helper makes it easier to deal with \"zip bombs\"." (_ (basename url)))) (define unzip - (module-ref (resolve-interface '(gnu packages zip)) 'unzip)) + (module-ref (resolve-interface '(gnu packages compression)) 'unzip)) (mlet %store-monad ((drv (url-fetch url hash-algo hash (string-append "zipbomb-" diff --git a/guix/packages.scm b/guix/packages.scm index 76aa43e7d3..464fc433b2 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -401,7 +401,7 @@ object." ("bzip2" ,(ref '(gnu packages compression) 'bzip2)) ("gzip" ,(ref '(gnu packages compression) 'gzip)) ("lzip" ,(ref '(gnu packages compression) 'lzip)) - ("unzip" ,(ref '(gnu packages zip) 'unzip)) + ("unzip" ,(ref '(gnu packages compression) 'unzip)) ("patch" ,(ref '(gnu packages base) 'patch)) ("locales" ,(ref '(gnu packages base) 'glibc-utf8-locales))))) diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in index 749bd1b24e..1eafdcb4b8 100644 --- a/po/packages/POTFILES.in +++ b/po/packages/POTFILES.in @@ -57,4 +57,3 @@ gnu/packages/webkit.scm gnu/packages/web.scm gnu/packages/wordnet.scm gnu/packages/xiph.scm -gnu/packages/zip.scm |