From a12c6382246e82152a2d6e66ddc1f2c97c331c24 Mon Sep 17 00:00:00 2001 From: Tom Scogland Date: Wed, 11 May 2022 04:01:35 -0700 Subject: Neovim luajit (#28855) Upstream neovim builds with luajit-openresty or luajit in almost all cases. To support the current usage, a user can specify that they want lua, but this will allow the use of the normal (faster, better tested and better maintained) setup. --- .../repos/builtin/packages/lua-ffi/package.py | 20 +++ var/spack/repos/builtin/packages/neovim/package.py | 165 ++++++++++++++++----- .../repos/builtin/packages/tree-sitter/package.py | 4 + 3 files changed, 148 insertions(+), 41 deletions(-) create mode 100644 var/spack/repos/builtin/packages/lua-ffi/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lua-ffi/package.py b/var/spack/repos/builtin/packages/lua-ffi/package.py new file mode 100644 index 0000000000..7ba6e72be1 --- /dev/null +++ b/var/spack/repos/builtin/packages/lua-ffi/package.py @@ -0,0 +1,20 @@ +# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class LuaFfi(LuaPackage): + """luajit FFI for interpreted lua""" + + homepage = "https://github.com/facebook/luaffifb/" + git = "https://github.com/facebook/luaffifb/" + url = "https://github.com/facebook/luaffifb/" + + maintainers = ['trws'] + + version('0.0.1.fakever', git="https://github.com/facebook/luaffifb/", commit='a1cb731b08c91643b0665935eb5622b3d621211b') + + depends_on('lua@5.1:5.1.99') diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index 5e8b4815cc..2e87dc98e9 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * +from spack.pkgkit import * class Neovim(CMakePackage): @@ -13,45 +13,128 @@ class Neovim(CMakePackage): git = "https://github.com/neovim/neovim.git" url = "https://github.com/neovim/neovim/archive/v0.4.3.tar.gz" - maintainers = ['albestro'] - - version('master', branch='master') - version('stable', tag='stable') - version('0.6.1', sha256='dd882c21a52e5999f656cae3f336b5fc702d52addd4d9b5cd3dc39cfff35e864') - version('0.6.0', sha256='2cfd600cfa5bb57564cc22ffbbbcb2c91531053fc3de992df33656614384fa4c') - version('0.5.1', sha256='aa449795e5cc69bdd2eeed7095f20b9c086c6ecfcde0ab62ab97a9d04243ec84') - version('0.5.0', sha256='6bcfa5192c9460c946e853dbd1a0baf659df5de184436144147711d1bceedeee') - version('0.4.4', sha256='2f76aac59363677f37592e853ab2c06151cca8830d4b3fe4675b4a52d41fc42c') - version('0.4.3', sha256='91a0b5d32204a821bf414690e6b48cf69224d1961d37158c2b383f6a6cf854d2') - version('0.3.4', sha256='a641108bdebfaf319844ed46b1bf35d6f7c30ef5aeadeb29ba06e19c3274bc0e') - version('0.3.1', sha256='bc5e392d4c076407906ccecbc283e1a44b7832c2f486cad81aa04cc29973ad22') - version('0.3.0', sha256='f7acb61b16d3f521907d99c486b7a9f1e505e8b2a18c9ef69a6d7f18f29f74b8') - version('0.2.2', sha256='a838ee07cc9a2ef8ade1b31a2a4f2d5e9339e244ade68e64556c1f4b40ccc5ed') - version('0.2.1', sha256='9e2c068a8994c9023a5f84cde9eb7188d3c85996a7e42e611e3cd0996e345dd3') - version('0.2.0', sha256='72e263f9d23fe60403d53a52d4c95026b0be428c1b9c02b80ab55166ea3f62b5') - - depends_on('cmake@3.0:', type='build') - depends_on('pkgconfig', type='build') - depends_on('gettext', type=('build', 'link')) - depends_on('lua@5.1.0:5.1.9', type=('build', 'link')) - depends_on('lua-lpeg', type='link') - depends_on('lua-mpack', type='link') - depends_on('lua-bitlib', type='link') - depends_on('libuv', type='link') - depends_on('libuv@1.28:', type='link', when='@0.4:,stable') - depends_on('jemalloc', type='link') - depends_on('libtermkey', type='link') - depends_on('libtermkey@0.18:', type='link', when='@0.3.4:,stable') - depends_on('libvterm@0.0.0', type='link', when='@0.2.0:0.3') - depends_on('libvterm@0.1:', type='link', when='@0.4:,stable') - depends_on('unibilium', type='link') - depends_on('unibilium@:1.2.0', type='link', when='@0.2.0') - depends_on('unibilium@2.0:', type='link', when='@0.4:,stable') - depends_on('msgpack-c', type='link') - depends_on('msgpack-c@1.0.0:', type='link', when='@0.4:,stable') - depends_on('gperf', type='link') - depends_on('libluv@1.30.0:', type='link', when='@0.4:,stable') - depends_on('tree-sitter', when='@0.5:') + maintainers = ["albestro", "trws"] + version("master", branch="master") + version("stable", tag="stable") + version( + '0.7.0', + sha256='792a9c55d5d5f4a5148d475847267df309d65fb20f05523f21c1319ea8a6c7df' + ) + version( + "0.6.1", + sha256="dd882c21a52e5999f656cae3f336b5fc702d52addd4d9b5cd3dc39cfff35e864", + ) + version( + "0.6.0", + sha256="2cfd600cfa5bb57564cc22ffbbbcb2c91531053fc3de992df33656614384fa4c", + ) + version( + "0.5.1", + sha256="aa449795e5cc69bdd2eeed7095f20b9c086c6ecfcde0ab62ab97a9d04243ec84", + ) + version( + "0.5.0", + sha256="6bcfa5192c9460c946e853dbd1a0baf659df5de184436144147711d1bceedeee", + deprecated=True, + ) + version( + "0.4.4", + sha256="2f76aac59363677f37592e853ab2c06151cca8830d4b3fe4675b4a52d41fc42c", + deprecated=True, + ) + version( + "0.4.3", + sha256="91a0b5d32204a821bf414690e6b48cf69224d1961d37158c2b383f6a6cf854d2", + deprecated=True, + ) + version( + "0.3.4", + sha256="a641108bdebfaf319844ed46b1bf35d6f7c30ef5aeadeb29ba06e19c3274bc0e", + deprecated=True, + ) + version( + "0.3.1", + sha256="bc5e392d4c076407906ccecbc283e1a44b7832c2f486cad81aa04cc29973ad22", + deprecated=True, + ) + version( + "0.3.0", + sha256="f7acb61b16d3f521907d99c486b7a9f1e505e8b2a18c9ef69a6d7f18f29f74b8", + deprecated=True, + ) + version( + "0.2.2", + sha256="a838ee07cc9a2ef8ade1b31a2a4f2d5e9339e244ade68e64556c1f4b40ccc5ed", + deprecated=True, + ) + version( + "0.2.1", + sha256="9e2c068a8994c9023a5f84cde9eb7188d3c85996a7e42e611e3cd0996e345dd3", + deprecated=True, + ) + version( + "0.2.0", + sha256="72e263f9d23fe60403d53a52d4c95026b0be428c1b9c02b80ab55166ea3f62b5", + deprecated=True, + ) + + variant( + "no_luajit", + default=False, + description="use lua rather than luajit as lua language provider", + ) + + # depend on virtual, lua-luajit-openresty preferred + depends_on("lua-lang") + depends_on("luajit", when="~no_luajit") + depends_on("lua@5.1:5.1.99", when="+no_luajit") + + # dependencies to allow regular lua to work + depends_on("lua-ffi", when="^lua", type=("link", "run")) + depends_on("lua-bitlib", type="link", when="^lua") + + # base dependencies + depends_on("cmake@3.0:", type="build") + depends_on("pkgconfig", type="build") + depends_on("gettext", type=("build", "link")) + depends_on("gperf", type="link") + depends_on("jemalloc", type="link", when="platform=linux") + depends_on("lua-lpeg", type="link") + depends_on("lua-mpack", type="link") + depends_on("libiconv", type="link") + depends_on("libtermkey", type="link") + depends_on("libuv", type="link") + depends_on("libluv", type="link") + depends_on("libvterm", type="link") + depends_on("msgpack-c", type="link") + depends_on("unibilium", type="link") + depends_on("unibilium@:1.2.0", type="link", when="@0.2.0") + + # versions + with when("@0.4:"): + depends_on("libuv@1.28:") + depends_on("libluv@1.30.0:") + depends_on("libtermkey@0.18:") + depends_on("libvterm@0.1:") + depends_on("unibilium@2.0:") + depends_on("msgpack-c@1.0.0:") + with when("@0.5:,stable,master"): + depends_on("libuv@1.42:") + depends_on("tree-sitter") + with when("@0.6:"): + depends_on("cmake@3.10:") + depends_on("gperf@3.1:") + depends_on("libiconv@1.15:") + depends_on("libtermkey@0.22:") + depends_on("libvterm@0.1.4:") + depends_on("msgpack-c@3.0.0:") + with when("@0.6:,master"): + depends_on("gettext@0.20.1:") + depends_on("libluv@1.43.0:") + depends_on("libuv@1.44.1:") + depends_on("tree-sitter@0.20.6:") + + @when("^lua") def cmake_args(self): - return ['-DPREFER_LUA=ON'] + return [self.define('PREFER_LUA', True)] diff --git a/var/spack/repos/builtin/packages/tree-sitter/package.py b/var/spack/repos/builtin/packages/tree-sitter/package.py index 036b9d382e..964a5d63d3 100644 --- a/var/spack/repos/builtin/packages/tree-sitter/package.py +++ b/var/spack/repos/builtin/packages/tree-sitter/package.py @@ -17,6 +17,10 @@ class TreeSitter(MakefilePackage): maintainers = ['albestro'] + version('0.20.6', sha256='4d37eaef8a402a385998ff9aca3e1043b4a3bba899bceeff27a7178e1165b9de') + version('0.20.4', sha256='979ad0b36eb90975baf0c65d155d106276cac08afb1c2fe0ad54d4b7d498ce39') + version('0.20.3', sha256='ab52fe93e0c658cff656b9d10d67cdd29084247052964eba13ed6f0e9fa3bd36') + version('0.20.2', sha256='2a0445f8172bbf83db005aedb4e893d394e2b7b33251badd3c94c2c5cc37c403') version('0.20.1', sha256='12a3f7206af3028dbe8a0de50d8ebd6d7010bf762db918acae76fc7585f1258d') def edit(self, spec, prefix): -- cgit v1.2.3-60-g2f50