From f7b46bfd5f410d3854dc519330adbb5c71c7a09c Mon Sep 17 00:00:00 2001 From: barsoosayque Date: Sat, 23 Nov 2024 13:25:04 +0700 Subject: [PATCH 1/4] lusc_luv: init at 4.0.1-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 5b1aed463def..a4496b177519 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -103,6 +103,7 @@ luazip,,,,,, lush.nvim,,,https://luarocks.org/dev,,,teto luuid,,,,20120509-2,, luv,,,,1.48.0-2,, +lusc_luv,,,,,, lyaml,,,,,,lblasc lz.n,,,,,,mrcjkb lze,,,,,,birdee diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 8074651f393c..477a73951218 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2443,6 +2443,31 @@ buildLuarocksPackage { }; }) {}; +lusc_luv = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luv }: +buildLuarocksPackage { + pname = "lusc_luv"; + version = "4.0.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lusc_luv-4.0.1-1.rockspec"; + sha256 = "1bgk481ljfy8q7r3w9z1x5ix0dm6v444c7mf9nahlpyrz9skxakp"; + }).outPath; + src = fetchFromGitHub { + owner = "svermeulen"; + repo = "lusc_luv"; + rev = "838b8f647911b1fcfe160ddce881409ea9b35acf"; + hash = "sha256-xT3so0QHtzzLRNRb7yqfaRMwkl2bt1MP1xh8BkHKqqo="; + }; + + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ luv ]; + + meta = { + homepage = "https://github.com/svermeulen/lusc_luv"; + description = "Structured Async/Concurrency for Lua using Luv"; + license.fullName = "MIT"; + }; +}) {}; + luv = callPackage({ buildLuarocksPackage, cmake, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luv"; From 0967e2f2c518fccc7f0fd1618a4cc4f361bb1cb0 Mon Sep 17 00:00:00 2001 From: barsoosayque Date: Sat, 23 Nov 2024 13:28:07 +0700 Subject: [PATCH 2/4] 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"); }); From e6c6a56f64562cf01de3a8522f36466a67777246 Mon Sep 17 00:00:00 2001 From: barsoosayque Date: Sat, 23 Nov 2024 13:30:20 +0700 Subject: [PATCH 3/4] teal-language-server: dev-1 -> 0.0.5.1 teal-language-server is now out of dev channel in luarocks --- maintainers/scripts/luarocks-packages.csv | 2 +- .../development/lua-modules/generated-packages.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 5918c7c0d5f3..e6f7737952a6 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -139,7 +139,7 @@ sqlite,,,,,, std._debug,,,,,, std.normalize,,,,,, stdlib,,,,41.2.2,,vyp -teal-language-server,,,http://luarocks.org/dev,,, +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 d6dc2998776a..9c1cf63c4b12 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -3305,22 +3305,22 @@ buildLuarocksPackage { }; }) {}; -teal-language-server = callPackage({ buildLuarocksPackage, cyan, dkjson, fetchFromGitHub, fetchurl, luafilesystem }: +teal-language-server = callPackage({ argparse, buildLuarocksPackage, dkjson, fetchFromGitHub, fetchurl, inspect, luafilesystem, lusc_luv, luv, tl }: buildLuarocksPackage { pname = "teal-language-server"; - version = "dev-1"; + version = "0.0.5-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/teal-language-server-dev-1.rockspec"; - sha256 = "01l44c6bknz7ff9xqgich31hlb0yk4ms5k1hs4rhm3cs95s5vlzc"; + url = "mirror://luarocks/teal-language-server-0.0.5-1.rockspec"; + sha256 = "11ps1hgkgli4sf9gcj7pin4kbc5w0yck0daig1ghqssn2q9m2x5l"; }).outPath; src = fetchFromGitHub { owner = "teal-language"; repo = "teal-language-server"; - rev = "67b5d7cad60b9df472851a2c61591f2aab97da47"; - hash = "sha256-fUuOjJrwpLU1YoJm3yn+X15ioRf4GZoi6323On1W2Io="; + rev = "6e50c7d907b150b1b2e03fb5d70f0f3c63dec5c3"; + hash = "sha256-lTCTePaAYW4pqbJznos3BM0I0/Vaw13TNCCatmQjIJo="; }; - propagatedBuildInputs = [ cyan dkjson luafilesystem ]; + propagatedBuildInputs = [ argparse dkjson inspect luafilesystem lusc_luv luv tl ]; meta = { homepage = "https://github.com/teal-language/teal-language-server"; From 3dc8daa6e1163fab95f768d2d93ef67c11872d37 Mon Sep 17 00:00:00 2001 From: barsoosayque Date: Sat, 23 Nov 2024 13:31:22 +0700 Subject: [PATCH 4/4] cyan: 0.3.1-2 -> 0.4.0-1 --- pkgs/development/lua-modules/generated-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 9c1cf63c4b12..722eca0f7552 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -366,16 +366,16 @@ buildLuarocksPackage { cyan = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luafilesystem, luasystem, tl }: buildLuarocksPackage { pname = "cyan"; - version = "0.3.1-2"; + version = "0.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/cyan-0.3.1-2.rockspec"; - sha256 = "1fsz3a05blm45qv690w51fa7scqc7l7f3fcj8s8isax89gjbqvgy"; + url = "mirror://luarocks/cyan-0.4.0-1.rockspec"; + sha256 = "0bdbyxmgias8m1xg042j1fbn9qw3mvllmkksz1b4dv85dglh7c2n"; }).outPath; src = fetchFromGitHub { owner = "teal-language"; repo = "cyan"; - rev = "v0.3.1"; - hash = "sha256-cqQoWR4lIvYAWp5o9jivpjiILO1ECFhCyXG1+vc2yIM="; + rev = "71eaea271bff489d82a9fb575b823b161b996162"; + hash = "sha256-3RfUTTPu+E21+Z7sMVLeA/gadYeF8fTE+ZMZw8G+trM="; }; propagatedBuildInputs = [ argparse luafilesystem luasystem tl ];