Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

pythonPackages.mpi4py: add patch for openmpi-4.0.0 compatibility

+11 -4
+11 -4
pkgs/development/python-modules/mpi4py/default.nix
··· 13 13 inherit mpi; 14 14 }; 15 15 16 - patches = [ (fetchpatch { 17 - # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE 18 - url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; 19 - sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; 16 + patches = [ 17 + (fetchpatch { 18 + # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE (upstream patch) 19 + url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; 20 + sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; 21 + }) 22 + (fetchpatch { 23 + # Open MPI: Workaround removal of MPI_{LB|UB} (upstream patch) 24 + url = "https://bitbucket.org/mpi4py/mpi4py/commits/39ca784226460f9e519507269ebb29635dc8bd90/raw"; 25 + sha256 = "02kxikdlsrlq8yr5hca42536mxbrq4k4j8nqv7p1p2r0q21a919q"; 20 26 }) 27 + 21 28 ]; 22 29 23 30 postPatch = ''