From 2c11db3de471f021596ef7715b0dcfb94fa18f67 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 10 Oct 2025 09:06:49 +0200
Subject: [PATCH] python313Packages.yamlfix: 1.16.1 -> 1.18.0

Changelog: https://github.com/lyz-code/yamlfix/blob/1.18.0/CHANGELOG.md
---
 .../python-modules/yamlfix/default.nix        | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix
index fb48b1960281..1c1cda272d74 100644
--- a/pkgs/development/python-modules/yamlfix/default.nix
+++ b/pkgs/development/python-modules/yamlfix/default.nix
@@ -5,38 +5,25 @@
   fetchFromGitHub,
   maison,
   pdm-backend,
+  pydantic,
   pytest-freezegun,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
   ruyaml,
   setuptools,
   writableTmpDirAsHomeHook,
 }:
-let
-  maison143 = maison.overridePythonAttrs (old: rec {
-    version = "1.4.3";
-    src = fetchFromGitHub {
-      owner = "dbatten5";
-      repo = "maison";
-      tag = "v${version}";
-      hash = "sha256-2hUmk91wr5o2cV3un2nMoXDG+3GT7SaIOKY+QaZY3nw=";
-    };
-  });
-in
 
 buildPythonPackage rec {
   pname = "yamlfix";
-  version = "1.16.1";
+  version = "1.18.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "lyz-code";
     repo = "yamlfix";
     tag = version;
-    hash = "sha256-RRpU6cxb3a3g6RrJbUCxY7YC87HHbGkhOFtE3hf8HdA=";
+    hash = "sha256-g2X9fBUS5wbQJbP29V5pWwrQ1+P/Y8euK4Rv7C6r3WM=";
   };
 
   build-system = [
@@ -46,12 +33,11 @@ buildPythonPackage rec {
 
   dependencies = [
     click
-    maison143
+    maison
+    pydantic
     ruyaml
   ];
 
-  pythonRelaxDeps = [ "maison" ];
-
   nativeCheckInputs = [
     pytest-freezegun
     pytest-xdist
@@ -63,14 +49,15 @@ buildPythonPackage rec {
 
   pytestFlags = [
     "-Wignore::DeprecationWarning"
+    "-Wignore::ResourceWarning"
   ];
 
   meta = {
     description = "Python YAML formatter that keeps your comments";
     homepage = "https://github.com/lyz-code/yamlfix";
-    changelog = "https://github.com/lyz-code/yamlfix/blob/${version}/CHANGELOG.md";
-    mainProgram = "yamlfix";
+    changelog = "https://github.com/lyz-code/yamlfix/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ koozz ];
+    mainProgram = "yamlfix";
   };
 }