From 565a8a7bf6fde0529cf291cf6abf211ebfc43875 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 13 Oct 2026 20:29:00 -0500 Subject: [PATCH] fityk: use Lua 5.5 Use Lua 5.5 for fityk's embedded scripting instead of Lua 5.2 with compatibility options. fityk 1.3.2's configure only accepts Lua older than 5.5, so apply the upstream commit that widens the version check. It can be dropped with the next release. Assisted-by: Claude Code (Claude Opus 5.5) --- pkgs/by-name/fi/fityk/package.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fityk/package.nix b/pkgs/by-name/fi/fityk/package.nix index 115f23fedc6a..ff504c6f1145 100644 --- a/pkgs/by-name/fi/fityk/package.nix +++ b/pkgs/by-name/fi/fityk/package.nix @@ -2,10 +2,11 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, autoreconfHook, wxwidgets_3_2, boost186, - lua5_2_compat, + lua5_5, zlib, bzip2, xylib, @@ -14,7 +15,7 @@ swig, }: let - lua = lua5_2_compat; + lua = lua5_5; in stdenv.mkDerivation (finalAttrs: { @@ -28,6 +29,16 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-m2RaZMYT6JGwa3sOUVsBIzCdZetTbiygaInQWoJ4m1o="; }; + patches = [ + # Accept Lua 5.5 in configure (https://github.com/wojdyr/fityk/pull/64). + # Can be dropped at the next release. + (fetchpatch2 { + name = "fityk-detect-lua-5.5.patch"; + url = "https://github.com/wojdyr/fityk/commit/48456231ca58211d7bcde0d2d8ac0c29cae2ab16.patch?full_index=1"; + hash = "sha256-QkhNnGRuSP0bGqK7GtHfx2OpkEZoz8YI7M2m4f5N1Pw="; + }) + ]; + nativeBuildInputs = [ autoreconfHook lua