python311Packages.pygame: 2.6.0 -> 2.6.1 (#322423)

pkgs/development/python-modules/pygame/default.nix

@@ -1,49 +1,44 @@
 {
-  stdenv,
   lib,
-  substituteAll,
-  fetchpatch,
-  fetchFromGitHub,
+  stdenv,
   buildPythonPackage,
-  pythonOlder,
+  fetchFromGitHub,
+  substituteAll,
+  fontconfig,
+  python,
 
   # build-system
   cython,
   setuptools,
+
+  # nativeBuildInputs
+  SDL2,
   pkg-config,
 
-  # native dependencies
-  AppKit,
-  fontconfig,
+  # buildInputs
   freetype,
   libjpeg,
   libpng,
   libX11,
   portmidi,
-  SDL2,
   SDL2_image,
   SDL2_mixer,
   SDL2_ttf,
-
-  # tests
-  python,
 }:
 
 buildPythonPackage rec {
   pname = "pygame";
-  version = "2.6.0";
+  version = "2.6.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = "refs/tags/${version}";
+    owner = "pygame";
+    repo = "pygame";
+    tag = version;
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The documentation
     # has such files and will be removed.
-    hash = "sha256-wNXcmH0IIuAOoomIdmhAPxe4TiEzes3Kq+Vth2r4/IA=";
+    hash = "sha256-paSDF0oPogq0g0HSDRagGu0OfsqIku6q4GGAMveGntk=";
     postFetch = "rm -rf $out/docs/reST";
   };
 
@@ -76,13 +71,16 @@ buildPythonPackage rec {
       --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     cython
-    pkg-config
-    SDL2
     setuptools
   ];
 
+  nativeBuildInputs = [
+    SDL2
+    pkg-config
+  ];
+
   buildInputs = [
     freetype
     libjpeg
@@ -93,7 +91,7 @@ buildPythonPackage rec {
     SDL2_image
     SDL2_mixer
     SDL2_ttf
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ];
+  ];
 
   preConfigure = ''
     ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py
@@ -110,17 +108,20 @@ buildPythonPackage rec {
     export SDL_VIDEODRIVER=dummy
     export SDL_AUDIODRIVER=disk
 
-    ${python.interpreter} -m pygame.tests -v --exclude opengl,timing --time_out 300
+    ${python.interpreter} -m pygame.tests -v \
+      --exclude opengl,timing \
+      --time_out 300
 
     runHook postCheck
   '';
   pythonImportsCheck = [ "pygame" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python library for games";
     homepage = "https://www.pygame.org/";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ emilytrau ];
-    platforms = platforms.unix;
+    changelog = "https://github.com/pygame/pygame/releases/tag/${src.tag}";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ emilytrau ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/top-level/python-packages.nix

@@ -11722,7 +11722,6 @@ self: super: with self; {
   pygal = callPackage ../development/python-modules/pygal { };
 
   pygame = callPackage ../development/python-modules/pygame {
-    inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
     SDL2_image = pkgs.SDL2_image_2_0;
   };