Merge pull request #47986 from erictapen/borgbackup-cherry-4093

borgbackup: patch bug that allowed for exceeding quotas
This commit is contained in:
Jörg Thalheim 2018-10-07 11:53:02 +01:00 committed by GitHub
commit 8a2026a37c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ stdenv, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }:
{ stdenv, fetchpatch, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }:
python3Packages.buildPythonApplication rec {
pname = "borgbackup";
@ -9,6 +9,15 @@ python3Packages.buildPythonApplication rec {
sha256 = "f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc";
};
patches = [
# Workarounds for https://github.com/borgbackup/borg/issues/4093
# Can be deleted when 1.1.8 comes out
(fetchpatch {
url = "https://github.com/borgbackup/borg/commit/975cc33206e0e3644626fb7204c34d2157715b61.patch";
sha256 = "0b7apaixpa7bk0sy7g5ycm98cjpkg5gkwcgm7m37xj35lzxdlxhc";
})
];
nativeBuildInputs = with python3Packages; [
# For building documentation:
sphinx guzzle_sphinx_theme