svn path=/nixos/branches/modular-nixos/; revision=16065
svn path=/nixos/branches/modular-nixos/; revision=15750