Merge branch 'master' into staging

Hydra: ?compare=1399476
2017-10-07 10:17:42 +02:00
parent 656a0089f6 893df17c5a
commit ef41fc7f51
89 changed files with 2041 additions and 888 deletions
@@ -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 = [
@@ -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 ];