about summary refs log tree commit diff
path: root/doc/functions
diff options
context:
space:
mode:
authorNaïm Favier <n@monade.li>2022-12-11 15:56:09 +0100
committerNaïm Favier <n@monade.li>2022-12-22 11:31:08 +0100
commit8906aa28e4de1f1b53a99691c1373292f1106766 (patch)
tree075ff85215c4658a0e8e93b9cac12051ae1962bf /doc/functions
parentcd39b90b6f5c7333116c75b1cb9a132cf2d56714 (diff)
doc/lib-functions: remove warnings
Building the nixpkgs manual currently triggers a bunch of deprecation
warnings, because every attribute in `lib` is evaluated to see if it's
an attrset to generate locations for.

Instead, share the lib subsets to include in the documentation
between `lib-function-docs` and `lib-function-locations` so they can
coordinate.

Also generate the list of sections instead of duplicating it in
`library.xml`.
Diffstat (limited to 'doc/functions')
-rw-r--r--doc/functions/library.xml24
1 files changed, 3 insertions, 21 deletions
diff --git a/doc/functions/library.xml b/doc/functions/library.xml
index 0a8bae229f261..788ea0b94f1fe 100644
--- a/doc/functions/library.xml
+++ b/doc/functions/library.xml
@@ -8,25 +8,7 @@
   Nixpkgs provides a standard library at <varname>pkgs.lib</varname>, or through <code>import &lt;nixpkgs/lib&gt;</code>.
  </para>
 
-<!-- These docs are generated via nixdoc. To add another generated
-      library function file to this list, the file
-      `lib-function-docs.nix` must also be updated. -->
-
- <xi:include href="./library/generated/asserts.xml" />
-
- <xi:include href="./library/generated/attrsets.xml" />
-
- <xi:include href="./library/generated/strings.xml" />
-
- <xi:include href="./library/generated/trivial.xml" />
-
- <xi:include href="./library/generated/lists.xml" />
-
- <xi:include href="./library/generated/debug.xml" />
-
- <xi:include href="./library/generated/options.xml" />
-
- <xi:include href="./library/generated/filesystem.xml" />
-
- <xi:include href="./library/generated/sources.xml" />
+ <!-- The index must have a root element to declare namespaces, but we
+      don't want to include it, so we select all of its children. -->
+ <xi:include href="./library/generated/index.xml" xpointer="xpointer(/root/*)" />
 </section>