Loading pkgs/development/python-modules/skytemple-files/default.nix +29 −26 Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ lib, buildPythonPackage, fetchFromGitHub, fetchpatch2, appdirs, dungeon-eos, explorerscript, Loading @@ -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, Loading @@ -31,42 +29,47 @@ 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 = [ dependencies = [ 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 ]; passthru.optional-dependencies = { Loading @@ -78,7 +81,7 @@ buildPythonPackage rec { ] ++ gql.optional-dependencies.aiohttp; }; checkInputs = [ nativeCheckInputs = [ pytestCheckHook parameterized xmldiff Loading Loading
pkgs/development/python-modules/skytemple-files/default.nix +29 −26 Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ lib, buildPythonPackage, fetchFromGitHub, fetchpatch2, appdirs, dungeon-eos, explorerscript, Loading @@ -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, Loading @@ -31,42 +29,47 @@ 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 = [ dependencies = [ 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 ]; passthru.optional-dependencies = { Loading @@ -78,7 +81,7 @@ buildPythonPackage rec { ] ++ gql.optional-dependencies.aiohttp; }; checkInputs = [ nativeCheckInputs = [ pytestCheckHook parameterized xmldiff Loading