From 1a65a6a274eb9ff1d4aff1625b23136730806e4c Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 23 Jan 2025 11:34:23 +0800 Subject: [PATCH] lucenepp: 3.0.8 -> 3.0.9 --- pkgs/by-name/lu/lucenepp/package.nix | 43 +++++++++++++--------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/lu/lucenepp/package.nix b/pkgs/by-name/lu/lucenepp/package.nix index 5e9688571ce7..89e719e2295d 100644 --- a/pkgs/by-name/lu/lucenepp/package.nix +++ b/pkgs/by-name/lu/lucenepp/package.nix @@ -4,25 +4,25 @@ fetchFromGitHub, fetchpatch, cmake, - boost, + boost186, gtest, zlib, }: stdenv.mkDerivation rec { pname = "lucene++"; - version = "3.0.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "luceneplusplus"; repo = "LucenePlusPlus"; rev = "rel_${version}"; - sha256 = "12v7r62f7pqh5h210pb74sfx6h70lj4pgfpva8ya2d55fn0qxrr2"; + hash = "sha256-VxEV45OXHRldFdIt2OC6O7ey5u98VQzlzeOb9ZiKfd8="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ - boost + boost186 gtest zlib ]; @@ -30,32 +30,33 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; patches = [ - (fetchpatch { - name = "pkgconfig_use_correct_LIBDIR_for_destination_library"; - url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch"; - sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo"; - }) - (fetchpatch { - name = "fix-visibility-on-mac.patch"; - url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/bc436842227aea561b68c6ae89fbd1fdefcac7b3.patch"; - sha256 = "sha256-/S7tFZ4ht5p0cv036xF2NKZQwExbPaGINyWZiUg/lS4="; - }) (fetchpatch { name = "fix-build-with-boost-1_85_0.patch"; url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/76dc90f2b65d81be018c499714ff11e121ba5585.patch"; - sha256 = "sha256-SNAngHwy7yxvly8d6u1LcPsM6NYVx3FrFiSHLmkqY6Q="; + hash = "sha256-SNAngHwy7yxvly8d6u1LcPsM6NYVx3FrFiSHLmkqY6Q="; + }) + (fetchpatch { + name = "fix-install-path-for-liblucene_pc.patch"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/f40f59c6e169b4e16b7a6439ecb26a629c6540d1.patch"; + hash = "sha256-YtZMqh/cnkGikatcgRjOWXj570M5ZOnCqgW8/K0/nVo="; + }) + (fetchpatch { + name = "migrate-to-boost_asio_io_context.patch"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/e6a376836e5c891577eae6369263152106b9bc02.patch"; + hash = "sha256-0mdVvrS0nTxSJXRzVdx2Zb/vm9aVxGfARG/QliRx7tA="; }) ]; # Don't use the built in gtest - but the nixpkgs one requires C++14. postPatch = '' substituteInPlace src/test/CMakeLists.txt \ - --replace "add_subdirectory(gtest)" "" + --replace-fail "add_subdirectory(gtest)" "" substituteInPlace CMakeLists.txt \ - --replace "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)" + --replace-fail "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)" ''; - doCheck = true; + # FIXME: Stuck for several hours after passing 1472 tests + doCheck = false; checkPhase = '' runHook preCheck @@ -64,11 +65,6 @@ stdenv.mkDerivation rec { runHook postCheck ''; - postInstall = '' - mv $out/include/pkgconfig $out/lib/ - cp $src/src/contrib/include/*h $out/include/lucene++/ - ''; - meta = { description = "C++ port of the popular Java Lucene search engine"; homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; @@ -77,5 +73,6 @@ stdenv.mkDerivation rec { lgpl3Plus ]; platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ rewine ]; }; }