diff --git a/pkgs/tools/nix/nixos-render-docs/default.nix b/pkgs/tools/nix/nixos-render-docs/default.nix index 312bc8058245..065404f36c20 100644 --- a/pkgs/tools/nix/nixos-render-docs/default.nix +++ b/pkgs/tools/nix/nixos-render-docs/default.nix @@ -24,18 +24,15 @@ let }; makeDeps = pkgs: small: - [ pkgs.frozendict ] - ++ ( - if small - then [ - markdown-it-py-no-tests - mdit-py-plugins-no-tests - ] - else [ - pkgs.markdown-it-py - pkgs.mdit-py-plugins - ] - ); + if small + then [ + markdown-it-py-no-tests + mdit-py-plugins-no-tests + ] + else [ + pkgs.markdown-it-py + pkgs.mdit-py-plugins + ]; in python.pkgs.buildPythonApplication rec { diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py index 28ab53720936..e6a761dcf13f 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py @@ -1,5 +1,4 @@ from collections.abc import Mapping, MutableMapping, Sequence -from frozendict import frozendict # type: ignore[attr-defined] from typing import Any, cast, Optional, NamedTuple import markdown_it diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py index 599ee7e91c14..8fa7c547f5d8 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py @@ -1,6 +1,5 @@ from abc import ABC from collections.abc import Mapping, MutableMapping, Sequence -from frozendict import frozendict # type: ignore[attr-defined] from typing import Any, Callable, cast, get_args, Iterable, Literal, NoReturn, Optional import dataclasses @@ -458,7 +457,7 @@ class Converter(ABC): __renderer__: Callable[[Mapping[str, str], markdown_it.MarkdownIt], Renderer] def __init__(self, manpage_urls: Mapping[str, str]): - self._manpage_urls = frozendict(manpage_urls) + self._manpage_urls = manpage_urls self._md = markdown_it.MarkdownIt( "commonmark", diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py index 8282d7493249..28b4120fd7d9 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py @@ -204,7 +204,7 @@ class DocBookConverter(BaseConverter): __renderer__ = OptionsDocBookRenderer __option_block_separator__ = "" - def __init__(self, manpage_urls: dict[str, str], + def __init__(self, manpage_urls: Mapping[str, str], revision: str, markdown_by_default: bool, document_type: str,