nixos/modules: Replace all nested types.either's with types.oneOf's

2019-08-08 23:35:52 +02:00
parent 9a44f44d4c
commit 88bb9fa403
12 changed files with 13 additions and 13 deletions
@@ -62,9 +62,9 @@ let
      concatStringsSep "\n" (toLines cfg.config);

  semanticTypes = with types; rec {
-    zncAtom = nullOr (either (either int bool) str);
+    zncAtom = nullOr (oneOf [ int bool str ]);
    zncAttr = attrsOf (nullOr zncConf);
-    zncAll = either (either zncAtom (listOf zncAtom)) zncAttr;
+    zncAll = oneOf [ zncAtom (listOf zncAtom) zncAttr ];
    zncConf = attrsOf (zncAll // {
      # Since this is a recursive type and the description by default contains
      # the description of its subtypes, infinite recursion would occur without