1 files changed, 18 insertions, 33 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/nixpkgs/pkgs/development/python-modules/datashader/default.nix
index 534cc816def7..d656a203b9e8 100644
--- a/nixpkgs/pkgs/development/python-modules/datashader/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/datashader/default.nix
@@ -1,9 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
 , dask
-, distributed
 , bokeh
 , toolz
 , datashape
@@ -15,38 +13,26 @@
 , colorcet
 , param
 , pyct
-, pyyaml
-, requests
-, scikitimage
 , scipy
-, pytest
-, pytest-benchmark
-, flake8
+, pytestCheckHook
 , nbsmoke
 , fastparquet
-, testpath
 , nbconvert
-, pytest_xdist
+, pytest-xdist
+, netcdf4
 }:
 
 buildPythonPackage rec {
   pname = "datashader";
-  version = "0.11.1";
+  version = "0.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6";
+    sha256 = "a135612876dc3e4b16ccb9ddb70de50519825c8c1be251b49aefa550bcf8a39a";
   };
-  patches = [ (fetchpatch {
-    # Unpins pyct==0.46 (Sep. 11, 2020).
-    # Will be incorporated into the next datashader release after 0.11.1
-    url = "https://github.com/holoviz/datashader/pull/960/commits/d7a462fa399106c34fd0d44505a8a73789dbf874.patch";
-    sha256 = "1wqsk9dpxnkxr49fa7y5q6ahin80cvys05lnirs2w2p1dja35y4x";
-  })];
 
   propagatedBuildInputs = [
     dask
-    distributed
     bokeh
     toolz
     datashape
@@ -58,30 +44,29 @@ buildPythonPackage rec {
     colorcet
     param
     pyct
-    pyyaml
-    requests
-    scikitimage
     scipy
-    testpath
   ];
 
   checkInputs = [
-    pytest
-    pytest-benchmark
-    pytest_xdist # not needed
-    flake8
+    pytestCheckHook
+    pytest-xdist # not needed
     nbsmoke
     fastparquet
-    pandas
     nbconvert
+    netcdf4
+  ];
+
+  pytestFlagsArray = [
+    "-n $NIX_BUILD_CORES"
+    "datashader"
   ];
 
-  # dask doesn't do well with large core counts
-  checkPhase = ''
-    pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array'
-  '';
+  disabledTestPaths = [
+    # 31/50 tests fail with TypeErrors
+    "datashader/tests/test_datatypes.py"
+  ];
 
-  meta = with lib; {
+  meta = with lib;{
     description = "Data visualization toolchain based on aggregating into a grid";
     homepage = "https://datashader.org";
     license = licenses.bsd3;