Merge branch 'staging'

Hydra looks very good: https://hydra.nixos.org/eval/1409475?compare=1409440
There's mainly some fallout from aarch64-linux not building `go`
on the first attempt.