Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1525828
2019-06-18 09:41:36 +02:00
parent 7adbdd9758 03acdd20be
commit 0aa9f35a99
855 changed files with 1664 additions and 1409 deletions
--- a/pkgs/development/python-modules/hdbscan/default.nix
+++ b/pkgs/development/python-modules/hdbscan/default.nix
@@ -6,6 +6,7 @@
 , scipy
 , scikitlearn
 , fetchPypi
+, fetchpatch
 }:

 buildPythonPackage rec {
@@ -17,6 +18,15 @@ 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 ];