diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 12:51:57 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 13:11:40 -0400 |
| commit | 5e2140511c1ad9ccd731438b74d61b62111da1e6 (patch) | |
| tree | a4ff748ad26e121b88469b5d921001ef1382be8f /gnu/packages/backup.scm | |
| parent | 9e3a5ee417ea7fe9721be8804ff047e80c4f22ed (diff) | |
| parent | 353bdae32f72b720c7ddd706576ccc40e2b43f95 (diff) | |
| download | guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar.gz | |
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/backup.scm')
| -rw-r--r-- | gnu/packages/backup.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 051b200631..770bb23a9c 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -569,13 +569,13 @@ detection, and lossless compression.") (define-public borg (package (name "borg") - (version "1.1.13") + (version "1.1.14") (source (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) (sha256 - (base32 "089q3flmwbz7dc28zlscwylf64kgck3jf1n6lqpwww8hlrk8cjhn")) + (base32 "1fpdj73cgp96xwasdcifxl7q2pr1my2f4vfdjpv771llri3hgfvx")) (modules '((guix build utils))) (snippet '(begin @@ -606,7 +606,7 @@ detection, and lossless compression.") #t)))) (build-system python-build-system) (arguments - `(#:modules ((srfi srfi-26) ; for cut + `(#:modules ((srfi srfi-26) ; for cut (guix build utils) (guix build python-build-system)) #:phases @@ -1066,7 +1066,7 @@ other storage medium. Subsequent incremental backups can then be layered on top of the full backup. The restore command performs the inverse function of dump; it can restore a full backup of a file system. Single files and directory subtrees may also be restored from full or partial backups in -interractive mode.") +interactive mode.") (license license:bsd-3))) (define-public burp @@ -1103,7 +1103,7 @@ interractive mode.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("check" ,check) + ("check" ,check-0.14) ("pkg-config" ,pkg-config))) (home-page "https://burp.grke.org") (synopsis "Differential backup and restore") |