mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
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 fdb3fb44db)
This commit is contained in:
parent
a3f7376414
commit
422096a865
1 changed files with 2 additions and 23 deletions
|
|
@ -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 = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue