mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 23:20:55 +00:00
Code Issues Wiki Activity

Merge pull request #132004 from teto/luarocks-nix-bump

Browse source 
Luarocks nix bump
This commit is contained in:
Matthieu Coudron 2021-07-30 11:17:43 +02:00 committed by GitHub
parent ab776c4158 a2a2bb32fb
commit bed52081e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
maintainers/scripts/luarocks-packages.csv
View file

@ -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,,,,,

1 # nix name luarocks name server version luaversion maintainers
78 moonscript arobyn
79 nvim-client
80 penlight
81 plenary.nvim lua5_1
82 rapidjson
83 readline
84 say
85 std__debug std-_debug std._debug
86 std_normalize std.normalize
87 stdlib vyp
88 vstruct

6
maintainers/scripts/update-luarocks-packages
View file

@ -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

30
pkgs/development/lua-modules/generated-packages.nix
View file

@ -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";

4
pkgs/development/tools/misc/luarocks/luarocks-nix.nix
View file

@ -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=";
};
})