Unverified Commit c3590087 authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

dragonflydb: 0.1.0 -> 1.34.2 (#452792)

parents 0eec3a39 5f938a94

doc/release-notes/rl-2511.section.md

+2 −0
Original line number Diff line number Diff line
@@ -353,6 +353,8 @@ 


- `plasma6`: Fixed the `ksycoca` cache not being re-built when `$XDG_CACHE_HOME` is set to something that isn't `$HOME/.cache`.



- `dragonflydb` has been updated from version 0.1.0 to version 1.34.2.



## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

pkgs/by-name/cr/croncpp/package.nix

0 → 100644
+28 −0
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  fetchFromGitHub,

  cmake,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "croncpp";

  version = "2023.03.30";



  src = fetchFromGitHub {

    owner = "mariusbancila";

    repo = "croncpp";

    tag = "v${finalAttrs.version}";

    hash = "sha256-SBjNzy54OGEMemBp+c1gaH90Dc7ySL915z4E64cBWTI=";

  };



  nativeBuildInputs = [ cmake ];



  meta = with lib; {

    description = "C++11/14/17 header-only cross-platform library for handling CRON expressions";

    homepage = "https://github.com/mariusbancila/croncpp";

    license = licenses.mit;

    platforms = platforms.all;

    maintainers = with maintainers; [ typedrat ];

  };

})

pkgs/by-name/dr/dragonflydb/external-libs.patch

0 → 100644
+115 −0
Original line number Diff line number Diff line 
diff --git a/src/external_libs.cmake b/src/external_libs.cmake

index 62e6e879..8934777f 100644

--- a/src/external_libs.cmake

+++ b/src/external_libs.cmake

