Merge master into staging-next

2021-04-24 06:05:30 +00:00
parent 01e4b493de 276cb2ad23
commit d8d6ba0d2e
46 changed files with 453 additions and 127 deletions
--- a/pkgs/development/python-modules/dask-glm/default.nix
+++ b/pkgs/development/python-modules/dask-glm/default.nix
@@ -9,6 +9,7 @@
 , scipy
 , scikitlearn
 , pytest
+, setuptools-scm
 }:

 buildPythonPackage rec {
@@ -22,6 +23,7 @@ buildPythonPackage rec {

  nativeBuildInputs = [ setuptools-scm ];
  checkInputs = [ pytest ];
+  nativeBuildInputs = [ setuptools-scm ];
  propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ];

  checkPhase = ''