diff options
Diffstat (limited to 'pkgs/tools/compression')
25 files changed, 38 insertions, 29 deletions
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index b57e3f6806f30..a3d61f615b9d6 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A set of tools to optimize deflate-compressed files"; + description = "Set of tools to optimize deflate-compressed files"; license = licenses.gpl3 ; maintainers = [ maintainers.raskin ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 60429f435ec66..94ed992812e57 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/google/brotli"; - description = "A generic-purpose lossless compression algorithm and tool"; + description = "Generic-purpose lossless compression algorithm and tool"; longDescription = '' Brotli is a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 6db5d99246771..e5be1e515b5ae 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An efficient binary diff/patch tool"; + description = "Efficient binary diff/patch tool"; homepage = "https://www.daemonology.net/bsdiff/"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index bfab2dbb94670..0268b60afc52c 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -25,7 +25,7 @@ in { patches = [ (fetchurl { - url = "https://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6.2-autoconfiscated.patch"; + url = "ftp://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6.2-autoconfiscated.patch"; sha256 = "sha256-QMufl6ffJVVVVZespvkCbFpB6++R1lnq1687jEsUjr0="; }) ]; diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index 135b253229ad1..92ddefdb86622 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - description = "A better and stronger spiritual successor to BZip2"; + description = "Better and stronger spiritual successor to BZip2"; homepage = "https://github.com/kspalaiologos/bzip3"; changelog = "https://github.com/kspalaiologos/bzip3/blob/${finalAttrs.src.rev}/NEWS"; license = lib.licenses.lgpl3Plus; diff --git a/pkgs/tools/compression/crabz/default.nix b/pkgs/tools/compression/crabz/default.nix index f8668fbbd2fea..bbdbdacadc793 100644 --- a/pkgs/tools/compression/crabz/default.nix +++ b/pkgs/tools/compression/crabz/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - description = "A cross platform, fast, compression and decompression tool"; + description = "Cross platform, fast, compression and decompression tool"; homepage = "https://github.com/sstadick/crabz"; changelog = "https://github.com/sstadick/crabz/blob/v${version}/CHANGELOG.md"; license = with licenses; [ unlicense /* or */ mit ]; diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/tools/compression/flips/default.nix index e061459ece269..d697a10fad62d 100644 --- a/pkgs/tools/compression/flips/default.nix +++ b/pkgs/tools/compression/flips/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, libdivsufsort, pkg-config, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, gtk3, libdivsufsort, pkg-config, wrapGAppsHook3 }: stdenv.mkDerivation { pname = "flips"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { hash = "sha256-uuHgpt7aWqiMTUILm5tAEGGeZrls3g/DdylYQgsfpTw="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk3 libdivsufsort ]; patches = [ ./use-system-libdivsufsort.patch ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A patcher for IPS and BPS files"; + description = "Patcher for IPS and BPS files"; homepage = "https://github.com/Alcaro/Flips"; license = licenses.gpl3Plus; maintainers = [ ]; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index baff7f0303874..05539050861f3 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,7 +1,9 @@ { lib, stdenv , fetchurl , makeWrapper +, updateAutotoolsGnuConfigScriptsHook , xz +, runtimeShellPackage }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -22,7 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ xz.bin makeWrapper ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook makeWrapper ]; + buildInputs = [ runtimeShellPackage ]; makeFlags = [ "SHELL=/bin/sh" diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix index 59d87cf4f3417..9dc85fa6f94b9 100644 --- a/pkgs/tools/compression/gzrt/default.nix +++ b/pkgs/tools/compression/gzrt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; - description = "The gzip Recovery Toolkit"; + description = "Gzip Recovery Toolkit"; maintainers = with maintainers; [ ]; mainProgram = "gzrecover"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index 11adbe3ced1b9..cab59ebde556b 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/SciresM/hactool"; - description = "A tool to manipulate common file formats for the Nintendo Switch"; + description = "Tool to manipulate common file formats for the Nintendo Switch"; longDescription = "A tool to view information about, decrypt, and extract common file formats for the Nintendo Switch, especially Nintendo Content Archives"; license = licenses.isc; maintainers = with maintainers; [ ivar ]; diff --git a/pkgs/tools/compression/heatshrink/default.nix b/pkgs/tools/compression/heatshrink/default.nix index d18f82ef21fad..b7508030f9cc4 100644 --- a/pkgs/tools/compression/heatshrink/default.nix +++ b/pkgs/tools/compression/heatshrink/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "A data compression/decompression library for embedded/real-time systems"; + description = "Data compression/decompression library for embedded/real-time systems"; homepage = "https://github.com/atomicobject/heatshrink"; license = licenses.isc; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index bde65af03e907..9da423396593b 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A tool that aggressively optimizes the sizes of Zip archives"; + description = "Tool that aggressively optimizes the sizes of Zip archives"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 3bb1e29f03477..bca4bdd2a31f2 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://ck.kolivas.org/apps/lrzip/"; - description = "The CK LRZIP compression program (LZMA + RZIP)"; + description = "CK LRZIP compression program (LZMA + RZIP)"; maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index e5f104a9aef2d..3f37f781041e6 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/lzfse/lzfse"; - description = "a reference C implementation of the LZFSE compressor"; + description = "Reference C implementation of the LZFSE compressor"; longDescription = '' This is a reference C implementation of the LZFSE compressor introduced in the Compression library with OS X 10.11 and iOS 9. LZFSE is a Lempel-Ziv style data compression algorithm using Finite State Entropy coding. diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 82052bab6e3d1..80d247fbc9cea 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.nongnu.org/lzip/lzip.html"; - description = "A lossless data compressor based on the LZMA algorithm"; + description = "Lossless data compressor based on the LZMA algorithm"; license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ vlaci ]; platforms = lib.platforms.all; diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 64061647667a4..887ae94e5c994 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = "http://www.lzop.org"; description = "Fast file compressor"; maintainers = with maintainers; [ ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; mainProgram = "lzop"; }; diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index c4678cd960210..bb8084ac013a6 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://ncompress.sourceforge.net/"; license = licenses.publicDomain; - description = "A fast, simple LZW file compressor"; + description = "Fast, simple LZW file compressor"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/offzip/default.nix b/pkgs/tools/compression/offzip/default.nix index e756d42572642..3ec2165c703b4 100644 --- a/pkgs/tools/compression/offzip/default.nix +++ b/pkgs/tools/compression/offzip/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A tool to unpack the zip data contained in any type of file"; + description = "Tool to unpack the zip data contained in any type of file"; homepage = "https://aluigi.altervista.org/mytoolz.htm#offzip"; license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ r-burns ]; diff --git a/pkgs/tools/compression/orz/default.nix b/pkgs/tools/compression/orz/default.nix index b760b0132ef75..1520a76365dab 100644 --- a/pkgs/tools/compression/orz/default.nix +++ b/pkgs/tools/compression/orz/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A high performance, general purpose data compressor written in rust"; + description = "High performance, general purpose data compressor written in rust"; homepage = "https://github.com/richox/orz"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/tools/compression/ouch/default.nix index 42ae945aeea03..2db0c25c440ba 100644 --- a/pkgs/tools/compression/ouch/default.nix +++ b/pkgs/tools/compression/ouch/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { env.OUCH_ARTIFACTS_FOLDER = "artifacts"; meta = with lib; { - description = "A command-line utility for easily compressing and decompressing files and directories"; + description = "Command-line utility for easily compressing and decompressing files and directories"; homepage = "https://github.com/ouch-org/ouch"; changelog = "https://github.com/ouch-org/ouch/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index 81144fb14b193..6bf83bd718fc9 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://compression.ca/pbzip2/"; - description = "A parallel implementation of bzip2 for multi-core machines"; + description = "Parallel implementation of bzip2 for multi-core machines"; license = licenses.bsd2; maintainers = with maintainers; [viric]; platforms = platforms.unix; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 79363eecade35..6e9decb1b710a 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zlib.net/pigz/"; - description = "A parallel implementation of gzip for multi-core machines"; + description = "Parallel implementation of gzip for multi-core machines"; maintainers = with maintainers; [ ]; license = licenses.zlib; platforms = platforms.unix; diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index 9eb1d6539cdf9..4e221ae18fc93 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A parallel compressor/decompressor for xz format"; + description = "Parallel compressor/decompressor for xz format"; license = licenses.bsd2; maintainers = [ maintainers.raskin ]; platforms = platforms.unix; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 3a2c6394f90a9..280e1425ef537 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "upx"; - version = "4.2.3"; + version = "4.2.4"; src = fetchFromGitHub { owner = "upx"; repo = "upx"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-3+aOadTqQ1apnrXt2I27j8P6iJF96W90YjxVTPmRhs0="; + hash = "sha256-r36BD5f/sQSz3GjvreOptc7atIaaBZKpU+7qm+BKLss="; }; nativeBuildInputs = [ cmake ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://upx.github.io/"; - description = "The Ultimate Packer for eXecutables"; + description = "Ultimate Packer for eXecutables"; changelog = "https://github.com/upx/upx/blob/${finalAttrs.src.rev}/NEWS"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 4431a178ac02f..e5d2fd267a611 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; doCheck = true; + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + postPatch = '' + substituteInPlace ./build-aux/config.guess --replace-fail /usr/bin/uname uname + ''; + preCheck = '' # Tests have a /bin/sh dependency... patchShebangs tests @@ -60,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://tukaani.org/xz/"; - description = "A general-purpose data compression software, successor of LZMA"; + description = "General-purpose data compression software, successor of LZMA"; longDescription = '' XZ Utils is free general-purpose data compression software with high |