From dd7d2c203af5a1676ecd5bc7d4556360a6922073 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 13:42:56 +0100
Subject: [PATCH 1/2] python312Packages.subarulink: refactor

---
 .../python-modules/subarulink/default.nix           | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix
index c0c4fd0c244f..47918d96bbbb 100644
--- a/pkgs/development/python-modules/subarulink/default.nix
+++ b/pkgs/development/python-modules/subarulink/default.nix
@@ -7,24 +7,27 @@
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
   stdiomask,
 }:
 
 buildPythonPackage rec {
   pname = "subarulink";
   version = "0.7.13";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "G-Two";
-    repo = pname;
+    repo = "subarulink";
     tag = "v${version}";
     hash = "sha256-R6d9BaQDFSobiIsbI1I/eUaJt0VUU2ELdWU9xDyhuFc=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
     stdiomask
   ];
@@ -50,10 +53,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python module for interacting with STARLINK-enabled vehicle";
-    mainProgram = "subarulink";
     homepage = "https://github.com/G-Two/subarulink";
     changelog = "https://github.com/G-Two/subarulink/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "subarulink";
   };
 }

From 901090877fbfc56c2aedead1d4e15537ba1c5a33 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 13:45:14 +0100
Subject: [PATCH 2/2] python312Packages.subarulink: migrate to pytest-cov-stub

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

diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix
index 47918d96bbbb..fc0e7c9d8ece 100644
--- a/pkgs/development/python-modules/subarulink/default.nix
+++ b/pkgs/development/python-modules/subarulink/default.nix
@@ -5,6 +5,7 @@
   cryptography,
   fetchFromGitHub,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -35,14 +36,10 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     cryptography
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
   ];
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "--cov=subarulink" ""
-  '';
-
   __darwinAllowLocalNetworking = true;
 
   preCheck = ''