diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-03-25 08:45:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-25 08:45:07 +0000 |
commit | 82515ef0d8509325a122dc674f4303e78a3e4bea (patch) | |
tree | 66d111d852ab9495c4420e84055e25fb5aa8531a /pkgs/tools | |
parent | 3f9d424f348d0fa0e1943f92ddf013f63bc5b2de (diff) | |
parent | 05bf5d726dfcfaf6c4816276473cc742e9df437c (diff) |
Merge pull request #117301 from mweinelt/borgbackup
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/backup/borg/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 4b8908448f68..f07b19830de3 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,20 +1,21 @@ -{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh }: +{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.15"; + version = "1.1.16"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9"; + sha256 = "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw"; }; nativeBuildInputs = with python3.pkgs; [ + setuptools-scm # For building documentation: sphinx guzzle_sphinx_theme ]; buildInputs = [ - libb2 lz4 zstd openssl python3.pkgs.setuptools_scm + libb2 lz4 zstd openssl ] ++ lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3.pkgs; [ cython llfuse @@ -24,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { export BORG_OPENSSL_PREFIX="${openssl.dev}" export BORG_LZ4_PREFIX="${lz4.dev}" export BORG_LIBB2_PREFIX="${libb2}" - export BORG_LIBZSTD_PREFIX="${zstd}" + export BORG_LIBZSTD_PREFIX="${zstd.dev}" ''; makeWrapperArgs = [ @@ -61,6 +62,10 @@ python3.pkgs.buildPythonApplication rec { # 64 failures, needs pytest-benchmark doCheck = false; + passthru.tests = { + inherit (nixosTests) borgbackup; + }; + meta = with lib; { description = "Deduplicating archiver with compression and encryption"; homepage = "https://www.borgbackup.org"; |