From 1eeb94a4e3f75b4760d540d7e2ef3fcfe24feb93 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 1 May 2024 00:35:22 +0200
Subject: python311Packages.pygame-gui: switch to pygame-ce

happened upstream a year ago: https://github.com/MyreMylar/pygame_gui/commit/aa67f1e30a2e3d0e5414277bf54c437cf77195b7
became required as of https://github.com/MyreMylar/pygame_gui/pull/522
---
 pkgs/development/python-modules/pygame-gui/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index e2314f9c6e920..0b96a4ec9c9b2 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -2,7 +2,7 @@
 , pkgs
 , buildPythonPackage
 , fetchFromGitHub
-, pygame
+, pygame-ce
 , python-i18n
 , pytestCheckHook
 }:
@@ -20,7 +20,10 @@ buildPythonPackage rec {
     hash = "sha256-IXU00Us1odbfS7jLPMYuCPv2l/5TUZdYKES7xHs+EWg=";
   };
 
-  propagatedBuildInputs = [ pygame python-i18n ];
+  propagatedBuildInputs = [
+    pygame-ce
+    python-i18n
+  ];
 
   postPatch = ''
     substituteInPlace pygame_gui/core/utility.py \
-- 
cgit 1.4.1


From 16211e812efb922e8c80ece46c4c5e0a8bcd5db2 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 1 May 2024 23:54:48 +0200
Subject: python311Packages.pygame-gui: 069 -> 0610

---
 pkgs/development/python-modules/pygame-gui/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index 0b96a4ec9c9b2..fd82fed8995e8 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pygame-gui";
-  version = "069";
+  version = "0610";
   format = "setuptools";
   # nixpkgs-update: no auto update
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "MyreMylar";
     repo = "pygame_gui";
     rev = "refs/tags/v_${version}";
-    hash = "sha256-IXU00Us1odbfS7jLPMYuCPv2l/5TUZdYKES7xHs+EWg=";
+    hash = "sha256-PVNi/I174AyEEjc+N2UGtgOYSGAgVQbqrKkWZnjOxFY=";
   };
 
   propagatedBuildInputs = [
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     description = "A GUI system for pygame";
     homepage = "https://github.com/MyreMylar/pygame_gui";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ emilytrau ];
+    maintainers = with maintainers; [ emilytrau pbsds ];
   };
 }
-- 
cgit 1.4.1


From 6bbf0a7e1f48c483d4ffbaaf72ce94765281e5e7 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 2 May 2024 00:02:38 +0200
Subject: python311Packages.pygame-gui: harden, migrate to pyproject=true

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

diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index fd82fed8995e8..e74448a30768d 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -2,6 +2,7 @@
 , pkgs
 , buildPythonPackage
 , fetchFromGitHub
+, setuptools
 , pygame-ce
 , python-i18n
 , pytestCheckHook
@@ -10,7 +11,7 @@
 buildPythonPackage rec {
   pname = "pygame-gui";
   version = "0610";
-  format = "setuptools";
+  pyproject = true;
   # nixpkgs-update: no auto update
 
   src = fetchFromGitHub {
@@ -20,6 +21,10 @@ buildPythonPackage rec {
     hash = "sha256-PVNi/I174AyEEjc+N2UGtgOYSGAgVQbqrKkWZnjOxFY=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     pygame-ce
     python-i18n
@@ -27,7 +32,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pygame_gui/core/utility.py \
-      --replace "xsel" "${pkgs.xsel}/bin/xsel"
+      --replace-fail "xsel" "${lib.getExe pkgs.xsel}"
   '';
 
   nativeCheckInputs = [ pytestCheckHook ];
-- 
cgit 1.4.1