From 2c072c2083badf093c93730f5bd79e0418dea5a3 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 18 Jun 2022 18:32:53 +0200 Subject: [PATCH] luaPackages.sqlite: init at v1.2.2-0 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 32 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 17 ++++++++++ 3 files changed, 50 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index e743675be505..c7b1e405ebba 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -86,6 +86,7 @@ plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, readline,,,,,, say,https://github.com/Olivine-Labs/say.git,,,,, +sqlite,,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, stdlib,,,,41.2.2,,vyp diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index f38b16e1a973..22570d3fbb4b 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2546,6 +2546,38 @@ buildLuarocksPackage { }; }) {}; +sqlite = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, luv +}: +buildLuarocksPackage { + pname = "sqlite"; + version = "v1.2.2-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/sqlite-v1.2.2-0.rockspec"; + sha256 = "0jxsl9lpxsbzc6s5bwmh27mglkqz1299lz68vfxayvailwl3xbxm"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/tami5/sqlite.lua.git", + "rev": "6c00ab414dc1b69621b145908c582b747f24b46e", + "date": "2022-06-17T15:57:13+03:00", + "path": "/nix/store/637s46bsvsxfnzmy6ygig3y0vqmf3r8p-sqlite.lua", + "sha256": "0ckifx6xxrannn9szacgiiqjsp4rswghxscdl3s411dhas8djj1m", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + propagatedBuildInputs = [ luv ]; + + meta = { + homepage = "https://github.com/tami5/sqlite.lua"; + description = "SQLite/LuaJIT binding and a highly opinionated wrapper for storing, retrieving, caching, and persisting [SQLite] databases"; + license.fullName = "MIT"; + }; +}) {}; + std-_debug = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, lua }: diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 507e1414189e..60fcf2ca1ca5 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -417,6 +417,23 @@ with prev; ''; }); + sqlite = prev.lib.overrideLuarocks prev.sqlite (drv: { + + doCheck = true; + checkInputs = [ final.plenary-nvim pkgs.neovim-unwrapped ]; + + # we override 'luarocks test' because otherwise neovim doesn't find/load the plenary plugin + checkPhase = '' + export LIBSQLITE="${pkgs.sqlite.out}/lib/libsqlite3.so" + export HOME="$TMPDIR"; + + nvim --headless -i NONE \ + -u test/minimal_init.vim --cmd "set rtp+=${pkgs.vimPlugins.plenary-nvim}" \ + -c "PlenaryBustedDirectory test/auto/ { minimal_init = './test/minimal_init.vim' }" + ''; + + }); + std-_debug = prev.std-_debug.overrideAttrs(oa: { # run make to generate lib/std/_debug/version.lua preConfigure = ''