svn path=/nixpkgs/trunk/; revision=8709
* Backed out the curl change for now. svn path=/nixpkgs/trunk/; revision=8612