From 51ef95e6faa8efd644424dd72796e1bb9997983c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Feb 2022 14:04:07 +0100
Subject: [PATCH] python3.pkgs.dask: don't offer an option for extras-require

Using such an option within the package set this way will result in
different packages depending on different versions of dask and thereby
collisions.

Instead, we can simply declare in the package offering the extras the
packages the extra needs.
---
 pkgs/development/python-modules/dask/default.nix       | 8 ++++----
 pkgs/development/python-modules/datashader/default.nix | 2 +-
 pkgs/top-level/python-packages.nix                     | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 132753b1583f..7af0eca747e8 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -18,7 +18,6 @@
 , pythonOlder
 , pyyaml
 , toolz
-, withExtraComplete ? false
 }:
 
 buildPythonPackage rec {
@@ -46,9 +45,6 @@ buildPythonPackage rec {
     jinja2
     bokeh
     numpy
-  ] ++ lib.optionals (withExtraComplete) [
-    # infinite recursion between distributed and dask
-    distributed
   ];
 
   doCheck = true;
@@ -104,6 +100,10 @@ buildPythonPackage rec {
     "dask.diagnostics"
   ];
 
+  passthru.extras-require = {
+    complete = [ distributed ];
+  };
+
   meta = with lib; {
     description = "Minimal task scheduling abstraction";
     homepage = "https://dask.org/";
diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix
index d4515b064833..152582f6716f 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     param
     pyct
     scipy
-  ];
+  ] ++ dask.extras-require.complete;
 
   checkInputs = [
     pytestCheckHook
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a7f59aea3b45..c6a62cde8f7d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2044,9 +2044,7 @@ in {
 
   datasette-template-sql = callPackage ../development/python-modules/datasette-template-sql { };
 
-  datashader = callPackage ../development/python-modules/datashader {
-    dask = self.dask.override { withExtraComplete = true; };
-  };
+  datashader = callPackage ../development/python-modules/datashader { };
 
   datashape = callPackage ../development/python-modules/datashape { };