From 45ec327c04e358363d2aa4882aa365c703857357 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Apr 2022 10:34:31 +0000
Subject: [PATCH 1/2] python310Packages.svdtools: 0.1.21 -> 0.1.22

---
 pkgs/development/python-modules/svdtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/svdtools/default.nix b/pkgs/development/python-modules/svdtools/default.nix
index 03db4b6356e2..3e79479e9f19 100644
--- a/pkgs/development/python-modules/svdtools/default.nix
+++ b/pkgs/development/python-modules/svdtools/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "svdtools";
-  version = "0.1.21";
+  version = "0.1.22";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0qc94haqkj4dbhify1l3x0ji1dx34m79nfnsk1c7l1kl2zjvz6bz";
+    sha256 = "sha256-5zMuCFCvh7BXr9BbyyDhWw1Lt/Fomv0SALiPJQbxJNQ=";
   };
 
   # remove upon next release

From 7fe8c7fd43743178c7681e87b5cddfef774b85c8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Apr 2022 13:36:02 +0200
Subject: [PATCH 2/2] python3Packages.svdtools: remove stale substituteInPlace

---
 .../python-modules/svdtools/default.nix        | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/svdtools/default.nix b/pkgs/development/python-modules/svdtools/default.nix
index 3e79479e9f19..98b59c18bdc3 100644
--- a/pkgs/development/python-modules/svdtools/default.nix
+++ b/pkgs/development/python-modules/svdtools/default.nix
@@ -12,21 +12,15 @@
 buildPythonPackage rec {
   pname = "svdtools";
   version = "0.1.22";
+  format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "sha256-5zMuCFCvh7BXr9BbyyDhWw1Lt/Fomv0SALiPJQbxJNQ=";
+    hash = "sha256-5zMuCFCvh7BXr9BbyyDhWw1Lt/Fomv0SALiPJQbxJNQ=";
   };
 
-  # remove upon next release
-  # see: https://github.com/stm32-rs/svdtools/pull/96
-  prePatch = ''
-    substituteInPlace setup.py \
-      --replace 'PyYAML ~= 5.3' 'PyYAML >= 5.3'
-  '';
-
   propagatedBuildInputs = [
     braceexpand
     click
@@ -34,9 +28,13 @@ buildPythonPackage rec {
     lxml
   ];
 
-  checkInputs = [ pytestCheckHook ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  pythonImportsCheck = [ "svdtools" ];
+  pythonImportsCheck = [
+    "svdtools"
+  ];
 
   meta = with lib; {
     description = "Python package to handle vendor-supplied, often buggy SVD files";