rsnapshot: 1.3.1 -> 1.4.1

pkgs/tools/backup/rsnapshot/default.nix

@@ -16,10 +16,11 @@ let patch = writeText "rsnapshot-config.patch" ''
 '';
 in
 stdenv.mkDerivation rec {
-  name = "rsnapshot-1.3.1";
+  name = "rsnapshot-1.4.1";
+
   src = fetchurl {
-    url = "mirror://sourceforge/rsnapshot/${name}.tar.gz";
+    url = "http://rsnapshot.org/downloads/${name}.tar.gz";
-    sha256 = "0pn7vlg3yxl7xrvfwmp4zlrg3cckmlldq6qr5bs3b2b281zcgdll";
+    sha256 = "1s28wkpqajgmwi88n3xs3qsa4b7yxd6lkl4zfi0mr06klwli2jpv";
   };
 
   propagatedBuildInputs = [perl openssh rsync logger];

pkgs/tools/backup/rsnapshot/git.nix

@@ -1,52 +0,0 @@
-{ fetchFromGitHub, stdenv, writeText, perl, openssh, rsync, logger,
-  configFile ? "/etc/rsnapshot.conf" }:
-
-let patch = writeText "rsnapshot-config.patch" ''
---- rsnapshot-program.pl	2013-10-05 20:31:08.715991442 +0200
-+++ rsnapshot-program.pl	2013-10-05 20:31:42.496193633 +0200
-@@ -383,7 +383,7 @@
- 	}
- 	
- 	# set global variable
--	$config_file = $default_config_file;
-+	$config_file = '${configFile}';
- }
- 
- # accepts no args
-'';
-in
-stdenv.mkDerivation rec {
-  name = "rsnapshot-1.4git";
-  src = fetchFromGitHub {
-    owner = "DrHyde";
-    repo = "rsnapshot";
-    rev = "1047cbb57937c29233388e2fcd847fecd3babe74";
-    sha256 = "173y9q89dp4zf7nysqhjp3i2m086n7qdpawb9vx0ml5zha6mxf2p";
-  };
-
-  propagatedBuildInputs = [perl openssh rsync logger];
-
-  patchPhase = ''
-    substituteInPlace "Makefile.in" --replace \
-      "/usr/bin/pod2man" "${perl}/bin/pod2man"
-    patch -p0 <${patch}
-  '';
-
-  # I still think this is a good idea, but it currently fails in the chroot because it checks
-  # that things are writable and so on.
-  #checkPhase = ''
-  #  if [ -f "${configFile}" ]
-  #  then
-  #    ${perl}/bin/perl -w ./rsnapshot configtest
-  #  else
-  #    echo File "${configFile}" does not exist, not checking
-  #  fi
-  #'';
-
-  meta = with stdenv.lib; {
-    description = "A filesystem snapshot utility for making backups of local and remote systems";
-    homepage = http://rsnapshot.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -2902,16 +2902,10 @@ let
   rng_tools = callPackage ../tools/security/rng-tools { };
 
   rsnapshot = callPackage ../tools/backup/rsnapshot {
-    perl = perl516; # fails to create docs: POD document had syntax errors
     # For the `logger' command, we can use either `utillinux' or
     # GNU Inetutils.  The latter is more portable.
-    logger = inetutils;
+    logger = if stdenv.isLinux then utillinux else inetutils;
   };
-  rsnapshotGit = lowPrio (callPackage ../tools/backup/rsnapshot/git.nix {
-    # For the `logger' command, we can use either `utillinux' or
-    # GNU Inetutils.  The latter is more portable.
-    logger = inetutils;
-  });
 
   rlwrap = callPackage ../tools/misc/rlwrap { };