Skip to content

Commit bf226bb

Browse files
authored
luaPackages: update on 2025-04-11 (#397956)
2 parents 88d1dcb + d0d01d8 commit bf226bb

File tree

2 files changed

+53
-42
lines changed

2 files changed

+53
-42
lines changed

pkgs/by-name/lu/luarocks-packages-updater/updater.py

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,16 @@ def format(self, record):
5050
TMP_FILE = "$(mktemp)"
5151
GENERATED_NIXFILE = "pkgs/development/lua-modules/generated-packages.nix"
5252

53-
HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
54-
Regenerate it with: nix run nixpkgs#luarocks-packages-updater
55-
You can customize the generated packages in pkgs/development/lua-modules/overrides.nix
53+
HEADER = """/*
54+
{GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
55+
Regenerate it with: nix run nixpkgs#luarocks-packages-updater
56+
You can customize the generated packages in pkgs/development/lua-modules/overrides.nix
5657
*/
5758
""".format(GENERATED_NIXFILE=GENERATED_NIXFILE)
5859

5960
FOOTER = """
6061
}
61-
/* GENERATED - do not edit this file */
62+
# GENERATED - do not edit this file
6263
"""
6364

6465

@@ -118,10 +119,16 @@ def generate_nix(self, results: list[tuple[LuaPlugin, str]], outfilename: str):
118119
with tempfile.NamedTemporaryFile("w+") as f:
119120
f.write(HEADER)
120121
header2 = textwrap.dedent(
121-
"""
122-
{ stdenv, lib, fetchurl, fetchgit, callPackage, ... }:
123-
final: prev:
124-
{
122+
"""
123+
{
124+
stdenv,
125+
lib,
126+
fetchurl,
127+
fetchgit,
128+
callPackage,
129+
...
130+
}:
131+
final: prev: {
125132
"""
126133
)
127134
f.write(header2)
@@ -231,7 +238,8 @@ def generate_pkg_nix(plug: LuaPlugin):
231238
log.debug("running %s", " ".join(cmd))
232239

233240
output = subprocess.check_output(cmd, text=True)
234-
output = "callPackage(" + output.strip() + ") {};\n\n"
241+
## FIXME: luarocks nix command output isn't formatted properly
242+
output = "callPackage(\n" + output.strip() + ") {};\n\n"
235243
return (plug, output, None)
236244
except subprocess.CalledProcessError as e:
237245
log.error("Failed to generate nix expression for %s: %s", plug.name, e)

pkgs/development/lua-modules/generated-packages.nix

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -815,15 +815,15 @@ final: prev: {
815815
}:
816816
buildLuarocksPackage {
817817
pname = "fzf-lua";
818-
version = "0.0.1815-1";
818+
version = "0.0.1823-1";
819819
knownRockspec =
820820
(fetchurl {
821-
url = "mirror://luarocks/fzf-lua-0.0.1815-1.rockspec";
822-
sha256 = "0nihsjmwvf3v0v3wqnwbn5563q28iq64mwgif2kl7hrmkm1r68na";
821+
url = "mirror://luarocks/fzf-lua-0.0.1823-1.rockspec";
822+
sha256 = "0icbchqxr546j21xq2f6w122xkcmqgpg9pywlip8xjj8vsdfx6n6";
823823
}).outPath;
824824
src = fetchzip {
825-
url = "https://github.com/ibhagwan/fzf-lua/archive/caee13203d6143d691710c34f85ad6441fe3f535.zip";
826-
sha256 = "0ddkgml971j4rz0fhhg7s9sj1wbgyj8b9rjy32wrc681bwy01qx2";
825+
url = "https://github.com/ibhagwan/fzf-lua/archive/47b85a25c0c0b2c20b4e75199ed01bb71e7814f5.zip";
826+
sha256 = "1znlhvb84x3lipa5n1cdk1kpid49h647hnnwy01xw447vk49p11p";
827827
};
828828

829829
disabled = luaOlder "5.1";
@@ -904,15 +904,15 @@ final: prev: {
904904
}:
905905
buildLuarocksPackage {
906906
pname = "haskell-tools.nvim";
907-
version = "4.4.3-1";
907+
version = "5.0.0-1";
908908
knownRockspec =
909909
(fetchurl {
910-
url = "mirror://luarocks/haskell-tools.nvim-4.4.3-1.rockspec";
911-
sha256 = "1qc6ny0pw4098d2i3wkmcw1qb88jhvbjfabm40x5n0rv3jqkaij9";
910+
url = "mirror://luarocks/haskell-tools.nvim-5.0.0-1.rockspec";
911+
sha256 = "0ps1aqz344b2kc0p5zs70i4n9s07fnc5b2kxdbyj1x8cn3ndv959";
912912
}).outPath;
913913
src = fetchzip {
914-
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v4.4.3.zip";
915-
sha256 = "002lzdjdf9f5jp63bngmp9fadzs81c0w0gqqpy7b2wfxg76biggr";
914+
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v5.0.0.zip";
915+
sha256 = "0xwxxwcn775yjqjs90mr1qs9hf5dyqxhkii38yfq1cv5w8bnlrff";
916916
};
917917

918918
disabled = luaOlder "5.1";
@@ -1078,11 +1078,11 @@ final: prev: {
10781078
}:
10791079
buildLuarocksPackage {
10801080
pname = "jsregexp";
1081-
version = "0.0.7-1";
1081+
version = "0.0.7-2";
10821082
knownRockspec =
10831083
(fetchurl {
1084-
url = "mirror://luarocks/jsregexp-0.0.7-1.rockspec";
1085-
sha256 = "1yx0340h51xk23n0g8irj5c9bs35zy6p1zl5kp7vy2cwxazbipbl";
1084+
url = "mirror://luarocks/jsregexp-0.0.7-2.rockspec";
1085+
sha256 = "048gaxgm45hvqz8x2sp3bjii2fgimwafccnwvf92crlj3r6cys6k";
10861086
}).outPath;
10871087
src = fetchFromGitHub {
10881088
owner = "kmarius";
@@ -2225,17 +2225,17 @@ final: prev: {
22252225
}:
22262226
buildLuarocksPackage {
22272227
pname = "lua-zlib";
2228-
version = "1.2-2";
2228+
version = "1.3-0";
22292229
knownRockspec =
22302230
(fetchurl {
2231-
url = "mirror://luarocks/lua-zlib-1.2-2.rockspec";
2232-
sha256 = "1ycjy59w6rkhasqqbiyra0f1sj87fswcz25zwxy4gyv7rrwy5hxd";
2231+
url = "mirror://luarocks/lua-zlib-1.3-0.rockspec";
2232+
sha256 = "06mkh54k009bvn7xl8fbxl574n7zqk3ki04f0xbsc8an5w9bw1l8";
22332233
}).outPath;
22342234
src = fetchFromGitHub {
22352235
owner = "brimworks";
22362236
repo = "lua-zlib";
2237-
rev = "v1.2";
2238-
hash = "sha256-3gDYO4KcGUmcJFV22NDXWrFDwHNmPvMp++iXrz+QbC0=";
2237+
rev = "v1.3";
2238+
hash = "sha256-FjhI8i2yP4aeZGakFL+vuWKAdISTkdt1mPKl8GIecVM=";
22392239
};
22402240

22412241
disabled = luaOlder "5.1";
@@ -2730,13 +2730,13 @@ final: prev: {
27302730
knownRockspec =
27312731
(fetchurl {
27322732
url = "mirror://luarocks/lualine.nvim-scm-1.rockspec";
2733-
sha256 = "1ss3g2435xiz6ql12dnkdzs6qyb71gvk46ny3bgrcr4d34gd7j0c";
2733+
sha256 = "044bnw2phsxjsxkraaq9phj932f2f7vsbvfa91p7qfp2yjshixjf";
27342734
}).outPath;
27352735
src = fetchFromGitHub {
27362736
owner = "nvim-lualine";
27372737
repo = "lualine.nvim";
2738-
rev = "482ae358c67aec2a4939d68a1a4fe4c8064ccd16";
2739-
hash = "sha256-zVRE9a+ojQUHdaPL0CWqHKepFdO417KazahbdJPym6g=";
2738+
rev = "0ea56f91b7f51a37b749c050a5e5dfdd56b302b3";
2739+
hash = "sha256-VSWWvhnaeNoeM7U1SwerL8vqu81eg8YJtLnJDdEjvzY=";
27402740
};
27412741

27422742
disabled = luaOlder "5.1";
@@ -3213,17 +3213,17 @@ final: prev: {
32133213
}:
32143214
buildLuarocksPackage {
32153215
pname = "luasystem";
3216-
version = "0.5.1-1";
3216+
version = "0.6.0-1";
32173217
knownRockspec =
32183218
(fetchurl {
3219-
url = "mirror://luarocks/luasystem-0.5.1-1.rockspec";
3220-
sha256 = "0aiav3a3gw9l3gxxlq6ak6vigqqg0z9iyfq28knfm8rb23bvyi60";
3219+
url = "mirror://luarocks/luasystem-0.6.0-1.rockspec";
3220+
sha256 = "0pbjxfa56wy2bzs3q0bsxv27m8l2f3p2frvkprah2n708pxzi84s";
32213221
}).outPath;
32223222
src = fetchFromGitHub {
32233223
owner = "lunarmodules";
32243224
repo = "luasystem";
3225-
rev = "v0.5.1";
3226-
hash = "sha256-+dkXf4F2mZgQSRQRpJnjwo5Swi06Pi2BQjjY5p3PQGc=";
3225+
rev = "v0.6.0";
3226+
hash = "sha256-xhMdtI8tVBIQ4hsGe3l9z/ywJTvJhtGoE9hVnzvrTGc=";
32273227
};
32283228

32293229
disabled = luaOlder "5.1";
@@ -3807,26 +3807,29 @@ final: prev: {
38073807
mimetypes = callPackage (
38083808
{
38093809
buildLuarocksPackage,
3810+
fetchFromGitHub,
38103811
fetchurl,
38113812
luaOlder,
38123813
}:
38133814
buildLuarocksPackage {
38143815
pname = "mimetypes";
3815-
version = "1.0.0-3";
3816+
version = "1.1.0-2";
38163817
knownRockspec =
38173818
(fetchurl {
3818-
url = "mirror://luarocks/mimetypes-1.0.0-3.rockspec";
3819-
sha256 = "02f5x5pkz6fba71mp031arrgmddsyivn5fsa0pj3q3a7nxxpmnq9";
3819+
url = "mirror://luarocks/mimetypes-1.1.0-2.rockspec";
3820+
sha256 = "1asi5dlkqml9rjh2k2iq0fy2khdlc7mq4kxp4j42c8507w9dijww";
38203821
}).outPath;
3821-
src = fetchurl {
3822-
url = "https://github.com/lunarmodules/lua-mimetypes/archive/v1.0.0/lua-mimetypes-1.0.0.tar.gz";
3823-
sha256 = "1rc5lnzvw4cg8wxn4w4sar2xgf5vaivdd2hgpxxcqfzzcmblg1zk";
3822+
src = fetchFromGitHub {
3823+
owner = "lunarmodules";
3824+
repo = "lua-mimetypes";
3825+
rev = "v1.1.0";
3826+
hash = "sha256-9uuhMerMqE/AtFFGNIWxGBN0BQ+FE+NgZa3g041lesE=";
38243827
};
38253828

38263829
disabled = luaOlder "5.1";
38273830

38283831
meta = {
3829-
homepage = "https://github/lunarmodules/lua-mimetypes/";
3832+
homepage = "https://github.com/lunarmodules/lua-mimetypes";
38303833
description = "A simple library for looking up the MIME types of files.";
38313834
license.fullName = "MIT/X11";
38323835
};

0 commit comments

Comments
 (0)