commit 068916ae8fccebf137ffe68b511bff26f1069ef8 · pyrox.dev/nixpkgs

+6 -6
pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py
···

       16
       16
        
       

     

       17
       17
        
       class ManualDocBookRenderer(DocBookRenderer):

     

       18
       18
        
           _toplevel_tag: str

     

       19
       19
       +
           _revision: str

     

       19
       20
        
       

     

       20
       20
       -
           def __init__(self, toplevel_tag: str, manpage_urls: Mapping[str, str]):

     

       21
       21
       +
           def __init__(self, toplevel_tag: str, revision: str, manpage_urls: Mapping[str, str]):

     

       21
       22
        
               super().__init__(manpage_urls)

     

       22
       23
        
               self._toplevel_tag = toplevel_tag

     

       24
       24
       +
               self._revision = revision

     

       23
       25
        
               self.rules |= {

     

       24
       26
        
                   'included_sections': lambda *args: self._included_thing("section", *args),

     

       25
       27
        
                   'included_chapters': lambda *args: self._included_thing("chapter", *args),

     
···

       87
       89
        
                   self._headings[-1] = self._headings[-1]._replace(partintro_closed=True)

     

       88
       90
        
               # must nest properly for structural includes. this requires saving at least

     

       89
       91
        
               # the headings stack, but creating new renderers is cheap and much easier.

     

       90
       90
       -
               r = ManualDocBookRenderer(tag, self._manpage_urls)

     

       92
       92
       +
               r = ManualDocBookRenderer(tag, self._revision, self._manpage_urls)

     

       91
       93
        
               for (included, path) in token.meta['included']:

     

       92
       94
        
                   try:

     

       93
       95
        
                       result.append(r.render(included))

     
···

       110
       112
        
       

     

       111
       113
        
       class DocBookConverter(Converter[ManualDocBookRenderer]):

     

       112
       114
        
           _base_paths: list[Path]

     

       113
       113
       -
           _revision: str

     

       114
       115
        
       

     

       115
       116
        
           def __init__(self, manpage_urls: Mapping[str, str], revision: str):

     

       116
       117
        
               super().__init__()

     

       117
       117
       -
               self._renderer = ManualDocBookRenderer('book', manpage_urls)

     

       118
       118
       -
               self._revision = revision

     

       118
       118
       +
               self._renderer = ManualDocBookRenderer('book', revision, manpage_urls)

     

       119
       119
        
       

     

       120
       120
        
           def convert(self, file: Path) -> str:

     

       121
       121
        
               self._base_paths = [ file ]

     
···

       182
       182
        
       

     

       183
       183
        
               try:

     

       184
       184
        
                   conv = options.DocBookConverter(

     

       185
       185
       -
                       self._renderer._manpage_urls, self._revision, False, 'fragment', varlist_id, id_prefix)

     

       185
       185
       +
                       self._renderer._manpage_urls, self._renderer._revision, False, 'fragment', varlist_id, id_prefix)

     

       186
       186
        
                   with open(self._base_paths[-1].parent / source, 'r') as f:

     

       187
       187
        
                       conv.add_options(json.load(f))

     

       188
       188
        
                   token.meta['rendered-options'] = conv.finalize(fragment=True)