treewide: use lib.concatAttrValues to obtain all optional-dependencies (#465847)

2025-11-29 19:37:08 +00:00
parent ec69ac126b 82c4e4f1ef
commit a09378c010
283 changed files with 307 additions and 284 deletions
@@ -303,6 +303,7 @@ let
        elem
        elemAt
        isList
+        concatAttrValues
        ;
      inherit (self.strings)
        concatStrings
@@ -10,7 +10,7 @@ let
    id
    warn
    ;
-  inherit (lib.attrsets) mapAttrs attrNames;
+  inherit (lib.attrsets) mapAttrs attrNames attrValues;
  inherit (lib) max;
 in
 rec {
@@ -1997,4 +1997,26 @@ rec {
  */
  mutuallyExclusive = a: b: length a == 0 || !(any (x: elem x a) b);

+  /**
+    Concatenate all attributes of an attribute set.
+    This assumes that every attribute of the set is a list.
+
+    # Inputs
+
+    `set`
+
+    : Attribute set with attributes that are lists
+
+    # Examples
+    :::{.example}
+    ## `lib.concatAttrValues` usage example
+
+    ```nix
+    concatAttrValues { a = [ 1 2 ]; b = [ 3 ]; }
+    => [ 1 2 3 ]
+    ```
+
+    :::
+  */
+  concatAttrValues = set: concatLists (attrValues set);
 }
@@ -65,7 +65,7 @@ python3Packages.buildPythonApplication rec {
      pytest-aiohttp
      pytestCheckHook
    ]
-    ++ lib.flatten (lib.attrValues optional-dependencies);
+    ++ lib.concatAttrValues optional-dependencies;

  nativeBuildInputs = lib.optionals enableDbusUi [
    wrapGAppsHook3
@@ -96,7 +96,7 @@ pythonPackages.buildPythonApplication rec {
      gst-python
      opencv4
    ]
-    ++ lib.flatten (builtins.attrValues optional-dependencies);
+    ++ lib.concatAttrValues optional-dependencies;

  optional-dependencies = with pythonPackages; {
    speech-to-text = [
@@ -136,7 +136,7 @@ python3Packages.buildPythonApplication rec {
    "unidecode"
  ];

-  nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies);
+  nativeCheckInputs = lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "calibreweb" ];

@@ -82,7 +82,7 @@ python3Packages.buildPythonApplication rec {
      requests
      softhsm
    ]
-    ++ lib.flatten (lib.attrValues optional-dependencies);
+    ++ lib.concatAttrValues optional-dependencies;

  preCheck = ''
    export PATH="$out/bin:$PATH"
@@ -135,7 +135,7 @@ python3Packages.buildPythonApplication rec {
    mock
    parameterized
  ])
-  ++ lib.filter (pkg: !pkg.meta.broken) (lib.flatten (lib.attrValues optional-dependencies));
+  ++ lib.filter (pkg: !pkg.meta.broken) (lib.concatAttrValues optional-dependencies);

  doCheck = !stdenv.hostPlatform.isDarwin;

@@ -163,7 +163,7 @@ python.pkgs.buildPythonApplication rec {

      poppler-utils
    ]
-    ++ lib.flatten (lib.attrValues optional-dependencies);
+    ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "mediagoblin" ];

@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
      setuptools
      wxpython
    ]
-    ++ lib.flatten (lib.attrValues optional-dependencies);
+    ++ lib.concatAttrValues optional-dependencies;

  optional-dependencies = with python3Packages; {
    cam = [
@@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec {
      dill
      pytestCheckHook
    ]
-    ++ lib.flatten (builtins.attrValues optional-dependencies);
+    ++ lib.concatAttrValues optional-dependencies;

  # tensorflow doesn0t support Python 3.12
  doCheck = false;
@@ -154,7 +154,7 @@ python.pkgs.buildPythonApplication rec {
      syrupy
      pytest-timeout
    ]
-    ++ lib.flatten (lib.attrValues optional-dependencies)
+    ++ lib.concatAttrValues optional-dependencies
    ++ (providerPackages.jellyfin python.pkgs)
    ++ (providerPackages.opensubsonic python.pkgs);

@@ -70,7 +70,7 @@ let
        pytestCheckHook
        yapf
      ])
