Everything seems to be working.

I'm going to start another merge immediately, so we're fully up to
date.  But the Nixpkgs I merged in was only from last week, so it
shouldn't be too hard.