This also updates some python libraries and fixes some things I forgot to patch svn path=/nixpkgs/trunk/; revision=21171
svn path=/nixpkgs/trunk/; revision=21132