From 230fac9aa4961d922c7c29834fde4ad88f9bd85d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 2 May 2025 00:37:25 +0200
Subject: [PATCH] python313Packages.mirakuru: 2.5.3 -> 2.6.0

https://github.com/ClearcodeHQ/mirakuru/blob/v2.6.0/CHANGES.rst
---
 .../python-modules/mirakuru/default.nix       | 20 +++++++++----------
 .../python-modules/mirakuru/tmpdir.patch      | 19 ------------------
 2 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/python-modules/mirakuru/tmpdir.patch

diff --git a/pkgs/development/python-modules/mirakuru/default.nix b/pkgs/development/python-modules/mirakuru/default.nix
index 573548da6825..85085c1e6ebc 100644
--- a/pkgs/development/python-modules/mirakuru/default.nix
+++ b/pkgs/development/python-modules/mirakuru/default.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   pythonOlder,
   pytestCheckHook,
+  pytest-rerunfailures,
   setuptools,
   psutil,
   netcat,
@@ -14,8 +15,8 @@
 
 buildPythonPackage rec {
   pname = "mirakuru";
-  version = "2.5.3";
-  format = "pyproject";
+  version = "2.6.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.9";
 
@@ -23,24 +24,21 @@ buildPythonPackage rec {
     owner = "ClearcodeHQ";
     repo = "mirakuru";
     tag = "v${version}";
-    hash = "sha256-blk4Oclb3+Cj3RH7BhzacfoPFDBIP/zgv4Ct7fawGnQ=";
+    hash = "sha256-R5prLIub2kVhsKRGWbZMf/v0U7oOBieoLiHwMRDEs0I=";
   };
 
-  patches = [
-    # https://github.com/ClearcodeHQ/mirakuru/pull/810
-    ./tmpdir.patch
-  ];
+  build-system = [ setuptools ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ psutil ];
+  dependencies = [ psutil ];
 
   nativeCheckInputs = [
     netcat.nc
     ps
     python-daemon
+    pytest-rerunfailures
     pytestCheckHook
   ];
+
   pythonImportsCheck = [ "mirakuru" ];
 
   # Necessary for the tests to pass on Darwin with sandbox enabled.
@@ -61,7 +59,7 @@ buildPythonPackage rec {
     ];
 
   meta = with lib; {
-    homepage = "https://pypi.org/project/mirakuru";
+    homepage = "https://github.com/dbfixtures/mirakuru";
     description = "Process orchestration tool designed for functional and integration tests";
     changelog = "https://github.com/ClearcodeHQ/mirakuru/blob/v${version}/CHANGES.rst";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/python-modules/mirakuru/tmpdir.patch b/pkgs/development/python-modules/mirakuru/tmpdir.patch
deleted file mode 100644
index 2fd6fcfd2741..000000000000
--- a/pkgs/development/python-modules/mirakuru/tmpdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/tests/executors/test_unixsocket_executor.py
-+++ b/tests/executors/test_unixsocket_executor.py
-@@ -4,6 +4,7 @@ Some of these tests run ``nc``: when running Debian, make sure the
- ``netcat-openbsd`` package is used, not ``netcat-traditional``.
- """
- 
-+import os
- import sys
- 
- import pytest
-@@ -12,7 +13,7 @@ from mirakuru import TimeoutExpired
- from mirakuru.unixsocket import UnixSocketExecutor
- from tests import TEST_SOCKET_SERVER_PATH
- 
--SOCKET_PATH = "/tmp/mirakuru.sock"
-+SOCKET_PATH = os.path.join(os.getenv("TMPDIR", "/tmp"), "mirakuru.sock")
- 
- SOCKET_SERVER_CMD = f"{sys.executable} {TEST_SOCKET_SERVER_PATH} {SOCKET_PATH}"
-