From a325eebd210f373d75174792243f40bcbeea9a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 28 Jan 2026 14:15:38 +0100 Subject: [PATCH 1/4] lua-modules: delete unused flake8 file --- pkgs/development/lua-modules/updater/.flake8 | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 pkgs/development/lua-modules/updater/.flake8 diff --git a/pkgs/development/lua-modules/updater/.flake8 b/pkgs/development/lua-modules/updater/.flake8 deleted file mode 100644 index 7ad3e937c9a5..000000000000 --- a/pkgs/development/lua-modules/updater/.flake8 +++ /dev/null @@ -1,8 +0,0 @@ -[flake8] -# E111 => 4 spaces tabs -# don't let spaces else it is not recognized -# E123 buggy -ignore = - E501,E265,E402 - -max-line-length = 120 From 4861f9d03206d3fa945e03442fe6207d9bd9f927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 28 Jan 2026 14:14:54 +0100 Subject: [PATCH 2/4] luaPackages.image-nvim: 1.3.0-1 -> 1.4.0 --- maintainers/scripts/luarocks-packages.csv | 1 - .../lua-modules/generated-packages.nix | 33 ----------------- .../lua-modules/image-nvim/default.nix | 35 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 8 ----- pkgs/top-level/lua-packages.nix | 2 ++ 5 files changed, 37 insertions(+), 42 deletions(-) create mode 100644 pkgs/development/lua-modules/image-nvim/default.nix diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 877e97fd2aed..3cb60cea6ae2 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -29,7 +29,6 @@ gitsigns.nvim,,,,,5.1, grug-far.nvim,,,,,5.1,teto haskell-tools.nvim,,,,,5.1,mrcjkb http,,,,0.4-0,,vcunat -image.nvim,,,,,5.1,teto inspect,,,,,, jsregexp,,,,0.0.7-2,, ldbus,,,https://luarocks.org/dev,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index cb1189466280..6af1545fde09 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1010,39 +1010,6 @@ final: prev: { } ) { }; - image-nvim = callPackage ( - { - buildLuarocksPackage, - fetchurl, - fetchzip, - luaOlder, - magick, - }: - buildLuarocksPackage { - pname = "image.nvim"; - version = "1.3.0-1"; - knownRockspec = - (fetchurl { - url = "mirror://luarocks/image.nvim-1.3.0-1.rockspec"; - sha256 = "1ls3v5xcgmqmscqk5prpj0q9sy0946rfb2dfva5f1axb5x4jbvj9"; - }).outPath; - src = fetchzip { - url = "https://github.com/3rd/image.nvim/archive/v1.3.0.zip"; - sha256 = "0fbc3wvzsck8bbz8jz5piy68w1xmq5cnhaj1lw91d8hkyjryrznr"; - }; - - disabled = luaOlder "5.1"; - propagatedBuildInputs = [ magick ]; - - meta = { - homepage = "https://github.com/3rd/image.nvim"; - description = "🖼️ Bringing images to Neovim."; - maintainers = with lib.maintainers; [ teto ]; - license.fullName = "MIT"; - }; - } - ) { }; - inspect = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/lua-modules/image-nvim/default.nix b/pkgs/development/lua-modules/image-nvim/default.nix new file mode 100644 index 000000000000..bd7abb627618 --- /dev/null +++ b/pkgs/development/lua-modules/image-nvim/default.nix @@ -0,0 +1,35 @@ +{ + buildLuarocksPackage, + fetchFromGitHub, + lib, + lua, + luaOlder, + luajitPackages, +}: +buildLuarocksPackage rec { + pname = "image.nvim"; + version = "1.4.0"; + + disabled = luaOlder "5.1"; + knownRockspec = "image.nvim-scm-1.rockspec"; + rockspecVersion = "scm-1"; + + src = fetchFromGitHub { + owner = "3rd"; + repo = "image.nvim"; + tag = "v${version}"; + hash = "sha256-EaDeY8aP41xHTw5epqYjaBqPYs6Z2DABzSaVOnG6D6I="; + }; + + propagatedBuildInputs = [ + lua + luajitPackages.magick + ]; + + meta = { + homepage = "https://github.com/3rd/image.nvim"; + description = "🖼️ Bringing images to Neovim."; + maintainers = with lib.maintainers; [ teto ]; + license.fullName = "MIT"; + }; +} diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 3c3c5ef0677c..fd95c001628a 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -35,7 +35,6 @@ libxcrypt, libyaml, lua-language-server, - luajitPackages, mariadb, mpfr, neovim-unwrapped, @@ -251,13 +250,6 @@ in ''; }; - image-nvim = prev.image-nvim.overrideAttrs { - propagatedBuildInputs = [ - lua - luajitPackages.magick - ]; - }; - ldbus = prev.ldbus.overrideAttrs (old: { luarocksConfig = old.luarocksConfig // { variables = { diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e2a42938108b..fc17bc35f2bd 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -110,6 +110,8 @@ rec { } ) { }; + image-nvim = callPackage ../development/lua-modules/image-nvim { }; + lua-pam = callPackage ( { fetchFromGitHub, From 83987d8e82c1bbd4d628cb48b365adc830924ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jan 2026 18:42:00 +0100 Subject: [PATCH 3/4] luaPackages.image-nvim: adopt on maintainer request --- pkgs/development/lua-modules/image-nvim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lua-modules/image-nvim/default.nix b/pkgs/development/lua-modules/image-nvim/default.nix index bd7abb627618..4f5b0839cef1 100644 --- a/pkgs/development/lua-modules/image-nvim/default.nix +++ b/pkgs/development/lua-modules/image-nvim/default.nix @@ -29,7 +29,7 @@ buildLuarocksPackage rec { meta = { homepage = "https://github.com/3rd/image.nvim"; description = "🖼️ Bringing images to Neovim."; - maintainers = with lib.maintainers; [ teto ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; license.fullName = "MIT"; }; } From 6fda86789fdf1ea216fab0a80cb2e6f3f9769967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Jan 2026 18:53:43 +0100 Subject: [PATCH 4/4] luaPackages.readline: move out of overrides --- pkgs/development/lua-modules/overrides.nix | 47 ------------------- .../lua-modules/readline/default.nix | 45 ++++++++++++++++++ pkgs/top-level/lua-packages.nix | 2 + 3 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 pkgs/development/lua-modules/readline/default.nix diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index fd95c001628a..65901e802f4f 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -937,53 +937,6 @@ in ''; }; - readline = final.callPackage ( - { - buildLuarocksPackage, - fetchurl, - luaAtLeast, - luaOlder, - luaposix, - }: - # upstream broken, can't be generated, so moved out from the generated set - buildLuarocksPackage { - pname = "readline"; - version = "3.2-0"; - knownRockspec = - (fetchurl { - url = "mirror://luarocks/readline-3.2-0.rockspec"; - sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24"; - }).outPath; - src = fetchurl { - # the rockspec url doesn't work because 'www.' is not covered by the certificate so - # I manually removed the 'www' prefix here - url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz"; - sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; - }; - - luarocksConfig.variables = rec { - READLINE_INCDIR = "${readline.dev}/include"; - HISTORY_INCDIR = READLINE_INCDIR; - }; - unpackCmd = '' - unzip "$curSrc" - tar xf *.tar.gz - ''; - - propagatedBuildInputs = [ - luaposix - readline.out - ]; - - meta = { - homepage = "https://pjb.com.au/comp/lua/readline.html"; - description = "Interface to the readline library"; - license.fullName = "MIT/X11"; - broken = (luaOlder "5.1") || (luaAtLeast "5.5"); - }; - } - ) { }; - rocks-dev-nvim = prev.rocks-dev-nvim.overrideAttrs { # E5113: Error while calling lua chunk [...] pl.path requires LuaFileSystem diff --git a/pkgs/development/lua-modules/readline/default.nix b/pkgs/development/lua-modules/readline/default.nix new file mode 100644 index 000000000000..ef2a04267fe2 --- /dev/null +++ b/pkgs/development/lua-modules/readline/default.nix @@ -0,0 +1,45 @@ +{ + buildLuarocksPackage, + fetchurl, + luaAtLeast, + luaOlder, + luaposix, + readline, +}: +# upstream broken, can't be generated, so moved out from the generated set +buildLuarocksPackage { + pname = "readline"; + version = "3.2-0"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/readline-3.2-0.rockspec"; + sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24"; + }).outPath; + src = fetchurl { + # the rockspec url doesn't work because 'www.' is not covered by the certificate so + # I manually removed the 'www' prefix here + url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz"; + sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; + }; + + luarocksConfig.variables = rec { + READLINE_INCDIR = "${readline.dev}/include"; + HISTORY_INCDIR = READLINE_INCDIR; + }; + unpackCmd = '' + unzip "$curSrc" + tar xf *.tar.gz + ''; + + propagatedBuildInputs = [ + luaposix + readline.out + ]; + + meta = { + homepage = "https://pjb.com.au/comp/lua/readline.html"; + description = "Interface to the readline library"; + license.fullName = "MIT/X11"; + broken = (luaOlder "5.1") || (luaAtLeast "5.5"); + }; +} diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index fc17bc35f2bd..ce44a1a21147 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -253,6 +253,8 @@ rec { inherit (pkgs) zenity; }; + readline = callPackage ../development/lua-modules/readline { inherit (pkgs) readline; }; + vicious = callPackage ( { fetchFromGitHub }: stdenv.mkDerivation rec {