From 1fed23c9f6d15b8a9691fdf0b79e2fd713f4b59b Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sun, 20 Oct 2024 20:48:52 -0700
Subject: [PATCH 1/3] python312Packages.pymumble: 1.6.1 -> unstable-2024-10-20

Move to using my fork of pymumble with a commit that regenerates proto
files using protoc 3.20 and relaxes version constraints.
---
 .../python-modules/pymumble/default.nix       | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix
index bc15652d7027..29ca8b4d5411 100644
--- a/pkgs/development/python-modules/pymumble/default.nix
+++ b/pkgs/development/python-modules/pymumble/default.nix
@@ -9,26 +9,20 @@
   pythonOlder,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pymumble";
-  version = "1.6.1"; # Don't upgrade to 1.7, version was yanked
+  version = "unstable-2024-10-20";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
-    owner = "azlux";
+    owner = "tjni";
     repo = "pymumble";
-    rev = "refs/tags/${version}";
-    hash = "sha256-+sT5pqdm4A2rrUcUUmvsH+iazg80+/go0zM1vr9oeuE=";
+    rev = "3241e84e5ce162a20597e4df6a9c443122357fec";
+    hash = "sha256-9lfWvfrS+vUFTf9jo4T+VHkm9u/hVjsDszLBQIEZVcQ=";
   };
 
-  postPatch = ''
-    # Changes all `library==x.y.z` statements to just `library`
-    # So that we aren't constrained to a specific version
-    sed -i 's/\(.*\)==.*/\1/' requirements.txt
-  '';
-
   propagatedBuildInputs = [
     opuslib
     protobuf
@@ -46,8 +40,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Library to create mumble bots";
-    homepage = "https://github.com/azlux/pymumble";
-    changelog = "https://github.com/azlux/pymumble/releases/tag/${version}";
+    homepage = "https://github.com/tjni/pymumble";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ thelegy ];
   };

From 9b6701a8da619e785d53497e0e19cd2db1344bcb Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sun, 20 Oct 2024 20:52:40 -0700
Subject: [PATCH 2/3] python312Packages.pymumble: add tjni as maintainer

---
 pkgs/development/python-modules/pymumble/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix
index 29ca8b4d5411..d1bb6b757437 100644
--- a/pkgs/development/python-modules/pymumble/default.nix
+++ b/pkgs/development/python-modules/pymumble/default.nix
@@ -42,6 +42,9 @@ buildPythonPackage {
     description = "Library to create mumble bots";
     homepage = "https://github.com/tjni/pymumble";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ thelegy ];
+    maintainers = with maintainers; [
+      thelegy
+      tjni
+    ];
   };
 }

From b3528b87e1a7fb074abf529d0800c91317a31f58 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Mon, 21 Oct 2024 07:51:51 -0700
Subject: [PATCH 3/3] python312Packages.pymumble: switch to pyproject and
 dependencies

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

diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix
index d1bb6b757437..e6214b6a9023 100644
--- a/pkgs/development/python-modules/pymumble/default.nix
+++ b/pkgs/development/python-modules/pymumble/default.nix
@@ -7,12 +7,13 @@
   pytestCheckHook,
   pycrypto,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage {
   pname = "pymumble";
   version = "unstable-2024-10-20";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -23,7 +24,11 @@ buildPythonPackage {
     hash = "sha256-9lfWvfrS+vUFTf9jo4T+VHkm9u/hVjsDszLBQIEZVcQ=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     opuslib
     protobuf
   ];