From 6a10f24e20fe95b9e09f194b0be5fa651fd1e802 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 26 Feb 2026 22:46:09 -0600 Subject: [PATCH] luaPackages.teal-language-server: 0.0.5-1-main -> 0.1.1-1 Signed-off-by: Austin Horstman --- maintainers/scripts/luarocks-packages.csv | 2 +- .../lua-modules/generated-packages.nix | 22 ++++++++++----- pkgs/development/lua-modules/overrides.nix | 27 +++++++++++++++++++ 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index d9adfd7ceedf..a4416d002d23 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -159,7 +159,7 @@ sqlite,,,,,, std._debug,,,,,, std.normalize,,,,,, stdlib,,,,41.2.2,, -teal-language-server,,,,0.0.5-1,, +teal-language-server,,,,,, telescope-manix,,,,,, telescope.nvim,,,,,5.1, tiktoken_core,,,,,,natsukium diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index e234476e8a4c..097d1b2eec07 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5772,38 +5772,46 @@ final: prev: { { argparse, buildLuarocksPackage, - dkjson, fetchFromGitHub, fetchurl, inspect, + ltreesitter-ts, + lua-cjson, luafilesystem, + luarocks-build-treesitter-parser, lusc_luv, luv, tl, + tree-sitter-cli, + tree-sitter-teal, }: buildLuarocksPackage { pname = "teal-language-server"; - version = "0.0.5-1"; + version = "0.1.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/teal-language-server-0.0.5-1.rockspec"; - sha256 = "11ps1hgkgli4sf9gcj7pin4kbc5w0yck0daig1ghqssn2q9m2x5l"; + url = "mirror://luarocks/teal-language-server-0.1.1-1.rockspec"; + sha256 = "1dhhqm2dwl1i27dni8yd6l7qjd1xhz16b772jp96aj66rizhkvcr"; }).outPath; src = fetchFromGitHub { owner = "teal-language"; repo = "teal-language-server"; - rev = "main"; - hash = "sha256-TbNvYG2aRt27+sfXvZOlq/F7Gy6sQtoDz6satC+Qqss="; + tag = "0.1.1"; + hash = "sha256-UgN3BOdsxUIsn1HAXEmAzHns1ZKylxUo7owI2uYsNlA="; }; + nativeBuildInputs = [ luarocks-build-treesitter-parser ]; propagatedBuildInputs = [ argparse - dkjson inspect + ltreesitter-ts + lua-cjson luafilesystem lusc_luv luv tl + tree-sitter-cli + tree-sitter-teal ]; meta = { diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index c1034e946b3a..b37a139d8ba5 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1129,6 +1129,33 @@ in ''; }; + teal-language-server = prev.teal-language-server.overrideAttrs (old: { + strictDeps = false; + # Relax lockfile-pinned deps (e.g. luafilesystem 1.8.0-1) so nixpkgs + # packaged versions can satisfy dependencies. + preConfigure = (old.preConfigure or "") + '' + rm -f luarocks.lock + ''; + postConfigure = (old.postConfigure or "") + '' + substituteInPlace ''${rockspecFilename} \ + --replace-fail '"ltreesitter-ts == 0.0.1",' '"ltreesitter >= 0.2.0",' \ + --replace-fail '"tree-sitter-cli == 0.24.4",' "" \ + --replace-fail '"tl == 0.24.4",' '"tl >= 0.24.4",' \ + --replace-fail '"tree-sitter-teal == 0.0.33",' '"tree-sitter-teal >= 0.0.33",' + ''; + + nativeBuildInputs = + (lib.filter ( + drv: + !(lib.elem (lib.getName drv) [ + "ltreesitter-ts" + ]) + ) old.nativeBuildInputs) + ++ [ + final.ltreesitter + ]; + }); + tiktoken_core = prev.tiktoken_core.overrideAttrs (old: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (old) src;