Apply suggestions from code review

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>

doc/manual/meson.build

@@ -30,7 +30,7 @@ nix_eval_for_docs_common = nix_for_docs + [
 nix_eval_for_docs = nix_eval_for_docs_common + '--raw'
 
 conf_file_json = custom_target(
-  command : nix_for_docs + ['show-config', '--json'],
+  command : nix_for_docs + ['show', 'config', '--json'],
   capture : true,
   output : 'conf-file.json',
   env : nix_env_for_docs,

doc/manual/package.nix

@@ -61,8 +61,8 @@ mkMesonDerivation (finalAttrs: {
     '';
 
   postInstall = ''
-    mkdir -p ''${!outputDoc}/nix-support
-    echo "doc manual ''${!outputDoc}/share/doc/nix/manual" >> ''${!outputDoc}/nix-support/hydra-build-products
+    mkdir -p ''$out/nix-support
+    echo "doc manual ''$out/share/doc/nix/manual" >> ''$out/nix-support/hydra-build-products
   '';
 
   meta = {

doc/manual/substitute.py

@@ -7,11 +7,11 @@
 
 name = 'substitute.py'
 
-def log(*args, **kwargs):
+def log(*args: Any, **kwargs: Any) -> None:
     kwargs['file'] = sys.stderr
-    return print(f'{name}:', *args, **kwargs)
+    print(f'{name}:', *args, **kwargs)
 
-def do_include(content: str, relative_md_path: Path, source_root: Path, search_path: Path):
+def do_include(content: str, relative_md_path: Path, source_root: Path, search_path: Path) -> str:
     assert not relative_md_path.is_absolute(), f'{relative_md_path=} from mdbook should be relative'
 
     md_path_abs = source_root / relative_md_path
@@ -34,7 +34,7 @@ def do_include(content: str, relative_md_path: Path, source_root: Path, search_p
             lines.append(l)
     return "".join(lines)
 
-def recursive_replace(data, book_root, search_path):
+def recursive_replace(data: dict[str, Any], book_root: Path, search_path: Path) -> dict[str, Any]:
     match data:
         case {'sections': sections}:
             return data | dict(
@@ -67,9 +67,8 @@ def recursive_replace(data, book_root, search_path):
         case rest:
             assert False, f'should have been called on a dict, not {type(rest)=}\n\t{rest=}'
 
-def main():
+def main() -> None:
 
-    print(f'{name}: HIIIIII', file=sys.stderr)
 
     if len(sys.argv) > 1 and sys.argv[1] == 'supports':
         return 0
@@ -106,6 +105,6 @@ def main():
 try:
     sys.exit(main())
 except AssertionError as e:
-    print(f'{name}: INTERNAL ERROR in mdbook preprocessor', file=sys.stderr)
+    print(f'{name}: INTERNAL ERROR in mdbook preprocessor: {e}', file=sys.stderr)
     print(f'this is a bug in {name}', file=sys.stderr)
     raise