diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2021-05-18 12:04:37 +0200 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-05-19 14:08:46 -0700 |
commit | 3f3cec6d9e0ea459823ddc557b9a99f4ef2c5b95 (patch) | |
tree | c5cdad610a57e069c9bc57338941ebf0b26a1641 /pkgs/servers/clickhouse | |
parent | 274a71f262bd50cbbbabe484e2430fb2c8480431 (diff) | |
download | nixlib-3f3cec6d9e0ea459823ddc557b9a99f4ef2c5b95.tar nixlib-3f3cec6d9e0ea459823ddc557b9a99f4ef2c5b95.tar.gz nixlib-3f3cec6d9e0ea459823ddc557b9a99f4ef2c5b95.tar.bz2 nixlib-3f3cec6d9e0ea459823ddc557b9a99f4ef2c5b95.tar.lz nixlib-3f3cec6d9e0ea459823ddc557b9a99f4ef2c5b95.tar.xz nixlib-3f3cec6d9e0ea459823ddc557b9a99f4ef2c5b95.tar.zst nixlib-3f3cec6d9e0ea459823ddc557b9a99f4ef2c5b95.zip |
clickhouse: 20.11.4.13-stable -> 21.3.11.5-lts
Failing Hydra build: https://hydra.nixos.org/build/143269865 ZHF #122042
Diffstat (limited to 'pkgs/servers/clickhouse')
-rw-r--r-- | pkgs/servers/clickhouse/default.nix | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 087f96285059..51d091f0ad3e 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libtool, lldClang, ninja +{ lib, stdenv, fetchFromGitHub, cmake, libtool, lldClang, ninja , boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion , icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl , poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC @@ -7,16 +7,16 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "20.11.4.13"; + version = "21.3.11.5"; broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685 src = fetchFromGitHub { owner = "ClickHouse"; repo = "ClickHouse"; - rev = "v${version}-stable"; + rev = "v${version}-lts"; fetchSubmodules = true; - sha256 = "0c87k0xqwj9sc3xy2f3ngfszgjiz4rzd787bdg6fxp94w1adjhny"; + sha256 = "sha256-V62Z82p21qtvSOsoXM225/Wkc9F+dvVMz0xpVjhgZVo="; }; nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ]; @@ -27,20 +27,9 @@ stdenv.mkDerivation rec { xxHash zstd ]; - patches = [ - # This patch is only required for 20.11.4.13 - it should be included in the - # next stable release from upstream by default - (fetchpatch { - url = "https://github.com/ClickHouse/ClickHouse/commit/e31753b4db7aa0a72a85757dc11fc403962e30db.patch"; - sha256 = "12ax02dh9y9k8smkj6v50yfr46iprscbrvd4bb9vfbx8xqgw7grb"; - }) - ]; - postPatch = '' patchShebangs src/ - substituteInPlace contrib/openssl-cmake/CMakeLists.txt \ - --replace '/usr/bin/env perl' perl substituteInPlace src/Storages/System/StorageSystemLicenses.sh \ --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/check-style/check-duplicate-includes.sh \ |