Unverified Commit 2b2df960 authored by Johannes Kirschbauer's avatar Johannes Kirschbauer Committed by GitHub
Browse files

lib/types: submodule fix description with freeformType (#443134)

parents 7e0bcb51 35cb0d92

lib/tests/modules.sh

+3 −0
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ checkConfigError 'A definition for option .intStrings\.badTagTypeError\.left. is 
checkConfigError 'A definition for option .nested\.right\.left. is not of type .signed integer.' config.nested.right.left ./types-attrTag.nix

checkConfigError 'In attrTag, each tag value must be an option, but tag int was a bare type, not wrapped in mkOption.' config.opt.int ./types-attrTag-wrong-decl.nix



# types

checkConfigOutput '"ok"' config.assertions ./types.nix



# types.pathInStore

checkConfigOutput '".*/store/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./types.nix

checkConfigOutput '".*/store/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./types.nix

lib/tests/modules/types.nix

+459 −0

File changed.

Preview size limit exceeded, changes collapsed.

lib/types.nix

+8 −1
Original line number Diff line number Diff line
@@ -1247,7 +1247,14 @@ let 
              let

                docsEval = base.extendModules { modules = [ noCheckForDocsModule ]; };

              in

              docsEval._module.freeformType.description or name;

              if docsEval._module.freeformType ? description then

                "open ${name} of ${

                  optionDescriptionPhrase (

                    class: class == "noun" || class == "composite"

                  ) docsEval._module.freeformType

                }"

              else

                name;

          inherit check;

          merge = {

            __functor =