diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-07 11:53:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-07 11:53:02 +0100 |
| commit | 8a2026a37cdb37bba8895d251114112206077d95 (patch) | |
| tree | 425422f70aaeffd37a2bb2bed414baa990fb9864 /pkgs/tools | |
| parent | 68bd7c306296fdccf4821f0028979db05125e4d7 (diff) | |
| parent | 0cfc923813f803c7a169d257ce856173a2387ffc (diff) | |
| download | nixlib-8a2026a37cdb37bba8895d251114112206077d95.tar nixlib-8a2026a37cdb37bba8895d251114112206077d95.tar.gz nixlib-8a2026a37cdb37bba8895d251114112206077d95.tar.bz2 nixlib-8a2026a37cdb37bba8895d251114112206077d95.tar.lz nixlib-8a2026a37cdb37bba8895d251114112206077d95.tar.xz nixlib-8a2026a37cdb37bba8895d251114112206077d95.tar.zst nixlib-8a2026a37cdb37bba8895d251114112206077d95.zip | |
Merge pull request #47986 from erictapen/borgbackup-cherry-4093
borgbackup: patch bug that allowed for exceeding quotas
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/backup/borg/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index fe2f771c7227..72f6cd03e038 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -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 |