diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-10 21:44:32 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-10 21:44:32 +0200 |
| commit | 1c055d72585bd075e20ad0b41942d501d0b38656 (patch) | |
| tree | 7baf50e22fb5f6c6d4b2fa7197596f68298eb691 /gnu/packages/backup.scm | |
| parent | 565e24c4e4710a5b81cce5cfb619b3e474e7f65c (diff) | |
| parent | ffb4da7ad5c0e9cc969e0e47a3b8f4d2eba4d6f3 (diff) | |
| download | guix-1c055d72585bd075e20ad0b41942d501d0b38656.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/backup.scm')
| -rw-r--r-- | gnu/packages/backup.scm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index a85f9f39c9..40221e5896 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -293,20 +293,20 @@ random access nor for in-place modification.") ("nettle" ,nettle))) (arguments `(#:parallel-build? #f ;race conditions - #:phases (alist-cons-before - 'build 'remove-Werror - ;; rdup uses a deprecated function from libarchive - (lambda _ - (substitute* "GNUmakefile" - (("^(CFLAGS=.*)-Werror" _ front) front))) - (alist-cons-before - 'check 'pre-check - (lambda _ - (setenv "HOME" (getcwd)) - (substitute* "testsuite/rdup/rdup.rdup-up-t-with-file.exp" - (("/bin/cat") (which "cat")))) - - %standard-phases)))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'remove-Werror + ;; rdup uses a deprecated function from libarchive + (lambda _ + (substitute* "GNUmakefile" + (("^(CFLAGS=.*)-Werror" _ front) front)) + #t)) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" (getcwd)) + (substitute* "testsuite/rdup/rdup.rdup-up-t-with-file.exp" + (("/bin/cat") (which "cat"))) + #t))))) (home-page "http://archive.miek.nl/projects/rdup/index.html") (synopsis "Provide a list of files to backup") (description @@ -336,9 +336,9 @@ list and implement the backup strategy.") "CC=gcc") #:tests? #f ;test input not distributed #:phases - (alist-delete - 'configure ;no configure phase - %standard-phases))) + ;; no configure phase + (modify-phases %standard-phases + (delete 'configure)))) (home-page "http://viric.name/cgi-bin/btar/doc/trunk/doc/home.wiki") (synopsis "Tar-compatible archiver") (description |