From 907c6fb6da6f4b5b36a994950c193ebda0efda52 Mon Sep 17 00:00:00 2001 From: Anton Tetov Date: Sat, 26 Apr 2025 16:48:38 +0200 Subject: [PATCH] luaPackages.cqueues: enable builds for lua 5.4 --- pkgs/development/lua-modules/overrides.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 54aef8fb8313..7de5a4e4744f 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -101,7 +101,7 @@ in ''; }); - cqueues = prev.cqueues.overrideAttrs (oa: rec { + cqueues = prev.cqueues.overrideAttrs (oa: { # Parse out a version number without the Lua version inserted version = let @@ -112,7 +112,7 @@ in in "${date}-${rev}"; - meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; + meta.broken = luaOlder "5.1" || luaAtLeast "5.5"; nativeBuildInputs = oa.nativeBuildInputs ++ [ gnum4 @@ -133,13 +133,13 @@ in # version, which doesn't work well for us, so modify it postConfigure = let - inherit (prev.cqueues) pname; + inherit (final.cqueues) pname version; in '' # 'all' target auto-detects correct Lua version, which is fine for us as # we only have the right one available :) sed -Ei ''${rockspecFilename} \ - -e 's|lua == 5.[[:digit:]]|lua >= 5.1, <= 5.3|' \ + -e 's|lua == 5.[[:digit:]]|lua >= 5.1, <= 5.4|' \ -e 's|build_target = "[^"]+"|build_target = "all"|' \ -e 's|version = "[^"]+"|version = "${version}"|' specDir=$(dirname ''${rockspecFilename})