From a18f7e07e1b1af054e192c8de4447de71a0b9e30 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 7 May 2026 23:50:12 +0000
Subject: [PATCH] python3Packages.eliot: 1.17.5 -> 1.18.0

Diff: https://github.com/itamarst/eliot/compare/1.17.5...1.18.0

Changelog: https://github.com/itamarst/eliot/blob/1.18.0/docs/source/news.rst
---
 .../python-modules/eliot/default.nix          | 16 +++++++------
 .../python-modules/eliot/python-3.14.patch    | 23 -------------------
 2 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/python-modules/eliot/python-3.14.patch

diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix
index 5412f8ca4d3e..07fc87bbb1e4 100644
--- a/pkgs/development/python-modules/eliot/default.nix
+++ b/pkgs/development/python-modules/eliot/default.nix
@@ -6,6 +6,8 @@
 
   # build-system
   setuptools,
+  setuptools-scm,
+  versioneer,
 
   # dependencies
   boltons,
@@ -27,23 +29,23 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "eliot";
-  version = "1.17.5";
+  version = "1.18.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "itamarst";
     repo = "eliot";
     tag = finalAttrs.version;
-    hash = "sha256-x6zonKL6Ys1fyUjyOgVgucAN64Dt6dCzdBrxRZa+VDQ=";
+    hash = "sha256-YUvHdnpWtsy2NlrVLaaewcUPKGLfdfX/zvowV0jcXuw=";
   };
 
-  patches = [
-    # Upstream PR: https://github.com/itamarst/eliot/pull/520
-    ./python-3.14.patch
+  build-system = [
+    setuptools
+    setuptools-scm
+    versioneer
   ];
 
-  build-system = [ setuptools ];
-
   dependencies = [
     boltons
     orjson
diff --git a/pkgs/development/python-modules/eliot/python-3.14.patch b/pkgs/development/python-modules/eliot/python-3.14.patch
deleted file mode 100644
index af34f0db80f1..000000000000
--- a/pkgs/development/python-modules/eliot/python-3.14.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From a5fc2936e8e13ebb73de4254234ca4d6ead15d1e Mon Sep 17 00:00:00 2001
-From: Itamar Turner-Trauring <itamar@pythonspeed.com>
-Date: Sun, 18 Jan 2026 14:15:02 -0500
-Subject: [PATCH] Pass tests for 3.14.
-
----
- eliot/tests/test_coroutines.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/eliot/tests/test_coroutines.py b/eliot/tests/test_coroutines.py
-index 39c5496c..cb2c1b13 100644
---- a/eliot/tests/test_coroutines.py
-+++ b/eliot/tests/test_coroutines.py
-@@ -34,7 +34,8 @@ def run_coroutines(*async_functions):
-     """
-     Run a coroutine until it finishes.
-     """
--    loop = asyncio.get_event_loop()
-+    loop = asyncio.new_event_loop()
-+    asyncio.set_event_loop(loop)
-     futures = [asyncio.ensure_future(f()) for f in async_functions]
- 
-     async def wait_for_futures():