From bb7c0499c8525816819d6636f67723c45c97ed08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 Aug 2024 03:01:06 +0000
Subject: [PATCH 1/2] python312Packages.txtorcon: 23.11.0 -> 24.8.0

---
 .../development/python-modules/txtorcon/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix
index 6c6f7c86b3a0..6fafeaaef938 100644
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -4,7 +4,6 @@
   automat,
   buildPythonPackage,
   cryptography,
-  fetchpatch2,
   fetchPypi,
   geoip,
   incremental,
@@ -18,24 +17,16 @@
 
 buildPythonPackage rec {
   pname = "txtorcon";
-  version = "23.11.0";
+  version = "24.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cfha6T121yZRAFnJ7XTmCLxaXJ99EDhTtJ5BQoBAai8=";
+    hash = "sha256-vv4ZE42cjFMHtu5tT+RG0MIB/9HMQErrJl7ZAwmXitA=";
   };
 
-  patches = [
-    # https://github.com/meejah/txtorcon/pull/400
-    (fetchpatch2 {
-      name = "twisted-24.7.0-fixes.patch";
-      url = "https://github.com/meejah/txtorcon/commit/88b5dc2971514babd36d837c93550715dea44b09.patch";
-      hash = "sha256-O7kFZw+y1PHJRcMdxCczy8UZd3ruLhjLMxh2tcawWI4=";
-    })
-  ];
 
   propagatedBuildInputs = [
     cryptography

From 3134d8e0f9d43c53208b2f6fc1204f771a16be0f Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sun, 15 Sep 2024 16:45:44 +0900
Subject: [PATCH 2/2] python312Packages.txtorcon: switch to pypa builder

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

diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix
index 6fafeaaef938..c41d50e4e1df 100644
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -6,11 +6,11 @@
   cryptography,
   fetchPypi,
   geoip,
-  incremental,
   lsof,
   mock,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
   twisted,
   zope-interface,
 }:
@@ -18,7 +18,7 @@
 buildPythonPackage rec {
   pname = "txtorcon";
   version = "24.8.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -27,10 +27,10 @@ buildPythonPackage rec {
     hash = "sha256-vv4ZE42cjFMHtu5tT+RG0MIB/9HMQErrJl7ZAwmXitA=";
   };
 
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     cryptography
-    incremental
     twisted
     automat
     zope-interface
@@ -45,6 +45,8 @@ buildPythonPackage rec {
 
   doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
 
+  pythonImportsCheck = [ "txtorcon" ];
+
   meta = with lib; {
     description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions";
     homepage = "https://github.com/meejah/txtorcon";