Merge pull request #197651 from samuela/samuela/beam

python3Packages.apache-beam: relax protobuf dependency to fix build

authored by Samuel Ainsworth and committed by GitHub 437171bf 039fa8de

+16 -11
+16 -11
pkgs/development/python-modules/apache-beam/default.nix
··· 27 27 , pymongo 28 28 , pytestCheckHook 29 29 , python 30 + , python-dateutil 30 31 , pythonAtLeast 31 - , python-dateutil 32 + , pythonRelaxDepsHook 32 33 , pytz 33 34 , pyyaml 34 35 , requests 35 36 , requests-mock 37 + , scikit-learn 36 38 , setuptools 37 39 , sqlalchemy 38 40 , tenacity 39 - , typing-extensions 40 41 , testcontainers 41 - , scikit-learn }: 42 + , typing-extensions 43 + }: 42 44 43 45 buildPythonPackage rec { 44 46 pname = "apache-beam"; ··· 51 53 sha256 = "sha256-0S7Dj6PMSbZkEAY6ZLUpKVfe/tFxsq60TTAFj0Qhtv0="; 52 54 }; 53 55 54 - # See https://github.com/NixOS/nixpkgs/issues/156957. 55 - postPatch = '' 56 - substituteInPlace setup.py \ 57 - --replace "dill>=0.3.1.1,<0.3.2" "dill" \ 58 - --replace "pyarrow>=0.15.1,<8.0.0" "pyarrow" \ 59 - --replace "numpy>=1.14.3,<1.23.0" "numpy" \ 60 - --replace "pymongo>=3.8.0,<4.0.0" "pymongo" 61 - ''; 56 + pythonRelaxDeps = [ 57 + # See https://github.com/NixOS/nixpkgs/issues/156957 58 + "dill" 59 + "numpy" 60 + "pyarrow" 61 + "pymongo" 62 + 63 + # See https://github.com/NixOS/nixpkgs/issues/193613 64 + "protobuf" 65 + ]; 62 66 63 67 sourceRoot = "source/sdks/python"; 64 68 ··· 66 70 cython 67 71 grpcio-tools 68 72 mypy-protobuf 73 + pythonRelaxDepsHook 69 74 ]; 70 75 71 76 propagatedBuildInputs = [