From 4934e7588331a4fd98d3b6f06e11df55002154df Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 30 Sep 2024 12:07:13 +0200
Subject: [PATCH] python312Packages.cfn-lint: 0.87.10 -> 1.15.1

Changelog: https://github.com/aws-cloudformation/cfn-lint/releases/tag/v1.15.1
---
 .../python-modules/cfn-lint/default.nix       | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index 595c5db21f16..c38052c00fe4 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -2,6 +2,7 @@
   lib,
   aws-sam-translator,
   buildPythonPackage,
+  defusedxml,
   fetchFromGitHub,
   jschema-to-python,
   jsonpatch,
@@ -15,13 +16,14 @@
   pyyaml,
   regex,
   sarif-om,
+  setuptools,
   sympy,
 }:
 
 buildPythonPackage rec {
   pname = "cfn-lint";
-  version = "0.87.10";
-  format = "setuptools";
+  version = "1.15.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -29,10 +31,12 @@ buildPythonPackage rec {
     owner = "aws-cloudformation";
     repo = "cfn-lint";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BQimKuM9TThSQPM8WsmjtHdTsmGE9+RYTE6z4lq6Q5k=";
+    hash = "sha256-45UIKXb1tX/jWw612WTGgYbg93bAYsQlXHJDZQUl5jg=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aws-sam-translator
     jschema-to-python
     jsonpatch
@@ -46,11 +50,26 @@ buildPythonPackage rec {
     sympy
   ];
 
+  optional-dependencies = {
+    graph = [ pydot ];
+    junit = [ junit-xml ];
+    sarif = [
+      jschema-to-python
+      sarif-om
+    ];
+    full = [
+      jschema-to-python
+      junit-xml
+      pydot
+      sarif-om
+    ];
+  };
+
   nativeCheckInputs = [
+    defusedxml
     mock
-    pydot
     pytestCheckHook
-  ];
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export PATH=$out/bin:$PATH
@@ -68,6 +87,8 @@ buildPythonPackage rec {
     "test_override_parameters"
     "test_positional_template_parameters"
     "test_template_config"
+    # Assertion error
+    "test_build_graph"
   ];
 
   pythonImportsCheck = [ "cfnlint" ];