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.

1 files changed, 2 insertions, 3 deletions

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 = {