about summary refs log tree commit diff
path: root/pkgs/servers/clickhouse
diff options
context:
space:
mode:
authorYureka <yuka@yuka.dev>2023-06-25 19:18:39 +0200
committerYt <happysalada@tuta.io>2023-06-26 12:39:28 +0800
commitcb26e4230dedb788f9612d00332b11efac003da7 (patch)
tree5982080c978bfd87c1a22ac40ab5d389d9f853c3 /pkgs/servers/clickhouse
parent850cfffabc40ce79dbaec027be15c8d57749e35b (diff)
downloadnixlib-cb26e4230dedb788f9612d00332b11efac003da7.tar
nixlib-cb26e4230dedb788f9612d00332b11efac003da7.tar.gz
nixlib-cb26e4230dedb788f9612d00332b11efac003da7.tar.bz2
nixlib-cb26e4230dedb788f9612d00332b11efac003da7.tar.lz
nixlib-cb26e4230dedb788f9612d00332b11efac003da7.tar.xz
nixlib-cb26e4230dedb788f9612d00332b11efac003da7.tar.zst
nixlib-cb26e4230dedb788f9612d00332b11efac003da7.zip
clickhouse: 23.3.3.52 -> 23.3.5.9
Diffstat (limited to 'pkgs/servers/clickhouse')
-rw-r--r--pkgs/servers/clickhouse/default.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index ffa10568ffff..4a07e129cfd3 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -1,6 +1,7 @@
 { lib
 , llvmPackages
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , ninja
 , python3
@@ -27,7 +28,7 @@ let
     else llvmPackages.stdenv).mkDerivation;
 in mkDerivation rec {
   pname = "clickhouse";
-  version = "23.3.3.52";
+  version = "23.3.5.9";
 
   src = fetchFromGitHub rec {
     owner = "ClickHouse";
@@ -35,9 +36,7 @@ in mkDerivation rec {
     rev = "v${version}-lts";
     fetchSubmodules = true;
     name = "clickhouse-${rev}.tar.gz";
-    hash = if stdenv.isDarwin
-           then "sha256-VaUGbUyDilYPK4iBv/nICOsfeolNQeBSEtC71gBTkpE="
-           else "sha256-NH+OW6zr8XBmJr68fX1WIy8Wt7cLWFMskIv7Be0TLEU=";
+    hash = "sha256-soF0L69oi95r0zgzPL0DfDhhXfRKekN5u/4+/mt8QwM=";
     postFetch = ''
       # delete files that make the source too big
       rm -rf $out/contrib/llvm-project/llvm/test
@@ -53,7 +52,7 @@ in mkDerivation rec {
       tar -I 'gzip -n' \
         --sort=name \
         --mtime=1970-01-01 \
-        --owner=root --group=root \
+        --owner=0 --group=0 \
         --numeric-owner --mode=go=rX,u+rw,a-s \
         --transform='s@^@source/@S' \
         -cf temp  -C "$out" .
@@ -157,9 +156,11 @@ in mkDerivation rec {
     "-DENABLE_TESTS=OFF"
     "-DCOMPILER_CACHE=disabled"
     "-DENABLE_EMBEDDED_COMPILER=ON"
-    "-DWERROR=OFF"
   ];
 
+  # https://github.com/ClickHouse/ClickHouse/issues/49988
+  hardeningDisable = [ "fortify" ];
+
   postInstall = ''
     rm -rf $out/share/clickhouse-test