From 8394619baceb118df92e355377fd543bb1aa501a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Dec 2021 17:18:24 +0100 Subject: gnu: Simplify package inputs. This commit was obtained by running: ./pre-inst-env guix style without any additional argument. --- gnu/packages/compression.scm | 130 +++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 78 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 5fe559e294..17f6c276b4 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -169,10 +169,8 @@ in compression.") (delete-file (string-append out "/include/minizip/crypt.h")) #t)))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) - (propagated-inputs `(("zlib" ,zlib))) + (list autoconf automake libtool)) + (propagated-inputs (list zlib)) (home-page (package-home-page zlib)) (synopsis "Zip Compression library") (description @@ -193,7 +191,7 @@ the @code{zlib} source.") (base32 "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi")))) (build-system gnu-build-system) - (inputs `(("zlib" ,zlib))) + (inputs (list zlib)) (home-page "https://savannah.nongnu.org/projects/fastjar") (synopsis "Replacement for Sun's 'jar' utility") (description @@ -221,11 +219,9 @@ the @code{zlib} source.") (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) + (list autoconf automake libtool)) (inputs - `(("zlib" ,zlib))) + (list zlib)) (synopsis "C library for manipulating POSIX tar files") (description "libtar is a C library for manipulating POSIX tar files. It handles @@ -466,7 +462,7 @@ compatible with bzip2 – both at file format and command line level.") "1rnvgcdixjzbrmcr1nv9b6ccrjfrhryaj7jwz28yxxv6lam3xlcg")))) (build-system gnu-build-system) (inputs - `(("bzip2" ,bzip2))) + (list bzip2)) (arguments `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases @@ -550,7 +546,7 @@ than gzip and 15 % smaller output than bzip2.") (search-input-directory inputs "share/zoneinfo"))))))) (native-inputs - `(("tzdata" ,tzdata-for-tests))) + (list tzdata-for-tests)) (home-page "https://fragglet.github.com/lhasa/") (synopsis "LHA archive decompressor") (description "Lhasa is a replacement for the Unix LHA tool, for @@ -600,7 +596,7 @@ format are designed to be portable across platforms.") (base32 "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky")))) (build-system gnu-build-system) - (inputs `(("lzo" ,lzo))) + (inputs (list lzo)) (home-page "https://www.lzop.org/") (synopsis "Compress or expand files") (description @@ -696,7 +692,7 @@ decompressors when faced with corrupted input.") (string-append "extern " all))))))) (build-system gnu-build-system) (native-inputs - `(("which" ,which))) + (list which)) (arguments `(#:phases (modify-phases %standard-phases @@ -739,7 +735,7 @@ This package is mostly for compatibility and historical interest.") (("/usr/local") (assoc-ref outputs "out"))) #t))))) (inputs - `(("zlib" ,zlib))) + (list zlib)) (home-page "https://github.com/raboof/sfArkLib") (synopsis "Library for SoundFont decompression") (description @@ -775,8 +771,7 @@ with the sfArk algorithm.") (("/usr/local") (assoc-ref outputs "out"))) #t))))) (inputs - `(("zlib" ,zlib) - ("sfarklib" ,sfarklib))) + (list zlib sfarklib)) (home-page "https://github.com/raboof/sfarkxtc") (synopsis "Basic sfArk decompressor") (description "SfArk extractor converts SoundFonts in the compressed legacy @@ -818,9 +813,8 @@ decompression of some loosely related file formats used by Microsoft.") (build-system gnu-build-system) (outputs (list "out" "static")) (native-inputs - `(;; For tests. - ("python" ,python) - ("valgrind" ,valgrind))) + (list ;; For tests. + python valgrind)) (arguments `(;; Not designed for parallel testing. ;; See https://github.com/lz4/lz4/issues/957#issuecomment-737419821 @@ -936,10 +930,7 @@ This package allows you to create and extract such file systems.") `(#:configure-flags (list "--disable-static"))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config))) + (list autoconf automake libtool pkg-config)) (inputs `(("libselinux" ,libselinux) @@ -1009,7 +1000,7 @@ byte-for-byte identical output.") #:make-flags (list ,(string-append "CC=" (cc-for-target))) #:test-target "tests")) - (inputs `(("zlib" ,zlib))) + (inputs (list zlib)) (home-page "https://zlib.net/pigz/") (synopsis "Parallel implementation of gzip") (description @@ -1034,8 +1025,7 @@ multiple processors and multiple cores when compressing data.") "1ifxr18f2h75gkcrkx8033kwmwmrcgxshpaawyc2n4dzn1p2rqz5")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("libarchive" ,libarchive))) + (list pkg-config libarchive)) (home-page "https://github.com/vasi/pixz") (synopsis "Parallel indexing implementation of LZMA") (description @@ -1081,7 +1071,7 @@ tarballs.") (delete-file-recursively dir-name) #t)))))) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs `(("libmspack" ,libmspack) ("libmspack-source" ,(package-source libmspack)))) @@ -1106,17 +1096,15 @@ tarballs.") (base32 "18qkyg19r7fxzv93kar5n808n3582ygjmqwa7rnyg5y4b6hnwihl")))) (build-system meson-build-system) (native-inputs - `(("gobject-introspection" ,gobject-introspection) - ("help2man" ,help2man) - ("pkg-config" ,pkg-config))) + (list gobject-introspection help2man pkg-config)) (inputs - `(("git" ,git) - ("glib" ,glib) - ("gnupg" ,gnupg) - ("gnutls" ,gnutls) - ("gpgme" ,gpgme) - ("json-glib" ,json-glib) - ("vala" ,vala))) + (list git + glib + gnupg + gnutls + gpgme + json-glib + vala)) (home-page "https://github.com/hughsie/libjcat") (synopsis "Library for reading and writing Jcat files") (description @@ -1146,8 +1134,7 @@ file.") #t)))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake))) + (list autoconf automake)) (arguments `(#:phases (modify-phases %standard-phases @@ -1182,10 +1169,7 @@ human-readable output.") '()) ("perl" ,perl))) (inputs - `(("bzip2" ,bzip2) - ("lz4" ,lz4) - ("lzo" ,lzo) - ("zlib" ,zlib))) + (list bzip2 lz4 lzo zlib)) (home-page "http://ck.kolivas.org/apps/lrzip/") (synopsis "Large file compressor with a very high compression ratio") (description "lrzip is a compression utility that uses long-range @@ -1295,8 +1279,7 @@ for most inputs, but the resulting compressed files are anywhere from 20% to (native-inputs `(("clang" ,clang-toolchain-6))) (inputs - `(("libcxx+libcxxabi" ,libcxx+libcxxabi-6) - ("libcxxabi" ,libcxxabi-6))))) + (list libcxx+libcxxabi-6 libcxxabi-6)))) (define-public p7zip (package @@ -1404,7 +1387,7 @@ handles the 7z format which features very high compression ratios.") (install-file "libgzstream.a" lib) (install-file "gzstream.h" include) #t)))))) - (propagated-inputs `(("zlib" ,zlib))) + (propagated-inputs (list zlib)) (home-page "http://www.cs.unc.edu/Research/compgeom/gzstream/") (synopsis "Compressed C++ iostream") (description "gzstream is a small library for providing zlib @@ -1454,7 +1437,7 @@ functionality in a C++ iostream.") (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (native-inputs - `(("perl" ,perl))) ; for pod2man + (list perl)) ; for pod2man (home-page "http://mattmahoney.net/dc/zpaq.html") (synopsis "Incremental journaling archiver") (description "ZPAQ is a command-line archiver for realistic situations with @@ -1518,7 +1501,7 @@ or junctions, and always follows hard links.") (base32 "1k5cw6vnpja8yjlnhx5124xrw9i8s1l539hfdqqrqz3l5gn0bnyd")) (file-name "unshield-the-feeble-files-spanish.zip"))))) (native-inputs - `(("unzip" ,unzip))) + (list unzip)) (arguments `(#:out-of-source? #f #:phases @@ -1710,7 +1693,7 @@ the actual decompression, the other input and output.") (base32 "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h")))) (build-system gnu-build-system) - (inputs `(("bzip2" ,bzip2))) + (inputs (list bzip2)) (arguments `(#:tests? #f ; no test target #:make-flags (let ((out (assoc-ref %outputs "out"))) @@ -1889,11 +1872,9 @@ timestamps in the file header with a fixed time (1 January 2008). "0i6bpa2b13z19alm6ig80364dnin1w28cvif18k6wkkb0w3dzp8y")))) (build-system cmake-build-system) (inputs - `(("zlib" ,zlib))) - (native-inputs `(("perl" ,perl) ; for the documentation - ("pkg-config" ,pkg-config) - ("python" ,python) - ("zip" ,zip))) ; to create test files + (list zlib)) + (native-inputs (list perl ; for the documentation + pkg-config python zip)) ; to create test files (synopsis "Library for accessing zip files") (description "ZZipLib is a library based on zlib for accessing zip files.") @@ -1913,8 +1894,7 @@ timestamps in the file header with a fixed time (1 January 2008). (base32 "0zn9vaiwy2izj8cnm8i7c2mbdn38n328grqb8f07x55s4kd3nxph")))) (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config))) + (list perl pkg-config)) (inputs `(("gnutls" ,gnutls) ("liblzma" ,xz) @@ -1954,8 +1934,7 @@ archive can be reverted.") "/bin/file'"))) #t))))) (inputs - `(("perl" ,perl) - ("file" ,file))) + (list perl file)) (home-page "https://www.nongnu.org/atool/") (synopsis "Universal tool to manage file archives of various types") (description "The main command is @command{aunpack} which extracts files @@ -2059,7 +2038,7 @@ corrupted input.") (base32 "19zinpx7hssl6r3vilpvq2s7wha3545xan8b0vcvsxnyipdx3n0l")))) (build-system gnu-build-system) (inputs - `(("lzlib" ,lzlib))) + (list lzlib)) (home-page "https://www.nongnu.org/lzip/plzip.html") (synopsis "Parallel lossless data compressor for the lzip format") (description @@ -2091,10 +2070,8 @@ single-member files which can't be decompressed in parallel.") (build-system cmake-build-system) (arguments `(#:tests? #f)) - (inputs `(("boost" ,boost) - ("libiconv" ,libiconv) - ("xz" ,xz))) - (native-inputs `(("pkg-config" ,pkg-config))) + (inputs (list boost libiconv xz)) + (native-inputs (list pkg-config)) (home-page "https://constexpr.org/innoextract/") (synopsis "Tool for extracting Inno Setup installers") (description "innoextract allows extracting Inno Setup installers under @@ -2210,10 +2187,9 @@ decompression is a little bit slower.") (patches (search-patches "upx-CVE-2021-20285.patch")))) (build-system gnu-build-system) (native-inputs - `(("perl" ,perl))) + (list perl)) (inputs - `(("ucl" ,ucl) - ("zlib" ,zlib))) + (list ucl zlib)) (arguments `(#:make-flags (list "all") @@ -2260,10 +2236,9 @@ download times, and other distribution and storage costs.") (arguments `(#:tests? #f)) ;no test (native-inputs - `(("doxygen" ,doxygen))) + (list doxygen)) (inputs - `(("qtbase" ,qtbase-5) - ("zlib" ,zlib))) + (list qtbase-5 zlib)) (home-page "https://stachenov.github.io/quazip/index.html") (synopsis "Qt/C++ wrapper for Minizip") (description "QuaZIP is a simple C++ wrapper over Gilles Vollant's @@ -2318,10 +2293,9 @@ reading from and writing to ZIP archives. ") (string-append (assoc-ref inputs "zstd") "/bin/zstd")))))))) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("curl" ,curl) - ("zstd" ,zstd))) + (list curl zstd)) (propagated-inputs `(("zstd:lib" ,zstd "lib"))) ;in Requires.private of zck.pc (home-page "https://github.com/zchunk/zchunk") @@ -2378,7 +2352,7 @@ To download a zchunk file. make-flags)))))) (native-inputs ;; Needed to extract the source tarball and run the test suite. - `(("lzip" ,lzip))) + (list lzip)) (home-page "https://www.nongnu.org/zutils/zutils.html") (synopsis "Utilities that transparently operate on compressed files") (description @@ -2494,8 +2468,8 @@ file compression algorithm.") ("libxslt" ,libxslt) ("pkg-config" ,pkg-config))) (inputs - `(("adwaita-icon-theme" ,adwaita-icon-theme) ; hard-coded theme - ("gtk+" ,gtk+))) + (list adwaita-icon-theme ; hard-coded theme + gtk+)) (home-page "https://github.com/ib/xarchiver") (synopsis "Graphical front-end for archive operations") (description "Xarchiver is a front-end to various command line archiving @@ -2633,7 +2607,7 @@ to their original, binary CD format.") (modify-phases %standard-phases (delete 'configure)))) (inputs - `(("zlib" ,zlib))) + (list zlib)) (home-page "https://github.com/ebiggers/libdeflate") (synopsis "Library for DEFLATE/zlib/gzip compression and decompression") (description "Libdeflate is a library for fast, whole-buffer DEFLATE-based @@ -2660,9 +2634,9 @@ compression and decompression. The supported formats are: (base32 "1x5dw03lcwfigcv97cg70gkbkfycjmv1012s9lwnl4izvl9235qg")))) (build-system gnu-build-system) (native-inputs - `(("lzip" ,lzip))) + (list lzip)) (inputs - `(("lzlib" ,lzlib))) + (list lzlib)) (home-page "https://www.nongnu.org/lzip/tarlz.html") (synopsis "Combination of the tar archiver and the lzip compressor") (description -- cgit v1.2.3