Thanks to @tomprince for the suggestion.

Thanks @tomprince!

The nixpkgs fork already contains all of the changes our overlays were
responsible for - but as direct nixpkgs changes instead.

Rely on upstream package to supply typing and challenge-bypass-ristretto as
necessary.  Simplify our expression (approximately pointfree style) so we
don't have to know about any other arguments that might be passed or accepted.