about summary refs log tree commit diff
path: root/pkgs/development/python-modules/hdbscan
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2019-06-22 16:11:06 +0100
committerRobert Scott <code@humanleg.org.uk>2019-06-22 19:06:52 +0100
commit80089545797ce1aae097886c2630549127ea9828 (patch)
treeca1d0fc8f74591a55d89366d49a72a2739dea8b0 /pkgs/development/python-modules/hdbscan
parent4d9a4aa3f15b3b2702901abb07b4d4e650ceaab0 (diff)
pythonPackages.hdbscan: fix build by removing upstream patch, adding joblib
joblib is for the benefit of py27, whose scikitlearn doesn't include it.
also move cython to nativeBuildInputs
Diffstat (limited to 'pkgs/development/python-modules/hdbscan')
-rw-r--r--pkgs/development/python-modules/hdbscan/default.nix14
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix
index 72d818c25d620..02f888b175dc0 100644
--- a/pkgs/development/python-modules/hdbscan/default.nix
+++ b/pkgs/development/python-modules/hdbscan/default.nix
@@ -6,7 +6,7 @@
 , scipy
 , scikitlearn
 , fetchPypi
-, fetchpatch
+, joblib
 }:
 
 buildPythonPackage rec {
@@ -18,18 +18,10 @@ buildPythonPackage rec {
     sha256 = "5cfdc25375123eb9a72363449979141cc928c1953f220f0f81d7baabcaccec2d";
   };
 
-  patches = [
-    # Fix Tests. Drop in release >0.8.20
-    (fetchpatch {
-      name = "test-rsl-missing-import.patch";
-      url = https://github.com/scikit-learn-contrib/hdbscan/commit/e40ccef139e56e38adf7bd6912cd63efd97598f9.patch;
-      sha256 = "0cfq4ja7j61h2zwd1jw5gagcz2sg18kjnx29sb0bwa13wfw6fip0";
-    })
-  ];
-
   checkInputs = [ nose ];
 
-  propagatedBuildInputs = [ cython numpy scipy scikitlearn ];
+  nativeBuildInputs = [ cython ];
+  propagatedBuildInputs = [ numpy scipy scikitlearn joblib ];
 
   meta = with lib; {
     description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API";