From 2a2d2fc7ce6eefad4f7c9c84130a365c8dfc1ca8 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 29 Apr 2025 13:14:24 +0800 Subject: [PATCH] groonga: 14.0.6 -> 15.0.4 --- .../gr/groonga/do-not-use-vendored-libraries.patch | 10 ++++------ .../by-name/gr/groonga/fix-cmake-install-path.patch | 4 ++-- pkgs/by-name/gr/groonga/package.nix | 13 ++++++------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch b/pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch index 8729031f14cb..76b29d3ee3ed 100644 --- a/pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch +++ b/pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch @@ -2,14 +2,12 @@ Do not use vendored libraries --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt -@@ -14,10 +14,7 @@ - # License along with this library; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - add_subdirectory(onigmo) +@@ -18,8 +18,6 @@ + if(GRN_WITH_BUNDLED_ONIGMO) + add_subdirectory(onigmo) + endif() -add_subdirectory(mruby) -add_subdirectory(mecab) --add_subdirectory(message_pack) if(GRN_WITH_MRUBY) add_subdirectory(groonga-log) endif() diff --git a/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch b/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch index 5b00cd42404c..bca9b6d5d023 100644 --- a/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch +++ b/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch @@ -2,8 +2,8 @@ Fix CMake install path --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1141,11 +1141,11 @@ - +@@ -1879,11 +1879,11 @@ + set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "\${prefix}") -set(bindir "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}") diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix index 8b985dbeee43..cbd3aee3bff3 100644 --- a/pkgs/by-name/gr/groonga/package.nix +++ b/pkgs/by-name/gr/groonga/package.nix @@ -15,7 +15,6 @@ suggestSupport ? false, zeromq, libevent, - openssl, lz4Support ? false, lz4, zlibSupport ? true, @@ -24,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "groonga"; - version = "14.0.6"; + version = "15.0.4"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz"; - hash = "sha256-1caTQAycvpG2PgtbxIn58HrxvWjxKgiczRSC72nWzGw="; + hash = "sha256-ESPUEBpV6hg8KQeSzjklPgf4R0DlYdpwxp9M6YdTV/Q="; }; patches = [ @@ -74,12 +73,12 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { homepage = "https://groonga.org/"; description = "Open-source fulltext search engine and column store"; - license = licenses.lgpl21; - maintainers = [ maintainers.ericsagnes ]; - platforms = platforms.all; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.ericsagnes ]; + platforms = lib.platforms.all; longDescription = '' Groonga is an open-source fulltext search engine and column store. It lets you write high-performance applications that requires fulltext search.