From 4eff3206a03abf634d8ed86340c4c5c14d980868 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Fri, 29 May 2026 19:12:45 +0200 Subject: [PATCH] luaPackages.vicious: build with luarocks --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 30 ++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 13 +++++++ pkgs/top-level/lua-packages.nix | 36 ------------------- 4 files changed, 44 insertions(+), 36 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 19a5a74f9e07..51583b8e2b6f 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -176,6 +176,7 @@ tree-sitter-norg-meta,,,,,, tree-sitter-orgmode,,,,,5.1, utf8,,,,,, tree-sitter-teal,,,,,, +vicious,,,,,, vstruct,,,,,, vusted,,,,,, xml2lua,,,,,,teto diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index fbbeb8a2d405..0291e2740366 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -6357,6 +6357,36 @@ final: prev: { } ) { }; + vicious = callPackage ( + { + buildLuarocksPackage, + fetchurl, + fetchzip, + luaOlder, + }: + buildLuarocksPackage { + pname = "vicious"; + version = "2.7.1-3"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/vicious-2.7.1-4.rockspec"; + sha256 = "1yvc9mbalsyrqysxkc1lf92ki5gzizn79y2azyavmgjwljif6lfi"; + }).outPath; + src = fetchzip { + url = "https://github.com/vicious-widgets/vicious/archive/refs/tags/v2.7.1.zip"; + sha256 = "0bfj3bc1gmbwwvpwkmqp658iwrwdifc78hzwwy1qpn7rbmarg2qv"; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://vicious.rtfd.io"; + license = lib.licenses.gpl2Plus; + description = "Modular widget library for the \"awesome\" window manager"; + }; + } + ) { }; + vstruct = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index c8d4f7c39424..aa47a9ec9a49 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1300,6 +1300,19 @@ in ''; }; + vicious = prev.vicious.overrideAttrs (old: { + meta = (old.meta or { }) // { + changelog = "https://github.com/vicious-widgets/vicious/blob/v${old.version}/CHANGELOG.rst"; + maintainers = with lib.maintainers; [ + makefu + mic92 + mrcjkb + McSinyx + ]; + platforms = lib.platforms.linux; + }; + }); + vstruct = prev.vstruct.overrideAttrs (old: { meta = (old.meta or { }) // { broken = luaOlder "5.1" || luaAtLeast "5.4"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index cf7245ead857..aed979e7a5d5 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -257,40 +257,4 @@ rec { }; readline = callPackage ../development/lua-modules/readline { inherit (pkgs) readline; }; - - vicious = callPackage ( - { fetchFromGitHub }: - stdenv.mkDerivation rec { - pname = "vicious"; - version = "2.7.1"; - - src = fetchFromGitHub { - owner = "vicious-widgets"; - repo = "vicious"; - rev = "v${version}"; - sha256 = "sha256-G4uXVV352IuD5/xDdJiLjWceUTEX18nv5nzVF9ga0i0="; - }; - - buildInputs = [ lua ]; - - installPhase = '' - mkdir -p $out/lib/lua/${lua.luaversion}/ - cp -r . $out/lib/lua/${lua.luaversion}/vicious/ - printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua - ''; - - meta = { - description = "Modular widget library for the awesome window manager"; - homepage = "https://vicious.readthedocs.io"; - changelog = "https://vicious.readthedocs.io/changelog.html"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - makefu - mic92 - McSinyx - ]; - platforms = lib.platforms.linux; - }; - } - ) { }; }