Mostly automatic changes. Will fix evaluation/compilation later. svn path=/nixpkgs/trunk/; revision=25933
svn path=/nixpkgs/trunk/; revision=25279