diff options
| author | Orivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> | 2019-01-07 11:25:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-07 11:25:08 +0000 |
| commit | fa17392fd81381dae9e2b299520be213a52a36be (patch) | |
| tree | aca235453d068446dd063b34d1ecaf338640ae1c /pkgs/servers | |
| parent | 8ad610b0401a545d649aa66650027499c283b658 (diff) | |
| parent | e4e695548c126297ccef27af62a65a9bb8d099fd (diff) | |
| download | nixpkgs-fa17392fd81381dae9e2b299520be213a52a36be.tar nixpkgs-fa17392fd81381dae9e2b299520be213a52a36be.tar.gz nixpkgs-fa17392fd81381dae9e2b299520be213a52a36be.tar.bz2 nixpkgs-fa17392fd81381dae9e2b299520be213a52a36be.tar.lz nixpkgs-fa17392fd81381dae9e2b299520be213a52a36be.tar.xz nixpkgs-fa17392fd81381dae9e2b299520be213a52a36be.tar.zst nixpkgs-fa17392fd81381dae9e2b299520be213a52a36be.zip | |
Merge pull request #53376 from r-ryantm/auto-update/clickhouse
clickhouse: 18.14.18 -> 18.16.1
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/clickhouse/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index bddffc52fd7..3272065efbe 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libtool +{ 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 @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "18.14.18"; + version = "18.16.1"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "0nivnmlnamcjxwc66ja9fagi5fqzzjsnrrfk32f4g8sxffx2rjy3"; + sha256 = "02slllcan7w3ln4c9yvxc8w0h2vszd7n0wshbn4bra2hb6mrzyp8"; }; nativeBuildInputs = [ cmake libtool ninja ]; @@ -28,10 +28,16 @@ stdenv.mkDerivation rec { "-DUSE_STATIC_LIBRARIES=OFF" "-DUSE_INTERNAL_SSL_LIBRARY=False" ]; - hardeningDisable = [ "format" ]; - patchPhase = '' - patchShebangs . + patches = [ + (fetchpatch { + url = "https://github.com/yandex/ClickHouse/commit/afbcdf2f00a04e747c5279414cf4691f29bb5cc2.patch"; + sha256 = "17y891q0dp179w3jv32h74pbfwyzgnz4dxxwv73vzdwvys4i8c8z"; + }) + ]; + + postPatch = '' + patchShebangs copy_headers.sh ''; postInstall = '' @@ -43,6 +49,8 @@ stdenv.mkDerivation rec { --replace "<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>" "<console>1</console>" ''; + hardeningDisable = [ "format" ]; + meta = with stdenv.lib; { homepage = https://clickhouse.yandex/; description = "Column-oriented database management system"; |