colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #247757 from xfix/skytemple-1.5.4

Browse Source 
skytemple: 1.4.7 -> 1.5.4
This commit is contained in:
OTABI Tomoya 2023-08-25 13:54:43 +09:00 committed by GitHub
commit 9b8748836a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/skytemple/default.nix
View File

@ -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 = [

18
pkgs/development/python-modules/explorerscript/default.nix
View File

@ -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
'';

4
pkgs/development/python-modules/skytemple-files/default.nix
View File

@ -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;
};

6
pkgs/development/python-modules/skytemple-rust/default.nix
View File

@ -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 ];