Merge branch 'master' into staging-next

(a trivial conflict in transmission)

pkgs/tools/networking/findomain/default.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "findomain";
-  version = "4.0.1";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "Edu4rdSHL";
     repo = pname;
     rev = version;
-    sha256 = "sha256-uv1boI9iaBeobo/58Di4oslh1eGLuK9HR5EwQQeWn+0=";
+    sha256 = "sha256-kzB6HIZK1XRxnjg5FvUWESalrYppJiiXVI8DBsDpLu8=";
   };
 
-  cargoSha256 = "sha256-31OD/sv4br9cdBNqNGr4McypSGkBbKs7b7H1u7mFt3o=";
+  cargoSha256 = "sha256-2XftJ/T8wSaHXVgqbWY6EAmaVBXEzM+J6TSOJ0QFR3g=";
 
   nativeBuildInputs = [ installShellFiles perl ];
   buildInputs = lib.optional stdenv.isDarwin Security;

pkgs/tools/networking/miniupnpd/default.nix

@@ -1,5 +1,6 @@
 { stdenv, lib, fetchurl, iptables, libuuid, pkg-config
 , which, iproute2, gnused, coreutils, gawk, makeWrapper
+, nixosTests
 }:
 
 let
@@ -30,6 +31,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru.tests = {
+    bittorrent-integration = nixosTests.bittorrent;
+  };
+
   meta = with lib; {
     homepage = "http://miniupnp.free.fr/";
     description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification";

pkgs/tools/networking/openssh/common.nix

@@ -22,6 +22,7 @@
 , withKerberos ? true
 , libkrb5
 , libfido2
+, nixosTests
 , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl
 , linkOpenssl ? true
 }:
@@ -111,6 +112,10 @@ stdenv.mkDerivation rec {
     "sysconfdir=\${out}/etc/ssh"
   ];
 
+  passthru.tests = {
+    borgbackup-integration = nixosTests.borgbackup;
+  };
+
   meta = {
     description = "An implementation of the SSH protocol${extraDesc}";
     homepage = "https://www.openssh.com/";