From 05ba987c1b6b69db149478844d8a7d71ee2d53cf Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 26 Mar 2026 23:37:20 +0000
Subject: [PATCH] eliot-tree: 21.0.0 -> 24.0.0

Changelog: https://github.com/jonathanj/eliottree/blob/24.0.0/NEWS.rst
---
 pkgs/by-name/el/eliot-tree/package.nix | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/el/eliot-tree/package.nix b/pkgs/by-name/el/eliot-tree/package.nix
index ed8bbc2edc97..85ea33f3541a 100644
--- a/pkgs/by-name/el/eliot-tree/package.nix
+++ b/pkgs/by-name/el/eliot-tree/package.nix
@@ -1,27 +1,22 @@
 {
   lib,
   python3Packages,
-  fetchPypi,
+  fetchFromGitHub,
   addBinToPathHook,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "eliot-tree";
-  version = "21.0.0";
+  version = "24.0.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit (finalAttrs) pname version;
-    hash = "sha256-hTl+r+QJPPQ7ss73lty3Wm7DLy2SKGmmgIuJx38ilO8=";
+  src = fetchFromGitHub {
+    owner = "jonathanj";
+    repo = "eliottree";
+    tag = finalAttrs.version;
+    hash = "sha256-4P6eAhX7XBuxu8r/7xvm07u4PZzKP3YLj/5kekgYXG8=";
   };
 
-  # Patch Python 3.12 incompatibilities in versioneer.py.
-  postPatch = ''
-    substituteInPlace versioneer.py \
-      --replace-fail SafeConfigParser ConfigParser \
-      --replace-fail readfp read_file
-  '';
-
   build-system = with python3Packages; [ setuptools ];
 
   dependencies = with python3Packages; [
@@ -29,6 +24,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     eliot
     iso8601
     jmespath
+    six
     toolz
   ];