From 73bf44ceb684d6f8e528dd70a3633471db703a1a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Nov 2024 11:52:26 +0100
Subject: [PATCH 1/2] python312Packages.cached-property: 1.5.2 -> 2.0.1

Diff: https://github.com/pydanny/cached-property/compare/refs/tags/1.5.2...2.0.1

Changelog: https://github.com/pydanny/cached-property/releases/tag/2.0.1
---
 .../cached-property/default.nix               | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix
index aab264724162..247d1ce50ceb 100644
--- a/pkgs/development/python-modules/cached-property/default.nix
+++ b/pkgs/development/python-modules/cached-property/default.nix
@@ -2,38 +2,31 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
-  pytestCheckHook,
   freezegun,
+  pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "cached-property";
-  version = "1.5.2";
-  format = "setuptools";
+  version = "2.0.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "pydanny";
-    repo = pname;
+    repo = "cached-property";
     rev = "refs/tags/${version}";
-    hash = "sha256-DGI8FaEjFd2bDeBDKcA0zDCE+5I6meapVNZgycE1gzs=";
+    hash = "sha256-sOThFJs18DR9aBgIpqkORU4iRmhCVKehyM3DLYUt/Wc=";
   };
 
-  patches = [
-    # Don't use asyncio.coroutine if it's not available, https://github.com/pydanny/cached-property/pull/267
-    (fetchpatch {
-      name = "asyncio-coroutine.patch";
-      url = "https://github.com/pydanny/cached-property/commit/297031687679762849dedeaf24aa3a19116f095b.patch";
-      hash = "sha256-qolrUdaX7db4hE125Lt9ICmPNYsD/uBmQrdO4q5NG3c=";
-    })
-  ];
+  build-system = [ setuptools ];
 
-  checkInputs = [
-    pytestCheckHook
+  nativeCheckInputs = [
     freezegun
+    pytestCheckHook
   ];
 
   disabledTests = [

From 8ddd87d8e10c1f34d551839656577bbb437c00b3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 11:49:48 +0100
Subject: [PATCH 2/2] tartufo: relax cached-property

---
 pkgs/by-name/ta/tartufo/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/tartufo/package.nix b/pkgs/by-name/ta/tartufo/package.nix
index 92cd656bd7e0..3bcf7c106de5 100644
--- a/pkgs/by-name/ta/tartufo/package.nix
+++ b/pkgs/by-name/ta/tartufo/package.nix
@@ -16,7 +16,10 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-s7gqGvOnie7lGlpW3wfd8igWfowxwg9mftRjiHnvedc=";
   };
 
-  pythonRelaxDeps = [ "tomlkit" ];
+  pythonRelaxDeps = [
+    "cached-property"
+    "tomlkit"
+  ];
 
   build-system = with python3.pkgs; [ poetry-core ];