summary refs log tree commit diff
diff options
context:
space:
mode:
authorIzorkin <Izorkin@gmail.com>2018-07-12 17:41:41 +0300
committerIzorkin <Izorkin@gmail.com>2018-07-12 17:41:41 +0300
commitf7d6744cf86bb6b32bbbe6c2e9676f18609d6397 (patch)
treee3ef7c7a20c7268a23ec349d9835651ce5f1169b
parent0d499686c6179a782c0995a9704d101dc6e50b52 (diff)
downloadnixpkgs-f7d6744cf86bb6b32bbbe6c2e9676f18609d6397.tar
nixpkgs-f7d6744cf86bb6b32bbbe6c2e9676f18609d6397.tar.gz
nixpkgs-f7d6744cf86bb6b32bbbe6c2e9676f18609d6397.tar.bz2
nixpkgs-f7d6744cf86bb6b32bbbe6c2e9676f18609d6397.tar.lz
nixpkgs-f7d6744cf86bb6b32bbbe6c2e9676f18609d6397.tar.xz
nixpkgs-f7d6744cf86bb6b32bbbe6c2e9676f18609d6397.tar.zst
nixpkgs-f7d6744cf86bb6b32bbbe6c2e9676f18609d6397.zip
dar: 2.5.14 -> 2.5.15
-rw-r--r--pkgs/tools/backup/dar/default.nix (renamed from pkgs/tools/archivers/dar/default.nix)22
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index 315ef727283..99c0bd4a34c 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 a52db70835f..c7209eb497c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1946,7 +1946,7 @@ with pkgs;
 
   daq = callPackage ../applications/networking/ids/daq { };
 
-  dar = callPackage ../tools/archivers/dar { };
+  dar = callPackage ../tools/backup/dar { };
 
   darkhttpd = callPackage ../servers/http/darkhttpd { };