;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
(define-module (gnu packages backup)
#:use-module (guix packages)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix git-download)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
(define-public duplicity
(package
(name "duplicity")
- (version "0.7.17")
+ (version "0.7.18.1")
(source
(origin
(method url-fetch)
version ".tar.gz"))
(sha256
(base32
- "0jmh3h09680xyf33hzxxxl74bwz66zqhzvjlj7j89r9rz3qwa91p"))))
+ "17c0203y5qz9w8iyhs26l44qf6a1vp26b5ykz1ypdr2kv6g02df9"))))
(build-system python-build-system)
(native-inputs
- `(("util-linux" ,util-linux) ;setsid command, for the tests
+ `(("util-linux" ,util-linux) ; setsid command, for the tests
("par2cmdline" ,par2cmdline)
("python-pexpect" ,python2-pexpect)
("python-fasteners" ,python2-fasteners)
(inputs
`(("librsync" ,librsync)
("lftp" ,lftp)
- ("gnupg" ,gnupg) ;gpg executable needed
- ("util-linux" ,util-linux) ;for setsid
+ ("gnupg" ,gnupg) ; gpg executable needed
+ ("util-linux" ,util-linux) ; for setsid
("tzdata" ,tzdata)))
(arguments
- `(#:python ,python-2 ;setup assumes Python 2
+ `(#:python ,python-2 ; setup assumes Python 2
#:test-target "test"
#:phases
(modify-phases %standard-phases
- (add-before 'build 'patch-source
+ (add-before 'build 'use-store-file-names
(lambda* (#:key inputs #:allow-other-keys)
- ;; embed gpg store name
(substitute* "duplicity/gpginterface.py"
(("self.call = 'gpg'")
(string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'")))
+
(substitute* '("testing/functional/__init__.py"
"testing/overrides/bin/lftp")
(("/bin/sh") (which "sh")))
#t))
(add-before 'check 'check-setup
(lambda* (#:key inputs #:allow-other-keys)
- (setenv "HOME" (getcwd)) ;gpg needs to write to $HOME
- (setenv "TZDIR" ;some timestamp checks need TZDIR
+ (setenv "HOME" (getcwd)) ; gpg needs to write to $HOME
+ (setenv "TZDIR" ; some timestamp checks need TZDIR
(string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo"))
#t)))))
(name "par2cmdline")
(version "0.8.0")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/Parchive/par2cmdline/archive/v"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Parchive/par2cmdline.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1jpshmmcr81mxly0md2rr231qz9c8c680bbvcmhh100dg9i4a6s6"))))
+ "0f1jsd5sw2wynjzi7yjqjaf13yhyjfdid91p8yh0jn32y03kjyrz"))))
(native-inputs
`(("automake" ,automake)
("autoconf" ,autoconf)))
(build-system gnu-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'autoreconf
- (lambda _ (invoke "autoreconf" "-vfi"))))))
(synopsis "File verification and repair tools")
(description "Par2cmdline uses Reed-Solomon error-correcting codes to
generate and verify PAR2 recovery files. These files can be distributed
"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)
(define-public borg
(package
(name "borg")
- (version "1.1.6")
+ (version "1.1.8")
(source
(origin
(method url-fetch)
(uri (pypi-uri "borgbackup" version))
(sha256
- (base32 "0c09j46fi8i7klas0bh82a4whlwnajshk0izkgax6fjxr1sf9lm1"))
+ (base32
+ "0qqvcscn1l4y83x4sh3izdpmr8zq38j8chjkpfq4q4d01i470hqb"))
(modules '((guix build utils)))
(snippet
'(begin
+ ;; Delete files generated by Cython. We used to have a regex
+ ;; that created the list of generated files but Borg has
+ ;; added new non-generated C files that cause the regex to
+ ;; generate the wrong list.
(for-each delete-file
- (find-files "borg" "^(c|h|p).*\\.c$"))
+ '("src/borg/algorithms/checksums.c"
+ "src/borg/chunker.c"
+ "src/borg/compress.c"
+ "src/borg/crypto/low_level.c"
+ "src/borg/hashindex.c"
+ "src/borg/item.c"
+ "src/borg/platform/darwin.c"
+ "src/borg/platform/freebsd.c"
+ "src/borg/platform/linux.c"
+ "src/borg/platform/posix.c"))
;; Remove bundled shared libraries.
(with-directory-excursion "src/borg/algorithms"
(for-each delete-file-recursively
(replace 'check
(lambda _
(substitute* "obnamlib/vfs_local_tests.py"
- ;; Check for the nobody user instead of root
+ ;; Check for the nobody user instead of root.
(("self.fs.get_username\\(0\\), 'root'")
"self.fs.get_username(65534), 'nobody'")
- ;; Disable tests checking for root group
+ ;; Disable tests checking for root group.
(("self.fs.get_groupname\\(0\\)") "'root'"))
(substitute* "obnamlib/vfs_local.py"
- ;; Don't cover get_groupname function
+ ;; Don't cover get_groupname function.
(("def get_groupname\\(self, gid\\):")
"def get_groupname(self, gid): # pragma: no cover"))
- ;; Can't run network tests
- (zero? (system* "./check" "--unit-tests")))))))
+ ;; Can't run network tests.
+ (invoke "./check" "--unit-tests"))))))
(inputs
`(("python2-cliapp" ,python2-cliapp)
("python2-larch" ,python2-larch)
("python2-pep8" ,python2-pep8)
("python2-pylint" ,python2-pylint)))
(home-page "https://obnam.org/")
- (synopsis "Easy and secure backup program")
- (description "Obnam is an easy, secure backup program. Features
-include snapshot backups, data de-duplication and encrypted backups
-using GnuPG. Backups can be stored on local hard disks, or online via
-the SSH SFTP protocol. The backup server, if used, does not require
-any special software, on top of SSH.")
+ (synopsis "Retired backup program")
+ (description
+ "Warning: @uref{https://blog.liw.fi/posts/2017/08/13/retiring_obnam/,
+the Obnam project is retired}. You should use another backup solution instead.
+
+Obnam was an easy, secure backup program. Features included snapshot backups,
+data de-duplication and encrypted backups using GnuPG. Backups can be stored on
+local hard disks, or online via the SSH SFTP protocol. The backup server, if
+used, does not require any special software, on top of SSH.")
(license license:gpl3+)))
(define-public dirvish
(define-public restic
(package
(name "restic")
- (version "0.9.1")
+ (version "0.9.3")
;; TODO Try packaging the bundled / vendored dependencies in the 'vendor/'
;; directory.
(source (origin
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "15f0rsm2lxk4lmn4773q28g49p68pqyyx0ccp7r556asan73p79m"))))
+ "1l1ddnf61pfsrry97qwhhdzywin2mgnbrkhcc9pabsdfk602anmr"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/restic/restic"
(with-directory-excursion (string-append
"src/github.com/restic/restic-"
,version)
+ ;; Disable 'restic self-update'. It makes little sense in Guix.
+ (substitute* "build.go" (("selfupdate") ""))
+ (setenv "HOME" (getcwd)) ; for $HOME/.cache/go-build
(invoke "go" "run" "build.go"))))
+ (replace 'check
+ (lambda _
+ (with-directory-excursion (string-append
+ "src/github.com/restic/restic-"
+ ,version)
+ ;; Disable FUSE tests.
+ (setenv "RESTIC_TEST_FUSE" "0")
+ (invoke "go" "run" "build.go" "--test"))))
+
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
HCoop / jackhill / guix / guix.git / blobdiff