types.optionSet: deprecate and remove last usages

2019-01-31 00:41:10 +02:00
parent aa2e63ce5e
commit 27982b408e
10 changed files with 45 additions and 55 deletions
@@ -469,10 +469,7 @@ rec {
    # Obsolete alternative to configOf.  It takes its option
    # declarations from the ‘options’ attribute of containing option
    # declaration.
-    optionSet = mkOptionType {
-      name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "optionSet";
-      description = "option set";
-    };
+    optionSet = builtins.throw "types.optionSet is deprecated; use types.submodule instead" "optionSet";

    # Augment the given type with an additional type check function.
    addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; };