@@ -1,7 +1,6 @@

 add_third_party(

   lua

-  GIT_REPOSITORY https://github.com/dragonflydb/lua

-  GIT_TAG Dragonfly-5.4.6a

+  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/lua/. <SOURCE_DIR>

   CONFIGURE_COMMAND echo

   BUILD_IN_SOURCE 1

   BUILD_COMMAND ${DFLY_TOOLS_MAKE} all

@@ -19,18 +18,16 @@ endif()

 

 add_third_party(

   dconv

-  URL https://github.com/google/double-conversion/archive/refs/tags/v3.3.0.tar.gz

-  PATCH_COMMAND ${SED_REPL} "/static const std::ctype/d"

-                <SOURCE_DIR>/double-conversion/string-to-double.cc

-  COMMAND ${SED_REPL} "/std::use_facet</d" <SOURCE_DIR>/double-conversion/string-to-double.cc

-  COMMAND ${SED_REPL} "s/cType.tolower/std::tolower/g" <SOURCE_DIR>/double-conversion/string-to-double.cc

+  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/dconv/. <SOURCE_DIR>

+  PATCH_COMMAND echo

+  CMAKE_PASS_FLAGS "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"

   LIB libdouble-conversion.a

 )

 

 add_third_party(

   reflex

-  URL https://github.com/Genivia/RE-flex/archive/refs/tags/v5.2.2.tar.gz

-  PATCH_COMMAND autoreconf -fi

+  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/reflex/. <SOURCE_DIR>

+  PATCH_COMMAND echo

   CONFIGURE_COMMAND <SOURCE_DIR>/configure --disable-avx2 --prefix=${THIRD_PARTY_LIB_DIR}/reflex

           CXX=${CMAKE_CXX_COMPILER} CC=${CMAKE_C_COMPILER}

 )

@@ -41,16 +38,14 @@ set(REFLEX "${THIRD_PARTY_LIB_DIR}/reflex/bin/reflex")

 

 add_third_party(

   jsoncons

-  GIT_REPOSITORY https://github.com/dragonflydb/jsoncons

-  GIT_TAG Dragonfly.178

-  GIT_SHALLOW 1

+  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/jsoncons/. <SOURCE_DIR>

   CMAKE_PASS_FLAGS "-DJSONCONS_BUILD_TESTS=OFF -DJSONCONS_HAS_POLYMORPHIC_ALLOCATOR=ON"

   LIB "none"

 )

 

 add_third_party(

   lz4

-  URL https://github.com/lz4/lz4/archive/refs/tags/v1.10.0.tar.gz

+  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/lz4/. <SOURCE_DIR>

 

   BUILD_IN_SOURCE 1

   CONFIGURE_COMMAND echo skip

@@ -65,7 +60,7 @@ set(MIMALLOC_C_FLAGS "-O3 -g -DMI_STAT=1 -DNDEBUG")

 file(MAKE_DIRECTORY ${MIMALLOC_INCLUDE_DIR})

 

 ExternalProject_Add(mimalloc2_project

-  URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.2.4.tar.gz

+  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/mimalloc224/. <SOURCE_DIR>

   DOWNLOAD_DIR ${THIRD_PARTY_DIR}/mimalloc2

   SOURCE_DIR ${THIRD_PARTY_DIR}/mimalloc2

   # INSTALL_DIR ${MIMALLOC_ROOT_DIR}

@@ -118,21 +113,21 @@ set_target_properties(TRDP::mimalloc2 PROPERTIES IMPORTED_LOCATION ${MIMALLOC_RO

 

 add_third_party(

   croncpp

-  URL https://github.com/mariusbancila/croncpp/archive/refs/tags/v2023.03.30.tar.gz

+  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/croncpp/. <SOURCE_DIR>

   LIB "none"

 )

 

 if (WITH_SEARCH)

   add_third_party(

     uni-algo

-    URL https://github.com/uni-algo/uni-algo/archive/refs/tags/v1.0.0.tar.gz

+    DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/uni-algo/. <SOURCE_DIR>

 

     CMAKE_PASS_FLAGS "-DCMAKE_CXX_STANDARD:STRING=17"

   )

 

   add_third_party(

     hnswlib

-    URL https://github.com/nmslib/hnswlib/archive/refs/tags/v0.7.0.tar.gz

+    DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/hnswlib/. <SOURCE_DIR>

 

     BUILD_COMMAND echo SKIP

     INSTALL_COMMAND cp -R <SOURCE_DIR>/hnswlib ${THIRD_PARTY_LIB_DIR}/hnswlib/include/

@@ -142,21 +137,20 @@ endif()

 

 add_third_party(

   fast_float

-  URL https://github.com/fastfloat/fast_float/archive/refs/tags/v5.2.0.tar.gz

+  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/fast_float/. <SOURCE_DIR>

   LIB "none"

 )

 

 add_third_party(

   flatbuffers

-  URL https://github.com/google/flatbuffers/archive/refs/tags/v23.5.26.tar.gz

+  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/flatbuffers/. <SOURCE_DIR>

   CMAKE_PASS_FLAGS "-DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_LIBCXX_WITH_CLANG=OFF

                     -DFLATBUFFERS_BUILD_FLATC=OFF"

 )

 

 add_third_party(

   hdr_histogram

-  GIT_REPOSITORY https://github.com/HdrHistogram/HdrHistogram_c/

-  GIT_TAG 652d51bcc36744fd1a6debfeb1a8a5f58b14022c

+  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/hdr_histogram/. <SOURCE_DIR>

   CMAKE_PASS_FLAGS "-DHDR_LOG_REQUIRED=OFF -DHDR_HISTOGRAM_BUILD_PROGRAMS=OFF

                     -DHDR_HISTOGRAM_INSTALL_SHARED=OFF"

   LIB libhdr_histogram_static.a

pkgs/by-name/dr/dragonflydb/fixes.patch

deleted100644 → 0
+0 −132
Original line number Diff line number Diff line 
diff --git a/helio/cmake/third_party.cmake b/helio/cmake/third_party.cmake

index aeb78d9..e9d4e6b 100644

--- a/helio/cmake/third_party.cmake

+++ b/helio/cmake/third_party.cmake

@@ -143,7 +143,7 @@ endfunction()

 

 FetchContent_Declare(

   gtest

-  URL https://github.com/google/googletest/archive/release-1.11.0.zip

+  DOWNLOAD_COMMAND true

 )

 

 FetchContent_GetProperties(gtest)

@@ -154,7 +154,7 @@ endif ()

 

 FetchContent_Declare(

   benchmark

-  URL https://github.com/google/benchmark/archive/v1.6.1.tar.gz

+  DOWNLOAD_COMMAND true

 )

 

 FetchContent_GetProperties(benchmark)

@@ -169,7 +169,7 @@ endif ()

 

 FetchContent_Declare(

   abseil_cpp

-  URL https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz

+  DOWNLOAD_COMMAND true

   PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-20211102.patch"

 )

 

@@ -183,11 +183,7 @@ endif()

 

 FetchContent_Declare(

   glog

-  GIT_REPOSITORY https://github.com/romange/glog

-  GIT_TAG Absl

-

-  GIT_PROGRESS    TRUE

-  GIT_SHALLOW     TRUE

+  DOWNLOAD_COMMAND true

 )

 

 FetchContent_GetProperties(glog)

@@ -233,10 +229,7 @@ endif()

 

 add_third_party(

   gperf

-  URL https://github.com/gperftools/gperftools/archive/gperftools-2.9.1.tar.gz

-  #GIT_REPOSITORY https://github.com/gperftools/gperftools

-  #GIT_TAG gperftools-2.9.1

-  GIT_SHALLOW TRUE

+  DOWNLOAD_COMMAND true

   PATCH_COMMAND autoreconf -i   # update runs every time for some reason

   # CMAKE_PASS_FLAGS "-DGPERFTOOLS_BUILD_HEAP_PROFILER=OFF -DGPERFTOOLS_BUILD_HEAP_CHECKER=OFF \

   #                   -DGPERFTOOLS_BUILD_DEBUGALLOC=OFF -DBUILD_TESTING=OFF  \

@@ -260,11 +253,12 @@ else()

 endif()

 

 add_third_party(mimalloc

-  URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.5.tar.gz

+  DOWNLOAD_COMMAND true

 

   # Add -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-O0 to debug

   CMAKE_PASS_FLAGS "-DCMAKE_BUILD_TYPE=Release -DMI_BUILD_SHARED=OFF -DMI_BUILD_TESTS=OFF \

-                    -DMI_INSTALL_TOPLEVEL=ON -DMI_OVERRIDE=${MI_OVERRIDE} -DCMAKE_C_FLAGS=-g"

+                    -DMI_INSTALL_TOPLEVEL=ON -DMI_OVERRIDE=${MI_OVERRIDE} -DCMAKE_C_FLAGS=-g \

+                    -DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/mimalloc/lib"

 

   BUILD_COMMAND make -j4 mimalloc-static

   INSTALL_COMMAND make install

@@ -274,7 +268,7 @@ add_third_party(mimalloc

 )

 

 add_third_party(jemalloc

-  URL https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2

+  URL REPLACEJEMALLOCURL

   PATCH_COMMAND ./autogen.sh

   CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/jemalloc --with-jemalloc-prefix=je_ --disable-libdl

 )

@@ -282,24 +276,23 @@ add_third_party(jemalloc

 

 add_third_party(

   xxhash

-  URL https://github.com/Cyan4973/xxHash/archive/v0.8.0.tar.gz

+  DOWNLOAD_COMMAND true

   SOURCE_SUBDIR cmake_unofficial

-  CMAKE_PASS_FLAGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF"

+  CMAKE_PASS_FLAGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF \

+                    -DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/xxhash/lib"

 )

 

 

 add_third_party(

   uring

-  GIT_REPOSITORY https://github.com/axboe/liburing.git

-  GIT_TAG liburing-2.1

+  DOWNLOAD_COMMAND true

   CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/uring

   BUILD_IN_SOURCE 1

 )

 

 add_third_party(

   rapidjson

-  GIT_REPOSITORY https://github.com/Tencent/rapidjson.git

-  GIT_TAG 1a803826f1197b5e30703afe4b9c0e7dd48074f5

+  DOWNLOAD_COMMAND true

   CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \

                     -DRAPIDJSON_BUILD_DOC=OFF"

   LIB "none"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

index 0dc0824..d5b38b3 100644

--- a/src/CMakeLists.txt

+++ b/src/CMakeLists.txt

@@ -1,6 +1,6 @@

 add_third_party(

   lua

-  URL https://github.com/lua/lua/archive/refs/tags/v5.4.4.tar.gz

+  URL REPLACELUAURL

   PATCH_COMMAND patch -p1 -i "${CMAKE_SOURCE_DIR}/patches/lua-v5.4.4.patch"

   CONFIGURE_COMMAND echo

   BUILD_IN_SOURCE 1

@@ -11,7 +11,8 @@ add_third_party(

 

 add_third_party(

   dconv

-  URL https://github.com/google/double-conversion/archive/refs/tags/v3.2.0.tar.gz

+  DOWNLOAD_COMMAND true

+  CMAKE_PASS_FLAGS "-DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/dconv/lib"

   LIB libdouble-conversion.a

 )

pkgs/by-name/dr/dragonflydb/glog.patch

deleted100644 → 0
+0 −553

File deleted.

Preview size limit exceeded, changes collapsed.