5fbb4da862
...into staging-next, i.e. this will come to nixpkgs master earlier
than the first merge of the PR in commit d58e2d51a5.