diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 5c9e2432c822..80c0d153b72d 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -24,11 +24,13 @@ SDL2_mixer, SDL2_ttf, numpy, + + pygame-gui, }: buildPythonPackage rec { pname = "pygame-ce"; - version = "2.5.1"; + version = "2.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +39,7 @@ buildPythonPackage rec { owner = "pygame-community"; repo = "pygame-ce"; rev = "refs/tags/${version}"; - hash = "sha256-bt/6ukXZU79CWFqov9JON9ktQ/c4NKLxhX4Jif3Enxs="; + hash = "sha256-9e02ZfBfk18jsVDKKhMwEJiTGMG7VdBEgVh4unMJguY="; # Unicode file cause different checksums on HFS+ vs. other filesystems postFetch = "rm -rf $out/docs/reST"; }; @@ -67,10 +69,10 @@ buildPythonPackage rec { '' # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015) substituteInPlace pyproject.toml \ - --replace-fail '"cython<=3.0.10",' '"cython",' \ - --replace-fail '"meson<=1.5.0",' '"meson",' \ - --replace-fail '"sphinx<=7.2.6",' "" \ - --replace-fail '"ninja<=1.11.1.1",' "" + --replace-fail '"meson<=1.5.1",' '"meson",' \ + --replace-fail '"ninja<=1.11.1.1",' "" \ + --replace-fail '"cython<=3.0.11",' '"cython",' \ + --replace-fail '"sphinx<=7.2.6",' "" substituteInPlace buildconfig/config_{unix,darwin}.py \ --replace-fail 'from distutils' 'from setuptools._distutils' substituteInPlace src_py/sysfont.py \ @@ -151,12 +153,16 @@ buildPythonPackage rec { "pygame.version" ]; - meta = with lib; { + passthru.tests = { + inherit pygame-gui; + }; + + meta = { description = "Pygame Community Edition (CE) - library for multimedia application built on SDL"; homepage = "https://pyga.me/"; changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${version}"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ pbsds ]; - platforms = platforms.unix; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.pbsds ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index 5906a6f9a9cb..6c8261a06b3a 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -1,6 +1,7 @@ { lib, pkgs, + stdenv, buildPythonPackage, nix-update-script, fetchFromGitHub, @@ -53,6 +54,11 @@ buildPythonPackage rec { "test_process_event_text_ctrl_v_select_range" "test_process_event_text_ctrl_a" "test_process_event_text_ctrl_x" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # fails to determine "/" as an existing path + # https://github.com/MyreMylar/pygame_gui/issues/644 + "test_process_event" ]; disabledTestPaths = [ "tests/test_performance/test_text_performance.py" ];