From 0967e2f2c518fccc7f0fd1618a4cc4f361bb1cb0 Mon Sep 17 00:00:00 2001 From: barsoosayque Date: Sat, 23 Nov 2024 13:28:07 +0700 Subject: [PATCH] tl: 0.15.3-1 -> 0.24.1-1 https://github.com/teal-language/tl/blob/v0.24.1/CHANGELOG.md#0241 This update introduced a lock file in tl, which needs to be removed in order to build the package --- maintainers/scripts/luarocks-packages.csv | 2 +- .../development/lua-modules/generated-packages.nix | 14 +++++++------- pkgs/development/lua-modules/overrides.nix | 6 ++++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a4496b177519..5918c7c0d5f3 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -143,7 +143,7 @@ teal-language-server,,,http://luarocks.org/dev,,, telescope-manix,,,,,, telescope.nvim,,,,,5.1, tiktoken_core,,,,,,natsukium -tl,,,,0.15.3-1,,mephistophiles +tl,,,,,,mephistophiles toml-edit,,,,,5.1,mrcjkb tree-sitter-norg,,,,,5.1,mrcjkb vstruct,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 477a73951218..d6dc2998776a 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -3403,22 +3403,22 @@ buildLuarocksPackage { }; }) {}; -tl = callPackage({ argparse, buildLuarocksPackage, compat53, fetchFromGitHub, fetchurl, luafilesystem }: +tl = callPackage({ argparse, buildLuarocksPackage, compat53, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "tl"; - version = "0.15.3-1"; + version = "0.24.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tl-0.15.3-1.rockspec"; - sha256 = "15p67r5bjp997pymjq80yn1gyf7r5g2nwkachkwx88100ihblqrc"; + url = "mirror://luarocks/tl-0.24.1-1.rockspec"; + sha256 = "0r9cp5w824mmn3hmcwjcga182sa25hyvnkk81025hn49jfgr2hps"; }).outPath; src = fetchFromGitHub { owner = "teal-language"; repo = "tl"; - rev = "v0.15.3"; - hash = "sha256-nkwPYI4uB1rTtcBsZ7TKNPusWXtXViyBDSkiL9UH+Wo="; + rev = "refs/tags/v0.24.1"; + hash = "sha256-7jnkURfY2o/32V5sEYleBfwWjDIeo2q/gGrFIizoHZk="; }; - propagatedBuildInputs = [ argparse compat53 luafilesystem ]; + propagatedBuildInputs = [ argparse compat53 ]; meta = { homepage = "https://github.com/teal-language/tl"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 5e9adc307a2a..dbfccf9c5e62 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -855,6 +855,12 @@ in ]; }); + tl = prev.tl.overrideAttrs ({ + preConfigure = '' + rm luarocks.lock + ''; + }); + vstruct = prev.vstruct.overrideAttrs (_: { meta.broken = (luaOlder "5.1" || luaAtLeast "5.4"); });