diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-22 18:14:04 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-22 18:14:04 +0200 |
| commit | 233df51ebc162bf95dfadf914914cbfbc6984651 (patch) | |
| tree | 06fa8d78bbe97619450a88d8a38d01dc3775655b /gnu/packages/backup.scm | |
| parent | 43cec3fb1ea54dedee8a5f613c833958c76892f4 (diff) | |
| parent | 180a8986e57a6cfb65a8cddabcb430f23801832b (diff) | |
| download | patches-233df51ebc162bf95dfadf914914cbfbc6984651.tar patches-233df51ebc162bf95dfadf914914cbfbc6984651.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/backup.scm')
| -rw-r--r-- | gnu/packages/backup.scm | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index cf8be7a9b9..754dfa1a40 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -454,9 +454,27 @@ rsnapshot uses hard links to deduplicate identical files.") "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g")) (patches (search-patches "diffutils-gets-undeclared.patch")))) (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'configure 'adjust-configure-script + (lambda _ + ;; Mimic upstream commit + ;; 25750ab5ef82fd3cfce5205d5f1ef07b47098091. + (substitute* "configure" + (("GUILE=(.*)--variable bindir`" _ middle) + (string-append "GUILE=" middle + "--variable bindir`/guile"))) + #t)) + (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))))) (native-inputs `(("guile" ,guile-2.0) - ("gperf" ,gperf) + ("gperf" ,gperf-3.0) ;see <https://bugs.gnu.org/32382> ("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.0) @@ -881,8 +899,8 @@ is like a time machine for your data. ") (with-directory-excursion (string-append "src/github.com/restic/restic-" ,version) - ;; unexpected error: fusermount: exit status 1 - (delete-file "cmd/restic/integration_fuse_test.go") + ;; Disable FUSE tests. + (setenv "RESTIC_TEST_FUSE" "0") (invoke "go" "run" "build.go" "--test")))) (replace 'install |