NixOS/nixpkgs — pull request #4567 by abbradar (2014-10-17 12:10:00+00:00)
Title: Fixes and improvements to some packages

If it is needed, I can split this PR, but all this is fairly unobtrusive.