From 594a143e0e5dafbce1a2f400e233388d4461b7ae Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 28 Jul 2021 02:28:25 +0200 Subject: [PATCH 1/3] lua: normalize package name --- maintainers/scripts/update-luarocks-packages | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index da4d224bd33..c7180083da2 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -89,6 +89,10 @@ function convert_pkg() { echo "Skipping comment ${*}" >&2 return fi + + # Normalize package name + nix_pkg_name_normalized=$(sed 's/\./-/' <(echo "$nix_pkg_name")) + if [ -z "$lua_pkg_name" ]; then echo "Using nix_name as lua_pkg_name for '$nix_pkg_name'" >&2 lua_pkg_name="$nix_pkg_name" @@ -111,7 +115,7 @@ function convert_pkg() { luarocks_args+=("$pkg_version") fi echo "Running 'luarocks ${luarocks_args[*]}'" >&2 - if drv="$nix_pkg_name = $(luarocks "${luarocks_args[@]}")"; then + if drv="$nix_pkg_name_normalized = $(luarocks "${luarocks_args[@]}")"; then echo "$drv" else echo "Failed to convert $nix_pkg_name" >&2 From 9a70fbc593389b35d5e83fe489d857cf3756632a Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 28 Jul 2021 02:54:42 +0200 Subject: [PATCH 2/3] luarocks-nix: nix_v3.5.0 -> nix_v3.5.0-1 that changes some rules as how to normalize nix names --- pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 30e02a3623f..6e55292722f 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -5,7 +5,7 @@ luarocks.overrideAttrs(old: { src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "v3.5.0_nix"; - sha256 = "sha256-Ea3PVkCaUPO/mvVZtHtD1G9T/Yom28M9oN6duY4ovHk="; + rev = "nix_v3.5.0-1"; + sha256 = "sha256-jcgshxAuuc8QizpYL/2K3PKYWiKsnF/8BJAUaryvEvQ="; }; }) From a2a2bb32fb3cb254a10b88570366e221cb49fe37 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 30 Jul 2021 00:05:53 +0200 Subject: [PATCH 3/3] lua51Packages.plenary-nvim: init there is no version yet --- maintainers/scripts/luarocks-packages.csv | 3 +- .../lua-modules/generated-packages.nix | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a387430245a..b092a58b2d1 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -78,10 +78,11 @@ mpack,,,,, moonscript,,,,,arobyn nvim-client,,,,, penlight,,,,, +plenary.nvim,,,,lua5_1, rapidjson,,,,, readline,,,,, say,,,,, -std__debug,std._debug,,,, +std-_debug,std._debug,,,, std_normalize,std.normalize,,,, stdlib,,,,,vyp vstruct,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 07a91f96ff3..5cd7a7c8fe7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1479,6 +1479,36 @@ penlight = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; +plenary-nvim = buildLuarocksPackage { + pname = "plenary.nvim"; + version = "scm-1"; + + knownRockspec = (fetchurl { + url = "mirror://luarocks/plenary.nvim-scm-1.rockspec"; + sha256 = "1cp2dzf3010q85h300aa7zphyz75qn67lrwf9v6b0p534nzvmash"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/nvim-lua/plenary.nvim", + "rev": "8bae2c1fadc9ed5bfcfb5ecbd0c0c4d7d40cb974", + "date": "2021-07-12T11:07:18-04:00", + "path": "/nix/store/djp9yacizsxs9hiz786fb900fri0m2l8-plenary.nvim", + "sha256": "1axvjv6n77afkjqk914dpc020kxd7mig6m5sr916k1n1q35jc4ny", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua luassert ]; + + meta = with lib; { + homepage = "http://github.com/nvim-lua/plenary.nvim"; + description = "lua functions you don't want to write "; + license.fullName = "MIT/X11"; + }; +}; rapidjson = buildLuarocksPackage { pname = "rapidjson"; version = "0.6.1-1";