Skip to content

Commit 3f9a08b

Browse files
authored
turingdb: 1.30 -> 1.31 (#520785)
2 parents af3f292 + 0738a4d commit 3f9a08b

1 file changed

Lines changed: 21 additions & 2 deletions

File tree

pkgs/by-name/tu/turingdb/package.nix

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
fetchFromGitHub,
55
cmake,
66
pkg-config,
7+
python3,
78
gitMinimal,
89
bison,
910
flex,
1011
inih,
1112
minio-cpp,
13+
arrow-cpp,
1214
curl,
1315
curlpp,
1416
nlohmann_json,
@@ -26,18 +28,19 @@ let
2628
in
2729
turingstdenv.mkDerivation (finalAttrs: {
2830
pname = "turingdb";
29-
version = "1.30";
31+
version = "1.31";
3032

3133
src = fetchFromGitHub {
3234
owner = "turing-db";
3335
repo = "turingdb";
3436
tag = "v${finalAttrs.version}";
35-
hash = "sha256-dYggkkuTC+amR/Alz+B1YCNo5kHgmrt/dNLRW5EgaZY=";
37+
hash = "sha256-dorRoDWylZo/QRJbqEZOUf+JNHSKCIi/s8wxZ2HwZsI=";
3638

3739
fetchSubmodules = true;
3840

3941
leaveDotGit = true;
4042
postFetch = ''
43+
git -C $out log -1 --format=%H > $out/HEAD_COMMIT_HASH
4144
git -C $out log -1 --format=%ct > $out/HEAD_COMMIT_TIMESTAMP
4245
rm -rf $out/.git
4346
'';
@@ -46,6 +49,20 @@ turingstdenv.mkDerivation (finalAttrs: {
4649
postPatch = ''
4750
substituteInPlace storage/dump/DumpConfig.h \
4851
--replace-fail HEAD_COMMIT_TIMESTAMP "$(cat $src/HEAD_COMMIT_TIMESTAMP)"
52+
53+
substituteInPlace io/parquet/CMakeLists.txt \
54+
--replace-fail "Parquet::parquet_static" "Parquet::parquet_shared"
55+
56+
substituteInPlace CMakeLists.txt \
57+
--replace-fail 'COMMAND git rev-parse HEAD' 'COMMAND cat HEAD_COMMIT_HASH' \
58+
--replace-fail 'COMMAND git show --no-patch --format=%at' 'COMMAND cat HEAD_COMMIT_TIMESTAMP'
59+
60+
substituteInPlace tools/turingdb/TuringDBTool.cpp \
61+
--replace-fail '"turingdb", "1.0"' '"turingdb", "${finalAttrs.version}"'
62+
63+
for dir in test samples regress fuzz examples; do
64+
substituteInPlace CMakeLists.txt --replace-fail "add_subdirectory($dir)" ""
65+
done
4966
'';
5067

5168
strictDeps = true;
@@ -56,9 +73,11 @@ turingstdenv.mkDerivation (finalAttrs: {
5673
flex
5774
gitMinimal
5875
pkg-config
76+
python3
5977
];
6078

6179
buildInputs = [
80+
arrow-cpp
6281
curl
6382
curlpp
6483
faiss

0 commit comments

Comments
 (0)