git.iko.soy/typeable/nixpkgs
on master help sign in
clickhouse: 20.11.4.13-stable -> 21.3.11.5-lts

Failing Hydra build: https://hydra.nixos.org/build/143269865 ZHF #122042

commit3f3cec6d9e0ea459823ddc557b9a99f4ef2c5b95 authorMaximilian Bosch <maximilian@mbosch.me> dateTue 18 May 2021, 12:04 (5 years ago) parent274a71f
3 files changed+6−15
compare with master
unifiedsplit
nixos/modules/services/databases/clickhouse.nix+1 nixos/tests/clickhouse.nix+1 pkgs/servers/clickhouse/default.nix+4−15
nixos/modules/services/databases/clickhouse.nix+1
@@ -42,6 +42,7 @@ with lib;
4242 User = "clickhouse";
4343 Group = "clickhouse";
4444 ConfigurationDirectory = "clickhouse-server";
45+ AmbientCapabilities = "CAP_SYS_NICE";
4546 StateDirectory = "clickhouse";
4647 LogsDirectory = "clickhouse";
4748 ExecStart = "${pkgs.clickhouse}/bin/clickhouse-server --config-file=${pkgs.clickhouse}/etc/clickhouse-server/config.xml";
nixos/tests/clickhouse.nix+1
@@ -4,6 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44
55 machine = {
66 services.clickhouse.enable = true;
7+ virtualisation.memorySize = 4096;
78 };
89
910 testScript =
pkgs/servers/clickhouse/default.nix+4−15
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libtool, lldClang, ninja
1+{ lib, stdenv, fetchFromGitHub, cmake, libtool, lldClang, ninja
22, boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion
33, icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl
44, poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC
@@ -7,16 +7,16 @@
77
88stdenv.mkDerivation rec {
99 pname = "clickhouse";
10− version = "20.11.4.13";
10+ version = "21.3.11.5";
1111
1212 broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
1313
1414 src = fetchFromGitHub {
1515 owner = "ClickHouse";
1616 repo = "ClickHouse";
17− rev = "v${version}-stable";
17+ rev = "v${version}-lts";
1818 fetchSubmodules = true;
19− sha256 = "0c87k0xqwj9sc3xy2f3ngfszgjiz4rzd787bdg6fxp94w1adjhny";
19+ sha256 = "sha256-V62Z82p21qtvSOsoXM225/Wkc9F+dvVMz0xpVjhgZVo=";
2020 };
2121
2222 nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ];
@@ -27,20 +27,9 @@ stdenv.mkDerivation rec {
2727 xxHash zstd
2828 ];
2929
30− patches = [
31− # This patch is only required for 20.11.4.13 - it should be included in the
32− # next stable release from upstream by default
33− (fetchpatch {
34− url = "https://github.com/ClickHouse/ClickHouse/commit/e31753b4db7aa0a72a85757dc11fc403962e30db.patch";
35− sha256 = "12ax02dh9y9k8smkj6v50yfr46iprscbrvd4bb9vfbx8xqgw7grb";
36− })
37− ];
38−
3930 postPatch = ''
4031 patchShebangs src/
4132
42− substituteInPlace contrib/openssl-cmake/CMakeLists.txt \
43− --replace '/usr/bin/env perl' perl
4433 substituteInPlace src/Storages/System/StorageSystemLicenses.sh \
4534 --replace 'git rev-parse --show-toplevel' '$src'
4635 substituteInPlace utils/check-style/check-duplicate-includes.sh \