renpy: 8.0.1 -> 8.1.0

+21 -24
+6 -9
pkgs/development/interpreters/renpy/default.nix
··· 8 # base_version is of the form major.minor.patch 9 # vc_version is of the form YYMMDDCC 10 # version corresponds to the tag on GitHub 11 - base_version = "8.0.3"; 12 - vc_version = "22090809"; 13 in stdenv.mkDerivation rec { 14 pname = "renpy"; 15 ··· 19 owner = "renpy"; 20 repo = "renpy"; 21 rev = version; 22 - sha256 = "sha256-0/wkUk7PMPbBSGzDuSd82yxRzvAYxkbEhM5LTVt4bMA="; 23 }; 24 25 nativeBuildInputs = [ 26 pkg-config 27 makeWrapper 28 python3.pkgs.cython 29 ]; 30 31 buildInputs = [ 32 SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib 33 ] ++ (with python3.pkgs; [ 34 - python pygame_sdl2 tkinter future six pefile requests 35 ]); 36 37 RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ ··· 41 enableParallelBuilding = true; 42 43 patches = [ 44 - ./renpy-system-fribidi.diff 45 ./shutup-erofs-errors.patch 46 ]; 47 48 postPatch = '' 49 - substituteInPlace module/setup.py \ 50 - --replace "@fribidi@" "${fribidi.dev}" 51 - 52 cp tutorial/game/tutorial_director.rpy{m,} 53 54 cat > renpy/vc_version.py << EOF ··· 67 installPhase = with python3.pkgs; '' 68 runHook preInstall 69 70 - ${python.pythonForBuild.interpreter} module/setup.py install --prefix=$out 71 mkdir -p $out/share/renpy 72 cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy 73
··· 8 # base_version is of the form major.minor.patch 9 # vc_version is of the form YYMMDDCC 10 # version corresponds to the tag on GitHub 11 + base_version = "8.1.0"; 12 + vc_version = "23051307"; 13 in stdenv.mkDerivation rec { 14 pname = "renpy"; 15 ··· 19 owner = "renpy"; 20 repo = "renpy"; 21 rev = version; 22 + sha256 = "sha256-5EU4jaBTU+a9UNHRs7xrKQ7ZivhDEqisO3l4W2E6F+c="; 23 }; 24 25 nativeBuildInputs = [ 26 pkg-config 27 makeWrapper 28 python3.pkgs.cython 29 + python3.pkgs.setuptools 30 ]; 31 32 buildInputs = [ 33 SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib 34 ] ++ (with python3.pkgs; [ 35 + python pygame_sdl2 tkinter future six pefile requests ecdsa 36 ]); 37 38 RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ ··· 42 enableParallelBuilding = true; 43 44 patches = [ 45 ./shutup-erofs-errors.patch 46 ]; 47 48 postPatch = '' 49 cp tutorial/game/tutorial_director.rpy{m,} 50 51 cat > renpy/vc_version.py << EOF ··· 64 installPhase = with python3.pkgs; '' 65 runHook preInstall 66 67 + ${python.pythonForBuild.interpreter} module/setup.py install_lib -d $out/${python.sitePackages} 68 mkdir -p $out/share/renpy 69 cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy 70
+14 -14
pkgs/development/interpreters/renpy/shutup-erofs-errors.patch
··· 1 - From 1660c8f20ac807fcd0ce65a8b9dc31e646a40711 Mon Sep 17 00:00:00 2001 2 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= 3 <23130178+ShadowRZ@users.noreply.github.com> 4 - Date: Sat, 13 Aug 2022 19:26:42 +0800 5 Subject: [PATCH] Don't print a backtrace on EROFS 6 7 This can shut up EROFS errors caused by writing to read-only /nix/store. ··· 10 1 file changed, 4 insertions(+) 11 12 diff --git a/renpy/script.py b/renpy/script.py 13 - index 3e5dae8..8f103c1 100644 14 --- a/renpy/script.py 15 +++ b/renpy/script.py 16 - @@ -656,6 +656,10 @@ class Script(object): 17 - rpydigest = hashlib.md5(fullf.read()).digest() 18 19 - self.write_rpyc_md5(f, rpydigest) 20 - + except OSError as e: 21 - + if e.errno != 30: 22 - + import traceback 23 - + traceback.print_exc() 24 - except Exception: 25 - import traceback 26 - traceback.print_exc() 27 -- 28 - 2.37.1 29
··· 1 + From 09e598ddf1f6af72ccb6c7c9301abff689e64f88 Mon Sep 17 00:00:00 2001 2 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= 3 <23130178+ShadowRZ@users.noreply.github.com> 4 + Date: Wed, 17 May 2023 14:32:03 +0800 5 Subject: [PATCH] Don't print a backtrace on EROFS 6 7 This can shut up EROFS errors caused by writing to read-only /nix/store. ··· 10 1 file changed, 4 insertions(+) 11 12 diff --git a/renpy/script.py b/renpy/script.py 13 + index de35457ba..b7d511560 100644 14 --- a/renpy/script.py 15 +++ b/renpy/script.py 16 + @@ -705,6 +705,10 @@ class Script(object): 17 + rpydigest = hashlib.md5(fullf.read()).digest() 18 19 + self.write_rpyc_md5(f, rpydigest) 20 + + except OSError as e: 21 + + if e.errno != 30: 22 + + import traceback 23 + + traceback.print_exc() 24 + except Exception: 25 + import traceback 26 + traceback.print_exc() 27 -- 28 + 2.40.1 29
+1 -1
pkgs/development/python-modules/pygame_sdl2/default.nix
··· 9 10 src = fetchurl { 11 url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; 12 - hash = "sha256-BpETor1dz8qdMM8iYijlthnsrPF0FS8b1FDvuXxFB9s="; 13 }; 14 15 # force rebuild of headers needed for install
··· 9 10 src = fetchurl { 11 url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; 12 + hash = "sha256-smJsOVavMvy0aO3C5PC050LlOy5bsG45uWSMbbFMQ+I="; 13 }; 14 15 # force rebuild of headers needed for install