treewide: replace passthru.optional-dependencies with optional-dependencies

2024-09-28 22:35:45 -07:00 · 2024-09-28 22:35:45 -07:00 · 543781083a
commit 543781083a
parent 8637e879e4
405 changed files with 751 additions and 769 deletions
--- a/pkgs/applications/file-managers/browsr/default.nix
+++ b/pkgs/applications/file-managers/browsr/default.nix
@ -32,9 +32,9 @@ python3.pkgs.buildPythonApplication rec {
    rich-pixels
    textual
    textual-universal-directorytree
-  ] ++ lib.attrVals extras passthru.optional-dependencies;
+  ] ++ lib.attrVals extras optional-dependencies;

-  passthru.optional-dependencies = with python3.pkgs; {
+  optional-dependencies = with python3.pkgs; {
    all = [
      pyarrow
      textual-universal-directorytree.optional-dependencies.remote
--- a/pkgs/applications/misc/dbx/default.nix
+++ b/pkgs/applications/misc/dbx/default.nix
@ -52,7 +52,7 @@ python.pkgs.buildPythonApplication rec {
      watchdog
    ];

-  passthru.optional-dependencies = with python3.pkgs; {
+  optional-dependencies = with python3.pkgs; {
    aws = [ boto3 ];
    azure = [
      azure-storage-blob
--- a/pkgs/applications/misc/meerk40t/default.nix
+++ b/pkgs/applications/misc/meerk40t/default.nix
@ -36,9 +36,9 @@ python3Packages.buildPythonApplication rec {
    setuptools
    wxpython
  ]
-  ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
+  ++ lib.flatten (lib.attrValues optional-dependencies);

-  passthru.optional-dependencies = with python3Packages; {
+  optional-dependencies = with python3Packages; {
    cam = [
      opencv4
    ];
--- a/pkgs/by-name/as/asciinema-automation/package.nix
+++ b/pkgs/by-name/as/asciinema-automation/package.nix
@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
    pexpect
  ];

-  passthru.optional-dependencies = with python3.pkgs; {
+  optional-dependencies = with python3.pkgs; {
    dev = [
      mypy
      pytest
--- a/pkgs/by-name/co/comic-mandown/package.nix
+++ b/pkgs/by-name/co/comic-mandown/package.nix
@ -4,8 +4,8 @@
 , withGUI ? true
 }:
 let
-  mandown' = python3Packages.mandown.overrideAttrs (prev: {
-    propagatedBuildInputs = prev.propagatedBuildInputs ++ lib.optionals withGUI prev.passthru.optional-dependencies.gui;
+  mandown' = python3Packages.mandown.overridePythonAttrs (prev: {
+    propagatedBuildInputs = prev.propagatedBuildInputs ++ lib.optionals withGUI prev.optional-dependencies.gui;
  });
  mandownApp = python3Packages.toPythonApplication mandown';
 in
--- a/pkgs/by-name/ho/homeassistant-satellite/package.nix
+++ b/pkgs/by-name/ho/homeassistant-satellite/package.nix
@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
    aiohttp
  ];

-  passthru.optional-dependencies = {
+  optional-dependencies = {
    pulseaudio = with python3.pkgs; [
      pasimple
      pulsectl
--- a/pkgs/by-name/ji/jinja2-cli/package.nix
+++ b/pkgs/by-name/ji/jinja2-cli/package.nix
@ -27,11 +27,11 @@ python3.pkgs.buildPythonApplication rec {

  propagatedBuildInputs = with python3.pkgs; [
    jinja2
-  ] ++ lib.attrVals extras passthru.optional-dependencies;
+  ] ++ lib.attrVals extras optional-dependencies;

  pythonImportsCheck = [ "jinja2cli" ];

-  passthru.optional-dependencies = with python3.pkgs; {
+  optional-dependencies = with python3.pkgs; {
    hjson = [ hjson ];
    json5 = [ json5 ];
    toml = [ toml ];
--- a/pkgs/by-name/of/offat/package.nix
+++ b/pkgs/by-name/of/offat/package.nix
@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
    tenacity
  ];

-  passthru.optional-dependencies = {
+  optional-dependencies = {
    api = with python3.pkgs; [
      fastapi
      uvicorn
--- a/pkgs/by-name/po/poethepoet/package.nix
+++ b/pkgs/by-name/po/poethepoet/package.nix
@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
    tomli
  ];

-  passthru.optional-dependencies = with python3.pkgs; {
+  optional-dependencies = with python3.pkgs; {
    poetry_plugin = [
      poetry
    ];
--- a/pkgs/by-name/st/strictdoc/package.nix
+++ b/pkgs/by-name/st/strictdoc/package.nix
@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec {
    xlsxwriter
  ];

-  passthru.optional-dependencies = with python3.pkgs; {
+  optional-dependencies = with python3.pkgs; {
    development = [
      invoke
      tox
--- a/pkgs/by-name/wy/wyoming-satellite/package.nix
+++ b/pkgs/by-name/wy/wyoming-satellite/package.nix
@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
    zeroconf
  ];

-  passthru.optional-dependencies = {
+  optional-dependencies = {
    silerovad = with python3Packages; [
      pysilero-vad
    ];
--- 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" ];

--- 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" ];

--- 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 ];
  };
--- 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
--- 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
--- 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" ];

--- 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 ];
--- 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" ];

--- 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;
--- 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
--- 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 ];
  };

--- 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 ];
  };

--- 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"
--- 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" ];

--- 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" ];

--- 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 ];
  };

--- 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" ];

--- 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 ];
  };

--- 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
--- 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" ];

--- 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 ];
  };
--- 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 = ''
--- 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;
  };

--- 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;
  };

--- 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 ];
  };

--- 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);
--- 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" ];

--- 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" ];

--- 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
--- 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"
--- 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 ];
  };

--- 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 ];
--- 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 ];
--- 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 ];
  };

--- 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 ];
  };

--- 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; {
--- 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;
--- 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
--- 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
--- 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" ];

--- 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" ];

--- 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
--- 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
--- 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" ];

--- 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
--- 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 ];
--- 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 ];
--- 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
--- 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
--- 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 ];
  };

--- 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 ];
--- 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 ];
  };

--- 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"
--- 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";
--- 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; {
--- 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 ];
--- 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
--- 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; {
--- 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
--- 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" ];

--- 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" ];

--- 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" ];

--- 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" ];

--- 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 = [
--- 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" ];

--- 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 ];
--- 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 ];
--- 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 =
    [ ]
--- 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 ];
  };

--- 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"
--- 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" ];

--- 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
--- 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;
  };
--- 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 ];
  };

--- 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" ];

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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" ];

--- 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
--- 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
--- 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" ];

--- 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
--- 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
--- 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
--- 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
--- 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") [
--- a/Show More
+++ b/Show More