Fix failing NixOS tests on master

[Ericson2314]

We will need to bump to a commit containing the NixOS/nixpkgs#271423 backport (easy) but also containing the two PRs we rely on today which, while based on master commits, had to be merged to staging branches.

@vcunat (thanks!) says there will be another staging-next-23.05 -> release-23.05 in a week or so, after which we'll be good on that.

Once this is done, Hydra should be all green again, and it will be easier to land #9535 safely.

[vcunat]

I expect this is the PR which you might want to watch to merge: NixOS/nixpkgs#273936

[Ericson2314]

Thanks @vcunat!