diff options
| author | hhoeflin <hhoeflin@gmail.com> | 2020-10-13 20:18:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 13:18:08 -0500 |
| commit | 74a30bc6240181522a413776811fe8d4f5e063c4 (patch) | |
| tree | fe71a3fcba3e5297cb0db286ca780de606115950 | |
| parent | b84812256dae57d4bccbe46d7f7956585f57c0d6 (diff) | |
| download | spack-74a30bc6240181522a413776811fe8d4f5e063c4.tar.gz spack-74a30bc6240181522a413776811fe8d4f5e063c4.tar.bz2 spack-74a30bc6240181522a413776811fe8d4f5e063c4.tar.xz spack-74a30bc6240181522a413776811fe8d4f5e063c4.zip | |
Update neovim build and libvterm (#19015)
* Fixed wrong link to version 0.0.0 and add hash for version 0.1.4
* Fix failing build for neovim@master and neovim@stable and add hash for version 0.4.0
* Fix flake8 issues
* Removed unnecessary newline
* Depedency conditions restriction to neovim >= 0.2.0 as previous versions fail to compile
* Removed build dependency on git
* Removed master from all conditions
| -rw-r--r-- | var/spack/repos/builtin/packages/libvterm/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/neovim/package.py | 20 |
2 files changed, 13 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/libvterm/package.py b/var/spack/repos/builtin/packages/libvterm/package.py index 7bed885b63..6697ceeeb7 100644 --- a/var/spack/repos/builtin/packages/libvterm/package.py +++ b/var/spack/repos/builtin/packages/libvterm/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * @@ -11,8 +12,9 @@ class Libvterm(Package): homepage = "http://www.leonerd.org.uk/code/libvterm/" url = "http://www.leonerd.org.uk/code/libvterm/libvterm-0.1.3.tar.gz" + version('0.1.4', sha256='bc70349e95559c667672fc8c55b9527d9db9ada0fb80a3beda533418d782d3dd') version('0.1.3', sha256='e41724466a4658e0f095e8fc5aeae26026c0726dce98ee71d6920d06f7d78e2b') - version('0.0.0', sha256='6344eca01c02e2270348b79e033c1e0957028dbcd76bc784e8106bea9ec3029d', url='http://www.leonerd.org.uk/code/libvterm/libvterm-0+bzr728.tar.gz') + version('0.0.0', sha256='6344eca01c02e2270348b79e033c1e0957028dbcd76bc784e8106bea9ec3029d', url='http://www.leonerd.org.uk/code/libvterm/libvterm-0+bzr726.tar.gz') depends_on('libtool', type='build') diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index d30d2181de..c920ae114b 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -3,7 +3,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - from spack import * @@ -16,6 +15,7 @@ class Neovim(CMakePackage): version('master', branch='master') version('stable', tag='stable') + version('0.4.4', sha256='2f76aac59363677f37592e853ab2c06151cca8830d4b3fe4675b4a52d41fc42c') version('0.4.3', sha256='91a0b5d32204a821bf414690e6b48cf69224d1961d37158c2b383f6a6cf854d2') version('0.3.4', sha256='a641108bdebfaf319844ed46b1bf35d6f7c30ef5aeadeb29ba06e19c3274bc0e') version('0.3.1', sha256='bc5e392d4c076407906ccecbc283e1a44b7832c2f486cad81aa04cc29973ad22') @@ -27,24 +27,24 @@ class Neovim(CMakePackage): depends_on('cmake@3.0:', type='build') depends_on('pkgconfig', type='build') depends_on('gettext', type=('build', 'link')) - depends_on('lua@5.1:5.2', 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:') + 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:') - depends_on('libvterm@0.0', type='link', when='@:0.3') - depends_on('libvterm@0.1:', type='link', when='@0.4:') + 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:') + 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:') + 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:') + depends_on('libluv@1.30.0:', type='link', when='@0.4:,stable') def cmake_args(self): return ['-DPREFER_LUA=ON'] |