diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-20 09:12:42 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-20 09:12:42 -0700 |
| commit | 14f3686af1dc4f2cb34b1445125df8241639746b (patch) | |
| tree | 6af2f44fb1d6a1019eecd47e8b4e1fef9bc30aa4 /pkgs/servers/clickhouse | |
| parent | 24f13758b9f5e8370bebd6f097bb1f931b0a967f (diff) | |
| parent | 8aac6d8daf586ac6246e4233e00217258a738889 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
pkgs/applications/terminal-emulators/alacritty/default.nix
pkgs/servers/clickhouse/default.nix
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 9607c435fcdb..8c71b37d526b 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libtool, llvm-bintools, ninja +{ lib, stdenv, fetchFromGitHub, cmake, libtool, llvm-bintools, 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 llvm-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 \ |