Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

borgbackup: 1.1.15 -> 1.1.16 #117301

Merged
merged 4 commits into from Mar 25, 2021
Merged

borgbackup: 1.1.15 -> 1.1.16 #117301

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f146d46
borgbackup: 1.1.15 -> 1.1.16
mweinelt Mar 23, 2021
6761a8e
borgbackup: use correct output for zstd headers
dotlambda Mar 23, 2021
966e030
borgbackup: add passthru.tests
dotlambda Mar 23, 2021
05bf5d7
borgbackup: move setuptools-scm to nativeBuildInputs
dotlambda Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 10 additions & 5 deletions pkgs/tools/backup/borg/default.nix
View file
Open in desktop
@@ -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
Expand All @@ -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 = [
Expand Down Expand Up @@ -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";
Expand Down