Merge pull request #64757 from marsam/fix-sklearn-deap

pythonPackages.sklearn-deap: 0.2.2 -> 0.2.3

1 files changed, 11 insertions, 4 deletions

diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix
index 63a048abdb2..c54997a21fe 100644
--- a/pkgs/development/python-modules/sklearn-deap/default.nix
+++ b/pkgs/development/python-modules/sklearn-deap/default.nix
@@ -1,17 +1,25 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, deap, scikitlearn, python, isPy3k }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }:
 
 buildPythonPackage rec {
   pname = "sklearn-deap";
-  version = "0.2.2";
+  version = "0.2.3";
 
   # No tests in Pypi
   src = fetchFromGitHub {
     owner = "rsteca";
     repo = pname;
     rev = "${version}";
-    sha256 = "01ynmzxg181xhv2d7bs53zjvk9x2qpxix32sspq54mpigxh13ava";
+    sha256 = "1yqnmy8h08i2y6bb2s0a5nx9cwvyg45293whqh420c195gpzg1x3";
   };
 
+  patches = [
+    # Fix for newer versions of scikit-learn. See: https://github.com/rsteca/sklearn-deap/pull/62
+    (fetchpatch {
+      url = "https://github.com/rsteca/sklearn-deap/commit/3ae62990fc87f36b59382e7c4db3c74cf99ec3bf.patch";
+      sha256 = "1na6wf4v0dcmyz3pz8aiqkmv76d1iz3hi4iyfq9kfnycgzpv1kxk";
+    })
+  ];
+
   propagatedBuildInputs = [ numpy scipy deap scikitlearn ];
 
   checkPhase = ''
@@ -23,7 +31,6 @@ buildPythonPackage rec {
     homepage = https://github.com/rsteca/sklearn-deap;
     license = licenses.lgpl3;
     maintainers = with maintainers; [ psyanticy ];
-    broken = isPy3k; # https://github.com/rsteca/sklearn-deap/issues/65
   };
 }