summary refs log tree commit diff
path: root/nixos/doc/manual
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-05-04 12:23:31 +0000
committerGitHub <noreply@github.com>2021-05-04 12:23:31 +0000
commitdfafc173e026a0353744b5937b50c317f9d50722 (patch)
tree5e3ae7d636e2c3251e8d3c948eb8bb48809dce59 /nixos/doc/manual
parentb6956b5ef8212d32362615d104849fd83d0fa1f8 (diff)
parent1a4bd0930709779caf3e0a83529af123d6b7d897 (diff)
downloadnixpkgs-dfafc173e026a0353744b5937b50c317f9d50722.tar
nixpkgs-dfafc173e026a0353744b5937b50c317f9d50722.tar.gz
nixpkgs-dfafc173e026a0353744b5937b50c317f9d50722.tar.bz2
nixpkgs-dfafc173e026a0353744b5937b50c317f9d50722.tar.lz
nixpkgs-dfafc173e026a0353744b5937b50c317f9d50722.tar.xz
nixpkgs-dfafc173e026a0353744b5937b50c317f9d50722.tar.zst
nixpkgs-dfafc173e026a0353744b5937b50c317f9d50722.zip
Merge staging-next into staging
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r--nixos/doc/manual/development/settings-options.xml12
1 files changed, 11 insertions, 1 deletions
diff --git a/nixos/doc/manual/development/settings-options.xml b/nixos/doc/manual/development/settings-options.xml
index 7795d7c8044..7292cac62b7 100644
--- a/nixos/doc/manual/development/settings-options.xml
+++ b/nixos/doc/manual/development/settings-options.xml
@@ -50,7 +50,7 @@
        </varlistentry>
        <varlistentry>
          <term>
-           <varname>pkgs.formats.ini</varname> { <replaceable>listsAsDuplicateKeys</replaceable> ? false, ... }
+           <varname>pkgs.formats.ini</varname> { <replaceable>listsAsDuplicateKeys</replaceable> ? false, <replaceable>listToValue</replaceable> ? null, ... }
          </term>
          <listitem>
            <para>
@@ -66,6 +66,16 @@
                    </para>
                  </listitem>
                </varlistentry>
+               <varlistentry>
+                 <term>
+                   <varname>listToValue</varname>
+                 </term>
+                 <listitem>
+                   <para>
+                     A function for turning a list of values into a single value.
+                   </para>
+                 </listitem>
+               </varlistentry>
              </variablelist>
             It returns a set with INI-specific attributes <varname>type</varname> and <varname>generate</varname> as specified <link linkend='pkgs-formats-result'>below</link>.
            </para>