From 1273548f4facefa379ae3607b47891959c42c13d Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Thu, 5 Aug 2021 13:20:07 -0700 Subject: gnu: restic: Patch tests for go-1.16. * gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/backup.scm (restic): Use it. Signed-off-by: Maxim Cournoyer --- gnu/packages/backup.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 9ec4e281d8..d8d8728a14 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Timothy Sample ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -928,7 +929,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" -- cgit v1.2.3 From 362a1cc3fb50c67ed4249b97827dbffdbdace766 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 5 Aug 2021 22:54:19 -0400 Subject: gnu: restic: Have the custom check phase honor TESTS?. * gnu/packages/backup.scm (restic)[phases]{check}: Honor TESTS?. --- gnu/packages/backup.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index d8d8728a14..b35dbe4b76 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -948,11 +948,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) -- cgit v1.2.3 From 5e71375361c0d6a11e1890b61e464f030596d0de Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 4 Aug 2021 01:21:00 -0400 Subject: gnu: Borg: Use bundled msgpack. This is an old and customized version of msgpack-python. * gnu/packages/backup.scm (borg)[source]: In the snippet, don't delete the bundled 'msgpack' directory, and remove the related substition applied to setup.py. [arguments]: Remove the 'use-system-msgpack' phase. [inputs]: Remove 'python-msgpack-transitional'. --- gnu/packages/backup.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index b35dbe4b76..d05cb55163 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -659,12 +659,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 @@ -688,12 +683,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 @@ -757,10 +746,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: - ;; - ("python-msgpack" ,python-msgpack-transitional) ("zstd" ,zstd "lib"))) (synopsis "Deduplicated, encrypted, authenticated and compressed backups") (description "Borg is a deduplicating backup program. Optionally, it -- cgit v1.2.3 From b1c97ff60b8ac8205d878fec3af8d02ffdf601fe Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Aug 2021 12:16:30 -0400 Subject: gnu: Duplicity: Depend on python-paramiko. Fixes . * gnu/packages/backup.scm (duplicity)[native-inputs]: Add python-paramiko. --- gnu/packages/backup.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index d05cb55163..7d7868ea17 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -105,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) -- cgit v1.2.3