Merge pull request #43418 from Izorkin/dar

dar: 2.5.14 -> 2.5.15
This commit is contained in:
Michael Raskin 2018-07-13 16:28:58 +00:00 committed by GitHub
commit 66cb10a2ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions

View file

@ -3,27 +3,37 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.5.14"; version = "2.5.15";
name = "dar-${version}"; name = "dar-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/dar/${name}-bis.tar.gz"; url = "mirror://sourceforge/dar/${name}.tar.gz";
sha256 = "1sbd7n5mfqkwxy5rz2v8575y21j94ypwrpinizr3l2yy9pq49rx5"; sha256 = "1h700i2k524w5rf5gr9yxl50ca5jwzqlkifay4ffcbhbkqln1n2q";
}; };
buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
++ optionals stdenv.isLinux [ attr e2fsprogs ]; ++ optionals stdenv.isLinux [ attr e2fsprogs ];
configureFlags = [ "--disable-dar-static" ]; configureFlags = [
"--disable-birthtime"
"--disable-upx"
"--disable-dar-static"
"--disable-build-html"
"--enable-threadar"
];
postInstall = ''
rm -r "$out"/share/dar # Disable html help
'';
enableParallelBuilding = true; enableParallelBuilding = true;
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
meta = { meta = {
homepage = http://dar.linux.free.fr/; homepage = http://dar.linux.free.fr;
description = "Disk ARchiver, allows backing up files into indexed archives"; description = "Disk ARchiver, allows backing up files into indexed archives";
maintainers = [ maintainers.viric ]; maintainers = with maintainers; [ viric ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -1948,7 +1948,7 @@ with pkgs;
daq = callPackage ../applications/networking/ids/daq { }; daq = callPackage ../applications/networking/ids/daq { };
dar = callPackage ../tools/archivers/dar { }; dar = callPackage ../tools/backup/dar { };
darkhttpd = callPackage ../servers/http/darkhttpd { }; darkhttpd = callPackage ../servers/http/darkhttpd { };