diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
commit | 375bc8def7c17506bc10f3b6193635f05d5ccc40 (patch) | |
tree | 6af7662b245e7998bd18ae20d9e74922c489fb6d /pkgs/tools/compression | |
parent | 2f75c6845981b38a698cf1a9f620145877c80956 (diff) | |
parent | 7f9ccc628403ed88844a4436da3b2944be5560a4 (diff) | |
download | nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.gz nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.bz2 nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.lz nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.xz nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.zst nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.zip |
Merge staging into closure-size
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r-- | pkgs/tools/compression/dtrx/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/compression/lz4/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/compression/xdelta/default.nix | 50 |
3 files changed, 37 insertions, 18 deletions
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 0d7a0e14e7de..343709dd9571 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -10,7 +10,7 @@ pythonPackages.buildPythonPackage rec { }; meta = with stdenv.lib; { - description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives."; + description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; homepage = "http://brettcsmith.org/2007/dtrx/"; license = licenses.gpl3Plus; maintainers = [ maintainers.spwhitt ]; diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 26e82886b6f3..d27ada615c71 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { owner = "Cyan4973"; }; - # valgrind is required only by `make test` - buildInputs = [ valgrind ]; + buildInputs = stdenv.lib.optional doCheck valgrind; enableParallelBuilding = true; diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index c85c7366cda8..fcc3b373fd10 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -1,24 +1,44 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation { - name = "xdelta-3.0z"; +let version = "3.0.9"; in +stdenv.mkDerivation rec { + name = "xdelta-${version}"; - src = fetchurl { - url = http://xdelta.googlecode.com/files/xdelta3.0z.tar.gz; - sha256 = "1rpk4n3yz8x81vakzn3n75h79a2ycm06p5v72djklx0wn9gb412m"; + src = fetchFromGitHub { + sha256 = "1pd7dyq44dbggmwkrr8251anqsf2an67zbvrk4vfnc92jkmjp17i"; + rev = "v${version}"; + repo = "xdelta-devel"; + owner = "jmacd"; }; - installPhase = - '' - mkdir -p $out/bin - cp xdelta3 $out/bin/ + buildInputs = [ autoreconfHook ]; - mkdir -p $out/share/man/man1 - cp xdelta3.1 $out/share/man/man1/ - ''; + postPatch = '' + cd xdelta3 + '' + stdenv.lib.optionalString doCheck '' + mkdir tmp + substituteInPlace testing/file.h --replace /tmp tmp + substituteInPlace xdelta3-test.h --replace /tmp $PWD/tmp + ''; - meta = { + enableParallelBuilding = true; + + doCheck = true; + checkPhase = '' + ./xdelta3regtest + ''; + + installPhase = '' + install -D -m755 xdelta3 $out/bin/xdelta3 + install -D -m644 xdelta3.1 $out/share/man/man1/xdelta3.1 + ''; + + meta = with stdenv.lib; { + inherit version; + description = "Binary differential compression in VCDIFF (RFC 3284) format"; homepage = http://xdelta.org/; - description = "A binary diff tool that uses the VCDIFF (RFC 3284) format and compression"; + license = with licenses; gpl2Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; }; } |