Commit 82c4e4f1 authored by Robert Schütz's avatar Robert Schütz
Browse files

treewide: use lib.concatAttrValues to obtain all optional-dependencies

parent fafebf71

pkgs/applications/networking/instant-messengers/pantalaimon/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/al/alpaca/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 = [

pkgs/by-name/ca/calibre-web/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ python3Packages.buildPythonApplication rec { 
    "unidecode"

  ];



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

  nativeCheckInputs = lib.concatAttrValues optional-dependencies;



  pythonImportsCheck = [ "calibreweb" ];

pkgs/by-name/es/esptool/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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"

pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;