python312Packages.boto3-stubs: 1.34.160 -> 1.34.161, python312Packages.botocore-stubs: 1.34.160 -> 1.34.161

pkgs/development/python-modules/boto3-stubs/default.nix

@@ -359,15 +359,15 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.34.160";
+  version = "1.35.19";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-xrHf6zyuZz7tWW8BQJM54uC5VaUkGhbO5p8pMD2bN94=";
+    hash = "sha256-xYQs2C1KFXBhPxeIMcK20bYPURuH9WzAFPKiFsA+z1o=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/botocore-stubs/default.nix

@@ -2,28 +2,28 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  poetry-core,
+  setuptools,
   pythonOlder,
   types-awscrt,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.34.160";
+  version = "1.35.19";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-kAlT8/km0gVQV3ZTX9ExBH74lRlzTx5TZdA+y67FPNk=";
+    hash = "sha256-/5Xq04vK9hSw8kxCIFRBzwSoy+IsdLxz8ossCmoFVuA=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     types-awscrt
     typing-extensions
   ];

pkgs/development/python-modules/cfn-lint/default.nix

@@ -2,10 +2,10 @@
   lib,
   aws-sam-translator,
   buildPythonPackage,
+  defusedxml,
   fetchFromGitHub,
   jschema-to-python,
   jsonpatch,
-  jsonschema,
   junit-xml,
   mock,
   networkx,
@@ -15,42 +15,58 @@
   pyyaml,
   regex,
   sarif-om,
+  setuptools,
   sympy,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "cfn-lint";
-  version = "0.87.7";
-  format = "setuptools";
+  version = "1.10.3";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "aws-cloudformation";
     repo = "cfn-lint";
     rev = "refs/tags/v${version}";
-    hash = "sha256-em6Vi9zIn8ikmcHVbljA1vr+R3t8ZpJ57p3Ix3bqMYU=";
+    hash = "sha256-so97s1PwAlLAnS86Y4yG30LuGxNGmw4Z+K2tk1WifdQ=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aws-sam-translator
-    jschema-to-python
     jsonpatch
-    jsonschema
-    junit-xml
     networkx
     networkx
     pyyaml
     regex
-    sarif-om
     sympy
+    typing-extensions
   ];
 
+  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,16 +84,18 @@ buildPythonPackage rec {
     "test_override_parameters"
     "test_positional_template_parameters"
     "test_template_config"
+    # Assertion error
+    "test_build_graph"
   ];
 
   pythonImportsCheck = [ "cfnlint" ];
 
   meta = with lib; {
     description = "Checks cloudformation for practices and behaviour that could potentially be improved";
-    mainProgram = "cfn-lint";
     homepage = "https://github.com/aws-cloudformation/cfn-lint";
     changelog = "https://github.com/aws-cloudformation/cfn-lint/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = [ ];
+    mainProgram = "cfn-lint";
   };
 }

pkgs/development/tools/aws-sam-cli/default.nix

@@ -11,14 +11,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "aws-sam-cli";
-  version = "1.120.0";
+  version = "1.122.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sam-cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XFVh7e9ooIBhWRkVovPdrSuyosBMQ84PDRjV2o0x9ns=";
+    hash = "sha256-kGU0f8rW6ZS4/Cszb/DshfJKeRaqeFwNHQz4WqDg5JI=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];