Merge master into staging

pkgs/tools/backup/ddar/default.nix

@@ -1,6 +1,6 @@
-{ lib, buildPythonApplication, fetchFromGitHub, protobuf, roundup }:
+{ lib, python2, fetchFromGitHub, roundup }:
 
-buildPythonApplication rec {
+python2.pkgs.buildPythonApplication rec {
   pname = "ddar";
   version = "1.0";
 
@@ -23,7 +23,7 @@ buildPythonApplication rec {
     make -f Makefile.prep synctus/ddar_pb2.py
   '';
 
-  propagatedBuildInputs = [ protobuf ];
+  propagatedBuildInputs = with python2.pkgs; [ protobuf ];
 
   checkInputs = [ roundup ];
 

pkgs/tools/backup/duply/default.nix

@@ -1,13 +1,14 @@
-{ stdenv, fetchurl, coreutils, python, duplicity, gawk, gnupg1, bash
+{ stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg1, bash
 , gnugrep, txt2man, makeWrapper, which
 }:
 
-stdenv.mkDerivation {
-  name = "duply-1.9.2";
+stdenv.mkDerivation rec {
+  name = "duply-${version}";
+  version = "2.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.9.x/duply_1.9.2.tgz";
-    sha256 = "1ay50rsr90dcnjncjclzfckqmxxnizmi4jhb5rsybfn0xdj0kz1b";
+    url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.1.x/duply_${version}.tgz";
+    sha256 = "0i5j7h7h6ssrwhll0sfhymisshg54kx7j45zcqffzjxa0ylvzlm8";
   };
 
   buildInputs = [ txt2man makeWrapper ];
@@ -19,7 +20,7 @@ stdenv.mkDerivation {
     mkdir -p "$out/share/man/man1"
     install -vD duply "$out/bin"
     wrapProgram "$out/bin/duply" --set PATH \
-        ${stdenv.lib.makeBinPath [ coreutils python duplicity gawk gnupg1 bash gnugrep txt2man which ]}
+        ${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg1 bash gnugrep txt2man which ]}
     "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1"
   '';
 

pkgs/tools/backup/restic/default.nix

@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "restic-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
 
   goPackagePath = "github.com/restic/restic";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "restic";
     repo = "restic";
     rev = "v${version}";
-    sha256 = "116dc86fjmflmk0n2nywvv2f6z1jig3czqxz0cx0z77n8rmj9npv";
+    sha256 = "0kl8yk636i3y7f2kd43pydjh4pv7hhq09p5k54jlysnrbf2kjb4h";
   };
 
   buildPhase = ''

pkgs/tools/backup/wal-g/default.nix

@@ -1,18 +1,14 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
-let
-  rev      = "966f3c5f45ba18b2225c5b06918e41f56e223e73";
-  revCount = "240";
-  sha256   = "1m70a5rpycrfwrrc83745mamgpg54pc0n75qpzr9jbvicbp8g66p";
-in
 buildGoPackage rec {
   name = "wal-g-${version}";
-  version = "0.1.8pre${revCount}_${builtins.substring 0 9 rev}";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
-    owner = "wal-g";
-    repo  = "wal-g";
-    inherit rev sha256;
+    owner  = "wal-g";
+    repo   = "wal-g";
+    rev    = "v${version}";
+    sha256 = "0klqnrrjzzxcj3clg7vapmbga1vqsfh8mkci5r2ir1bjp0z1xfnp";
   };
 
   goPackagePath = "github.com/wal-g/wal-g";