diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:16:36 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:17:42 +0200 |
commit | ef41fc7f5140a6d980faf7ed2a865ec2f092253b (patch) | |
tree | 81bcfcc47155b56618dd73934ba41d8d8c7fc309 /pkgs/tools/backup | |
parent | 656a0089f68495cd42d3164ed85d22ceec630d82 (diff) | |
parent | 893df17c5a37e14616a24e66d96f3fd5e0344bce (diff) | |
download | nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.gz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.bz2 nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.lz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.xz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.zst nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.zip |
Merge branch 'master' into staging
Hydra: ?compare=1399476
Diffstat (limited to 'pkgs/tools/backup')
-rw-r--r-- | pkgs/tools/backup/btrbk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/backup/duplicity/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index ff542e781a69..f9feaf40ec2f 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "btrbk-${version}"; - version = "0.24.0"; + version = "0.25.1"; src = fetchurl { url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz"; - sha256 = "01jrlswly28h4q4r3qfrzadz0pf0ms6wynmqhwddj1ahj31729h3"; + sha256 = "02qc9vbd5l0ywnv01p60v9q3dcx2z92dfaf95qf7ccxqaa9zxfr5"; }; patches = [ diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 313167b1ae27..d55783f7f2ce 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -11,7 +11,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; propagatedBuildInputs = with python2Packages; [ - boto cffi cryptography ecdsa enum idna + boto cffi cryptography ecdsa enum idna pygobject3 ipaddress lockfile paramiko pyasn1 pycrypto six ]; checkInputs = with python2Packages; [ lockfile mock pexpect ]; |