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
..
activation	* Add a module for managing cgroups.	2011-11-24 18:28:45 +00:00
boot	switched all mergeOptionString to pkgs.lib.types.string	2011-12-29 00:51:35 +00:00
etc	Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.	2011-10-30 15:19:58 +00:00
upstart	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
upstart-events	Asking for an interactive shell in case of error umounting filesystems. I've	2011-12-26 16:40:13 +00:00