Unverified Commit 101a3913 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #232364 from ShadowRZ/shadowrz/renpy-8.1.0 

renpy: 8.0.1 -> 8.1.0
parents fdd73b14 815c6480

pkgs/development/interpreters/renpy/default.nix

+6 −9
Original line number Diff line number Diff line
@@ -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

pkgs/development/interpreters/renpy/shutup-erofs-errors.patch

+14 −14
Original line number Diff line number Diff line 
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,10 +10,10 @@ 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):

@@ -705,6 +705,10 @@ class Script(object):

                                 rpydigest = hashlib.md5(fullf.read()).digest()

 

                             self.write_rpyc_md5(f, rpydigest)
@@ -25,5 +25,5 @@ index 3e5dae8..8f103c1 100644 
                         import traceback

                         traceback.print_exc()

-- 

2.37.1

2.40.1

pkgs/development/python-modules/pygame_sdl2/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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