diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index f4f0ac41563a3..59ee89614fb07 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v" + version; + rev = "v${version}"; sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; @@ -22,8 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; }); - cmakeFlags = [] - ++ stdenv.lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; + cmakeFlags = stdenv.lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; outputs = [ "out" "dev" "lib" ]; @@ -52,9 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; - description = "A 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 @@ -67,7 +64,6 @@ stdenv.mkDerivation rec { in the following internet draft: http://www.ietf.org/id/draft-alakuijala-brotli ''; - license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; platforms = platforms.all; diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index 384cbfc3839bf..5f07f053099f5 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, openmp ? null }: +{ stdenv, fetchFromGitHub, openmp ? null }: stdenv.mkDerivation rec { pname = "bsc"; version = "3.1.0"; - src = fetchurl { - url = "https://github.com/IlyaGrebnov/libbsc/archive/${version}.tar.gz"; - sha256 = "01yhizaf6qjv1plyrx0fcib264maa5qwvgfvvid9rzlzj9fxjib6"; + src = fetchFromGitHub { + owner = "IlyaGrebnov"; + repo = "libbsc"; + rev = version; + sha256 = "0c0jmirh9y23kyi1jnrm13sa3xsjn54jazfr84ag45pai279fciz"; }; enableParallelBuilding = true; @@ -14,13 +16,10 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin openmp; prePatch = '' - substituteInPlace makefile \ - --replace 'g++' '$(CXX)' + substituteInPlace makefile --replace 'g++' '$(CXX)' ''; - preInstall = '' - makeFlagsArray+=("PREFIX=$out") - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "High performance block-sorting data compression library"; diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index a5b527d70b7fd..e05d32d740c8c 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -5,12 +5,11 @@ stdenv.mkDerivation rec { version = "4.3"; src = fetchurl { - url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; + url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; buildInputs = [ bzip2 ]; - patches = [ ./include-systypes.patch ]; buildPhase = '' $CC -O3 -lbz2 bspatch.c -o bspatch @@ -20,18 +19,15 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 - - cp bsdiff $out/bin - cp bspatch $out/bin - cp bsdiff.1 $out/share/man/man1 - cp bspatch.1 $out/share/man/man1 + cp {bsdiff,bspatch} $out/bin + cp {bsdiff.1,bspatch.1} $out/share/man/man1 ''; - meta = { + meta = with stdenv.lib; { description = "An efficient binary diff/patch tool"; - homepage = "http://www.daemonology.net/bsdiff"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + homepage = "http://www.daemonology.net/bsdiff"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/compression/bsdiff/include-systypes.patch b/pkgs/tools/compression/bsdiff/include-systypes.patch deleted file mode 100644 index d070a8bb0f856..0000000000000 --- a/pkgs/tools/compression/bsdiff/include-systypes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/bspatch.c b/bspatch.c -index 643c60b..543379c 100644 ---- a/bspatch.c -+++ b/bspatch.c -@@ -28,6 +28,7 @@ - __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:06 cperciva Exp $"); - #endif - -+#include - #include - #include - #include diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix index 7520fc824c01b..560bf325c3092 100644 --- a/pkgs/tools/compression/dejsonlz4/default.nix +++ b/pkgs/tools/compression/dejsonlz4/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchFromGitHub }: + stdenv.mkDerivation rec { - pname = "dejsonlz4"; - version = "1.1"; - src = fetchFromGitHub { - owner = "avih"; - repo = pname; - rev = "v${version}"; - sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; - }; + pname = "dejsonlz4"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "avih"; + repo = pname; + rev = "v${version}"; + sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; + }; - buildPhase = '' - gcc -Wall -o dejsonlz4 src/dejsonlz4.c src/lz4.c - ''; + buildPhase = '' + gcc -Wall -o dejsonlz4 src/dejsonlz4.c src/lz4.c + ''; - installPhase = '' - mkdir -p $out/bin/ - cp dejsonlz4 $out/bin/ - ''; + installPhase = '' + mkdir -p $out/bin/ + cp dejsonlz4 $out/bin/ + ''; - meta = with stdenv.lib; { - description = "Decompress Mozilla Firefox bookmarks backup files"; - homepage = "https://github.com/avih/dejsonlz4"; - license = licenses.bsd2; - maintainers = with maintainers; [ mt-caret ]; - platforms = platforms.linux; - }; - } + meta = with stdenv.lib; { + description = "Decompress Mozilla Firefox bookmarks backup files"; + homepage = "https://github.com/avih/dejsonlz4"; + license = licenses.bsd2; + maintainers = with maintainers; [ mt-caret ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix index 4367f4b6d61f3..5a31328a3fe05 100644 --- a/pkgs/tools/compression/gzrt/default.nix +++ b/pkgs/tools/compression/gzrt/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "gzrt-0.8"; + pname = "gzrt"; + version = "0.8"; src = fetchurl { - url = "https://www.urbanophile.com/arenn/coding/gzrt/${name}.tar.gz"; + url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${version}.tar.gz"; sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh"; }; @@ -15,10 +16,10 @@ stdenv.mkDerivation rec { cp gzrecover $out/bin ''; - meta = { + meta = with stdenv.lib; { homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; description = "The gzip Recovery Toolkit"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index f68b0cdc751a2..322be4be07166 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -1,25 +1,25 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, autoPatchelfHook }: -stdenv.mkDerivation { - name = "kzipmix-20091108"; +stdenv.mkDerivation rec { + pname = "kzipmix"; + version = "20200115"; src = fetchurl { - url = "http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz"; - sha256 = "19gyn8pblffdz1bf3xkbpzx8a8wn3xb0v411pqzmz5g5l6pm5gph"; + url = "https://www.jonof.id.au/files/kenutils/kzipmix-${version}-linux.tar.gz"; + sha256 = "086z8jzl56dk0hwgaj3vwy6n924xrgvwayiwvzwl1z7s81xk5y3q"; }; + nativeBuildInputs = [ autoPatchelfHook ]; + installPhase = '' mkdir -p $out/bin - cp kzip zipmix $out/bin - - patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip - patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix + cp amd64/{kzip,zipmix} $out/bin ''; - meta = { + meta = with stdenv.lib; { description = "A tool that aggressively optimizes the sizes of Zip archives"; - license = stdenv.lib.licenses.unfree; - homepage = "http://advsys.net/ken/utils.htm"; - maintainers = [ stdenv.lib.maintainers.sander ]; + homepage = "https://www.jonof.id.au/kenutils.html"; + license = licenses.unfree; + maintainers = [ maintainers.sander ]; }; } diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index 99d41c06ec647..d0a87777f09c7 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }: stdenv.mkDerivation rec { + pname = "lbzip2"; version = "2.5"; - name = "lbzip2-${version}"; src = fetchFromGitHub { owner = "kjn"; repo = "lbzip2"; - sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; rev = "v${version}"; + sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; }; buildInputs = [ gnulib perl ]; diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix index edf42266acdb1..0c8e39c057ff0 100644 --- a/pkgs/tools/compression/lhasa/default.nix +++ b/pkgs/tools/compression/lhasa/default.nix @@ -1,21 +1,24 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "lhasa"; + version = "0.3.1"; -stdenv.mkDerivation { - name = "lhasa-0.3.1"; src = fetchurl { - url = "https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz"; + url = "https://soulsphere.org/projects/lhasa/lhasa-${version}.tar.gz"; sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z"; }; - meta = { + + meta = with stdenv.lib; { description = "Free Software replacement for the Unix LHA tool"; longDescription = '' Lhasa is a Free Software replacement for the Unix LHA tool, for decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for the tool is a library, so that it can be reused for other purposes. ''; - license = stdenv.lib.licenses.isc; + license = licenses.isc; homepage = "http://fragglet.github.io/lhasa"; - maintainers = with stdenv.lib; [ maintainers.sander ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = [ maintainers.sander ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index aaddb6299c4bc..7b3f10fefe7f7 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}: +{ stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl }: stdenv.mkDerivation rec { version = "0.631"; @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d"; }; - buildInputs = [ zlib lzo bzip2 nasm perl ]; + nativeBuildInputs = [ nasm perl ]; + buildInputs = [ zlib lzo bzip2 ]; - meta = { + meta = with stdenv.lib; { homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; - license = stdenv.lib.licenses.gpl2Plus; - inherit version; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/lrzip/default.upstream b/pkgs/tools/compression/lrzip/default.upstream deleted file mode 100644 index 1b83459863745..0000000000000 --- a/pkgs/tools/compression/lrzip/default.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url http://ck.kolivas.org/apps/lrzip/ -version_link '[.]tar[.]bz2$' - -do_overwrite () { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 48645942038ff..4c7badb9db8ed 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -1,9 +1,11 @@ -{stdenv, fetchurl, lzo}: +{ stdenv, fetchurl, lzo }: stdenv.mkDerivation rec { - name = "lzop-1.04"; + pname = "lzop"; + version = "1.04"; + src = fetchurl { - url = "https://www.lzop.org/download/${name}.tar.gz"; + url = "https://www.lzop.org/download/lzop-${version}.tar.gz"; sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky"; }; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 07c7bf95607dd..1a70662dc22af 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,31 +1,27 @@ -{ stdenv, fetchurl, zlib, util-linux }: +{ stdenv, fetchurl, zlib, utillinux }: -let name = "pigz"; - version = "2.4"; -in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + pname = "pigz"; + version = "2.4"; src = fetchurl { - url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; + url = "https://www.zlib.net/pigz/pigz-${version}.tar.gz"; sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54"; }; enableParallelBuilding = true; - buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux util-linux; + buildInputs = [ zlib ] ++ stdenv.lib.optional stdenv.isLinux utillinux; makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ]; doCheck = stdenv.isLinux; checkTarget = "tests"; - installPhase = - '' - install -Dm755 pigz "$out/bin/pigz" - ln -s pigz "$out/bin/unpigz" - install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" - ln -s pigz.1 "$out/share/man/man1/unpigz.1" - install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" + + installPhase = '' + install -Dm755 pigz "$out/bin/pigz" + install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" + install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index c7b4b46328d74..0c8169e0c5a5b 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -1,37 +1,35 @@ -{ - stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig - , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl - , libarchive, lzma +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig +, asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl +, libarchive, lzma }: + stdenv.mkDerivation rec { - baseName = "pixz"; + pname = "pixz"; version = "1.0.7"; - name = "${baseName}-${version}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - autoconf automake libtool asciidoc libxslt libxml2 - docbook_xml_dtd_45 docbook_xsl - libarchive lzma - ]; - preBuild = '' - echo "XML_CATALOG_FILES='$XML_CATALOG_FILES'" - ''; src = fetchFromGitHub { owner = "vasi"; - repo = baseName; + repo = pname; rev = "v${version}"; sha256 = "163axxs22w7pghr786hda22mnlpvmi50hzhfr9axwyyjl9n41qs2"; }; + + nativeBuildInputs = [ pkgconfig autoconf automake ]; + + buildInputs = [ + libtool asciidoc libxslt libxml2 + docbook_xml_dtd_45 docbook_xsl + libarchive lzma + ]; + preConfigure = '' ./autogen.sh ''; - meta = { - inherit version; - description = ''A parallel compressor/decompressor for xz format''; - license = stdenv.lib.licenses.bsd2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "A parallel compressor/decompressor for xz format"; + license = licenses.bsd2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch b/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch deleted file mode 100644 index fac8f1fc147cf..0000000000000 --- a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b8f9827fc4de9296c7a6f5e6fdac46e070cd6cb4 Mon Sep 17 00:00:00 2001 -From: Igor Pashev -Date: Sat, 1 Nov 2014 18:10:05 +0300 -Subject: [PATCH] Fixed crash on Linux when stack size is unlimited - ---- - pxz.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pxz.c b/pxz.c -index 9cb843e..52713e2 100644 ---- a/pxz.c -+++ b/pxz.c -@@ -65,7 +65,7 @@ FILE **ftemp; - char str[0x100]; - char buf[BUFFSIZE]; - char *xzcmd; --size_t xzcmd_max; -+const size_t xzcmd_max = 10240; - - unsigned opt_complevel = 6, opt_stdout, opt_keep, opt_threads, opt_verbose; - unsigned opt_force, opt_stdout; -@@ -243,9 +243,12 @@ int main( int argc, char **argv ) { - lzma_filter filters[LZMA_FILTERS_MAX + 1]; - lzma_options_lzma lzma_options; - -- xzcmd_max = sysconf(_SC_ARG_MAX); - page_size = sysconf(_SC_PAGE_SIZE); - xzcmd = malloc(xzcmd_max); -+ if (!xzcmd) { -+ fprintf(stderr, "Failed to allocate %lu bytes for xz command.\n", xzcmd_max); -+ return -1; -+ } - snprintf(xzcmd, xzcmd_max, XZ_BINARY); - - parse_args(argc, argv); diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index e731d91f6d6ee..bb7ddeaed204e 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -1,44 +1,34 @@ -{ stdenv, fetchgit, xz, lzma }: +{ stdenv, fetchFromGitHub, xz, lzma }: -let name = "pxz"; - version = "4.999.9beta+git"; -in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + pname = "pxz"; + version = "4.999.9beta"; - src = fetchgit { - url = "https://github.com/jnovy/pxz.git"; - rev = "ae808463c2950edfdedb8fb49f95006db0a18667"; - sha256 = "0na2kw8cf0qd8l1aywlv9m3xrxnqlcwxfdwp3f7x9vxwqx3k32kc"; + src = fetchFromGitHub { + owner = "jnovy"; + repo = "pxz"; + rev = "124382a6d0832b13b7c091f72264f8f3f463070a"; + sha256 = "15mmv832iqsqwigidvwnf0nyivxf0y8m22j2szy4h0xr76x4z21m"; }; buildInputs = [ lzma ]; - patches = [ ./_SC_ARG_MAX.patch ]; - - buildPhase = '' - gcc -o pxz pxz.c -llzma \ - -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \ - -DPXZ_BUILD_DATE=\"nixpkgs\" \ - -DXZ_BINARY=\"${xz.bin}/bin/xz\" \ - -DPXZ_VERSION=\"${version}\" - ''; - installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp pxz $out/bin cp pxz.1 $out/share/man/man1 ''; - meta = { + meta = with stdenv.lib; { homepage = "https://jnovy.fedorapeople.org/pxz/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [pashev]; - description = ''Parallel XZ is a compression utility that takes advantage of + description = "Parallel LZMA compressor using liblzma"; + longDescription = "Parallel XZ is a compression utility that takes advantage of running LZMA compression of different parts of an input file on multiple cores and processors simultaneously. Its primary goal is to utilize all resources to speed up compression time with minimal possible influence - on compression ratio''; - platforms = with stdenv.lib.platforms; linux; + on compression ratio"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pashev ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index fe4ac14ad0210..b202f1aa79817 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -1,11 +1,14 @@ -{stdenv, fetchurl, fetchpatch, bzip2}: +{ stdenv, fetchurl, fetchpatch, bzip2 }: + +stdenv.mkDerivation rec { + pname = "rzip"; + version = "2.1"; -stdenv.mkDerivation { - name = "rzip-2.1"; src = fetchurl { - url = "mirror://samba/rzip/rzip-2.1.tar.gz"; + url = "mirror://samba/rzip/rzip-${version}.tar.gz"; sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7"; }; + buildInputs = [ bzip2 ]; patches = [ @@ -16,10 +19,10 @@ stdenv.mkDerivation { }) ]; - meta = { + meta = with stdenv.lib; { homepage = "https://rzip.samba.org/"; description = "Compression program"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 7984e2bd58934..03a94ea84badb 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -1,20 +1,21 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "zsync-0.6.2"; + pname = "zsync"; + version = "0.6.2"; src = fetchurl { - url = "http://zsync.moria.org.uk/download/${name}.tar.bz2"; + url = "http://zsync.moria.org.uk/download/zsync-${version}.tar.bz2"; sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; }; makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; - meta = { + meta = with stdenv.lib; { homepage = "http://zsync.moria.org.uk/"; description = "File distribution system using the rsync algorithm"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = licenses.free; + maintainers = with maintainers; [ viric ]; + platforms = platforms.all; }; }