diff options
| author | Leo Famulari <leo@famulari.name> | 2018-01-11 14:22:50 -0800 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-01-11 14:22:50 -0800 |
| commit | 4adb40bffc0dda8871878283887a0e0cd88d9578 (patch) | |
| tree | 74d5fb686116002da72de4a1075d0ed8f307cec1 /gnu/packages/backup.scm | |
| parent | 4610ab7c9a5327df0d475262817bc081a5891aa8 (diff) | |
| parent | 138c08899ba73049de8afd2b74a8cf6845a1d9e1 (diff) | |
| download | guix-patches-4adb40bffc0dda8871878283887a0e0cd88d9578.tar guix-patches-4adb40bffc0dda8871878283887a0e0cd88d9578.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/backup.scm')
| -rw-r--r-- | gnu/packages/backup.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index b29256d1b0..6da09750e8 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> -;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> @@ -38,6 +38,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages dejagnu) #:use-module (gnu packages ftp) @@ -469,7 +470,7 @@ detection, and lossless compression.") ;; Remove bundled shared libraries. (with-directory-excursion "src/borg/algorithms" (for-each delete-file-recursively - (list "lz4" "zstd"))))))) + (list "blake2" "lz4" "zstd"))))))) (build-system python-build-system) (arguments `(#:modules ((srfi srfi-26) ; for cut @@ -480,9 +481,11 @@ detection, and lossless compression.") (add-after 'unpack 'set-env (lambda* (#:key inputs #:allow-other-keys) (let ((openssl (assoc-ref inputs "openssl")) + (libb2 (assoc-ref inputs "libb2")) (lz4 (assoc-ref inputs "lz4")) (zstd (assoc-ref inputs "zstd"))) (setenv "BORG_OPENSSL_PREFIX" openssl) + (setenv "BORG_LIBB2_PREFIX" libb2) (setenv "BORG_LIBLZ4_PREFIX" lz4) (setenv "BORG_LIBZSTD_PREFIX" zstd) (setenv "PYTHON_EGG_CACHE" "/tmp") @@ -542,6 +545,7 @@ detection, and lossless compression.") ("python-guzzle-sphinx-theme" ,python-guzzle-sphinx-theme))) (inputs `(("acl" ,acl) + ("libb2" ,libb2) ("lz4" ,lz4) ("openssl" ,openssl) ("python-llfuse" ,python-llfuse) |