about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-01-30 13:30:34 -0500
committerGitHub <noreply@github.com>2019-01-30 13:30:34 -0500
commitbdc7aabb2f97a650bb8d743790d7822e3d75ba5d (patch)
tree1a4d658957bc64c138e99250aa37ed4c7808c956 /pkgs/development
parent293a5c90ca245a16a79ed475e9c6fe99114e1115 (diff)
parentc0f82700ee25f4151bfbc787416cde9098b3ad40 (diff)
downloadnixlib-bdc7aabb2f97a650bb8d743790d7822e3d75ba5d.tar
nixlib-bdc7aabb2f97a650bb8d743790d7822e3d75ba5d.tar.gz
nixlib-bdc7aabb2f97a650bb8d743790d7822e3d75ba5d.tar.bz2
nixlib-bdc7aabb2f97a650bb8d743790d7822e3d75ba5d.tar.lz
nixlib-bdc7aabb2f97a650bb8d743790d7822e3d75ba5d.tar.xz
nixlib-bdc7aabb2f97a650bb8d743790d7822e3d75ba5d.tar.zst
nixlib-bdc7aabb2f97a650bb8d743790d7822e3d75ba5d.zip
Merge pull request #54898 from matthewbauer/pyspark-fix
pyspark: 2.3.2 -> 2.4.0, fix version bounds
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/python-modules/pyspark/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
index 29dd344a34cb..0eca6c5ddf05 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -2,16 +2,19 @@
 
 buildPythonPackage rec {
   pname = "pyspark";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7fb3b4fe47edb0fb78cecec37e0f2a728590f17ef6a49eae55141a7a374c07c8";
+    sha256 = "1p7z5f1a20l7xkjkh88q9cvjw2x8jbrlydkycn5lh4qvx72vgmy9";
   };
 
   # pypandoc is broken with pandoc2, so we just lose docs.
   postPatch = ''
     sed -i "s/'pypandoc'//" setup.py
+
+    # Current release works fine with py4j 0.10.8.1
+    substituteInPlace setup.py --replace py4j==0.10.7 'py4j>=0.10.7,<0.11'
   '';
 
   propagatedBuildInputs = [ py4j ];