This reverts commit b5ee55f81f.
The reason is that the args attribute in this case doesn't contain the
optional attributes which are specified, see here for example:
$ nix-instantiate --eval -E '(args@{ bar ? 111, ... }: args) {}'
{ }
$
This essentially breaks all VM tests, because stage-1 is passing all
arguments but pkgs/build-support/vm/default.nix does not.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
cb5e5a5b9d