Upstream nixpkgs has upgraded these packages

So we don't have to override them to get a new version anymore.  Also,
upstream has done a better job of integrating them into the overall system
than we have (with respect to other upstream changes).