svn path=/nixos/branches/modular-nixos/; revision=15725
svn path=/nixos/branches/modular-nixos/; revision=15722