From 80089545797ce1aae097886c2630549127ea9828 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 22 Jun 2019 16:11:06 +0100 Subject: [PATCH] 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 --- .../development/python-modules/hdbscan/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 72d818c25d6..02f888b175d 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";