diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index d18c9ef2b38c..3d4ee70e7a04 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.0.3"; - vc_version = "22090809"; + base_version = "8.1.0"; + vc_version = "23051307"; in stdenv.mkDerivation rec { pname = "renpy"; @@ -19,19 +19,20 @@ in stdenv.mkDerivation rec { owner = "renpy"; repo = "renpy"; rev = version; - sha256 = "sha256-0/wkUk7PMPbBSGzDuSd82yxRzvAYxkbEhM5LTVt4bMA="; + sha256 = "sha256-5EU4jaBTU+a9UNHRs7xrKQ7ZivhDEqisO3l4W2E6F+c="; }; nativeBuildInputs = [ pkg-config makeWrapper python3.pkgs.cython + python3.pkgs.setuptools ]; buildInputs = [ SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib ] ++ (with python3.pkgs; [ - python pygame_sdl2 tkinter future six pefile requests + python pygame_sdl2 tkinter future six pefile requests ecdsa ]); RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ @@ -41,14 +42,10 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; patches = [ - ./renpy-system-fribidi.diff ./shutup-erofs-errors.patch ]; postPatch = '' - substituteInPlace module/setup.py \ - --replace "@fribidi@" "${fribidi.dev}" - cp tutorial/game/tutorial_director.rpy{m,} cat > renpy/vc_version.py << EOF @@ -67,7 +64,7 @@ in stdenv.mkDerivation rec { installPhase = with python3.pkgs; '' runHook preInstall - ${python.pythonForBuild.interpreter} module/setup.py install --prefix=$out + ${python.pythonForBuild.interpreter} module/setup.py install_lib -d $out/${python.sitePackages} mkdir -p $out/share/renpy cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy diff --git a/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch b/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch index 519840383b8d..9889c9f8ef85 100644 --- a/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch +++ b/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch @@ -1,7 +1,7 @@ -From 1660c8f20ac807fcd0ce65a8b9dc31e646a40711 Mon Sep 17 00:00:00 2001 +From 09e598ddf1f6af72ccb6c7c9301abff689e64f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= <23130178+ShadowRZ@users.noreply.github.com> -Date: Sat, 13 Aug 2022 19:26:42 +0800 +Date: Wed, 17 May 2023 14:32:03 +0800 Subject: [PATCH] Don't print a backtrace on EROFS This can shut up EROFS errors caused by writing to read-only /nix/store. @@ -10,20 +10,20 @@ This can shut up EROFS errors caused by writing to read-only /nix/store. 1 file changed, 4 insertions(+) diff --git a/renpy/script.py b/renpy/script.py -index 3e5dae8..8f103c1 100644 +index de35457ba..b7d511560 100644 --- a/renpy/script.py +++ b/renpy/script.py -@@ -656,6 +656,10 @@ class Script(object): - rpydigest = hashlib.md5(fullf.read()).digest() +@@ -705,6 +705,10 @@ class Script(object): + rpydigest = hashlib.md5(fullf.read()).digest() - self.write_rpyc_md5(f, rpydigest) -+ except OSError as e: -+ if e.errno != 30: -+ import traceback -+ traceback.print_exc() - except Exception: - import traceback - traceback.print_exc() + self.write_rpyc_md5(f, rpydigest) ++ except OSError as e: ++ if e.errno != 30: ++ import traceback ++ traceback.print_exc() + except Exception: + import traceback + traceback.print_exc() -- -2.37.1 +2.40.1 diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index 444fe10dfea3..318683f04815 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-BpETor1dz8qdMM8iYijlthnsrPF0FS8b1FDvuXxFB9s="; + hash = "sha256-smJsOVavMvy0aO3C5PC050LlOy5bsG45uWSMbbFMQ+I="; }; # force rebuild of headers needed for install