From f7d136fea75c645e046f70890b5aff6e3a88498e Mon Sep 17 00:00:00 2001 From: Jakob Beckmann Date: Tue, 30 Apr 2024 21:05:45 +0200 Subject: [PATCH] chore: add luajitPackages.sofa --- maintainers/maintainer-list.nix | 11 +++++ maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 44 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 12 +++++ 4 files changed, 68 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 835ec2814e89..be7941a57f06 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7912,6 +7912,17 @@ githubId = 11909469; name = "Fabian Geiselhart"; }; + f4z3r = { + email = "f4z3r-github@pm.me"; + name = "Jakob Beckmann"; + github = "f4z3r"; + githubId = 32326425; + keys = [ + { + fingerprint = "358A 6251 E2ED EDC1 9717 14A7 96A8 BA6E C871 2183"; + } + ]; + }; fab = { email = "mail@fabian-affolter.ch"; matrix = "@fabaff:matrix.org"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 2b9c13e5071d..457505f8f0de 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -143,6 +143,7 @@ rtp.nvim,,,,,,mrcjkb rustaceanvim,,,,,,mrcjkb say,,,,,, serpent,,,,,,lockejan +sofa,,,,,,f4z3r sqlite,,,,,, std._debug,,,,,, std.normalize,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d9b50a11d799..c6f870c04031 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -4706,6 +4706,50 @@ final: prev: { } ) { }; + sofa = callPackage ( + { + buildLuarocksPackage, + fetchFromGitHub, + fetchurl, + luaAtLeast, + luaOlder, + argparse, + compat53, + luatext, + lyaml, + }: + buildLuarocksPackage { + pname = "sofa"; + version = "0.7.0-0"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/sofa-0.7.0-0.rockspec"; + sha256 = "0hkdm4h8yjh5zw9116cclff8q6br4yyhb7f7y7lv4ydrkxfl1lzq"; + }).outPath; + src = fetchFromGitHub { + owner = "f4z3r"; + repo = "sofa"; + rev = "v0.7.0"; + hash = "sha256-aoFmzhzWuBTbDnSWDGLbkhORlrtvVOtfIV7oq2xc0pQ="; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + propagatedBuildInputs = [ + argparse + compat53 + luatext + lyaml + ]; + + meta = { + homepage = "https://github.com/f4z3r/sofa"; + description = "A command execution engine powered by rofi."; + maintainers = with lib.maintainers; [ f4z3r ]; + license.fullName = "MIT "; + }; + } + ) { }; + sqlite = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 94136d9dfc52..54ce81ed2ba4 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -977,6 +977,18 @@ in ''; }); + sofa = prev.sofa.overrideAttrs (oa: { + nativeBuildInputs = oa.nativeBuildInputs ++ [ + installShellFiles + ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd sofa \ + --bash <($out/bin/sofa --completion bash) \ + --fish <($out/bin/sofa --completion fish) \ + --zsh <($out/bin/sofa --completion zsh) + ''; + }); + sqlite = prev.sqlite.overrideAttrs (drv: { doCheck = stdenv.hostPlatform.isLinux; nativeCheckInputs = [