From 54bca949c02977b9e2e39cdc41bbe69a6e6b7dc5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 1 Feb 2026 09:35:52 +0000 Subject: [PATCH 1/6] python3Packages.skytemple-rust: cleanup --- .../python-modules/skytemple-rust/default.nix | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index 5bbb8c5eb498..aee9d1b0aaca 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -1,17 +1,21 @@ { lib, - stdenv, buildPythonPackage, - cargo, fetchFromGitHub, - libiconv, + + # build-system + setuptools-rust, + + # nativeBuildInputs + cargo, rustPlatform, rustc, - setuptools-rust, + + # dependencies range-typed-integers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "skytemple-rust"; version = "1.8.5"; pyproject = true; @@ -19,35 +23,38 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SkyTemple"; repo = "skytemple-rust"; - rev = version; + tag = finalAttrs.version; hash = "sha256-yJ78P00h4SITVuDnIh5IIlWkoed/VtIw3NB8ETB95bk="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-9OgUuuMuo2l4YsZMhBZJBqKqbNwj1W4yidoogjcNgm8="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - ]; - nativeBuildInputs = [ + env.GETTEXT_SYSTEM = true; + + build-system = [ setuptools-rust - rustPlatform.cargoSetupHook + ]; + + nativeBuildInputs = [ cargo + rustPlatform.cargoSetupHook rustc ]; - propagatedBuildInputs = [ range-typed-integers ]; - GETTEXT_SYSTEM = true; + dependencies = [ + range-typed-integers + ]; doCheck = false; # tests for this package are in skytemple-files package pythonImportsCheck = [ "skytemple_rust" ]; meta = { - homepage = "https://github.com/SkyTemple/skytemple-rust"; description = "Binary Rust extensions for SkyTemple"; + homepage = "https://github.com/SkyTemple/skytemple-rust"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ marius851000 ]; }; -} +}) From 26bd9c33659e90930d59ec4880702cc81c1ac60b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 1 Feb 2026 09:42:41 +0000 Subject: [PATCH 2/6] python3Packages.skytemple-rust: fix for python>=3.14 Tracking: https://github.com/NixOS/nixpkgs/issues/475732 --- .../python-modules/skytemple-rust/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index aee9d1b0aaca..c4026e949f5d 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -32,7 +32,14 @@ buildPythonPackage (finalAttrs: { hash = "sha256-9OgUuuMuo2l4YsZMhBZJBqKqbNwj1W4yidoogjcNgm8="; }; - env.GETTEXT_SYSTEM = true; + env = { + GETTEXT_SYSTEM = true; + + # Python 3.14 compatibility + # error: the configured Python interpreter version (3.14) is newer than PyO3's maximum supported + # version (3.13) + PYO3_USE_ABI3_FORWARD_COMPATIBILITY = 1; + }; build-system = [ setuptools-rust From 18f29e3b42d5b693a0c1b516db59782631156e47 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 1 Feb 2026 09:53:12 +0000 Subject: [PATCH 3/6] armips: cleanup --- pkgs/by-name/ar/armips/package.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ar/armips/package.nix b/pkgs/by-name/ar/armips/package.nix index a4881193b7da..b12b033db896 100644 --- a/pkgs/by-name/ar/armips/package.nix +++ b/pkgs/by-name/ar/armips/package.nix @@ -5,21 +5,27 @@ cmake, }: -clangStdenv.mkDerivation rec { +clangStdenv.mkDerivation (finalAttrs: { pname = "armips"; version = "0.11.0"; src = fetchFromGitHub { owner = "Kingcom"; repo = "armips"; - rev = "v${version}"; - sha256 = "sha256-L+Uxww/WtvDJn1xZqoqA6Pkzq/98sy1qTxZbv6eEjbA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-L+Uxww/WtvDJn1xZqoqA6Pkzq/98sy1qTxZbv6eEjbA="; }; postPatch = '' substituteInPlace CMakeLists.txt \ - --replace-fail c++11 c++17 \ - --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.13)" # done by https://github.com/Kingcom/armips/commit/e1ed5bf0f4565250b98b0ddfb9112f15dc8e8e3b upstream, patch not directly compatible + --replace-fail c++11 c++17 + '' + # done by https://github.com/Kingcom/armips/commit/e1ed5bf0f4565250b98b0ddfb9112f15dc8e8e3b upstream, patch not directly compatible + + '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + "cmake_minimum_required(VERSION 2.8)" \ + "cmake_minimum_required(VERSION 3.13)" ''; nativeBuildInputs = [ cmake ]; @@ -48,4 +54,4 @@ clangStdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ marius851000 ]; }; -} +}) From 59611204366848a2bf97cdb51bdd6726703910fa Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 1 Feb 2026 09:56:31 +0000 Subject: [PATCH 4/6] armips: fix build (GCC 15 compatibility) Tracking: https://github.com/NixOS/nixpkgs/issues/475479 --- pkgs/by-name/ar/armips/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ar/armips/package.nix b/pkgs/by-name/ar/armips/package.nix index b12b033db896..c9a883d0b2a5 100644 --- a/pkgs/by-name/ar/armips/package.nix +++ b/pkgs/by-name/ar/armips/package.nix @@ -28,6 +28,10 @@ clangStdenv.mkDerivation (finalAttrs: { "cmake_minimum_required(VERSION 3.13)" ''; + # Fix GCC 15 compatibility + # error: unknown type name 'uint32_t' + env.CXXFLAGS = "-include cstdint"; + nativeBuildInputs = [ cmake ]; installPhase = '' From c8a65aa8ee2cf193b30a808808c01465f07234f3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 1 Feb 2026 10:01:25 +0000 Subject: [PATCH 5/6] python3Packages.skytemple-ssb-emulator: use finalAttrs --- .../python-modules/skytemple-ssb-emulator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix index fdf959f56837..2a12138274f5 100644 --- a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix @@ -27,7 +27,7 @@ # dependencies range-typed-integers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "skytemple-ssb-emulator"; version = "1.8.2"; pyproject = true; @@ -35,12 +35,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SkyTemple"; repo = "skytemple-ssb-emulator"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zmLEvE96gkElTggcRG9fZDrJPLOXeNuSk49zXQAB69Y="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src pname; + inherit (finalAttrs) src pname version; hash = "sha256-MSPqQmC70pq+sEM8zJrrFiz32dorOJxr2G/y2H4EUQI="; }; @@ -81,4 +81,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ marius851000 ]; }; -} +}) From a1f09d2f52e5b2ce1c572f825df839093bba92e4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 1 Feb 2026 10:02:40 +0000 Subject: [PATCH 6/6] python3Packages.skytemple-ssb-emulator: fix for python>=3.14 Tracking: https://github.com/NixOS/nixpkgs/issues/475732 --- .../python-modules/skytemple-ssb-emulator/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix index 2a12138274f5..cd27fc5abdc9 100644 --- a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix @@ -44,6 +44,13 @@ buildPythonPackage (finalAttrs: { hash = "sha256-MSPqQmC70pq+sEM8zJrrFiz32dorOJxr2G/y2H4EUQI="; }; + env = { + # Python 3.14 compatibility + # error: the configured Python interpreter version (3.14) is newer than PyO3's maximum supported + # version (3.13) + PYO3_USE_ABI3_FORWARD_COMPATIBILITY = 1; + }; + build-system = [ meson setuptools