summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-08-28 12:05:34 +0100
committerGitHub <noreply@github.com>2018-08-28 12:05:34 +0100
commitfc32a36956ce81fd165c2bd04e8a29d17edcc5eb (patch)
tree26409e48f531984fe9508bfa8cc16e1ce6c0c2fe
parent083220867c71443b0473374e8abe871cecb8b7d9 (diff)
parentac2cbcf10eb26a80bb6ca9f121a821d22af357bd (diff)
downloadnixlib-fc32a36956ce81fd165c2bd04e8a29d17edcc5eb.tar
nixlib-fc32a36956ce81fd165c2bd04e8a29d17edcc5eb.tar.gz
nixlib-fc32a36956ce81fd165c2bd04e8a29d17edcc5eb.tar.bz2
nixlib-fc32a36956ce81fd165c2bd04e8a29d17edcc5eb.tar.lz
nixlib-fc32a36956ce81fd165c2bd04e8a29d17edcc5eb.tar.xz
nixlib-fc32a36956ce81fd165c2bd04e8a29d17edcc5eb.tar.zst
nixlib-fc32a36956ce81fd165c2bd04e8a29d17edcc5eb.zip
Merge pull request #45585 from erosennin/clickhouse
clickhouse: 18.5.1 -> 18.10.3
-rw-r--r--pkgs/servers/clickhouse/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index b5a2c61e23e7..2dcbf6737e66 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -1,31 +1,32 @@
 { stdenv, fetchFromGitHub, cmake, libtool
 , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu
 , libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka
-, readline, sparsehash, unixODBC, zstd, ninja
+, readline, sparsehash, unixODBC, zstd, ninja, jemalloc
 }:
 
 stdenv.mkDerivation rec {
   name = "clickhouse-${version}";
-  version = "18.5.1";
+  version = "18.10.3";
 
   src = fetchFromGitHub {
     owner  = "yandex";
     repo   = "ClickHouse";
     rev    = "v${version}-stable";
-    sha256 = "1bw1hx3ssd1jcg6jj85nmp6dnyhvaaphjpcr6x4xs410k140qx31";
+    sha256 = "1fm7jh9cxalvlic6pw58gblisvmvb6j0jzf3vr8p6cv7iw9238sp";
   };
 
   nativeBuildInputs = [ cmake libtool ninja ];
   buildInputs = [
     boost capnproto cctz clang-unwrapped double-conversion gperftools icu
     libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka
-    readline sparsehash unixODBC zstd
+    readline sparsehash unixODBC zstd jemalloc
   ];
 
   cmakeFlags = [
     "-DENABLE_TESTS=OFF"
     "-DUNBUNDLED=ON"
     "-DUSE_STATIC_LIBRARIES=OFF"
+    "-DUSE_INTERNAL_SSL_LIBRARY=False"
   ];
   hardeningDisable = [ "format" ];