I really should have done these changes in a topic branch, sorry svn path=/nixpkgs/trunk/; revision=29567