From e9e162784985611a0700cf7d0f16096762467a70 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Nov 2021 19:10:55 +0100 Subject: gnu: duplicity: Update to 0.8.21. * gnu/packages/backup.scm (duplicity): Update to 0.8.21. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/backup.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 61d330e861..1dca6fd9b1 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -88,7 +88,7 @@ (define-public duplicity (package (name "duplicity") - (version "0.8.20") + (version "0.8.21") (source (origin (method url-fetch) @@ -97,7 +97,7 @@ "-series/" version "/+download/duplicity-" version ".tar.gz")) (sha256 - (base32 "0d125mxknpn44xwgqzzak9y5ydigscrpjv9d63126mfc6yfngr5v")))) + (base32 "0ld4bhsi6iv4bvy99pblbr7vlwy9jbgfd6flyvb8qwbl8rvadzjp")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) ; for msgfmt @@ -138,8 +138,7 @@ "/bin/dbus-launch']"))) (substitute* '("testing/functional/__init__.py" "testing/overrides/bin/lftp") - (("/bin/sh") (which "sh"))) - #t)) + (("/bin/sh") (which "sh"))))) (add-before 'check 'set-up-tests (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" (getcwd)) ; gpg needs to write to $HOME @@ -148,8 +147,7 @@ "/share/zoneinfo")) ;; Some things respect TMPDIR, others hard-code /tmp, and the ;; defaults don't match up, breaking test_restart. Fix it. - (setenv "TMPDIR" "/tmp") - #t))))) + (setenv "TMPDIR" "/tmp")))))) (home-page "https://duplicity.gitlab.io/duplicity-web/") (synopsis "Encrypted backup using rsync algorithm") (description -- cgit v1.2.3 From d29a9aa54b9df9167f4641dd8ca42c561b460c4c Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 30 Oct 2021 14:27:48 +0530 Subject: gnu: Add borgmatic. * gnu/packages/backup.scm (borgmatic): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/backup.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 1dca6fd9b1..a5807d7aec 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016, 2017 Leo Famulari ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2021 Arun Isaac ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017, 2020 Efraim Flashner ;;; Copyright © 2017 Christine Lemmer-Webber @@ -80,6 +80,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rsync) + #:use-module (gnu packages serialization) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) @@ -1172,3 +1173,51 @@ original files. For example, a software archive made using tar and Gzip will need to describe the order of files in the tarball and the compression parameters used by Gzip.") (license license:gpl3+))) + +(define-public borgmatic + (package + (name "borgmatic") + (version "1.5.20") + (source + (origin + (method url-fetch) + (uri (pypi-uri "borgmatic" version)) + (sha256 + (base32 "1rdpj1mii4fbyprg56krf5k0xsd97ghybaabr7zdhsrcsxf719ha")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + ;; Set absolute store path to borg. + (substitute* "borgmatic/commands/borgmatic.py" + (("location\\.get\\('local_path', 'borg'\\)") + (string-append "location.get('local_path', '" + (assoc-ref inputs "borg") "/bin/borg" + "')"))))) + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + ;; Tests require the installed executable. + (setenv "PATH" (string-append (assoc-ref outputs "out") "/bin" + ":" (getenv "PATH"))) + (invoke "pytest"))))))) + (inputs + `(("borg" ,borg) + ("python-colorama" ,python-colorama) + ("python-jsonschema" ,python-jsonschema) + ("python-requests" ,python-requests) + ("python-ruamel.yaml" ,python-ruamel.yaml))) + (native-inputs + `(("python-flexmock" ,python-flexmock) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) + (home-page "https://torsion.org/borgmatic/") + (synopsis "Simple, configuration-driven backup software") + (description + "borgmatic is a simple, configuration-driven backup software for servers +and workstations. Protect your files with client-side encryption. Backup +your databases too. Monitor it all with integrated third-party services. +borgmatic is powered by borg.") + (license license:gpl3+))) -- cgit v1.2.3 From fb8e5f530ed52fda77066da2e7476dd1343c3b2c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Nov 2021 21:17:21 +0100 Subject: gnu: borgmatic: Fix typo in description. * gnu/packages/backup.scm (borgmatic): Fix typo, "software" being a mass noun. --- gnu/packages/backup.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index a5807d7aec..d30e546500 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1216,7 +1216,7 @@ compression parameters used by Gzip.") (home-page "https://torsion.org/borgmatic/") (synopsis "Simple, configuration-driven backup software") (description - "borgmatic is a simple, configuration-driven backup software for servers + "borgmatic is simple, configuration-driven backup software for servers and workstations. Protect your files with client-side encryption. Backup your databases too. Monitor it all with integrated third-party services. borgmatic is powered by borg.") -- cgit v1.2.3