Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1525828

pkgs/tools/backup/bacula/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "bacula-9.4.3";
+  name = "bacula-9.4.4";
 
   src = fetchurl {
     url    = "mirror://sourceforge/bacula/${name}.tar.gz";
-    sha256 = "07ablpfc4q7yr6hmff21dssqpg8gvvq2xfnfs9s3danwc321rd2g";
+    sha256 = "1gi0zkkzh6a87xk4sm051hwz5bv4qc4kbl6hk40752knr817mqqg";
   };
 
   buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]

pkgs/tools/backup/borg/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, python3, acl, libb2, lz4, zstd, openssl, openssh }:
+{ stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "borgbackup";

pkgs/tools/backup/dedup/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, lz4, snappy, libsodium
+{ stdenv, fetchurl, lz4, snappy, libsodium
 # For testing
 , coreutils, gawk
 }:

pkgs/tools/backup/dirvish/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeWrapper, perl, rsync, perlPackages }:
+{ fetchurl, stdenv, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
   name = "dirvish-1.2.1";