svn path=/nixpkgs/branches/modular-python/; revision=26565
Committing on behalf of Cillian de Róiste <cillian.deroiste@gmail.com>. svn path=/nixpkgs/trunk/; revision=24928