Merge staging-next into staging

2020-10-06 10:25:58 +02:00
parent c1a0aa7eb7 82390e2647
commit 692d219a93
646 changed files with 11286 additions and 6998 deletions
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -499,6 +499,7 @@ rec {
        show = v:
               if builtins.isString v then ''"${v}"''
          else if builtins.isInt v then builtins.toString v
+          else if builtins.isBool v then if v then "true" else "false"
          else ''<${builtins.typeOf v}>'';
      in
      mkOptionType rec {