From f3d94cfc23a2787772a369e2ca9e0cd94e72b8b3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Mar 2016 20:47:08 +0100 Subject: Revert "Add the tool "nixos-typecheck" that can check an option declaration to:" This reverts commit cad8957eabcbf73062226d28366fd446c15c8737. It breaks NixOps, but more importantly, such major changes to the module system really need to be reviewed. --- nixos/modules/system/boot/systemd-unit-options.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'nixos/modules/system/boot/systemd-unit-options.nix') diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 16d0e098b8c..d4cab93b26b 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -17,15 +17,14 @@ in rec { unitOption = mkOptionType { name = "systemd option"; - typerep = "(systemdOption)"; - merge = _module: loc: defs: + merge = loc: defs: let defs' = filterOverrides defs; defs'' = getValues defs'; in if isList (head defs'') then concatLists defs'' - else mergeOneOption _module loc defs'; + else mergeOneOption loc defs'; }; sharedOptions = { -- cgit 1.4.1