diff options
author | Naïm Favier <n@monade.li> | 2022-12-12 12:21:59 +0100 |
---|---|---|
committer | Naïm Favier <n@monade.li> | 2022-12-22 11:31:11 +0100 |
commit | ce952286ca8a37e8c63d9627aec2f0dc2c2913f2 (patch) | |
tree | 3ac3eca07eda5a24b7805c3fccefa1cd882a339c /doc/doc-support | |
parent | e1bb8f1e74895b6c4365e0fb7dcded9f69d39358 (diff) |
doc/lib-functions: preserve libsets order
Diffstat (limited to 'doc/doc-support')
-rw-r--r-- | doc/doc-support/default.nix | 26 | ||||
-rw-r--r-- | doc/doc-support/lib-function-docs.nix | 4 | ||||
-rw-r--r-- | doc/doc-support/lib-function-locations.nix | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/doc/doc-support/default.nix b/doc/doc-support/default.nix index d8ac4a6787b23..c55df4ce870e5 100644 --- a/doc/doc-support/default.nix +++ b/doc/doc-support/default.nix @@ -3,19 +3,19 @@ let inherit (pkgs) lib; inherit (lib) hasPrefix removePrefix; - libsets = { - asserts = "Assert functions"; - attrsets = "Attribute-set functions"; - strings = "String manipulation functions"; - versions = "Version string functions"; - trivial = "Miscellaneous functions"; - lists = "List manipulation functions"; - debug = "Debugging functions"; - options = "NixOS / nixpkgs option handling"; - filesystem = "Filesystem functions"; - sources = "Source filtering functions"; - cli = "Command-line serialization functions"; - }; + libsets = [ + { name = "asserts"; description = "Assert functions"; } + { name = "attrsets"; description = "Attribute-set functions"; } + { name = "strings"; description = "String manipulation functions"; } + { name = "versions"; description = "Version string functions"; } + { name = "trivial"; description = "Miscellaneous functions"; } + { name = "lists"; description = "List manipulation functions"; } + { name = "debug"; description = "Debugging functions"; } + { name = "options"; description = "NixOS / nixpkgs option handling"; } + { name = "filesystem"; description = "Filesystem functions"; } + { name = "sources"; description = "Source filtering functions"; } + { name = "cli"; description = "Command-line serialization functions"; } + ]; locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs libsets; }; functionDocs = import ./lib-function-docs.nix { inherit locationsXml pkgs libsets; }; diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index a11de1a9f6f1b..d3d90d98c9814 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -20,9 +20,9 @@ with pkgs; stdenv.mkDerivation { <root xmlns:xi="http://www.w3.org/2001/XInclude"> EOF - ${lib.concatStrings (lib.mapAttrsToList (name: description: '' + ${lib.concatMapStrings ({ name, description }: '' docgen ${name} ${lib.escapeShellArg description} - '') libsets)} + '') libsets} echo "</root>" >> "$out/index.xml" diff --git a/doc/doc-support/lib-function-locations.nix b/doc/doc-support/lib-function-locations.nix index 7db176256e0ae..ae1123c63ad30 100644 --- a/doc/doc-support/lib-function-locations.nix +++ b/doc/doc-support/lib-function-locations.nix @@ -16,7 +16,7 @@ let subsetname = subsetname; functions = libDefPos toplib.${subsetname}; }) - (builtins.attrNames libsets); + (builtins.map (x: x.name) libsets); nixpkgsLib = pkgs.lib; |