diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-12-02 17:31:25 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-12-04 12:19:45 +0100 |
commit | d13dc12987faaebdff1cbe4b48f1a9ac7984f9d4 (patch) | |
tree | 7e50104de290c42f7cbcfacb98a59b731b4597af /pkgs/tools/backup | |
parent | 9aa1cb6c59f7afc93d72037ab4477d5c259a3ff8 (diff) | |
download | nixlib-d13dc12987faaebdff1cbe4b48f1a9ac7984f9d4.tar nixlib-d13dc12987faaebdff1cbe4b48f1a9ac7984f9d4.tar.gz nixlib-d13dc12987faaebdff1cbe4b48f1a9ac7984f9d4.tar.bz2 nixlib-d13dc12987faaebdff1cbe4b48f1a9ac7984f9d4.tar.lz nixlib-d13dc12987faaebdff1cbe4b48f1a9ac7984f9d4.tar.xz nixlib-d13dc12987faaebdff1cbe4b48f1a9ac7984f9d4.tar.zst nixlib-d13dc12987faaebdff1cbe4b48f1a9ac7984f9d4.zip |
rsnapshot: 1.3.1 -> 1.4.1
Diffstat (limited to 'pkgs/tools/backup')
-rw-r--r-- | pkgs/tools/backup/rsnapshot/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/backup/rsnapshot/git.nix | 52 |
2 files changed, 4 insertions, 55 deletions
diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index bacfbdfe1cab..f46a2c20de42 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/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"; - sha256 = "0pn7vlg3yxl7xrvfwmp4zlrg3cckmlldq6qr5bs3b2b281zcgdll"; + url = "http://rsnapshot.org/downloads/${name}.tar.gz"; + sha256 = "1s28wkpqajgmwi88n3xs3qsa4b7yxd6lkl4zfi0mr06klwli2jpv"; }; propagatedBuildInputs = [perl openssh rsync logger]; diff --git a/pkgs/tools/backup/rsnapshot/git.nix b/pkgs/tools/backup/rsnapshot/git.nix deleted file mode 100644 index d1025a11d29c..000000000000 --- a/pkgs/tools/backup/rsnapshot/git.nix +++ /dev/null @@ -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; - }; -} |