public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51791 from dotlambda/borgbackup-1.1.8

Browse Source 
borgbackup: 1.1.7 -> 1.1.8
This commit is contained in:
markuskowa 2018-12-09 22:34:02 +01:00 committed by GitHub
commit c362f98ba0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/tests/borgbackup.nix
View File

@ -130,6 +130,9 @@ in {
# Make sure keepFile has the correct content
$client->succeed("$borg extract '${localRepo}::${archiveName}'");
$client->succeed('c=$(cat ${dataDir}/${keepFile}) && [[ "$c" == "${keepFileData}" ]]');
# Make sure the same is true when using `borg mount`
$client->succeed("mkdir -p /mnt/borg && $borg mount '${localRepo}::${archiveName}' /mnt/borg");
$client->succeed('c=$(cat /mnt/borg/${dataDir}/${keepFile}) && [[ "$c" == "${keepFileData}" ]]');
};
subtest "remote", sub {

13
pkgs/tools/backup/borg/default.nix
View File

@ -2,22 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "borgbackup";
version = "1.1.7";
version = "1.1.8";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc";
sha256 = "0b4370480ca0114cb0bb534286241af8a35c6ffb71404dfa409ed06099661b63";
};
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