Skip to content

Commit 3819cf0

Browse files
GaetanLepageGaetanLepage
authored
luaPackages: update on 2025-02-28 (#385811)
2 parents 2cf427c + b81fe34 commit 3819cf0

File tree

3 files changed

+48
-43
lines changed

3 files changed

+48
-43
lines changed

‎maintainers/scripts/luarocks-packages.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ nvim-nio,,,,,,mrcjkb
127127
nvim-web-devicons,,,,,,
128128
oil.nvim,,,,,,
129129
orgmode,,,,,,
130-
papis-nvim,,,,,,GaetanLepage
130+
papis.nvim,,,,,,GaetanLepage
131131
pathlib.nvim,,,,,,
132132
penlight,,,,,,alerque
133133
plenary.nvim,https://raw.githubusercontent.com/nvim-lua/plenary.nvim/master/plenary.nvim-scm-1.rockspec,,,,5.1,

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

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ You can customize the generated packages in pkgs/development/lua-modules/overrid
66
{ stdenv, lib, fetchurl, fetchgit, callPackage, ... }:
77
final: prev:
88
{
9-
alt-getopt = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder }:
9+
alt-getopt = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }:
1010
buildLuarocksPackage {
1111
pname = "alt-getopt";
12-
version = "0.8.0-1";
12+
version = "0.8.0-2";
1313
knownRockspec = (fetchurl {
14-
url = "mirror://luarocks/alt-getopt-0.8.0-1.rockspec";
15-
sha256 = "17yxi1lsrbkmwzcn1x48x8758d7v1frsz1bmnpqfv4vfnlh0x210";
14+
url = "mirror://luarocks/alt-getopt-0.8.0-2.rockspec";
15+
sha256 = "1x1wb351n8c9aghgrlwkjg4crriwby18drzrz3280mw9cildg11v";
1616
}).outPath;
1717
src = fetchFromGitHub {
1818
owner = "cheusov";
@@ -21,7 +21,7 @@ buildLuarocksPackage {
2121
hash = "sha256-OxtMNB8++cVQ/gQjntLUt3WYopGhYb1VbIUAZEzJB88=";
2222
};
2323

24-
disabled = luaOlder "5.1" || luaAtLeast "5.4";
24+
disabled = luaOlder "5.1";
2525

2626
meta = {
2727
homepage = "https://github.com/cheusov/lua-alt-getopt";
@@ -374,8 +374,8 @@ buildLuarocksPackage {
374374
src = fetchFromGitHub {
375375
owner = "teal-language";
376376
repo = "cyan";
377-
rev = "71eaea271bff489d82a9fb575b823b161b996162";
378-
hash = "sha256-3RfUTTPu+E21+Z7sMVLeA/gadYeF8fTE+ZMZw8G+trM=";
377+
rev = "0650e05c656b73f85b2bcd02ac1f27453f65cb17";
378+
hash = "sha256-pj1Zy5ygg90/6uuNi2jc5xax/vg64aHm1G1e9kAcZv8=";
379379
};
380380

381381
propagatedBuildInputs = [ argparse luafilesystem luasystem tl ];
@@ -461,16 +461,16 @@ buildLuarocksPackage {
461461
fennel = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }:
462462
buildLuarocksPackage {
463463
pname = "fennel";
464-
version = "1.5.1-1";
464+
version = "1.5.3-1";
465465
knownRockspec = (fetchurl {
466-
url = "mirror://luarocks/fennel-1.5.1-1.rockspec";
467-
sha256 = "02wq1rlgv2zl1x30vqpdf5nmblxv7kkwx9lwplj4rj1fp9s3m8mh";
466+
url = "mirror://luarocks/fennel-1.5.3-1.rockspec";
467+
sha256 = "1nlibaa6zlik0c164z4c57yy3zizqx8q0wifql5x4ya3s0bn0d9r";
468468
}).outPath;
469469
src = fetchFromGitHub {
470470
owner = "bakpakin";
471471
repo = "Fennel";
472-
rev = "1.5.1";
473-
hash = "sha256-ciXElwX/F8YCFA6C0F3+8lnUPQlKYpcdpagAjoXZpyY=";
472+
rev = "1.5.3";
473+
hash = "sha256-7Tq6Vx032jxnfPmtsKiTBQ/yH8vHO8+wMoQHZSIevWY=";
474474
};
475475

476476
disabled = luaOlder "5.1";
@@ -579,14 +579,14 @@ buildLuarocksPackage {
579579
fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
580580
buildLuarocksPackage {
581581
pname = "fzf-lua";
582-
version = "0.0.1753-1";
582+
version = "0.0.1768-1";
583583
knownRockspec = (fetchurl {
584-
url = "mirror://luarocks/fzf-lua-0.0.1753-1.rockspec";
585-
sha256 = "0d6cy5hqcpimm71kr1q58yf264mymhrvsfxsql9ghhmbrinrdq3w";
584+
url = "mirror://luarocks/fzf-lua-0.0.1768-1.rockspec";
585+
sha256 = "0jd4xcy4hpmhqrgpqp166rpim36yldhrp76xp92vgq3z8sdpjy7i";
586586
}).outPath;
587587
src = fetchzip {
588-
url = "https://github.com/ibhagwan/fzf-lua/archive/0a3b70feb05879a8001c51f7a2a42fa52a9e552c.zip";
589-
sha256 = "0ysjs6pm16373rp5p4l3cvxx6c9p8h5fp14vvd38z7f3gd6mxwqa";
588+
url = "https://github.com/ibhagwan/fzf-lua/archive/9b84b53f3297d4912d7eb95b979e9b27e2e61281.zip";
589+
sha256 = "1p3fb68h7x50b6m6aaxxqcylipa5rdg0yfz6jlrd5i2kmr5gxldq";
590590
};
591591

592592
disabled = luaOlder "5.1";
@@ -771,8 +771,8 @@ buildLuarocksPackage {
771771
src = fetchFromGitHub {
772772
owner = "daurnimator";
773773
repo = "ldbus";
774-
rev = "d2b80eced6293e2a02345fa517147953336af375";
775-
hash = "sha256-2es/xoh2G28Dq/74/wWX1OHgioqZBLzUtX4fy7cDit0=";
774+
rev = "2571a9ba15d03bc40ac2e406f42ef14b322e1c01";
775+
hash = "sha256-ph/6oAhMOdKYYeueOVVx/PopcBqxDnHho2qF+liE8ks=";
776776
};
777777

778778
disabled = luaOlder "5.1" || luaAtLeast "5.5";
@@ -1946,13 +1946,13 @@ buildLuarocksPackage {
19461946
};
19471947
}) {};
19481948

1949-
lualine-nvim = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, nvim-web-devicons }:
1949+
lualine-nvim = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }:
19501950
buildLuarocksPackage {
19511951
pname = "lualine.nvim";
19521952
version = "scm-1";
19531953
knownRockspec = (fetchurl {
19541954
url = "mirror://luarocks/lualine.nvim-scm-1.rockspec";
1955-
sha256 = "1mzsfiq4h95s0nbygwii2w8xs5rixdbha322bvx453k530s2kxxj";
1955+
sha256 = "0ry9k3rs9msi6zd7nmd0cij0ghrxikwn4508i11xg9azpzhjzvn7";
19561956
}).outPath;
19571957
src = fetchFromGitHub {
19581958
owner = "nvim-lualine";
@@ -1962,7 +1962,6 @@ buildLuarocksPackage {
19621962
};
19631963

19641964
disabled = luaOlder "5.1";
1965-
propagatedBuildInputs = [ nvim-web-devicons ];
19661965

19671966
meta = {
19681967
homepage = "https://github.com/nvim-lualine/lualine.nvim";
@@ -2781,8 +2780,8 @@ buildLuarocksPackage {
27812780
src = fetchFromGitHub {
27822781
owner = "leafo";
27832782
repo = "moonscript";
2784-
rev = "98448bdcb219d6df081e7986200784b83ccd10f3";
2785-
hash = "sha256-3HxJoP78PmK3s64AfB1VQNjhvraMFwZHg6gSWYKGZjo=";
2783+
rev = "3b134e01ebc5961ca132bff5ba2871c88d65347e";
2784+
hash = "sha256-ijWmxgoi524fbo3oXxuK/cPHxwHyGt3mMrGOw3+TsfY=";
27862785
};
27872786

27882787
disabled = luaOlder "5.1";
@@ -2920,8 +2919,8 @@ buildLuarocksPackage {
29202919
src = fetchFromGitHub {
29212920
owner = "hrsh7th";
29222921
repo = "nvim-cmp";
2923-
rev = "12509903a5723a876abd65953109f926f4634c30";
2924-
hash = "sha256-a45FPHLtM1AnBlvJZ/ka5m7gOz84rpVk8GH75fYWqSg=";
2922+
rev = "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3";
2923+
hash = "sha256-dBAYadxdnl0j5e8VnnyGxx2AE6GgCDyIBxEgmrNawxo=";
29252924
};
29262925

29272926
disabled = luaOlder "5.1" || luaAtLeast "5.4";
@@ -3004,14 +3003,14 @@ buildLuarocksPackage {
30043003
orgmode = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, tree-sitter-orgmode }:
30053004
buildLuarocksPackage {
30063005
pname = "orgmode";
3007-
version = "0.4.2-1";
3006+
version = "0.4.32-1";
30083007
knownRockspec = (fetchurl {
3009-
url = "mirror://luarocks/orgmode-0.4.2-1.rockspec";
3010-
sha256 = "0cgvkqn7657wqyhisr9jf2abn7isykgslbmas79530flrcv4ni4w";
3008+
url = "mirror://luarocks/orgmode-0.4.32-1.rockspec";
3009+
sha256 = "1n3nd975m58f5kr4gl6d5mpgsm7aaz2pmcar0hlkisc91fq5pfyz";
30113010
}).outPath;
30123011
src = fetchzip {
3013-
url = "https://github.com/nvim-orgmode/orgmode/archive/0.4.2.zip";
3014-
sha256 = "01rri5d9sc4ng3bs0v4nvfaf9f93ihjnpi0ngpvvkq5ij6wwv2js";
3012+
url = "https://github.com/nvim-orgmode/orgmode/archive/0.4.32.zip";
3013+
sha256 = "0qwv2pg4s9spmy5wvkvflhcb0a2drlygch6hmjanj3g2kkn3ph5f";
30153014
};
30163015

30173016
disabled = luaOlder "5.1";
@@ -3309,14 +3308,14 @@ buildLuarocksPackage {
33093308
rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
33103309
buildLuarocksPackage {
33113310
pname = "rustaceanvim";
3312-
version = "5.24.4-1";
3311+
version = "5.25.0-1";
33133312
knownRockspec = (fetchurl {
3314-
url = "mirror://luarocks/rustaceanvim-5.24.4-1.rockspec";
3315-
sha256 = "1jx85ydafnyl2p9bbg4p3612iwcgp0xwp0cq0avay404vwcg6byp";
3313+
url = "mirror://luarocks/rustaceanvim-5.25.0-1.rockspec";
3314+
sha256 = "178vb8dqbsswa1vy0bcisxyijhdvd2bq7f7hqkl7wvxvf250k4lp";
33163315
}).outPath;
33173316
src = fetchzip {
3318-
url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.24.4.zip";
3319-
sha256 = "09rldlwgsi22ih0gd3lg7ajagdy7bj03zr6w1rh0gn7scgcp7y2g";
3317+
url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.25.0.zip";
3318+
sha256 = "0r2z5givkkxqswbk5wpqmhm04gn6gjlv7jdrgm5ddz1gn8vvkgci";
33203319
};
33213320

33223321
disabled = luaOlder "5.1";
@@ -3667,14 +3666,14 @@ buildLuarocksPackage {
36673666
tree-sitter-orgmode = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser }:
36683667
buildLuarocksPackage {
36693668
pname = "tree-sitter-orgmode";
3670-
version = "1.3.2-1";
3669+
version = "1.3.4-1";
36713670
knownRockspec = (fetchurl {
3672-
url = "mirror://luarocks/tree-sitter-orgmode-1.3.2-1.rockspec";
3673-
sha256 = "1md45ic96yf3agay30w9icr9c1v5fs0p6zs4dd5d0clrsc9029c4";
3671+
url = "mirror://luarocks/tree-sitter-orgmode-1.3.4-1.rockspec";
3672+
sha256 = "00p8abqdnjwshi6nqkhjaxdvqilfppvlv2bk98cmspgjhb3sd2bh";
36743673
}).outPath;
36753674
src = fetchzip {
3676-
url = "https://github.com/nvim-orgmode/tree-sitter-org/archive/v1.3.2.zip";
3677-
sha256 = "1y1dyabvmm2q51nmi58lv0zf7sdz066i319s5j3ch6abcm1wv24i";
3675+
url = "https://github.com/nvim-orgmode/tree-sitter-org/archive/1.3.4.zip";
3676+
sha256 = "08lmcvvklr2nyx8v8gacaip8n8cfmywj3fnkhwa0p9yzpza86b4r";
36783677
};
36793678

36803679
nativeBuildInputs = [ luarocks-build-treesitter-parser ];

‎pkgs/development/lua-modules/overrides.nix‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ in
500500
nativeCheckInputs = [
501501
final.nlua
502502
final.busted
503+
final.nvim-web-devicons
503504
gitMinimal
504505
writableTmpDirAsHomeHook
505506
];
@@ -1113,7 +1114,12 @@ in
11131114
orgmode = prev.orgmode.overrideAttrs (oa: {
11141115
# Patch in tree-sitter-orgmode dependency
11151116
postPatch = ''
1116-
substituteInPlace lua/orgmode/config/init.lua \
1117+
substituteInPlace lua/orgmode/utils/treesitter/install.lua \
1118+
--replace-fail \
1119+
"pcall(vim.treesitter.language.add, 'org')" \
1120+
"pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)"
1121+
1122+
substituteInPlace lua/orgmode/health.lua \
11171123
--replace-fail \
11181124
"pcall(vim.treesitter.language.add, 'org')" \
11191125
"pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)"

0 commit comments

Comments
 (0)