python.pkgs.joblib: 0.12.4 -> 0.13.2 (#57906)

NixOS · Mar 24, 2019 · 2c07a08 · 2c07a08
1 parent 39cb31e
commit 2c07a08
Showing 1 changed file with 23 additions and 8 deletions.
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
+, fetchpatch
 , sphinx
 , numpydoc
 , pytest
@@ -10,16 +11,30 @@
 
 buildPythonPackage rec {
   pname = "joblib";
-  version = "0.12.4";
+  version = "0.13.2";
 
-  # get full repository inorder to run tests
-  src = fetchFromGitHub {
-    owner = "joblib";
-    repo = pname;
-    rev = version;
-    sha256 = "06zszgp7wpa4jr554wkk6kkigp4k9n5ad5h08i6w9qih963rlimb";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "315d6b19643ec4afd4c41c671f9f2d65ea9d787da093487a81ead7b0bac94524";
   };
 
+  # python-lz4 compatibility
+  # https://github.com/joblib/joblib/pull/847
+  patches = [
+    (fetchpatch {
+      url = https://github.com/joblib/joblib/commit/d3235fd601f40c91e074d48a411d7380329fe155.patch;
+      sha256 = "1hg1vfbba7mfilrpvmd97s68v03vs4bhlp1c1dj9lizi51mj2q2h";
+    })
+    (fetchpatch {
+      url = https://github.com/joblib/joblib/commit/884c92cd2aa5c2c1975ab48786da75556d779833.patch;
+      sha256 = "11kvpkvi428dq13ayy7vfyrib8isvcrdw8cd5hxkp5axr7sl12ba";
+    })
+    (fetchpatch {
+      url = https://github.com/joblib/joblib/commit/f1e177d781cc0d64420ec964a0b17d8268cb42a0.patch;
+      sha256 = "1sq6wcw4bhaq8cqwcd43fdws3467qy342xx3pgv62hp2nn75a21d";
+    })
+  ];
+
   checkInputs = [ sphinx numpydoc pytest ];
   propagatedBuildInputs = [ python-lz4 ];