Merge branch 'master' into staging-next

Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e105 which
adapts #69210 to master that doesn't yet have
329a88ef

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works