diff options
| author | Alberto Invernizzi <9337627+albestro@users.noreply.github.com> | 2024-02-01 14:11:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-01 14:11:49 +0100 |
| commit | 74bd8a9cf7dd69743dc2b2780287fb3a968fc032 (patch) | |
| tree | 19b0523c3c6d2c4966a5dafce7f4e4c325ea7e06 /var | |
| parent | 023a6be67d4dc97fa275757a4f212cecf43b4d24 (diff) | |
| download | spack-74bd8a9cf7dd69743dc2b2780287fb3a968fc032.tar.gz spack-74bd8a9cf7dd69743dc2b2780287fb3a968fc032.tar.bz2 spack-74bd8a9cf7dd69743dc2b2780287fb3a968fc032.tar.xz spack-74bd8a9cf7dd69743dc2b2780287fb3a968fc032.zip | |
neovim: be more specific with lua dependencies (#42401)
Diffstat (limited to 'var')
4 files changed, 6 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/lua-ffi/package.py b/var/spack/repos/builtin/packages/lua-ffi/package.py index cecf7a11d5..d96c73dd4d 100644 --- a/var/spack/repos/builtin/packages/lua-ffi/package.py +++ b/var/spack/repos/builtin/packages/lua-ffi/package.py @@ -23,4 +23,4 @@ class LuaFfi(LuaPackage): commit="a1cb731b08c91643b0665935eb5622b3d621211b", ) - depends_on("lua@5.1:5.1.99") + depends_on("lua-lang@5.1") diff --git a/var/spack/repos/builtin/packages/lua-lpeg/package.py b/var/spack/repos/builtin/packages/lua-lpeg/package.py index 0e00475866..6983f13b98 100644 --- a/var/spack/repos/builtin/packages/lua-lpeg/package.py +++ b/var/spack/repos/builtin/packages/lua-lpeg/package.py @@ -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") diff --git a/var/spack/repos/builtin/packages/lua-luaposix/package.py b/var/spack/repos/builtin/packages/lua-luaposix/package.py index 1f2cc52f92..cddba50a2b 100644 --- a/var/spack/repos/builtin/packages/lua-luaposix/package.py +++ b/var/spack/repos/builtin/packages/lua-luaposix/package.py @@ -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") diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index 3f9bbfc00d..7924b894fa 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -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") |