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
..
autofs.nix	autofs: add sshfs to PATH	2011-09-20 07:14:24 +00:00
disnix.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
felix.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
folding-at-home.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
gpsd.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
nix-daemon.nix	switched all mergeOptionString to pkgs.lib.types.string	2011-12-29 00:51:35 +00:00
nix-gc.nix	* Add options to handle automatic calls to the garbage collector.	2009-12-04 12:50:44 +00:00
nixos-manual.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
rogue.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
svnserve.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
synergy.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
virtualbox.nix	Make VirtualBox Guest Additions use the configured kernel.	2011-09-19 13:20:09 +00:00