diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index 95fd50b1e241..21f9e52ff84d 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -50,8 +50,7 @@ python.pkgs.buildPythonApplication rec { tenacity typer watchdog - ] - ++ typer.optional-dependencies.all; + ]; passthru.optional-dependencies = with python3.pkgs; { aws = [ boto3 ]; diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix index df4833199d8c..60b3ce9548ce 100644 --- a/pkgs/applications/misc/shell-genie/default.nix +++ b/pkgs/applications/misc/shell-genie/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { rich shellingham typer - ] ++ typer.optional-dependencies.all; + ]; # No tests available doCheck = false; diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix index 8ad9d6397341..d7cff9d14e4b 100644 --- a/pkgs/by-name/au/audiness/package.nix +++ b/pkgs/by-name/au/audiness/package.nix @@ -30,8 +30,7 @@ python3.pkgs.buildPythonApplication rec { pytenable typer validators - ] - ++ typer.optional-dependencies.all; + ]; pythonImportsCheck = [ "audiness" ]; diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix index b6e124fef07d..7b0cf99298a8 100644 --- a/pkgs/by-name/cu/cups-printers/package.nix +++ b/pkgs/by-name/cu/cups-printers/package.nix @@ -30,8 +30,7 @@ python3.pkgs.buildPythonApplication rec { pycups typer validators - ] - ++ typer.optional-dependencies.all; + ]; # Project has no tests doCheck = false; diff --git a/pkgs/by-name/kr/krr/package.nix b/pkgs/by-name/kr/krr/package.nix index f919f8c0d226..eb76c1fe4a6d 100644 --- a/pkgs/by-name/kr/krr/package.nix +++ b/pkgs/by-name/kr/krr/package.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonPackage rec { pydantic_1 slack-sdk typer - ] ++ typer.optional-dependencies.all; + ]; nativeCheckInputs = with python3.pkgs; [ pytestCheckHook diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix index 7e6e8d2bd6a6..8e1a4e183ce0 100644 --- a/pkgs/by-name/ro/route-graph/package.nix +++ b/pkgs/by-name/ro/route-graph/package.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { scapy typer typing-extensions - ] ++ typer.optional-dependencies.all); + ]); # Project has no tests doCheck = false; diff --git a/pkgs/by-name/tr/trak/package.nix b/pkgs/by-name/tr/trak/package.nix index 2129850159bd..46323b4b472e 100644 --- a/pkgs/by-name/tr/trak/package.nix +++ b/pkgs/by-name/tr/trak/package.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ questionary typer - ] ++ typer.optional-dependencies.all; + ]; build-system = [ python3Packages.poetry-core ]; diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 5cc026cd3f2a..b59ba637d713 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -123,7 +123,7 @@ buildPythonPackage rec { uvicorn typer tomlkit - ] ++ typer.passthru.optional-dependencies.all; + ]; passthru.optional-dependencies.oauth = [ authlib diff --git a/pkgs/development/python-modules/manifestoo/default.nix b/pkgs/development/python-modules/manifestoo/default.nix index 4ee80ef7fd28..45c59f1c2309 100644 --- a/pkgs/development/python-modules/manifestoo/default.nix +++ b/pkgs/development/python-modules/manifestoo/default.nix @@ -2,15 +2,12 @@ buildPythonPackage, fetchPypi, hatch-vcs, - importlib-metadata, lib, manifestoo-core, nix-update-script, pytestCheckHook, - pythonOlder, textual, typer, - typing-extensions, }: buildPythonPackage rec { @@ -32,9 +29,7 @@ buildPythonPackage rec { manifestoo-core textual typer - ] - ++ typer.passthru.optional-dependencies.all - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 0b33812e6518..38411beca94b 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { prompt-toolkit pygments click - ] ++ typer.optional-dependencies.all; + ]; serial = [ pyserial ]; }; diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index b33c6695bc0b..da08bf339be7 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { pyjwt pytz typer - ] ++ typer.optional-dependencies.all ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; + ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; passthru.optional-dependencies = { shell = [ diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index 91f58f134710..259b460e9e09 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { types-docutils pydantic typer - ] ++ typer.optional-dependencies.all; + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index 79d245c926d2..c0aae74f178f 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { torch tqdm typer - ] ++ typer.passthru.optional-dependencies.all; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 298db51c8f7b..2ef63fd1f97a 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -33,11 +33,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ click typing-extensions - ]; + # Build includes the standard optional by default + # https://github.com/tiangolo/typer/blob/0.12.3/pyproject.toml#L71-L72 + ] ++ optional-dependencies.standard; - passthru.optional-dependencies = { - all = [ - colorama + optional-dependencies = { + standard = [ shellingham rich ]; @@ -48,7 +49,7 @@ buildPythonPackage rec { pytest-sugar pytest-xdist pytestCheckHook - ] ++ passthru.optional-dependencies.all; + ]; preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix index 3632bc2ff605..397533883014 100644 --- a/pkgs/tools/misc/markdown-anki-decks/default.nix +++ b/pkgs/tools/misc/markdown-anki-decks/default.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { markdown python-frontmatter typer - ] ++ typer.optional-dependencies.all; + ]; # No tests available on Pypi and there is only a failing version assertion test in the repo. doCheck = false;