From 13202afc5ba567d0d8a0d7bb1421399cc07b1eec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Oct 2024 05:35:59 +0000
Subject: [PATCH 1/2] djhtml: 3.0.6 -> 3.0.7

---
 pkgs/development/tools/djhtml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/development/tools/djhtml/default.nix
index 0d30fc4f38002..1c58954665559 100644
--- a/pkgs/development/tools/djhtml/default.nix
+++ b/pkgs/development/tools/djhtml/default.nix
@@ -5,7 +5,7 @@
 }:
 buildPythonApplication rec {
   pname = "djhtml";
-  version = "3.0.6";
+  version = "3.0.7";
 
   format = "setuptools";
   disabled = pythonOlder "3.7";
@@ -14,7 +14,7 @@ buildPythonApplication rec {
     owner = "rtts";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-3bviLyTLpHcAUWAaAmNZukWBDwFs8yFOAxl2bSk9GNY=";
+    hash = "sha256-W93J3UFUrCqT718zoGcu96ORYFt0NLyYP7iVWbr8FYo=";
   };
 
   pythonImportsCheck = [ "djhtml" ];

From f3305a504237f6e777261ad778840c579f673fe7 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 1 Nov 2024 23:13:13 +0900
Subject: [PATCH 2/2] djhtml: refactor

---
 pkgs/development/tools/djhtml/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/development/tools/djhtml/default.nix
index 1c58954665559..1859249eb0f3c 100644
--- a/pkgs/development/tools/djhtml/default.nix
+++ b/pkgs/development/tools/djhtml/default.nix
@@ -1,28 +1,30 @@
 { lib
 , buildPythonApplication
 , fetchFromGitHub
-, pythonOlder
+, setuptools
 }:
 buildPythonApplication rec {
   pname = "djhtml";
   version = "3.0.7";
-
-  format = "setuptools";
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rtts";
-    repo = pname;
+    repo = "djhtml";
     rev = "refs/tags/${version}";
     hash = "sha256-W93J3UFUrCqT718zoGcu96ORYFt0NLyYP7iVWbr8FYo=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "djhtml" ];
 
   meta = with lib; {
     homepage = "https://github.com/rtts/djhtml";
     description = "Django/Jinja template indenter";
+    changelog = "https://github.com/rtts/djhtml/releases/tag/${version}";
     license = licenses.gpl3Plus;
     maintainers = [ ];
+    mainProgram = "djhtml";
   };
 }