diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/backup/dar/default.nix similarity index 52% rename from pkgs/tools/archivers/dar/default.nix rename to pkgs/tools/backup/dar/default.nix index 315ef7272838..99c0bd4a34ca 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -3,27 +3,37 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.5.14"; + version = "2.5.15"; name = "dar-${version}"; src = fetchurl { - url = "mirror://sourceforge/dar/${name}-bis.tar.gz"; - sha256 = "1sbd7n5mfqkwxy5rz2v8575y21j94ypwrpinizr3l2yy9pq49rx5"; + url = "mirror://sourceforge/dar/${name}.tar.gz"; + sha256 = "1h700i2k524w5rf5gr9yxl50ca5jwzqlkifay4ffcbhbkqln1n2q"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] ++ 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; hardeningDisable = [ "format" ]; meta = { - homepage = http://dar.linux.free.fr/; + homepage = http://dar.linux.free.fr; description = "Disk ARchiver, allows backing up files into indexed archives"; - maintainers = [ maintainers.viric ]; + maintainers = with maintainers; [ viric ]; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6187bfb5d016..b8c41b9975da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1948,7 +1948,7 @@ with pkgs; daq = callPackage ../applications/networking/ids/daq { }; - dar = callPackage ../tools/archivers/dar { }; + dar = callPackage ../tools/backup/dar { }; darkhttpd = callPackage ../servers/http/darkhttpd { };