Bump dtk to v1.0.0 and objdiff-cli to v2.2.0 (#1475)

This commit is contained in:
Robin Avery 2024-09-29 16:27:32 -04:00 committed by GitHub
parent 55c19741b9
commit eba088d1d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 13 deletions

View File

@ -7,13 +7,13 @@
rustPlatform.buildRustPackage rec {
pname = "decomp-toolkit";
version = "0.9.6";
version = "1.0.0";
src = fetchFromGitHub {
owner = "encounter";
repo = "decomp-toolkit";
rev = "v${version}";
hash = "sha256-mgdohsZ0ZkTSg/UsGVBPmtlJFa1rKMG6aa4XG1S9F4Y=";
hash = "sha256-4fRdN5m9eyASFfyWTytQFu8mjENXhnuwlFvQFNjcdiE=";
};
nativeBuildInputs = [
@ -22,8 +22,6 @@ rustPlatform.buildRustPackage rec {
cargoLock.lockFile = "${src}/Cargo.lock";
cargoLock.outputHashes."ar-0.8.0" = "sha256-OLyo+cRRWMsI1i8NsgsBKRJH1XsKW1CculQnJ/wcya0=";
cargoLock.outputHashes."objdiff-core-2.0.0-alpha.3" = "sha256-E597zRlSpxrTGino7jqoQmyxWkLYXT1P6U2PRolm0Ek=";
cargoLock.outputHashes."ppc750cl-0.3.0" = "sha256-nMJk+rgu7Ydi2VZfodJk0kBz9xLLVBVz0vEZPee8Q6M=";
meta = with lib; {
description = "A GameCube & Wii decompilation toolkit";

View File

@ -5,15 +5,10 @@
stdenv.mkDerivation {
name = "GC_WII_COMPILERS";
src = fetchzip {
url = "https://files.decomp.dev/compilers_20230715.zip";
url = "https://files.decomp.dev/compilers_20240706.zip";
stripRoot = false;
sha256 = "sha256-IX3byvEUVJB6Rmc+NqO9ZNt1jl95nQpEIqxbHI+uUio=";
sha256 = "sha256-+j3bLERQ6CFkqRUaQN6Q8QIE+NMJcNZcQM8b2wvE7RQ=";
};
# Patch 1.1 linker to not read garbage from stack.
# Fixes random crashes under wibo.
postPatch = ''
printf '\x51' | dd of=GC/1.1/mwldeppc.exe bs=1 seek=130933 count=1 conv=notrunc
'';
installPhase = ''
runHook preInstall

View File

@ -159,8 +159,8 @@ if not config.non_matching:
# Tool versions
config.binutils_tag = "2.42-1"
config.compilers_tag = "20240706"
config.dtk_tag = "v0.9.6"
config.objdiff_tag = "v2.1.0"
config.dtk_tag = "v1.0.0"
config.objdiff_tag = "v2.2.0"
config.sjiswrap_tag = "v1.1.1"
config.wibo_tag = "0.6.11"