clickhouse: 18.16.1 -> 19.6.2.11

This commit is contained in:
Tom Hunger 2019-05-23 21:06:57 +01:00
parent 0ca30f22f1
commit efcaed45ce
2 changed files with 7 additions and 14 deletions

View file

@ -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 = ''

View file

@ -14077,7 +14077,8 @@ in
clamsmtp = callPackage ../servers/mail/clamsmtp { };
clickhouse = callPackage ../servers/clickhouse {
inherit (llvmPackages_latest) clang-unwrapped lld llvm;
# clickhouse doesn't build on llvm8.
inherit (llvmPackages_7) clang-unwrapped lld llvm;
};
couchdb = callPackage ../servers/http/couchdb {