diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-09-30 15:41:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-30 15:41:25 +0200 |
| commit | 27b4e638c011ef5a265a944ff494a38291b81e67 (patch) | |
| tree | 7d465e16500ece9682d1f4abcfb17d0d03b7df49 /pkgs/development | |
| parent | 97321f17bccb5f81f42b93123973ce64e720261a (diff) | |
| parent | 543781083afffe71d6250862eb494c244355fa11 (diff) | |
treewide: replace passthru.optional-dependencies with optional-dependencies (#345232)
Diffstat (limited to 'pkgs/development')
388 files changed, 725 insertions, 743 deletions
diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index ca5f1c39a6086..2157e0fc7b206 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { dissect-target ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ dissect-target minio @@ -52,7 +52,7 @@ buildPythonPackage rec { ] ++ dissect-target.optional-dependencies.full; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; pythonImportsCheck = [ "acquire" ]; diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index a7347c080d787..b37440c51c8b8 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { rsa ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles async-timeout @@ -46,7 +46,7 @@ buildPythonPackage rec { mock pycryptodome pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "adb_shell" ]; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 75fa1cc5b5dc8..40a5adfd3c237 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { awscli = [ awscli ]; boto3 = [ boto3 ]; }; diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index 51a73cc4ecbf0..00592ed89516f 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { oscore = [ cbor2 cryptography diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index ee0429bacb460..a926f96b8d125 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ siosocks ]; - passthru.optional-dependencies = { + optional-dependencies = { socks = [ siosocks ]; }; @@ -42,7 +42,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trustme - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # uses 127.0.0.2, which macos doesn't like diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 437e5a3ce0ce7..8ee952feb39fc 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { pytestCheckHook pytest-aiohttp pytest-cov-stub - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "aiojobs" ]; diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 59412173e9770..a9dabfd3ee2a3 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -45,9 +45,9 @@ buildPythonPackage rec { fastapi pytestCheckHook setproctitle - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; #asgi = [ aiohttp-asgi ]; cron = [ croniter ]; diff --git a/pkgs/development/python-modules/aioprometheus/default.nix b/pkgs/development/python-modules/aioprometheus/default.nix index 0c74e4a6ac25e..2dc49ae5b1f82 100644 --- a/pkgs/development/python-modules/aioprometheus/default.nix +++ b/pkgs/development/python-modules/aioprometheus/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { quantile-python ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; starlette = [ starlette ]; quart = [ quart ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { httpx fastapi uvicorn - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "aioprometheus" ]; diff --git a/pkgs/development/python-modules/alpha-vantage/default.nix b/pkgs/development/python-modules/alpha-vantage/default.nix index 3e39efa7d3843..7830701eabee1 100644 --- a/pkgs/development/python-modules/alpha-vantage/default.nix +++ b/pkgs/development/python-modules/alpha-vantage/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { pandas = [ pandas ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { aioresponses requests-mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Starting with 3.0.0 most tests require an API key doCheck = false; diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 799306fa30f01..c277a6e28993e 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pure-python-adb ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; inherit (adb-shell.optional-dependencies) usb; }; @@ -39,7 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.async ++ passthru.optional-dependencies.usb; + ] ++ optional-dependencies.async ++ optional-dependencies.usb; disabledTests = [ # Requires git but fails anyway diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 15663d0e790f5..d382cc49c987c 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -91,7 +91,7 @@ buildPythonPackage rec { unique-log-filter ]; - passthru.optional-dependencies = { + optional-dependencies = { AngrDB = [ sqlalchemy ]; }; diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 014b1feaa0f64..3ae9c38314c42 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { vertex = [ google-auth ]; }; diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 23f249bfcad25..d2655fa2a1e18 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { trio = [ trio ]; }; @@ -69,7 +69,7 @@ buildPythonPackage rec { pytestCheckHook trustme uvloop - ] ++ passthru.optional-dependencies.trio; + ] ++ optional-dependencies.trio; pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/apischema/default.nix b/pkgs/development/python-modules/apischema/default.nix index 1034d1d02160a..632489d7cce9a 100644 --- a/pkgs/development/python-modules/apischema/default.nix +++ b/pkgs/development/python-modules/apischema/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { hash = "sha256-omw6znk09r2SigPfaVrtA6dd8KeSfjaPgGfK12ty23g="; }; - passthru.optional-dependencies = { + optional-dependencies = { graphql = [ graphql-core ]; }; nativeCheckInputs = [ pytest-asyncio pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "apischema" ]; diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 2ca9be416c8f5..9c487d1dd6f3b 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { marshmallow = [ marshmallow ]; yaml = [ pyyaml ]; validation = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "apispec" ]; diff --git a/pkgs/development/python-modules/arabic-reshaper/default.nix b/pkgs/development/python-modules/arabic-reshaper/default.nix index 36c9aaf013954..6e1610e6f0cd8 100644 --- a/pkgs/development/python-modules/arabic-reshaper/default.nix +++ b/pkgs/development/python-modules/arabic-reshaper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-ucSC5aTvpnlAVQcT0afVecnoN3hIZKtzUhEQ6Qg0jQM="; }; - passthru.optional-dependencies = { + optional-dependencies = { with-fonttools = [ fonttools ]; }; diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 50ea4cbb74f8e..c767e7ca3eed3 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -106,7 +106,7 @@ buildPythonPackage rec { typer ]; - passthru.optional-dependencies = { + optional-dependencies = { server = [ aiofiles @@ -178,7 +178,7 @@ buildPythonPackage rec { pytest-mock pytest-asyncio factory-boy - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ "tests/server/datasets/test_dao.py" ]; diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix index 77bd37acd6f67..e3423a8c56e36 100644 --- a/pkgs/development/python-modules/argparse-manpage/default.nix +++ b/pkgs/development/python-modules/argparse-manpage/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "argparse_manpage" ]; - passthru.optional-dependencies = { + optional-dependencies = { setuptools = [ setuptools ]; }; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 132f467e0499d..b2ac4e967398d 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { tui = [ asciimatics pyperclip @@ -64,7 +64,7 @@ buildPythonPackage rec { responses psutil uvicorn - ] ++ passthru.optional-dependencies.tui; + ] ++ optional-dependencies.tui; disabledTests = [ # require a running display server diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix index af6162dc92637..808530221781f 100644 --- a/pkgs/development/python-modules/avwx-engine/default.nix +++ b/pkgs/development/python-modules/avwx-engine/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { xmltodict ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ numpy rapidfuzz @@ -61,7 +61,7 @@ buildPythonPackage rec { pytest-cov-stub pytestCheckHook time-machine - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "avwx" ]; diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 3f770c272c552..5ef6e53e67437 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { requests-aws4auth ]; - passthru.optional-dependencies = { + optional-dependencies = { sqlserver = [ pyodbc ]; sparql = [ sparqlwrapper ]; }; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index a9cdf1ac4e991..14fa56f4958d0 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ aiohttp ]; }; @@ -54,7 +54,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trio - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # test server needs to be available preCheck = '' diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 377b77975b841..5169b9a733662 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ azure-core ] ++ azure-core.optional-dependencies.aio; }; diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 86f757e0ab441..dbeb4286bbfea 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ azure-core ] ++ azure-core.optional-dependencies.aio; }; diff --git a/pkgs/development/python-modules/base2048/default.nix b/pkgs/development/python-modules/base2048/default.nix index 4a760c5b6f192..9deaf973f7937 100644 --- a/pkgs/development/python-modules/base2048/default.nix +++ b/pkgs/development/python-modules/base2048/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - passthru.optional-dependencies = { + optional-dependencies = { fuzz = [ frelatage ]; }; diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index f392cdfbbc7af..3a0884103c7b1 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { unidiff ]; - passthru.optional-dependencies = { + optional-dependencies = { word_list = [ pyahocorasick ]; gibberish = [ gibberish-detector ]; }; @@ -47,7 +47,7 @@ buildPythonPackage rec { pkgs.gitMinimal pytestCheckHook responses - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 4ebcfd4128df6..764f91ec409e4 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -47,14 +47,14 @@ buildPythonPackage rec { soupsieve ]; - passthru.optional-dependencies = { + optional-dependencies = { html5lib = [ html5lib ]; lxml = [ lxml ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "bs4" ]; diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index 5f42d46b1e588..ab36e1dda5628 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies.compiler = [ + optional-dependencies.compiler = [ black jinja2 isort @@ -54,7 +54,7 @@ buildPythonPackage rec { pytest-mock pytest7CheckHook tomlkit - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "betterproto" ]; diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index ef3ecbd638d4e..da526eeba18d2 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pyjwt ]; - passthru.optional-dependencies = { + optional-dependencies = { china = [ pillow ]; }; @@ -57,7 +57,7 @@ buildPythonPackage rec { pytestCheckHook respx time-machine - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # presumably regressed in pytest-asyncio 0.23.0 diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index de9a6d9d48b6e..f2648124c05c2 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { colorama = [ colorama ]; d = [ aiohttp ]; uvloop = [ uvloop ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook parameterized - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 00fcd0bf91257..5adbde446d959 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { webencodings ]; - passthru.optional-dependencies = { + optional-dependencies = { css = [ tinycss2 ]; }; diff --git a/pkgs/development/python-modules/bonsai/default.nix b/pkgs/development/python-modules/bonsai/default.nix index 0f2c5f180f05b..ad14127686ce5 100644 --- a/pkgs/development/python-modules/bonsai/default.nix +++ b/pkgs/development/python-modules/bonsai/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { openldap ]; - passthru.optional-dependencies = { + optional-dependencies = { gevent = [ gevent ]; tornado = [ tornado ]; trio = [ trio ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index d5c4c1f37efc9..fae0b5ff4fd37 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -378,7 +378,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { accessanalyzer = [ mypy-boto3-accessanalyzer ]; account = [ mypy-boto3-account ]; acm = [ mypy-boto3-acm ]; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index f6998d6400a26..f1d9105c5f76b 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "tests/integration" ]; - passthru.optional-dependencies = { + optional-dependencies = { crt = [ botocore.optional-dependencies.crt ]; }; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 68a1ae7c68dce..dd08f7215a119 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "botocore" ]; - passthru.optional-dependencies = { + optional-dependencies = { crt = [ awscrt ]; }; diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index b6316ad036e75..759af9e47b87f 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -71,9 +71,15 @@ buildPythonPackage rec { tzlocal urllib3 ] - ++ passthru.optional-dependencies.launchpad - ++ passthru.optional-dependencies.fastimport - ++ passthru.optional-dependencies.github; + ++ optional-dependencies.launchpad + ++ optional-dependencies.fastimport + ++ optional-dependencies.github; + + optional-dependencies = { + launchpad = [ launchpadlib ]; + fastimport = [ fastimport ]; + github = [ pygithub ]; + }; nativeCheckInputs = [ testtools ]; @@ -107,11 +113,6 @@ buildPythonPackage rec { package = breezy; command = "HOME=$TMPDIR brz --version"; }; - optional-dependencies = { - launchpad = [ launchpadlib ]; - fastimport = [ fastimport ]; - github = [ pygithub ]; - }; }; meta = with lib; { diff --git a/pkgs/development/python-modules/btchip-python/default.nix b/pkgs/development/python-modules/btchip-python/default.nix index 66c22bafac3ed..a15708b79394b 100644 --- a/pkgs/development/python-modules/btchip-python/default.nix +++ b/pkgs/development/python-modules/btchip-python/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ecdsa ]; - passthru.optional-dependencies.smartcard = [ pyscard ]; + optional-dependencies.smartcard = [ pyscard ]; # tests requires hardware doCheck = false; diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index bfb6f582dd3a9..dd609be90c490 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webob ]; - passthru.optional-dependencies = { + optional-dependencies = { flask = [ blinker flask diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix index 36c1efc4266cb..d7fe5f9a00ec0 100644 --- a/pkgs/development/python-modules/bytewax/default.nix +++ b/pkgs/development/python-modules/bytewax/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonpickle ]; - passthru.optional-dependencies = { + optional-dependencies = { kafka = [ confluent-kafka ]; }; @@ -85,7 +85,7 @@ buildPythonPackage rec { checkInputs = [ myst-docutils pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # dependens on an old myst-docutils version diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index fe81e67424494..1f749cfb31326 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { filecache = [ filelock ]; redis = [ redis ]; }; @@ -46,7 +46,7 @@ buildPythonPackage rec { mock pytestCheckHook requests - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cachecontrol" ]; diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix index 5837ef4d0c7cf..79ab007d22459 100644 --- a/pkgs/development/python-modules/camel-converter/default.nix +++ b/pkgs/development/python-modules/camel-converter/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { build-system = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { pydantic = [ pydantic ]; }; nativeCheckInputs = [ pytestCheckHook pytest-cov-stub - ] ++ passthru.optional-dependencies.pydantic; + ] ++ optional-dependencies.pydantic; pythonImportsCheck = [ "camel_converter" ]; diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix index 938a6279e0026..a57300a77b841 100644 --- a/pkgs/development/python-modules/canals/default.nix +++ b/pkgs/development/python-modules/canals/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { docs = [ mkdocs-material mkdocs-mermaid2-plugin @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # Test requires internet connection to mermaid.ink diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 634eec1da39d5..42f9c1757a930 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { arxml = [ lxml ]; fibex = [ lxml ]; kcd = [ lxml ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ # long_envvar_name_imports requires stable key value pair ordering diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index a2a65df02e91b..4e4dff8984243 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -42,12 +42,12 @@ buildPythonPackage rec { textparser ]; - passthru.optional-dependencies.plot = [ matplotlib ]; + optional-dependencies.plot = [ matplotlib ]; nativeCheckInputs = [ parameterized pytestCheckHook - ] ++ passthru.optional-dependencies.plot; + ] ++ optional-dependencies.plot; pythonImportsCheck = [ "cantools" ]; diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index dbd7659ab81e9..5f7659b61346f 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { shapely ]; - passthru.optional-dependencies = { + optional-dependencies = { ows = [ owslib pillow @@ -80,7 +80,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mpl pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf diff --git a/pkgs/development/python-modules/cashews/default.nix b/pkgs/development/python-modules/cashews/default.nix index d5f0801c358f8..af6f0a3d0cefc 100644 --- a/pkgs/development/python-modules/cashews/default.nix +++ b/pkgs/development/python-modules/cashews/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { dill = [ dill ]; diskcache = [ diskcache ]; redis = [ redis ]; diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 0f03b20e196df..b72fd7d8a525c 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { pytz pyyaml sure - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # This is used to determine the version of cython that can be used CASS_DRIVER_ALLOWED_CYTHON_VERSION = cython.version; @@ -127,7 +127,7 @@ buildPythonPackage rec { "test_nts_token_performance" ]; - passthru.optional-dependencies = { + optional-dependencies = { cle = [ cryptography ]; eventlet = [ eventlet ]; gevent = [ gevent ]; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 99854b9d772e1..1ab0ee43a711a 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { vine ]; - passthru.optional-dependencies = { + optional-dependencies = { gcs = [ google-cloud-storage ]; mongodb = [ pymongo ]; msgpack = [ msgpack ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { pytest-timeout pytest-xdist pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # test_eventlet touches network diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix index e9311df36e82f..b04866a54607c 100644 --- a/pkgs/development/python-modules/certomancer/default.nix +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { requests-mocker = [ requests-mock ]; web-api = [ jinja2 @@ -73,7 +73,7 @@ buildPythonPackage rec { pytestCheckHook pytz requests - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # pyhanko_certvalidator.errors.DisallowedAlgorithmError diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index 73538fcdce4c8..e6743a93bf68f 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { msgpack ]; - passthru.optional-dependencies = { + optional-dependencies = { cryptography = [ cryptography ]; }; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index c9a63cc215052..7f3bd134f29fc 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -111,7 +111,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cherrypy" ]; - passthru.optional-dependencies = { + optional-dependencies = { json = [ simplejson ]; memcached_session = [ python-memcached ]; routes_dispatcher = [ routes ]; diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 6b39d48513d6d..68dfea58f94f0 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { tritonclient ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ pycocotools ]; }; diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index eb9c003c913fd..91372bca1be74 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ faust-cchardet pandas @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; pythonImportsCheck = [ "clevercsv" diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 1d1e2c741b6ce..e043ff31da298 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { tabulate ] ++ tabulate.optional-dependencies.widechars; - passthru.optional-dependencies = { + optional-dependencies = { styles = [ pygments ]; }; nativeCheckInputs = [ pytestCheckHook mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { description = "Python helpers for common CLI tasks"; diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index d5300b5499a8e..4640b71cee046 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-dotenv - ] ++ passthru.optional-dependencies.sqlalchemy ++ passthru.optional-dependencies.numpy; + ] ++ optional-dependencies.sqlalchemy ++ optional-dependencies.numpy; # these tests require a running clickhouse instance disabledTestPaths = [ @@ -68,14 +68,12 @@ buildPythonPackage rec { "clickhouse_connect.driverc.npconv" ]; - passthru = { - optional-dependencies = { - sqlalchemy = [ sqlalchemy ]; - numpy = [ numpy ]; - pandas = [ pandas ]; - arrow = [ pyarrow ]; - orjson = [ orjson ]; - }; + optional-dependencies = { + sqlalchemy = [ sqlalchemy ]; + numpy = [ numpy ]; + pandas = [ pandas ]; + arrow = [ pyarrow ]; + orjson = [ orjson ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index 3689a9d0dab46..8c642edda2420 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ cloudpathlib ]; azure = [ azure-storage-blob ]; gs = [ google-cloud-storage ]; diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix index ead29ecbb939d..6fcf618bafef4 100644 --- a/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/pkgs/development/python-modules/cmdstanpy/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { stanio ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ xarray ]; }; @@ -59,7 +59,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; disabledTestPaths = [ # No need to test these when using Nix diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 26272d385cb7e..81294e45b9fb7 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -48,14 +48,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-mock - ] ++ passthru.optional-dependencies.pandas; + ] ++ optional-dependencies.pandas; pythonImportsCheck = [ "coinmetrics.api_client" ]; - passthru = { - optional-dependencies = { - pandas = [ pandas ]; - }; + optional-dependencies = { + pandas = [ pandas ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/compressai/default.nix b/pkgs/development/python-modules/compressai/default.nix index 4848df28167f5..517a33d8aa661 100644 --- a/pkgs/development/python-modules/compressai/default.nix +++ b/pkgs/development/python-modules/compressai/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { torchvision ]; - passthru.optional-dependencies = { + optional-dependencies = { tutorials = [ ipywidgets jupyter diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 59f89df05231d..9a1cdb8798d41 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { hash = "sha256-m77MY0IZ1AJkd4/Y7ltApvdF9y17Lgn92WZPYTCU9tA="; }; - passthru.optional-dependencies = { + optional-dependencies = { yaml = [ pyyaml ]; }; nativeCheckInputs = [ pytestCheckHook mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "configargparse" ]; diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 95cf2c7bf0b69..b0098ded880c3 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - passthru.optional-dependencies = { + optional-dependencies = { avro = [ avro fastavro @@ -49,7 +49,7 @@ buildPythonPackage rec { pyflakes pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "confluent_kafka" ]; diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 0e599c2945c30..a43fccb0170ec 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { werkzeug ]; - passthru.optional-dependencies = { + optional-dependencies = { flask = [ a2wsgi flask @@ -75,7 +75,7 @@ buildPythonPackage rec { pytest-aiohttp pytestCheckHook testfixtures - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "connexion" ]; diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index daad048634b36..b0fdf8d7c326a 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { lz4 ]; - passthru.optional-dependencies = { + optional-dependencies = { extras = [ arrow cloudpickle @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "construct" ]; diff --git a/pkgs/development/python-modules/corner/default.nix b/pkgs/development/python-modules/corner/default.nix index 853ba51119229..50ab12a81f9a4 100644 --- a/pkgs/development/python-modules/corner/default.nix +++ b/pkgs/development/python-modules/corner/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { dependencies = [ matplotlib ]; - passthru.optional-dependencies = { + optional-dependencies = { arviz = [ arviz ]; docs = [ arviz @@ -66,7 +66,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "corner" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ corner.passthru.optional-dependencies.test; + nativeCheckInputs = [ pytestCheckHook ] ++ corner.optional-dependencies.test; # matplotlib.testing.exceptions.ImageComparisonFailure: images not close disabledTests = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 09689a8447519..f895557a32b3b 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { types-toml ]; - passthru.optional-dependencies = { + optional-dependencies = { validation = [ jsonschema lxml @@ -69,7 +69,7 @@ buildPythonPackage rec { ddt pytestCheckHook xmldiff - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cyclonedx" ]; diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix index 8935e536996af..f1aa0dbc6fb36 100644 --- a/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { traitlets ]; - passthru.optional-dependencies = { + optional-dependencies = { kerberos = [ pykerberos ]; jobqueue = [ sqlalchemy ]; local = [ sqlalchemy ]; diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 33fd15cded4b1..55f3489a0144f 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy ]; - passthru.optional-dependencies = { + optional-dependencies = { postgresql = [ asyncpg ]; asyncpg = [ asyncpg ]; aiopg = [ aiopg ]; diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix index 39f0f0aa39fa7..2a063482fe17b 100644 --- a/pkgs/development/python-modules/dataclass-wizard/default.nix +++ b/pkgs/development/python-modules/dataclass-wizard/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { timedelta = [ pytimeparse ]; yaml = [ pyyaml ]; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-mock - ] ++ passthru.optional-dependencies.timedelta ++ passthru.optional-dependencies.yaml; + ] ++ optional-dependencies.timedelta ++ optional-dependencies.yaml; disabledTests = [ ] diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix index b82fa0900fbb4..f988112c533f5 100644 --- a/pkgs/development/python-modules/dataproperty/default.nix +++ b/pkgs/development/python-modules/dataproperty/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { tcolorpy ] ++ typepy.optional-dependencies.datetime; - passthru.optional-dependencies = { + optional-dependencies = { logging = [ loguru ]; }; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 3f1fec78aeb30..e87f6d2a72c66 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { calendars = [ hijri-converter convertdate @@ -60,7 +60,7 @@ buildPythonPackage rec { parsel requests ruamel-yaml - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export HOME="$TEMPDIR" diff --git a/pkgs/development/python-modules/debuglater/default.nix b/pkgs/development/python-modules/debuglater/default.nix index 503dc862497b6..fcb0b4f1f9451 100644 --- a/pkgs/development/python-modules/debuglater/default.nix +++ b/pkgs/development/python-modules/debuglater/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorama ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ dill ]; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { numpy pandas pytestCheckHook - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; pythonImportsCheck = [ "debuglater" ]; diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index af4500ffd5806..ff583a572018f 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { orjson ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ clevercsv click @@ -56,7 +56,7 @@ buildPythonPackage rec { pytestCheckHook python-dateutil tomli-w - ] ++ passthru.optional-dependencies.cli; + ] ++ optional-dependencies.cli; disabledTests = [ # not compatible with pydantic 2.x diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 309b02d14fa1b..4e2c4d9b75e20 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "defcon" ]; - passthru.optional-dependencies = { + optional-dependencies = { pens = [ fontpens ]; lxml = [ fonttools ] ++ fonttools.optional-dependencies.lxml; }; diff --git a/pkgs/development/python-modules/demoji/default.nix b/pkgs/development/python-modules/demoji/default.nix index 4538f6c9c8be5..b63b2c12a1c08 100644 --- a/pkgs/development/python-modules/demoji/default.nix +++ b/pkgs/development/python-modules/demoji/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { ujson = [ ujson ]; }; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index be655a971dd49..5980eaff54db3 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; pydantic = [ pydantic ]; flask = [ flask ]; @@ -50,10 +50,10 @@ buildPythonPackage rec { pytestCheckHook scipy ] - ++ passthru.optional-dependencies.aiohttp - ++ passthru.optional-dependencies.pydantic - ++ passthru.optional-dependencies.yaml - ++ passthru.optional-dependencies.flask; + ++ optional-dependencies.aiohttp + ++ optional-dependencies.pydantic + ++ optional-dependencies.yaml + ++ optional-dependencies.flask; pythonImportsCheck = [ "dependency_injector" ]; diff --git a/pkgs/development/python-modules/detectron2/default.nix b/pkgs/development/python-modules/detectron2/default.nix index 95506510e2149..42b8f0a6f43c2 100644 --- a/pkgs/development/python-modules/detectron2/default.nix +++ b/pkgs/development/python-modules/detectron2/default.nix @@ -99,7 +99,7 @@ buildPythonPackage { pydot # no idea why this is not in their setup.py ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; nativeCheckInputs = [ av diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index ee540ee7e9c80..e7e736927ea0b 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { safetensors ]; - passthru.optional-dependencies = { + optional-dependencies = { flax = [ flax jax @@ -102,7 +102,7 @@ buildPythonPackage rec { sentencepiece torchsde transformers - ] ++ passthru.optional-dependencies.torch; + ] ++ optional-dependencies.torch; preCheck = let diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix index 9fa09e0df0704..03566cf27dc11 100644 --- a/pkgs/development/python-modules/diofant/default.nix +++ b/pkgs/development/python-modules/diofant/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mpmath ]; - passthru.optional-dependencies = { + optional-dependencies = { exports = [ cython numpy diff --git a/pkgs/development/python-modules/discum/default.nix b/pkgs/development/python-modules/discum/default.nix index ffa8b9957993e..50254162ff06c 100644 --- a/pkgs/development/python-modules/discum/default.nix +++ b/pkgs/development/python-modules/discum/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { ra = [ pycryptodome pypng diff --git a/pkgs/development/python-modules/dissect-btrfs/default.nix b/pkgs/development/python-modules/dissect-btrfs/default.nix index ef7f8fdd9f4ac..e854feb88a2ff 100644 --- a/pkgs/development/python-modules/dissect-btrfs/default.nix +++ b/pkgs/development/python-modules/dissect-btrfs/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { dissect-util ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ python-lzo zstandard diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 973cd01a7aa4f..0795b7aaee8e6 100644 --- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { lark ]; - passthru.optional-dependencies = { + optional-dependencies = { c2 = [ flow-record httpx @@ -68,7 +68,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-httpserver pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "dissect.cobaltstrike" ]; diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 26cf663c5ae27..4a1cb39782d36 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { dissect-util ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ pycryptodome rich diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix index 88f7f3ab84671..a85b51abcf19d 100644 --- a/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { dissect-util ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ lz4 python-lzo diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index d2c632a1f564e..409f8444c33d5 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { structlog ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ asn1crypto dissect-btrfs @@ -102,12 +102,12 @@ buildPythonPackage rec { yara-python zstandard ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - yara = [ yara-python ] ++ passthru.optional-dependencies.full; - smb = [ impacket ] ++ passthru.optional-dependencies.full; - mqtt = [ paho-mqtt ] ++ passthru.optional-dependencies.full; + yara = [ yara-python ] ++ optional-dependencies.full; + smb = [ impacket ] ++ optional-dependencies.full; + mqtt = [ paho-mqtt ] ++ optional-dependencies.full; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; pythonImportsCheck = [ "dissect.target" ]; diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 1f0ac3747c878..9dddc459a3cc3 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -40,13 +40,13 @@ buildPythonPackage rec { dependencies = [ djangorestframework ]; - passthru.optional-dependencies.with_social = [ django-allauth ]; + optional-dependencies.with_social = [ django-allauth ]; nativeCheckInputs = [ djangorestframework-simplejwt responses unittest-xml-reporting - ] ++ passthru.optional-dependencies.with_social; + ] ++ optional-dependencies.with_social; preCheck = '' # Test connects to graph.facebook.com diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index fb7eb5ffac844..4b75865cf326f 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { preBuild = "${python.interpreter} -m django compilemessages"; - passthru.optional-dependencies = { + optional-dependencies = { saml = [ python3-saml ]; mfa = [ qrcode ]; }; @@ -71,7 +71,7 @@ buildPythonPackage rec { pillow pytestCheckHook pytest-django - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 52f1ff4d5b4c3..d2d65daa66892 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { tablib ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ tablib ] ++ tablib.optional-dependencies.all; cli = [ tablib ] ++ tablib.optional-dependencies.cli; ods = [ tablib ] ++ tablib.optional-dependencies.ods; @@ -52,7 +52,7 @@ buildPythonPackage rec { chardet psycopg2 pytz - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/django-markup/default.nix b/pkgs/development/python-modules/django-markup/default.nix index dce53f40ad93d..61ce9fd91cec7 100644 --- a/pkgs/development/python-modules/django-markup/default.nix +++ b/pkgs/development/python-modules/django-markup/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { dependencies = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { all_filter_dependencies = [ bleach docutils @@ -63,7 +63,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-django pytestCheckHook - ] ++ passthru.optional-dependencies.all_filter_dependencies; + ] ++ optional-dependencies.all_filter_dependencies; preCheck = '' export DJANGO_SETTINGS_MODULE=django_markup.tests diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix index a7efa70261fbc..acb7fd370429c 100644 --- a/pkgs/development/python-modules/django-modelcluster/default.nix +++ b/pkgs/development/python-modules/django-modelcluster/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pytz ]; - passthru.optional-dependencies.taggit = [ django-taggit ]; + optional-dependencies.taggit = [ django-taggit ]; env.DJANGO_SETTINGS_MODULE = "tests.settings"; nativeCheckInputs = [ pytest-django pytestCheckHook - ] ++ passthru.optional-dependencies.taggit; + ] ++ optional-dependencies.taggit; # https://github.com/wagtail/django-modelcluster/issues/173 disabledTests = lib.optionals (lib.versionAtLeast django.version "4.2") [ diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix index eefb715e17088..94249cebd94c6 100644 --- a/pkgs/development/python-modules/django-redis/default.nix +++ b/pkgs/development/python-modules/django-redis/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { redis ]; - passthru.optional-dependencies = { + optional-dependencies = { hiredis = [ redis ] ++ redis.optional-dependencies.hiredis; }; @@ -67,7 +67,7 @@ buildPythonPackage rec { pytest-django pytest-mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 84378ee311a86..1014efc09e65d 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { azure = [ azure-storage-blob ]; boto3 = [ boto3 ]; dropbox = [ dropbox ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { moto pytestCheckHook rsa - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "storages" ]; diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index 0bdd73e774884..198e782fde3e0 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -37,13 +37,13 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { compatible-mypy = [ mypy ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "django-stubs" ]; diff --git a/pkgs/development/python-modules/django-tables2/default.nix b/pkgs/development/python-modules/django-tables2/default.nix index cb1f2307d527e..b5692c1d0f6d5 100644 --- a/pkgs/development/python-modules/django-tables2/default.nix +++ b/pkgs/development/python-modules/django-tables2/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { tablib = [ tablib ] ++ tablib.optional-dependencies.xls ++ tablib.optional-dependencies.yaml; }; @@ -53,7 +53,7 @@ buildPythonPackage rec { pyyaml pytest-django pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTestPaths = [ # requires django-filters diff --git a/pkgs/development/python-modules/django-two-factor-auth/default.nix b/pkgs/development/python-modules/django-two-factor-auth/default.nix index 718d2206700b4..1a35580d19e5e 100644 --- a/pkgs/development/python-modules/django-two-factor-auth/default.nix +++ b/pkgs/development/python-modules/django-two-factor-auth/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { qrcode ]; - passthru.optional-dependencies = { + optional-dependencies = { call = [ twilio ]; sms = [ twilio ]; webauthn = [ diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 2d7bb6ce9dde2..3e79caf801342 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -94,7 +94,7 @@ buildPythonPackage rec { sqlparse ]; - passthru.optional-dependencies = { + optional-dependencies = { argon2 = [ argon2-cffi ]; bcrypt = [ bcrypt ]; }; @@ -116,7 +116,7 @@ buildPythonPackage rec { selenium tblib tzdata - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index abf6c29ed81b2..dc91ad35fa03c 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyjwt ]; - passthru.optional-dependencies = { + optional-dependencies = { python-jose = [ python-jose ]; crypto = [ cryptography ]; }; diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix index 19e771ebbeec2..826bb862248cb 100644 --- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix +++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { compatible-mypy = [ mypy ] ++ django-stubs.optional-dependencies.compatible-mypy; coreapi = [ coreapi ]; markdown = [ types-markdown ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { py pytest-mypy-plugins pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Upstream recommends mypy > 1.7 which we don't have yet, thus all testsare failing with 3.14.5 and below doCheck = false; diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 7290b31b7f37b..06b01a4478437 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { wrapt ] ++ etils.optional-dependencies.epath; - passthru.optional-dependencies = { + optional-dependencies = { tensorflow = [ tensorflow ]; }; diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix index 225a04ee5342b..89f98539f7a4f 100644 --- a/pkgs/development/python-modules/dns-lexicon/default.nix +++ b/pkgs/development/python-modules/dns-lexicon/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { tldextract ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { route53 = [ boto3 ]; localzone = [ localzone ]; softlayer = [ softlayer ]; @@ -66,7 +66,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-vcr - ] ++ passthru.optional-dependencies.full; + ] ++ optional-dependencies.full; pytestFlagsArray = [ "tests/" ]; diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 56098c6250c5b..d1d0d61398de1 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { DOH = [ httpx h2 @@ -53,7 +53,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ cacert ] ++ passthru.optional-dependencies.DNSSEC; + checkInputs = [ cacert ] ++ optional-dependencies.DNSSEC; disabledTests = [ # dns.exception.SyntaxError: protocol not found diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix index 59a19b30caeba..cbe4b8518763f 100644 --- a/pkgs/development/python-modules/dparse/default.nix +++ b/pkgs/development/python-modules/dparse/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { # FIXME pipenv = [ pipenv ]; conda = [ pyyaml ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "dparse" ]; diff --git a/pkgs/development/python-modules/draftjs-exporter/default.nix b/pkgs/development/python-modules/draftjs-exporter/default.nix index 29205e3d5dd4b..0573af0c60a3b 100644 --- a/pkgs/development/python-modules/draftjs-exporter/default.nix +++ b/pkgs/development/python-modules/draftjs-exporter/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-4MmCVRx350p6N9XqTZSo8ROI/OJ0s4aKSYH9+Oxgvf4="; }; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; html5lib = [ beautifulsoup4 @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; }; - checkInputs = passthru.optional-dependencies.lxml ++ passthru.optional-dependencies.html5lib; + checkInputs = optional-dependencies.lxml ++ optional-dependencies.html5lib; checkPhase = '' # 2 tests in this file randomly fail because they depend on the order of diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix index 9eec4bba08fb4..b02da84182f7e 100644 --- a/pkgs/development/python-modules/dramatiq/default.nix +++ b/pkgs/development/python-modules/dramatiq/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ prometheus-client ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ gevent pika diff --git a/pkgs/development/python-modules/drawsvg/default.nix b/pkgs/development/python-modules/drawsvg/default.nix index 8feb1a1151ea6..d6df1c87a2dc5 100644 --- a/pkgs/development/python-modules/drawsvg/default.nix +++ b/pkgs/development/python-modules/drawsvg/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ numpy imageio diff --git a/pkgs/development/python-modules/dsnap/default.nix b/pkgs/development/python-modules/dsnap/default.nix index f14636df06547..1908de7692e80 100644 --- a/pkgs/development/python-modules/dsnap/default.nix +++ b/pkgs/development/python-modules/dsnap/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer ]; scannerd = [ aws-sam-cli @@ -55,7 +55,7 @@ buildPythonPackage rec { moto mypy-boto3-ebs pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # https://github.com/RhinoSecurityLabs/dsnap/issues/26 # ImportError: cannot import name 'mock_iam' from 'moto' diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index f4df5623013db..749abe71e0bc8 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { table = [ flatten-dict tabulate @@ -46,7 +46,7 @@ buildPythonPackage rec { pytestCheckHook pytest-mock pytest-test-utils - ] ++ passthru.optional-dependencies.table ++ passthru.optional-dependencies.markdown; + ] ++ optional-dependencies.table ++ optional-dependencies.markdown; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_vega.py" ]; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 284de4ad026b4..ee197c22044c2 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -124,14 +124,14 @@ buildPythonPackage rec { voluptuous zc-lockfile ] - ++ lib.optionals enableGoogle passthru.optional-dependencies.gs - ++ lib.optionals enableAWS passthru.optional-dependencies.s3 - ++ lib.optionals enableAzure passthru.optional-dependencies.azure - ++ lib.optionals enableSSH passthru.optional-dependencies.ssh + ++ lib.optionals enableGoogle optional-dependencies.gs + ++ lib.optionals enableAWS optional-dependencies.s3 + ++ lib.optionals enableAzure optional-dependencies.azure + ++ lib.optionals enableSSH optional-dependencies.ssh ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - passthru.optional-dependencies = { + optional-dependencies = { azure = [ dvc-azure ]; gdrive = [ dvc-gdrive ]; gs = [ dvc-gs ]; diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 7973a0e769676..6124823fce597 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pynvml ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ jsonargparse lightgbm diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index e710689aaa26e..25af1e1e6ded6 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 ]; - passthru.optional-dependencies = { + optional-dependencies = { reporting = [ pandas pyparsing @@ -52,7 +52,7 @@ buildPythonPackage rec { pytestCheckHook which yosys - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "edalize" ]; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 562d66e9bc2a6..68621f96c1510 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { certifi ]; - passthru.optional-dependencies = { + optional-dependencies = { requests = [ requests ]; async = [ aiohttp ]; }; diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 3d3594ae4b344..3428dfbff8b62 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { dependencies = [ elastic-transport ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiohttp ]; requests = [ requests ]; orjson = [ orjson ]; diff --git a/pkgs/development/python-modules/esig/default.nix b/pkgs/development/python-modules/esig/default.nix index 68af34c82e3a4..ba89418c0b693 100644 --- a/pkgs/development/python-modules/esig/default.nix +++ b/pkgs/development/python-modules/esig/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { iisignature = [ iisignature ]; }; diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix index 7438c2ef6e981..b6cc242620736 100644 --- a/pkgs/development/python-modules/essentials-openapi/default.nix +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ click jinja2 diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index c53e052b76fcb..241a4260e43ac 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest ] - ++ passthru.optional-dependencies.pycryptodome + ++ optional-dependencies.pycryptodome # eth-hash can use either safe-pysha3 or pycryptodome; # safe-pysha3 requires Python 3.9+ while pycryptodome does not. # https://github.com/ethereum/eth-hash/issues/46#issuecomment-1314029211 - ++ lib.optional (pythonAtLeast "3.9") passthru.optional-dependencies.pysha3; + ++ lib.optional (pythonAtLeast "3.9") optional-dependencies.pysha3; checkPhase = '' @@ -38,7 +38,7 @@ buildPythonPackage rec { pytest tests/backends/pysha3/ ''; - passthru.optional-dependencies = { + optional-dependencies = { pycryptodome = [ pycryptodome ]; pysha3 = [ safe-pysha3 ]; }; diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index 964f4f08326dc..c64470a2c485c 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pyasn1 pytestCheckHook ] - ++ passthru.optional-dependencies.coincurve + ++ optional-dependencies.coincurve ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3 ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome; @@ -63,7 +63,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "eth_keys" ]; - passthru.optional-dependencies = { + optional-dependencies = { coincurve = [ coincurve ]; }; diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index a78831b4aedf3..0f925eadb23ad 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { array-types = enp; eapp = [ absl-py # FIXME package simple-parsing @@ -91,7 +91,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook yapf - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; disabledTests = [ "test_public_access" # requires network access diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 5be910888a8e1..0f6e58d0cb2cb 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { tzlocal ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; - passthru.optional-dependencies = { + optional-dependencies = { complete = [ requests-gssapi # requests-negotiate-sspi diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 391881204e29a..0d4a31376f32d 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -47,9 +47,9 @@ buildPythonPackage rec { igraph ]; - passthru.optional-dependencies.pygments = [ pygments ]; + optional-dependencies.pygments = [ pygments ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pygments; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pygments; pythonImportsCheck = [ "explorerscript" ]; diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index fa62b17548938..4aa0af9aa8db9 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { lua = [ lupa ]; json = [ jsonpath-ng ]; bf = [ pyprobables ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 4add91da09261..5beafcea7a1c7 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { lzo = [ python-lzo ]; }; diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 8b5a06c4a1fc5..0dd47d31ed703 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { dependencies = [ cryptography ]; - passthru.optional-dependencies = { + optional-dependencies = { pcsc = [ pyscard ]; }; diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix index 0d6118e44c4e8..15c39a634980c 100644 --- a/pkgs/development/python-modules/firebase-messaging/default.nix +++ b/pkgs/development/python-modules/firebase-messaging/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core sphinxHook - ] ++ passthru.optional-dependencies.docs; + ] ++ optional-dependencies.docs; propagatedBuildInputs = [ aiohttp @@ -52,7 +52,7 @@ buildPythonPackage rec { protobuf ]; - passthru.optional-dependencies = { + optional-dependencies = { docs = [ sphinx sphinx-autodoc-typehints diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index a14f24cb8e5fd..ca122ad9c7db6 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ pbr ]; - passthru.optional-dependencies = { + optional-dependencies = { streams = [ testtools ]; }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.streams; + ] ++ optional-dependencies.streams; meta = { description = "Reusable state for writing clean tests and more"; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index d05524e905fb0..00c9862355875 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -31,11 +31,11 @@ buildPythonPackage rec { werkzeug ]; - passthru.optional-dependencies.asymmetric_crypto = [ cryptography ]; + optional-dependencies.asymmetric_crypto = [ cryptography ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "flask_jwt_extended" ]; diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index 69ad443789edd..6c256c4968351 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { marshmallow ]; - passthru.optional-dependencies = { + optional-dependencies = { sqlalchemy = [ flask-sqlalchemy marshmallow-sqlalchemy ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.sqlalchemy; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.sqlalchemy; pythonImportsCheck = [ "flask_marshmallow" ]; diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 65ba830e91035..8fa9a23335613 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { mongoengine ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { wtf = [ flask-wtf wtforms diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 487c2c997b8ee..09fa23575fa47 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { wtforms ]; - passthru.optional-dependencies = { + optional-dependencies = { email = [ email-validator ]; }; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index d8effec2045e5..850dba14f28e1 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { werkzeug ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ asgiref ]; dotenv = [ python-dotenv ]; }; @@ -58,7 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ greenlet ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); passthru.tests = { inherit diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index 098e6cf28e6b5..4f93bd4f8ea50 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ matplotlib ]; }; diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index d9c61a791615b..b926605875494 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { dependencies = [ msgpack ]; - passthru.optional-dependencies = { + optional-dependencies = { compression = [ lz4 zstandard @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest7CheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "flow.record" ]; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index a5f3eb9c60b18..3cf3b2beb1b8b 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pyopenssl ] ++ twisted.optional-dependencies.tls; - passthru.optional-dependencies = { + optional-dependencies = { i2p = [ txi2p-tahoe ]; tor = [ txtorcon ]; }; @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "foolscap" ]; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 4ed60bd8a704f..9e49e8c420c83 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - passthru.optional-dependencies = { + optional-dependencies = { qr = [ segno ]; }; diff --git a/pkgs/development/python-modules/fschat/default.nix b/pkgs/development/python-modules/fschat/default.nix index d086073f1a4d0..d86fd4d91062f 100644 --- a/pkgs/development/python-modules/fschat/default.nix +++ b/pkgs/development/python-modules/fschat/default.nix @@ -63,7 +63,7 @@ buildPythonPackage { # ] ++ markdown2.optional-dependencies.all; ]; - passthru.optional-dependencies = { + optional-dependencies = { llm_judge = [ anthropic openai diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 832920986a39d..741755247223f 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { entrypoints = [ ]; abfs = [ adlfs ]; adl = [ adlfs ]; diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix index 99c0853b461c6..ab617d6264734 100644 --- a/pkgs/development/python-modules/fugashi/default.nix +++ b/pkgs/development/python-modules/fugashi/default.nix @@ -34,9 +34,9 @@ buildPythonPackage rec { nativeCheckInputs = [ ipadic pytestCheckHook - ] ++ passthru.optional-dependencies.unidic-lite; + ] ++ optional-dependencies.unidic-lite; - passthru.optional-dependencies = { + optional-dependencies = { unidic-lite = [ unidic-lite ]; unidic = [ unidic ]; }; diff --git a/pkgs/development/python-modules/fvcore/default.nix b/pkgs/development/python-modules/fvcore/default.nix index 6d00d662b0550..a3f359bad457c 100644 --- a/pkgs/development/python-modules/fvcore/default.nix +++ b/pkgs/development/python-modules/fvcore/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { pythonImportsCheck = [ "fvcore" ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; meta = with lib; { description = "Collection of common code that's shared among different research projects in FAIR computer vision team"; diff --git a/pkgs/development/python-modules/gardena-bluetooth/default.nix b/pkgs/development/python-modules/gardena-bluetooth/default.nix index 38ad47244f225..45cbdea0d5461 100644 --- a/pkgs/development/python-modules/gardena-bluetooth/default.nix +++ b/pkgs/development/python-modules/gardena-bluetooth/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ asyncclick ]; }; diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index d27a9e672da20..b09f275147278 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ anyio pyjwt @@ -59,7 +59,7 @@ buildPythonPackage rec { pytestCheckHook pytest-cov-stub pytest-xdist - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "githubkit" ]; diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index ccfeaa3debacb..8d9083115fd5b 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { grpc = [ grpcio grpcio-status diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 30ea8208ff8ef..ea25b7f2a6b66 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { rsa ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp requests @@ -75,9 +75,9 @@ buildPythonPackage rec { pytestCheckHook responses ] - ++ passthru.optional-dependencies.aiohttp - ++ passthru.optional-dependencies.enterprise_cert - ++ passthru.optional-dependencies.reauth; + ++ optional-dependencies.aiohttp + ++ optional-dependencies.enterprise_cert + ++ optional-dependencies.reauth; pythonImportsCheck = [ "google.auth" diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 4eae86bbbf46e..22389251e06c2 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { fastavro = [ fastavro ]; pandas = [ pandas ]; pyarrow = [ pyarrow ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index d9ea0eba51ba7..5451d1857a652 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { python-dateutil ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { bqstorage = [ google-cloud-bigquery-storage grpcio @@ -78,7 +78,7 @@ buildPythonPackage rec { google-cloud-storage pytestCheckHook pytest-xdist - ] ++ passthru.optional-dependencies.pandas ++ passthru.optional-dependencies.ipython; + ] ++ optional-dependencies.pandas ++ optional-dependencies.ipython; # prevent google directory from shadowing google imports preCheck = '' diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 91896114390e5..fe8e5f4963604 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index bd5fbf7ee044b..e0b052ba2fb03 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { google-api-core ]; - passthru.optional-dependencies = { + optional-dependencies = { grpc = [ grpcio ]; }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.grpc; + ] ++ optional-dependencies.grpc; # prevent google directory from shadowing google imports preCheck = '' diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index a564a85d45d62..dae730accaa80 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 14527a19a43a7..da4dbf120eb17 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { sqlparse ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 4a5081468f9c5..d5a4d97cf7ce0 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { protobuf = [ protobuf ]; }; diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 504987669e7e3..bf55a48543a27 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { google-crc32c ]; - passthru.optional-dependencies = { + optional-dependencies = { requests = [ requests ]; aiohttp = [ aiohttp ]; }; @@ -40,7 +40,7 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.requests; + ] ++ optional-dependencies.requests; preCheck = '' # prevent shadowing imports diff --git a/pkgs/development/python-modules/gotailwind/default.nix b/pkgs/development/python-modules/gotailwind/default.nix index 8593c49ddc115..a3a640841d4a8 100644 --- a/pkgs/development/python-modules/gotailwind/default.nix +++ b/pkgs/development/python-modules/gotailwind/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { zeroconf ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer ]; }; diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 68d0da3d5660d..2e59cce67546d 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -127,7 +127,7 @@ buildPythonPackage rec { tomlkit ]; - passthru.optional-dependencies.oauth = [ + optional-dependencies.oauth = [ authlib itsdangerous ]; @@ -151,7 +151,7 @@ buildPythonPackage rec { # mock calls to `shutil.which(...)` (writeShellScriptBin "npm" "false") - ] ++ passthru.optional-dependencies.oauth ++ pydantic.optional-dependencies.email; + ] ++ optional-dependencies.oauth ++ pydantic.optional-dependencies.email; # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi. diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index ddb9195df7f8b..79708b5673c04 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; }; diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 97b5c1f480e30..8c7ae2b3bc2c6 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { zeroconf ]; - passthru.optional-dependencies.QRCode = [ + optional-dependencies.QRCode = [ base36 pyqrcode ]; @@ -48,7 +48,7 @@ buildPythonPackage rec { pytest-asyncio pytest-timeout pytestCheckHook - ] ++ passthru.optional-dependencies.QRCode; + ] ++ optional-dependencies.QRCode; disabledTestPaths = [ # Disable tests requiring network access diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index 65227f54d5ab2..0d8aaa732636b 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -138,7 +138,7 @@ buildPythonPackage rec { env.HOME = "$(mktemp -d)"; - passthru.optional-dependencies = { + optional-dependencies = { # all = [ # farm-haystack # ]; diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index 25148892a0b40..646ba22abda5f 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pydicom ]; - passthru.optional-dependencies = { + optional-dependencies = { libjpeg = [ pylibjpeg pylibjpeg-libjpeg @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.libjpeg; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.libjpeg; preCheck = '' export HOME=$TMP/test-home mkdir -p $HOME/.pydicom/ diff --git a/pkgs/development/python-modules/hikari-lightbulb/default.nix b/pkgs/development/python-modules/hikari-lightbulb/default.nix index 9fb3952ce0a77..a87c5fb7c2d4f 100644 --- a/pkgs/development/python-modules/hikari-lightbulb/default.nix +++ b/pkgs/development/python-modules/hikari-lightbulb/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hikari ]; - passthru.optional-dependencies = { + optional-dependencies = { crontrigger = [ croniter ]; }; diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index dbc853b926aaa..709b9cde7f495 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonRelaxDeps = true; - passthru.optional-dependencies = { + optional-dependencies = { server = [ pynacl ]; }; diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index 3d13f6c129adb..41476b16f57a4 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { dependencies = [ httpx ]; - passthru.optional-dependencies = { + optional-dependencies = { redis = [ redis ]; s3 = [ boto3 ]; sqlite = [ anysqlite ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trio - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "hishel" ]; diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix index 3f504f7729b6f..adfeb0b7949e1 100644 --- a/pkgs/development/python-modules/htmldate/default.nix +++ b/pkgs/development/python-modules/htmldate/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { speed = [ faust-cchardet diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 4b670b4c17bde..ef9fe211f55c4 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { werkzeug ]; - passthru.optional-dependencies = { + optional-dependencies = { mainapp = [ gunicorn gevent diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index b1d64e6526be4..979fe3b3ef516 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { h11 ]; - passthru.optional-dependencies = { + optional-dependencies = { asyncio = [ anyio ]; http2 = [ h2 ]; socks = [ socksio ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-httpbin pytest-trio pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "httpcore" ]; diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 64049235003aa..97d65fafa3f2a 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { python-socks ]; - passthru.optional-dependencies = { + optional-dependencies = { asyncio = [ async-timeout ]; trio = [ trio ]; }; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index eb91fa3fce1e1..0a32af68bab9d 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { sniffio ]; - passthru.optional-dependencies = { + optional-dependencies = { http2 = [ h2 ]; socks = [ socksio ]; brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { pytest-trio trustme uvicorn - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # testsuite wants to find installed packages for testing entrypoint preCheck = '' diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index abaabb11f1bb1..7631a36d37856 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -125,7 +125,7 @@ buildPythonPackage rec { pytest-snapshot pytest-timeout pytest-xdist - ] ++ lib.concatMap (name: passthru.optional-dependencies.${name}) testBackends; + ] ++ lib.concatMap (name: optional-dependencies.${name}) testBackends; pytestFlagsArray = [ "--dist=loadgroup" @@ -167,54 +167,52 @@ buildPythonPackage rec { pythonImportsCheck = [ "ibis" ] ++ map (backend: "ibis.backends.${backend}") testBackends; - passthru = { - optional-dependencies = { - bigquery = [ - db-dtypes - google-cloud-bigquery - google-cloud-bigquery-storage - pydata-google-auth - ]; - clickhouse = [ clickhouse-connect ]; - dask = [ - dask - regex - packaging - ]; - datafusion = [ datafusion ]; - druid = [ pydruid ]; - duckdb = [ duckdb ]; - flink = [ ]; - geospatial = [ - geopandas - shapely - ]; - mssql = [ pyodbc ]; - mysql = [ pymysql ]; - oracle = [ - oracledb - packaging - ]; - pandas = [ - regex - packaging - ]; - polars = [ - polars - packaging - ]; - postgres = [ psycopg2 ]; - pyspark = [ - pyspark - packaging - ]; - snowflake = [ snowflake-connector-python ]; - sqlite = [ regex ]; - trino = [ trino-python-client ]; - visualization = [ graphviz ]; - decompiler = [ black ]; - examples = [ pins ] ++ pins.optional-dependencies.gcs; - }; + optional-dependencies = { + bigquery = [ + db-dtypes + google-cloud-bigquery + google-cloud-bigquery-storage + pydata-google-auth + ]; + clickhouse = [ clickhouse-connect ]; + dask = [ + dask + regex + packaging + ]; + datafusion = [ datafusion ]; + druid = [ pydruid ]; + duckdb = [ duckdb ]; + flink = [ ]; + geospatial = [ + geopandas + shapely + ]; + mssql = [ pyodbc ]; + mysql = [ pymysql ]; + oracle = [ + oracledb + packaging + ]; + pandas = [ + regex + packaging + ]; + polars = [ + polars + packaging + ]; + postgres = [ psycopg2 ]; + pyspark = [ + pyspark + packaging + ]; + snowflake = [ snowflake-connector-python ]; + sqlite = [ regex ]; + trino = [ trino-python-client ]; + visualization = [ graphviz ]; + decompiler = [ black ]; + examples = [ pins ] ++ pins.optional-dependencies.gcs; }; meta = with lib; { diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 3f13cf77b7293..48983a575805a 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { dependencies = [ texttable ]; - passthru.optional-dependencies = { + optional-dependencies = { cairo = [ cairocffi ]; matplotlib = [ matplotlib ]; plotly = [ plotly ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ "testAuthorityScore" diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index e3bdcc2a059e9..f3ba057087499 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { threadpoolctl ]; - passthru.optional-dependencies = { + optional-dependencies = { optional = [ keras pandas diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 0bf65299a561b..9360f6d780100 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiocsv aiohttp diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index ba078d1f90c37..7ee914aca70f3 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -59,9 +59,9 @@ buildPythonPackage rec { nativeCheckInputs = [ intake-parquet pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); - passthru.optional-dependencies = { + optional-dependencies = { server = [ msgpack python-snappy diff --git a/pkgs/development/python-modules/iopath/default.nix b/pkgs/development/python-modules/iopath/default.nix index 53159f5a84571..66ea7ae87f2e0 100644 --- a/pkgs/development/python-modules/iopath/default.nix +++ b/pkgs/development/python-modules/iopath/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { pythonImportsCheck = [ "iopath" ]; - passthru.optional-dependencies = { + optional-dependencies = { aws = [ boto3 ]; }; diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index ee1d27671b5d6..995f436a8242a 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { i18n = [ babel ]; }; @@ -43,7 +43,7 @@ buildPythonPackage rec { # See https://github.com/pallets/jinja/issues/1158 doCheck = !stdenv.hostPlatform.is32bit; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.i18n; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.i18n; disabledTests = lib.optionals (pythonAtLeast "3.13") [ # https://github.com/pallets/jinja/issues/1900 diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 2e2ff91c8b0a3..dae3210280e31 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ ipython keyring diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index 4ee82d9af57bf..762e7f892b0a4 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { dependencies = [ pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ argcomplete fsspec diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index b0db522f61e91..cc0adcaffc167 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { pkgutil-resolve-name ]; - passthru.optional-dependencies = { + optional-dependencies = { format = [ fqdn idna diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index 66de5a91ff5fd..6a5431fd1abf9 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { traitlets ] ++ jsonschema.optional-dependencies.format-nongpl; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click rich @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-asyncio pytest-console-scripts pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export PATH="$out/bin:$PATH" diff --git a/pkgs/development/python-modules/kafka-python-ng/default.nix b/pkgs/development/python-modules/kafka-python-ng/default.nix index 4e3997d5ed1f6..79d253cacc8ed 100644 --- a/pkgs/development/python-modules/kafka-python-ng/default.nix +++ b/pkgs/development/python-modules/kafka-python-ng/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { crc32c = [ crc32c ]; lz4 = [ lz4 ]; snappy = [ python-snappy ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook xxhash - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = { changelog = "https://github.com/wbarnha/kafka-python-ng/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/layoutparser/default.nix b/pkgs/development/python-modules/layoutparser/default.nix index 3b6b8165aea2c..6e3e795de0ab9 100644 --- a/pkgs/development/python-modules/layoutparser/default.nix +++ b/pkgs/development/python-modules/layoutparser/default.nix @@ -96,7 +96,7 @@ buildPythonPackage { "tests_deps/test_only_paddledetection.py" # requires paddlepaddle not yet packaged ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; meta = with lib; { description = "Unified toolkit for Deep Learning Based Document Image Analysis"; diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index fa0c17487d337..2c9e2447e33c1 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies.matplotlib = [ matplotlib ]; + optional-dependencies.matplotlib = [ matplotlib ]; # check that import works, this allows to capture errors like https://github.com/librosa/librosa/issues/1160 pythonImportsCheck = [ "librosa" ]; @@ -90,7 +90,7 @@ buildPythonPackage rec { pytestCheckHook resampy samplerate - ] ++ passthru.optional-dependencies.matplotlib; + ] ++ optional-dependencies.matplotlib; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 5c52a73507414..231b9e5c258ce 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - passthru.optional-dependencies = { + optional-dependencies = { arrow = [ cffi pyarrow diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index 0873eff17d0fa..dce3a93374e0a 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { scikit-build ]; - passthru.optional-dependencies = { + optional-dependencies = { ipython = [ ipython ]; }; nativeCheckInputs = [ pytestCheckHook ubelt - ] ++ passthru.optional-dependencies.ipython; + ] ++ optional-dependencies.ipython; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index decda0e7425b2..8b19dd4915a08 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { tokenizers ]; - passthru.optional-dependencies = { + optional-dependencies = { proxy = [ apscheduler backoff diff --git a/pkgs/development/python-modules/llmx/default.nix b/pkgs/development/python-modules/llmx/default.nix index d5ddcfdaec425..aa1b526782dac 100644 --- a/pkgs/development/python-modules/llmx/default.nix +++ b/pkgs/development/python-modules/llmx/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { web = [ fastapi uvicorn diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index 62a00fa1c8fab..5750985977a3b 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { execnet = [ execnet ]; sqlalchemy = [ sqlalchemy ]; redis = [ redis ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 0e6b95276c93b..81cd8589605b1 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { zipstream-ng ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; - passthru.optional-dependencies = { + optional-dependencies = { dilation = [ noiseprotocol ]; }; @@ -91,7 +91,7 @@ buildPythonPackage rec { mock pytestCheckHook ] - ++ passthru.optional-dependencies.dilation + ++ optional-dependencies.dilation ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index 5e58f90b58d8f..0735cf8f2c9e7 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { babel = [ babel ]; lingua = [ lingua ]; }; @@ -48,7 +48,7 @@ buildPythonPackage rec { chameleon mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = lib.optionals isPyPy [ diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix index 942643cc457c1..17c8b691b4a8b 100644 --- a/pkgs/development/python-modules/mandown/default.nix +++ b/pkgs/development/python-modules/mandown/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { typer ]; - passthru.optional-dependencies = { + optional-dependencies = { gui = [ pyside6 ]; updateScript = nix-update-script { }; }; diff --git a/pkgs/development/python-modules/manifest-ml/default.nix b/pkgs/development/python-modules/manifest-ml/default.nix index 7eeec2a60fee1..80d80d51f9341 100644 --- a/pkgs/development/python-modules/manifest-ml/default.nix +++ b/pkgs/development/python-modules/manifest-ml/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { xxhash ]; - passthru.optional-dependencies = { + optional-dependencies = { api = [ accelerate # deepspeed @@ -84,7 +84,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index f50f6e8e308ca..3f0af08d192a4 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-regressions pytestCheckHook - ] ++ passthru.optional-dependencies.linkify; + ] ++ optional-dependencies.linkify; # disable and remove benchmark tests preCheck = '' @@ -60,7 +60,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "markdown_it" ]; - passthru.optional-dependencies = { + optional-dependencies = { compare = [ commonmark markdown diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 77f5fe0fc656a..25412d4c0009a 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -35,12 +35,10 @@ buildPythonPackage rec { runHook postCheck ''; - passthru.optional-dependencies = { + optional-dependencies = { code_syntax_highlighting = [ pygments ]; wavedrom = [ wavedrom ]; - all = lib.flatten ( - lib.attrValues (lib.filterAttrs (n: v: n != "all") passthru.optional-dependencies) - ); + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); }; meta = with lib; { diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index 153eb0298fce4..0cab2ca8dd70b 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { orjson = [ orjson ]; msgpack = [ msgpack ]; yaml = [ pyyaml ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { pendulum pytest-mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "mashumaro" ]; diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index b8b93bc84eaa4..e8c80177cbf5a 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { blurhash = [ blurhash ]; webpush = [ http-ece @@ -58,7 +58,7 @@ buildPythonPackage rec { pytest-vcr requests-mock setuptools - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ "test_notifications_dismiss_pre_2_9_2" diff --git a/pkgs/development/python-modules/matplotx/default.nix b/pkgs/development/python-modules/matplotx/default.nix index 8baa52efcf4d5..17bf869e874a4 100644 --- a/pkgs/development/python-modules/matplotx/default.nix +++ b/pkgs/development/python-modules/matplotx/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ networkx pypng @@ -47,7 +47,7 @@ buildPythonPackage rec { # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; disabledTestPaths = [ "tests/test_spy.py" # Requires meshzoo (non-free) and pytest-codeblocks (not packaged) diff --git a/pkgs/development/python-modules/mayim/default.nix b/pkgs/development/python-modules/mayim/default.nix index 49d4a23c80e15..44630b5121e49 100644 --- a/pkgs/development/python-modules/mayim/default.nix +++ b/pkgs/development/python-modules/mayim/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { wheel ]; - passthru.optional-dependencies = { + optional-dependencies = { postgres = [ psycopg ] ++ psycopg.optional-dependencies.pool; mysql = [ asyncmy ]; sqlite = [ aiosqlite ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { pytest-asyncio pytest-cov-stub ] - ++ (with passthru.optional-dependencies; [ + ++ (with optional-dependencies; [ postgres mysql sqlite diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 6f8b5d293e98c..e3a5bf6a39b7c 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { webencodings ]; - passthru.optional-dependencies = { + optional-dependencies = { tunnel = [ pytap2 ]; }; @@ -84,7 +84,7 @@ buildPythonPackage rec { hypothesis pytestCheckHook riden - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export PATH="$PATH:$out/bin"; diff --git a/pkgs/development/python-modules/mip/default.nix b/pkgs/development/python-modules/mip/default.nix index 63f2eeb59d727..a2c6e80e3f16a 100644 --- a/pkgs/development/python-modules/mip/default.nix +++ b/pkgs/development/python-modules/mip/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { # Tests that rely on Gurobi are activated only when Gurobi support is enabled disabledTests = lib.optional (!gurobiSupport) "gurobi"; - passthru.optional-dependencies = { + optional-dependencies = { inherit gurobipy numpy; }; diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 3fb32767e77e1..51ee57283f448 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { recommended = [ mkdocs-minify-plugin mkdocs-redirects diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 6549917758851..da196135439b2 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -66,14 +66,14 @@ buildPythonPackage rec { watchdog ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { i18n = [ babel ] ++ lib.optionals (pythonAtLeast "3.12") [ setuptools ]; }; nativeCheckInputs = [ unittestCheckHook mock - ] ++ passthru.optional-dependencies.i18n; + ] ++ optional-dependencies.i18n; unittestFlagsArray = [ "-v" diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 460d128f5a9e8..8b4b66ce4fca3 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { lazy-loader ]; - passthru.optional-dependencies.hdf5 = [ + optional-dependencies.hdf5 = [ h5io pymatreader ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-timeout - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 1df4cc1eef21f..eef43dc79fd84 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { pook = [ pook ]; speedups = [ xxhash ]; }; @@ -72,7 +72,7 @@ buildPythonPackage rec { sure ] ++ lib.optionals (pythonOlder "3.12") [ aiohttp ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' ${redis-server}/bin/redis-server & diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix index 5539d053a0658..073c99026b9a5 100644 --- a/pkgs/development/python-modules/moderngl-window/default.nix +++ b/pkgs/development/python-modules/moderngl-window/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pyrr ]; - passthru.optional-dependencies = { + optional-dependencies = { trimesh = [ trimesh scipy diff --git a/pkgs/development/python-modules/molecule/plugins.nix b/pkgs/development/python-modules/molecule/plugins.nix index b87c3b121b546..3d98ecd039805 100644 --- a/pkgs/development/python-modules/molecule/plugins.nix +++ b/pkgs/development/python-modules/molecule/plugins.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { docker = [ docker ]; vagrant = [ python-vagrant ]; }; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 1c9e917b60abb..74fadd5d2e493 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { optionals = [ matplotlib scikit-image @@ -62,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "moviepy" ]; diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index 3f8b44f5dcf74..7ca19c597c161 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { twisted = [ twisted ]; }; - nativeCheckInputs = [ unittestCheckHook ] ++ passthru.optional-dependencies.twisted; + nativeCheckInputs = [ unittestCheckHook ] ++ optional-dependencies.twisted; meta = with lib; { changelog = "https://github.com/Mic92/python-mpd2/blob/v${version}/doc/changes.rst"; diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 6f0f289e853b9..308b57376dce2 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { gmpy = lib.optionals (!isPyPy) [ gmpy2 ]; }; diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix index 669fee8887fb0..35af2272ff586 100644 --- a/pkgs/development/python-modules/mrjob/default.nix +++ b/pkgs/development/python-modules/mrjob/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { aws = [ boto3 botocore @@ -60,7 +60,7 @@ buildPythonPackage rec { pyspark unittestCheckHook warcio - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); unittestFlagsArray = [ "-v" ]; diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index 4a28fc2c57bd7..ffd604f6daec1 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { dependencies = [ ed25519 ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; nkeys = [ nkeys ]; # fast_parse = [ diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index 5bd31f3042a12..dc03557da2511 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { --replace "--flakes" "" ''; - passthru.optional-dependencies.arrays = [ numpy ]; + optional-dependencies.arrays = [ numpy ]; pythonImportsCheck = [ "ndindex" ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { hypothesis pytest-cov-stub pytestCheckHook - ] ++ passthru.optional-dependencies.arrays; + ] ++ optional-dependencies.arrays; meta = with lib; { description = ""; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index a9ff53af77ff6..4e36e2dc37ece 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { tomlkit ]; - passthru.optional-dependencies = { + optional-dependencies = { numpy = [ numpy ]; pandas = [ numpy diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 04ab642d75d69..f1c1a4f383a06 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { dependencies = [ jsonschema ]; - passthru.optional-dependencies.optionals = [ + optional-dependencies.optionals = [ jsonschema napalm ]; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index eb3051d8e14bd..46ba43afb1390 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { default = [ numpy scipy diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 1fb80ed06f347..c0a51cd1dd39e 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { packaging ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { all = dicom ++ dicomfs ++ minc2 ++ spm ++ zstd; dicom = [ pydicom ]; dicomfs = [ pillow ] ++ dicom; @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-httpserver pytest-xdist pytest7CheckHook - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; preCheck = '' export PATH=$out/bin:$PATH diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index c08da4abe5170..cba7bfe4b69af 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { tenacity ]; - passthru.optional-dependencies = { + optional-dependencies = { convert = [ pandas python-slugify diff --git a/pkgs/development/python-modules/norfair/default.nix b/pkgs/development/python-modules/norfair/default.nix index c3c50cd13334d..24376e28863f3 100644 --- a/pkgs/development/python-modules/norfair/default.nix +++ b/pkgs/development/python-modules/norfair/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { metrics = [ motmetrics ]; video = [ opencv4 ]; }; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index b2a65a5648ef3..cbf66277951b5 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { coverage = [ coverage ]; }; @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); meta = with lib; { changelog = "https://github.com/nose-devs/nose2/blob/${version}/docs/changelog.rst"; diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 23f49c77ad438..7f04ae4bf4140 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { msgpack = [ msgpack ]; # zfpy = [ zfpy ]; }; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index e87edd391028c..c971467d17a12 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { traitlets ]; - passthru.optional-dependencies = { + optional-dependencies = { googlegroups = [ google-api-python-client google-auth-oauthlib @@ -57,7 +57,7 @@ buildPythonPackage rec { pytest-cov-stub pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 84fc4a2627b8b..fbbc8a6a1ad92 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { rsa = [ cryptography ]; signedtoken = [ cryptography @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # https://github.com/oauthlib/oauthlib/issues/877 diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 231c14e4ceff3..bdd104518852b 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { ipython = [ graphviz ]; }; diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index 297d35fb0deb4..ae082ec7d8574 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { requests scikit-image toolz - ] ++ fsspec.passthru.optional-dependencies.s3; + ] ++ fsspec.optional-dependencies.s3; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index e879bec83842a..c75fb5f416c9b 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; - passthru.optional-dependencies = { + optional-dependencies = { datalib = [ numpy pandas diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index a4a54e9a879dc..34ccb51cd7d04 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyusb ]; - passthru.optional-dependencies = { + optional-dependencies = { serial = [ pyserial ]; influx = [ influxdb-client ]; }; diff --git a/pkgs/development/python-modules/opencontainers/default.nix b/pkgs/development/python-modules/opencontainers/default.nix index b5672a5590f21..c3dbd0e1bfde6 100644 --- a/pkgs/development/python-modules/opencontainers/default.nix +++ b/pkgs/development/python-modules/opencontainers/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { sed -i "/pytest-runner/d" setup.py ''; - passthru.optional-dependencies.reggie = [ requests ]; + optional-dependencies.reggie = [ requests ]; pythonImportsCheck = [ "opencontainers" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.reggie; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.reggie; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix index c20daff074c8d..0914a8ca67014 100644 --- a/pkgs/development/python-modules/opensearch-py/default.nix +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { events ]; - passthru.optional-dependencies.async = [ aiohttp ]; + optional-dependencies.async = [ aiohttp ]; nativeCheckInputs = [ botocore @@ -60,7 +60,7 @@ buildPythonPackage rec { pytestCheckHook pyyaml pytz - ] ++ passthru.optional-dependencies.async; + ] ++ optional-dependencies.async; disabledTestPaths = [ # require network diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 5a85e42a04d35..a8b14f1cfd2ce 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { opentelemetry-util-http ]; - passthru.optional-dependencies = { + optional-dependencies = { asgi = [ opentelemetry-instrumentation-asgi ]; }; nativeCheckInputs = [ opentelemetry-test-utils pytestCheckHook - ] ++ passthru.optional-dependencies.asgi; + ] ++ optional-dependencies.asgi; pythonImportsCheck = [ "opentelemetry.instrumentation.django" ]; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index 26bde1eaae5e1..9716dbc767c22 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -42,7 +42,7 @@ buildPythonPackage { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { instruments = [ grpcio ]; }; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index dfdca6fe6d942..9109242d7f278 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { integration = [ botorch catboost @@ -115,7 +115,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook scipy - ] ++ fakeredis.optional-dependencies.lua ++ passthru.optional-dependencies.optional; + ] ++ fakeredis.optional-dependencies.lua ++ optional-dependencies.optional; pytestFlagsArray = [ "-m 'not integration'" ]; diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index a2ef75c52bb1e..bb65573eee640 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { postgresql = [ asyncpg ]; postgres = [ asyncpg ]; aiopg = [ aiopg ]; @@ -89,7 +89,7 @@ buildPythonPackage rec { httpx nest-asyncio pytest-asyncio - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; disabledTestPaths = [ "benchmarks/test_benchmark_*.py" ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 83103314bd831..abf91dc56aae6 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -108,7 +108,7 @@ let tzdata ]; - passthru.optional-dependencies = + optional-dependencies = let extras = { aws = [ s3fs ]; @@ -183,7 +183,7 @@ let pytest-xdist pytestCheckHook ] - ++ lib.flatten (lib.attrValues passthru.optional-dependencies) + ++ lib.flatten (lib.attrValues optional-dependencies) ++ lib.optionals (stdenv.hostPlatform.isLinux) [ # for locale executable glibc diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 3c310b72b28bf..bf81409491cec 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { ansicolors ] ++ lib.optionals (pythonAtLeast "3.12") [ aiohttp ]; - passthru.optional-dependencies = { + optional-dependencies = { azure = [ azure-datalake-store azure-identity @@ -69,16 +69,12 @@ buildPythonPackage rec { s3 = [ boto3 ]; }; - nativeCheckInputs = - [ - ipykernel - moto - pytest-mock - pytestCheckHook - ] - ++ passthru.optional-dependencies.azure - ++ passthru.optional-dependencies.s3 - ++ passthru.optional-dependencies.gcs; + nativeCheckInputs = [ + ipykernel + moto + pytest-mock + pytestCheckHook + ] ++ optional-dependencies.azure ++ optional-dependencies.s3 ++ optional-dependencies.gcs; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 248dc1f513189..8903d65550e77 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -44,9 +44,9 @@ buildPythonPackage rec { cryptography pyasn1 six - ] ++ passthru.optional-dependencies.ed25519; # remove on 3.0 update + ] ++ optional-dependencies.ed25519; # remove on 3.0 update - passthru.optional-dependencies = { + optional-dependencies = { gssapi = [ pyasn1 gssapi @@ -62,7 +62,7 @@ buildPythonPackage rec { icecream mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # disable tests that require pytest-relaxed, which is broken diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 0dd614644d2d5..ac75974739b2f 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { toolz ]; - passthru.optional-dependencies = { + optional-dependencies = { complete = [ blosc2 numpy diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 29d1b111e9219..ee1eaa0645053 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-3v1Q9ytlxUAqssVzgwppeOXyAq0NmEeTyN3ixBUuvgQ"; }; - passthru.optional-dependencies = { + optional-dependencies = { argon2 = [ argon2-cffi ]; bcrypt = [ bcrypt ]; totp = [ cryptography ]; @@ -35,14 +35,10 @@ buildPythonPackage rec { "version = getattr(getattr(_bcrypt, '__about__', _bcrypt), '__version__', '<unknown>')" ''; - nativeCheckInputs = - [ - pytestCheckHook - pytest-xdist - ] - ++ passthru.optional-dependencies.argon2 - ++ passthru.optional-dependencies.bcrypt - ++ passthru.optional-dependencies.totp; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ] ++ optional-dependencies.argon2 ++ optional-dependencies.bcrypt ++ optional-dependencies.totp; pythonImportsCheck = [ "passlib" ]; diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix index 9bb487e85630d..e2e562f0d0f18 100644 --- a/pkgs/development/python-modules/pettingzoo/default.nix +++ b/pkgs/development/python-modules/pettingzoo/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ chess # multi-agent-ale-py diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index 68c5148f7eb46..9f736b9ca2e19 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ bottleneck gwcs diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix index 30f9c503c34b1..34d224669b3c6 100644 --- a/pkgs/development/python-modules/pins/default.nix +++ b/pkgs/development/python-modules/pins/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { xxhash ]; - passthru.optional-dependencies = { + optional-dependencies = { aws = [ s3fs ]; azure = [ adlfs ]; gcs = [ gcsfs ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { pytest-cases pytest-parallel pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pins" ]; diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 2ba2d47cae9e2..5b7e66f6916cd 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { graphviz = [ graphviz ]; }; @@ -47,7 +47,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook virtualenv - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pipdeptree" ]; diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 8717bfa11759c..e35e94376e317 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { w3lib ]; - passthru.optional-dependencies = { + optional-dependencies = { recaptcha = [ speechrecognition pydub diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index 11f3a62535b47..14525a16d8d80 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { urllib3 ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { progress_bar = [ rich ]; }; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 0017582e25cc5..131928baba252 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click ]; flex = [ flex ]; icu = [ pyicu ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-cov-stub pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # Disable tests that require network disabledTestPaths = [ "tests/test_convert.py" ]; diff --git a/pkgs/development/python-modules/prometheus-async/default.nix b/pkgs/development/python-modules/prometheus-async/default.nix index 95d2277697d6e..22627f161fa22 100644 --- a/pkgs/development/python-modules/prometheus-async/default.nix +++ b/pkgs/development/python-modules/prometheus-async/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix index 8f33fc7aa808d..4ccfdb7fc7262 100644 --- a/pkgs/development/python-modules/prophet/default.nix +++ b/pkgs/development/python-modules/prophet/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { importlib-resources ]; - passthru.optional-dependencies.parallel = [ + optional-dependencies.parallel = [ dask distributed ] ++ dask.optional-dependencies.dataframe; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index aaaf362eab3a2..bc55c2d697bcd 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -161,7 +161,7 @@ buildPythonPackage rec { "psycopg_pool" ]; - passthru.optional-dependencies = { + optional-dependencies = { c = [ psycopg-c ]; pool = [ psycopg-pool ]; }; @@ -175,8 +175,8 @@ buildPythonPackage rec { postgresql ] ++ lib.optional (stdenv.hostPlatform.isLinux) postgresqlTestHook - ++ passthru.optional-dependencies.c - ++ passthru.optional-dependencies.pool; + ++ optional-dependencies.c + ++ optional-dependencies.pool; env = { postgresqlEnableTCP = 1; diff --git a/pkgs/development/python-modules/pure-python-adb/default.nix b/pkgs/development/python-modules/pure-python-adb/default.nix index 39ca6addf0080..9b861f821a4a3 100644 --- a/pkgs/development/python-modules/pure-python-adb/default.nix +++ b/pkgs/development/python-modules/pure-python-adb/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { sha256 = "0kdr7w2fhgjpcf1k3l6an9im583iqkr6v8hb4q1zw30nh3bqkk0f"; }; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; }; doCheck = pythonOlder "3.10"; # all tests result in RuntimeError on 3.10 - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.async; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.async; pythonImportsCheck = [ "ppadb.client" ] ++ lib.optionals doCheck [ "ppadb.client_async" ]; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index efbd9d96f4298..77d33a7d9b791 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { build-system = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { json = [ ujson ]; PIL = [ pillow ]; redis = [ redis ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook requests - ] ++ passthru.optional-dependencies.watchdog ++ passthru.optional-dependencies.aiohttp; + ] ++ optional-dependencies.watchdog ++ optional-dependencies.aiohttp; pythonImportsCheck = [ "telebot" ]; diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix index 698a9e20595a7..5dc9dec212477 100644 --- a/pkgs/development/python-modules/pycyphal/default.nix +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nunavut ]; - passthru.optional-dependencies = { + optional-dependencies = { transport-can-pythoncan = [ python-can ] ++ python-can.optional-dependencies.serial; transport-serial = [ cobs @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-asyncio - ] ++ builtins.foldl' (x: y: x ++ y) [ ] (builtins.attrValues passthru.optional-dependencies); + ] ++ builtins.foldl' (x: y: x ++ y) [ ] (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index 2b268d2bf543f..cfd0df8c7603a 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { dotenv = [ python-dotenv ]; email = [ email-validator ]; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mock pytest7CheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ # https://github.com/pydantic/pydantic/issues/4817 diff --git a/pkgs/development/python-modules/pydeck/default.nix b/pkgs/development/python-modules/pydeck/default.nix index e0c77c5a2ce1c..51cb247a51799 100644 --- a/pkgs/development/python-modules/pydeck/default.nix +++ b/pkgs/development/python-modules/pydeck/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { carto = [ # pydeck-carto ]; @@ -61,7 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pandas - ] ++ passthru.optional-dependencies.jupyter; + ] ++ optional-dependencies.jupyter; # tries to start a jupyter server disabledTests = [ "test_nbconvert" ]; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index 8e53cf0865019..47abe284a8672 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ snowballstemmer ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies.toml = [ tomli ]; + optional-dependencies.toml = [ tomli ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.toml; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.toml; disabledTestPaths = [ "src/tests/test_integration.py" # runs pip install diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index f96380877eccb..a360b48083eac 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { fsspec = [ appdirs fsspec diff --git a/pkgs/development/python-modules/pydruid/default.nix b/pkgs/development/python-modules/pydruid/default.nix index 69ba702507b0c..37838c6fed9d1 100644 --- a/pkgs/development/python-modules/pydruid/default.nix +++ b/pkgs/development/python-modules/pydruid/default.nix @@ -41,17 +41,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pycurl - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "pydruid" ]; - passthru = { - optional-dependencies = { - pandas = [ pandas ]; - async = [ tornado ]; - sqlalchemy = [ sqlalchemy ]; - # druid has a `cli` extra, but it doesn't work with nixpkgs pygments - }; + optional-dependencies = { + pandas = [ pandas ]; + async = [ tornado ]; + sqlalchemy = [ sqlalchemy ]; + # druid has a `cli` extra, but it doesn't work with nixpkgs pygments }; meta = with lib; { diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index efe1c179777b9..24ec863842f29 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { dependencies = [ pysendfile ]; - passthru.optional-dependencies = { + optional-dependencies = { ssl = [ pyopenssl ]; }; diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index c16eae5e8e513..7f7c72eb518dc 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; png = [ cairosvg ]; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pyquery pytestCheckHook - ] ++ passthru.optional-dependencies.png; + ] ++ optional-dependencies.png; preCheck = '' # necessary on darwin to pass the testsuite diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index 8128de3769b9d..48791db6a2752 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { typeguard ]; - passthru.optional-dependencies = { + optional-dependencies = { ws = [ websockets ]; }; diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index a4f605692c5f2..cbca76c7467d5 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pydantic ]; - passthru.optional-dependencies = { + optional-dependencies = { CLI = [ click prompt-toolkit diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index cac67ca5051ae..5cf7838dea18e 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pylint-plugin-utils ]; - passthru.optional-dependencies = { + optional-dependencies = { with_django = [ django ]; }; diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 2bd1368ffb02b..94bae7f24eb5e 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click xdg diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 005a65b63169f..303d7680e8d3e 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { uncertainties ]; - passthru.optional-dependencies = { + optional-dependencies = { ase = [ ase ]; joblib = [ joblib ]; seekpath = [ seekpath ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-xdist - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' # ensure tests can find these diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 38411beca94b3..bb0fb022d2ef7 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { repl = [ aiohttp typer @@ -57,7 +57,7 @@ buildPythonPackage rec { redis sqlalchemy twisted - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' pushd test diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index df42f2a4cc373..9178399610b30 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { voluptuous ]; - passthru.optional-dependencies = { + optional-dependencies = { mqtt-client = [ paho-mqtt ]; }; diff --git a/pkgs/development/python-modules/pypsrp/default.nix b/pkgs/development/python-modules/pypsrp/default.nix index faddf2906f5fe..286b8a2ad9024 100644 --- a/pkgs/development/python-modules/pypsrp/default.nix +++ b/pkgs/development/python-modules/pypsrp/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { xmldiff ]; - passthru.optional-dependencies = { + optional-dependencies = { credssp = [ requests-credssp ]; kerberos = pyspnego.optional-dependencies.kerberos; named_pipe = [ psutil ]; diff --git a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix index 8d9406666fe7b..33e5958430d14 100644 --- a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix +++ b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { env.BORING_BSSL_PATH = boringssl-wrapper; - passthru.optional-dependencies = { + optional-dependencies = { dev = [ pytest ]; }; diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 51ed8f0cc31f9..621f703992968 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { xmlschema ]; - passthru.optional-dependencies = { + optional-dependencies = { s2repoze = [ paste repoze-who diff --git a/pkgs/development/python-modules/pyscaffold/default.nix b/pkgs/development/python-modules/pyscaffold/default.nix index 7b3bc447ef488..6e738b07d3dc5 100644 --- a/pkgs/development/python-modules/pyscaffold/default.nix +++ b/pkgs/development/python-modules/pyscaffold/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { tomlkit ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ pre-commit pyscaffoldext-cookiecutter diff --git a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix index bcc4ed68bfdd2..a34bf93334e9a 100644 --- a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix index f487b25c9eea6..ee4bc3aa728b5 100644 --- a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/pkgs/development/python-modules/pyscaffoldext-django/default.nix index c85e01e099252..e0e9ca4cf69f2 100644 --- a/pkgs/development/python-modules/pyscaffoldext-django/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-django/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix index 5f2cd21069fea..9763ba8ace954 100644 --- a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pyscaffoldext-markdown ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix index 82b25bac417ce..4d6157ed4d99e 100644 --- a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { wheel ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix index 46d27e7480b41..6c08f6c23adc0 100644 --- a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 7ffcf52bea8a3..93078d91dad91 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ py4j ]; - passthru.optional-dependencies = { + optional-dependencies = { ml = [ numpy ]; mllib = [ numpy ]; sql = [ diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 992318ff06672..401ccbe27097f 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ]; - passthru.optional-dependencies = { + optional-dependencies = { kerberos = [ gssapi krb5 diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix index 1b074f1b8584f..d7996053a7b43 100644 --- a/pkgs/development/python-modules/pytablewriter/default.nix +++ b/pkgs/development/python-modules/pytablewriter/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { typepy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ dominate elasticsearch @@ -84,7 +84,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pathvalidate" ]; diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 70dc1d0f7fb1d..585092787483d 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ py-cpuinfo ]; - passthru.optional-dependencies = { + optional-dependencies = { aspect = [ aspectlib ]; histogram = [ pygal ]; elasticsearch = [ elasticsearch ]; @@ -70,7 +70,7 @@ buildPythonPackage rec { mercurial pytestCheckHook pytest-xdist - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix index 36e45343a3082..560f17f02592a 100644 --- a/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -40,7 +40,7 @@ let propagatedBuildInputs = [ jupyter-core ]; - passthru.optional-dependencies = { + optional-dependencies = { client = [ jupyter-client nbformat @@ -59,7 +59,7 @@ let nativeCheckInputs = [ pytest-timeout pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); passthru.tests = { check = self.overridePythonAttrs (_: { diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 5e47e2e1c6d5c..bb1584aa162ef 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { "pytest_regressions.plugin" ]; - passthru.optional-dependencies = { + optional-dependencies = { dataframe = [ pandas numpy diff --git a/pkgs/development/python-modules/pytest/7.nix b/pkgs/development/python-modules/pytest/7.nix index 8ca33b158e5ce..b00e988d2e97c 100644 --- a/pkgs/development/python-modules/pytest/7.nix +++ b/pkgs/development/python-modules/pytest/7.nix @@ -60,7 +60,7 @@ let tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ argcomplete attrs diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index fc5ca9c2a37b8..4d1b33f2cbe32 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ argcomplete attrs diff --git a/pkgs/development/python-modules/python-barcode/default.nix b/pkgs/development/python-modules/python-barcode/default.nix index 214e074ffd7a4..432a910b95c6f 100644 --- a/pkgs/development/python-modules/python-barcode/default.nix +++ b/pkgs/development/python-modules/python-barcode/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { images = [ pillow ]; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { --replace "--no-cov-on-fail" "" ''; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.images; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.images; pythonImportsCheck = [ "barcode" ]; diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 055a993ca013b..3bdb639be493b 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ beautifulsoup4 boto3 @@ -95,7 +95,7 @@ buildPythonPackage rec { orjson pytestCheckHook python-decouple - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 97885c27a9522..2ab21191104cb 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ msgpack ruamel-yaml @@ -47,7 +47,7 @@ buildPythonPackage rec { msgpack = [ msgpack ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; pythonImportsCheck = [ "box" ]; diff --git a/pkgs/development/python-modules/python-can/default.nix b/pkgs/development/python-modules/python-can/default.nix index 8224de600ae80..019fd93c4a00d 100644 --- a/pkgs/development/python-modules/python-can/default.nix +++ b/pkgs/development/python-modules/python-can/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { serial = [ pyserial ]; seeedstudio = [ pyserial ]; pcan = [ uptime ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { parameterized pytest-timeout pytestCheckHook - ] ++ passthru.optional-dependencies.serial; + ] ++ optional-dependencies.serial; disabledTestPaths = [ # We don't support all interfaces diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 6a534a249f1fe..28bf7840a30b7 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dependencies = [ simple-websocket ]; - passthru.optional-dependencies = { + optional-dependencies = { client = [ requests websocket-client diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 449fec2d7d076..037b352ccc7ea 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { rsa ]; - passthru.optional-dependencies = { + optional-dependencies = { cryptography = [ cryptography ]; pycrypto = [ pycrypto ]; pycryptodome = [ pycryptodome ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # https://github.com/mpdavis/python-jose/issues/348 diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index b5d389bced407..dcb2a96f671a3 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { voluptuous ]; - passthru.optional-dependencies = { + optional-dependencies = { shell = [ ptpython rich diff --git a/pkgs/development/python-modules/python-libnmap/default.nix b/pkgs/development/python-modules/python-libnmap/default.nix index 3e3937051aaf6..4647160406935 100644 --- a/pkgs/development/python-modules/python-libnmap/default.nix +++ b/pkgs/development/python-modules/python-libnmap/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-cI8wdOvTmRy2cxLBkJn7vXRBRvewDMNl/tkIiRGhZJ8="; }; - passthru.optional-dependencies = { + optional-dependencies = { defusedxml = [ defusedxml ]; }; diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index c82331304a0f5..3fa1de5b4e21c 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -72,25 +72,26 @@ buildPythonPackage rec { pythonImportsCheck = [ "openstackclient" ]; + optional-dependencies = { + # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst + cli-plugins = [ + osc-placement + python-aodhclient + python-barbicanclient + python-designateclient + python-heatclient + python-ironicclient + python-magnumclient + python-manilaclient + python-mistralclient + python-neutronclient + python-watcherclient + python-zaqarclient + python-zunclient + ]; + }; + passthru = { - optional-dependencies = { - # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst - cli-plugins = [ - osc-placement - python-aodhclient - python-barbicanclient - python-designateclient - python-heatclient - python-ironicclient - python-magnumclient - python-manilaclient - python-mistralclient - python-neutronclient - python-watcherclient - python-zaqarclient - python-zunclient - ]; - }; tests.version = testers.testVersion { package = python-openstackclient; command = "openstack --version"; diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index c640a72873259..142e5883cf8a7 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ text-unidecode ]; - passthru.optional-dependencies = { + optional-dependencies = { unidecode = [ unidecode ]; }; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 9ecfd72e38dee..c59201a466cd0 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { python-engineio ]; - passthru.optional-dependencies = { + optional-dependencies = { client = [ requests websocket-client @@ -58,7 +58,7 @@ buildPythonPackage rec { pytestCheckHook uvicorn simple-websocket - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "socketio" ]; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 2a2b5d714deea..15647160b5258 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { SOAP = [ zeep ]; }; diff --git a/pkgs/development/python-modules/python-u2flib-server/default.nix b/pkgs/development/python-modules/python-u2flib-server/default.nix index e1b44777dfeea..fa93cb83fce8a 100644 --- a/pkgs/development/python-modules/python-u2flib-server/default.nix +++ b/pkgs/development/python-modules/python-u2flib-server/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { u2f_server = [ webob ]; }; @@ -42,7 +42,7 @@ buildPythonPackage rec { "u2flib_server.u2f" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.u2f_server; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.u2f_server; meta = with lib; { description = "Python based U2F server library"; diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 1261da097fe0c..3af465ba2de13 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click ]; }; nativeCheckInputs = [ pytest-timeout pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pythonfinder" ]; diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix index bec278f08e6f6..563d1e4d2ecdb 100644 --- a/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -46,11 +46,11 @@ buildPythonPackage rec { sphinx-autodoc-typehints sphinx-rtd-theme sphinxHook - ] ++ passthru.optional-dependencies.doc; + ] ++ optional-dependencies.doc; propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { validation = [ pydantic ]; global = [ platformdirs ]; doc = [ @@ -63,7 +63,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { description = "Python tool configuration"; diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 9e710823127aa..8227ac4846417 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ pydantic ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiocoap dtlssocket ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.async; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.async; pythonImportsCheck = [ "pytradfri" ]; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index a98538cc43eab..6c079b11712fb 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { versioneer ]; - passthru.optional-dependencies = { + optional-dependencies = { jsonutil = [ simplejson ]; # Module not available # randcookie = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { mock twisted pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pyutil" ]; diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 4a2b39a87ab21..aec66ed08f4a9 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { gpib-ctypes = [ gpib-ctypes ]; serial = [ pyserial ]; usb = [ pyusb ]; diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 16260ed5de0a3..80a8f5832a10a 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { sso = [ lxml pyopenssl diff --git a/pkgs/development/python-modules/pywavefront/default.nix b/pkgs/development/python-modules/pywavefront/default.nix index 534b5647c046d..676f2aaab6612 100644 --- a/pkgs/development/python-modules/pywavefront/default.nix +++ b/pkgs/development/python-modules/pywavefront/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies.visualization = [ pyglet ]; + optional-dependencies.visualization = [ pyglet ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 9755d531adc46..a42bdab7c1abe 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { # Tests require network access doCheck = false; - passthru.optional-dependencies = { + optional-dependencies = { fastembed = [ fastembed ]; }; diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index b62530a547d28..af278cea4c09d 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { # FIXME commented out solvers have not been packaged yet clarabel = [ clarabel ]; cvxopt = [ cvxopt ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { quadprog = [ quadprog ]; scs = [ scs ]; open_source_solvers = - with passthru.optional-dependencies; + with optional-dependencies; lib.flatten [ clarabel cvxopt @@ -68,7 +68,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ unittestCheckHook ] ++ passthru.optional-dependencies.open_source_solvers; + nativeCheckInputs = [ unittestCheckHook ] ++ optional-dependencies.open_source_solvers; meta = with lib; { changelog = "https://github.com/qpsolvers/qpsolvers/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index 2c7df77b33a10..e14d4ab416fcd 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -32,12 +32,12 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies.pil = [ pillow ]; + optional-dependencies.pil = [ pillow ]; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.pil; + ] ++ optional-dependencies.pil; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 8cc5ccba6c306..12b6c1b9e9d99 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-rerunfailures - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # QuTiP tries to access the home directory to create an rc file for us. # We need to go to another directory to run the tests from there. @@ -68,7 +68,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "qutip" ]; - passthru.optional-dependencies = { + optional-dependencies = { graphics = [ matplotlib ]; ipython = [ ipython ]; semidefinite = [ diff --git a/pkgs/development/python-modules/radon/default.nix b/pkgs/development/python-modules/radon/default.nix index 5d494b4c2996b..007368986c829 100644 --- a/pkgs/development/python-modules/radon/default.nix +++ b/pkgs/development/python-modules/radon/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { colorama ]; - passthru.optional-dependencies = { + optional-dependencies = { toml = [ tomli ]; }; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 64246e6835eeb..36bf7fdfc6af3 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB" ''; - passthru.optional-dependencies = { + optional-dependencies = { full = [ numpy ]; }; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 3365f12c1bc37..40033924bfda5 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -73,7 +73,7 @@ buildPythonPackage rec { snuggs ]; - passthru.optional-dependencies = { + optional-dependencies = { ipython = [ ipython ]; plot = [ matplotlib ]; s3 = [ boto3 ]; diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 88727591db838..ac4f03faaa78e 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "raven" ]; - passthru.optional-dependencies = { + optional-dependencies = { flask = [ blinker flask diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 17bf74863a746..f6a5ded15e74f 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pyparsing ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { html = [ html5lib ]; networkx = [ networkx ]; }; @@ -63,7 +63,7 @@ buildPythonPackage rec { # Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted. pytest7CheckHook setuptools - ] ++ passthru.optional-dependencies.networkx ++ passthru.optional-dependencies.html; + ] ++ optional-dependencies.networkx ++ optional-dependencies.html; pytestFlagsArray = [ # requires network access diff --git a/pkgs/development/python-modules/reconplogger/default.nix b/pkgs/development/python-modules/reconplogger/default.nix index 6b1800c7052bf..0881bc5c3c052 100644 --- a/pkgs/development/python-modules/reconplogger/default.nix +++ b/pkgs/development/python-modules/reconplogger/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ flask requests diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index a55e5b293bb46..8cee5fa57311a 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { hiredis = [ hiredis ]; ocsp = [ cryptography diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 458633c1a36a2..1a45c719e061d 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { lxml ]; - passthru.optional-dependencies = { + optional-dependencies = { chart = [ # pycha pyyaml @@ -36,7 +36,7 @@ buildPythonPackage rec { fodt = [ python-magic ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.fodt; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.fodt; pythonImportsCheck = [ "relatorio" ]; diff --git a/pkgs/development/python-modules/reportlab-qrcode/default.nix b/pkgs/development/python-modules/reportlab-qrcode/default.nix index b540fd219caf7..67d69ef8cf0ff 100644 --- a/pkgs/development/python-modules/reportlab-qrcode/default.nix +++ b/pkgs/development/python-modules/reportlab-qrcode/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { reportlab ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ pillow pytest diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 09a1c303c5208..aad655cc13e77 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -69,14 +69,14 @@ buildPythonPackage rec { xmltodict ]; - passthru.optional-dependencies = { + optional-dependencies = { ghostwriter = [ gql ] ++ gql.optional-dependencies.aiohttp; translate = [ deepl ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 3df15dd5ca4e1..aa8b918ca8c1e 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { url-normalize ]; - passthru.optional-dependencies = { + optional-dependencies = { dynamodb = [ boto3 botocore @@ -79,7 +79,7 @@ buildPythonPackage rec { tenacity time-machine timeout-decorator - ] ++ passthru.optional-dependencies.json ++ passthru.optional-dependencies.security; + ] ++ optional-dependencies.json ++ optional-dependencies.security; preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/requests-credssp/default.nix b/pkgs/development/python-modules/requests-credssp/default.nix index f6be7b9908f28..428b4ac187771 100644 --- a/pkgs/development/python-modules/requests-credssp/default.nix +++ b/pkgs/development/python-modules/requests-credssp/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { kerberos = pyspnego.optional-dependencies.kerberos; }; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index e32427b7b1e43..c9c29a1287be7 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pygments ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { jupyter = [ ipywidgets ]; }; diff --git a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix index c6d36a7b8849e..014f651e18c39 100644 --- a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytz ]; - passthru.optional-dependencies = { + optional-dependencies = { fast = [ ujson ]; }; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index d245c6b0b964b..3ac85beed8948 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "s3transfer" ]; - passthru.optional-dependencies = { + optional-dependencies = { crt = [ botocore.optional-dependencies.crt ]; }; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 23906dc2d9a34..7dfe98f36a558 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -97,7 +97,7 @@ buildPythonPackage rec { "sagemaker.lineage.visualizer" ]; - passthru.optional-dependencies = { + optional-dependencies = { local = [ urllib3 docker diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix index c139a1d1a4c63..43ed26ace4e28 100644 --- a/pkgs/development/python-modules/samsungctl/default.nix +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g"; }; - passthru.optional-dependencies = { + optional-dependencies = { websocket = [ websocket-client ]; # interactive_ui requires curses package }; diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index 7111961f9224c..3a99d9c891650 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiohttp websockets @@ -55,7 +55,7 @@ buildPythonPackage rec { aioresponses pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.async ++ passthru.optional-dependencies.encrypted; + ] ++ optional-dependencies.async ++ optional-dependencies.encrypted; pythonImportsCheck = [ "samsungtvws" ]; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 6979926cd7c9b..05cdff616166e 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { websockets ]; - passthru.optional-dependencies = { + optional-dependencies = { ext = [ # TODO: sanic-ext ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { pytestCheckHook sanic-testing uvicorn - ] ++ passthru.optional-dependencies.http3; + ] ++ optional-dependencies.http3; inherit doCheck; diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 6e3b6e3d5ed62..e90abc94768c0 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { hash = "sha256-fke75FCCn23LAMJ5bDWJpuBR6E9XIpjmzzXSbjqpxn8="; } ) ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pycodegen; preCheck = '' rm tox.ini @@ -80,7 +80,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "schema_salad" ]; - passthru.optional-dependencies = { + optional-dependencies = { pycodegen = [ black ]; }; diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 3c0743354787a..6eb9bc428949f 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -77,7 +77,7 @@ let tifffile ]; - passthru.optional-dependencies = { + optional-dependencies = { data = [ pooch ]; optional = [ astropy diff --git a/pkgs/development/python-modules/scim2-filter-parser/default.nix b/pkgs/development/python-modules/scim2-filter-parser/default.nix index 4ea0d1a6c7d5d..2ddf986971858 100644 --- a/pkgs/development/python-modules/scim2-filter-parser/default.nix +++ b/pkgs/development/python-modules/scim2-filter-parser/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sly ]; - passthru.optional-dependencies = { + optional-dependencies = { django-query = [ django ]; }; @@ -49,7 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.django-query; + ] ++ optional-dependencies.django-query; meta = with lib; { description = "Customizable parser/transpiler for SCIM2.0 filters"; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 16e9d1b98078b..74987d59dcc49 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { stats = [ scipy statsmodels diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 7bb81e8006eb1..8ea5a67932fe4 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { libusb-compat-0_1 ]; - passthru.optional-dependencies = { + optional-dependencies = { pyseabreeze = [ pyusb ]; }; @@ -77,7 +77,7 @@ buildPythonPackage rec { pytestCheckHook mock zipp - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ "TestHardware" ]; diff --git a/pkgs/development/python-modules/seasonal/default.nix b/pkgs/development/python-modules/seasonal/default.nix index f6aa8d2e36461..cef289ff5c8ec 100644 --- a/pkgs/development/python-modules/seasonal/default.nix +++ b/pkgs/development/python-modules/seasonal/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { csv = [ pandas ]; plot = [ matplotlib ]; }; @@ -51,7 +51,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { description = "Robustly estimate trend and periodicity in a timeseries"; diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix index 21cff0dc498e4..62fb78f356539 100644 --- a/pkgs/development/python-modules/securesystemslib/default.nix +++ b/pkgs/development/python-modules/securesystemslib/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { PySPX = [ pyspx ]; awskms = [ boto3 @@ -70,7 +70,7 @@ buildPythonPackage rec { nativeCheckInputs = [ ed25519 pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "securesystemslib" ]; diff --git a/pkgs/development/python-modules/sentry-sdk/1.nix b/pkgs/development/python-modules/sentry-sdk/1.nix index db47e03c017d9..c09abf95944c0 100644 --- a/pkgs/development/python-modules/sentry-sdk/1.nix +++ b/pkgs/development/python-modules/sentry-sdk/1.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; beam = [ apache-beam ]; bottle = [ bottle ]; diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix index 4764b5ff573fa..d68d4485a0954 100644 --- a/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { httpx ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click ]; }; @@ -47,7 +47,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook respx - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "sfrbox_api" ]; diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 25246028a5144..e2b3deaa92301 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { plots = [ matplotlib ipython diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix index 2759c829246ed..731d9299fc2c3 100644 --- a/pkgs/development/python-modules/simpful/default.nix +++ b/pkgs/development/python-modules/simpful/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { plotting = [ matplotlib seaborn @@ -44,7 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "simpful" ]; diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 240c0a65d8057..57551e9e67402 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { range-typed-integers ]; - passthru.optional-dependencies = { + optional-dependencies = { spritecollab = [ aiohttp gql @@ -85,7 +85,7 @@ buildPythonPackage rec { pytestCheckHook parameterized xmldiff - ] ++ passthru.optional-dependencies.spritecollab; + ] ++ optional-dependencies.spritecollab; pytestFlagsArray = [ "test/" ]; disabledTestPaths = [ "test/skytemple_files_test/common/spritecollab/sc_online_test.py" diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index 7eeb546c5d5d9..ace86514b22aa 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { dependencies = [ slack-sdk ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiohttp websockets @@ -94,7 +94,7 @@ buildPythonPackage rec { docker pytest-asyncio pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME="$(mktemp -d)" diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index 7f9091b46f435..b2641bed1e7f8 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { requests-oauthlib ]; - passthru.optional-dependencies = { + optional-dependencies = { openidconnect = [ python-jose ]; saml = [ lxml @@ -56,7 +56,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook httpretty - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # Disable checking the code coverage prePatch = '' diff --git a/pkgs/development/python-modules/spatialmath-python/default.nix b/pkgs/development/python-modules/spatialmath-python/default.nix index f889c325ac2ee..259383492a25f 100644 --- a/pkgs/development/python-modules/spatialmath-python/default.nix +++ b/pkgs/development/python-modules/spatialmath-python/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { dev = [ coverage flake8 diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 2740b83afbb4d..7cfc6b174a3a6 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { social_cards_generation = [ matplotlib ]; }; @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook beautifulsoup4 - ] ++ passthru.optional-dependencies.social_cards_generation; + ] ++ optional-dependencies.social_cards_generation; pythonImportsCheck = [ "sphinxext.opengraph" ]; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index c85096167742e..c8ce42bc73513 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { "zope.testbrowser" = [ zope-testbrowser lxml @@ -54,7 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # driver is present and fails with a different error during loading diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index e4865cd091af8..1cf2d9418e988 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { babel = [ babel ]; arrow = [ arrow ]; pendulum = [ pendulum ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { pymysql pyodbc ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies) + ++ lib.flatten (builtins.attrValues optional-dependencies) ++ lib.optionals (pythonOlder "3.12") [ # requires distutils, which were removed in 3.12 psycopg2cffi diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index b741a7710c560..2384a4f0c0566 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ greenlet ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { asyncio = [ greenlet ]; mypy = [ mypy ]; mssql = [ pyodbc ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 426be56eea9d4..efd9f7a3af464 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { asyncio = [ greenlet ]; mypy = [ mypy ]; mssql = [ pyodbc ]; diff --git a/pkgs/development/python-modules/static3/default.nix b/pkgs/development/python-modules/static3/default.nix index 050fb2119daee..13a41618feb31 100644 --- a/pkgs/development/python-modules/static3/default.nix +++ b/pkgs/development/python-modules/static3/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { --replace ", 'pytest-cov'" "" ''; - passthru.optional-dependencies = { + optional-dependencies = { KidMagic = [ # TODO: kid ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook webtest - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { changelog = "https://github.com/rmohr/static3/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 4fab0c1b30774..b27d221d75f46 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -44,13 +44,13 @@ buildPythonPackage rec { pyserial ]; - passthru.optional-dependencies = { + optional-dependencies = { hex = [ intelhex ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "tests/unit" ]; diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 1e3a816d6572d..95fd2c9161b91 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp pytest-aiohttp @@ -146,7 +146,7 @@ buildPythonPackage rec { pytest-snapshot pytestCheckHook sanic-testing - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "strawberry" ]; diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 34cec394a1049..8c4688807d26e 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { parfive ]; - passthru.optional-dependencies = { + optional-dependencies = { asdf = [ asdf # asdf-astropy @@ -91,11 +91,11 @@ buildPythonPackage rec { pytest-mock pytestCheckHook ] - ++ passthru.optional-dependencies.asdf - ++ passthru.optional-dependencies.database - ++ passthru.optional-dependencies.image - ++ passthru.optional-dependencies.net - ++ passthru.optional-dependencies.timeseries; + ++ optional-dependencies.asdf + ++ optional-dependencies.database + ++ optional-dependencies.image + ++ optional-dependencies.net + ++ optional-dependencies.timeseries; postPatch = '' substituteInPlace setup.cfg \ diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index c2fbba8406847..713f688a4c17a 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { quantity = [ pint ]; pyside2 = [ pyside2 ]; pyside6 = [ pyside6 ]; diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index 443b83ce78103..bd1ed07849ed2 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ markuppy odfpy diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index c781a453397ac..d0c635cc919c7 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { widechars = [ wcwidth ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = { description = "Pretty-print tabular data"; diff --git a/pkgs/development/python-modules/telegraph/default.nix b/pkgs/development/python-modules/telegraph/default.nix index 387c7034bb82d..80a4d12c7b164 100644 --- a/pkgs/development/python-modules/telegraph/default.nix +++ b/pkgs/development/python-modules/telegraph/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ httpx ]; }; diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix index 20429de6f8104..9da4e1e82ee78 100644 --- a/pkgs/development/python-modules/textual-universal-directorytree/default.nix +++ b/pkgs/development/python-modules/textual-universal-directorytree/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { universal-pathlib ]; - passthru.optional-dependencies = { + optional-dependencies = { remote = [ adlfs aiohttp diff --git a/pkgs/development/python-modules/tree-sitter-html/default.nix b/pkgs/development/python-modules/tree-sitter-html/default.nix index 361f53b29bb6e..4c5060294231c 100644 --- a/pkgs/development/python-modules/tree-sitter-html/default.nix +++ b/pkgs/development/python-modules/tree-sitter-html/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-javascript/default.nix b/pkgs/development/python-modules/tree-sitter-javascript/default.nix index f6a8782f14061..39766ce588f79 100644 --- a/pkgs/development/python-modules/tree-sitter-javascript/default.nix +++ b/pkgs/development/python-modules/tree-sitter-javascript/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-json/default.nix b/pkgs/development/python-modules/tree-sitter-json/default.nix index 45557bd5e2eaf..0e6cd37f8b87a 100644 --- a/pkgs/development/python-modules/tree-sitter-json/default.nix +++ b/pkgs/development/python-modules/tree-sitter-json/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-python/default.nix b/pkgs/development/python-modules/tree-sitter-python/default.nix index 399fcb0afc188..4ca4ec1d7b81c 100644 --- a/pkgs/development/python-modules/tree-sitter-python/default.nix +++ b/pkgs/development/python-modules/tree-sitter-python/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-rust/default.nix b/pkgs/development/python-modules/tree-sitter-rust/default.nix index c532127dcd145..526d1907a0a65 100644 --- a/pkgs/development/python-modules/tree-sitter-rust/default.nix +++ b/pkgs/development/python-modules/tree-sitter-rust/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix index a75171f6957f9..b76dba2b7692e 100644 --- a/pkgs/development/python-modules/trino-python-client/default.nix +++ b/pkgs/development/python-modules/trino-python-client/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { kerberos = [ requests-kerberos ]; sqlalchemy = [ sqlalchemy ]; external-authentication-token-cache = [ keyring ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ httpretty pytestCheckHook - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; pythonImportsCheck = [ "trino" ]; diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index 7cfac7521cf9b..ce40ef338b111 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { unittestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { policy = [ awacs ]; }; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 100a7d42d201b..cc72a5e86697f 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -171,13 +171,13 @@ buildPythonPackage rec { hypothesis pyhamcrest ] - ++ passthru.optional-dependencies.conch - ++ passthru.optional-dependencies.http2 - ++ passthru.optional-dependencies.serial + ++ optional-dependencies.conch + ++ optional-dependencies.http2 + ++ optional-dependencies.serial # not supported on aarch64-darwin: https://github.com/pyca/pyopenssl/issues/873 ++ lib.optionals ( !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) - ) passthru.optional-dependencies.tls; + ) optional-dependencies.tls; checkPhase = '' export SOURCE_DATE_EPOCH=315532800 @@ -186,26 +186,26 @@ buildPythonPackage rec { ${python.interpreter} -m twisted.trial -j1 twisted ''; - passthru = { - optional-dependencies = { - conch = [ - appdirs - bcrypt - cryptography - pyasn1 - ]; - http2 = [ - h2 - priority - ]; - serial = [ pyserial ]; - tls = [ - idna - pyopenssl - service-identity - ]; - }; + optional-dependencies = { + conch = [ + appdirs + bcrypt + cryptography + pyasn1 + ]; + http2 = [ + h2 + priority + ]; + serial = [ pyserial ]; + tls = [ + idna + pyopenssl + service-identity + ]; + }; + passthru = { tests = { inherit cassandra-driver diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index c9be16e2eba4c..7b08166e1d564 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -174,7 +174,7 @@ buildPythonPackage { regex ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; pythonImportsCheck = [ "txtai" ]; diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index a39f18bad504d..4b30159221467 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { dependencies = lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ attrs cattrs @@ -57,7 +57,7 @@ buildPythonPackage rec { hypothesis pytestCheckHook typing-extensions - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ "tests" ]; diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix index 91e01efa20192..0de0eea1ca8ec 100644 --- a/pkgs/development/python-modules/typepy/default.nix +++ b/pkgs/development/python-modules/typepy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mbstrdecoder ]; - passthru.optional-dependencies = { + optional-dependencies = { datetime = [ python-dateutil pytz @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook tcolorpy - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "typepy" ]; diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index a91d608c77fc9..29fffba265bc5 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -380,7 +380,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { accessanalyzer = [ types-aiobotocore-accessanalyzer ]; account = [ types-aiobotocore-account ]; acm = [ types-aiobotocore-acm ]; diff --git a/pkgs/development/python-modules/ubelt/default.nix b/pkgs/development/python-modules/ubelt/default.nix index ae9c6b2a648db..11491426bd097 100644 --- a/pkgs/development/python-modules/ubelt/default.nix +++ b/pkgs/development/python-modules/ubelt/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { wheel ]; - passthru.optional-dependencies = { + optional-dependencies = { optional = [ numpy python-dateutil diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix index d8e3492614184..e18b8062f1ff8 100644 --- a/pkgs/development/python-modules/ufmt/default.nix +++ b/pkgs/development/python-modules/ufmt/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { usort ]; - passthru.optional-dependencies = { + optional-dependencies = { lsp = [ pygls ]; ruff = [ ruff-api ]; }; nativeCheckInputs = [ unittestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "ufmt" ]; diff --git a/pkgs/development/python-modules/ufolib2/default.nix b/pkgs/development/python-modules/ufolib2/default.nix index 6eaac11f17f03..201413ed9b9de 100644 --- a/pkgs/development/python-modules/ufolib2/default.nix +++ b/pkgs/development/python-modules/ufolib2/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { fonttools ] ++ fonttools.optional-dependencies.ufo; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; converters = [ cattrs ]; json = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "ufoLib2" ]; diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 8a6f51bded2af..9fbe57c250e98 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { plot = [ bokeh colorcet diff --git a/pkgs/development/python-modules/unrpa/default.nix b/pkgs/development/python-modules/unrpa/default.nix index c64443ff66614..b806af03a2c1b 100644 --- a/pkgs/development/python-modules/unrpa/default.nix +++ b/pkgs/development/python-modules/unrpa/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0yl4qdwp3in170ks98qnldqz3r2iyzil5g1775ccg98qkh95s724"; }; - passthru.optional-dependencies = { + optional-dependencies = { ZiX = [ uncompyle6 ]; }; diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index afa02b4477398..dc0b24644733c 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -143,7 +143,7 @@ buildPythonPackage { grpcio ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; meta = with lib; { description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines"; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 1bffd501e763d..3fae3b0b70f0c 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -34,7 +34,7 @@ let nativeBuildInputs = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; socks = [ pysocks ]; }; @@ -47,7 +47,7 @@ let trustme ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); # Tests in urllib3 are mostly timeout-based instead of event-based and # are therefore inherently flaky. On your own machine, the tests will diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 7c2024af44d8f..f11af5836ca85 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { wcwidth ]; - passthru.optional-dependencies = { + optional-dependencies = { glib = [ pygobject3 ]; tornado = [ tornado ]; trio = [ @@ -62,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ glibcLocales pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); env.LC_ALL = "en_US.UTF8"; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 48bd9e9ef85ec..f81acc469a3d3 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { h11 ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - passthru.optional-dependencies.standard = [ + optional-dependencies.standard = [ httptools python-dotenv pyyaml diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index d7fbe2cabaa2f..1acb25ddf8094 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { widget = [ ipywidgets ]; jupyterlab = [ jupyterlab ]; }; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index d98aa5ab71d1b..613859ff61e01 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { toml = lib.optionals (pythonOlder "3.11") [ tomli ]; }; diff --git a/pkgs/development/python-modules/visions/default.nix b/pkgs/development/python-modules/visions/default.nix index 6d3da09118f97..f79a34ce58c9b 100644 --- a/pkgs/development/python-modules/visions/default.nix +++ b/pkgs/development/python-modules/visions/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { type-geometry = [ shapely ]; type-image-path = [ imagehash pillow ]; plotting = [ matplotlib pydot pygraphviz ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # requires running Apache Spark: diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index ef939cbdca6e0..e99a473b48a60 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { cxxfilt msgpack pycparser - ] ++ lib.optionals (withGui) passthru.optional-dependencies.gui; + ] ++ lib.optionals (withGui) optional-dependencies.gui; - passthru.optional-dependencies.gui = [ + optional-dependencies.gui = [ pyqt5 pyqtwebengine ]; diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 23677ab4ec4f3..c61971b587f41 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - passthru.optional-dependencies = { + optional-dependencies = { console = [ certifi docopt @@ -55,7 +55,7 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.mqtt; + ] ++ optional-dependencies.mqtt; pythonImportsCheck = [ "volvooncall" ]; diff --git a/pkgs/development/python-modules/w1thermsensor/default.nix b/pkgs/development/python-modules/w1thermsensor/default.nix index eca3bdd9302ec..af8854ce96ec7 100644 --- a/pkgs/development/python-modules/w1thermsensor/default.nix +++ b/pkgs/development/python-modules/w1thermsensor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; }; @@ -46,7 +46,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ tomli ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "w1thermsensor" ]; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 10184cfef7dd0..e68d2acbf1308 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - passthru.optional-dependencies.watchmedo = [ pyyaml ]; + optional-dependencies.watchmedo = [ pyyaml ]; nativeCheckInputs = [ eventlet flaky pytest-timeout pytestCheckHook - ] ++ passthru.optional-dependencies.watchmedo; + ] ++ optional-dependencies.watchmedo; postPatch = '' substituteInPlace setup.cfg \ diff --git a/pkgs/development/python-modules/watermark/default.nix b/pkgs/development/python-modules/watermark/default.nix index 3af49dd8d38d4..5eefa67895c5c 100644 --- a/pkgs/development/python-modules/watermark/default.nix +++ b/pkgs/development/python-modules/watermark/default.nix @@ -31,13 +31,13 @@ buildPythonPackage rec { importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { gpu = [ py3nvml ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "watermark" ]; diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 49415d090f5c6..08fc850f9e507 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { }; # Note: to reflect the extra_requires in main/setup.py. - passthru.optional-dependencies = { + optional-dependencies = { ipfs = [ ipfshttpclient ]; }; diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix index 9a6459fa375e7..ce0d6d58b61fe 100644 --- a/pkgs/development/python-modules/webdav4/default.nix +++ b/pkgs/development/python-modules/webdav4/default.nix @@ -47,9 +47,9 @@ buildPythonPackage rec { pytestCheckHook pytest-cov-stub wsgidav - ] ++ passthru.optional-dependencies.fsspec; + ] ++ optional-dependencies.fsspec; - passthru.optional-dependencies = { + optional-dependencies = { fsspec = [ fsspec ]; http2 = [ httpx.optional-dependencies.http2 ]; all = [ diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 171622cf10b2f..1094573081109 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { Images = [ ascii-magic pillow diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index be6cd79b788a8..ebd1983a0c7fe 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { watchdog = lib.optionals (!stdenv.hostPlatform.isDarwin) [ # watchdog requires macos-sdk 10.13 watchdog @@ -59,7 +59,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ greenlet ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "werkzeug" ]; diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index f2ab1675d0438..83b446947683f 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { defusedxml ]; - passthru.optional-dependencies = { + optional-dependencies = { heif = [ pillow-heif ]; }; @@ -52,7 +52,7 @@ buildPythonPackage rec { pytestCheckHook pillow wand - ] ++ passthru.optional-dependencies.heif; + ] ++ optional-dependencies.heif; meta = with lib; { description = "Python image library that sits on top of Pillow, Wand and OpenCV"; diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix index 23529f04a3568..de011db9a56d8 100644 --- a/pkgs/development/python-modules/wktutils/default.nix +++ b/pkgs/development/python-modules/wktutils/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { shapely ]; - passthru.optional-dependencies = { + optional-dependencies = { extras = [ requests scikit-learn diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 00e3c9e24412c..196397ab7f1d9 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { yarl ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer zeroconf diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 4712aefbed07a..99cd521f6c5c8 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -41,13 +41,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { email = [ email-validator ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "wtforms" ]; diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix index bc1eb85ab3ba0..3c63c6a739168 100644 --- a/pkgs/development/python-modules/wyoming/default.nix +++ b/pkgs/development/python-modules/wyoming/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { zeroconf = [ zeroconf ]; }; diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 387eefcd14bfd..96c32ac9349a2 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { dependencies = [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click click-default-group @@ -59,11 +59,9 @@ buildPythonPackage rec { soap = [ requests ]; }; - nativeCheckInputs = - [ pytestCheckHook ] - ++ passthru.optional-dependencies.cli - ++ passthru.optional-dependencies.lxml - ++ passthru.optional-dependencies.soap; + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.cli ++ optional-dependencies.lxml ++ optional-dependencies.soap; disabledTestPaths = [ "tests/integration/benchmarks" ]; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index d9c3041c038ce..4fae5aaf31d2c 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { nospam = [ requests-cache requests-ratelimiter diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index d5965d455f6ed..67bee46658f64 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { requests-toolbelt ]; - passthru.optional-dependencies = { + optional-dependencies = { async_require = [ httpx ]; xmlsec_require = [ xmlsec ]; }; @@ -68,7 +68,7 @@ buildPythonPackage rec { pytest-httpx pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Failed: External connections not allowed during tests. |