Merge pull request #117301 from mweinelt/borgbackup

This commit is contained in:
Jörg Thalheim 2021-03-25 08:45:07 +00:00 committed by GitHub
commit 82515ef0d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 { python3.pkgs.buildPythonApplication rec {
pname = "borgbackup"; pname = "borgbackup";
version = "1.1.15"; version = "1.1.16";
src = python3.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9"; sha256 = "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw";
}; };
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [
setuptools-scm
# For building documentation: # For building documentation:
sphinx guzzle_sphinx_theme sphinx guzzle_sphinx_theme
]; ];
buildInputs = [ buildInputs = [
libb2 lz4 zstd openssl python3.pkgs.setuptools_scm libb2 lz4 zstd openssl
] ++ lib.optionals stdenv.isLinux [ acl ]; ] ++ lib.optionals stdenv.isLinux [ acl ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
cython llfuse cython llfuse
@ -24,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
export BORG_OPENSSL_PREFIX="${openssl.dev}" export BORG_OPENSSL_PREFIX="${openssl.dev}"
export BORG_LZ4_PREFIX="${lz4.dev}" export BORG_LZ4_PREFIX="${lz4.dev}"
export BORG_LIBB2_PREFIX="${libb2}" export BORG_LIBB2_PREFIX="${libb2}"
export BORG_LIBZSTD_PREFIX="${zstd}" export BORG_LIBZSTD_PREFIX="${zstd.dev}"
''; '';
makeWrapperArgs = [ makeWrapperArgs = [
@ -61,6 +62,10 @@ python3.pkgs.buildPythonApplication rec {
# 64 failures, needs pytest-benchmark # 64 failures, needs pytest-benchmark
doCheck = false; doCheck = false;
passthru.tests = {
inherit (nixosTests) borgbackup;
};
meta = with lib; { meta = with lib; {
description = "Deduplicating archiver with compression and encryption"; description = "Deduplicating archiver with compression and encryption";
homepage = "https://www.borgbackup.org"; homepage = "https://www.borgbackup.org";