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
..
acpid.nix	* Use the ‘path’ attribute in Upstart jobs in more places. It's a bit	2011-11-25 16:32:54 +00:00
bluetooth.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
hal.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
pcscd.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
sane.nix	Apply mornfall's SANE patches	2011-12-05 17:32:45 +00:00
udev.nix	switched all mergeOptionString to pkgs.lib.types.string	2011-12-29 00:51:35 +00:00
udisks.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
upower.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00