summary refs log tree commit diff
path: root/pkgs/servers/clickhouse/default.nix
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2018-06-11 08:37:06 +0000
committerOrivej Desh <orivej@gmx.fr>2018-06-11 09:26:07 +0000
commit796fa8190e3bb398aa322fbe27da2f4c7b0e1e8b (patch)
treea9f79469d7699733754fdc8ea40010d21f99c6a2 /pkgs/servers/clickhouse/default.nix
parent63a5b85b2a29615765dd235fb11233ea4c2ae223 (diff)
downloadnixpkgs-796fa8190e3bb398aa322fbe27da2f4c7b0e1e8b.tar
nixpkgs-796fa8190e3bb398aa322fbe27da2f4c7b0e1e8b.tar.gz
nixpkgs-796fa8190e3bb398aa322fbe27da2f4c7b0e1e8b.tar.bz2
nixpkgs-796fa8190e3bb398aa322fbe27da2f4c7b0e1e8b.tar.lz
nixpkgs-796fa8190e3bb398aa322fbe27da2f4c7b0e1e8b.tar.xz
nixpkgs-796fa8190e3bb398aa322fbe27da2f4c7b0e1e8b.tar.zst
nixpkgs-796fa8190e3bb398aa322fbe27da2f4c7b0e1e8b.zip
clickhouse: 1.1.54310 -> 1.1.54385
Diffstat (limited to 'pkgs/servers/clickhouse/default.nix')
-rw-r--r--pkgs/servers/clickhouse/default.nix20
1 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index f4a6b47a45a..58a178a8b2e 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -1,34 +1,30 @@
-{ stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools
-, icu, mysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC
-, zookeeper_mt, zstd }:
+{ stdenv, fetchFromGitHub, cmake, libtool, boost, cctz, double-conversion, gperftools
+, icu, lz4, mysql, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC, zstd
+}:
 
 stdenv.mkDerivation rec {
   name = "clickhouse-${version}";
 
-  version = "1.1.54310";
+  version = "1.1.54385";
 
   src = fetchFromGitHub {
     owner = "yandex";
     repo = "ClickHouse";
     rev = "v${version}-stable";
-    sha256 = "167pihqak8ip7bmlyrbzl9x3mpn381j8v7pl7nhrl9bfnzgrq69v";
+    sha256 = "0s290xnx9dil2lbxdir5p5zmakvq5h523gdwax2cb37606wg8yj7";
   };
 
-  patches = [ ./termcap.patch ];
+  patches = [ ./find-mysql.patch ./termcap.patch ];
 
   nativeBuildInputs = [ cmake libtool ];
 
   buildInputs = [
-    boost double-conversion gperftools icu mysql.connector-c lz4 openssl poco
-    re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd
+    boost cctz double-conversion gperftools icu lz4 mysql.connector-c openssl poco
+    re2 rdkafka readline sparsehash unixODBC zstd
   ];
 
   cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ];
 
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-function" ];
-
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     homepage = https://clickhouse.yandex/;
     description = "Column-oriented database management system";