Merge branch 'master' into staging-next

2020-10-24 01:10:07 +02:00
parent d13fc932cd 579daedfca
commit c252654584
97 changed files with 2242 additions and 2155 deletions
@@ -2874,6 +2874,8 @@ in {
  else
    callPackage ../development/python-modules/imbalanced-learn { };

+  imdbpy = callPackage ../development/python-modules/imdbpy { };
+
  img2pdf = callPackage ../development/python-modules/img2pdf { };

  imgaug = callPackage ../development/python-modules/imgaug { };
@@ -6399,6 +6401,16 @@ in {
    disabled = !isPy3k;
  });

+  scipy_1_4 = self.scipy.overridePythonAttrs (oldAttrs: rec {
+    version = "1.4.1";
+    src = oldAttrs.src.override {
+      inherit version;
+      sha256 = "0ndw7zyxd2dj37775mc75zm4fcyiipnqxclc45mkpxy8lvrvpqfy";
+    };
+    doCheck = false;
+    disabled = !isPy3k;
+  });
+
  scipy = let
    scipy_ = callPackage ../development/python-modules/scipy { };
    scipy_1_2 = scipy_.overridePythonAttrs (oldAttrs: rec {