From e3e9e48993d6dce6040ee85c326617a99779dac3 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 10:35:39 +0700
Subject: [PATCH 1/4] python3Packages.cheetah3: migrate to pyproject

---
 pkgs/development/python-modules/cheetah3/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix
index 8006522a60c1..b437fc55877a 100644
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@@ -2,12 +2,13 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "cheetah3";
   version = "3.4.0.post5";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CheetahTemplate3";
@@ -16,6 +17,8 @@ buildPythonPackage rec {
     hash = "sha256-qWV6ncSe4JbGZD7sLc/kEXY1pUM1II24UgsS/zX872Y=";
   };
 
+  build-system = [ setuptools ];
+
   doCheck = false; # Circular dependency
 
   pythonImportsCheck = [ "Cheetah" ];

From 2bd6620b554c5129fb38f6346abb766e2b819228 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 10:40:36 +0700
Subject: [PATCH 2/4] python3Packages.cheetah3: modernize

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

diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix
index b437fc55877a..5cc6b91f8a44 100644
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@@ -5,15 +5,17 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "cheetah3";
   version = "3.4.0.post5";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "CheetahTemplate3";
     repo = "cheetah3";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-qWV6ncSe4JbGZD7sLc/kEXY1pUM1II24UgsS/zX872Y=";
   };
 
@@ -26,8 +28,8 @@ buildPythonPackage rec {
   meta = {
     description = "Template engine and code generation tool";
     homepage = "http://www.cheetahtemplate.org/";
-    changelog = "https://github.com/CheetahTemplate3/cheetah3/releases/tag/${version}";
+    changelog = "https://github.com/CheetahTemplate3/cheetah3/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pjjw ];
   };
-}
+})

From 4ecfc278f4bc9aa405bf79a091339a9d7c9852b6 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 10:43:58 +0700
Subject: [PATCH 3/4] python3Packages.cheetah3: use HTTPS meta.homepage

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

diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix
index 5cc6b91f8a44..fea1a79f272f 100644
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: {
 
   meta = {
     description = "Template engine and code generation tool";
-    homepage = "http://www.cheetahtemplate.org/";
+    homepage = "https://www.cheetahtemplate.org/";
     changelog = "https://github.com/CheetahTemplate3/cheetah3/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pjjw ];

From 86eee854e6db7f011a8eae0b06421818ce316a01 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 10:47:12 +0700
Subject: [PATCH 4/4] python3Packages.cheetah3: re-enable previously-disabled
 tests

---
 pkgs/development/python-modules/cheetah3/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix
index fea1a79f272f..2b7f46b2e646 100644
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@@ -21,8 +21,6 @@ buildPythonPackage (finalAttrs: {
 
   build-system = [ setuptools ];
 
-  doCheck = false; # Circular dependency
-
   pythonImportsCheck = [ "Cheetah" ];
 
   meta = {