diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix index 685b9ffa6b81..a240e3db8b7b 100644 --- a/pkgs/development/python-modules/executor/default.nix +++ b/pkgs/development/python-modules/executor/default.nix @@ -2,8 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, setuptools, - pythonAtLeast, coloredlogs, humanfriendly, property-manager, @@ -14,21 +14,27 @@ virtualenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "executor"; version = "23.2"; - format = "setuptools"; - - # pipes is removed in python 3.13 - disabled = pythonAtLeast "3.13"; + pyproject = true; src = fetchFromGitHub { owner = "xolox"; repo = "python-executor"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Gjv+sUtnP11cM8GMGkFzXHVx0c2XXSU56L/QwoQxINc="; }; + patches = [ + # https://github.com/xolox/python-executor/pull/26 + (fetchpatch2 { + name = "python313-compat.patch"; + url = "https://github.com/xolox/python-executor/commit/4c5f4b44543bfb48ad790c440d1d7d0933e12499.patch?full_index=1"; + hash = "sha256-pfWdLaREikzBaey75Tb+GiE+pUCl1h2OmsjlpzKOlno="; + }) + ]; + build-system = [ setuptools ]; @@ -59,11 +65,11 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/xolox/python-executor/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/xolox/python-executor/blob/${finalAttrs.version}/CHANGELOG.rst"; description = "Programmer friendly subprocess wrapper"; mainProgram = "executor"; homepage = "https://github.com/xolox/python-executor"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ eyjhb ]; }; -} +})