From b4636d14c24facd6ab2ce393f2b0e50e98ea7b06 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 15 Feb 2025 19:08:54 -0600 Subject: [PATCH 1/2] lua-modules/overrides: remove unused inputs --- pkgs/development/lua-modules/overrides.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 955333f948c4..7f134fbcbf33 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -7,10 +7,8 @@ # plenary utilities which, findutils, - clang, coreutils, curl, - cyrus_sasl, dbus, expat, fetchFromGitHub, @@ -39,7 +37,6 @@ luajitPackages, lua-language-server, mariadb, - magic-enum, mpfr, neovim-unwrapped, openldap, @@ -48,13 +45,10 @@ pkg-config, readline, rustPlatform, - sol2, sqlite, - tomlplusplus, tree-sitter, unbound, vimPlugins, - vimUtils, yajl, zip, unzip, @@ -69,7 +63,6 @@ let luaAtLeast lua isLuaJIT - isLua51 ; in { From 7f931c6d1f9a482a8fe93aa402e8f570f6a314a5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 15 Feb 2025 19:09:35 -0600 Subject: [PATCH 2/2] luaPackages.fzf-lua: add tests --- pkgs/development/lua-modules/overrides.nix | 50 +++++++++++++++++++++- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 7f134fbcbf33..eee33c9b22e9 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -11,10 +11,12 @@ curl, dbus, expat, + fd, fetchFromGitHub, fetchpatch, fetchurl, fixDarwinDylibNames, + fzf, glib, glibc, gmp, @@ -34,8 +36,8 @@ libuv, libxcrypt, libyaml, - luajitPackages, lua-language-server, + luajitPackages, mariadb, mpfr, neovim-unwrapped, @@ -44,16 +46,18 @@ pcre, pkg-config, readline, + ripgrep, rustPlatform, sqlite, tree-sitter, unbound, + unzip, vimPlugins, yajl, zip, - unzip, zlib, zziplib, + writableTmpDirAsHomeHook, }: final: prev: @@ -153,6 +157,48 @@ in ''; }); + fzf-lua = prev.fzf-lua.overrideAttrs { + # FIXME: Darwin flaky tests + # address already in use on second test run + # Previewer transient failure + doCheck = !stdenv.hostPlatform.isDarwin; + checkInputs = [ + fd + fzf + ripgrep + ]; + nativeCheckInputs = [ + neovim-unwrapped + writableTmpDirAsHomeHook + ]; + checkPhase = '' + runHook preCheck + + # Linking the dependencies since makefile wants to clone them each time + # for `make deps` + mkdir -p deps + ln -s ${vimPlugins.mini-nvim} deps/mini.nvim + ln -s ${vimPlugins.nvim-web-devicons} deps/nvim-web-devicons + + # TODO: remove with new nvim-web-devicons release + # Disabled devicons test because we have old version as dep and fzf-lua checks for a new icon + substituteInPlace tests/file/ui_spec.lua \ + --replace-fail \ + "T[\"files()\"][\"icons\"] = new_set({ parametrize = { { \"devicons\" }, { \"mini\" } } })" \ + "T[\"files()\"][\"icons\"] = new_set({ parametrize = { { \"mini\" } } })" + + # TODO: Figure out why 2 files extra for `fd` + substituteInPlace tests/file/ui_spec.lua \ + --replace-fail \ + "T[\"files()\"][\"executable\"] = new_set({ parametrize = { { \"fd\" }, { \"rg\" }, { \"find|dir\" } } }, {" \ + "T[\"files()\"][\"executable\"] = new_set({ parametrize = { { \"rg\" }, { \"find|dir\" } } }, {" + + make test + + runHook postCheck + ''; + }; + # Until https://github.com/swarn/fzy-lua/pull/8 is merged, # we have to invoke busted manually fzy = prev.fzy.overrideAttrs (oa: {