git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #162931 from marius851000/skemple134
commit7143d2485eaec2078a0190d08b4fe6484e7500d1 authorSandro <sandro.jaeckel@gmail.com> dateWed 4 May 2022, 14:30 (5 years ago) parentb59d4472d23275
8 files changed+65−26
compare with master
unifiedsplit
pkgs/applications/misc/skytemple/default.nix+5−2 pkgs/development/python-modules/dungeon-eos/default.nix+2−2 pkgs/development/python-modules/gbulb/default.nix+43 pkgs/development/python-modules/py-desmume/default.nix+3−14 pkgs/development/python-modules/skytemple-files/default.nix+2−2 pkgs/development/python-modules/skytemple-rust/default.nix+6−4 pkgs/development/python-modules/skytemple-ssb-debugger/default.nix+2−2 pkgs/top-level/python-packages.nix+2
pkgs/applications/misc/skytemple/default.nix+5−2
@@ -2,13 +2,13 @@
22
33python3Packages.buildPythonApplication rec {
44 pname = "skytemple";
5− version = "1.3.2";
5+ version = "1.3.10";
66
77 src = fetchFromGitHub {
88 owner = "SkyTemple";
99 repo = pname;
1010 rev = version;
11− sha256 = "1sx2rib0la3mifvh84ia3jnnq4qw9jxc13vxyidsdkp6x82nbvcg";
11+ sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o=";
1212 };
1313
1414 buildInputs = [
@@ -26,7 +26,10 @@ python3Packages.buildPythonApplication rec {
2626 packaging
2727 pycairo
2828 pygal
29+ psutil
30+ gbulb
2931 pypresence
32+ sentry-sdk
3033 setuptools
3134 skytemple-dtef
3235 skytemple-eventserver
pkgs/development/python-modules/dungeon-eos/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "dungeon-eos";
5− version = "0.0.4";
5+ version = "0.0.5";
66
77 src = fetchFromGitHub {
88 owner = "SkyTemple";
99 repo = pname;
1010 rev = version;
11− sha256 = "0hxygjk9i4qlwsxnxr52cxhqy3i62pc373z1x5sh2pas5ag59bvl";
11+ sha256 = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY=";
1212 };
1313
1414 doCheck = false; # there are no tests
pkgs/development/python-modules/gbulb/default.nixnew file+43
@@ -0,0 +1,43 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, pygobject3
5+, pytestCheckHook
6+, gtk3
7+, gobject-introspection
8+}:
9+
10+buildPythonPackage rec {
11+ pname = "gbulb";
12+ version = "0.6.3";
13+
14+ src = fetchFromGitHub {
15+ owner = "beeware";
16+ repo = "gbulb";
17+ rev = "v${version}";
18+ sha256 = "sha256-QNpZf1zfe6r6MtmYMWSrXPsXm5iX36oMx4GnXiTYPaQ=";
19+ };
20+
21+ propagatedBuildInputs = [
22+ pygobject3
23+ ];
24+
25+ checkInputs = [
26+ pytestCheckHook
27+ gtk3
28+ gobject-introspection
29+ ];
30+
31+ disabledTests = [
32+ "test_glib_events.TestBaseGLibEventLoop" # Somtimes fail due to imprecise timing
33+ ];
34+
35+ pythonImportsCheck = [ "gbulb" ];
36+
37+ meta = with lib; {
38+ description = "GLib implementation of PEP 3156";
39+ homepage = "https://github.com/beeware/gbulb";
40+ license = licenses.asl20;
41+ maintainers = with maintainers; [ marius851000 ];
42+ };
43+}
pkgs/development/python-modules/py-desmume/default.nix+3−14
@@ -3,29 +3,18 @@
33, alsa-lib, soundtouch, openal
44}:
55
6−let
7− desmume = fetchFromGitHub {
8− owner = "SkyTemple";
9− repo = "desmume";
10− rev = "8e7af8ada883b7e91344985236f7c7c04ee795d7";
11− sha256 = "0svmv2rch9q347gbpbws4agymas8n014gh1ssaf91wx7jwn53842";
12− };
13−in
146buildPythonPackage rec {
157 pname = "py-desmume";
16− version = "0.0.3.post2";
8+ version = "0.0.4.post2";
179
1810 src = fetchFromGitHub {
1911 owner = "SkyTemple";
2012 repo = pname;
2113 rev = version;
22− sha256 = "1chsg70k8kqnlasn88b04ww3yl0lay1bjxvz6lhp6s2cvsxv03x1";
14+ sha256 = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY=";
15+ fetchSubmodules = true;
2316 };
2417
25− postPatch = ''
26− cp -R --no-preserve=mode ${desmume} __build_desmume
27− '';
28−
2918 buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ];
3019 nativeBuildInputs = [ meson ninja pkg-config ];
3120 propagatedBuildInputs = [ pillow pygobject3 ];
pkgs/development/python-modules/skytemple-files/default.nix+2−2
@@ -4,13 +4,13 @@
44
55buildPythonPackage rec {
66 pname = "skytemple-files";
7− version = "1.3.3";
7+ version = "1.3.9";
88
99 src = fetchFromGitHub {
1010 owner = "SkyTemple";
1111 repo = pname;
1212 rev = version;
13− sha256 = "01j6khn60mdmz32xkpqrzwdqibmpdpi2wvwzxgdnaim9sq0fdqws";
13+ sha256 = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0=";
1414 fetchSubmodules = true;
1515 };
1616
pkgs/development/python-modules/skytemple-rust/default.nix+6−4
@@ -2,24 +2,26 @@
22
33buildPythonPackage rec {
44 pname = "skytemple-rust";
5− version = "unstable-2021-08-11";
5+ version = "1.3.7";
66
77 src = fetchFromGitHub {
88 owner = "SkyTemple";
99 repo = pname;
10− rev = "e306e5edc096cb3fef25585d9ca5a2817543f1cd";
11− sha256 = "0ja231gsy9i1z6jsaywawz93rnyjhldngi5i787nhnf88zrwx9ml";
10+ rev = version;
11+ sha256 = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0=";
1212 };
1313
1414 cargoDeps = rustPlatform.fetchCargoTarball {
1515 inherit src;
1616 name = "${pname}-${version}";
17− sha256 = "0gjvfblyv72m0nqv90m7qvbdnazsh5ind1pxwqz83vm4zjh9a873";
17+ sha256 = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E=";
1818 };
1919
2020 buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
2121 nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
2222
23+ GETTEXT_SYSTEM = true;
24+
2325 doCheck = false; # there are no tests
2426 pythonImportsCheck = [ "skytemple_rust" ];
2527
pkgs/development/python-modules/skytemple-ssb-debugger/default.nix+2−2
@@ -5,13 +5,13 @@
55
66buildPythonPackage rec {
77 pname = "skytemple-ssb-debugger";
8− version = "1.3.0";
8+ version = "1.3.8.post2";
99
1010 src = fetchFromGitHub {
1111 owner = "SkyTemple";
1212 repo = pname;
1313 rev = version;
14− sha256 = "12v0071125m8xjcp2hxm9qvs0qw4hdhkx8r3gbl0plm22vl3fk0d";
14+ sha256 = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow=";
1515 };
1616
1717 buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];
pkgs/top-level/python-packages.nix+2
@@ -3256,6 +3256,8 @@ in {
32563256
32573257 gbinder-python = callPackage ../development/python-modules/gbinder-python { };
32583258
3259+ gbulb = callPackage ../development/python-modules/gbulb { };
3260+
32593261 gcovr = callPackage ../development/python-modules/gcovr { };
32603262
32613263 gcsfs = callPackage ../development/python-modules/gcsfs { };