push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,13 @@
Do not use vendored libraries
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -18,8 +18,6 @@
if(GRN_WITH_BUNDLED_ONIGMO)
add_subdirectory(onigmo)
endif()
-add_subdirectory(mruby)
-add_subdirectory(mecab)
if(GRN_WITH_MRUBY)
add_subdirectory(groonga-log)
endif()

View File

@@ -0,0 +1,21 @@
Fix CMake install path
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1879,11 +1879,11 @@
set(prefix "${CMAKE_INSTALL_PREFIX}")
set(exec_prefix "\${prefix}")
-set(bindir "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}")
-set(sbindir "\${exec_prefix}/${CMAKE_INSTALL_SBINDIR}")
-set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
-set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-set(datarootdir "\${prefix}/${CMAKE_INSTALL_DATAROOTDIR}")
+set(bindir "${CMAKE_INSTALL_FULL_BINDIR}")
+set(sbindir "${CMAKE_INSTALL_FULL_SBINDIR}")
+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
+set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+set(datarootdir "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
set(datadir "\${datarootdir}")
set(expanded_pluginsdir "${GRN_PLUGINS_DIR}")
set(GRN_EXPANDED_DEFAULT_DOCUMENT_ROOT "${GRN_DEFAULT_DOCUMENT_ROOT}")

View File

@@ -0,0 +1,86 @@
{
lib,
stdenv,
cmake,
fetchurl,
kytea,
msgpack-c,
mecab,
pkg-config,
rapidjson,
testers,
xxHash,
zstd,
postgresqlPackages,
suggestSupport ? false,
zeromq,
libevent,
lz4Support ? false,
lz4,
zlibSupport ? true,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "groonga";
version = "15.1.5";
src = fetchurl {
url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz";
hash = "sha256-dRO9QBQCIVJlFhNZjVZwoiEIesIBrkZWNSOwzgkOnkY=";
};
patches = [
./fix-cmake-install-path.patch
./do-not-use-vendored-libraries.patch
];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
rapidjson
xxHash
zstd
mecab
kytea
msgpack-c
]
++ lib.optionals lz4Support [
lz4
]
++ lib.optional zlibSupport [
zlib
]
++ lib.optionals suggestSupport [
zeromq
libevent
];
env.NIX_CFLAGS_COMPILE = lib.optionalString zlibSupport "-I${zlib.dev}/include";
passthru.tests = {
inherit (postgresqlPackages) pgroonga;
version = testers.testVersion {
package = finalAttrs.finalPackage;
};
pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
moduleNames = [ "groonga" ];
};
};
meta = {
homepage = "https://groonga.org/";
description = "Open-source fulltext search engine and column store";
license = lib.licenses.lgpl21;
maintainers = [ ];
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.
'';
};
})