From df2f09686890ac9fdf5b3c1c6b616fe7e104d1a2 Mon Sep 17 00:00:00 2001 From: marius david Date: Sun, 17 Sep 2023 09:43:20 +0200 Subject: [PATCH] skytemple: 1.5.4 -> 1.5.5 --- pkgs/applications/misc/skytemple/default.nix | 4 ++-- .../python-modules/skytemple-files/default.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 8aa1da1568f9..43e41b253bf8 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -10,13 +10,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-brt1bNQonAjbqCsMLHgOS8leDb3Y8MWKIxV+BXoJ1lY="; + hash = "sha256-7sv0TzYMQLEaohy45JPPiK2wS3x4sXaevT/BfHaSbWw="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 349544f1d035..d6a56883bc46 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -28,19 +28,19 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-RB+Cp4mL0y59/l7yu0z3jefADHR9/h0rbTZLm7BvJ7k="; + hash = "sha256-PVHI3SuXXH+XpSaBhtSUT5I6wYK3WmwW67nJmPLKdg4="; fetchSubmodules = true; }; postPatch = '' - substituteInPlace skytemple_files/patch/arm_patcher.py \ - --replace "exec_name = os.getenv('SKYTEMPLE_ARMIPS_EXEC', f'{prefix}armips')" "exec_name = \"${armips}/bin/armips\"" + substituteInPlace skytemple_files/patch/arm_patcher.py skytemple_files/data/data_cd/armips_importer.py \ + --replace "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\"" ''; buildInputs = [ armips ];