From 5abf5d4a9baa06e10272297562139d818d431a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 27 Oct 2024 19:00:51 -0700
Subject: [PATCH 1/2] python312Packages.versioningit: don't test with
 pydantic_1

---
 pkgs/development/python-modules/versioningit/default.nix | 3 +++
 pkgs/servers/home-assistant/default.nix                  | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix
index 9abbf8bba33b..2dfe93144469 100644
--- a/pkgs/development/python-modules/versioningit/default.nix
+++ b/pkgs/development/python-modules/versioningit/default.nix
@@ -36,6 +36,9 @@ buildPythonPackage rec {
     ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]
     ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
+  # AttributeError: type object 'CaseDetails' has no attribute 'model_validate_json'
+  doCheck = lib.versionAtLeast pydantic.version "2";
+
   nativeCheckInputs = [
     pytestCheckHook
     build
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index c39617fc84ca..532a5ce32d32 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -318,10 +318,6 @@ let
         ];
       };
 
-      versioningit = super.versioningit.overridePythonAttrs {
-        doCheck = false;
-      };
-
       # Pinned due to API changes ~1.0
       vultr = super.vultr.overridePythonAttrs (oldAttrs: rec {
         version = "0.1.2";

From 4ab73135df2c13fe4ee3c2ebd191e9abf9e56165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 27 Oct 2024 19:02:39 -0700
Subject: [PATCH 2/2] python312Packages.versioningit: modernize

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

diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix
index 2dfe93144469..05dc14a79557 100644
--- a/pkgs/development/python-modules/versioningit/default.nix
+++ b/pkgs/development/python-modules/versioningit/default.nix
@@ -20,7 +20,7 @@
 buildPythonPackage rec {
   pname = "versioningit";
   version = "3.1.2";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -29,9 +29,9 @@ buildPythonPackage rec {
     hash = "sha256-Tbg+2Z9WsH2DlAvuNEXKRsoSDRO2swTNtftE5apO3sA=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs =
+  dependencies =
     [ packaging ]
     ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]
     ++ lib.optionals (pythonOlder "3.11") [ tomli ];