From 1dfa19f60f8fe8167e8f098c75b5b76a42b47721 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Thu, 4 Jun 2026 20:54:28 +0200
Subject: [PATCH 1/3] python3Packages.executor: migrate to pyproject

---
 pkgs/development/python-modules/executor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix
index 685b9ffa6b81..94629f6b0f43 100644
--- a/pkgs/development/python-modules/executor/default.nix
+++ b/pkgs/development/python-modules/executor/default.nix
@@ -17,7 +17,7 @@
 buildPythonPackage rec {
   pname = "executor";
   version = "23.2";
-  format = "setuptools";
+  pyproject = true;
 
   # pipes is removed in python 3.13
   disabled = pythonAtLeast "3.13";

From bfe66c1052b242651696f7d8abb488a0bd49152f Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Thu, 4 Jun 2026 20:56:24 +0200
Subject: [PATCH 2/3] python3Packages.executor: migrate from rec to finalAttrs

---
 pkgs/development/python-modules/executor/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix
index 94629f6b0f43..dd057870b7c1 100644
--- a/pkgs/development/python-modules/executor/default.nix
+++ b/pkgs/development/python-modules/executor/default.nix
@@ -14,7 +14,7 @@
   virtualenv,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "executor";
   version = "23.2";
   pyproject = true;
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-executor";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-Gjv+sUtnP11cM8GMGkFzXHVx0c2XXSU56L/QwoQxINc=";
   };
 
@@ -59,11 +59,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 ];
   };
-}
+})

From a3783c59897789dd491dbbd5c5329aac1ba28b5a Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Thu, 4 Jun 2026 21:04:26 +0200
Subject: [PATCH 3/3] python3Packages.executor: fix for python 3.13+

---
 .../python-modules/executor/default.nix            | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix
index dd057870b7c1..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,
@@ -19,9 +19,6 @@ buildPythonPackage (finalAttrs: {
   version = "23.2";
   pyproject = true;
 
-  # pipes is removed in python 3.13
-  disabled = pythonAtLeast "3.13";
-
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-executor";
@@ -29,6 +26,15 @@ buildPythonPackage (finalAttrs: {
     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
   ];