Author: NicolasPierron
Date: Wed Jul 27 20:55:35 2011
New Revision: 27978
URL: https://svn.nixos.org/websvn/nix/?rev=27978&sc=1
Log:
Experiment with dual option types (list & attribute sets).
Modified:
nixos/trunk/modules/system/upstart/upstart.nix
nixos/trunk/modules/tasks/filesystems.nix
Modified: nixos/trunk/modules/system/upstart/upstart.nix
==============================================================================
--- nixos/trunk/modules/system/upstart/upstart.nix Wed Jul 27 20:55:28
2011 (r27977)
+++ nixos/trunk/modules/system/upstart/upstart.nix Wed Jul 27 20:55:35
2011 (r27978)
@@ -322,7 +322,7 @@
This option defines the system jobs started and managed by the
Upstart daemon.
'';
- type = types.attrsOf types.optionSet;
+ type = types.loaOf types.optionSet;
options = [ jobOptions upstartJob ];
};
Modified: nixos/trunk/modules/tasks/filesystems.nix
==============================================================================
--- nixos/trunk/modules/tasks/filesystems.nix Wed Jul 27 20:55:28 2011
(r27977)
+++ nixos/trunk/modules/tasks/filesystems.nix Wed Jul 27 20:55:35 2011
(r27978)
@@ -50,7 +50,8 @@
<command>mkdir -p</command> .
";
- type = types.nullOr (types.list types.optionSet);
+ type = types.nullOr (types.loaOf types.optionSet);
+ apply = x: attrValues x;
options = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
