From 422096a86543da9eee7f7db80e1ef8d6c9e599ea Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Fri, 15 May 2026 11:44:53 +0200 Subject: [PATCH] croaring: 3.6.1 -> 4.7.0 changelog: https://github.com/RoaringBitmap/CRoaring/releases/tag/v4.7.0 diff: https://github.com/RoaringBitmap/CRoaring/compare/v4.6.1...v4.7.0 (cherry picked from commit fdb3fb44db4818bbe4be924b4dc06fd06146b12e) --- pkgs/by-name/cr/croaring/package.nix | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/cr/croaring/package.nix b/pkgs/by-name/cr/croaring/package.nix index ccc77ce42f7a..4b2be5003143 100644 --- a/pkgs/by-name/cr/croaring/package.nix +++ b/pkgs/by-name/cr/croaring/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "croaring"; - version = "4.6.1"; + version = "4.7.0"; src = fetchFromGitHub { owner = "RoaringBitmap"; repo = "CRoaring"; tag = "v${finalAttrs.version}"; - hash = "sha256-wks7kkF0va7RUJXY74ku/yWTSsHQKlFczfhAHyuNudM="; + hash = "sha256-YXEEiWbbP6G7x/rQiihAq20OEMxJNSgky+JTEaKlNDU="; }; # roaring.pc.in cannot handle absolute CMAKE_INSTALL_*DIRs, nor @@ -28,27 +28,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - postPatch = '' - # Fixes the build of dependent projects by updating the supported - # CMake version. - # Issue: https://github.com/RoaringBitmap/CRoaring/issues/793 - # PR: https://github.com/RoaringBitmap/CRoaring/pull/794 - substituteInPlace CMakeLists.txt \ - --replace-fail '2.8...3.15' '3.15' - ''; - - preConfigure = '' - mkdir -p dependencies/.cache - ln -s ${ - fetchFromGitHub { - owner = "clibs"; - repo = "cmocka"; - rev = "f5e2cd77c88d9f792562888d2b70c5a396bfbf7a"; - hash = "sha256-Oq0nFsZhl8IF7kQN/LgUq8VBy+P7gO98ep/siy5A7Js="; - } - } dependencies/.cache/cmocka - ''; - cmakeFlags = [ (lib.cmakeBool "ROARING_USE_CPM" false) ]; meta = {