From 0fb2e4d5e7fe57308b9aebb661ca2aefc50ecda0 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Mon, 7 Aug 2023 17:11:25 +0200 Subject: python3Packages.skytemple-rust: 1.4.0.post0 -> 1.5.3 --- pkgs/development/python-modules/skytemple-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index 47bbf831afd..ddf1866a105 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "skytemple-rust"; - version = "1.4.0.post0"; + version = "1.5.3"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-aw57B15sDbMcdNPD8MW+O7AdqSSqjlOcuXNSm10GdPM="; + hash = "sha256-Txx8kQNb3ODbaJXfuHERzPx4zGUqYXzy+jbLNaMyf+w="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-SvHrMr5k4afVdU5nvg+bcoHVmzHYyoOYqv7nOSVxRCE="; + hash = "sha256-KQA8dfHnuysx9EUySJXZ/52Hfq6AbALwkBp3B1WJJuc="; }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; -- cgit 1.4.1 From 9078796cda8fa7e3919ea86f7a23c98bfa05a2b5 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Mon, 7 Aug 2023 17:11:50 +0200 Subject: python3Packages.explorerscript: 0.1.2 -> 0.1.3 --- .../python-modules/explorerscript/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index b3ecf7a3fce..dea302fb8f3 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -6,25 +6,37 @@ , igraph , pygments , pytestCheckHook +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "explorerscript"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-REQYyxB2sb/gG54+OkMw+M4Agg9SWfAyqAhiSNnd3tE="; + sha256 = "sha256-0U5n7e/utmgOTBuTypkBMeHZR7lji6lFimSjbC7hVRM="; }; nativeBuildInputs = [ antlr4 + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + # antlr output is rebuilt in postPatch step. + "antlr4-python3-runtime" + # igraph > 0.10.4 was marked as incompatible by upstream + # due to regression introduced in 0.10.5, which was fixed + # in igraph 0.10.6. + # + # https://github.com/igraph/python-igraph/issues/693 + "igraph" ]; postPatch = '' - sed -i "s/antlr4-python3-runtime.*/antlr4-python3-runtime',/" setup.py antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4 ''; -- cgit 1.4.1 From 13de9df3ed817b927827758d0f56652ce0730a8b Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Mon, 7 Aug 2023 17:12:13 +0200 Subject: python3Packages.skytemple-files: 1.4.7 -> 1.5.4 --- pkgs/development/python-modules/skytemple-files/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index fb6a49ff620..349544f1d03 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.4.7"; + version = "1.5.4"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-SLRZ9ThrH2UWqfr5BbjJKDM/SRkCfMNK70XZT4+Ks7w="; + hash = "sha256-RB+Cp4mL0y59/l7yu0z3jefADHR9/h0rbTZLm7BvJ7k="; fetchSubmodules = true; }; -- cgit 1.4.1 From ff1c16ca6d0eb0d68c7a19ceae02cfc5bff1bc44 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Mon, 7 Aug 2023 17:12:32 +0200 Subject: skytemple: 1.4.7 -> 1.5.4 --- pkgs/applications/misc/skytemple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index c1a77d634d3..31845799930 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.4.7"; + version = "1.5.4"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NK0yLxs7/pVpl9LCz6ggYsaUDuEAj6edBEPC+4yCxNM="; + hash = "sha256-brt1bNQonAjbqCsMLHgOS8leDb3Y8MWKIxV+BXoJ1lY="; }; buildInputs = [ -- cgit 1.4.1