Merge pull request #270032 from marsam/update-groonga

groonga: 12.0.7 -> 13.0.9

authored by Mario Rodas and committed by GitHub b4d76b8d deb11327

+78 -30
+42 -30
pkgs/servers/search/groonga/default.nix
··· 1 - { lib, stdenv, fetchurl, autoreconfHook, mecab, kytea, libedit, pkg-config, libxcrypt 2 , suggestSupport ? false, zeromq, libevent, msgpack, openssl 3 , lz4Support ? false, lz4 4 , zlibSupport ? true, zlib 5 }: 6 7 - stdenv.mkDerivation rec { 8 - 9 pname = "groonga"; 10 - version = "12.0.7"; 11 12 src = fetchurl { 13 - url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; 14 - sha256 = "sha256-Eaei4Zi0Rg9zu7DInLAcaRo8Fyu2mqBblcYNRaS46c8="; 15 }; 16 17 - preConfigure = '' 18 - # To avoid problems due to libc++abi 11 using `#include <version>`. 19 - rm version 20 - ''; 21 22 - buildInputs = with lib; 23 - [ mecab kytea libedit openssl libxcrypt ] 24 - ++ optional lz4Support lz4 25 - ++ optional zlibSupport zlib 26 - ++ optionals suggestSupport [ zeromq libevent msgpack ]; 27 28 - nativeBuildInputs = [ autoreconfHook pkg-config ]; 29 30 - configureFlags = with lib; 31 - optional zlibSupport "--with-zlib" 32 - ++ optional lz4Support "--with-lz4"; 33 34 - env = lib.optionalAttrs stdenv.cc.isClang { 35 - # Prevent warning about using a GNU extension from being promoted to an error. 36 - NIX_CFLAGS_COMPILE = "-Wno-error=gnu-folding-constant"; 37 }; 38 - 39 - doInstallCheck = true; 40 - installCheckPhase = "$out/bin/groonga --version"; 41 42 meta = with lib; { 43 - homepage = "https://groonga.org/"; 44 description = "An open-source fulltext search engine and column store"; 45 - license = licenses.lgpl21; 46 maintainers = [ maintainers.ericsagnes ]; 47 - platforms = platforms.unix; 48 longDescription = '' 49 Groonga is an open-source fulltext search engine and column store. 50 It lets you write high-performance applications that requires fulltext search. 51 ''; 52 }; 53 - 54 - }
··· 1 + { lib, stdenv, cmake, fetchurl, kytea, mecab, pkg-config, rapidjson, testers, xxHash, zstd, postgresqlPackages 2 , suggestSupport ? false, zeromq, libevent, msgpack, openssl 3 , lz4Support ? false, lz4 4 , zlibSupport ? true, zlib 5 }: 6 7 + stdenv.mkDerivation (finalAttrs: { 8 pname = "groonga"; 9 + version = "13.0.9"; 10 11 src = fetchurl { 12 + url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz"; 13 + hash = "sha256-ZmeOYwrd1Xvwqq565zOtcDv6heOLVVaF04M1jEtjDO8="; 14 }; 15 16 + patches = [ 17 + ./fix-cmake-install-path.patch 18 + ./do-not-use-vendored-libraries.patch 19 + ]; 20 21 + nativeBuildInputs = [ 22 + cmake 23 + pkg-config 24 + ]; 25 26 + buildInputs = [ 27 + rapidjson 28 + xxHash 29 + zstd 30 + mecab 31 + kytea 32 + ] ++ lib.optionals lz4Support [ 33 + lz4 34 + ] ++ lib.optional zlibSupport [ 35 + zlib 36 + ] ++ lib.optionals suggestSupport [ 37 + zeromq 38 + libevent 39 + msgpack 40 + ]; 41 42 + env.NIX_CFLAGS_COMPILE = lib.optionalString zlibSupport "-I${zlib.dev}/include"; 43 44 + passthru.tests = { 45 + inherit (postgresqlPackages) pgroonga; 46 + version = testers.testVersion { 47 + package = finalAttrs.finalPackage; 48 + }; 49 + pkg-config = testers.hasPkgConfigModules { 50 + package = finalAttrs.finalPackage; 51 + moduleNames = [ "groonga" ]; 52 + }; 53 }; 54 55 meta = with lib; { 56 + homepage = "https://groonga.org/"; 57 description = "An open-source fulltext search engine and column store"; 58 + license = licenses.lgpl21; 59 maintainers = [ maintainers.ericsagnes ]; 60 + platforms = platforms.all; 61 longDescription = '' 62 Groonga is an open-source fulltext search engine and column store. 63 It lets you write high-performance applications that requires fulltext search. 64 ''; 65 }; 66 + })
+15
pkgs/servers/search/groonga/do-not-use-vendored-libraries.patch
···
··· 1 + Do not use vendored libraries 2 + 3 + --- a/vendor/CMakeLists.txt 4 + +++ b/vendor/CMakeLists.txt 5 + @@ -14,10 +14,7 @@ 6 + # License along with this library; if not, write to the Free Software 7 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 8 + 9 + add_subdirectory(onigmo) 10 + -add_subdirectory(mruby) 11 + -add_subdirectory(mecab) 12 + -add_subdirectory(message_pack) 13 + if(GRN_WITH_MRUBY) 14 + add_subdirectory(groonga-log) 15 + endif()
+21
pkgs/servers/search/groonga/fix-cmake-install-path.patch
···
··· 1 + Fix CMake install path 2 + 3 + --- a/CMakeLists.txt 4 + +++ b/CMakeLists.txt 5 + @@ -1141,11 +1141,11 @@ 6 + 7 + set(prefix "${CMAKE_INSTALL_PREFIX}") 8 + set(exec_prefix "\${prefix}") 9 + -set(bindir "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}") 10 + -set(sbindir "\${exec_prefix}/${CMAKE_INSTALL_SBINDIR}") 11 + -set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}") 12 + -set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") 13 + -set(datarootdir "\${prefix}/${CMAKE_INSTALL_DATAROOTDIR}") 14 + +set(bindir "${CMAKE_INSTALL_FULL_BINDIR}") 15 + +set(sbindir "${CMAKE_INSTALL_FULL_SBINDIR}") 16 + +set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") 17 + +set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") 18 + +set(datarootdir "${CMAKE_INSTALL_FULL_DATAROOTDIR}") 19 + set(datadir "\${datarootdir}") 20 + set(expanded_pluginsdir "${GRN_PLUGINS_DIR}") 21 + set(GRN_EXPANDED_DEFAULT_DOCUMENT_ROOT "${GRN_DEFAULT_DOCUMENT_ROOT}")