Merge pull request #248908 from ShadowRZ/shadowrz/renpy-8.1.1

renpy: 8.1.0 -> 8.1.1

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
   '';
 

pkgs/development/interpreters/renpy/renpy-system-fribidi.diff

@@ -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 <Python.h>
- 
--#ifdef RENPY_BUILD
- #include <fribidi.h>
--#else
--#include <fribidi-src/lib/fribidi.h>
--#endif
- 
- #include <stdlib.h>
- 
-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):

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