diff options
| author | 夜坂雅 <23130178+ShadowRZ@users.noreply.github.com> | 2022-08-13 19:53:48 +0800 |
|---|---|---|
| committer | 夜坂雅 <23130178+ShadowRZ@users.noreply.github.com> | 2022-08-13 19:53:48 +0800 |
| commit | a6ce9617eb9456f603205eee44fb9bac5da3f734 (patch) | |
| tree | 305d3db231e69ffe6affafe6096dbc4a11666220 | |
| parent | d6865504013f6ee0a100083db4e4c222db597701 (diff) | |
| download | nixpkgs-a6ce9617eb9456f603205eee44fb9bac5da3f734.tar nixpkgs-a6ce9617eb9456f603205eee44fb9bac5da3f734.tar.gz nixpkgs-a6ce9617eb9456f603205eee44fb9bac5da3f734.tar.bz2 nixpkgs-a6ce9617eb9456f603205eee44fb9bac5da3f734.tar.lz nixpkgs-a6ce9617eb9456f603205eee44fb9bac5da3f734.tar.xz nixpkgs-a6ce9617eb9456f603205eee44fb9bac5da3f734.tar.zst nixpkgs-a6ce9617eb9456f603205eee44fb9bac5da3f734.zip | |
renpy: 8.0.0 -> 8.0.1
| -rw-r--r-- | pkgs/development/interpreters/renpy/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/interpreters/renpy/shutup-erofs-errors.patch | 29 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pygame_sdl2/default.nix | 2 |
3 files changed, 35 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 73c95c74059..21d1f849464 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { # 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.0"; - vc_version = "22062402"; + base_version = "8.0.1"; + vc_version = "22070801"; version = "${base_version}.${vc_version}"; src = fetchFromGitHub { owner = "renpy"; repo = "renpy"; rev = version; - sha256 = "sha256-37Hbs0i5eXMjVaETX7ImJCak0y8XtEHUaRFceA9J39A="; + sha256 = "sha256-rwRykovY8vv+boQiaSjCBoGxGpT1dF3qdEyxkykrKyk="; }; nativeBuildInputs = [ @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { patches = [ ./renpy-system-fribidi.diff + ./shutup-erofs-errors.patch ]; postPatch = '' @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { makeWrapper ${python.interpreter} $out/bin/renpy \ --set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" \ - --add-flags "-O $out/share/renpy/renpy.py" + --add-flags "$out/share/renpy/renpy.py" runHook postInstall ''; diff --git a/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch b/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch new file mode 100644 index 00000000000..519840383b8 --- /dev/null +++ b/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch @@ -0,0 +1,29 @@ +From 1660c8f20ac807fcd0ce65a8b9dc31e646a40711 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 +Subject: [PATCH] Don't print a backtrace on EROFS + +This can shut up EROFS errors caused by writing to read-only /nix/store. +--- + renpy/script.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/renpy/script.py b/renpy/script.py +index 3e5dae8..8f103c1 100644 +--- a/renpy/script.py ++++ b/renpy/script.py +@@ -656,6 +656,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() +-- +2.37.1 + diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index 2d0004cdfc1..1e30869402c 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"; - sha256 = "sha256-iKsnmuSBzfHlIOHUwWECfvPa9LuBbCr9Kmq5dolxUlU="; + sha256 = "sha256-/PCw2sF3CxiBXV7WZcTl6NAs+v++od4Fs6uYFUhJMH8="; }; # force rebuild of headers needed for install |