From 2ec53a7ff5779caa043bfdd5293e757e62fd31db Mon Sep 17 00:00:00 2001
From: con-f-use <con-f-use@users.noreply.github.com>
Date: Tue, 2 Dec 2025 15:25:42 +0100
Subject: [PATCH] mcomix: 3.1.0 -> 3.1.1

Updates mcomix from 3.1.0 to 3.1.1 see: https://sourceforge.net/p/mcomix/news/2025/09/changelog---mcomix-311/
Should make it compatible with Python > 3.12 (#428631)
---
 pkgs/by-name/mc/mcomix/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/mc/mcomix/package.nix b/pkgs/by-name/mc/mcomix/package.nix
index 04537d5bea12..becbbe4d3da1 100644
--- a/pkgs/by-name/mc/mcomix/package.nix
+++ b/pkgs/by-name/mc/mcomix/package.nix
@@ -5,7 +5,7 @@
   gobject-introspection,
   gtk3,
   mcomix,
-  python312, # TODO: Revert to python3 when upgrading past 3.1.0
+  python3,
   testers,
   wrapGAppsHook3,
 
@@ -17,14 +17,14 @@
   unrarSupport ? false, # unfree software
 }:
 
-python312.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "mcomix";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
 
   src = fetchurl {
     url = "mirror://sourceforge/mcomix/mcomix-${version}.tar.gz";
-    hash = "sha256-+Shuun/7w86VKBNamTmCPEJfO76fdKY5+HBvzCi0xCc=";
+    hash = "sha256-oQqq7XvAfet0796Tv5qKJ+G8vxgkoFGbJkz+5YK+zvg=";
   };
 
   buildInputs = [
@@ -34,12 +34,12 @@ python312.pkgs.buildPythonApplication rec {
 
   nativeBuildInputs = [
     gobject-introspection
-    python312.pkgs.setuptools
+    python3.pkgs.setuptools
     wrapGAppsHook3
   ];
 
   propagatedBuildInputs =
-    with python312.pkgs;
+    with python3.pkgs;
     [
       pillow
       pycairo
@@ -79,6 +79,9 @@ python312.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://sourceforge.net/projects/mcomix/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ thiagokokada ];
+    maintainers = with maintainers; [
+      confus
+      thiagokokada
+    ];
   };
 }