-- also removed poorly considered earlier individual patches. svn path=/nixpkgs/trunk/; revision=26810
svn path=/nixpkgs/trunk/; revision=26809
svn path=/nixpkgs/trunk/; revision=23953