zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

neovim: be more specific with lua dependencies (#42401)

Browse Source
This commit is contained in:
Alberto Invernizzi
2024-02-01 14:11:49 +01:00
committed by GitHub
parent 023a6be67d
commit 74bd8a9cf7
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/lua-ffi/package.py
View File

@@ -23,4 +23,4 @@ class LuaFfi(LuaPackage):
commit="a1cb731b08c91643b0665935eb5622b3d621211b",
)
depends_on("lua@5.1:5.1.99")
depends_on("lua-lang@5.1")

2
var/spack/repos/builtin/packages/lua-lpeg/package.py
View File

@@ -26,4 +26,4 @@ class LuaLpeg(LuaPackage):
expand=False,
)
depends_on("lua@:5.1.9", when="@:0.12.1^lua")
depends_on("lua-lang@:5.1.9", when="@:0.12.1 ^[virtuals=lua-lang] lua")

2
var/spack/repos/builtin/packages/lua-luaposix/package.py
View File

@@ -23,4 +23,4 @@ class LuaLuaposix(LuaPackage):
version("33.4.0", sha256="e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21")
version("33.2.1", sha256="4fb34dfea67f4cf3194cdecc6614c9aea67edc3c4093d34137669ea869c358e1")
depends_on("lua-bit32", when="^lua-lang@5.1:5.1.99")
depends_on("lua-bit32", when="^lua-lang@5.1")

7
var/spack/repos/builtin/packages/neovim/package.py
View File

@@ -84,13 +84,12 @@ class Neovim(CMakePackage):
)
# 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")
depends_on("lua-lang@5.1", 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", "run"), when="^lua")
depends_on("lua-ffi", when="^[virtuals=lua-lang] lua", type=("link", "run"))
depends_on("lua-bitlib", when="^[virtuals=lua-lang] lua", type=("link", "run"))
# base dependencies
depends_on("cmake@3.0:", type="build")