From 05dcfe829ed5d71764ee7bd2465edb620e4938d5 Mon Sep 17 00:00:00 2001 From: Eisuke Kawashima Date: Thu, 7 May 2020 17:29:27 +0900 Subject: neovim: added v0.4.3 (#16410) Use neovim's vendored dependencies for 0.4 and later --- var/spack/repos/builtin/packages/neovim/package.py | 53 +++++++++++++++------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index 8a574f58e9..a74d4816a8 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -4,15 +4,20 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import os from spack import * class Neovim(CMakePackage): - """NeoVim: the future of vim""" + """Neovim: Vim-fork focused on extensibility and usability""" - homepage = "http://neovim.io" - url = "https://github.com/neovim/neovim/archive/v0.3.4.tar.gz" + homepage = "https://neovim.io" + git = "https://github.com/neovim/neovim.git" + url = "https://github.com/neovim/neovim/archive/v0.4.3.tar.gz" + version('master', branch='master') + version('stable', tag='stable') + version('0.4.3', sha256='91a0b5d32204a821bf414690e6b48cf69224d1961d37158c2b383f6a6cf854d2') version('0.3.4', sha256='a641108bdebfaf319844ed46b1bf35d6f7c30ef5aeadeb29ba06e19c3274bc0e') version('0.3.1', sha256='bc5e392d4c076407906ccecbc283e1a44b7832c2f486cad81aa04cc29973ad22') version('0.3.0', sha256='f7acb61b16d3f521907d99c486b7a9f1e505e8b2a18c9ef69a6d7f18f29f74b8') @@ -20,21 +25,37 @@ class Neovim(CMakePackage): version('0.2.1', sha256='9e2c068a8994c9023a5f84cde9eb7188d3c85996a7e42e611e3cd0996e345dd3') version('0.2.0', sha256='72e263f9d23fe60403d53a52d4c95026b0be428c1b9c02b80ab55166ea3f62b5') - depends_on('lua@5.1:5.2') - depends_on('lua-lpeg') - depends_on('lua-mpack') - depends_on('lua-bitlib') - depends_on('libuv') - depends_on('jemalloc') - depends_on('libtermkey') - depends_on('libvterm') - depends_on('unibilium') - depends_on('msgpack-c') - depends_on('gperf') + depends_on('cmake@3.0:', type='build') + + depends_on('lua@5.1:5.2', when='@:0.4.0') + depends_on('lua-lpeg', when='@:0.4.0') + depends_on('lua-mpack', when='@:0.4.0') + depends_on('lua-bitlib', when='@:0.4.0') + depends_on('libuv', when='@:0.4.0') + depends_on('jemalloc', when='@:0.4.0') + depends_on('libtermkey', when='@:0.4.0') + depends_on('libvterm', when='@:0.4.0') + depends_on('unibilium', when='@:0.4.0') + depends_on('msgpack-c', when='@:0.4.0') + depends_on('gperf', when='@:0.4.0') + + @run_before('cmake') + def build_dependencies(self): + if self.version < Version('0.4.0'): + return + + deps_build_dir = '.deps' + options = [ + '-G', self.generator, + os.path.join(os.path.abspath(self.root_cmakelists_dir), + 'third-party'), + ] + with working_dir(deps_build_dir, create=True): + cmake(*options) + make() def cmake_args(self): args = [] - if self.version >= Version('0.2.1'): + if Version('0.2.1') <= self.version < Version('0.4.0'): args = ['-DPREFER_LUA=ON'] - return args -- cgit v1.2.3-70-g09d2