(Doesn't quite work nicely yet.) svn path=/nixpkgs/trunk/; revision=15163
svn path=/nixpkgs/trunk/; revision=15153