And add package meta data.
svn path=/nixpkgs/trunk/; revision=34305
svn path=/nixpkgs/trunk/; revision=17346