summary refs log tree commit diff
path: root/pkgs/servers/clickhouse
diff options
context:
space:
mode:
authorTom Hunger <tehunger@gmail.com>2019-05-23 21:06:57 +0100
committerTom Hunger <tehunger@gmail.com>2019-05-25 19:48:28 +0100
commitefcaed45ce4e9f41c7d2dcef84faad098a6d891e (patch)
tree1ad8c254e33528172d6f7a59eca8e49d5b5b2cda /pkgs/servers/clickhouse
parent0ca30f22f1a7c42c274a5fc60c433cbf03906666 (diff)
downloadnixpkgs-efcaed45ce4e9f41c7d2dcef84faad098a6d891e.tar
nixpkgs-efcaed45ce4e9f41c7d2dcef84faad098a6d891e.tar.gz
nixpkgs-efcaed45ce4e9f41c7d2dcef84faad098a6d891e.tar.bz2
nixpkgs-efcaed45ce4e9f41c7d2dcef84faad098a6d891e.tar.lz
nixpkgs-efcaed45ce4e9f41c7d2dcef84faad098a6d891e.tar.xz
nixpkgs-efcaed45ce4e9f41c7d2dcef84faad098a6d891e.tar.zst
nixpkgs-efcaed45ce4e9f41c7d2dcef84faad098a6d891e.zip
clickhouse: 18.16.1 -> 19.6.2.11
Diffstat (limited to 'pkgs/servers/clickhouse')
-rw-r--r--pkgs/servers/clickhouse/default.nix18
1 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 3272065efbe..61476a892d6 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -1,43 +1,35 @@
 { stdenv, fetchFromGitHub, fetchpatch, 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, jemalloc
+, readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash
 }:
 
 stdenv.mkDerivation rec {
   name = "clickhouse-${version}";
-  version = "18.16.1";
+  version = "19.6.2.11";
 
   src = fetchFromGitHub {
     owner  = "yandex";
     repo   = "ClickHouse";
     rev    = "v${version}-stable";
-    sha256 = "02slllcan7w3ln4c9yvxc8w0h2vszd7n0wshbn4bra2hb6mrzyp8";
+    sha256 = "0bs38a8dm5x43klx4nc5dwkkxpab12lp2chyvc2y47c75j7rn5d7";
   };
 
   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 jemalloc
+    readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash
   ];
 
   cmakeFlags = [
     "-DENABLE_TESTS=OFF"
     "-DUNBUNDLED=ON"
     "-DUSE_STATIC_LIBRARIES=OFF"
-    "-DUSE_INTERNAL_SSL_LIBRARY=False"
-  ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/yandex/ClickHouse/commit/afbcdf2f00a04e747c5279414cf4691f29bb5cc2.patch";
-      sha256 = "17y891q0dp179w3jv32h74pbfwyzgnz4dxxwv73vzdwvys4i8c8z";
-    })
   ];
 
   postPatch = ''
-    patchShebangs copy_headers.sh
+    patchShebangs dbms/programs/clang/copy_headers.sh
   '';
 
   postInstall = ''