top-level: Splice in more package sets for new types of deps

This is done in preparation for the next commit where, among other
changes, I add support for the new `dep*` attributes.