svn path=/nixpkgs/trunk/; revision=28357
Also add to nixpkgs new dependencies from hackage. svn path=/nixpkgs/trunk/; revision=26283