movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-26 11:06:44 +03:00
Code Activity

nixos-render-docs: drop frozendict

Browse source 
with mypy type checking and Mapping types this is a lot less useful than
anticipated. let's drop it for simplicity and having fewer dependencies.

frozendict 2.3.5 also broke the mypy checks.
This commit is contained in:
pennae 2023-02-19 20:51:39 +01:00 • committed by pennae
parent 27a45b0e10
commit 00bffb84da
4 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pkgs/tools/nix/nixos-render-docs/default.nix
View file

@ -24,18 +24,15 @@ let
}; };
makeDeps = pkgs: small: makeDeps = pkgs: small:
[ pkgs.frozendict ] if small
++ ( then [
if small markdown-it-py-no-tests
then [ mdit-py-plugins-no-tests
markdown-it-py-no-tests ]
mdit-py-plugins-no-tests else [
] pkgs.markdown-it-py
else [ pkgs.mdit-py-plugins
pkgs.markdown-it-py ];
pkgs.mdit-py-plugins
]
);
in in
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {

1
pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py
View file

@ -1,5 +1,4 @@
from collections.abc import Mapping, MutableMapping, Sequence from collections.abc import Mapping, MutableMapping, Sequence
from frozendict import frozendict # type: ignore[attr-defined]
from typing import Any, cast, Optional, NamedTuple from typing import Any, cast, Optional, NamedTuple
import markdown_it import markdown_it

3
pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
View file

@ -1,6 +1,5 @@
from abc import ABC from abc import ABC
from collections.abc import Mapping, MutableMapping, Sequence 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 from typing import Any, Callable, cast, get_args, Iterable, Literal, NoReturn, Optional
import dataclasses import dataclasses
@ -458,7 +457,7 @@ class Converter(ABC):
__renderer__: Callable[[Mapping[str, str], markdown_it.MarkdownIt], Renderer] __renderer__: Callable[[Mapping[str, str], markdown_it.MarkdownIt], Renderer]
def __init__(self, manpage_urls: Mapping[str, str]): def __init__(self, manpage_urls: Mapping[str, str]):
self._manpage_urls = frozendict(manpage_urls) self._manpage_urls = manpage_urls
self._md = markdown_it.MarkdownIt( self._md = markdown_it.MarkdownIt(
"commonmark", "commonmark",

2
pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
View file

@ -204,7 +204,7 @@ class DocBookConverter(BaseConverter):
__renderer__ = OptionsDocBookRenderer __renderer__ = OptionsDocBookRenderer
__option_block_separator__ = "" __option_block_separator__ = ""
def __init__(self, manpage_urls: dict[str, str], def __init__(self, manpage_urls: Mapping[str, str],
revision: str, revision: str,
markdown_by_default: bool, markdown_by_default: bool,
document_type: str, document_type: str,