svn path=/nixpkgs/trunk/; revision=28418
Some downgrades were necessary. svn path=/nixpkgs/trunk/; revision=28364