From 8ef8de799fcbc7b1a04be0d33e1183c766d0f893 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Feb 2017 21:40:08 +0100 Subject: gnu: duplicity: Fix tests. * gnu/packages/backup.scm (duplicity)[native-inputs]: Add PAR2CMDLINE. [arguments]: Move /bin/sh substitution to 'patch-source' phase and add one file. --- gnu/packages/backup.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 8dbe32ebdd..809d54a646 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -67,6 +67,7 @@ (build-system python-build-system) (native-inputs `(("util-linux" ,util-linux) ;setsid command, for the tests + ("par2cmdline" ,par2cmdline) ("python-pexpect" ,python2-pexpect) ("mock" ,python2-mock))) (propagated-inputs @@ -83,16 +84,18 @@ #:test-target "test" #:phases (modify-phases %standard-phases - (add-before - 'build 'patch-source ; embed gpg store name - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "duplicity/gpginterface.py" - (("self.call = 'gpg'") - (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'"))))) - (add-before 'check 'check-setup + (add-before 'build 'patch-source (lambda* (#:key inputs #:allow-other-keys) - (substitute* "testing/functional/__init__.py" + ;; embed gpg store name + (substitute* "duplicity/gpginterface.py" + (("self.call = 'gpg'") + (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'"))) + (substitute* '("testing/functional/__init__.py" + "testing/overrides/bin/lftp") (("/bin/sh") (which "sh"))) + #t)) + (add-before 'check 'check-setup + (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" (getcwd)) ;gpg needs to write to $HOME (setenv "TZDIR" ;some timestamp checks need TZDIR (string-append (assoc-ref inputs "tzdata") -- cgit 1.4.1 From beb1e8067d163b9d681b613c56e13e4da304582e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 8 Mar 2017 10:54:50 +0100 Subject: gnu: Remove unneeded imports. * gnu/packages/backup.scm: Remove unneeded (guix build utils) import. * gnu/packages/finance.scm: Likewise. --- gnu/packages/backup.scm | 1 - gnu/packages/finance.scm | 1 - 2 files changed, 2 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 986ffef08f..d557bf3f01 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -24,7 +24,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix utils) - #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index ee90c38eb7..234e40c281 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -24,7 +24,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system python) -- cgit 1.4.1 From 0da4f3659aadeb3f72b405a19dd6c69ccff7c30e Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Wed, 8 Mar 2017 18:04:58 +0100 Subject: gnu: Add rsnapshot. * gnu/packages/backup.scm (rsnapshot): New variable. --- gnu/packages/backup.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index d557bf3f01..8eaab8a871 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015, 2016 Leo Famulari ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017 Thomas Danckaert ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ #:use-module (gnu packages mcrypt) #:use-module (gnu packages nettle) #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages rsync) @@ -372,6 +374,42 @@ to a remote location, and only the differences will be transmitted. Finally, rdiff-backup is easy to use and settings have sensible defaults.") (license license:gpl2+))) +(define-public rsnapshot + (package + (name "rsnapshot") + (version "1.4.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/rsnapshot/rsnapshot/releases/download/" + version "/rsnapshot-" version ".tar.gz")) + (sha256 + (base32 + "05jfy99a0xs6lvsjfp3wz21z0myqhmwl2grn3jr9clijbg282ah4")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (substitute* '("t/cmd-post_pre-exec/conf/pre-true-post-true.conf" + "t/backup_exec/conf/backup_exec_fail.conf" + "t/backup_exec/conf/backup_exec.conf") + (("/bin/true") (which "true")) + (("/bin/false") (which "false"))) + (zero? (system* "make" "test"))))))) + (inputs + `(("perl" ,perl) + ("rsync" ,rsync))) + (home-page "http://rsnapshot.org") + (synopsis "Deduplicating snapshot backup utility based on rsync") + (description "rsnapshot is a filesystem snapshot utility based on rsync. +rsnapshot makes it easy to make periodic snapshots of local machines, and +remote machines over SSH. To reduce the disk space required for each backup, +rsnapshot uses hard links to deduplicate identical files.") + (license license:gpl2+))) + (define-public libchop (package (name "libchop") -- cgit 1.4.1