From e08ce0d54d67a1a4bdd88ca3f062f489bba0f801 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Sep 2022 07:40:09 +0000 Subject: [PATCH 01/10] skytemple: 1.3.10 -> 1.3.11.post1 --- pkgs/applications/misc/skytemple/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 2ec034e882e1..3eacada55b22 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -10,13 +10,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.3.10"; + version = "1.3.11.post1"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; - rev = version; - hash = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; + rev = "refs/tags/${version}"; + hash = "sha256-H3apAb5viupj7cNsiHsTMDBAhK5sUzpV4aOn5KVu6mI="; }; buildInputs = [ From 64110b1518467b87d7b5eb2f90d9236434501b11 Mon Sep 17 00:00:00 2001 From: marius david Date: Mon, 7 Nov 2022 13:36:40 +0100 Subject: [PATCH 02/10] python3Packages.pmdsky-debug-py: init at 4.0.0 --- .../pmdsky-debug-py/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pmdsky-debug-py/default.nix diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix new file mode 100644 index 000000000000..3f7e3305b98e --- /dev/null +++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +}: + +#This package is auto-generated. It could totally be possible to generate it from upstream, but seems unecessary +buildPythonPackage rec { + pname = "pmdsky-debug-py"; + version = "4.0.0"; + # SkyTemple specifically require this version. This is used when patching the binary, + # and risk to be a bit problematic if using the latest version, given it doesn’t follow semver. + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "sha256-iRiUZoyWAkFGPvRyQRWvI0210Vk2jPS0PSCCCns5yJI="; + }; + + prePatch = "cd src"; + + format = "pyproject"; + + nativeBuildInputs = [ setuptools ]; + + meta = with lib; { + description = "Autogenerated and statically check-able pmdsky-debug symbol definitions for Python"; + homepage = "https://github.com/SkyTemple/pmdsky-debug-py"; + license = licenses.mit; + maintainers = with maintainers; [ marius851000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d124af9813b..d2e0e560dabd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7650,6 +7650,8 @@ self: super: with self; { pmw = callPackage ../development/python-modules/pmw { }; + pmdsky-debug-py = callPackage ../development/python-modules/pmdsky-debug-py { }; + pnglatex = callPackage ../development/python-modules/pnglatex { }; pocket = callPackage ../development/python-modules/pocket { }; From 102ee94b2de883b261c848c7907588d831b467fa Mon Sep 17 00:00:00 2001 From: marius david Date: Mon, 7 Nov 2022 13:37:01 +0100 Subject: [PATCH 03/10] python3Packages.range-typed-integers: init at 1.0.1 --- .../range-typed-integers/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/range-typed-integers/default.nix diff --git a/pkgs/development/python-modules/range-typed-integers/default.nix b/pkgs/development/python-modules/range-typed-integers/default.nix new file mode 100644 index 000000000000..1bb5d7b26f62 --- /dev/null +++ b/pkgs/development/python-modules/range-typed-integers/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "range-typed-integers"; + version = "1.0.1"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "theCapypara"; + repo = "range-typed-integers"; + rev = version; + sha256 = "sha256-4+XdalHq6Q2cBbuYi4x7kmCNQh1MwYf+XlLP9FzzzgE="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ setuptools ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "A package provides integer types that have a specific range of valid values"; + homepage = "https://github.com/theCapypara/range-typed-integers"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ marius851000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2e0e560dabd..8f0a7c604da1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10109,6 +10109,8 @@ self: super: with self; { random2 = callPackage ../development/python-modules/random2 { }; + range-typed-integers = callPackage ../development/python-modules/range-typed-integers { }; + rangehttpserver = callPackage ../development/python-modules/rangehttpserver { }; rapidfuzz = callPackage ../development/python-modules/rapidfuzz { }; From eb81ab148d3aeff7902f5b810d487c99b1efdd04 Mon Sep 17 00:00:00 2001 From: marius david Date: Mon, 7 Nov 2022 13:37:47 +0100 Subject: [PATCH 04/10] python3Packages.py-desmume: 0.0.4.post2 -> 0.0.5.post0 --- pkgs/development/python-modules/py-desmume/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index 30631de36e52..1ed79995b4ee 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "py-desmume"; - version = "0.0.4.post2"; + version = "0.0.5.post0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY="; + hash = "sha256-q6E7J7e0yXt+jo1KNqqAw2cG/Us+Tw0dLfTqAKWfAlc="; fetchSubmodules = true; }; @@ -64,6 +64,6 @@ buildPythonPackage rec { description = "Python library to interface with DeSmuME, the Nintendo DS emulator"; homepage = "https://github.com/SkyTemple/py-desmume"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ marius851000 xfix ]; }; } From 35fb0f40fb774e6b699f2dc0c8f479c9b52168a2 Mon Sep 17 00:00:00 2001 From: marius david Date: Mon, 7 Nov 2022 13:38:18 +0100 Subject: [PATCH 05/10] python3Packages.tilequant: 0.4.0.post0 -> 0.4.1.post0 --- .../python-modules/tilequant/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix index a72802e2c7b3..c0d182693553 100644 --- a/pkgs/development/python-modules/tilequant/default.nix +++ b/pkgs/development/python-modules/tilequant/default.nix @@ -9,17 +9,9 @@ , sortedcollections }: -let - aikku93-tilequant = fetchFromGitHub { - owner = "SkyTemple"; - repo = "aikku93-tilequant"; - rev = "6604e0906edff384b6c8d4cde03e6601731f66fd"; - sha256 = "0w19h3n2i0xriqsy0b0rifjgbv4hqd7gl78fw0cappkrdykij5r1"; - }; -in buildPythonPackage rec { pname = "tilequant"; - version = "0.4.0.post0"; + version = "0.4.1.post0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,13 +20,10 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "189af203iay3inj1bbgm3hh1fshn879bcm28ypbvfp27fy7j5b25"; + hash = "sha256-7vU/AYnX7deOH3PjrseRIj9BUJMWzDlwR3UcMpBRyfc="; + fetchSubmodules = true; }; - postPatch = '' - cp -R --no-preserve=mode ${aikku93-tilequant} __aikku93_tilequant - ''; - buildInputs = [ gitpython ]; @@ -56,6 +45,6 @@ buildPythonPackage rec { description = "Tool for quantizing image colors using tile-based palette restrictions"; homepage = "https://github.com/SkyTemple/tilequant"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ marius851000 xfix ]; }; } From fbf0455874cda2ed6c1ffe8d2a546a2b7b66460a Mon Sep 17 00:00:00 2001 From: marius david Date: Mon, 7 Nov 2022 13:38:47 +0100 Subject: [PATCH 06/10] python3Packages.skytemple-ssb-debugger: 1.3.8.post2 -> 1.4.2 --- .../skytemple-ssb-debugger/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index b394dd1662e9..26479aacdad9 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -1,20 +1,31 @@ -{ lib, buildPythonPackage, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3 -, wrapGAppsHook, nest-asyncio, pycairo, py-desmume, pygtkspellcheck, setuptools -, skytemple-files, skytemple-icons +{ lib +, buildPythonPackage +, fetchFromGitHub +, gobject-introspection +, gtk3 +, gtksourceview4 +, wrapGAppsHook +, nest-asyncio +, pycairo +, py-desmume +, pygtkspellcheck +, setuptools +, skytemple-files +, skytemple-icons }: buildPythonPackage rec { pname = "skytemple-ssb-debugger"; - version = "1.3.8.post2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow="; + hash = "sha256-/LBz0PCQI3QOAmOZk6Jynqi/+NN0w8gbY/S3YckRZ68="; }; - buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; + buildInputs = [ gobject-introspection gtk3 gtksourceview4 ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ nest-asyncio From c489175b763859ae44a14be46e564f15560f9cbc Mon Sep 17 00:00:00 2001 From: marius david Date: Mon, 7 Nov 2022 13:39:16 +0100 Subject: [PATCH 07/10] python3Packages.skytemple-rust: 1.3.7 -> 1.4.0.post0 --- .../python-modules/skytemple-rust/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index 87319d81270b..e894dec0dec0 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -5,27 +5,30 @@ , libiconv , Foundation , rustPlatform -, setuptools-rust }: +, setuptools-rust +, range-typed-integers +}: buildPythonPackage rec { pname = "skytemple-rust"; - version = "1.3.7"; + version = "1.4.0.post0"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0="; + hash = "sha256-aw57B15sDbMcdNPD8MW+O7AdqSSqjlOcuXNSm10GdPM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E="; + hash = "sha256-SvHrMr5k4afVdU5nvg+bcoHVmzHYyoOYqv7nOSVxRCE="; }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); + propagatedBuildInputs = [ range-typed-integers ]; GETTEXT_SYSTEM = true; From 286a5af4598b0f2c389bacdb1518c266603d9a68 Mon Sep 17 00:00:00 2001 From: marius david Date: Mon, 7 Nov 2022 13:39:32 +0100 Subject: [PATCH 08/10] python3Packages.skytemple-files: 1.3.9 -> 1.4.7 --- .../skytemple-files/default.nix | 64 +++++++++++++++++-- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 226cc5295e7f..b850f694dcf8 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -1,16 +1,40 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, appdirs, dungeon-eos, explorerscript -, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, appdirs +, dungeon-eos +, explorerscript +, ndspy +, pillow +, setuptools +, skytemple-rust +, tilequant +, pyyaml +, pmdsky-debug-py +, typing-extensions +, pythonOlder +, # optional dependancies for SpriteCollab + aiohttp +, lru-dict +, graphql-core +, gql +, armips +# tests +, pytestCheckHook +, parameterized +, xmldiff }: buildPythonPackage rec { pname = "skytemple-files"; - version = "1.3.9"; + version = "1.4.7"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0="; + hash = "sha256-SLRZ9ThrH2UWqfr5BbjJKDM/SRkCfMNK70XZT4+Ks7w="; fetchSubmodules = true; }; @@ -21,9 +45,37 @@ buildPythonPackage rec { buildInputs = [ armips ]; - propagatedBuildInputs = [ appdirs dungeon-eos explorerscript ndspy pillow setuptools skytemple-rust tilequant ]; + propagatedBuildInputs = [ + appdirs + dungeon-eos + explorerscript + ndspy + pillow + setuptools + skytemple-rust + tilequant + pyyaml + pmdsky-debug-py + ] ++ lib.optionals (pythonOlder "3.9") [ + typing-extensions + ]; + + passthru.optional-dependencies = { + spritecollab = [ + aiohttp + gql + graphql-core + lru-dict + ] ++ gql.optional-dependencies.aiohttp; + }; + + checkInputs = [ pytestCheckHook parameterized xmldiff ] ++ passthru.optional-dependencies.spritecollab; + pytestFlagsArray = "test/"; + disabledTestPaths = [ + "test/skytemple_files_test/common/spritecollab/sc_online_test.py" + "test/skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test + ]; - doCheck = false; # requires Pokémon Mystery Dungeon ROM pythonImportsCheck = [ "skytemple_files" ]; meta = with lib; { From 6428e9be30f75094cabf50d88e665a691db63230 Mon Sep 17 00:00:00 2001 From: marius david Date: Mon, 24 Apr 2023 22:40:43 +0200 Subject: [PATCH 09/10] python3Packages.explorerscript: 0.1.1 -> 0.1.2 --- .../python-modules/explorerscript/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index cd31e6ff0101..b3ecf7a3fce2 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , antlr4 , antlr4-python3-runtime , igraph @@ -11,27 +10,19 @@ buildPythonPackage rec { pname = "explorerscript"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1"; + sha256 = "sha256-REQYyxB2sb/gG54+OkMw+M4Agg9SWfAyqAhiSNnd3tE="; }; nativeBuildInputs = [ antlr4 ]; - patches = [ - # https://github.com/SkyTemple/ExplorerScript/pull/17 - (fetchpatch { - url = "https://github.com/SkyTemple/ExplorerScript/commit/47d8b3d246881d675a82b4049b87ed7d9a0e1b15.patch"; - sha256 = "0sadw9l2nypl2s8lw526lvbdj4rzqdvrjncx4zxxgyp3x47csb48"; - }) - ]; - postPatch = '' sed -i "s/antlr4-python3-runtime.*/antlr4-python3-runtime',/" setup.py antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4 From e9efa398cf97b9044415c9b2547995fc0daa96c1 Mon Sep 17 00:00:00 2001 From: marius david Date: Mon, 7 Nov 2022 13:40:18 +0100 Subject: [PATCH 10/10] skytemple: 1.3.11.post1 -> 1.4.7 --- pkgs/applications/misc/skytemple/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 3eacada55b22..c1a77d634d35 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gobject-introspection , gtk3 -, gtksourceview3 +, gtksourceview4 , webkitgtk , wrapGAppsHook , python3Packages @@ -10,19 +10,19 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.3.11.post1"; + version = "1.4.7"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-H3apAb5viupj7cNsiHsTMDBAhK5sUzpV4aOn5KVu6mI="; + hash = "sha256-NK0yLxs7/pVpl9LCz6ggYsaUDuEAj6edBEPC+4yCxNM="; }; buildInputs = [ gobject-introspection gtk3 - gtksourceview3 + gtksourceview4 # webkitgkt is used for rendering interactive statistics graph which # can be seen by opening a ROM, entering Pokemon section, selecting # any Pokemon, and clicking Stats and Moves tab. @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { skytemple-icons skytemple-ssb-debugger tilequant - ]; + ] ++ skytemple-files.optional-dependencies.spritecollab; doCheck = false; # there are no tests