pyrox.dev / nixpkgs
lol
fork atom

smb3-foundry: 1.2 -> 1.3.1

TomaSajt 42cd0173 e5699088

+9 -42
unified split
+6 -7
pkgs/applications/misc/smb3-foundry/default.nix
··· 14 14 in 15 15 stdenv.mkDerivation (finalAttrs: { 16 16 pname = "smb3-foundry"; 17 - version = "1.2"; 17 + version = "1.3.1"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "mchlnix"; 21 21 repo = "SMB3-Foundry"; 22 22 rev = "refs/tags/${finalAttrs.version}"; 23 - hash = "sha256-iqqIyGp/sqWgShxk52omVcn7Q3WL2hK8sTLH4dashLE="; 23 + hash = "sha256-8cf7VhvC372Cqi94n2FSHcoCGblpZoZvBXcXq5jU6CY="; 24 24 }; 25 - 26 - patches = [ ./fix-relative-dirs.patch ]; 27 25 28 26 nativeBuildInputs = [ makeWrapper ]; 29 27 ··· 42 40 ''; 43 41 44 42 meta = { 45 - homepage = "https://github.com/mchlnix/SMB3-Foundry"; 46 - description = "A modern Super Mario Bros. 3 Level Editor"; 47 43 changelog = "https://github.com/mchlnix/SMB3-Foundry/releases/tag/${finalAttrs.version}"; 44 + description = "A modern Super Mario Bros. 3 Level Editor"; 45 + homepage = "https://github.com/mchlnix/SMB3-Foundry"; 48 46 license = lib.licenses.gpl3Only; 47 + mainProgram = "smb3-foundry"; 48 + maintainers = with lib.maintainers; [ tomasajt ]; 49 49 platforms = lib.platforms.unix; 50 - maintainers = with lib.maintainers; [ tomasajt ]; 51 50 }; 52 51 })
-34
pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch
··· 1 - diff --git a/foundry/gui/WarningList.py b/foundry/gui/WarningList.py 2 - index ace83d7..46012df 100644 3 - --- a/foundry/gui/WarningList.py 4 - +++ b/foundry/gui/WarningList.py 5 - @@ -5,6 +5,7 @@ from PySide6.QtCore import QEvent, QRect, Qt, Signal, SignalInstance 6 - from PySide6.QtGui import QCursor, QFocusEvent 7 - from PySide6.QtWidgets import QLabel, QVBoxLayout, QWidget 8 - 9 - +from foundry import root_dir 10 - from foundry.game import GROUND 11 - from foundry.game.ObjectDefinitions import GeneratorType 12 - from foundry.game.gfx.objects import EnemyItem 13 - @@ -216,7 +217,7 @@ class WarningList(QWidget): 14 - return [enemy for enemy in self.level_ref.level.enemies if enemy.type == enemy_id] 15 - 16 - def _build_enemy_clan_dict(self): 17 - - with open("data/enemy_data.json", "r") as enemy_data_file: 18 - + with open(root_dir.joinpath("data", "enemy_data.json"), "r") as enemy_data_file: 19 - enemy_data = json.loads(enemy_data_file.read()) 20 - 21 - self._enemy_dict.clear() 22 - diff --git a/smb3parse/util/parser/__init__.py b/smb3parse/util/parser/__init__.py 23 - index ecef169..8bba57e 100644 24 - --- a/smb3parse/util/parser/__init__.py 25 - +++ b/smb3parse/util/parser/__init__.py 26 - @@ -302,7 +302,7 @@ def gen_levels_in_rom( 27 - 28 - print("---------------------", level_count, "------------------------") 29 - 30 - - level_data = pathlib.Path("data/levels.dat") 31 - + level_data = pathlib.Path(__file__).parent.parent.parent.joinpath("data", "levels.dat") 32 - 33 - missing = 0 34 - levels: dict[int, set[int]] = defaultdict(set)
+3 -1
pkgs/top-level/all-packages.nix
··· 1969 1969 1970 1970 sorted-grep = callPackage ../tools/text/sorted-grep { }; 1971 1971 1972 - smb3-foundry = callPackage ../applications/misc/smb3-foundry { }; 1972 + smb3-foundry = callPackage ../applications/misc/smb3-foundry { 1973 + python3 = python311; 1974 + }; 1973 1975 1974 1976 smbmap = callPackage ../tools/security/smbmap { }; 1975 1977