From ff2026987f5e57ddfb6e449f88abc901c939789a Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Thu, 3 Aug 2023 11:30:43 -0700 Subject: [PATCH] craftos-pc: 2.7.4 -> 2.7.5 Changelog: https://github.com/MCJack123/craftos2/releases/tag/v2.7.5 This commit includes a hotfix of the craftos2-rom submodule with the version number '2.7.5.1', which fixes a critical bug (see https://github.com/MCJack123/craftos2-rom/commit/9881064c28c6de4433a53a32c084e9e566df2310 for more information.) --- pkgs/applications/emulators/craftos-pc/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 67950e0ed8a..b147af8d02b 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , callPackage , patchelf , unzip @@ -15,18 +16,18 @@ }: let - version = "2.7.4"; + version = "2.7.5"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; rev = "v${version}"; - sha256 = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY="; + hash = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; - rev = "v${version}"; - sha256 = "sha256-BXTsBMlsymQHABWQCiv22Ia5jm2xv1jNy7Unwymtyp0="; + rev = "v${version}.1"; # Author released a hotfix; remove trailing '.1' on next update + hash = "sha256-WZs/KIdpqLLzvpH2hiJpe/AehluoQMtewBbAb4htz8k="; }; in @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - sha256 = "sha256-9XMc7zmtPxlt3WgS93lUJNMFtUJ/llG9SFGtgdFqZEA="; + hash = "sha256-t2yhSuNPFCF2NaQFWuN9Nos5ZPinAvecV6EZNO0Cy9I="; }; buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ];