Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/release-notes/rl-2511.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand Down
28 changes: 28 additions & 0 deletions pkgs/by-name/cr/croncpp/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
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 ];
};
})
115 changes: 115 additions & 0 deletions pkgs/by-name/dr/dragonflydb/external-libs.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
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
132 changes: 0 additions & 132 deletions pkgs/by-name/dr/dragonflydb/fixes.patch

This file was deleted.

Loading
Loading