Merge staging-next into staging

pkgs/applications/networking/sync/rsync/default.nix

@@ -5,6 +5,7 @@
 , enableXXHash ? true, xxHash ? null
 , enableZstd ? true, zstd ? null
 , enableCopyDevicesPatch ? false
+, nixosTests
 }:
 
 assert enableACLs -> acl != null;
@@ -36,6 +37,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = ["--with-nobody-group=nogroup"];
 
+  passthru.tests = { inherit (nixosTests) rsyncd; };
+
   meta = base.meta // {
     description = "A fast incremental file transfer utility";
     maintainers = with stdenv.lib.maintainers; [ peti ehmry kampfschlaefer ];