From 6b4b96e68589414dee2724e14ebc352954c86616 Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Tue, 3 Jan 2023 16:26:57 -0800 Subject: [PATCH 1/2] craftos-pc: 2.6.6 -> 2.7.3 Changelog: https://github.com/MCJack123/craftos2/releases/tag/v2.7.3 --- pkgs/applications/emulators/craftos-pc/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index d2668c473a62..1de8fd3c3a3d 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -14,29 +14,30 @@ }: let + version = "2.7.3"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; - rev = "v2.6.6"; - sha256 = "cCXH1GTRqJQ57/6sWIxik366YBx/ii3nzQwx4YpEh1w="; + rev = "v${version}"; + sha256 = "sha256-lMqYfSA3sI7+glRE+eUf03uLfbf7lipmoqgt74FUaJQ="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; - rev = "v2.6.6"; - sha256 = "VzIqvf83k121DxuH5zgZfFS9smipDonyqqhVgj2kgYw="; + rev = "v${version}"; + sha256 = "sha256-t76Yltx7vHNoAAFvNpYLKuwFja4On6M20upmG6w3C1M="; }; in stdenv.mkDerivation rec { pname = "craftos-pc"; - version = "2.6.6"; + inherit version; src = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - sha256 = "9lpAWYFli3/OBfmu2dQxKi+/TaHaBQNpZsCURvl0h/E="; + sha256 = "sha256-a7oMLfjZUkEWPjxDDywlSW4qLhcQrCXPPY2BEOgiafU="; }; buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; From fb8cf494a107f4a899cc3fd2aee054317bd0336c Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Tue, 3 Jan 2023 16:30:05 -0800 Subject: [PATCH 2/2] craftos-pc: Add tomodachi94 to maintainers --- pkgs/applications/emulators/craftos-pc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 1de8fd3c3a3d..202d49c19add 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { homepage = "https://www.craftos-pc.cc"; license = with licenses; [ mit free ]; platforms = platforms.linux; - maintainers = [ maintainers.siraben ]; + maintainers = with maintainers; [ siraben tomodachi94 ]; mainProgram = "craftos"; }; }