diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
| commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
| tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/doc/functions | |
| parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
| parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
| download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/doc/functions')
| -rw-r--r-- | nixpkgs/doc/functions/library/attrsets.xml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nixpkgs/doc/functions/library/attrsets.xml b/nixpkgs/doc/functions/library/attrsets.xml index 7ef0d16624c8..de8414249abf 100644 --- a/nixpkgs/doc/functions/library/attrsets.xml +++ b/nixpkgs/doc/functions/library/attrsets.xml @@ -7,7 +7,7 @@ <section xml:id="function-library-lib.attrsets.attrByPath"> <title><function>lib.attrset.attrByPath</function></title> - <subtitle><literal>attrByPath :: [String] -> Any -> AttrSet</literal> + <subtitle><literal>attrByPath :: [String] -> Any -> AttrSet -> Any</literal> </subtitle> <xi:include href="./locations.xml" xpointer="lib.attrsets.attrByPath" /> @@ -1677,8 +1677,7 @@ recursiveUpdate <xi:include href="./locations.xml" xpointer="lib.attrsets.recurseIntoAttrs" /> <para> - Make various Nix tools consider the contents of the resulting - attribute set when looking for what to build, find, etc. + Make various Nix tools consider the contents of the resulting attribute set when looking for what to build, find, etc. </para> <para> @@ -1720,7 +1719,7 @@ recursiveUpdate <xi:include href="./locations.xml" xpointer="lib.attrsets.cartesianProductOfSets" /> <para> - Return the cartesian product of attribute set value combinations. + Return the cartesian product of attribute set value combinations. </para> <variablelist> @@ -1749,5 +1748,4 @@ cartesianProductOfSets { a = [ 1 2 ]; b = [ 10 20 ]; } ]]></programlisting> </example> </section> - </section> |