Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

doc/lib-functions: preserve libsets order

+16 -16
+13 -13
doc/doc-support/default.nix
··· 3 3 inherit (pkgs) lib; 4 4 inherit (lib) hasPrefix removePrefix; 5 5 6 - libsets = { 7 - asserts = "Assert functions"; 8 - attrsets = "Attribute-set functions"; 9 - strings = "String manipulation functions"; 10 - versions = "Version string functions"; 11 - trivial = "Miscellaneous functions"; 12 - lists = "List manipulation functions"; 13 - debug = "Debugging functions"; 14 - options = "NixOS / nixpkgs option handling"; 15 - filesystem = "Filesystem functions"; 16 - sources = "Source filtering functions"; 17 - cli = "Command-line serialization functions"; 18 - }; 6 + libsets = [ 7 + { name = "asserts"; description = "Assert functions"; } 8 + { name = "attrsets"; description = "Attribute-set functions"; } 9 + { name = "strings"; description = "String manipulation functions"; } 10 + { name = "versions"; description = "Version string functions"; } 11 + { name = "trivial"; description = "Miscellaneous functions"; } 12 + { name = "lists"; description = "List manipulation functions"; } 13 + { name = "debug"; description = "Debugging functions"; } 14 + { name = "options"; description = "NixOS / nixpkgs option handling"; } 15 + { name = "filesystem"; description = "Filesystem functions"; } 16 + { name = "sources"; description = "Source filtering functions"; } 17 + { name = "cli"; description = "Command-line serialization functions"; } 18 + ]; 19 19 20 20 locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs libsets; }; 21 21 functionDocs = import ./lib-function-docs.nix { inherit locationsXml pkgs libsets; };
+2 -2
doc/doc-support/lib-function-docs.nix
··· 20 20 <root xmlns:xi="http://www.w3.org/2001/XInclude"> 21 21 EOF 22 22 23 - ${lib.concatStrings (lib.mapAttrsToList (name: description: '' 23 + ${lib.concatMapStrings ({ name, description }: '' 24 24 docgen ${name} ${lib.escapeShellArg description} 25 - '') libsets)} 25 + '') libsets} 26 26 27 27 echo "</root>" >> "$out/index.xml" 28 28
+1 -1
doc/doc-support/lib-function-locations.nix
··· 16 16 subsetname = subsetname; 17 17 functions = libDefPos toplib.${subsetname}; 18 18 }) 19 - (builtins.attrNames libsets); 19 + (builtins.map (x: x.name) libsets); 20 20 21 21 nixpkgsLib = pkgs.lib; 22 22