-      ++ lib.flatten (lib.attrValues optional-dependencies)
+      ++ lib.concatAttrValues optional-dependencies
      ++ [
        addBinToPathHook
        versionCheckHook
@@ -220,7 +220,7 @@ python.pkgs.buildPythonApplication rec {
      pytestCheckHook
      responses
    ]
-    ++ lib.flatten (lib.attrValues optional-dependencies);
+    ++ lib.concatAttrValues optional-dependencies;

  disabledTests = [
    # tries to run npm run i18n:extract
@@ -256,7 +256,7 @@ python.pkgs.buildPythonApplication rec {
      fakeredis
      responses
    ]
-    ++ lib.flatten (lib.attrValues optional-dependencies);
+    ++ lib.concatAttrValues optional-dependencies;

  pytestFlags = [
    "--reruns=3"
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
      click
      platformdirs
    ]
-    ++ lib.flatten (lib.attrValues pyhanko.optional-dependencies);
+    ++ lib.concatAttrValues pyhanko.optional-dependencies;

  nativeCheckInputs = with python3Packages; [
    pytestCheckHook
@@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec {
  ];

  # expose optional-dependencies, but provide all features
-  dependencies = lib.flatten (lib.attrValues optional-dependencies);
+  dependencies = lib.concatAttrValues optional-dependencies;

  optional-dependencies = {
    default = with python3Packages; [
@@ -50,7 +50,7 @@ buildPythonPackage rec {
    pycryptodome
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "adb_shell" ];

@@ -56,7 +56,7 @@ buildPythonPackage rec {
    pytestCheckHook
  ]
  ++ moto.optional-dependencies.server
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests = [
    "test_patches"
@@ -47,7 +47,7 @@ buildPythonPackage rec {
    pytestCheckHook
    redisTestHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pytestFlags = [
    "-Wignore::DeprecationWarning"
@@ -40,7 +40,7 @@ buildPythonPackage rec {
    pytestCheckHook
    trustme
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
    # uses 127.0.0.2, which macos doesn't like
@@ -77,7 +77,7 @@ buildPythonPackage rec {
    pytestCheckHook
    pytz
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "aiogram" ];

@@ -54,7 +54,7 @@ buildPythonPackage rec {
    pytest-httpx
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "aiohomeconnect" ];

@@ -67,7 +67,7 @@ buildPythonPackage rec {
    pytest-aiohttp
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pytestFlags = [ "--asyncio-mode=auto" ];

@@ -34,7 +34,7 @@ buildPythonPackage rec {
    zlib_ng = [ zlib-ng ];
  };

-  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "aiohttp_fast_zlib" ];

@@ -38,7 +38,7 @@ buildPythonPackage rec {
    pytest-aiohttp
    pytest-cov-stub
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "aiojobs" ];

@@ -42,7 +42,7 @@ buildPythonPackage rec {
    pytestCheckHook
    setproctitle
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  optional-dependencies = {
    aiohttp = [ aiohttp ];
@@ -47,7 +47,7 @@ buildPythonPackage rec {
    fastapi
    uvicorn
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "aioprometheus" ];

@@ -28,7 +28,7 @@ buildPythonPackage rec {
    pytest-asyncio_0
    pytestCheckHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests = [
    # network access
@@ -50,7 +50,7 @@ buildPythonPackage rec {
    pytest-cov-stub
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "aiortm" ];

@@ -37,7 +37,7 @@ buildPythonPackage rec {
    pytest-timeout
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "aiovlc" ];

@@ -50,7 +50,7 @@ buildPythonPackage rec {
    requests-mock
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  # Starting with 3.0.0 most tests require an API key
  doCheck = false;
@@ -39,7 +39,7 @@ buildPythonPackage rec {
    pytest-asyncio
    pytest8_3CheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "apischema" ];

@@ -43,7 +43,7 @@ buildPythonPackage rec {
    mock
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "apispec" ];

@@ -46,7 +46,7 @@ buildPythonPackage rec {
    preferences = [ configobj ];
  };

-  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies;

  preCheck = ''
    export HOME=$TMP
@@ -143,7 +143,7 @@ buildPythonPackage rec {
    pytestCheckHook
    boto3
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTestPaths = [
    "tests/integration_tests"
@@ -181,7 +181,7 @@ buildPythonPackage rec {
    pytest-asyncio
    factory-boy
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTestPaths = [ "tests/server/datasets/test_dao.py" ];

@@ -49,7 +49,7 @@ buildPythonPackage rec {
    pytestCheckHook
    versionCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;
  versionCheckProgramArg = "--version";

  pythonImportsCheck = [ "asn1tools" ];
@@ -57,7 +57,7 @@ buildPythonPackage rec {
    openssl
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  patches = [
    # Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730
@@ -59,7 +59,7 @@ buildPythonPackage rec {
    pytestCheckHook
    time-machine
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "avwx" ];

@@ -64,7 +64,7 @@ buildPythonPackage rec {
    pytestCheckHook
    trio
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  # test server needs to be available
  preCheck = ''
@@ -56,7 +56,7 @@ buildPythonPackage rec {
    pytest-asyncio
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "azure.kusto.data" ];

@@ -55,7 +55,7 @@ buildPythonPackage rec {
    pytestCheckHook
    responses
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "azure.kusto.ingest" ];

@@ -52,7 +52,7 @@ buildPythonPackage rec {
    pytest-asyncio
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "banks" ];

@@ -104,7 +104,7 @@ buildPythonPackage rec {
    setuptools
    tomli
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests = lib.optionals (pythonAtLeast "3.12") [
    # cannot find distutils, and distutils cannot find types
@@ -50,7 +50,7 @@ buildPythonPackage rec {
    responses
    writableTmpDirAsHomeHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests = [
    # Tests are failing for various reasons (missing git repo, missing test data, etc.)
@@ -72,7 +72,7 @@ buildPythonPackage rec {
    starlette-wtf
    uvicorn
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  optional-dependencies = {
    login = [
@@ -100,7 +100,7 @@ buildPythonPackage rec {
    pytest-mock
    pytestCheckHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "beanhub_cli" ];

@@ -77,7 +77,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    pytestCheckHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests = [
    # fail with latest libxml, by not actually rejecting
@@ -59,7 +59,7 @@ buildPythonPackage rec {
    pytestCheckHook
    tomlkit
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "betterproto" ];

@@ -58,7 +58,7 @@ buildPythonPackage rec {
    respx
    time-machine
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests = [
    # presumably regressed in pytest-asyncio 0.23.0
@@ -90,7 +90,7 @@ buildPythonPackage rec {
    pytestCheckHook
    parameterized
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pytestFlags = [
    "-Wignore::DeprecationWarning"
@@ -60,7 +60,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    pytestCheckHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "bpython" ];

@@ -55,7 +55,7 @@ buildPythonPackage rec {
    pytest-mock
    udevCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTestPaths = [ "tests/test_pydantic_models.py" ];

@@ -84,7 +84,7 @@ buildPythonPackage rec {
    pytestCheckHook
    pytest-benchmark
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pytestFlags = [
    "--benchmark-disable"
@@ -41,7 +41,7 @@ buildPythonPackage rec {
    cherrypy
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "cachecontrol" ];

@@ -46,7 +46,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTestPaths = [
    # Test requires internet connection to mermaid.ink
@@ -57,7 +57,7 @@ buildPythonPackage rec {
    pytest-timeout
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pytestFlags = [
    # long_envvar_name_imports requires stable key value pair ordering
@@ -70,7 +70,7 @@ buildPythonPackage rec {
    pytest-mpl
    pytestCheckHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  preCheck = ''
    export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
@@ -63,7 +63,7 @@ buildPythonPackage rec {
    pyyaml
    sure
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  # This is used to determine the version of cython that can be used
  CASS_DRIVER_ALLOWED_CYTHON_VERSION = cython.version;
@@ -30,7 +30,7 @@ buildPythonPackage rec {
    rich = [ rich ];
  };

-  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "catppuccin" ];

@@ -93,7 +93,7 @@ buildPythonPackage rec {
    pytest-xdist
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTestPaths = [
    # test_eventlet touches network
@@ -57,7 +57,7 @@ buildPythonPackage rec {
    pytestCheckHook
    requests
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "cement" ];

@@ -72,7 +72,7 @@ buildPythonPackage rec {
    pytz
    requests
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "certomancer" ];

@@ -58,7 +58,7 @@ buildPythonPackage rec {
    pytestCheckHook
    scipy
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "cf_xarray" ];

@@ -70,7 +70,7 @@ buildPythonPackage rec {
    mock
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  preCheck = ''
    export PATH=$out/bin:$PATH
@@ -41,7 +41,7 @@ buildPythonPackage rec {
    pytest-django
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  # won't run in sandbox
  disabledTestPaths = [
@@ -37,7 +37,7 @@ buildPythonPackage rec {
    pytestCheckHook
    mock
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  meta = with lib; {
    description = "Python helpers for common CLI tasks";
@@ -52,7 +52,7 @@ buildPythonPackage rec {
    pytestCheckHook
    pytest-mock
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "coinmetrics.api_client" ];

@@ -64,7 +64,7 @@ buildPythonPackage rec {
    icu = lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) pyicu;
  };

-  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies;

  pythonRelaxDeps = [ "pycountry" ];

@@ -31,7 +31,7 @@ buildPythonPackage rec {
    pytestCheckHook
    mock
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests = lib.optionals (pythonAtLeast "3.13") [
    # regex mismatch
@@ -94,7 +94,7 @@ buildPythonPackage rec {
    requests-mock
    respx
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "confluent_kafka" ];

@@ -74,7 +74,7 @@ buildPythonPackage rec {
    pytestCheckHook
    testfixtures
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "connexion" ];

@@ -48,7 +48,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "construct" ];

@@ -47,7 +47,7 @@ buildPythonPackage rec {
    pytest-timeout
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "control" ];

@@ -67,7 +67,7 @@ buildPythonPackage rec {
    pytestCheckHook
    xmldiff
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "cyclonedx" ];

@@ -49,7 +49,7 @@ buildPythonPackage rec {
    pytest-mock
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "cyclopts" ];

@@ -60,7 +60,7 @@ buildPythonPackage rec {
    pytestCheckHook
    uproot
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "dask_awkward" ];

@@ -41,7 +41,7 @@ buildPythonPackage rec {
    pytestCheckHook
    pytest-mock
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests =
    [ ]
@@ -76,7 +76,7 @@ buildPythonPackage rec {
    pytest-mock
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "datamodel_code_generator" ];

@@ -61,7 +61,7 @@ buildPythonPackage rec {
    requests
    ruamel-yaml
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  preCheck = ''
    export HOME="$TEMPDIR"
@@ -68,7 +68,7 @@ buildPythonPackage rec {
    pandas
    uuid6
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests = [
    # Require pytest-benchmark
@@ -49,7 +49,7 @@ buildPythonPackage rec {
    pytestCheckHook
    scipy
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "dependency_injector" ];

@@ -104,7 +104,7 @@ buildPythonPackage rec {
    torchsde
    transformers
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  preCheck =
    let
@@ -66,7 +66,7 @@ buildPythonPackage rec {
    pytest-httpserver
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "dissect.cobaltstrike" ];

@@ -102,7 +102,7 @@ buildPythonPackage rec {
    pytestCheckHook
    pyyaml
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests = [
    # Tests require network access
@@ -47,7 +47,7 @@ buildPythonPackage rec {
    pytest-django
    pytestCheckHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  preCheck = ''
    export DJANGO_SETTINGS_MODULE=tests.app.settings
@@ -49,7 +49,7 @@ buildPythonPackage rec {
    psycopg2
    pytz
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  checkPhase = ''
    runHook preCheck
@@ -63,7 +63,7 @@ buildPythonPackage rec {
    pytestCheckHook
    redisTestHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  # https://github.com/jazzband/django-redis/issues/777
  dontUsePytestXdist = true;
@@ -63,7 +63,7 @@ buildPythonPackage rec {
    pytestCheckHook
    rsa
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  checkInputs = [ pynacl ];

@@ -54,7 +54,7 @@ buildPythonPackage rec {
    pytest-mypy-plugins
    pytestCheckHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests = [
    # AttributeError: module 'django.contrib.auth.forms' has no attribute 'SetUnusablePasswordMixin'
@@ -53,7 +53,7 @@ buildPythonPackage rec {
    pytest-django
    pytestCheckHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  meta = with lib; {
    changelog = "https://github.com/jieter/django-tables2/blob/v${version}/CHANGELOG.md";
@@ -137,7 +137,7 @@ buildPythonPackage rec {
    tblib
    tzdata
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  doCheck =
    !stdenv.hostPlatform.isDarwin
@@ -114,7 +114,7 @@ buildPythonPackage rec {
    tblib
    tzdata
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  preCheck = ''
    # make sure the installed library gets imported
@@ -106,7 +106,7 @@ buildPythonPackage rec {
    tblib
    tzdata
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  preCheck = ''
    # make sure the installed library gets imported
@@ -57,7 +57,7 @@ buildPythonPackage rec {
    pytest-mypy-plugins
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  # Upstream recommends mypy > 1.7 which we don't have yet, thus all tests are failing with 3.14.5 and below
  doCheck = false;
@@ -58,7 +58,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    pytestCheckHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  enabledTestPaths = [ "tests/unit" ];

@@ -74,7 +74,7 @@ buildPythonPackage rec {
    # fastapi
    httpx
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  disabledTests = [
    # AssertionError: assert 'c7a05e2b-8a21-4255-a3ed-92cea1e74a62' is None
@@ -36,7 +36,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    pytestCheckHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  pythonImportsCheck = [ "dparse" ];

@@ -29,7 +29,7 @@ buildPythonPackage rec {
  ];

  optional-dependencies = {
-    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
+    all = lib.concatAttrValues (lib.removeAttrs optional-dependencies [ "all" ]);
    gevent = [ gevent ];
    redis = [ redis ];
  };
@@ -56,7 +56,7 @@ buildPythonPackage rec {
    mypy-boto3-ebs
    pytestCheckHook
  ]
-  ++ lib.flatten (builtins.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  # https://github.com/RhinoSecurityLabs/dsnap/issues/26
  # ImportError: cannot import name 'mock_iam' from 'moto'
@@ -79,7 +79,7 @@ buildPythonPackage rec {
    glibcLocales
    pytestCheckHook
  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;

  enabledTestPaths = [ "tests" ];

--- a/Show More
+++ b/Show More