From ae31ceca9d611c34abdeed34a9c3c8b99e6051d7 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 15 Apr 2025 21:40:04 -0500 Subject: [PATCH 1/5] luaPackages.rustaceanvim: 6.0.1-1 -> 6.0.2-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 744f8e3084f8..2aba8982cbb7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -4649,15 +4649,15 @@ final: prev: { }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "6.0.1-1"; + version = "6.0.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-6.0.1-1.rockspec"; - sha256 = "02qxbrk32fay17nlxs4sf4dpkvsfnj5lkm8wsb2q0a8jaa2v7dxv"; + url = "mirror://luarocks/rustaceanvim-6.0.2-1.rockspec"; + sha256 = "1z2s2f91mnc9fxr5ykffajpj2c92rjgnwipfvi2lhhl2p5hpgf9f"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.0.1.zip"; - sha256 = "032barkibbsjjwzq87jbn2sqni3f5bmfvxn2bcq589viwdrziwgf"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.0.2.zip"; + sha256 = "09wrfmzbk81xax5p4wzczsvv1x28nv54mayi12fvzv6c3bmcsbvj"; }; disabled = luaOlder "5.1"; From ec2ff513504d8df0561ae3a538df163f68df03b5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 15 Apr 2025 21:52:04 -0500 Subject: [PATCH 2/5] luaPackages.bit32: 5.3.0-1 -> 5.3.5.1-1 Switches from the archived lua-compat-5.2 repository to the maintained lua-compat-5.3 version. --- maintainers/scripts/luarocks-packages.csv | 2 +- pkgs/development/lua-modules/bit32.patch | 14 ------------- .../lua-modules/generated-packages.nix | 21 +++++++++---------- pkgs/development/lua-modules/overrides.nix | 10 --------- 4 files changed, 11 insertions(+), 36 deletions(-) delete mode 100644 pkgs/development/lua-modules/bit32.patch diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 72f1fb1f9a44..bb23782e27d5 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -4,7 +4,7 @@ ansicolors,,,,,,Freed-Wu argparse,,,,,, basexx,,,,,, binaryheap,,,,,,vcunat -bit32,,,,5.3.0-1,5.1,lblasc +bit32,,,,,5.1,lblasc busted,,,,,, busted-htest,,,,,,mrcjkb cassowary,,,,,,alerque diff --git a/pkgs/development/lua-modules/bit32.patch b/pkgs/development/lua-modules/bit32.patch deleted file mode 100644 index 544c4d423981..000000000000 --- a/pkgs/development/lua-modules/bit32.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur lua-compat-5.2/c-api/compat-5.2.h lua-compat-5.2-patched/c-api/compat-5.2.h ---- lua-compat-5.2/c-api/compat-5.2.h 2015-02-19 09:23:42.000000000 +1100 -+++ lua-compat-5.2-patched/c-api/compat-5.2.h 2019-06-17 17:58:13.585361793 +1000 -@@ -146,8 +146,10 @@ - #define lua_pushglobaltable(L) \ - lua_pushvalue(L, LUA_GLOBALSINDEX) - -+#if !defined(luaL_newlib) - #define luaL_newlib(L, l) \ - (lua_newtable((L)),luaL_setfuncs((L), (l), 0)) -+#endif - - void luaL_checkversion (lua_State *L); - diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2aba8982cbb7..3adce2fa8e62 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -169,32 +169,31 @@ final: prev: { bit32 = callPackage ( { buildLuarocksPackage, - fetchFromGitHub, fetchurl, + fetchzip, + luaAtLeast, luaOlder, }: buildLuarocksPackage { pname = "bit32"; - version = "5.3.0-1"; + version = "5.3.5.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/bit32-5.3.0-1.rockspec"; - sha256 = "1d6xdihpksrj5a3yvsvnmf3vfk15hj6f8n1rrs65m7adh87hc0yd"; + url = "mirror://luarocks/bit32-5.3.5.1-1.rockspec"; + sha256 = "11mg0hmmil92hkwamm91ghih6ys9pqsakx0z9jgnqxymnl887j51"; }).outPath; - src = fetchFromGitHub { - owner = "keplerproject"; - repo = "lua-compat-5.2"; - rev = "bitlib-5.3.0"; - hash = "sha256-Ek7FMWskfHwHhEVfjTDZyL/cruHDiQo5Jmnwsvai+MY="; + src = fetchzip { + url = "https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.zip"; + sha256 = "1caxn228gx48g6kymp9w7kczgxcg0v0cd5ixsx8viybzkd60dcn4"; }; - disabled = luaOlder "5.1"; + disabled = luaOlder "5.1" || luaAtLeast "5.5"; meta = { homepage = "http://www.lua.org/manual/5.2/manual.html#6.7"; description = "Lua 5.2 bit manipulation library"; maintainers = with lib.maintainers; [ lblasc ]; - license.fullName = "MIT/X11"; + license.fullName = "MIT"; }; } ) { }; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 54c87b8ea563..aad3c3a828dd 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -86,16 +86,6 @@ in ##########################################3 #### manual fixes for generated packages ##########################################3 - bit32 = prev.bit32.overrideAttrs (oa: { - # Small patch in order to no longer redefine a Lua 5.2 function that Luajit - # 2.1 also provides, see https://github.com/LuaJIT/LuaJIT/issues/325 for - # more - patches = [ - ./bit32.patch - ]; - meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; - }); - busted = prev.busted.overrideAttrs (oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ installShellFiles From 2311200070115ba83823685fa8d930be634e72f4 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 16 Apr 2025 08:07:49 -0500 Subject: [PATCH 3/5] luaPackages.rest-nvim: 3.9.1-1 -> 3.12.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 3adce2fa8e62..1040a565980f 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -4425,15 +4425,15 @@ final: prev: { }: buildLuarocksPackage { pname = "rest.nvim"; - version = "3.9.1-1"; + version = "3.12.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rest.nvim-3.9.1-1.rockspec"; - sha256 = "02arw1hr702jfadnc72yr3kkhfcm7hfg1ipis7nlhvsj25i2yl54"; + url = "mirror://luarocks/rest.nvim-3.12.0-1.rockspec"; + sha256 = "1i16gr471v9v6jdwrqizagznpjdr58ijx0cs9yjnd8b6b9cwmxi9"; }).outPath; src = fetchzip { - url = "https://github.com/rest-nvim/rest.nvim/archive/v3.9.1.zip"; - sha256 = "15lkdr77q7zxqbh3xkx3ilj38hp5jfinrqw92q3dpmxc8d8wk9iw"; + url = "https://github.com/rest-nvim/rest.nvim/archive/v3.12.0.zip"; + sha256 = "1494r144idrq09da8ra4q0yk7giqh4hxs05397ja7hpxyz0yabdr"; }; disabled = luaOlder "5.1"; From 944b8d0e1c6f2665b84dbad7813323de0f941720 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 15 Apr 2025 21:55:52 -0500 Subject: [PATCH 4/5] luaPackages: update on 2025-04-16 --- .../editors/vim/plugins/overrides.nix | 4 + .../lua-modules/generated-packages.nix | 121 +++++++++--------- 2 files changed, 65 insertions(+), 60 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1784aca034f1..22e88798d1a3 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1204,6 +1204,10 @@ in fzf-lua = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.fzf-lua; runtimeDeps = [ fzf ]; + nvimSkipModules = [ + "fzf-lua.shell_helper" + "fzf-lua.spawn" + ]; }; fzf-vim = super.fzf-vim.overrideAttrs { diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 1040a565980f..44c8d6d993ee 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -814,15 +814,15 @@ final: prev: { }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.1823-1"; + version = "0.0.1836-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.1823-1.rockspec"; - sha256 = "0icbchqxr546j21xq2f6w122xkcmqgpg9pywlip8xjj8vsdfx6n6"; + url = "mirror://luarocks/fzf-lua-0.0.1836-1.rockspec"; + sha256 = "1q0wfck09d0449q8dyb95cyyr8z0r8292dp8vrqq3jcd7qkjcf1q"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/47b85a25c0c0b2c20b4e75199ed01bb71e7814f5.zip"; - sha256 = "1znlhvb84x3lipa5n1cdk1kpid49h647hnnwy01xw447vk49p11p"; + url = "https://github.com/ibhagwan/fzf-lua/archive/ba5ba606f11967e08165aeeb9d7abe04d0835f58.zip"; + sha256 = "1r66yrpzzzazasmb450xpr11f0sjg8ckrf91x4c66ypsanz2z2ws"; }; disabled = luaOlder "5.1"; @@ -880,8 +880,8 @@ final: prev: { src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "c6fedfd0b1715ee624384b134becec0a7b0a3d28"; - hash = "sha256-c+7Bf7SqVaNiYHczouYChDrurDdTxIDzr/TLMtLqZ50="; + rev = "fcfa7a989cd6fed10abf02d9880dc76d7a38167d"; + hash = "sha256-cg8r0yuuSE8G5MTj0pET8MzJ+VQf+HsXDJx5FzriM78="; }; disabled = lua.luaversion != "5.1"; @@ -894,6 +894,37 @@ final: prev: { } ) { }; + grug-far-nvim = callPackage ( + { + buildLuarocksPackage, + fetchurl, + fetchzip, + luaOlder, + }: + buildLuarocksPackage { + pname = "grug-far.nvim"; + version = "1.6.6-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/grug-far.nvim-1.6.6-1.rockspec"; + sha256 = "1axdj580nv078d4rh7q9rqd5rd46cvd3gfif0cbqys2kpv0xx53d"; + }).outPath; + src = fetchzip { + url = "https://github.com/MagicDuck/grug-far.nvim/archive/d6c682af0033b4fbb3645a997e3b4a9189ed1ed6.zip"; + sha256 = "0v1nfyiymb17p3fkk6ih1pxiib25f8vg74k79vp9r5wr56l9ja9c"; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/MagicDuck/grug-far.nvim"; + description = "Find And Replace plugin for neovim"; + maintainers = with lib.maintainers; [ teto ]; + license.fullName = "MIT"; + }; + } + ) { }; + haskell-tools-nvim = callPackage ( { buildLuarocksPackage, @@ -925,36 +956,6 @@ final: prev: { } ) { }; - grug-far-nvim = callPackage ( - { - buildLuarocksPackage, - fetchurl, - fetchzip, - luaOlder, - }: - buildLuarocksPackage { - pname = "grug-far.nvim"; - version = "1.5.15-1"; - knownRockspec = - (fetchurl { - url = "mirror://luarocks/grug-far.nvim-1.5.15-1.rockspec"; - sha256 = "1jp6b6kqp389wli766rypam4hr6dqv6v5r8kv1dk21d7glz8hg6h"; - }).outPath; - src = fetchzip { - url = "https://github.com/MagicDuck/grug-far.nvim/archive/5da116bc99a03e14be3b824e319f4e49c676af78.zip"; - sha256 = "196l6vy9573fkwld3cl927706a6gfgmc71kn1kx3pmk8l6p8hcya"; - }; - - disabled = luaOlder "5.1"; - - meta = { - homepage = "https://github.com/MagicDuck/grug-far.nvim"; - description = "Find And Replace plugin for neovim"; - license.fullName = "MIT"; - }; - } - ) { }; - http = callPackage ( { basexx, @@ -1978,17 +1979,17 @@ final: prev: { }: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "1.5.2-1"; + version = "1.6.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-1.5.2-1.rockspec"; - sha256 = "1nrriyf9fvn0achn2drvb915kx7cq4ldlyg24g118i8ib1fr9lgd"; + url = "mirror://luarocks/lua-resty-openssl-1.6.0-1.rockspec"; + sha256 = "108a53210khinpwk88pcz6s8n2f6hhaib3jfrgi9kjp0r4s14c4q"; }).outPath; src = fetchFromGitHub { owner = "fffonion"; repo = "lua-resty-openssl"; - rev = "1.5.2"; - hash = "sha256-vkcqUaHCIBBmcVP4csqjn6oPSBvUF8MBzveIc6jJKWY="; + rev = "1.6.0"; + hash = "sha256-TqBRTFV1255Ct2mm2T8bLJNdSWZTEB6wOOHGRZczcVk="; }; meta = { @@ -2010,17 +2011,17 @@ final: prev: { }: buildLuarocksPackage { pname = "lua-resty-session"; - version = "4.0.5-1"; + version = "4.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-session-4.0.5-1.rockspec"; - sha256 = "0h0kqwna46mrraq310qjb7yigxwv13n4czk24xnqr21czxsskzkg"; + url = "mirror://luarocks/lua-resty-session-4.1.0-1.rockspec"; + sha256 = "0cmx2rwiwiprg1112chxrfvp7gs2jg0grdnkb5n7yhd5rnp0bhhw"; }).outPath; src = fetchFromGitHub { owner = "bungle"; repo = "lua-resty-session"; - rev = "v4.0.5"; - hash = "sha256-n0m6/4JnUPoidM7oWKd+ZyNbb/X/h8w21ptCrFaA8SI="; + rev = "v4.1.0"; + hash = "sha256-MXB7Z/0drMOcTwJBHNwZx4iqem1XfG6uwozW+RxL588="; }; disabled = luaOlder "5.1"; @@ -2729,13 +2730,13 @@ final: prev: { knownRockspec = (fetchurl { url = "mirror://luarocks/lualine.nvim-scm-1.rockspec"; - sha256 = "044bnw2phsxjsxkraaq9phj932f2f7vsbvfa91p7qfp2yjshixjf"; + sha256 = "1cf500jgdd3f9d36ad9h3vf20vyz4za0lqsdrx9l3si39n71k92v"; }).outPath; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "0ea56f91b7f51a37b749c050a5e5dfdd56b302b3"; - hash = "sha256-VSWWvhnaeNoeM7U1SwerL8vqu81eg8YJtLnJDdEjvzY="; + rev = "86fe39534b7da729a1ac56c0466e76f2c663dc42"; + hash = "sha256-XeAFXg6GWzMJV/HzfdCXtv/effAHVU7mioFKTf1kDc8="; }; disabled = luaOlder "5.1"; @@ -3215,14 +3216,14 @@ final: prev: { version = "0.6.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasystem-0.6.0-1.rockspec"; - sha256 = "0pbjxfa56wy2bzs3q0bsxv27m8l2f3p2frvkprah2n708pxzi84s"; + url = "mirror://luarocks/luasystem-0.6.2-1.rockspec"; + sha256 = "0s6vd8a35x156ccp9b95rzqgklmgvz3a2bcfp4g09vlyh2kqy1am"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luasystem"; - rev = "v0.6.0"; - hash = "sha256-xhMdtI8tVBIQ4hsGe3l9z/ywJTvJhtGoE9hVnzvrTGc="; + rev = "v0.6.2"; + hash = "sha256-EcKs8W8UAbyA5WCt75tGO2osNgFbL8SNUl78vKSy82o="; }; disabled = luaOlder "5.1"; @@ -4079,8 +4080,8 @@ final: prev: { src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "059e89495b3ec09395262f16b1ad441a38081d04"; - hash = "sha256-YC2ehgS759GzRUySPqmb1NQFxJ9HnP731oVYptWU3Xk="; + rev = "b5311ab3ed9c846b585c0c15b7559be131ec4be9"; + hash = "sha256-l5z+PT4S9b09d2M+J/tHVd9W9Ss3eQQk5Ykpz2Qjxxw="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -4335,8 +4336,8 @@ final: prev: { src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "3707cdb1e43f5cea73afb6037e6494e7ce847a66"; - hash = "sha256-18zX3kZ42ynRefFP0mOcy6ESEpejTukjNi4jCRXx48A="; + rev = "857c5ac632080dba10aae49dba902ce3abf91b35"; + hash = "sha256-8FV5RjF7QbDmQOQynpK7uRKONKbPRYbOPugf9ZxNvUs="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -4961,8 +4962,8 @@ final: prev: { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "415af52339215926d705cccc08145f3782c4d132"; - hash = "sha256-5y8srYKaAqFplMtDjsc8GdDF8yui5vCNMiOeFLrC/sM="; + rev = "a4ed82509cecc56df1c7138920a1aeaf246c0ac5"; + hash = "sha256-GF1zOHZItVZm3bx2wqI4hPj7EXQJ2F9KS4MtaEt2gm0="; }; disabled = lua.luaversion != "5.1"; From 2f0ba319cfa1480572fffb8b7a6acffea3cb42e8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 16 Apr 2025 08:40:56 -0500 Subject: [PATCH 5/5] luaPackages.grug-far-nvim: fix checkphase --- pkgs/development/lua-modules/overrides.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index aad3c3a828dd..54aef8fb8313 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -4,7 +4,7 @@ cargo, cmake, - # plenary utilities + ast-grep, which, findutils, coreutils, @@ -217,6 +217,19 @@ in runHook preCheck # feel free to disable/adjust the tests rm tests/base/test_apply.lua tests/base/test_vimscript_interpreter.lua + + # Dependencies needed in special location + mkdir -p deps/{ripgrep,astgrep} + mkdir {temp_test_dir,temp_history_dir} + ln -s ${lib.getExe ripgrep} deps/ripgrep/rg + ln -s ${lib.getExe ast-grep} deps/astgrep/ast-grep + ln -s ${vimPlugins.mini-nvim} deps/mini.nvim + + # Update dependency check to respect packaged version + substituteInPlace lua/grug-far/test/dependencies.lua \ + --replace-fail "local RG_VERSION = '14.1.0'" "local RG_VERSION = '${lib.getVersion ripgrep}'" \ + --replace-fail "local SG_VERSION = '0.35.0'" "local SG_VERSION = '${lib.getVersion ast-grep}'" + make test dir=base runHook postCheck '';