From 26bfa2c7f2a3801a17a13986105842f42ea90172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 21 Sep 2024 18:15:24 -0700
Subject: [PATCH] nbqa: update dependencies

---
 pkgs/by-name/nb/nbqa/package.nix | 56 +++++++++++++-------------------
 1 file changed, 23 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/nb/nbqa/package.nix b/pkgs/by-name/nb/nbqa/package.nix
index f4b1a8fdf527..1c09784febbd 100644
--- a/pkgs/by-name/nb/nbqa/package.nix
+++ b/pkgs/by-name/nb/nbqa/package.nix
@@ -4,8 +4,6 @@
   fetchFromGitHub,
 
   # optional-dependencies
-  black,
-  blacken-docs,
   ruff,
 
   # passthru
@@ -28,27 +26,27 @@ python3.pkgs.buildPythonApplication rec {
     setuptools
   ];
 
-  passthru.optional-dependencies = {
-    black = [ black ];
-    blacken-docs = [ blacken-docs ];
-    flake8 = [ python3.pkgs.flake8 ];
-    isort = [ python3.pkgs.isort ];
-    jupytext = [ python3.pkgs.jupytext ];
-    mypy = [ python3.pkgs.mypy ];
-    pylint = [ python3.pkgs.pylint ];
-    pyupgrade = [ python3.pkgs.pyupgrade ];
-    ruff = [ ruff ];
-  };
+  optional-dependencies.toolchain =
+    (with python3.pkgs; [
+      black
+      blacken-docs
+      flake8
+      isort
+      jupytext
+      mypy
+      pylint
+      pyupgrade
+    ])
+    ++ [
+      ruff
+    ];
 
-  dependencies =
-    with python3.pkgs;
-    [
-      autopep8
-      ipython
-      tokenize-rt
-      tomli
-    ]
-    ++ builtins.attrValues passthru.optional-dependencies;
+  dependencies = with python3.pkgs; [
+    autopep8
+    ipython
+    tokenize-rt
+    tomli
+  ];
 
   postPatch = ''
     # Force using the Ruff executable rather than the Python package
@@ -61,24 +59,16 @@ python3.pkgs.buildPythonApplication rec {
   '';
 
   nativeCheckInputs =
-    [
-      black
-      ruff
-    ]
-    ++ (with python3.pkgs; [
+    (with python3.pkgs; [
       autoflake
       distutils
-      flake8
-      isort
-      jupytext
       mdformat
       pre-commit-hooks
       pydocstyle
-      pylint
       pytestCheckHook
-      pyupgrade
       yapf
-    ]);
+    ])
+    ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
     # Test data not found