Commit b521f451 authored by pennae's avatar pennae
Browse files

doc-support: don't expose locationsXml 

nothing except function docs uses this, so we need not expose it. we'll
be reworking this entire section of the build anyway, with the target of
breaking up doc-support as it is now.
parent a5414c29

doc/doc-support/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ let 
    { 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; };

  functionDocs = import ./lib-function-docs.nix { inherit pkgs nixpkgs libsets; };

  version = pkgs.lib.version;



  epub-xsl = pkgs.writeText "epub.xsl" ''
@@ -69,7 +68,6 @@ in pkgs.runCommand "doc-support" {} 
  mkdir result

  (

    cd result

    ln -s ${locationsXml} ./function-locations.xml

    ln -s ${functionDocs} ./function-docs

    ln -s ${optionsDoc.optionsDocBook} ./config-options.docbook.xml

doc/doc-support/lib-function-docs.nix

+7 −2
Original line number Diff line number Diff line 
# Generates the documentation for library functions via nixdoc.



{ pkgs, locationsXml, libsets }:

{ pkgs, nixpkgs, libsets }:



with pkgs; stdenv.mkDerivation {

with pkgs;



let

  locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs libsets; };

in

stdenv.mkDerivation {

  name = "nixpkgs-lib-docs";

  src = ../../lib;