Merge master into staging-next

pkgs/development/python-modules/execnet/default.nix

@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "752a3786f17416d491f833a29217dda3ea4a471fc5269c492eebcee8cc4772d3";
+    sha256 = "1lvj8z6fikpb5r4rq9n53x3lmsm3vlbr58ikz28x85kly633fakm";
   };
 
   checkInputs = [ pytest ];

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";

pkgs/development/python-modules/requests-toolbelt/default.nix

@@ -5,6 +5,7 @@
 , betamax
 , mock
 , pytest
+, pyopenssl
 }:
 
 buildPythonPackage rec {
@@ -16,7 +17,7 @@ buildPythonPackage rec {
     sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0";
   };
 
-  checkInputs = [ betamax mock pytest ];
+  checkInputs = [ pyopenssl betamax mock pytest ];
   propagatedBuildInputs = [ requests ];
 
   checkPhase = ''