git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #92694 from RaghavSood/clickhouse/20.5.2.7

clickhouse: 19.17.9.60 -> 20.5.2.7

commit904aa5d57204c6639d3f1a6bca98ffacc802f5f5 authorMaximilian Bosch <maximilian@mbosch.me> dateWed 8 Jul 2020, 17:49 (6 years ago) parent5b742c32761377
2 files changed+31−17
pkgs/servers/clickhouse/default.nix+30−16 pkgs/top-level/all-packages.nix+1−1
pkgs/servers/clickhouse/default.nix+30−16
@@ -1,39 +1,53 @@
11{ stdenv, fetchFromGitHub, cmake, libtool, lldClang, ninja
2−, boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion, gperftools
3−, icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl
4−, poco, protobuf, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC
2+, boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion
3+, icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl
4+, poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC
55, xxHash, zstd
66}:
77
88stdenv.mkDerivation rec {
99 pname = "clickhouse";
10− version = "19.17.9.60";
10+ version = "20.5.2.7";
1111
1212 src = fetchFromGitHub {
13− owner = "yandex";
13+ owner = "ClickHouse";
1414 repo = "ClickHouse";
1515 rev = "v${version}-stable";
16− sha256 = "0k1ncn7i4szpw4jlhv3zmw6mrkkm8qfs39nj1zbawjqrkgnw70kg";
16+ fetchSubmodules = true;
17+ sha256 = "15b499czsv727wwdb1i1ja5wfsk6ii3pqpk6dlqic9cdmkh8c8ic";
1718 };
1819
1920 nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ];
2021 buildInputs = [
21− boost brotli capnproto cctz clang-unwrapped double-conversion gperftools
22− icu jemalloc libcpuid libxml2 lld llvm lz4 libmysqlclient openssl
23− poco protobuf rapidjson re2 rdkafka readline sparsehash unixODBC
22+ boost brotli capnproto cctz clang-unwrapped double-conversion
23+ icu jemalloc libcpuid libxml2 lld llvm lz4 libmysqlclient openssl perl
24+ poco protobuf python3 rapidjson re2 rdkafka readline sparsehash unixODBC
2425 xxHash zstd
2526 ];
2627
28+ postPatch = ''
29+ patchShebangs src/
30+
31+ substituteInPlace contrib/openssl-cmake/CMakeLists.txt \
32+ --replace '/usr/bin/env perl' perl
33+ substituteInPlace src/Storages/System/StorageSystemLicenses.sh \
34+ --replace 'git rev-parse --show-toplevel' '$src'
35+ substituteInPlace utils/check-style/check-duplicate-includes.sh \
36+ --replace 'git rev-parse --show-toplevel' '$src'
37+ substituteInPlace utils/check-style/check-ungrouped-includes.sh \
38+ --replace 'git rev-parse --show-toplevel' '$src'
39+ substituteInPlace utils/generate-ya-make/generate-ya-make.sh \
40+ --replace 'git rev-parse --show-toplevel' '$src'
41+ substituteInPlace utils/list-licenses/list-licenses.sh \
42+ --replace 'git rev-parse --show-toplevel' '$src'
43+ substituteInPlace utils/check-style/check-style \
44+ --replace 'git rev-parse --show-toplevel' '$src'
45+ '';
46+
2747 cmakeFlags = [
2848 "-DENABLE_TESTS=OFF"
29− "-DUNBUNDLED=ON"
30− "-DUSE_STATIC_LIBRARIES=OFF"
3149 ];
3250
33− postPatch = ''
34− patchShebangs dbms/programs/clang/copy_headers.sh
35− '';
36−
3751 postInstall = ''
3852 rm -rf $out/share/clickhouse-test
3953
@@ -46,7 +60,7 @@ stdenv.mkDerivation rec {
4660 hardeningDisable = [ "format" ];
4761
4862 meta = with stdenv.lib; {
49− homepage = "https://clickhouse.yandex/";
63+ homepage = "https://clickhouse.tech/";
5064 description = "Column-oriented database management system";
5165 license = licenses.asl20;
5266 maintainers = with maintainers; [ orivej ];
pkgs/top-level/all-packages.nix+1−1
@@ -15774,7 +15774,7 @@ in
1577415774
1577515775 clickhouse = callPackage ../servers/clickhouse {
1577615776 # clickhouse doesn't build on llvm8.
15777− inherit (llvmPackages_7) clang-unwrapped lld lldClang llvm;
15777+ inherit (llvmPackages_9) clang-unwrapped lld lldClang llvm;
1577815778 };
1577915779
1578015780 couchdb = callPackage ../servers/http/couchdb {