diff options
Diffstat (limited to 'gnu/packages/backup.scm')
| -rw-r--r-- | gnu/packages/backup.scm | 57 |
1 files changed, 23 insertions, 34 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 5253e3d03d..e5237b3048 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -6,8 +6,8 @@ ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> -;;; Copyright © 2017, 2020 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org> +;;; Copyright © 2017, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> @@ -20,6 +20,7 @@ ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2021 Timothy Sample <samplet@ngyro.com> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,6 +105,7 @@ ("par2cmdline" ,par2cmdline) ("python-fasteners" ,python-fasteners) ("python-future" ,python-future) ; for tests + ("python-paramiko" ,python-paramiko) ("python-pexpect" ,python-pexpect) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) @@ -576,24 +578,23 @@ rsnapshot uses hard links to deduplicate identical files.") (substitute* "configure" (("GUILE=(.*)--variable bindir`" _ middle) (string-append "GUILE=" middle - "--variable bindir`/guile"))) - #t)) + "--variable bindir`/guile"))))) (add-before 'build 'set-libtirpc-include-path (lambda* (#:key inputs #:allow-other-keys) ;; Allow <rpc/rpc.h> & co. to be found. - (let ((libtirpc (assoc-ref inputs "libtirpc"))) - (setenv "CPATH" - (string-append (getenv "CPATH") - ":" libtirpc - "/include/tirpc")) - #t))) + (let ((tirpc (string-append (assoc-ref inputs "libtirpc") + "/include/tirpc"))) + (if (getenv "CPATH") + (setenv "CPATH" + (string-append (getenv "CPATH") + ":" tirpc)) + (setenv "CPATH" tirpc))))) (add-before 'check 'skip-test (lambda _ ;; XXX: This test fails (1) because current GnuTLS no ;; longer supports OpenPGP authentication, and (2) for ;; some obscure reason. Better skip it. - (setenv "XFAIL_TESTS" "utils/block-server") - #t))))) + (setenv "XFAIL_TESTS" "utils/block-server")))))) (native-inputs `(("guile" ,guile-2.0) ("gperf" ,gperf-3.0) ;see <https://bugs.gnu.org/32382> @@ -657,12 +658,7 @@ detection, and lossless compression.") ;; Remove bundled shared libraries. (with-directory-excursion "src/borg/algorithms" (for-each delete-file-recursively - (list "blake2" "lz4" "msgpack" "zstd"))) - ;; Purge some msgpack references from setup.py or the resulting - ;; sources will be unbuildable. - (substitute* "setup.py" - ((".*Extension\\('borg\\.algorithms\\.msgpack\\..*") "") - (("msgpack_packer_source, msgpack_unpacker_source") "")) + (list "blake2" "lz4" "zstd"))) #t)))) (build-system python-build-system) (arguments @@ -686,12 +682,6 @@ detection, and lossless compression.") ;; HOME=/homeless-shelter. (setenv "HOME" "/tmp") #t))) - (add-after 'unpack 'use-system-msgpack - (lambda _ - (substitute* "src/borg/helpers.py" - (("prefer_system_msgpack = False") - "prefer_system_msgpack = True")) - #t)) ;; The tests need to be run after Borg is installed. (delete 'check) (add-after 'install 'check @@ -755,10 +745,6 @@ detection, and lossless compression.") ("lz4" ,lz4) ("openssl" ,openssl) ("python-llfuse" ,python-llfuse) - ;; The Python msgpack library changed its name so Borg requires this - ;; transitional package for now: - ;; <https://bugs.gnu.org/30662> - ("python-msgpack" ,python-msgpack-transitional) ("zstd" ,zstd "lib"))) (synopsis "Deduplicated, encrypted, authenticated and compressed backups") (description "Borg is a deduplicating backup program. Optionally, it @@ -927,7 +913,9 @@ is like a time machine for your data. ") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1zmh42aah32ah8w5n6ilz9bci0y2xrf8p7qshy3yf1lzm5gnbj0w")))) + "1zmh42aah32ah8w5n6ilz9bci0y2xrf8p7qshy3yf1lzm5gnbj0w")) + (patches + (search-patches "restic-0.9.6-fix-tests-for-go1.15.patch")))) (build-system go-build-system) (arguments `(#:import-path "github.com/restic/restic" @@ -944,11 +932,12 @@ is like a time machine for your data. ") (invoke "go" "run" "build.go")))) (replace 'check - (lambda _ - (with-directory-excursion "src/github.com/restic/restic" - ;; Disable FUSE tests. - (setenv "RESTIC_TEST_FUSE" "0") - (invoke "go" "run" "build.go" "--test")))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "src/github.com/restic/restic" + ;; Disable FUSE tests. + (setenv "RESTIC_TEST_FUSE" "0") + (invoke "go" "run" "build.go" "--test"))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) |