Florian Friesdorf eb755d4692 switched all mergeOptionString to pkgs.lib.types.string ... pierron recommended the use of types.string over mergeOptionString, as it is superior but might break things. For my system the change evaluated to the exactly same. svn path=/nixos/trunk/; revision=31138		2011-12-29 00:51:35 +00:00
..
bash	switched all mergeOptionString to pkgs.lib.types.string	2011-12-29 00:51:35 +00:00
blcr.nix	Make blcr module use the configured kernel	2011-09-21 13:13:36 +00:00
info.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
shadow.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
ssh.nix	Update users of `services.sshd'.	2010-03-11 17:02:53 +00:00
ssmtp.nix	Rename environment.extraPackages to environment.systemPackages.	2009-10-07 17:14:25 +00:00
wvdial.nix	wvdial: don't make wvdial a system package; only root can run it	2011-11-25 17:41:47 +00:00