From 14cae0af316bb561e432697f04c6bc61af9d5459 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 5 Apr 2021 21:48:46 +0100 Subject: [PATCH] pythonPackages.greenlet: 0.4.17 -> 1.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update greenlet to 1.0.0. meinheld declares a dependency to greenlet <0.5, but according to [1] and [2], there are no API or ABI changes leading to greenlet-1.0.0, so it seems reasonable to drop the strict requirement. This commit uses substituteInPlace to patch setup.py since no upstream commit has landed in the main branch yet. Morehover, quoting [2]: Prior to greenlet 1.0 there were no semantic meanings attached to greenlet versions — API and ABI regularly changed from 0.4.x to 0.4.x+1, so their current pin doesn't make much sense anyway. nix-review reveals few broken packages that are also broken in master. [1] https://github.com/mopemope/meinheld/pull/123 [2] https://github.com/benoitc/gunicorn/issues/2541#issuecomment-800353993 --- pkgs/development/python-modules/greenlet/default.nix | 9 ++------- pkgs/development/python-modules/meinheld/default.nix | 6 ++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 9d00e93739c..c1de32eff51 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -8,21 +8,16 @@ buildPythonPackage rec { pname = "greenlet"; - version = "0.4.17"; + version = "1.0.0"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "0swdhrcq13bdszv3yz5645gi4ijbzmmhxpb6whcfg3d7d5f87n21"; + sha256 = "1y6wbg9yhm9dw6m768n4yslp56h85pnxkk3drz6icn15g6f1d7ki"; }; propagatedBuildInputs = [ six ]; - # see https://github.com/python-greenlet/greenlet/issues/85 - preCheck = '' - rm tests/test_leaks.py - ''; - meta = { homepage = "https://pypi.python.org/pypi/greenlet"; description = "Module for lightweight in-process concurrent programming"; diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index 9cf02e4c886..0fced5f3e71 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -9,6 +9,12 @@ buildPythonPackage rec { sha256 = "008c76937ac2117cc69e032dc69cea9f85fc605de9bac1417f447c41c16a56d6"; }; + patchPhase = '' + # Allow greenlet-1.0.0. + # See https://github.com/mopemope/meinheld/pull/123 + substituteInPlace setup.py --replace "greenlet>=0.4.5,<0.5" "greenlet>=0.4.5,<2.0.0" + ''; + propagatedBuildInputs = [ greenlet ]; # No tests