pygame-sdl2: 8.3.1.24090601 -> 8.3.5.25022704; renpy: 8.3.4.24120703 -> 8.3.6.25022803 (#389777)

authored by

7c6f434c and committed by
GitHub
fa5331b8 527fcd54

+24 -15
+8 -8
pkgs/by-name/re/renpy/package.nix
··· 12 12 makeWrapper, 13 13 nix-update-script, 14 14 pkg-config, 15 - python311, 15 + python3Full, 16 16 SDL2, 17 17 stdenv, 18 18 versionCheckHook, ··· 21 21 }: 22 22 23 23 let 24 - python = python311; 24 + python = python3Full; 25 25 in 26 26 stdenv.mkDerivation (finalAttrs: { 27 27 pname = "renpy"; 28 - version = "8.3.4.24120703"; 28 + version = "8.3.6.25022803"; 29 29 30 30 src = fetchFromGitHub { 31 31 owner = "renpy"; 32 32 repo = "renpy"; 33 33 tag = finalAttrs.version; 34 - hash = "sha256-9f1ptw+6OQ2rMytwPZPtUd+K/ihnVKHUiELs22iTTqE="; 34 + hash = "sha256-ibWbYf+e8PZ8ZxLHVPLzHBS0qf+eLzJasJJFHxXlCfk="; 35 35 }; 36 36 37 37 nativeBuildInputs = [ 38 38 makeWrapper 39 39 pkg-config 40 - # Ren'Py currently does not compile on Cython 3.x. 41 - # See https://github.com/renpy/renpy/issues/5359 42 - python.pkgs.cython_0 40 + python.pkgs.cython 43 41 python.pkgs.setuptools 44 42 ]; 45 43 ··· 120 118 runHook postInstall 121 119 ''; 122 120 123 - env.NIX_CFLAGS_COMPILE = "-I${python.pkgs.pygame-sdl2}/include/${python.libPrefix}"; 121 + env = { 122 + NIX_CFLAGS_COMPILE = "-I${python.pkgs.pygame-sdl2}/include"; 123 + }; 124 124 125 125 nativeInstallCheckInputs = [ versionCheckHook ]; 126 126 doInstallCheck = true;
+16 -7
pkgs/development/python-modules/pygame-sdl2/default.nix
··· 1 1 { 2 2 buildPythonPackage, 3 - cython_0, 3 + cython, 4 4 fetchFromGitHub, 5 5 lib, 6 6 libjpeg, ··· 15 15 16 16 buildPythonPackage rec { 17 17 pname = "pygame-sdl2"; 18 - version = "8.3.1.24090601"; 18 + version = "8.3.5.25022704"; 19 19 pyproject = true; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "renpy"; 23 23 repo = "pygame_sdl2"; 24 24 tag = "renpy-${version}"; 25 - hash = "sha256-0itOmDScM+4HmWTpjkln56pv+yXDPB1KIDbE6ub2Tls="; 25 + hash = "sha256-MA6c29UbZIBCIxUDfSiqxgdhrd9Ys5Yf/zKeXvI1iJ0="; 26 26 }; 27 27 28 28 build-system = [ 29 - cython_0 29 + cython 30 30 SDL2 31 31 setuptools 32 32 ]; ··· 42 42 43 43 doCheck = true; 44 44 45 - preBuild = '' 46 - substituteInPlace setup.py --replace-fail "2.1.0" "${version}" 47 - substituteInPlace src/pygame_sdl2/version.py --replace-fail "2, 1, 0" "${ 45 + postUnpack = '' 46 + substituteInPlace source/setup.py --replace-fail "2.1.0" "${version}" 47 + substituteInPlace source/src/pygame_sdl2/version.py --replace-fail "2, 1, 0" "${ 48 48 builtins.replaceStrings [ "." ] [ ", " ] version 49 49 }" 50 + 51 + headers=$(mktemp -d) 52 + substituteInPlace source/setup.py --replace-fail \ 53 + "pathlib.Path(sysconfig.get_paths()['include']) / \"pygame_sdl2\"" \ 54 + "pathlib.Path(\"$headers\")" 55 + ''; 56 + 57 + postInstall = '' 58 + install -Dm644 $headers/* -t $out/include/pygame_sdl2 50 59 ''; 51 60 52 61 passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=renpy-(.*)" ]; };