diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2023-03-17 01:41:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-17 01:41:00 +0100 |
| commit | accdb0104eb607a66a9908f24fbd13552d058765 (patch) | |
| tree | 4a7104ddad6963cff40a538201c1a7927ff54daf | |
| parent | 995196c614d14fa5947be4024fe8ea20c8a28973 (diff) | |
| parent | a5cf62e81c2c6551a42cb4365775d272fddd53bf (diff) | |
| download | rneovim-accdb0104eb607a66a9908f24fbd13552d058765.tar.gz rneovim-accdb0104eb607a66a9908f24fbd13552d058765.tar.bz2 rneovim-accdb0104eb607a66a9908f24fbd13552d058765.zip | |
Merge pull request #22680 from clason/bump-luarocks
build(deps): bump luarocks and bundled rocks
* Luarocks: v3.8.0 -> v3.9.2
* coxpcall: 1.16.0-1 -> 1.17.0-1
* luacheck: 0.23.0-1 -> 1.1.0-1
* mpack: 1.0.8-0 -> 1.0.10-0
| -rw-r--r-- | .luacheckrc | 2 | ||||
| -rw-r--r-- | cmake.deps/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake.deps/cmake/BuildLuarocks.cmake | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/.luacheckrc b/.luacheckrc index d1aca1cfd6..e804d1c822 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -19,8 +19,10 @@ cache = true ignore = { "631", -- max_line_length "212/_.*", -- unused argument, for vars with "_" prefix + "214", -- used variable with unused hint ("_" prefix) "121", -- setting read-only global variable 'vim' "122", -- setting read-only field of global variable 'vim' + "581", -- negation of a relational operator- operator can be flipped (not for tables) } -- Global objects defined by the C code diff --git a/cmake.deps/CMakeLists.txt b/cmake.deps/CMakeLists.txt index c188df0bea..b1a843ddc8 100644 --- a/cmake.deps/CMakeLists.txt +++ b/cmake.deps/CMakeLists.txt @@ -144,8 +144,8 @@ set(LUAJIT_SHA256 67c88399b901a22e9a236f4b77e6fe39af00f6b7144ce9dd6f51141d921f10 set(LUA_URL https://www.lua.org/ftp/lua-5.1.5.tar.gz) set(LUA_SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333) -set(LUAROCKS_URL https://github.com/luarocks/luarocks/archive/v3.8.0.tar.gz) -set(LUAROCKS_SHA256 ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7) +set(LUAROCKS_URL https://github.com/luarocks/luarocks/archive/v3.9.2.tar.gz) +set(LUAROCKS_SHA256 a0b36cd68586cd79966d0106bb2e5a4f5523327867995fd66bee4237062b3e3b) set(UNIBILIUM_URL https://github.com/neovim/unibilium/archive/d72c3598e7ac5d1ebf86ee268b8b4ed95c0fa628.tar.gz) set(UNIBILIUM_SHA256 9c4747c862ab5e3076dcf8fa8f0ea7a6b50f20ec5905618b9536655596797487) diff --git a/cmake.deps/cmake/BuildLuarocks.cmake b/cmake.deps/cmake/BuildLuarocks.cmake index 1f1bb94741..6e77fd7935 100644 --- a/cmake.deps/cmake/BuildLuarocks.cmake +++ b/cmake.deps/cmake/BuildLuarocks.cmake @@ -100,7 +100,7 @@ set(ROCKS_DIR ${DEPS_LIB_DIR}/luarocks/rocks-${LUA_VERSION}) # mpack add_custom_command(OUTPUT ${ROCKS_DIR}/mpack - COMMAND ${LUAROCKS_BINARY} build mpack 1.0.8-0 ${LUAROCKS_BUILDARGS} + COMMAND ${LUAROCKS_BINARY} build mpack 1.0.10-0 ${LUAROCKS_BUILDARGS} DEPENDS luarocks) add_custom_target(mpack ALL DEPENDS ${ROCKS_DIR}/mpack) @@ -140,14 +140,14 @@ if(USE_BUNDLED_BUSTED) # luacheck add_custom_command(OUTPUT ${LUACHECK_EXE} - COMMAND ${LUAROCKS_BINARY} build luacheck 0.23.0-1 ${LUAROCKS_BUILDARGS} + COMMAND ${LUAROCKS_BINARY} build luacheck 1.1.0-1 ${LUAROCKS_BUILDARGS} DEPENDS busted) add_custom_target(luacheck ALL DEPENDS ${LUACHECK_EXE}) if (USE_BUNDLED_LUA OR NOT USE_BUNDLED_LUAJIT) # coxpcall add_custom_command(OUTPUT ${ROCKS_DIR}/coxpcall - COMMAND ${LUAROCKS_BINARY} build coxpcall 1.16.0-1 ${LUAROCKS_BUILDARGS} + COMMAND ${LUAROCKS_BINARY} build coxpcall 1.17.0-1 ${LUAROCKS_BUILDARGS} DEPENDS luarocks) add_custom_target(coxpcall ALL DEPENDS ${ROCKS_DIR}/coxpcall) endif() |