diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 3d4ee70e7a04..4bbeb224ce3d 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -8,8 +8,8 @@ let # base_version is of the form major.minor.patch # vc_version is of the form YYMMDDCC # version corresponds to the tag on GitHub - base_version = "8.1.0"; - vc_version = "23051307"; + base_version = "8.1.1"; + vc_version = "23060707"; in stdenv.mkDerivation rec { pname = "renpy"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "renpy"; repo = "renpy"; rev = version; - sha256 = "sha256-5EU4jaBTU+a9UNHRs7xrKQ7ZivhDEqisO3l4W2E6F+c="; + sha256 = "sha256-aJ/MobZ6SNBYRC/EpUxAMLJ3pwK6PC92DV0YL/LF5Ew="; }; nativeBuildInputs = [ @@ -49,9 +49,11 @@ in stdenv.mkDerivation rec { cp tutorial/game/tutorial_director.rpy{m,} cat > renpy/vc_version.py << EOF - vc_version = ${vc_version} + version = '${version}' official = False nightly = False + # Look at https://renpy.org/latest.html for what to put. + version_name = 'Where No One Has Gone Before' EOF ''; diff --git a/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff b/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff deleted file mode 100644 index 8c93b75a7b0f..000000000000 --- a/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/module/renpybidicore.c b/module/renpybidicore.c -index 849430d..d883a52 100644 ---- a/module/renpybidicore.c -+++ b/module/renpybidicore.c -@@ -1,10 +1,6 @@ - #include - --#ifdef RENPY_BUILD - #include --#else --#include --#endif - - #include - -diff --git a/module/setup.py b/module/setup.py -index bd16816..f6b8794 100755 ---- a/module/setup.py -+++ b/module/setup.py -@@ -118,29 +118,17 @@ cython( - sdl + [ png, 'z', 'm' ]) - - FRIBIDI_SOURCES = """ --fribidi-src/lib/fribidi.c --fribidi-src/lib/fribidi-arabic.c --fribidi-src/lib/fribidi-bidi.c --fribidi-src/lib/fribidi-bidi-types.c --fribidi-src/lib/fribidi-deprecated.c --fribidi-src/lib/fribidi-joining.c --fribidi-src/lib/fribidi-joining-types.c --fribidi-src/lib/fribidi-mem.c --fribidi-src/lib/fribidi-mirroring.c --fribidi-src/lib/fribidi-run.c --fribidi-src/lib/fribidi-shape.c - renpybidicore.c - """.split() - cython( - "_renpybidi", - FRIBIDI_SOURCES, -+ ["fribidi"], - includes=[ -- BASE + "/fribidi-src/", -- BASE + "/fribidi-src/lib/", -+ "@fribidi@/include/fribidi/", - ], - define_macros=[ - ("FRIBIDI_ENTRY", ""), -- ("HAVE_CONFIG_H", "1"), - ]) - - if not (android or ios or emscripten): diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index 318683f04815..bf123eef02a5 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; - hash = "sha256-smJsOVavMvy0aO3C5PC050LlOy5bsG45uWSMbbFMQ+I="; + hash = "sha256-u9DIFKd+uyphH3ETMJWYqt7YFyeIgBWoXUO3rC+RWjc="; }; # force rebuild of headers needed for install