From 1aa795cfa27dfc26c6f943709c2bbcad9d862b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 13 Jul 2024 03:11:44 -0700
Subject: [PATCH] python312Packages.skytemple-files: 1.6.5 -> 1.7.0

Diff: https://github.com/SkyTemple/skytemple-files/compare/1.6.5...1.7.0
---
 .../skytemple-files/default.nix               | 55 ++++++++++---------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix
index ab4d8d085b26..01627db3b9ed 100644
--- a/pkgs/development/python-modules/skytemple-files/default.nix
+++ b/pkgs/development/python-modules/skytemple-files/default.nix
@@ -3,6 +3,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   appdirs,
   dungeon-eos,
   explorerscript,
@@ -10,12 +11,9 @@
   pillow,
   setuptools,
   skytemple-rust,
-  tilequant,
   pyyaml,
   pmdsky-debug-py,
   range-typed-integers,
-  importlib-resources,
-  typing-extensions,
   pythonOlder,
   # optional dependancies for SpriteCollab
   aiohttp,
@@ -31,43 +29,48 @@
 
 buildPythonPackage rec {
   pname = "skytemple-files";
-  version = "1.6.5";
+  version = "1.7.0";
   pyproject = true;
 
+  disabled = pythonOlder "3.9";
+
   src = fetchFromGitHub {
     owner = "SkyTemple";
-    repo = pname;
+    repo = "skytemple-files";
     rev = version;
-    hash = "sha256-y6VHRfwQNoehp06BoZXuprYtsiGgoNL4rztJw40P4FI=";
+    hash = "sha256-G2AAQ+eRnsMTWrAF0SNmxUmOoHTSMCuSy1kUZbFy8y0=";
     # Most patches are in submodules
     fetchSubmodules = true;
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "fix-tests.patch";
+      url = "https://github.com/SkyTemple/skytemple-files/commit/854e5514e6c63ba082618d14643e3a4b30a6c2b2.patch";
+      hash = "sha256-dZM9n332IMiZIp3QL0Z+yJrIW1SJsqpjh7i3VRFFf7w=";
+    })
+  ];
+
   postPatch = ''
     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\""
+      --replace-fail "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\""
   '';
 
+  build-system = [ setuptools ];
+
   buildInputs = [ armips ];
 
-  propagatedBuildInputs =
-    [
-      appdirs
-      dungeon-eos
-      explorerscript
-      ndspy
-      pillow
-      setuptools
-      skytemple-rust
-      tilequant
-      pyyaml
-      pmdsky-debug-py
-      range-typed-integers
-    ]
-    ++ lib.optionals (pythonOlder "3.9") [
-      importlib-resources
-      typing-extensions
-    ];
+  dependencies = [
+    appdirs
+    dungeon-eos
+    explorerscript
+    ndspy
+    pillow
+    skytemple-rust
+    pyyaml
+    pmdsky-debug-py
+    range-typed-integers
+  ];
 
   passthru.optional-dependencies = {
     spritecollab = [
@@ -78,7 +81,7 @@ buildPythonPackage rec {
     ] ++ gql.optional-dependencies.aiohttp;
   };
 
-  checkInputs = [
+  nativeCheckInputs = [
     pytestCheckHook
     parameterized
     xmldiff