svn path=/nixpkgs/trunk/; revision=8166
ignoring collisions and selectively including directories. svn path=/nixpkgs/trunk/; revision=7160