diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-05-26 15:35:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-26 15:35:46 -0400 |
| commit | 39adff94a1ce2dee5fc41f5c44f64bab35c49e70 (patch) | |
| tree | abe24f3b50b1077be2b76ee5d3c33dac6ff18483 /pkgs | |
| parent | 6e46d0b72a5b6761b1d73563ef5986695c914db7 (diff) | |
| parent | efcaed45ce4e9f41c7d2dcef84faad098a6d891e (diff) | |
| download | nixlib-39adff94a1ce2dee5fc41f5c44f64bab35c49e70.tar nixlib-39adff94a1ce2dee5fc41f5c44f64bab35c49e70.tar.gz nixlib-39adff94a1ce2dee5fc41f5c44f64bab35c49e70.tar.bz2 nixlib-39adff94a1ce2dee5fc41f5c44f64bab35c49e70.tar.lz nixlib-39adff94a1ce2dee5fc41f5c44f64bab35c49e70.tar.xz nixlib-39adff94a1ce2dee5fc41f5c44f64bab35c49e70.tar.zst nixlib-39adff94a1ce2dee5fc41f5c44f64bab35c49e70.zip | |
Merge pull request #61988 from teh/clickhouse
clickhouse: 18.16.1 -> 19.6.2.11
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/clickhouse/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 3272065efbef..61476a892d64 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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31be955ce51d..6ea55bf91737 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14081,7 +14081,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 { |