some cleanup for hydra's sake
Merge branch 'master' of https://github.com/joelteon/nixpkgs