From 51a5553c2e73b3e54957c382f19bcae865c017d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Oct 2024 02:56:32 +0000
Subject: [PATCH 1/2] python312Packages.gcovr: 7.2 -> 8.2

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

diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix
index c6ec91b5946b..6507943d3f55 100644
--- a/pkgs/development/python-modules/gcovr/default.nix
+++ b/pkgs/development/python-modules/gcovr/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "gcovr";
-  version = "7.2";
+  version = "8.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4+lctWyojbvnQctdaaor5JTrL8KgnuT2UWRKZw7lrrM=";
+    hash = "sha256-mh3d1FhdE+x3VV211rajHugVh+pvxgT/n80jLLB4LfU=";
   };
 
   propagatedBuildInputs = [

From 52ff10f24045b81502a2912805023030228ead2a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 16 Oct 2024 10:00:36 +0200
Subject: [PATCH 2/2] python312Packages.gcovr: refactor

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

diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix
index 6507943d3f55..0344d56a5dfe 100644
--- a/pkgs/development/python-modules/gcovr/default.nix
+++ b/pkgs/development/python-modules/gcovr/default.nix
@@ -7,22 +7,25 @@
   lxml,
   pygments,
   pythonOlder,
+  setuptools,
   tomli,
 }:
 
 buildPythonPackage rec {
   pname = "gcovr";
   version = "8.2";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-mh3d1FhdE+x3VV211rajHugVh+pvxgT/n80jLLB4LfU=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     colorlog
     jinja2
     lxml
@@ -41,10 +44,10 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python script for summarizing gcov data";
-    mainProgram = "gcovr";
     homepage = "https://www.gcovr.com/";
     changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst";
     license = lib.licenses.bsd0;
     maintainers = with lib.maintainers; [ sigmanificient ];
+    mainProgram = "gcovr";
   };
 }